aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwordi <wordijp@gmail.com>2020-01-03 15:23:47 +0900
committerwordi <wordijp@gmail.com>2020-01-03 15:23:47 +0900
commit776ce84f47a1a0b8d5df5e84c4c509ca0658f623 (patch)
treebb71bf4e6cb25e76aa0facbd017a9bbc4de5b4de
parent24de62683bbe337b4389cb57d48eb68c9afcf4ea (diff)
downloadvim-lsp-settings-776ce84f47a1a0b8d5df5e84c4c509ca0658f623.tar.gz
vim-lsp-settings-776ce84f47a1a0b8d5df5e84c4c509ca0658f623.tar.bz2
vim-lsp-settings-776ce84f47a1a0b8d5df5e84c4c509ca0658f623.zip
Modify for review
-rw-r--r--autoload/lsp_settings.vim2
-rw-r--r--installer/npm_install.cmd1
-rw-r--r--settings/typescript-language-server.vim2
3 files changed, 2 insertions, 3 deletions
diff --git a/autoload/lsp_settings.vim b/autoload/lsp_settings.vim
index ce3d09c..d59d4ed 100644
--- a/autoload/lsp_settings.vim
+++ b/autoload/lsp_settings.vim
@@ -24,7 +24,7 @@ function! s:first_one(cmd) abort
endfunction
function! lsp_settings#exec_path(cmd) abort
- let l:s= split(a:cmd, '/')
+ let l:s = split(a:cmd, ':')
let l:dir = len(l:s) >= 1 ? l:s[0] : ''
let l:cmd = len(l:s) >= 2 ? l:s[1] : l:s[0]
diff --git a/installer/npm_install.cmd b/installer/npm_install.cmd
index 12347e2..8521869 100644
--- a/installer/npm_install.cmd
+++ b/installer/npm_install.cmd
@@ -4,7 +4,6 @@ if "x%1" equ "x" goto :EOF
if "x%2" equ "x" goto :EOF
if not exist package.json (
-
call npm init -y
echo {"name":""}>package.json
diff --git a/settings/typescript-language-server.vim b/settings/typescript-language-server.vim
index 708e693..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('typescript-language-server/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']),