diff options
| author | mattn <mattn.jp@gmail.com> | 2019-12-27 16:04:57 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-27 16:04:57 +0900 |
| commit | a04d4470949f1291dcdd29f8160331e4f3c21e87 (patch) | |
| tree | 96fe0e54eaaadc5c818ba7f5cad71034f66aa0f5 | |
| parent | 8dad706ad6624f895fa54722f277f6a2735e6c5e (diff) | |
| parent | 23b4bb48be8ffa632992e901b3f8d3235f0c7f07 (diff) | |
| download | vim-lsp-settings-a04d4470949f1291dcdd29f8160331e4f3c21e87.tar.gz vim-lsp-settings-a04d4470949f1291dcdd29f8160331e4f3c21e87.tar.bz2 vim-lsp-settings-a04d4470949f1291dcdd29f8160331e4f3c21e87.zip | |
Merge pull request #37 from wordijp/fix/typescript_cmd
Fix/typescript cmd
| -rw-r--r-- | installer/install-typescript-language-server.cmd | 1 | ||||
| -rwxr-xr-x | installer/install-typescript-language-server.sh | 1 | ||||
| -rw-r--r-- | settings/typescript-language-server.vim | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/installer/install-typescript-language-server.cmd b/installer/install-typescript-language-server.cmd index 8538968..1f8dc85 100644 --- a/installer/install-typescript-language-server.cmd +++ b/installer/install-typescript-language-server.cmd @@ -2,4 +2,5 @@ cd /d %~dp0
+call npm_install tsserver typescript
call npm_install typescript-language-server typescript-language-server
diff --git a/installer/install-typescript-language-server.sh b/installer/install-typescript-language-server.sh index 7669018..a34ea58 100755 --- a/installer/install-typescript-language-server.sh +++ b/installer/install-typescript-language-server.sh @@ -5,4 +5,5 @@ set -e cd $(dirname $0) . ./npm.sh +npm_install tsserver typescript npm_install typescript-language-server typescript-language-server diff --git a/settings/typescript-language-server.vim b/settings/typescript-language-server.vim index 9a5506d..8b62b67 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'])}, + \ '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')])}, \ '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', ['typescript', 'typescriptreact']), |