Merge branch 'master' into fix/windows-native-py3

33 files changed, 352 insertions, 225 deletions

diff --git a/installer/install-bash-language-server.cmd b/installer/install-bash-language-server.cmd
index 1976dc4..eef3e5e 100644
--- a/installer/install-bash-language-server.cmd
+++ b/installer/install-bash-language-server.cmd
@@ -1,5 +1,5 @@
-@echo off
-
-cd %~dp0
-
-call npm_install bash-language-server bash-language-server
+@echo off

+

+cd /d %~dp0

+

+call npm_install bash-language-server bash-language-server

diff --git a/installer/install-clojure-lsp.cmd b/installer/install-clojure-lsp.cmd
index 26754b4..4f667f6 100644
--- a/installer/install-clojure-lsp.cmd
+++ b/installer/install-clojure-lsp.cmd
@@ -1,7 +1,12 @@
-@echo off
-
-cd %~dp0
-if exist "..\servers\clojure-lsp" rd /S /Q  "..\servers\clojure-lsp"
-md "..\servers\clojure-lsp"
-cd "..\servers\clojure-lsp"
-curl -L -o clojure-lsp.cmd https://github.com/snoe/clojure-lsp/releases/download/release-20191202T142318/clojure-lsp
+@echo off

+

+setlocal

+

+cd /d %~dp0

+

+set server_dir=..\servers\clojure-lsp

+if exist %server_dir% rd /Q /S "%server_dir%"

+md "%server_dir%"

+cd /d "%server_dir%"

+

+curl -L -o clojure-lsp.cmd https://github.com/snoe/clojure-lsp/releases/download/release-20191202T142318/clojure-lsp

diff --git a/installer/install-cobol-language-support.cmd b/installer/install-cobol-language-support.cmd
new file mode 100644
index 0000000..39959a1
--- /dev/null
+++ b/installer/install-cobol-language-support.cmd
@@ -0,0 +1,23 @@
+@echo off

+

+setlocal

+

+cd /d %~dp0

+

+set installer_dir=%cd%

+set server_dir=..\servers\cobol-language-support

+if exist %server_dir% rd /Q /S "%server_dir%"

+md "%server_dir%"

+cd /d "%server_dir%"

+

+set version=0.9.1

+set url=https://github.com/eclipse/che-che4z-lsp-for-cobol/releases/download/%version%/cobol-language-support-%version%.vsix

+curl -LO "%url%"

+call %installer_dir%\run_unzip "cobol-language-support-%version%.vsix"

+

+echo @echo off ^

+

+java "-Dline.speparator=\r\n" -jar "%%~dp0\extension\server\lsp-service-cobol-%version%.jar" pipeEnabled ^

+

+> cobol-language-support.cmd

+

diff --git a/installer/install-cobol-language-support.sh b/installer/install-cobol-language-support.sh
new file mode 100755
index 0000000..f87e1c3
--- /dev/null
+++ b/installer/install-cobol-language-support.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+cd $(dirname $0)
+
+server_dir="../servers/cobol-language-support"
+[ -d "$server_dir" ] && rm -rf "$server_dir"
+mkdir "$server_dir" && cd "$server_dir"
+
+version="0.9.1"
+url="https://github.com/eclipse/che-che4z-lsp-for-cobol/releases/download/$version/cobol-language-support-$version.vsix"
+curl -LO "$url"
+unzip "cobol-language-support-$version.vsix"
+
+cat <<EOF >./cobol-language-support
+#!/bin/sh
+DIR=\$(cd \$(dirname \$0); pwd)
+java "-Dline.speparator=\r\n" -jar "\$DIR/extension/server/lsp-service-cobol-$version.jar" pipeEnabled
+EOF
+
+chmod +x ./cobol-language-support
diff --git a/installer/install-css-languageserver.cmd b/installer/install-css-languageserver.cmd
index 79de653..529bb74 100644
--- a/installer/install-css-languageserver.cmd
+++ b/installer/install-css-languageserver.cmd
@@ -1,5 +1,5 @@
-@echo off
-
-cd %~dp0
-
-call npm_install css-languageserver vscode-css-languageserver-bin
+@echo off

+

+cd /d %~dp0

+

+call npm_install css-languageserver vscode-css-languageserver-bin

diff --git a/installer/install-docker-langserver.cmd b/installer/install-docker-langserver.cmd
index fd16f67..d4112c3 100644
--- a/installer/install-docker-langserver.cmd
+++ b/installer/install-docker-langserver.cmd
@@ -1,6 +1,6 @@
-@echo off
-
-cd %~dp0
-
-call npm_install docker-langserver dockerfile-language-server-nodejs
-
+@echo off

