From 23b4bb48be8ffa632992e901b3f8d3235f0c7f07 Mon Sep 17 00:00:00 2001
From: wordi <wordijp@gmail.com>
Date: Fri, 27 Dec 2019 02:29:15 +0900
Subject: Use installed tsserver from typescript-language-server

---
 installer/install-typescript-language-server.cmd | 1 +
 installer/install-typescript-language-server.sh  | 1 +
 settings/typescript-language-server.vim          | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

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']),
-- 
cgit v1.2.3-54-g00ecf