diff --git a/nvim/init.vim b/nvim/init.vim index 82d12df..ebffef4 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -52,10 +52,6 @@ Plug 'wlangstroth/vim-racket' Plug 'neovimhaskell/haskell-vim', { 'for': [ 'haskell', 'cabal' ] } Plug 'parsonsmatt/intero-neovim' Plug 'neomake/neomake' -Plug 'autozimu/LanguageClient-neovim' , { - \ 'branch' : 'next', - \ 'do' : './install.sh' - \ } " For Nix Plug 'LnL7/vim-nix', { 'for': 'nix' } " For autocompletion @@ -182,50 +178,6 @@ noremap noremap noremap -nnoremap ld :call LanguageClient#textDocument_definition() -nnoremap lr :call LanguageClient#textDocument_rename() -nnoremap lf :call LanguageClient#textDocument_formatting() -nnoremap lt :call LanguageClient#textDocument_typeDefinition() -nnoremap lx :call LanguageClient#textDocument_references() -nnoremap la :call LanguageClient_workspace_applyEdit() -nnoremap lc :call LanguageClient#textDocument_completion() -nnoremap lh :call LanguageClient#textDocument_hover() -nnoremap ls :call LanguageClient_textDocument_documentSymbol() -nnoremap lm :call LanguageClient_contextMenu() -nnoremap la :call LanguageClient#textDocument_codeAction() - -" https://github.com/autozimu/LanguageClient-neovim/issues/618 -function! LspMaybeHover(is_running) abort - if a:is_running.result && g:LanguageClient_autoHoverAndHighlightStatus - call LanguageClient_textDocument_hover() - endif -endfunction - -function! LspMaybeHighlight(is_running) abort - if a:is_running.result && g:LanguageClient_autoHoverAndHighlightStatus - call LanguageClient#textDocument_documentHighlight() - endif -endfunction - -augroup lsp_aucommands - au! - au CursorHold * call LanguageClient#isAlive(function('LspMaybeHover')) - au CursorMoved * call LanguageClient#isAlive(function('LspMaybeHighlight')) -augroup END - -let g:LanguageClient_autoHoverAndHighlightStatus = 0 - -function! ToggleLspAutoHoverAndHilight() abort - if g:LanguageClient_autoHoverAndHighlightStatus - let g:LanguageClient_autoHoverAndHighlightStatus = 0 - call LanguageClient#clearDocumentHighlight() - echo "" - else - let g:LanguageClient_autoHoverAndHighlightStatus = 1 - end -endfunction -nnoremap lg :call ToggleLspAutoHoverAndHilight() - augroup interoMaps au! " Maps for intero. Restrict to Haskell buffers so the bindings don't collide. @@ -282,30 +234,6 @@ autocmd FileType scheme nnoremap re :normal mscpaF`s " Evaluates the entire file. autocmd FileType scheme nnoremap rf :normal msggcpG`s -" For Clojure -function! Expand(exp) abort - let l:result = expand(a:exp) - return l:result ==# '' ? '' : "file://" . l:result -endfunction - -nnoremap crcc :call LanguageClient#workspace_executeCommand('cycle-coll', [Expand('%:p'), line('.') - 1, col('.') - 1]) -nnoremap crth :call LanguageClient#workspace_executeCommand('thread-first', [Expand('%:p'), line('.') - 1, col('.') - 1]) -nnoremap crtt :call LanguageClient#workspace_executeCommand('thread-last', [Expand('%:p'), line('.') - 1, col('.') - 1]) -nnoremap crtf :call LanguageClient#workspace_executeCommand('thread-first-all', [Expand('%:p'), line('.') - 1, col('.') - 1]) -nnoremap crtl :call LanguageClient#workspace_executeCommand('thread-last-all', [Expand('%:p'), line('.') - 1, col('.') - 1]) -nnoremap crml :call LanguageClient#workspace_executeCommand('move-to-let', [Expand('%:p'), line('.') - 1, col('.') - 1, input('Binding name: ')]) -nnoremap cril :call LanguageClient#workspace_executeCommand('introduce-let', [Expand('%:p'), line('.') - 1, col('.') - 1, input('Binding name: ')]) -nnoremap crel :call LanguageClient#workspace_executeCommand('expand-let', [Expand('%:p'), line('.') - 1, col('.') - 1]) -nnoremap cram :call LanguageClient#workspace_executeCommand('add-missing-libspec', [Expand('%:p'), line('.') - 1, col('.') - 1]) - -let g:LanguageClient_autoStart = 0 -let g:LanguageClient_loggingFile = expand('$HOME/LC.log') -let g:LanguageClient_rootMarkers = ['stack.yaml'] -let g:LanguageClient_serverCommands = { - \ 'haskell': ['$HOME/.local/bin/hie-wrapper'], - \ 'clojure': ['bash', '-c', 'clojure-lsp'], - \ } - let g:haskell_enable_quantification = 1 " to enable highlighting of `forall` let g:haskell_enable_recursivedo = 1 " to enable highlighting of `mdo` and `rec` let g:haskell_enable_arrowsyntax = 1 " to enable highlighting of `proc` @@ -349,8 +277,6 @@ call deoplete#custom#source('_', call deoplete#custom#option('sources', { \ '_' : ['buffer', 'tag'], \ 'rust': ['racer'], - \ 'haskell': ['LanguageClient'], - \ 'clojure': ['LanguageClient'], \}) let g:deoplete#sources#rust#disable_keymap = 1 let g:deoplete#sources#rust#racer_binary=expand('$HOME/.cargo/bin/racer')