Use npm_install

15 files changed, 37 insertions, 50 deletions

diff --git a/installer/install-bash-language-server.sh b/installer/install-bash-language-server.sh
index c27d0d8..1b9417c 100755
--- a/installer/install-bash-language-server.sh
+++ b/installer/install-bash-language-server.sh
@@ -4,5 +4,4 @@ set -e
 
 cd $(dirname $0)
 
-. ./npm.sh
-npm_install bash-language-server bash-language-server
+./npm_install bash-language-server bash-language-server
diff --git a/installer/install-css-languageserver.sh b/installer/install-css-languageserver.sh
index ae7c8a6..c34ad12 100755
--- a/installer/install-css-languageserver.sh
+++ b/installer/install-css-languageserver.sh
@@ -4,5 +4,4 @@ set -e
 
 cd $(dirname $0)
 
-. ./npm.sh
-npm_install css-languageserver vscode-css-languageserver-bin
+./npm_install css-languageserver vscode-css-languageserver-bin
diff --git a/installer/install-docker-langserver.sh b/installer/install-docker-langserver.sh
index 28b433f..a756b31 100755
--- a/installer/install-docker-langserver.sh
+++ b/installer/install-docker-langserver.sh
@@ -4,5 +4,4 @@ set -e
 
 cd $(dirname $0)
 
-. ./npm.sh
-npm_install docker-langserver dockerfile-language-server-nodejs
+./npm_install docker-langserver dockerfile-language-server-nodejs
diff --git a/installer/install-elm-language-server.sh b/installer/install-elm-language-server.sh
index e0a1b27..3b6b4df 100755
--- a/installer/install-elm-language-server.sh
+++ b/installer/install-elm-language-server.sh
@@ -4,5 +4,4 @@ set -e
 
 cd $(dirname $0)
 
-. ./npm.sh
-npm_install elm-languageserver "@elm-tooling/elm-language-server"
+./npm_install elm-languageserver "@elm-tooling/elm-language-server"
diff --git a/installer/install-html-languageserver.sh b/installer/install-html-languageserver.sh
index 6838379..3a7f817 100755
--- a/installer/install-html-languageserver.sh
+++ b/installer/install-html-languageserver.sh
@@ -4,5 +4,4 @@ set -e
 
 cd $(dirname $0)
 
-. ./npm.sh
-npm_install html-languageserver vscode-html-languageserver-bin
+./npm_install html-languageserver vscode-html-languageserver-bin
diff --git a/installer/install-intelephense.sh b/installer/install-intelephense.sh
index 4b24254..15c64d6 100755
--- a/installer/install-intelephense.sh
+++ b/installer/install-intelephense.sh
@@ -4,5 +4,4 @@ set -e
 
 cd $(dirname $0)
 
-. ./npm.sh
-npm_install intelephense intelephense
+./npm_install intelephense intelephense
diff --git a/installer/install-javascript-typescript-langserver.cmd b/installer/install-javascript-typescript-langserver.cmd
index a653ada..ce74e11 100644
--- a/installer/install-javascript-typescript-langserver.cmd
+++ b/installer/install-javascript-typescript-langserver.cmd
@@ -2,4 +2,4 @@
 

 cd /d %~dp0

 

-call npm_install javascript-typescript-langserver javascript-typescript-langserver

+call npm_install javascript-typescript-stdio javascript-typescript-langserver

diff --git a/installer/install-javascript-typescript-langserver.sh b/installer/install-javascript-typescript-langserver.sh
index de35663..b083671 100755
--- a/installer/install-javascript-typescript-langserver.sh
+++ b/installer/install-javascript-typescript-langserver.sh
@@ -4,5 +4,4 @@ set -e
 
 cd $(dirname $0)
 
-. ./npm.sh
-npm_install javascript-typescript-langserver javascript-typescript-langserver
+./npm_install javascript-typescript-stdio javascript-typescript-langserver
diff --git a/installer/install-json-languageserver.sh b/installer/install-json-languageserver.sh
index 8e5c2f2..74dd9e1 100755
--- a/installer/install-json-languageserver.sh
+++ b/installer/install-json-languageserver.sh
@@ -4,5 +4,4 @@ set -e
 
 cd $(dirname $0)
 
