From: Philippe Hürlimann <p@hurlimann.org>
Date: Wed, 7 Nov 2018 10:12:15 +0000 (+0100)
Subject: correct language client
X-Git-Url: https://git.hurlimann.org/?a=commitdiff_plain;h=9e4c9a602dabb99eb2147d819309f78ddaa45568;p=vimfiles.git

correct language client
---

diff --git a/ftplugin/haskell.vim b/ftplugin/haskell.vim
deleted file mode 100644
index c3e54a6..0000000
--- a/ftplugin/haskell.vim
+++ /dev/null
@@ -1,10 +0,0 @@
-setlocal omnifunc=necoghc#omnifunc
-
-let g:necoghc_enable_detailed_browse = 1
-
-autocmd BufWritePost *.hs GhcModCheckAsync
-
-nnoremap <localleader>i :GhcModTypeInsert<CR>
-nnoremap <leader>t :GhcModType<CR>
-nnoremap <leader>s :GhcModSplitFunCase<CR>
-nnoremap <leader>i :GhcModInfo<CR>
diff --git a/ftplugin/rust.vim b/ftplugin/rust.vim
index 9c2b7de..b80ead3 100644
--- a/ftplugin/rust.vim
+++ b/ftplugin/rust.vim
@@ -1,8 +1,2 @@
 set makeprg=cargo\ build
 set formatprg=rustfmt
-let g:LanguageClient_serverCommands = { 'rust': ['~/.cargo/bin/rustup', 'run', 'stable', 'rls'] }
-
-nnoremap <F5> :call LanguageClient_contextMenu()<CR>
-nnoremap <silent> K :call LanguageClient#textDocument_hover()<CR>
-nnoremap <silent> gd :call LanguageClient#textDocument_definition()<CR>
-nnoremap <silent> <F2> :call LanguageClient#textDocument_rename()<CR>
diff --git a/init.vim b/init.vim
index 49442e9..6926dc6 100644
--- a/init.vim
+++ b/init.vim
@@ -4,7 +4,7 @@ call plug#begin('~/.local/share/nvim/plugged')
 
 Plug 'airblade/vim-gitgutter'
 Plug 'ap/vim-css-color'
-Plug 'autozimu/LanguageClient-neovim'
+Plug 'autozimu/LanguageClient-neovim', { 'branch': 'next', 'do': 'bash install.sh' }
 Plug 'avakhov/vim-yaml'
 Plug 'bitterjug/vim-colors-bitterjug'
 Plug 'davidhalter/jedi-vim'
@@ -15,6 +15,7 @@ Plug 'leshill/vim-json'
 Plug 'luochen1990/rainbow'
 Plug 'majutsushi/tagbar'
 Plug 'mileszs/ack.vim'
+Plug 'OmniSharp/omnisharp-vim'
 Plug 'pbrisbin/html-template-syntax'
 Plug 'Raimondi/delimitMate'
 Plug 'rhysd/vim-clang-format'
@@ -32,11 +33,14 @@ Plug 'tpope/vim-surround'
 Plug 'vim-scripts/a.vim'
 Plug 'vim-scripts/matchit.zip'
 Plug 'vim-scripts/paredit.vim'
+Plug 'w0rp/ale'
 
 call plug#end()
 
 let g:deoplete#enable_at_startup = 1
 
+let g:OmniSharp_server_use_mono = 1
+
 let g:ackprg = "ag --vimgrep"
 
 let g:UltiSnipsListSnippets="<c-l>"
@@ -48,6 +52,19 @@ let maplocalleader = "_"
 
 set laststatus=2
 
+set hidden
+
+let g:LanguageClient_serverCommands = {
+    \ 'rust': ['rustup', 'run', 'stable', 'rls'],
+    \ 'haskell': ['hie-wrapper'],
+    \}
+
+nnoremap <F5> :call LanguageClient_contextMenu()<CR>
+nnoremap <silent> K :call LanguageClient#textDocument_hover()<CR>
+nnoremap <silent> gd :call LanguageClient#textDocument_definition()<CR>
+nnoremap <silent> <F2> :call LanguageClient#textDocument_rename()<CR>
+nnoremap <silent> <M-CR> call LanguageClient#textDocument_codeAction()<CR>
+
 let delimitMate_expand_space = 1
 
 set cursorcolumn