+

+cd /d %~dp0

+

+call npm_install docker-langserver dockerfile-language-server-nodejs

+

diff --git a/installer/install-eclipse-jdt-ls.cmd b/installer/install-eclipse-jdt-ls.cmd
index d4a5baa..7a8c1db 100644
--- a/installer/install-eclipse-jdt-ls.cmd
+++ b/installer/install-eclipse-jdt-ls.cmd
@@ -1,9 +1,14 @@
 @echo off

 

-cd %~dp0

-if exist "..\servers\eclipse-jdt-ls" rd /S /Q  "..\servers\eclipse-jdt-ls"

-md "..\servers\eclipse-jdt-ls"

-cd "..\servers\eclipse-jdt-ls"

+setlocal

+

+cd /d %~dp0

+

+set server_dir=..\servers\eclipse-jdt-ls

+if exist %server_dir% rd /Q /S "%server_dir%"

+md "%server_dir%"

+cd /d "%server_dir%"

+

 curl -o "jdt-language-server-latest.tar.gz" "http://download.eclipse.org/jdtls/snapshots/jdt-language-server-latest.tar.gz"

 curl -o "lombok.jar" "https://projectlombok.org/downloads/lombok.jar"

 tar xvf jdt-language-server-latest.tar.gz

diff --git a/installer/install-elm-language-server.cmd b/installer/install-elm-language-server.cmd
index 9b58339..ae36144 100644
--- a/installer/install-elm-language-server.cmd
+++ b/installer/install-elm-language-server.cmd
@@ -1,5 +1,5 @@
-@echo off
-
-cd %~dp0
-
-call npm_install elm-language-server "@elm-tooling/elm-language-server"
+@echo off

+

+cd /d %~dp0

+

+call npm_install elm-language-server "@elm-tooling/elm-language-server"

diff --git a/installer/install-emmylua-ls.cmd b/installer/install-emmylua-ls.cmd
index afbe34e..6c74ae1 100644
--- a/installer/install-emmylua-ls.cmd
+++ b/installer/install-emmylua-ls.cmd
@@ -1,14 +1,19 @@
-@echo off
-
-cd %~dp0
-if exist "..\servers\emmylua-ls" rd /S /Q  "..\servers\emmylua-ls"
-md "..\servers\emmylua-ls"
-cd "..\servers\emmylua-ls"
-curl -L -o EmmyLua-LS-all.jar "https://ci.appveyor.com/api/buildjobs/54yf9rjvj49494pd/artifacts/EmmyLua-LS%%2Fbuild%%2Flibs%%2FEmmyLua-LS-all.jar"
-
-echo @echo off ^
-
-java -cp %%~dp0/EmmyLua-LS-all.jar com.tang.vscode.MainKt ^
-
-> emmylua-ls.cmd
-
+@echo off

+

+setlocal

+

+cd /d %~dp0

+

+set server_dir=..\servers\emmylua-ls

+if exist %server_dir% rd /Q /S "%server_dir%"

+md "%server_dir%"

+cd /d "%server_dir%"

+

+curl -L -o EmmyLua-LS-all.jar "https://ci.appveyor.com/api/buildjobs/54yf9rjvj49494pd/artifacts/EmmyLua-LS%%2Fbuild%%2Flibs%%2FEmmyLua-LS-all.jar"

+

+echo @echo off ^

+

+java -cp %%~dp0/EmmyLua-LS-all.jar com.tang.vscode.MainKt ^

+

+> emmylua-ls.cmd

+

diff --git a/installer/install-fortls.cmd b/installer/install-fortls.cmd
index 89648e6..32251aa 100644
--- a/installer/install-fortls.cmd
+++ b/installer/install-fortls.cmd
@@ -1,6 +1,6 @@
-@echo off
-
-cd %~dp0
-
-call pip_install fortls fortran-language-server
-
+@echo off

+

+cd /d %~dp0

+

+call pip_install fortls fortran-language-server

+

diff --git a/installer/install-gopls.cmd b/installer/install-gopls.cmd
index 2862abe..9c08e36 100644
--- a/installer/install-gopls.cmd
+++ b/installer/install-gopls.cmd
@@ -1,12 +1,15 @@
-@echo off
-
-setlocal
-
-cd %~dp0
-if exist "..\servers\gopls" rd /S /Q  "..\servers\gopls"
-md "..\servers\gopls"
-cd "..\servers\gopls"
-set GOPATH=%cd%
-set GOBIN=%cd%
-go get -v -u golang.org/x/tools/cmd/gopls
-rd /S /Q "src"
+@echo off

