From 6198d0512be28fc2eeb6dfa7bf2a18f8c7f31ee3 Mon Sep 17 00:00:00 2001 From: Hirokazu Hata Date: Tue, 18 Feb 2020 22:00:35 +0900 Subject: rust-analyzer: add rust-analyzer I think it's better to keep ra_lsp_server for a while as a user transition period, so I add rust-analyzer instead of rename. --- installer/install-rust-analyzer.cmd | 5 +++++ installer/install-rust-analyzer.sh | 20 ++++++++++++++++++++ settings.json | 4 ++++ settings/rust-analyzer.vim | 13 +++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 installer/install-rust-analyzer.cmd create mode 100755 installer/install-rust-analyzer.sh create mode 100644 settings/rust-analyzer.vim diff --git a/installer/install-rust-analyzer.cmd b/installer/install-rust-analyzer.cmd new file mode 100644 index 0000000..f204545 --- /dev/null +++ b/installer/install-rust-analyzer.cmd @@ -0,0 +1,5 @@ +@echo off + +curl -L -o rust-analyzer-windows.exe "https://github.com/rust-analyzer/rust-analyzer/releases/download/2020-02-18/rust-analyzer-windows.exe" + +move rust-analyzer-windows.exe rust-analyzer.exe diff --git a/installer/install-rust-analyzer.sh b/installer/install-rust-analyzer.sh new file mode 100755 index 0000000..fc0afb1 --- /dev/null +++ b/installer/install-rust-analyzer.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +set -e + +os=$(uname -s | tr "[:upper:]" "[:lower:]") + +case $os in +linux) + platform="linux" + ;; +darwin) + platform="mac" + ;; +esac + +version="2020-02-18" +curl -L -o ra_lsp_server-$platform "https://github.com/rust-analyzer/rust-analyzer/releases/download/$version/rust-analyzer-$platform" + +mv rust-analyzer-$platform rust-analyzer +chmod +x rust-analyzer diff --git a/settings.json b/settings.json index 7847d2b..7d0c068 100644 --- a/settings.json +++ b/settings.json @@ -466,6 +466,10 @@ "command": "rls", "requires": [] }, + { + "command": "rust-analyzer", + "requires": [] + }, { "command": "ra_lsp_server", "requires": [] diff --git a/settings/rust-analyzer.vim b/settings/rust-analyzer.vim new file mode 100644 index 0000000..d07fc1c --- /dev/null +++ b/settings/rust-analyzer.vim @@ -0,0 +1,13 @@ +augroup vimlsp_settings_rust-analyzer + au! + LspRegisterServer { + \ 'name': 'rust-analyzer', + \ 'cmd': {server_info->lsp_settings#get('rust-analyzer', 'cmd', [lsp_settings#exec_path('rust-analyzer')])}, + \ 'root_uri':{server_info->lsp_settings#get('rust-analyzer', 'root_uri', lsp_settings#root_uri(['Cargo.toml']))}, + \ 'initialization_options': lsp_settings#get('rust-analyzer', 'initialization_options', v:null), + \ 'whitelist': lsp_settings#get('rust-analyzer', 'whitelist', ['rust']), + \ 'blacklist': lsp_settings#get('rust-analyzer', 'blacklist', []), + \ 'config': lsp_settings#get('rust-analyzer', 'config', lsp_settings#server_config('rust-analyzer')), + \ 'workspace_config': lsp_settings#get('rust-analyzer', 'workspace_config', {}), + \ } +augroup END -- cgit v1.2.3-54-g00ecf From 065558f9898fe96d2cd6afbdba96bb24fe22b6d3 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Tue, 18 Feb 2020 22:09:36 +0900 Subject: Add sqls --- installer/install-sqls.cmd | 3 +++ installer/install-sqls.sh | 5 +++++ settings.json | 3 +++ settings/sqls.vim | 13 +++++++++++++ 4 files changed, 24 insertions(+) create mode 100644 installer/install-sqls.cmd create mode 100755 installer/install-sqls.sh create mode 100644 settings/sqls.vim diff --git a/installer/install-sqls.cmd b/installer/install-sqls.cmd new file mode 100644 index 0000000..f649037 --- /dev/null +++ b/installer/install-sqls.cmd @@ -0,0 +1,3 @@ +@echo off + +call "%~dp0\go_install.cmd" github.com/lighttiger2505/sqls diff --git a/installer/install-sqls.sh b/installer/install-sqls.sh new file mode 100755 index 0000000..03f4628 --- /dev/null +++ b/installer/install-sqls.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -e + +"$(dirname "$0")/go_install.sh" github.com/lighttiger2505/sqls diff --git a/settings.json b/settings.json index 046f307..b132865 100644 --- a/settings.json +++ b/settings.json @@ -497,6 +497,9 @@ ] }, { + "config": { + "refresh_pattern": "\\( \\zs\\k*\\|[a-zA-Z0-9_-]\\+\\)$" + }, "command": "sqls", "requires": [ "go" diff --git a/settings/sqls.vim b/settings/sqls.vim new file mode 100644 index 0000000..a80e6ab --- /dev/null +++ b/settings/sqls.vim @@ -0,0 +1,13 @@ +augroup vimlsp_settings_sqls + au! + LspRegisterServer { + \ 'name': 'sqls', + \ 'cmd': {server_info->lsp_settings#get('sqls', 'cmd', [lsp_settings#exec_path('sqls')])}, + \ 'root_uri':{server_info->lsp_settings#get('sqls', 'root_uri', lsp_settings#root_uri())}, + \ 'initialization_options': lsp_settings#get('sqls', 'initialization_options', v:null), + \ 'whitelist': lsp_settings#get('sqls', 'whitelist', ['sql']), + \ 'blacklist': lsp_settings#get('sqls', 'blacklist', []), + \ 'config': lsp_settings#get('sqls', 'config', lsp_settings#server_config('sqls')), + \ 'workspace_config': lsp_settings#get('sqls', 'workspace_config', {}), + \ } +augroup END -- cgit v1.2.3-54-g00ecf From f0a6c9bdaa9c50a058ecc15466ff6e6f6577d482 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Thu, 20 Feb 2020 00:08:29 +0900 Subject: Move patterns --- settings.json | 90 +++++++++++++++++++++++++++++++-- settings/clojure-lsp.vim | 2 +- settings/eclipse-jdt-ls.vim | 2 +- settings/elm-language-server.vim | 2 +- settings/erlang-ls.vim | 2 +- settings/eslint-language-server.vim | 2 +- settings/gopls.vim | 2 +- settings/gql-language-server.vim | 2 +- settings/groovy-language-server.vim | 2 +- settings/metals.vim | 2 +- settings/ra_lsp_server.vim | 2 +- settings/reason-language-server.vim | 2 +- settings/rls.vim | 2 +- settings/sourcekit-lsp.vim | 2 +- settings/typescript-language-server.vim | 2 +- settings/vim-language-server.vim | 2 +- settings/vls.vim | 2 +- 17 files changed, 101 insertions(+), 21 deletions(-) diff --git a/settings.json b/settings.json index 7847d2b..943d849 100644 --- a/settings.json +++ b/settings.json @@ -36,7 +36,14 @@ "clojure": [ { "command": "clojure-lsp", - "requires": [] + "requires": [], + "root_uri_patterns": [ + ".lein/", + ".shadow-cljs/", + "project.clj", + "deps.edn", + "shadow-cljs.edn" + ] } ], "cobol": [ @@ -115,6 +122,9 @@ "requires": [ "npm" ], + "root_uri_patterns": [ + "elm.json" + ], "vim-plugin": { "extensions": [ "elm" @@ -130,6 +140,9 @@ "make", "rebar3" ], + "root_uri_patterns": [ + "rebar.config" + ], "vim-plugin": { "extensions": [ "erl" @@ -190,6 +203,9 @@ "command": "gopls", "requires": [ "go" + ], + "root_uri_patterns": [ + "go.mod" ] } ], @@ -199,6 +215,11 @@ "requires": [ "npm", "watchman" + ], + "root_uri_patterns": [ + "package.json", + "tsconfig.json", + ".gqlconfig" ] } ], @@ -207,6 +228,9 @@ "command": "groovy-language-server", "requires": [ "java" + ], + "root_uri_patterns": [ + "build.gradle" ] } ], @@ -226,6 +250,10 @@ "command": "eclipse-jdt-ls", "requires": [ "java" + ], + "root_uri_patterns": [ + "pom.xml", + "build.gradle" ] } ], @@ -234,6 +262,10 @@ "command": "typescript-language-server", "requires": [ "npm" + ], + "root_uri_patterns": [ + "package.json", + "tsconfig.json" ] }, { @@ -245,7 +277,12 @@ { "command": "eslint-language-server", "requires": [ - "git", "npm" + "git", + "npm" + ], + "root_uri_patterns": [ + "package.json", + "tsconfig.json" ] } ], @@ -254,6 +291,10 @@ "command": "typescript-language-server", "requires": [ "npm" + ], + "root_uri_patterns": [ + "package.json", + "tsconfig.json" ] }, { @@ -444,6 +485,9 @@ { "command": "reason-language-server", "requires": [], + "root_uri_patterns": [ + "package.json" + ], "vim-plugin": { "extensions": [ "re", @@ -464,11 +508,17 @@ "rust": [ { "command": "rls", - "requires": [] + "requires": [], + "root_uri_patterns": [ + "Cargo.toml" + ] }, { "command": "ra_lsp_server", - "requires": [] + "requires": [], + "root_uri_patterns": [ + "Cargo.toml" + ] } ], "sass": [ @@ -484,6 +534,9 @@ "command": "metals", "requires": [ "java" + ], + "root_uri_patterns": [ + "build.sbt" ] } ], @@ -515,6 +568,13 @@ "requires": [ "sourcekit-lsp" ], + "root_uri_patterns": [ + "Package.swift", + ".xcodeproj", + ".xcworkspace", + "Cartfile", + "Podfile" + ], "vim-plugin": { "extensions": [ "swift" @@ -559,12 +619,21 @@ "command": "typescript-language-server", "requires": [ "npm" + ], + "root_uri_patterns": [ + "package.json", + "tsconfig.json" ] }, { "command": "eslint-language-server", "requires": [ - "git", "npm" + "git", + "npm" + ], + "root_uri_patterns": [ + "package.json", + "tsconfig.json" ] } ], @@ -573,6 +642,10 @@ "command": "typescript-language-server", "requires": [ "npm" + ], + "root_uri_patterns": [ + "package.json", + "tsconfig.json" ] } ], @@ -581,6 +654,10 @@ "command": "vim-language-server", "requires": [ "npm" + ], + "root_uri_patterns": [ + ".vim/", + "vimfiles/" ] } ], @@ -590,6 +667,9 @@ "requires": [ "npm" ], + "root_uri_patterns": [ + "package.json" + ], "vim-plugin": { "extensions": [ "vue" diff --git a/settings/clojure-lsp.vim b/settings/clojure-lsp.vim index ae431dc..8072295 100644 --- a/settings/clojure-lsp.vim +++ b/settings/clojure-lsp.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_clojure_lsp LspRegisterServer { \ 'name': 'clojure-lsp', \ 'cmd': {server_info->lsp_settings#get('clojure-lsp', 'cmd', [lsp_settings#exec_path('clojure-lsp')])}, - \ 'root_uri':{server_info->lsp_settings#get('clojure-lsp', 'root_uri', lsp_settings#root_uri(['.lein/', '.shadow-cljs/', 'project.clj', 'deps.edn', 'shadow-cljs.edn']))}, + \ 'root_uri':{server_info->lsp_settings#get('clojure-lsp', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('clojure-lsp', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('clojure-lsp', 'whitelist', ['clojure']), \ 'blacklist': lsp_settings#get('clojure-lsp', 'blacklist', []), diff --git a/settings/eclipse-jdt-ls.vim b/settings/eclipse-jdt-ls.vim index 2577cdc..b9610df 100644 --- a/settings/eclipse-jdt-ls.vim +++ b/settings/eclipse-jdt-ls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_eclipse_jdt_ls LspRegisterServer { \ 'name': 'eclipse-jdt-ls', \ 'cmd': {server_info->lsp_settings#get('eclipse-jdt-ls', 'cmd', [lsp_settings#exec_path('eclipse-jdt-ls')])}, - \ 'root_uri':{server_info->lsp_settings#get('eclipse-jdt-ls', 'root_uri', lsp_settings#root_uri(['pom.xml', 'build.gradle']))}, + \ 'root_uri':{server_info->lsp_settings#get('eclipse-jdt-ls', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('eclipse-jdt-ls', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('eclipse-jdt-ls', 'whitelist', ['java']), \ 'blacklist': lsp_settings#get('eclipse-jdt-ls', 'blacklist', []), diff --git a/settings/elm-language-server.vim b/settings/elm-language-server.vim index 709d02b..b8026e3 100644 --- a/settings/elm-language-server.vim +++ b/settings/elm-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_elm_language_server LspRegisterServer { \ 'name': 'elm-language-server', \ 'cmd': {server_info->lsp_settings#get('elm-language-server', 'cmd', [lsp_settings#exec_path('elm-language-server')])}, - \ 'root_uri':{server_info->lsp_settings#get('elm-language-server', 'root_uri', lsp_settings#root_uri(['elm.json']))}, + \ 'root_uri':{server_info->lsp_settings#get('elm-language-server', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('elm-language-server', 'initialization_options', {'elmPath': 'elm', 'runtime': 'node', 'elmFormatPath': 'elm-format', 'elmTestPath': 'elm-test'}), \ 'whitelist': lsp_settings#get('elm-language-server', 'whitelist', ['elm', 'elm.tsx']), \ 'blacklist': lsp_settings#get('elm-language-server', 'blacklist', []), diff --git a/settings/erlang-ls.vim b/settings/erlang-ls.vim index 8239d6b..d4b7c64 100644 --- a/settings/erlang-ls.vim +++ b/settings/erlang-ls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_erlang_ls LspRegisterServer { \ 'name': 'erlang-ls', \ 'cmd': {server_info->lsp_settings#get('erlang-ls', 'cmd', [lsp_settings#exec_path('erlang-ls'), '--transport', 'stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('erlang-ls', 'root_uri', lsp_settings#root_uri(['rebar.config']))}, + \ 'root_uri':{server_info->lsp_settings#get('erlang-ls', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('erlang-ls', 'initialization_options', {}), \ 'whitelist': lsp_settings#get('erlang-ls', 'whitelist', ['erlang']), \ 'blacklist': lsp_settings#get('erlang-ls', 'blacklist', []), diff --git a/settings/eslint-language-server.vim b/settings/eslint-language-server.vim index eed9082..a469204 100644 --- a/settings/eslint-language-server.vim +++ b/settings/eslint-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_eslint_language_server LspRegisterServer { \ 'name': 'eslint-language-server', \ 'cmd': {server_info->lsp_settings#get('eslint-language-server', 'cmd', [lsp_settings#exec_path('eslint-language-server'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('eslint-language-server', 'root_uri', lsp_settings#root_uri(['package.json', 'tsconfig.json']))}, + \ 'root_uri':{server_info->lsp_settings#get('eslint-language-server', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('eslint-language-server', 'initialization_options', {'diagnostics': 'true'}), \ 'whitelist': lsp_settings#get('eslint-language-server', 'whitelist', ['javascript', 'javascriptreact', 'typescript', 'typescriptreact', 'typescript.tsx']), \ 'blacklist': lsp_settings#get('eslint-language-server', 'blacklist', []), diff --git a/settings/gopls.vim b/settings/gopls.vim index ef16622..9a7481e 100644 --- a/settings/gopls.vim +++ b/settings/gopls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_gopls LspRegisterServer { \ 'name': 'gopls', \ 'cmd': {server_info->lsp_settings#get('gopls', 'cmd', [lsp_settings#exec_path('gopls')])}, - \ 'root_uri':{server_info->lsp_settings#get('gopls', 'root_uri', lsp_settings#root_uri(['go.mod']))}, + \ 'root_uri':{server_info->lsp_settings#get('gopls', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('gopls', 'initialization_options', {"diagnostics": v:true, 'completeUnimported': v:true, 'matcher': 'fuzzy'}), \ 'whitelist': lsp_settings#get('gopls', 'whitelist', ['go']), \ 'blacklist': lsp_settings#get('gopls', 'blacklist', []), diff --git a/settings/gql-language-server.vim b/settings/gql-language-server.vim index 2fd42e2..dfe6d01 100644 --- a/settings/gql-language-server.vim +++ b/settings/gql-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_gql_language_server LspRegisterServer { \ 'name': 'gql-language-server', \ 'cmd': {server_info->lsp_settings#get('gql-language-server', 'cmd', [lsp_settings#exec_path('gql-language-server'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('gql-language-server', 'root_uri', lsp_settings#root_uri(['package.json', 'tsconfig.json', '.gqlconfig']))}, + \ 'root_uri':{server_info->lsp_settings#get('gql-language-server', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('gql-language-server', 'initialization_options', {'diagnostics': 'true'}), \ 'whitelist': lsp_settings#get('gql-language-server', 'whitelist', ['graphql']), \ 'blacklist': lsp_settings#get('gql-language-server', 'blacklist', []), diff --git a/settings/groovy-language-server.vim b/settings/groovy-language-server.vim index f642e45..b4a31f2 100644 --- a/settings/groovy-language-server.vim +++ b/settings/groovy-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_groovy_language_server LspRegisterServer { \ 'name': 'groovy-language-server', \ 'cmd': {server_info->lsp_settings#get('groovy-language-server', 'cmd', [lsp_settings#exec_path('groovy-language-server')])}, - \ 'root_uri':{server_info->lsp_settings#get('groovy-language-server', 'root_uri', lsp_settings#root_uri(['build.gradle']))}, + \ 'root_uri':{server_info->lsp_settings#get('groovy-language-server', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('groovy-language-server', 'initialization_options', {}), \ 'whitelist': lsp_settings#get('groovy-language-server', 'whitelist', ['groovy']), \ 'blacklist': lsp_settings#get('groovy-language-server', 'blacklist', []), diff --git a/settings/metals.vim b/settings/metals.vim index bf11930..18e53bd 100644 --- a/settings/metals.vim +++ b/settings/metals.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_metals LspRegisterServer { \ 'name': 'metals', \ 'cmd': {server_info->lsp_settings#get('metals', 'cmd', [lsp_settings#exec_path('metals')])}, - \ 'root_uri':{server_info->lsp_settings#get('metals', 'root_uri', lsp_settings#root_uri(['build.sbt']))}, + \ 'root_uri':{server_info->lsp_settings#get('metals', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('metals', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('metals', 'whitelist', ['scala', 'sbt']), \ 'blacklist': lsp_settings#get('metals', 'blacklist', []), diff --git a/settings/ra_lsp_server.vim b/settings/ra_lsp_server.vim index 005c06b..b4e4e87 100644 --- a/settings/ra_lsp_server.vim +++ b/settings/ra_lsp_server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_ra_lsp_server LspRegisterServer { \ 'name': 'ra_lsp_server', \ 'cmd': {server_info->lsp_settings#get('ra_lsp_server', 'cmd', [lsp_settings#exec_path('ra_lsp_server')])}, - \ 'root_uri':{server_info->lsp_settings#get('ra_lsp_server', 'root_uri', lsp_settings#root_uri(['Cargo.toml']))}, + \ 'root_uri':{server_info->lsp_settings#get('ra_lsp_server', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('ra_lsp_server', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('ra_lsp_server', 'whitelist', ['rust']), \ 'blacklist': lsp_settings#get('ra_lsp_server', 'blacklist', []), diff --git a/settings/reason-language-server.vim b/settings/reason-language-server.vim index 9e9f778..9bdbe4c 100644 --- a/settings/reason-language-server.vim +++ b/settings/reason-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_reason_language_server LspRegisterServer { \ 'name': 'reason-language-server', \ 'cmd': {server_info->lsp_settings#get('reason-language-server', 'cmd', [lsp_settings#exec_path('reason-language-server')])}, - \ 'root_uri':{server_info->lsp_settings#get('reason-language-server', 'root_uri', lsp_settings#root_uri(['package.json']))}, + \ 'root_uri':{server_info->lsp_settings#get('reason-language-server', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('reason-language-server', 'initialization_options', {}), \ 'whitelist': lsp_settings#get('reason-language-server', 'whitelist', ['reason']), \ 'blacklist': lsp_settings#get('reason-language-server', 'blacklist', []), diff --git a/settings/rls.vim b/settings/rls.vim index 6e87086..22aba06 100644 --- a/settings/rls.vim +++ b/settings/rls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_rls LspRegisterServer { \ 'name': 'rls', \ 'cmd': {server_info->lsp_settings#get('rls', 'cmd', [lsp_settings#exec_path('rls')])}, - \ 'root_uri':{server_info->lsp_settings#get('rls', 'root_uri', lsp_settings#root_uri(['Cargo.toml']))}, + \ 'root_uri':{server_info->lsp_settings#get('rls', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('rls', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('rls', 'whitelist', ['rust']), \ 'blacklist': lsp_settings#get('rls', 'blacklist', []), diff --git a/settings/sourcekit-lsp.vim b/settings/sourcekit-lsp.vim index fcbbf1f..df4c9fc 100644 --- a/settings/sourcekit-lsp.vim +++ b/settings/sourcekit-lsp.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_sourcekit_lsp LspRegisterServer { \ 'name': 'sourcekit-lsp', \ 'cmd': {server_info->lsp_settings#get('sourcekit-lsp', 'cmd', [lsp_settings#exec_path('sourcekit-lsp')])}, - \ 'root_uri':{server_info->lsp_settings#get('sourcekit-lsp', 'root_uri', lsp_settings#root_uri(['Package.swift', '.xcodeproj', '.xcworkspace', 'Cartfile', 'Podfile']))}, + \ 'root_uri':{server_info->lsp_settings#get('sourcekit-lsp', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('sourcekit-lsp', 'initialization_options', {}), \ 'whitelist': lsp_settings#get('sourcekit-lsp', 'whitelist', ['swift']), \ 'blacklist': lsp_settings#get('sourcekit-lsp', 'blacklist', []), diff --git a/settings/typescript-language-server.vim b/settings/typescript-language-server.vim index e02fb31..634f3a1 100644 --- a/settings/typescript-language-server.vim +++ b/settings/typescript-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_typescript_language_server LspRegisterServer { \ 'name': 'typescript-language-server', \ 'cmd': {server_info->lsp_settings#get('typescript-language-server', 'cmd', [lsp_settings#exec_path('typescript-language-server'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('typescript-language-server', 'root_uri', lsp_settings#root_uri(['package.json', 'tsconfig.json']))}, + \ 'root_uri':{server_info->lsp_settings#get('typescript-language-server', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('typescript-language-server', 'initialization_options', {'diagnostics': 'true'}), \ 'whitelist': lsp_settings#get('typescript-language-server', 'whitelist', ['javascript', 'javascriptreact', 'typescript', 'typescriptreact', 'typescript.tsx']), \ 'blacklist': lsp_settings#get('typescript-language-server', 'blacklist', []), diff --git a/settings/vim-language-server.vim b/settings/vim-language-server.vim index 986b36e..58b2f8d 100644 --- a/settings/vim-language-server.vim +++ b/settings/vim-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_vim_language_server LspRegisterServer { \ 'name': 'vim-language-server', \ 'cmd': {server_info->lsp_settings#get('vim-language-server', 'cmd', [lsp_settings#exec_path('vim-language-server'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('vim-language-server', 'root_uri', lsp_settings#root_uri(['.vim/', 'vimfiles/']))}, + \ 'root_uri':{server_info->lsp_settings#get('vim-language-server', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': extend({'vimruntime': $VIMRUNTIME, 'runtimepath': &rtp}, lsp_settings#get('vim-language-server', 'initialization_options', {}), 'force'), \ 'whitelist': lsp_settings#get('vim-language-server', 'whitelist', ['vim']), \ 'blacklist': lsp_settings#get('vimbash-language-server', 'blacklist', []), diff --git a/settings/vls.vim b/settings/vls.vim index c9575af..e3e960f 100644 --- a/settings/vls.vim +++ b/settings/vls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_vls LspRegisterServer { \ 'name': 'vls', \ 'cmd': {server_info->lsp_settings#get('vls', 'cmd', [lsp_settings#exec_path('vls'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('vls', 'root_uri', lsp_settings#root_uri(['package.json']))}, + \ 'root_uri':{server_info->lsp_settings#get('vls', 'root_uri', lsp_settings#root_uri())}, \ 'initialization_options': lsp_settings#get('vls', 'initialization_options', {'config': {'vetur': {'useWorkspaceDependencies': v:false, 'validation': {'template': v:true, 'style': v:true, 'script': v:true}, 'completion': {'autoImport': v:false, 'useScaffoldSnippets': v:false, 'tagCasing': 'kebab'}, 'format': {'defaultFormatter': {'js': '', 'ts': ''}, 'defaultFormatterOptions': {}, 'scriptInitialIndent': v:false, 'styleInitialIndent': v:false}, 'dev': {'logLevel': 'DEBUG'}}, 'css': {}, 'html': {'suggest': {}}, 'javascript': {'format': {}}, 'typescript': {'format': {}}, 'emmet': {}, 'stylusSupremacy': {}}}), \ 'whitelist': lsp_settings#get('vls', 'whitelist', ['vue']), \ 'blacklist': lsp_settings#get('vls', 'blacklist', []), -- cgit v1.2.3-54-g00ecf From e55fa57320b284eb38392a5e57b2edee27d966a5 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Thu, 20 Feb 2020 00:14:47 +0900 Subject: root_uri patterns should be configurable --- autoload/lsp_settings.vim | 15 ++++++++++++--- settings.json | 7 +++++-- settings/analysis-server-dart-snapshot.vim | 2 +- settings/apex-jorje-lsp.vim | 2 +- settings/bash-language-server.vim | 2 +- settings/cl-lsp.vim | 2 +- settings/clangd.vim | 2 +- settings/clojure-lsp.vim | 2 +- settings/cobol-language-support.vim | 2 +- settings/css-languageserver.vim | 2 +- settings/digestif.vim | 2 +- settings/dls.vim | 2 +- settings/docker-langserver.vim | 2 +- settings/eclipse-jdt-ls.vim | 2 +- settings/efm-langserver.vim | 2 +- settings/elixir-ls.vim | 2 +- settings/elm-language-server.vim | 2 +- settings/emmylua-ls.vim | 2 +- settings/erlang-ls.vim | 2 +- settings/eslint-language-server.vim | 2 +- settings/fortls.vim | 2 +- settings/fsautocomplete.vim | 2 +- settings/fsharp-language-server.vim | 2 +- settings/glslls.vim | 2 +- settings/gopls.vim | 2 +- settings/gql-language-server.vim | 2 +- settings/groovy-language-server.vim | 2 +- settings/html-languageserver.vim | 2 +- settings/intelephense.vim | 2 +- settings/javascript-typescript-stdio.vim | 2 +- settings/json-languageserver.vim | 2 +- settings/julia-language-server.vim | 2 +- settings/kotlin-language-server.vim | 2 +- settings/lsp4xml.vim | 2 +- settings/metals.vim | 2 +- settings/monastery.vim | 2 +- settings/nimlsp.vim | 2 +- settings/omnisharp-lsp.vim | 2 +- settings/perl-languageserver.vim | 2 +- settings/powershell-languageserver.vim | 2 +- settings/pyls-ms.vim | 2 +- settings/pyls.vim | 2 +- settings/r-languageserver.vim | 2 +- settings/ra_lsp_server.vim | 2 +- settings/reason-language-server.vim | 2 +- settings/rls.vim | 2 +- settings/rust-analyzer.vim | 2 +- settings/slp.vim | 2 +- settings/solargraph.vim | 2 +- settings/sourcekit-lsp.vim | 2 +- settings/sql-language-server.vim | 2 +- settings/sqls.vim | 2 +- settings/svls.vim | 2 +- settings/terraform-lsp.vim | 2 +- settings/texlab.vim | 2 +- settings/typescript-language-server.vim | 2 +- settings/vim-language-server.vim | 2 +- settings/vls.vim | 2 +- settings/yaml-language-server.vim | 2 +- 59 files changed, 74 insertions(+), 62 deletions(-) diff --git a/autoload/lsp_settings.vim b/autoload/lsp_settings.vim index f1b163e..9183069 100644 --- a/autoload/lsp_settings.vim +++ b/autoload/lsp_settings.vim @@ -168,13 +168,22 @@ function! lsp_settings#exec_path(cmd) abort return '' endfunction -function! lsp_settings#root_path(...) abort +function! lsp_settings#root_path(name) abort let l:patterns = get(a:000, 0, []) return lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), extend(l:patterns, g:lsp_settings_root_markers)) endfunction -function! lsp_settings#root_uri(...) abort - let l:patterns = get(a:000, 0, []) +function! lsp_settings#root_uri(name) abort + let l:patterns = [] + for l:ft in sort(keys(s:settings)) + for l:conf in s:settings[l:ft] + if l:conf.command ==# a:name && has_key(l:conf, 'root_uri_patterns') + let l:patterns = l:conf['root_uri_patterns'] + break + endif + endfor + endfor + let l:dir = lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), extend(l:patterns, g:lsp_settings_root_markers)) if empty(l:dir) return lsp#utils#get_default_root_uri() diff --git a/settings.json b/settings.json index c32a18c..c3eb7fb 100644 --- a/settings.json +++ b/settings.json @@ -515,7 +515,10 @@ }, { "command": "rust-analyzer", - "requires": [] + "requires": [], + "root_uri_patterns": [ + "Cargo.toml" + ] }, { "command": "ra_lsp_server", @@ -560,10 +563,10 @@ ] }, { + "command": "sqls", "config": { "refresh_pattern": "\\( \\zs\\k*\\|[a-zA-Z0-9_-]\\+\\)$" }, - "command": "sqls", "requires": [ "go" ] diff --git a/settings/analysis-server-dart-snapshot.vim b/settings/analysis-server-dart-snapshot.vim index 239fea8..7b58cc2 100644 --- a/settings/analysis-server-dart-snapshot.vim +++ b/settings/analysis-server-dart-snapshot.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_analysis_server_dart_snapshot LspRegisterServer { \ 'name': 'analysis-server-dart-snapshot', \ 'cmd': {server_info->lsp_settings#get('analysis-server-dart-snapshot', 'cmd', [lsp_settings#exec_path('analysis-server-dart-snapshot')])}, - \ 'root_uri':{server_info->lsp_settings#get('analysis-server-dart-snapshot', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('analysis-server-dart-snapshot', 'root_uri', lsp_settings#root_uri('analysis-server-dart-snapshot'))}, \ 'initialization_options': lsp_settings#get('analysis-server-dart-snapshot', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('analysis-server-dart-snapshot', 'whitelist', ['dart']), \ 'blacklist': lsp_settings#get('analysis-server-dart-snapshot', 'blacklist', []), diff --git a/settings/apex-jorje-lsp.vim b/settings/apex-jorje-lsp.vim index ce4e400..3c99894 100644 --- a/settings/apex-jorje-lsp.vim +++ b/settings/apex-jorje-lsp.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_apex_jorje_lsp LspRegisterServer { \ 'name': 'apex-jorje-lsp', \ 'cmd': {server_info->lsp_settings#get('apex-jorje-lsp', 'cmd', [lsp_settings#exec_path('apex-jorje-lsp')])}, - \ 'root_uri':{server_info->lsp_settings#get('apex-jorje-lsp', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('apex-jorje-lsp', 'root_uri', lsp_settings#root_uri('apex-jorje-lsp'))}, \ 'initialization_options': lsp_settings#get('apex-jorje-lsp', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('apex-jorje-lsp', 'whitelist', ['apex']), \ 'blacklist': lsp_settings#get('apex-jorje-lsp', 'blacklist', []), diff --git a/settings/bash-language-server.vim b/settings/bash-language-server.vim index 9eaa214..3f0673f 100644 --- a/settings/bash-language-server.vim +++ b/settings/bash-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_bash_language_server LspRegisterServer { \ 'name': 'bash-language-server', \ 'cmd': {server_info->lsp_settings#get('bash-language-server', 'cmd', [lsp_settings#exec_path('bash-language-server'), 'start'])}, - \ 'root_uri':{server_info->lsp_settings#get('bash-language-server', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('bash-language-server', 'root_uri', lsp_settings#root_uri('bash-language-server'))}, \ 'initialization_options': lsp_settings#get('bash-language-server', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('bash-language-server', 'whitelist', ['sh']), \ 'blacklist': lsp_settings#get('bash-language-server', 'blacklist', []), diff --git a/settings/cl-lsp.vim b/settings/cl-lsp.vim index 5a46294..ba7a44d 100644 --- a/settings/cl-lsp.vim +++ b/settings/cl-lsp.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_cl_lsp LspRegisterServer { \ 'name': 'cl-lsp', \ 'cmd': {server_info->lsp_settings#get('cl-lsp', 'cmd', {key, name-> ['ros', '-Q', '--', trim(filter(systemlist('ros version'), 'v:val=~"^homedir"')[0][8:], '"''') . '/bin/cl-lsp', 'stdio']})}, - \ 'root_uri':{server_info->lsp_settings#get('cl-lsp', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('cl-lsp', 'root_uri', lsp_settings#root_uri('cl-lsp'))}, \ 'initialization_options': lsp_settings#get('cl-lsp', 'initialization_options', {}), \ 'whitelist': lsp_settings#get('cl-lsp', 'whitelist', ['lisp']), \ 'blacklist': lsp_settings#get('cl-lsp', 'blacklist', []), diff --git a/settings/clangd.vim b/settings/clangd.vim index b87bfcc..10f386e 100644 --- a/settings/clangd.vim +++ b/settings/clangd.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_clangd LspRegisterServer { \ 'name': 'clangd', \ 'cmd': {server_info->lsp_settings#get('clangd', 'cmd', [lsp_settings#exec_path('clangd')])}, - \ 'root_uri':{server_info->lsp_settings#get('clangd', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('clangd', 'root_uri', lsp_settings#root_uri('clangd'))}, \ 'initialization_options': lsp_settings#get('clangd', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('clangd', 'whitelist', ['c', 'cpp', 'objc', 'objcpp']), \ 'blacklist': lsp_settings#get('clangd', 'blacklist', []), diff --git a/settings/clojure-lsp.vim b/settings/clojure-lsp.vim index 8072295..0c095a9 100644 --- a/settings/clojure-lsp.vim +++ b/settings/clojure-lsp.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_clojure_lsp LspRegisterServer { \ 'name': 'clojure-lsp', \ 'cmd': {server_info->lsp_settings#get('clojure-lsp', 'cmd', [lsp_settings#exec_path('clojure-lsp')])}, - \ 'root_uri':{server_info->lsp_settings#get('clojure-lsp', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('clojure-lsp', 'root_uri', lsp_settings#root_uri('clojure-lsp'))}, \ 'initialization_options': lsp_settings#get('clojure-lsp', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('clojure-lsp', 'whitelist', ['clojure']), \ 'blacklist': lsp_settings#get('clojure-lsp', 'blacklist', []), diff --git a/settings/cobol-language-support.vim b/settings/cobol-language-support.vim index 9f0977e..181fcf8 100644 --- a/settings/cobol-language-support.vim +++ b/settings/cobol-language-support.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_cobol_language_support LspRegisterServer { \ 'name': 'cobol-language-support', \ 'cmd': {server_info->lsp_settings#get('cobol-language-support', 'cmd', [lsp_settings#exec_path('cobol-language-support')])}, - \ 'root_uri':{server_info->lsp_settings#get('cobol-language-server', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('cobol-language-server', 'root_uri', lsp_settings#root_uri('cobol-language-support'))}, \ 'initialization_options': lsp_settings#get('cobol-language-support', 'initialization_options', {}), \ 'whitelist': lsp_settings#get('cobol-language-support', 'whitelist', ['cobol']), \ 'blacklist': lsp_settings#get('cobol-language-support', 'blacklist', []), diff --git a/settings/css-languageserver.vim b/settings/css-languageserver.vim index 9bab50d..c5f7a0b 100644 --- a/settings/css-languageserver.vim +++ b/settings/css-languageserver.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_css_languageserver LspRegisterServer { \ 'name': 'css-languageserver', \ 'cmd': {server_info->lsp_settings#get('css-languageserver', 'cmd', [lsp_settings#exec_path('css-languageserver'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('css-languageserver', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('css-languageserver', 'root_uri', lsp_settings#root_uri('css-languageserver'))}, \ 'initialization_options': lsp_settings#get('css-languageserver', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('css-languageserver', 'whitelist', ['css', 'less', 'sass']), \ 'blacklist': lsp_settings#get('css-languageserver', 'blacklist', []), diff --git a/settings/digestif.vim b/settings/digestif.vim index 7b4f7d0..7271cd7 100644 --- a/settings/digestif.vim +++ b/settings/digestif.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_digestif LspRegisterServer { \ 'name': 'digestif', \ 'cmd': {server_info->lsp_settings#get('digestif', 'cmd', [lsp_settings#exec_path('digestif')])}, - \ 'root_uri':{server_info->lsp_settings#get('digestif', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('digestif', 'root_uri', lsp_settings#root_uri('digestif'))}, \ 'initialization_options': lsp_settings#get('digestif', 'initialization_options', {'diagnostics': 'true'}), \ 'whitelist': lsp_settings#get('digestif', 'whitelist', ['plaintex', 'tex']), \ 'blacklist': lsp_settings#get('digestif', 'blacklist', []), diff --git a/settings/dls.vim b/settings/dls.vim index 6399c85..f59425a 100644 --- a/settings/dls.vim +++ b/settings/dls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_dls LspRegisterServer { \ 'name': 'dls', \ 'cmd': {server_info->lsp_settings#get('dls', 'cmd', [lsp_settings#exec_path('dls')])}, - \ 'root_uri':{server_info->lsp_settings#get('dls', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('dls', 'root_uri', lsp_settings#root_uri('dls'))}, \ 'initialization_options': lsp_settings#get('dls', 'initialization_options', {'diagnostics': 'true'}), \ 'whitelist': lsp_settings#get('dls', 'whitelist', ['d']), \ 'blacklist': lsp_settings#get('dls', 'blacklist', []), diff --git a/settings/docker-langserver.vim b/settings/docker-langserver.vim index c73ef1a..b6374f1 100644 --- a/settings/docker-langserver.vim +++ b/settings/docker-langserver.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_dockerfile_language_server_nodejs LspRegisterServer { \ 'name': 'docker-langserver', \ 'cmd': {server_info->lsp_settings#get('docker-langserver', 'cmd', [lsp_settings#exec_path('docker-langserver'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('docker-langserver', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('docker-langserver', 'root_uri', lsp_settings#root_uri('docker-langserver'))}, \ 'initialization_options': lsp_settings#get('docker-langserver', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('docker-langserver', 'whitelist', ['dockerfile']), \ 'blacklist': lsp_settings#get('docker-langserver', 'blacklist', []), diff --git a/settings/eclipse-jdt-ls.vim b/settings/eclipse-jdt-ls.vim index b9610df..6032f1c 100644 --- a/settings/eclipse-jdt-ls.vim +++ b/settings/eclipse-jdt-ls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_eclipse_jdt_ls LspRegisterServer { \ 'name': 'eclipse-jdt-ls', \ 'cmd': {server_info->lsp_settings#get('eclipse-jdt-ls', 'cmd', [lsp_settings#exec_path('eclipse-jdt-ls')])}, - \ 'root_uri':{server_info->lsp_settings#get('eclipse-jdt-ls', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('eclipse-jdt-ls', 'root_uri', lsp_settings#root_uri('eclipse-jdt-ls'))}, \ 'initialization_options': lsp_settings#get('eclipse-jdt-ls', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('eclipse-jdt-ls', 'whitelist', ['java']), \ 'blacklist': lsp_settings#get('eclipse-jdt-ls', 'blacklist', []), diff --git a/settings/efm-langserver.vim b/settings/efm-langserver.vim index 245fa8d..da90f20 100644 --- a/settings/efm-langserver.vim +++ b/settings/efm-langserver.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_efm_langserver LspRegisterServer { \ 'name': 'efm-langserver', \ 'cmd': {server_info->lsp_settings#get('efm-langserver', 'cmd', [lsp_settings#exec_path('efm-langserver')])}, - \ 'root_uri':{server_info->lsp_settings#get('efm-langserver', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('efm-langserver', 'root_uri', lsp_settings#root_uri('efm-langserver'))}, \ 'initialization_options': lsp_settings#get('efm-langserver', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('efm-langserver', 'whitelist', ['*']), \ 'blacklist': lsp_settings#get('efm-langserver', 'blacklist', []), diff --git a/settings/elixir-ls.vim b/settings/elixir-ls.vim index 28392b3..c01944a 100644 --- a/settings/elixir-ls.vim +++ b/settings/elixir-ls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_elixir_ls LspRegisterServer { \ 'name': 'elixir-ls', \ 'cmd': {server_info->lsp_settings#get('elixir-ls', 'cmd', [lsp_settings#exec_path('elixir-ls')])}, - \ 'root_uri':{server_info->lsp_settings#get('elixir-ls', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('elixir-ls', 'root_uri', lsp_settings#root_uri('elixir-ls'))}, \ 'initialization_options': lsp_settings#get('elixir-ls', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('elixir-ls', 'whitelist', ['elixir']), \ 'blacklist': lsp_settings#get('elixir-ls', 'blacklist', []), diff --git a/settings/elm-language-server.vim b/settings/elm-language-server.vim index b8026e3..0407f74 100644 --- a/settings/elm-language-server.vim +++ b/settings/elm-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_elm_language_server LspRegisterServer { \ 'name': 'elm-language-server', \ 'cmd': {server_info->lsp_settings#get('elm-language-server', 'cmd', [lsp_settings#exec_path('elm-language-server')])}, - \ 'root_uri':{server_info->lsp_settings#get('elm-language-server', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('elm-language-server', 'root_uri', lsp_settings#root_uri('elm-language-server'))}, \ 'initialization_options': lsp_settings#get('elm-language-server', 'initialization_options', {'elmPath': 'elm', 'runtime': 'node', 'elmFormatPath': 'elm-format', 'elmTestPath': 'elm-test'}), \ 'whitelist': lsp_settings#get('elm-language-server', 'whitelist', ['elm', 'elm.tsx']), \ 'blacklist': lsp_settings#get('elm-language-server', 'blacklist', []), diff --git a/settings/emmylua-ls.vim b/settings/emmylua-ls.vim index 2fd836a..624295a 100644 --- a/settings/emmylua-ls.vim +++ b/settings/emmylua-ls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_emmylua_ls LspRegisterServer { \ 'name': 'emmylua-ls', \ 'cmd': {server_info->lsp_settings#get('emmylua-ls', 'cmd', [lsp_settings#exec_path('emmylua-ls')])}, - \ 'root_uri':{server_info->lsp_settings#get('emmylua-ls', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('emmylua-ls', 'root_uri', lsp_settings#root_uri('emmylua-ls'))}, \ 'initialization_options': lsp_settings#get('emmylua-ls', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('emmylua-ls', 'whitelist', ['lua']), \ 'blacklist': lsp_settings#get('emmylua-ls', 'blacklist', []), diff --git a/settings/erlang-ls.vim b/settings/erlang-ls.vim index d4b7c64..7b4b3d8 100644 --- a/settings/erlang-ls.vim +++ b/settings/erlang-ls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_erlang_ls LspRegisterServer { \ 'name': 'erlang-ls', \ 'cmd': {server_info->lsp_settings#get('erlang-ls', 'cmd', [lsp_settings#exec_path('erlang-ls'), '--transport', 'stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('erlang-ls', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('erlang-ls', 'root_uri', lsp_settings#root_uri('erlang-ls'))}, \ 'initialization_options': lsp_settings#get('erlang-ls', 'initialization_options', {}), \ 'whitelist': lsp_settings#get('erlang-ls', 'whitelist', ['erlang']), \ 'blacklist': lsp_settings#get('erlang-ls', 'blacklist', []), diff --git a/settings/eslint-language-server.vim b/settings/eslint-language-server.vim index a469204..7377846 100644 --- a/settings/eslint-language-server.vim +++ b/settings/eslint-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_eslint_language_server LspRegisterServer { \ 'name': 'eslint-language-server', \ 'cmd': {server_info->lsp_settings#get('eslint-language-server', 'cmd', [lsp_settings#exec_path('eslint-language-server'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('eslint-language-server', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('eslint-language-server', 'root_uri', lsp_settings#root_uri('eslint-language-server'))}, \ 'initialization_options': lsp_settings#get('eslint-language-server', 'initialization_options', {'diagnostics': 'true'}), \ 'whitelist': lsp_settings#get('eslint-language-server', 'whitelist', ['javascript', 'javascriptreact', 'typescript', 'typescriptreact', 'typescript.tsx']), \ 'blacklist': lsp_settings#get('eslint-language-server', 'blacklist', []), diff --git a/settings/fortls.vim b/settings/fortls.vim index bc25d77..9d5220f 100644 --- a/settings/fortls.vim +++ b/settings/fortls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_fortls LspRegisterServer { \ 'name': 'fortls', \ 'cmd': {server_info->lsp_settings#get('fortls', 'cmd', [lsp_settings#exec_path('fortls')])}, - \ 'root_uri':{server_info->lsp_settings#get('fortls', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('fortls', 'root_uri', lsp_settings#root_uri('fortls'))}, \ 'initialization_options': lsp_settings#get('fortls', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('fortls', 'whitelist', ['fortran']), \ 'blacklist': lsp_settings#get('fortls', 'blacklist', []), diff --git a/settings/fsautocomplete.vim b/settings/fsautocomplete.vim index 7bbfe33..cac0525 100644 --- a/settings/fsautocomplete.vim +++ b/settings/fsautocomplete.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_fsautocomplete LspRegisterServer { \ 'name': 'fsautocomplete', \ 'cmd': {server_info->lsp_settings#get('fsautocomplete', 'cmd', [lsp_settings#exec_path('fsautocomplete'), '--background-service-enabled'])}, - \ 'root_uri':{server_info->lsp_settings#get('fsautocomplete', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('fsautocomplete', 'root_uri', lsp_settings#root_uri('fsautocomplete'))}, \ 'initialization_options': lsp_settings#get('fsautocomplete', 'initialization_options', {'AutomaticWorkspaceInit': v:true}), \ 'whitelist': lsp_settings#get('fsautocomplete', 'whitelist', ['fsharp']), \ 'blacklist': lsp_settings#get('fsautocomplete', 'blacklist', []), diff --git a/settings/fsharp-language-server.vim b/settings/fsharp-language-server.vim index e401802..19bbf6c 100644 --- a/settings/fsharp-language-server.vim +++ b/settings/fsharp-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_fsharp_language_server LspRegisterServer { \ 'name': 'fsharp-language-server', \ 'cmd': {server_info->lsp_settings#get('fsharp-language-server', 'cmd', [lsp_settings#exec_path('fsharp-language-server'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('fsharp-language-server', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('fsharp-language-server', 'root_uri', lsp_settings#root_uri('fsharp-language-server'))}, \ 'initialization_options': lsp_settings#get('fsharp-language-server', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('fsharp-language-server', 'whitelist', ['fsharp']), \ 'blacklist': lsp_settings#get('fsharp-language-server', 'blacklist', []), diff --git a/settings/glslls.vim b/settings/glslls.vim index 240fadc..6cbfa7f 100644 --- a/settings/glslls.vim +++ b/settings/glslls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_glslls LspRegisterServer { \ 'name': 'glslls', \ 'cmd': {server_info->lsp_settings#get('glslls', 'cmd', [lsp_settings#exec_path('glslls'), '--stdin'])}, - \ 'root_uri':{server_info->lsp_settings#get('glslls', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('glslls', 'root_uri', lsp_settings#root_uri('glslls'))}, \ 'initialization_options': lsp_settings#get('glslls', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('glslls', 'whitelist', ['glsl']), \ 'blacklist': lsp_settings#get('glslls', 'blacklist', []), diff --git a/settings/gopls.vim b/settings/gopls.vim index 9a7481e..91d2fc7 100644 --- a/settings/gopls.vim +++ b/settings/gopls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_gopls LspRegisterServer { \ 'name': 'gopls', \ 'cmd': {server_info->lsp_settings#get('gopls', 'cmd', [lsp_settings#exec_path('gopls')])}, - \ 'root_uri':{server_info->lsp_settings#get('gopls', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('gopls', 'root_uri', lsp_settings#root_uri('gopls'))}, \ 'initialization_options': lsp_settings#get('gopls', 'initialization_options', {"diagnostics": v:true, 'completeUnimported': v:true, 'matcher': 'fuzzy'}), \ 'whitelist': lsp_settings#get('gopls', 'whitelist', ['go']), \ 'blacklist': lsp_settings#get('gopls', 'blacklist', []), diff --git a/settings/gql-language-server.vim b/settings/gql-language-server.vim index dfe6d01..f99bb68 100644 --- a/settings/gql-language-server.vim +++ b/settings/gql-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_gql_language_server LspRegisterServer { \ 'name': 'gql-language-server', \ 'cmd': {server_info->lsp_settings#get('gql-language-server', 'cmd', [lsp_settings#exec_path('gql-language-server'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('gql-language-server', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('gql-language-server', 'root_uri', lsp_settings#root_uri('gql-language-server'))}, \ 'initialization_options': lsp_settings#get('gql-language-server', 'initialization_options', {'diagnostics': 'true'}), \ 'whitelist': lsp_settings#get('gql-language-server', 'whitelist', ['graphql']), \ 'blacklist': lsp_settings#get('gql-language-server', 'blacklist', []), diff --git a/settings/groovy-language-server.vim b/settings/groovy-language-server.vim index b4a31f2..c341c77 100644 --- a/settings/groovy-language-server.vim +++ b/settings/groovy-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_groovy_language_server LspRegisterServer { \ 'name': 'groovy-language-server', \ 'cmd': {server_info->lsp_settings#get('groovy-language-server', 'cmd', [lsp_settings#exec_path('groovy-language-server')])}, - \ 'root_uri':{server_info->lsp_settings#get('groovy-language-server', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('groovy-language-server', 'root_uri', lsp_settings#root_uri('groovy-language-server'))}, \ 'initialization_options': lsp_settings#get('groovy-language-server', 'initialization_options', {}), \ 'whitelist': lsp_settings#get('groovy-language-server', 'whitelist', ['groovy']), \ 'blacklist': lsp_settings#get('groovy-language-server', 'blacklist', []), diff --git a/settings/html-languageserver.vim b/settings/html-languageserver.vim index ef03108..ee198f0 100644 --- a/settings/html-languageserver.vim +++ b/settings/html-languageserver.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_html_languageserver LspRegisterServer { \ 'name': 'html-languageserver', \ 'cmd': {server_info->lsp_settings#get('html-languageserver', 'cmd', [lsp_settings#exec_path('html-languageserver'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('html-langserver', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('html-langserver', 'root_uri', lsp_settings#root_uri('html-languageserver'))}, \ 'initialization_options': lsp_settings#get('html-languageserver', 'initialization_options', {'embeddedLanguages': {'css': v:true, 'javascript': v:true}}), \ 'whitelist': lsp_settings#get('html-languageserver', 'whitelist', ['html']), \ 'blacklist': lsp_settings#get('html-languageserver', 'blacklist', []), diff --git a/settings/intelephense.vim b/settings/intelephense.vim index da8588d..635737a 100644 --- a/settings/intelephense.vim +++ b/settings/intelephense.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_intelephense_server LspRegisterServer { \ 'name': 'intelephense', \ 'cmd': {server_info->lsp_settings#get('intelephense', 'cmd', [lsp_settings#exec_path('intelephense'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('intelephense', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('intelephense', 'root_uri', lsp_settings#root_uri('intelephense'))}, \ 'initialization_options': lsp_settings#get('intelephense', 'initialization_options', {}), \ 'whitelist': lsp_settings#get('intelephense', 'whitelist', ['php']), \ 'blacklist': lsp_settings#get('intelephense', 'blacklist', []), diff --git a/settings/javascript-typescript-stdio.vim b/settings/javascript-typescript-stdio.vim index 9d13b4f..4074ef2 100644 --- a/settings/javascript-typescript-stdio.vim +++ b/settings/javascript-typescript-stdio.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_javascript_typescript_stdio LspRegisterServer { \ 'name': 'javascript-typescript-stdio', \ 'cmd': {server_info->lsp_settings#get('javascript-typescript-stdio', 'cmd', [lsp_settings#exec_path('javascript-typescript-stdio')])}, - \ 'root_uri':{server_info->lsp_settings#get('javascript-typescript-stdio', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('javascript-typescript-stdio', 'root_uri', lsp_settings#root_uri('javascript-typescript-stdio'))}, \ 'initialization_options': lsp_settings#get('javascript-typescript-stdio', 'initialization_options', {'diagnostics': 'true'}), \ 'whitelist': lsp_settings#get('javascript-typescript-stdio', 'whitelist', ['javascript', 'javascriptreact', 'javascript.jsx']), \ 'blacklist': lsp_settings#get('javascript-typescript-stdio', 'blacklist', []), diff --git a/settings/json-languageserver.vim b/settings/json-languageserver.vim index 097900d..8c90e48 100644 --- a/settings/json-languageserver.vim +++ b/settings/json-languageserver.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_json_languageserver LspRegisterServer { \ 'name': 'json-languageserver', \ 'cmd': {server_info->lsp_settings#get('json-languageserver', 'cmd', [lsp_settings#exec_path('json-languageserver'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('json-languageserver', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('json-languageserver', 'root_uri', lsp_settings#root_uri('json-languageserver'))}, \ 'initialization_options': lsp_settings#get('json-languageserver', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('json-languageserver', 'whitelist', ['json', 'jsonc']), \ 'blacklist': lsp_settings#get('json-languageserver', 'blacklist', []), diff --git a/settings/julia-language-server.vim b/settings/julia-language-server.vim index 5ca1a84..18d1335 100644 --- a/settings/julia-language-server.vim +++ b/settings/julia-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_julia_language_server LspRegisterServer { \ 'name': 'julia-language-server', \ 'cmd': {server_info->lsp_settings#get('julia-language-server', 'cmd', [lsp_settings#exec_path('julia-language-server')])}, - \ 'root_uri':{server_info->lsp_settings#get('julia-language-server', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('julia-language-server', 'root_uri', lsp_settings#root_uri('julia-language-server'))}, \ 'initialization_options': lsp_settings#get('julia-language-server', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('julia-language-server', 'whitelist', ['julia']), \ 'blacklist': lsp_settings#get('julia-language-server', 'blacklist', []), diff --git a/settings/kotlin-language-server.vim b/settings/kotlin-language-server.vim index 0fd011c..8749e60 100644 --- a/settings/kotlin-language-server.vim +++ b/settings/kotlin-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_kotlin_language_server LspRegisterServer { \ 'name': 'kotlin-language-server', \ 'cmd': {server_info->lsp_settings#get('kotlin-language-server', 'cmd', [lsp_settings#exec_path('kotlin-language-server')])}, - \ 'root_uri':{server_info->lsp_settings#get('kotlin-language-server', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('kotlin-language-server', 'root_uri', lsp_settings#root_uri('kotlin-language-server'))}, \ 'initialization_options': lsp_settings#get('kotlin-language-server', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('kotlin-language-server', 'whitelist', ['kotlin']), \ 'blacklist': lsp_settings#get('kotlin-language-server', 'blacklist', []), diff --git a/settings/lsp4xml.vim b/settings/lsp4xml.vim index 50268b9..c1845c3 100644 --- a/settings/lsp4xml.vim +++ b/settings/lsp4xml.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_lsp4xml LspRegisterServer { \ 'name': 'lsp4xml', \ 'cmd': {server_info->lsp_settings#get('lsp4xml', 'cmd', [lsp_settings#exec_path('lsp4xml')])}, - \ 'root_uri':{server_info->lsp_settings#get('lsp4xml', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('lsp4xml', 'root_uri', lsp_settings#root_uri('lsp4xml'))}, \ 'initialization_options': lsp_settings#get('lsp4xml', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('lsp4xml', 'whitelist', ['xml']), \ 'blacklist': lsp_settings#get('lsp4xml', 'blacklist', []), diff --git a/settings/metals.vim b/settings/metals.vim index 18e53bd..5527f36 100644 --- a/settings/metals.vim +++ b/settings/metals.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_metals LspRegisterServer { \ 'name': 'metals', \ 'cmd': {server_info->lsp_settings#get('metals', 'cmd', [lsp_settings#exec_path('metals')])}, - \ 'root_uri':{server_info->lsp_settings#get('metals', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('metals', 'root_uri', lsp_settings#root_uri('metals'))}, \ 'initialization_options': lsp_settings#get('metals', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('metals', 'whitelist', ['scala', 'sbt']), \ 'blacklist': lsp_settings#get('metals', 'blacklist', []), diff --git a/settings/monastery.vim b/settings/monastery.vim index ee7fe93..7022635 100644 --- a/settings/monastery.vim +++ b/settings/monastery.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_monastery LspRegisterServer { \ 'name': 'monastery', \ 'cmd': {server_info->lsp_settings#get('monastery', 'cmd', [lsp_settings#exec_path('monastery')])}, - \ 'root_uri':{server_info->lsp_settings#get('monastery', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('monastery', 'root_uri', lsp_settings#root_uri('monastery'))}, \ 'initialization_options': lsp_settings#get('monastery', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('monastery', 'whitelist', ['perl']), \ 'blacklist': lsp_settings#get('monastery', 'blacklist', []), diff --git a/settings/nimlsp.vim b/settings/nimlsp.vim index b36bae2..33ffb6e 100644 --- a/settings/nimlsp.vim +++ b/settings/nimlsp.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_nimlsp LspRegisterServer { \ 'name': 'nimlsp', \ 'cmd': {server_info->lsp_settings#get('nimlsp', 'cmd', [lsp_settings#exec_path('nimlsp')])}, - \ 'root_uri':{server_info->lsp_settings#get('nimlsp', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('nimlsp', 'root_uri', lsp_settings#root_uri('nimlsp'))}, \ 'initialization_options': lsp_settings#get('nimlsp', 'initialization_options', {'diagnostics': 'true'}), \ 'whitelist': lsp_settings#get('nimlsp', 'whitelist', ['nim']), \ 'blacklist': lsp_settings#get('nimlsp', 'blacklist', []), diff --git a/settings/omnisharp-lsp.vim b/settings/omnisharp-lsp.vim index fe22321..d8db644 100644 --- a/settings/omnisharp-lsp.vim +++ b/settings/omnisharp-lsp.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_omnisharp_lsp LspRegisterServer { \ 'name': 'omnisharp-lsp', \ 'cmd': {server_info->lsp_settings#get('omnisharp-lsp', 'cmd', [lsp_settings#exec_path('omnisharp-lsp'), '-lsp'])}, - \ 'root_uri':{server_info->lsp_settings#get('omnisharp-lsp', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('omnisharp-lsp', 'root_uri', lsp_settings#root_uri('omnisharp-lsp'))}, \ 'initialization_options': lsp_settings#get('omnisharp-lsp', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('omnisharp-lsp', 'whitelist', ['cs']), \ 'blacklist': lsp_settings#get('omnisharp-lsp', 'blacklist', []), diff --git a/settings/perl-languageserver.vim b/settings/perl-languageserver.vim index f8bdab0..6ad20ef 100644 --- a/settings/perl-languageserver.vim +++ b/settings/perl-languageserver.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_perl_languageserver LspRegisterServer { \ 'name': 'perl-languageserver', \ 'cmd': {server_info->lsp_settings#get('perl-languageserver', 'cmd', ['perl', '-MPerl::LanguageServer', '-e', 'Perl::LanguageServer->run'])}, - \ 'root_uri':{server_info->lsp_settings#get('perl-languageserver', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('perl-languageserver', 'root_uri', lsp_settings#root_uri('perl-languageserver'))}, \ 'initialization_options': lsp_settings#get('perl-languageserver', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('perl-languageserver', 'whitelist', ['perl']), \ 'blacklist': lsp_settings#get('perl-languageserver', 'blacklist', []), diff --git a/settings/powershell-languageserver.vim b/settings/powershell-languageserver.vim index b7e5682..6596876 100644 --- a/settings/powershell-languageserver.vim +++ b/settings/powershell-languageserver.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_powershell_languageserver LspRegisterServer { \ 'name': 'powershell-languageserver', \ 'cmd': {server_info->lsp_settings#get('powershell-languageserver', 'cmd', [lsp_settings#exec_path('powershell-languageserver')])}, - \ 'root_uri':{server_info->lsp_settings#get('powershell-languageserver', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('powershell-languageserver', 'root_uri', lsp_settings#root_uri('powershell-languageserver'))}, \ 'initialization_options': lsp_settings#get('powershell-languageserver', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('powershell-languageserver', 'whitelist', ['ps1']), \ 'blacklist': lsp_settings#get('powershell-languageserver', 'blacklist', []), diff --git a/settings/pyls-ms.vim b/settings/pyls-ms.vim index 264c51d..22c78d7 100644 --- a/settings/pyls-ms.vim +++ b/settings/pyls-ms.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_pyls_ms LspRegisterServer { \ 'name': 'pyls-ms', \ 'cmd': {server_info->lsp_settings#get('pyls-ms', 'cmd', [lsp_settings#exec_path('pyls-ms')])}, - \ 'root_uri':{server_info->lsp_settings#get('pyls-ms', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('pyls-ms', 'root_uri', lsp_settings#root_uri('pyls-ms'))}, \ 'initialization_options': lsp_settings#get('pyls-ms', 'initialization_options', { \ 'analysisUpdates': v:true, \ 'asyncStartup': v:true, diff --git a/settings/pyls.vim b/settings/pyls.vim index f6b5bd1..98732e5 100644 --- a/settings/pyls.vim +++ b/settings/pyls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_pyls LspRegisterServer { \ 'name': 'pyls', \ 'cmd': {server_info->lsp_settings#get('pyls', 'cmd', [lsp_settings#exec_path('pyls')])}, - \ 'root_uri':{server_info->lsp_settings#get('pyls', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('pyls', 'root_uri', lsp_settings#root_uri('pyls'))}, \ 'initialization_options': lsp_settings#get('pyls', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('pyls', 'whitelist', ['python']), \ 'blacklist': lsp_settings#get('pyls', 'blacklist', []), diff --git a/settings/r-languageserver.vim b/settings/r-languageserver.vim index 9567b48..7e0b096 100644 --- a/settings/r-languageserver.vim +++ b/settings/r-languageserver.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_r_languageserver LspRegisterServer { \ 'name': 'r-languageserver', \ 'cmd': {server_info->lsp_settings#get('r-languageserver', 'cmd', ['R', '--slave', '-e', 'languageserver::run()'])}, - \ 'root_uri':{server_info->lsp_settings#get('r-languageserver', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('r-languageserver', 'root_uri', lsp_settings#root_uri('r-languageserver'))}, \ 'initialization_options': lsp_settings#get('r-languageserver', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('r-languageserver', 'whitelist', ['r']), \ 'blacklist': lsp_settings#get('r-languageserver', 'blacklist', []), diff --git a/settings/ra_lsp_server.vim b/settings/ra_lsp_server.vim index b4e4e87..46cfcb1 100644 --- a/settings/ra_lsp_server.vim +++ b/settings/ra_lsp_server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_ra_lsp_server LspRegisterServer { \ 'name': 'ra_lsp_server', \ 'cmd': {server_info->lsp_settings#get('ra_lsp_server', 'cmd', [lsp_settings#exec_path('ra_lsp_server')])}, - \ 'root_uri':{server_info->lsp_settings#get('ra_lsp_server', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('ra_lsp_server', 'root_uri', lsp_settings#root_uri('ra_lsp_server'))}, \ 'initialization_options': lsp_settings#get('ra_lsp_server', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('ra_lsp_server', 'whitelist', ['rust']), \ 'blacklist': lsp_settings#get('ra_lsp_server', 'blacklist', []), diff --git a/settings/reason-language-server.vim b/settings/reason-language-server.vim index 9bdbe4c..b55b70a 100644 --- a/settings/reason-language-server.vim +++ b/settings/reason-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_reason_language_server LspRegisterServer { \ 'name': 'reason-language-server', \ 'cmd': {server_info->lsp_settings#get('reason-language-server', 'cmd', [lsp_settings#exec_path('reason-language-server')])}, - \ 'root_uri':{server_info->lsp_settings#get('reason-language-server', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('reason-language-server', 'root_uri', lsp_settings#root_uri('reason-language-server'))}, \ 'initialization_options': lsp_settings#get('reason-language-server', 'initialization_options', {}), \ 'whitelist': lsp_settings#get('reason-language-server', 'whitelist', ['reason']), \ 'blacklist': lsp_settings#get('reason-language-server', 'blacklist', []), diff --git a/settings/rls.vim b/settings/rls.vim index 22aba06..ed3fb44 100644 --- a/settings/rls.vim +++ b/settings/rls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_rls LspRegisterServer { \ 'name': 'rls', \ 'cmd': {server_info->lsp_settings#get('rls', 'cmd', [lsp_settings#exec_path('rls')])}, - \ 'root_uri':{server_info->lsp_settings#get('rls', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('rls', 'root_uri', lsp_settings#root_uri('rls'))}, \ 'initialization_options': lsp_settings#get('rls', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('rls', 'whitelist', ['rust']), \ 'blacklist': lsp_settings#get('rls', 'blacklist', []), diff --git a/settings/rust-analyzer.vim b/settings/rust-analyzer.vim index d07fc1c..1b77280 100644 --- a/settings/rust-analyzer.vim +++ b/settings/rust-analyzer.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_rust-analyzer LspRegisterServer { \ 'name': 'rust-analyzer', \ 'cmd': {server_info->lsp_settings#get('rust-analyzer', 'cmd', [lsp_settings#exec_path('rust-analyzer')])}, - \ 'root_uri':{server_info->lsp_settings#get('rust-analyzer', 'root_uri', lsp_settings#root_uri(['Cargo.toml']))}, + \ 'root_uri':{server_info->lsp_settings#get('rust-analyzer', 'root_uri', lsp_settings#root_uri('rust-analyzer'))}, \ 'initialization_options': lsp_settings#get('rust-analyzer', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('rust-analyzer', 'whitelist', ['rust']), \ 'blacklist': lsp_settings#get('rust-analyzer', 'blacklist', []), diff --git a/settings/slp.vim b/settings/slp.vim index 4918c7b..98948c4 100644 --- a/settings/slp.vim +++ b/settings/slp.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_slp LspRegisterServer { \ 'name': 'slp', \ 'cmd': {server_info->lsp_settings#get('slp', 'cmd', [lsp_settings#exec_path('slp.pl')])}, - \ 'root_uri':{server_info->lsp_settings#get('slp', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('slp', 'root_uri', lsp_settings#root_uri('slp'))}, \ 'initialization_options': lsp_settings#get('slp', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('slp', 'whitelist', ['perl']), \ 'blacklist': lsp_settings#get('slp', 'blacklist', []), diff --git a/settings/solargraph.vim b/settings/solargraph.vim index 60a2dae..e894ce7 100644 --- a/settings/solargraph.vim +++ b/settings/solargraph.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_solargraph LspRegisterServer { \ 'name': 'solargraph', \ 'cmd': {server_info->lsp_settings#get('solargraph', 'cmd', [lsp_settings#exec_path('solargraph'), 'stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('solargraph', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('solargraph', 'root_uri', lsp_settings#root_uri('solargraph'))}, \ 'initialization_options': lsp_settings#get('solargraph', 'initialization_options', {'diagnostics': 'true'}), \ 'whitelist': lsp_settings#get('solargraph', 'whitelist', ['ruby']), \ 'blacklist': lsp_settings#get('solargraph', 'blacklist', []), diff --git a/settings/sourcekit-lsp.vim b/settings/sourcekit-lsp.vim index df4c9fc..032812e 100644 --- a/settings/sourcekit-lsp.vim +++ b/settings/sourcekit-lsp.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_sourcekit_lsp LspRegisterServer { \ 'name': 'sourcekit-lsp', \ 'cmd': {server_info->lsp_settings#get('sourcekit-lsp', 'cmd', [lsp_settings#exec_path('sourcekit-lsp')])}, - \ 'root_uri':{server_info->lsp_settings#get('sourcekit-lsp', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('sourcekit-lsp', 'root_uri', lsp_settings#root_uri('sourcekit-lsp'))}, \ 'initialization_options': lsp_settings#get('sourcekit-lsp', 'initialization_options', {}), \ 'whitelist': lsp_settings#get('sourcekit-lsp', 'whitelist', ['swift']), \ 'blacklist': lsp_settings#get('sourcekit-lsp', 'blacklist', []), diff --git a/settings/sql-language-server.vim b/settings/sql-language-server.vim index cf40abd..3a33ac0 100644 --- a/settings/sql-language-server.vim +++ b/settings/sql-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_sql_language_server LspRegisterServer { \ 'name': 'sql-language-server', \ 'cmd': {server_info->lsp_settings#get('sql-language-server', 'cmd', [lsp_settings#exec_path('sql-language-server'), 'up', '--method', 'stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('sql-language-server', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('sql-language-server', 'root_uri', lsp_settings#root_uri('sql-language-server'))}, \ 'initialization_options': lsp_settings#get('sql-language-server', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('sql-language-server', 'whitelist', ['sql']), \ 'blacklist': lsp_settings#get('sql-language-server', 'blacklist', []), diff --git a/settings/sqls.vim b/settings/sqls.vim index a80e6ab..3ff97d3 100644 --- a/settings/sqls.vim +++ b/settings/sqls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_sqls LspRegisterServer { \ 'name': 'sqls', \ 'cmd': {server_info->lsp_settings#get('sqls', 'cmd', [lsp_settings#exec_path('sqls')])}, - \ 'root_uri':{server_info->lsp_settings#get('sqls', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('sqls', 'root_uri', lsp_settings#root_uri('sqls'))}, \ 'initialization_options': lsp_settings#get('sqls', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('sqls', 'whitelist', ['sql']), \ 'blacklist': lsp_settings#get('sqls', 'blacklist', []), diff --git a/settings/svls.vim b/settings/svls.vim index 9c2090d..4c39343 100644 --- a/settings/svls.vim +++ b/settings/svls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_svls LspRegisterServer { \ 'name': 'svls', \ 'cmd': {server_info->lsp_settings#get('svls', 'cmd', [lsp_settings#exec_path('svls')])}, - \ 'root_uri':{server_info->lsp_settings#get('svls', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('svls', 'root_uri', lsp_settings#root_uri('svls'))}, \ 'initialization_options': lsp_settings#get('svls', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('svls', 'whitelist', ['systemverilog']), \ 'blacklist': lsp_settings#get('svls', 'blacklist', []), diff --git a/settings/terraform-lsp.vim b/settings/terraform-lsp.vim index 181d897..90e608d 100644 --- a/settings/terraform-lsp.vim +++ b/settings/terraform-lsp.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_terraform_lsp LspRegisterServer { \ 'name': 'terraform-lsp', \ 'cmd': {server_info->lsp_settings#get('terraform-lsp', 'cmd', [lsp_settings#exec_path('terraform-lsp')])}, - \ 'root_uri':{server_info->lsp_settings#get('terraform-lsp', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('terraform-lsp', 'root_uri', lsp_settings#root_uri('terraform-lsp'))}, \ 'initialization_options': lsp_settings#get('terraform-lsp', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('terraform-lsp', 'whitelist', ['terraform']), \ 'blacklist': lsp_settings#get('terraform-lsp', 'blacklist', []), diff --git a/settings/texlab.vim b/settings/texlab.vim index 2b65032..722ad66 100644 --- a/settings/texlab.vim +++ b/settings/texlab.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_texlab LspRegisterServer { \ 'name': 'texlab', \ 'cmd': {server_info->lsp_settings#get('texlab', 'cmd', [lsp_settings#exec_path('texlab')])}, - \ 'root_uri':{server_info->lsp_settings#get('texlab', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('texlab', 'root_uri', lsp_settings#root_uri('texlab'))}, \ 'initialization_options': lsp_settings#get('texlab', 'initialization_options', {'diagnostics': 'true'}), \ 'whitelist': lsp_settings#get('texlab', 'whitelist', ['plaintex', 'tex']), \ 'blacklist': lsp_settings#get('texlab', 'blacklist', []), diff --git a/settings/typescript-language-server.vim b/settings/typescript-language-server.vim index 634f3a1..53b93ff 100644 --- a/settings/typescript-language-server.vim +++ b/settings/typescript-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_typescript_language_server LspRegisterServer { \ 'name': 'typescript-language-server', \ 'cmd': {server_info->lsp_settings#get('typescript-language-server', 'cmd', [lsp_settings#exec_path('typescript-language-server'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('typescript-language-server', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('typescript-language-server', 'root_uri', lsp_settings#root_uri('typescript-language-server'))}, \ 'initialization_options': lsp_settings#get('typescript-language-server', 'initialization_options', {'diagnostics': 'true'}), \ 'whitelist': lsp_settings#get('typescript-language-server', 'whitelist', ['javascript', 'javascriptreact', 'typescript', 'typescriptreact', 'typescript.tsx']), \ 'blacklist': lsp_settings#get('typescript-language-server', 'blacklist', []), diff --git a/settings/vim-language-server.vim b/settings/vim-language-server.vim index 58b2f8d..5f8812f 100644 --- a/settings/vim-language-server.vim +++ b/settings/vim-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_vim_language_server LspRegisterServer { \ 'name': 'vim-language-server', \ 'cmd': {server_info->lsp_settings#get('vim-language-server', 'cmd', [lsp_settings#exec_path('vim-language-server'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('vim-language-server', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('vim-language-server', 'root_uri', lsp_settings#root_uri('vim-language-server'))}, \ 'initialization_options': extend({'vimruntime': $VIMRUNTIME, 'runtimepath': &rtp}, lsp_settings#get('vim-language-server', 'initialization_options', {}), 'force'), \ 'whitelist': lsp_settings#get('vim-language-server', 'whitelist', ['vim']), \ 'blacklist': lsp_settings#get('vimbash-language-server', 'blacklist', []), diff --git a/settings/vls.vim b/settings/vls.vim index e3e960f..51b6075 100644 --- a/settings/vls.vim +++ b/settings/vls.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_vls LspRegisterServer { \ 'name': 'vls', \ 'cmd': {server_info->lsp_settings#get('vls', 'cmd', [lsp_settings#exec_path('vls'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('vls', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('vls', 'root_uri', lsp_settings#root_uri('vls'))}, \ 'initialization_options': lsp_settings#get('vls', 'initialization_options', {'config': {'vetur': {'useWorkspaceDependencies': v:false, 'validation': {'template': v:true, 'style': v:true, 'script': v:true}, 'completion': {'autoImport': v:false, 'useScaffoldSnippets': v:false, 'tagCasing': 'kebab'}, 'format': {'defaultFormatter': {'js': '', 'ts': ''}, 'defaultFormatterOptions': {}, 'scriptInitialIndent': v:false, 'styleInitialIndent': v:false}, 'dev': {'logLevel': 'DEBUG'}}, 'css': {}, 'html': {'suggest': {}}, 'javascript': {'format': {}}, 'typescript': {'format': {}}, 'emmet': {}, 'stylusSupremacy': {}}}), \ 'whitelist': lsp_settings#get('vls', 'whitelist', ['vue']), \ 'blacklist': lsp_settings#get('vls', 'blacklist', []), diff --git a/settings/yaml-language-server.vim b/settings/yaml-language-server.vim index 5befceb..b4d7e0a 100644 --- a/settings/yaml-language-server.vim +++ b/settings/yaml-language-server.vim @@ -3,7 +3,7 @@ augroup vimlsp_settings_yaml_language_server LspRegisterServer { \ 'name': 'yaml-language-server', \ 'cmd': {server_info->lsp_settings#get('yaml-language-server', 'cmd', [lsp_settings#exec_path('yaml-language-server'), '--stdio'])}, - \ 'root_uri':{server_info->lsp_settings#get('yaml-language-server', 'root_uri', lsp_settings#root_uri())}, + \ 'root_uri':{server_info->lsp_settings#get('yaml-language-server', 'root_uri', lsp_settings#root_uri('yaml-language-server'))}, \ 'initialization_options': lsp_settings#get('yaml-language-server', 'initialization_options', v:null), \ 'whitelist': lsp_settings#get('yaml-language-server', 'whitelist', ['yaml']), \ 'blacklist': lsp_settings#get('yaml-language-server', 'blacklist', []), -- cgit v1.2.3-54-g00ecf From 0e71903b66fdf01d0386ba1b653174dfcec7f21c Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Thu, 20 Feb 2020 00:18:27 +0900 Subject: Fix root_uri_patterns --- autoload/lsp_settings.vim | 6 +++--- local-schema.json | 15 ++++++++++++--- schema.json | 11 ++++++++++- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/autoload/lsp_settings.vim b/autoload/lsp_settings.vim index 9183069..fc6282b 100644 --- a/autoload/lsp_settings.vim +++ b/autoload/lsp_settings.vim @@ -345,15 +345,15 @@ function! s:vim_lsp_suggest_plugin() abort let l:ext = expand('%:e') for l:ft in keys(s:settings) for l:server in s:settings[l:ft] - if !has_key(l:server, 'vim-plugin') + if !has_key(l:server, 'vim_plugin') continue endif - if index(l:server['vim-plugin']['extensions'], l:ext) == -1 + if index(l:server['vim_plugin']['extensions'], l:ext) == -1 continue endif redraw echohl Directory - echomsg printf('Please install vim-plugin "%s" to enable Language Server', l:server['vim-plugin']['name']) + echomsg printf('Please install vim-plugin "%s" to enable Language Server', l:server['vim_plugin']['name']) echohl None return endfor diff --git a/local-schema.json b/local-schema.json index 694a97f..bf49ddd 100644 --- a/local-schema.json +++ b/local-schema.json @@ -4,7 +4,6 @@ "patternProperties": { "^([a-z0-9_-]+)+$": { "description": "define name of language server", - "type": "object", "properties": { "blacklist": { "items": { @@ -26,8 +25,8 @@ "type": "object" }, "disabled": { - "description": "set true if you want to enable server", "default": true, + "description": "set true if you want to enable server", "type": "boolean" }, "initialization_options": { @@ -39,6 +38,15 @@ "pattern": "^file://\\S+$", "type": "string" }, + "root_uri_patterns": { + "default": [], + "description": "define patterns with file or directory names for finding root_uri", + "items": { + "description": "file or directory name", + "type": "string" + }, + "type": "array" + }, "whitelist": { "items": { "description": "define name of whitelisted language server", @@ -50,7 +58,8 @@ "workspace_config": { "type": "object" } - } + }, + "type": "object" } }, "title": "vim-lsp-settings-local", diff --git a/schema.json b/schema.json index ab23b42..fa36bac 100644 --- a/schema.json +++ b/schema.json @@ -32,7 +32,16 @@ }, "type": "array" }, - "vim-plugin": { + "root_uri_patterns": { + "default": [], + "description": "define patterns with file or directory names for finding root_uri", + "items": { + "description": "file or directory name", + "type": "string" + }, + "type": "array" + }, + "vim_plugin": { "additionalProperties": false, "default": {}, "description": "define suggestion for vim-plugin", -- cgit v1.2.3-54-g00ecf From d31db49d279bd2b637743f669f1939ecc9759161 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Thu, 20 Feb 2020 00:24:10 +0900 Subject: Prefer user's configuration --- autoload/lsp_settings.vim | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/autoload/lsp_settings.vim b/autoload/lsp_settings.vim index fc6282b..e1d8e2b 100644 --- a/autoload/lsp_settings.vim +++ b/autoload/lsp_settings.vim @@ -174,15 +174,17 @@ function! lsp_settings#root_path(name) abort endfunction function! lsp_settings#root_uri(name) abort - let l:patterns = [] - for l:ft in sort(keys(s:settings)) - for l:conf in s:settings[l:ft] - if l:conf.command ==# a:name && has_key(l:conf, 'root_uri_patterns') - let l:patterns = l:conf['root_uri_patterns'] - break - endif + let l:patterns = lsp_settings#get(a:name, 'root_uri_patterns', []) + if empty(l:patterns) + for l:ft in sort(keys(s:settings)) + for l:conf in s:settings[l:ft] + if l:conf.command ==# a:name && has_key(l:conf, 'root_uri_patterns') + let l:patterns = l:conf['root_uri_patterns'] + break + endif + endfor endfor - endfor + endif let l:dir = lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), extend(l:patterns, g:lsp_settings_root_markers)) if empty(l:dir) -- cgit v1.2.3-54-g00ecf From 5e6bb6aab1074d4d2a40142b8a57fe88985c54bc Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Thu, 20 Feb 2020 00:54:21 +0900 Subject: Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index e55d929..c960f10 100644 --- a/README.md +++ b/README.md @@ -172,6 +172,9 @@ Overridable keys are: * blacklist (List) * config (Dictionary) * workspace_config (Dictionary) +* disabled (Boolean) +* root_uri (String) +* root_uri_patterns (List) If you install ruby but not solargraph, you can install solargraph with following command. -- cgit v1.2.3-54-g00ecf From 7734093728215b27db4e10a6603e043569974374 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Thu, 20 Feb 2020 01:15:56 +0900 Subject: Fix typos --- settings.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/settings.json b/settings.json index c3eb7fb..a5c8df4 100644 --- a/settings.json +++ b/settings.json @@ -15,7 +15,7 @@ "requires": [ "java" ], - "vim-plugin": { + "vim_plugin": { "extensions": [ "apxc", "apxt", @@ -107,7 +107,7 @@ "requires": [ "elixir" ], - "vim-plugin": { + "vim_plugin": { "extensions": [ "ex", "exs" @@ -125,7 +125,7 @@ "root_uri_patterns": [ "elm.json" ], - "vim-plugin": { + "vim_plugin": { "extensions": [ "elm" ], @@ -143,7 +143,7 @@ "root_uri_patterns": [ "rebar.config" ], - "vim-plugin": { + "vim_plugin": { "extensions": [ "erl" ], @@ -185,7 +185,7 @@ "git", "make" ], - "vim-plugin": { + "vim_plugin": { "extensions": [ "vert", "tesc", @@ -321,7 +321,7 @@ "requires": [ "npm" ], - "vim-plugin": { + "vim_plugin": { "extensions": [ "cjson" ], @@ -335,7 +335,7 @@ "requires": [ "julia" ], - "vim-plugin": { + "vim_plugin": { "extensions": [ "jl" ], @@ -349,7 +349,7 @@ "requires": [ "java" ], - "vim-plugin": { + "vim_plugin": { "extensions": [ "kt" ], @@ -385,7 +385,7 @@ { "command": "nimlsp", "requires": [], - "vim-plugin": { + "vim_plugin": { "extensions": [ "nim" ], @@ -445,7 +445,7 @@ "requires": [ "pwsh" ], - "vim-plugin": { + "vim_plugin": { "extensions": [ "ps1" ], @@ -488,7 +488,7 @@ "root_uri_patterns": [ "package.json" ], - "vim-plugin": { + "vim_plugin": { "extensions": [ "re", "rei" @@ -585,7 +585,7 @@ "Cartfile", "Podfile" ], - "vim-plugin": { + "vim_plugin": { "extensions": [ "swift" ], @@ -603,7 +603,7 @@ { "command": "terraform-lsp", "requires": [], - "vim-plugin": { + "vim_plugin": { "extensions": [ "tf", "tfvars" @@ -680,7 +680,7 @@ "root_uri_patterns": [ "package.json" ], - "vim-plugin": { + "vim_plugin": { "extensions": [ "vue" ], -- cgit v1.2.3-54-g00ecf