diff options
| author | Yasuhiro Matsumoto <mattn.jp@gmail.com> | 2020-01-05 00:39:23 +0900 |
|---|---|---|
| committer | Yasuhiro Matsumoto <mattn.jp@gmail.com> | 2020-01-05 00:39:23 +0900 |
| commit | 3e2882279c24b3f8ef9b6a139580315025473156 (patch) | |
| tree | e02143c2ef9b199bf73af0481c15a70af7d0d81e /settings | |
| parent | c0483f85f464f246e996d50e2a421972221271c0 (diff) | |
| parent | 92ad5168f987b2c2d2197ebbb490ebcc31c37053 (diff) | |
| download | vim-lsp-settings-3e2882279c24b3f8ef9b6a139580315025473156.tar.gz vim-lsp-settings-3e2882279c24b3f8ef9b6a139580315025473156.tar.bz2 vim-lsp-settings-3e2882279c24b3f8ef9b6a139580315025473156.zip | |
Merge branch 'master' of git://github.com/mattn/vim-lsp-settings
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/clojure-lsp.vim | 3 | ||||
| -rw-r--r-- | settings/typescript-language-server.vim | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/settings/clojure-lsp.vim b/settings/clojure-lsp.vim index f50e637..2b96ee9 100644 --- a/settings/clojure-lsp.vim +++ b/settings/clojure-lsp.vim @@ -3,7 +3,8 @@ 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(['.git/']))}, + \ 'root_uri':{server_info->lsp_settings#get('clojure-lsp', 'root_uri', lsp_settings#root_uri([ + \ '.lein/', '.shadow-cljs/', '.git/', 'project.clj', 'deps.edn', 'shadow-cljs.edn']))}, \ '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/typescript-language-server.vim b/settings/typescript-language-server.vim index 534a151..a75567c 100644 --- a/settings/typescript-language-server.vim +++ b/settings/typescript-language-server.vim @@ -2,7 +2,7 @@ augroup vimlsp_settings_typescript_language_server au! LspRegisterServer { \ 'name': 'typescript-language-server', - \ 'cmd': {server_info->lsp_settings#get('typescript-language-server', 'cmd', [lsp_settings#exec_path('typescript-language-server'), '--stdio', '--tsserver-path', lsp_settings#exec_path('tsserver')])}, + \ 'cmd': {server_info->lsp_settings#get('typescript-language-server', 'cmd', [lsp_settings#exec_path('typescript-language-server'), '--stdio', '--tsserver-path', lsp_settings#exec_path('typescript-language-server:tsserver')])}, \ 'root_uri':{server_info->lsp_settings#get('typescript-language-server', 'root_uri', lsp_settings#root_uri(['.git/', 'package.json']))}, \ 'initialization_options': lsp_settings#get('typescript-language-server', 'initialization_options', {"diagnostics": "true"}), \ 'whitelist': lsp_settings#get('typescript-language-server', 'whitelist', ['javascript', 'javascriptreact', 'typescript', 'typescriptreact']), |