+

+setlocal

+

+cd /d %~dp0

+

+set server_dir=..\servers\gopls

+if exist %server_dir% rd /Q /S "%server_dir%"

+md "%server_dir%"

+cd /d "%server_dir%"

+

+set GOPATH=%cd%

+set GOBIN=%cd%

+go get -v -u golang.org/x/tools/cmd/gopls

+rd /S /Q "src"

diff --git a/installer/install-html-languageserver.cmd b/installer/install-html-languageserver.cmd
index 0f17784..943ebf5 100644
--- a/installer/install-html-languageserver.cmd
+++ b/installer/install-html-languageserver.cmd
@@ -1,5 +1,5 @@
-@echo off
-
-cd %~dp0
-
-call npm_install html-languageserver vscode-json-languageserver-bin
+@echo off

+

+cd /d %~dp0

+

+call npm_install html-languageserver vscode-json-languageserver-bin

diff --git a/installer/install-intelephense.cmd b/installer/install-intelephense.cmd
index 72e55c7..6258852 100644
--- a/installer/install-intelephense.cmd
+++ b/installer/install-intelephense.cmd
@@ -1,5 +1,5 @@
-@echo off
-
-cd %~dp0
-
-call npm_install intelephense intelephense
+@echo off

+

+cd /d %~dp0

+

+call npm_install intelephense intelephense

diff --git a/installer/install-javascript-typescript-langserver.cmd b/installer/install-javascript-typescript-langserver.cmd
index 3ddc2da..a653ada 100644
--- a/installer/install-javascript-typescript-langserver.cmd
+++ b/installer/install-javascript-typescript-langserver.cmd
@@ -1,5 +1,5 @@
-@echo off
-
-cd %~dp0
-
-call npm_install javascript-typescript-langserver javascript-typescript-langserver
+@echo off

+

+cd /d %~dp0

+

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

diff --git a/installer/install-json-languageserver.cmd b/installer/install-json-languageserver.cmd
index 8e76105..06b7bb2 100644
--- a/installer/install-json-languageserver.cmd
+++ b/installer/install-json-languageserver.cmd
@@ -1,5 +1,5 @@
-@echo off
-
-cd %~dp0
-
-call npm_install json-languageserver vscode-json-languageserver-bin
+@echo off

+

+cd /d %~dp0

+

+call npm_install json-languageserver vscode-json-languageserver-bin

diff --git a/installer/install-kotlin-language-server.cmd b/installer/install-kotlin-language-server.cmd
index 84d5cbf..11d141c 100644
--- a/installer/install-kotlin-language-server.cmd
+++ b/installer/install-kotlin-language-server.cmd
@@ -1,11 +1,17 @@
 @echo off

 

-cd %~dp0

-if exist "..\servers\kotlin-language-server" rd /S /Q  "..\servers\kotlin-language-server"

-md "..\servers\kotlin-language-server"

-cd "..\servers\kotlin-language-server"

+setlocal

+

+cd /d %~dp0

+

+set installer_dir=%cd%

+set server_dir=..\servers\kotlin-language-server

+if exist %server_dir% rd /Q /S "%server_dir%"

+md "%server_dir%"

+cd /d "%server_dir%"

+

 curl -L -o server.zip "https://github.com/fwcd/kotlin-language-server/releases/download/0.5.2/server.zip"

-unzip server.zip

+call %installer_dir%\run_unzip server.zip

 del server.zip

 

 echo @echo off ^

diff --git a/installer/install-lsp4xml.cmd b/installer/install-lsp4xml.cmd
index 966a3b7..e85b269 100644
--- a/installer/install-lsp4xml.cmd
+++ b/installer/install-lsp4xml.cmd
@@ -1,14 +1,19 @@
-@echo off
-
-cd %~dp0
-if exist "..\servers\lsp4xml" rd /S /Q  "..\servers\lsp4xml"
-md "..\servers\lsp4xml"
-cd "..\servers\lsp4xml"
-curl -LO "https://dl.bintray.com/lsp4xml/releases/org/lsp4xml/org.eclipse.lsp4xml/0.9.1/org.eclipse.lsp4xml-0.9.1-uber.jar"
-
-echo @echo off ^
-
-java -jar %%~dp0\org.eclipse.lsp4xml-0.9.1-uber.jar ^
-
-> lsp4xml.cmd
-
+@echo off

