From e6b66752b788aeac9e35d4917b2140a946398e65 Mon Sep 17 00:00:00 2001 From: Guangxiong Lin Date: Mon, 15 Jan 2024 20:26:09 +0800 Subject: Migrate from vim-lsp to yegappan-lsp --- .gitmodules | 3 +++ .vim/after/plugin/lsp.vim | 1 + .vim/after/plugin/yegappan-lsp.vim | 34 ++++++++++++++++++++++++++++++++++ .vim/pack/submodule/opt/yegappan-lsp | 1 + 4 files changed, 39 insertions(+) create mode 100644 .vim/after/plugin/yegappan-lsp.vim create mode 160000 .vim/pack/submodule/opt/yegappan-lsp diff --git a/.gitmodules b/.gitmodules index 889677d..b56768d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,3 +58,6 @@ [submodule ".vim/pack/nvim/opt/diffview.nvim"] path = .vim/pack/nvim/opt/diffview.nvim url = https://github.com/sindrets/diffview.nvim +[submodule ".vim/pack/submodule/opt/yegappan-lsp"] + path = .vim/pack/submodule/opt/yegappan-lsp + url = https://github.com/yegappan/lsp diff --git a/.vim/after/plugin/lsp.vim b/.vim/after/plugin/lsp.vim index be41ceb..6b323c8 100644 --- a/.vim/after/plugin/lsp.vim +++ b/.vim/after/plugin/lsp.vim @@ -1,3 +1,4 @@ +finish if has('nvim') finish endif diff --git a/.vim/after/plugin/yegappan-lsp.vim b/.vim/after/plugin/yegappan-lsp.vim new file mode 100644 index 0000000..42bb6cf --- /dev/null +++ b/.vim/after/plugin/yegappan-lsp.vim @@ -0,0 +1,34 @@ +packadd yegappan-lsp + +" Go language server +call LspAddServer([#{ + \ name: 'golang', + \ filetype: ['go', 'gomod'], + \ omnicompl: v:true, + \ path: exepath('gopls'), + \ args: ['serve'], + \ syncInit: v:true + \ }]) + +call LspOptionsSet(#{ + \ aleSupport: v:true, + \ autoComplete: v:false, + \ omniComplete: v:true, + \ completionMatcher: "fuzzy", + \ }) + +function! s:on_lsp_attached() abort + setlocal tagfunc=lsp#lsp#TagFunc + setlocal keywordprg=:LspHover + " setlocal formatexpr=lsp#lsp#FormatExpr() + + nnoremap rn :LspRename + nnoremap gr :LspShowReferences + + autocmd! BufWritePre *.rs,*.go call execute('LspFormat') +endfunction + +augroup lsp_attached + au! + autocmd User LspAttached call s:on_lsp_attached() +augroup END diff --git a/.vim/pack/submodule/opt/yegappan-lsp b/.vim/pack/submodule/opt/yegappan-lsp new file mode 160000 index 0000000..feb7113 --- /dev/null +++ b/.vim/pack/submodule/opt/yegappan-lsp @@ -0,0 +1 @@ +Subproject commit feb71130dabe8ba23ccd0fbc18a5df3103cb2c80 -- cgit v1.2.3