From d81e6c581bd649743efa48e4b33886446d8c00e0 Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Wed, 7 Nov 2018 11:12:09 +0100
Subject: [vim] Re-enable Language Server plugin

---
 vim/.vimrc | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'vim/.vimrc')

diff --git a/vim/.vimrc b/vim/.vimrc
index ed86d36..750f4c0 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -74,8 +74,8 @@ endif
 if has("nvim")
     " Plug 'roxma/nvim-completion-manager'
     Plug 'Shougo/deoplete.nvim', { 'do' : ':UpdateRemotePlugins', 'tag' : '4.1' }
-    " Plug 'autozimu/LanguageClient-neovim'
-    Plug 'zchee/deoplete-jedi'
+    Plug 'autozimu/LanguageClient-neovim', { 'do': 'bash install.sh', 'branch': 'next' }
+    " Plug 'zchee/deoplete-jedi'
     Plug 'hkupty/iron.nvim'
 else
     Plug 'Shougo/neocomplete.vim'
@@ -91,7 +91,7 @@ Plug 'romainl/Apprentice'
 " Plug 'josuegaleas/jay'
 call plug#end()
 
-"" Plugin mappings {{{1
+"" Plugin configuration {{{1
 
 " Toggles
 nnoremap cpg :GitGutterToggle<cr>
@@ -166,6 +166,15 @@ if &runtimepath =~ 'remembrall'
     augroup END
 endif
 
+" LanguageClient
+if executable('pyls')
+    let g:LanguageClient_serverCommands = { 'python': ['pyls'], }
+endif
+
+nnoremap <silent> <leader>lh :call LanguageClient#textDocument_hover()<CR>
+nnoremap <silent> <leader>ld :call LanguageClient#textDocument_definition()<CR>
+nnoremap <silent> <leader>lr :call LanguageClient#textDocument_rename()<CR>
+
 " Ultisnips
 nnoremap cps :UltiSnipsEdit<cr>
 
@@ -183,8 +192,6 @@ let g:neomake_gcc_args=[
             \ '-I.', '-I..', '-I../..'
             \ ]
 
-"" Plugin configurations {{{1
-
 " Deoplete
 let g:deoplete#enable_at_startup = 1
 let g:deoplete#sources#jedi#show_docstring = 1
@@ -225,6 +232,7 @@ let g:vimtex_view_method='zathura'
 let g:vimtex_quickfix_mode=2
 let g:vimtex_compiler_progname='nvr'
 
+" Pilot
 let g:pilot_boundary='ignore'
 let g:pilot_mode='wintab'
 
-- 
cgit v1.2.3