+

+setlocal

+

+cd /d %~dp0

+

+set server_dir=..\servers\lsp4xml

+if exist %server_dir% rd /Q /S "%server_dir%"

+md "%server_dir%"

+cd /d "%server_dir%"

+

+curl -LO "https://dl.bintray.com/lsp4xml/releases/org/lsp4xml/org.eclipse.lsp4xml/0.9.1/org.eclipse.lsp4xml-0.9.1-uber.jar"

+

+echo @echo off ^

+

+java -jar %%~dp0\org.eclipse.lsp4xml-0.9.1-uber.jar ^

+

+> lsp4xml.cmd

+

diff --git a/installer/install-metals.cmd b/installer/install-metals.cmd
index 8d290cf..decf44c 100644
--- a/installer/install-metals.cmd
+++ b/installer/install-metals.cmd
@@ -1,16 +1,16 @@
-@echo off
-
-setlocal
-
-cd %~dp0
-
-set server_dir="..\servers\metals"
-rd /Q /S %server_dir%
-md %server_dir%
-cd "%server_dir%"
-
-curl -Lo coursier https://git.io/coursier-cli
-curl -Lo coursier.bat https://git.io/coursier-bat
-
-set version="0.7.6"
-java %JAVA_OPTS% -jar coursier bootstrap --ttl Inf "org.scalameta:metals_2.12:%version%" -r "bintray:scalacenter/releases" -r "sonatype:public" -r "sonatype:snapshots" -o metals
+@echo off

+

+setlocal

+

+cd /d %~dp0

+

+set server_dir=..\servers\metals

+if exist %server_dir% rd /Q /S "%server_dir%"

+md "%server_dir%"

+cd /d "%server_dir%"

+

+curl -Lo coursier https://git.io/coursier-cli

+curl -Lo coursier.bat https://git.io/coursier-bat

+

+set version="0.7.6"

+java %JAVA_OPTS% -jar coursier bootstrap --ttl Inf "org.scalameta:metals_2.12:%version%" -r "bintray:scalacenter/releases" -r "sonatype:public" -r "sonatype:snapshots" -o metals

diff --git a/installer/install-omnisharp-lsp.cmd b/installer/install-omnisharp-lsp.cmd
index 253936a..dd4efac 100644
--- a/installer/install-omnisharp-lsp.cmd
+++ b/installer/install-omnisharp-lsp.cmd
@@ -1,15 +1,22 @@
-@echo off
-
-cd %~dp0
-if exist "..\servers\omnisharp-lsp" rd /S /Q  "..\servers\omnisharp-lsp"
-md "..\servers\omnisharp-lsp"
-cd "..\servers\omnisharp-lsp"
-curl -L -o omnisharp-win-x64.zip "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v1.34.9/omnisharp-win-x64.zip"
-unzip omnisharp-win-x64.zip
-del omnisharp-win-x64.zip
-
-echo @echo off ^
-
-%%~dp0\omnisharp.exe %%* ^
-
-> omnisharp-lsp.cmd
+@echo off

+

+setlocal

+

+cd /d %~dp0

+

+set installer_dir=%cd%

+set server_dir=..\servers\omnisharp-lsp

+if exist %server_dir% rd /Q /S "%server_dir%"

+md "%server_dir%"

+cd /d "%server_dir%"

+

+curl -L -o omnisharp-win-x64.zip "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v1.34.9/omnisharp-win-x64.zip"

+call %installer_dir%\run_unzip omnisharp-win-x64.zip

+del omnisharp-win-x64.zip

+

+echo @echo off ^

+

+%%~dp0\omnisharp.exe %%* ^

+

+> omnisharp-lsp.cmd

+

diff --git a/installer/install-pyls.cmd b/installer/install-pyls.cmd
index 7b62104..bbdfefd 100644
--- a/installer/install-pyls.cmd
+++ b/installer/install-pyls.cmd
@@ -1,5 +1,5 @@
-@echo off
-
-cd %~dp0
-
-call pip_install pyls python-language-server
+@echo off

+

+cd /d %~dp0

+

+call pip_install pyls python-language-server