-. ./npm.sh
-npm_install json-languageserver vscode-json-languageserver-bin
+./npm_install json-languageserver vscode-json-languageserver-bin
diff --git a/installer/install-typescript-language-server.sh b/installer/install-typescript-language-server.sh
index a34ea58..4a9a735 100755
--- a/installer/install-typescript-language-server.sh
+++ b/installer/install-typescript-language-server.sh
@@ -4,6 +4,5 @@ set -e
 
 cd $(dirname $0)
 
-. ./npm.sh
-npm_install tsserver typescript
-npm_install typescript-language-server typescript-language-server
+./npm_install tsserver typescript
+./npm_install typescript-language-server typescript-language-server
diff --git a/installer/install-vim-language-server.sh b/installer/install-vim-language-server.sh
index 17b87df..974e315 100755
--- a/installer/install-vim-language-server.sh
+++ b/installer/install-vim-language-server.sh
@@ -4,5 +4,4 @@ set -e
 
 cd $(dirname $0)
 
-. ./npm.sh
-npm_install vim-language-server vim-language-server
+./npm_install vim-language-server vim-language-server
diff --git a/installer/install-yaml-language-server.sh b/installer/install-yaml-language-server.sh
index d3f0e47..7e46d5d 100755
--- a/installer/install-yaml-language-server.sh
+++ b/installer/install-yaml-language-server.sh
@@ -4,5 +4,4 @@ set -e
 
 cd $(dirname $0)
 
-. ./npm.sh
-npm_install yaml-language-server yaml-language-server
+./npm_install yaml-language-server yaml-language-server
diff --git a/installer/npm.sh b/installer/npm.sh
deleted file mode 100644
index 19e4e11..0000000
--- a/installer/npm.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Usage
-# $ . npm.sh
-# $ npm_install [EXECUTABLE_NAME] [NPM_NAME]
-npm_install() {
-  server_dir="../servers/$1"
-  [ -d "$server_dir" ] && rm -rf "$server_dir"
-  mkdir "$server_dir" && pushd . > /dev/null && cd "$server_dir"
-
-  npm init -y
-
-  # Avoid the problem of not being able to install the same package as name in package.json.
-  # Create an empty package.json.
-  cat <<EOF >package.json
-  {"name": ""}
-EOF
-
-  npm install "$2"
-  ln -s "./node_modules/.bin/$1" .
-
-  popd > /dev/null
-}
diff --git a/installer/npm_install b/installer/npm_install
new file mode 100755
index 0000000..3fd41bd
--- /dev/null
+++ b/installer/npm_install
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Usage
+# $ . npm.sh
+# $ npm_install [EXECUTABLE_NAME] [NPM_NAME]
+
+set -e
+
+server_dir="../servers/$1"
+[ -d "$server_dir" ] && rm -rf "$server_dir"
+mkdir "$server_dir"
+cd "$server_dir"
+
+npm init -y
+
+# Avoid the problem of not being able to install the same package as name in package.json.
+# Create an empty package.json.
+cat <<EOF >package.json
+{"name": ""}
+EOF
+
+npm install "$2"
+ln -s "./node_modules/.bin/$1" .
diff --git a/settings/typescript-language-server.vim b/settings/typescript-language-server.vim
index 8b62b67..438696c 100644
--- a/settings/typescript-language-server.vim
+++ b/settings/typescript-language-server.vim
@@ -5,7 +5,7 @@ augroup vimlsp_settings_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')])},
       \ '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']),
+      \ 'whitelist': lsp_settings#get('typescript-language-server', 'whitelist', ['javascript', 'typescript', 'typescriptreact']),
       \ 'blacklist': lsp_settings#get('typescript-language-server', 'blacklist', []),
       \ 'config': lsp_settings#get('typescript-language-server', 'config', {}),
       \ 'workspace_config': lsp_settings#get('typescript-language-server', 'workspace_config', {}),