From: Sergey Matveev <stargrave@stargrave.org>
Date: Tue, 31 Jan 2023 14:32:42 +0000 (+0300)
Subject: I use github.com/yegappan/lsp now
X-Git-Url: http://www.git.stargrave.org/?p=dotfiles.git;a=commitdiff_plain;h=332316f0d9ab39aa5f8365962ba2f7c785f0edd4

I use github.com/yegappan/lsp now
---

diff --git a/vim/.vim/ftplugin/python/lsp.vim b/vim/.vim/ftplugin/python/lsp.vim
deleted file mode 100644
index cd34fa5..0000000
--- a/vim/.vim/ftplugin/python/lsp.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-if executable("pyls")
-    LSClientEnable
-endif
diff --git a/vim/.vim/plugin/lsp.vim b/vim/.vim/plugin/lsp.vim
index 7cf4c2f..c5e1c90 100644
--- a/vim/.vim/plugin/lsp.vim
+++ b/vim/.vim/plugin/lsp.vim
@@ -3,27 +3,40 @@ vim9script
 # go get golang.org/x/tools/gopls@latest
 # pip install 'python-language-server[all]'
 
-g:lsc_enable_autocomplete = false
-g:lsc_server_commands = {
-    c: {command: "clangd --log=error"},
-    cpp: {command: "clangd --log=error"},
-    go: {command: "gopls", log_level: -1},
-    python: {
-        command: "pyls",
-        workspace_config: {pyls: {
+var lspServers = [
+    {
+        filetype: ["c", "cpp"],
+        path: "clangd",
+        args: ["--log=error"],
+    },
+    {
+        filetype: ["go"],
+        path: "gopls",
+        syncInit: true,
+    },
+    {
+        filetype: ["python"],
+        path: "pyls",
+        args: ["-v"],
+        syncInit: true,
+        workspaceConfig: {pyls: {
             configurationSources: ["flake8"],
             plugins: {
                 mccabe: {enabled: false},
             },
         }},
-        enabled: false,
-    },
-}
-g:lsc_auto_map = {
-    GoToDefinition: "gd",
-    GoToDefinitionSplit: "<C-W>gd",
-    ShowHover: true,
-    Completion: "omnifunc",
+    }
+]
+var lspOpts = {
+    ignoreMissingServer: true,
+    autoComplete: false,
+    autoHighlight: true,
+    autoPopulateDiags: true,
+    showInlayHints: true,
 }
 
-map <F6> :LSClientAllDiagnostics<CR>
+autocmd VimEnter * call LspAddServer(lspServers)
+autocmd VimEnter * call LspOptionsSet(lspOpts)
+nmap gd :LspGotoDefinition<CR>
+nmap <C-W>gd :vert LspGotoDefinition<CR>
+nmap <F6> :lopen<CR>