diff --git a/installer/install-reason-language-server.cmd b/installer/install-reason-language-server.cmd
new file mode 100644
index 0000000..1aa9aa8
--- /dev/null
+++ b/installer/install-reason-language-server.cmd
@@ -0,0 +1,18 @@
+@echo off
+
+setlocal
+
+cd /d %~dp0
+
+set installer_dir=%cd%
+set server_dir=..\servers\reason-language-server
+if exist %server_dir% rd /Q /S "%server_dir%"
+md "%server_dir%"
+cd /d "%server_dir%"
+
+curl -L -o rls-windows.zip "https://github.com/jaredly/reason-language-server/releases/download/1.7.4/rls-windows.zip"
+call %installer_dir%\run_unzip rls-windows.zip
+del rls-windows.zip
+
+move rls-windows\reason-language-server.exe reason-language-server.exe
+rmdir rls-windows
diff --git a/installer/install-reason-language-server.sh b/installer/install-reason-language-server.sh
new file mode 100755
index 0000000..78df09c
--- /dev/null
+++ b/installer/install-reason-language-server.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -e
+
+cd $(dirname $0)
+
+server_dir="../servers/reason-language-server"
+[ -d $server_dir ] && rm -rf $server_dir
+mkdir $server_dir && cd $server_dir
+
+os=$(uname -s | tr "[:upper:]" "[:lower:]")
+
+case $os in
+linux) ;;
+darwin)
+  os="macos"
+  ;;
+*)
+  printf "%s doesn't supported by bash installer" "$os"
+  exit 1
+  ;;
+esac
+
+version="1.7.4"
+url="https://github.com/jaredly/reason-language-server/releases/download/$version/rls-$os.zip"
+curl -LO "$url"
+unzip "rls-$os.zip"
+
+ln -s "./rls-$os/reason-language-server" .
diff --git a/installer/install-rls.cmd b/installer/install-rls.cmd
deleted file mode 100644
index eb7900a..0000000
--- a/installer/install-rls.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-setlocal
-
-cd %~dp0
-if exist "..\servers\rls" rd /S /Q  "..\servers\rls"
-md "..\servers\rls"
-cd "..\servers\rls"
-set CARGO_HOME=%cd%
-cargo install rls
-copy bin\rls.exe .
-rd /S /Q "bin"
-rd /S /Q "registry"
-del .package-cache
-del .crates.toml
diff --git a/installer/install-rls.sh b/installer/install-rls.sh
deleted file mode 100755
index ab310ff..0000000
--- a/installer/install-rls.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-[ -d ../servers/rls ] && rm -rf ../servers/rls
-mkdir ../servers/rls
-cd ../servers/rls
-CARGO_HOME=$(pwd) cargo install rls 
-cp bin/rls .
-rm -rf bin registry .package-cache .crates.toml
diff --git a/installer/install-solargraph.cmd b/installer/install-solargraph.cmd
index 9f7c973..fe7f6d8 100644
--- a/installer/install-solargraph.cmd
+++ b/installer/install-solargraph.cmd
@@ -1,16 +1,21 @@
-@echo off
-
-cd %~dp0
-if exist "..\servers\solargraph" rd /S /Q  "..\servers\solargraph"
-md "..\servers\solargraph"
-cd "..\servers\solargraph"
-git clone "https://github.com/castwide/solargraph" .
-
-call bundle install --path vendor/bundle
-
-echo @echo off ^
-
-bundle exec ruby %%~dp0\bin/solargraph stdio ^
-
-> solargraph.cmd
-
+@echo off

+

+setlocal

+

+cd /d %~dp0

+

+set server_dir=..\servers\solargraph

+if exist %server_dir% rd /Q /S "%server_dir%"

+md "%server_dir%"

+cd /d "%server_dir%"

+

+git clone "https://github.com/castwide/solargraph" .

+

+call bundle install --path vendor/bundle

+

+echo @echo off ^

+

+bundle exec ruby %%~dp0\bin/solargraph stdio ^

+

+> solargraph.cmd

+

diff --git a/installer/install-terraform-lsp.cmd b/installer/install-terraform-lsp.cmd
index 4903513..3c94999 100644
--- a/installer/install-terraform-lsp.cmd
+++ b/installer/install-terraform-lsp.cmd
@@ -1,7 +1,12 @@
-@echo off
-
-cd %~dp0
-if exist "..\servers\terraform-lsp" rd /S /Q  "..\servers\terraform-lsp"
-md "..\servers\terraform-lsp"
-cd "..\servers\terraform-lsp"
-curl -L "https://github.com/juliosueiras/terraform-lsp/releases/download/v0.0.9/terraform-lsp_0.0.9_windows_amd64.tar.gz" | tar xz
+@echo off

+

+setlocal

+

+cd /d %~dp0

+

+set server_dir=..\servers\terraform-lsp

+if exist %server_dir% rd /Q /S "%server_dir%"

+md "%server_dir%"

+cd /d "%server_dir%"

+

+curl -L "https://github.com/juliosueiras/terraform-lsp/releases/download/v0.0.9/terraform-lsp_0.0.9_windows_amd64.tar.gz" | tar xz

diff --git a/installer/install-typescript-language-server.cmd b/installer/install-typescript-language-server.cmd
index fea8393..1f8dc85 100644
--- a/installer/install-typescript-language-server.cmd
+++ b/installer/install-typescript-language-server.cmd
@@ -1,5 +1,6 @@
-@echo off
-
-cd %~dp0
-
-call npm_install typescript-language-server typescript-language-server
+@echo off

+

+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/installer/install-vim-language-server.cmd b/installer/install-vim-language-server.cmd
index 14ad1bc..c2a1d55 100644
--- a/installer/install-vim-language-server.cmd
+++ b/installer/install-vim-language-server.cmd
@@ -1,5 +1,5 @@
-@echo off
-
-cd %~dp0
-
-call npm_install vim-language-server vim-language-server
+@echo off

+

+cd /d %~dp0

+

+call npm_install vim-language-server vim-language-server

diff --git a/installer/install-yaml-language-server.cmd b/installer/install-yaml-language-server.cmd
index 6d404c6..043e388 100644
--- a/installer/install-yaml-language-server.cmd
+++ b/installer/install-yaml-language-server.cmd
@@ -1,5 +1,5 @@
-@echo off
-
-cd %~dp0
-
-call npm_install yaml-language-server yaml-language-server
+@echo off

+

+cd /d %~dp0

+

+call npm_install yaml-language-server yaml-language-server

diff --git a/installer/npm.sh b/installer/npm.sh
index c1ec529..19e4e11 100644
--- a/installer/npm.sh
+++ b/installer/npm.sh
@@ -8,7 +8,7 @@ set -e
 npm_install() {
   server_dir="../servers/$1"
   [ -d "$server_dir" ] && rm -rf "$server_dir"
-  mkdir "$server_dir" && cd "$server_dir"
+  mkdir "$server_dir" && pushd . > /dev/null && cd "$server_dir"
 
   npm init -y
 
@@ -20,4 +20,6 @@ EOF
 
   npm install "$2"
   ln -s "./node_modules/.bin/$1" .
+
+  popd > /dev/null
 }
diff --git a/installer/npm_install.cmd b/installer/npm_install.cmd
index d17c974..caea4a8 100644
--- a/installer/npm_install.cmd
+++ b/installer/npm_install.cmd
@@ -1,21 +1,23 @@
-@echo off
-
-if "x%1" equ "x" goto :EOF
-if "x%2" equ "x" goto :EOF
-
-set server_dir="..\servers\%1"
-rd /Q /S "%server_dir%" 2>NUL
-md "%server_dir%"
-cd "%server_dir%"
-
-call npm init -y
-
-echo {"name":""}>package.json
-
-call npm install "%2"
-
-echo @echo off ^
-
-call %%~dp0\node_modules\.bin\%1.cmd %%* ^
-
-> %1.cmd
+@echo off

+

+if "x%1" equ "x" goto :EOF

+if "x%2" equ "x" goto :EOF

+

+set server_dir=..\servers\%1

+if exist "%server_dir%" rd /Q /S "%server_dir%"

+md "%server_dir%"

+pushd .

+cd /d "%server_dir%"

+

+call npm init -y

+

+echo {"name":""}>package.json

+

+call npm install "%2"

+

+echo @echo off ^

+

+call %%~dp0\node_modules\.bin\%1.cmd %%* ^

+

+> %1.cmd

+popd

diff --git a/installer/run_unzip.cmd b/installer/run_unzip.cmd
new file mode 100644
index 0000000..1815a90
--- /dev/null
+++ b/installer/run_unzip.cmd
@@ -0,0 +1,9 @@
+@echo off
+
+if "x%1" equ "x" goto :EOF
+
+where unzip 2>NUL
+if %ERRORLEVEL% neq 0 (
+    curl -L -o %~dp0\unzip.exe https://github.com/mattn/vim-lsp-settings/releases/download/v0.0.1/unzip.exe
+)
+%~dp0\unzip "%1"