diff options
| -rw-r--r-- | installer/install-eslint-language-server.cmd | 10 | ||||
| -rwxr-xr-x | installer/install-eslint-language-server.sh | 12 | ||||
| -rw-r--r-- | settings.json | 31 | ||||
| -rw-r--r-- | settings/eslint-language-server.vim | 2 |
4 files changed, 34 insertions, 21 deletions
diff --git a/installer/install-eslint-language-server.cmd b/installer/install-eslint-language-server.cmd index ee71b53..1e3608f 100644 --- a/installer/install-eslint-language-server.cmd +++ b/installer/install-eslint-language-server.cmd @@ -1,14 +1,12 @@ @echo off
-git clone "https://github.com/microsoft/vscode-eslint" .
-git checkout release/2.0.15
-call npm install
-call npm --prefix ./server install ./server
-call npm run compile:server
+curl -L -o "vscode-eslint.vsix" "https://github.com/microsoft/vscode-eslint/releases/download/release%2F2.1.0-next.1/vscode-eslint-2.1.0.vsix"
+call "%~dp0\run_unzip.cmd" vscode-eslint.vsix
+del vscode-eslint.vsix
echo @echo off ^
-node %%~dp0\server\out\eslintServer.js --stdio %%* ^
+node %%~dp0\extension\server\out\eslintServer.js --stdio %%* ^
> eslint-language-server.cmd
diff --git a/installer/install-eslint-language-server.sh b/installer/install-eslint-language-server.sh index df6e4f9..b188e9f 100755 --- a/installer/install-eslint-language-server.sh +++ b/installer/install-eslint-language-server.sh @@ -1,16 +1,16 @@ #!/usr/bin/env bash -git clone "https://github.com/microsoft/vscode-eslint" . -git checkout release/2.0.15 -npm install -npm --prefix ./server install ./server -npm run compile:server +url="https://github.com/microsoft/vscode-eslint/releases/download/release%2F2.1.0-next.1/vscode-eslint-2.1.0.vsix" +asset="vscode-eslint.vsix" +curl -L "$url" -o "$asset" +unzip "$asset" +rm "$asset" cat <<EOF >eslint-language-server #!/usr/bin/env bash DIR=\$(cd \$(dirname \$0); pwd) -node \$DIR/server/out/eslintServer.js --stdio \$* +node \$DIR/extension/server/out/eslintServer.js --stdio \$* EOF chmod +x eslint-language-server diff --git a/settings.json b/settings.json index d168b14..2a6a377 100644 --- a/settings.json +++ b/settings.json @@ -277,12 +277,10 @@ { "command": "eslint-language-server", "requires": [ - "git", - "npm" + "node" ], "root_uri_patterns": [ - "package.json", - "tsconfig.json" + "package.json" ] } ], @@ -293,8 +291,16 @@ "npm" ], "root_uri_patterns": [ - "package.json", - "tsconfig.json" + "package.json" + ] + }, + { + "command": "eslint-language-server", + "requires": [ + "node" + ], + "root_uri_patterns": [ + "package.json" ] }, { @@ -638,8 +644,7 @@ { "command": "eslint-language-server", "requires": [ - "git", - "npm" + "node" ], "root_uri_patterns": [ "package.json", @@ -657,6 +662,16 @@ "package.json", "tsconfig.json" ] + }, + { + "command": "eslint-language-server", + "requires": [ + "node" + ], + "root_uri_patterns": [ + "package.json", + "tsconfig.json" + ] } ], "vim": [ diff --git a/settings/eslint-language-server.vim b/settings/eslint-language-server.vim index f6dd6e3..f27406c 100644 --- a/settings/eslint-language-server.vim +++ b/settings/eslint-language-server.vim @@ -5,7 +5,7 @@ augroup vimlsp_settings_eslint_language_server \ 'cmd': {server_info->lsp_settings#get('eslint-language-server', 'cmd', [lsp_settings#exec_path('eslint-language-server'), '--stdio'])}, \ 'root_uri':{server_info->lsp_settings#get('eslint-language-server', 'root_uri', lsp_settings#root_uri('eslint-language-server'))}, \ 'initialization_options': lsp_settings#get('eslint-language-server', 'initialization_options', {'diagnostics': 'true'}), - \ 'whitelist': lsp_settings#get('eslint-language-server', 'whitelist', ['javascript', 'javascriptreact', 'typescript', 'typescriptreact', 'typescript.tsx']), + \ 'whitelist': lsp_settings#get('eslint-language-server', 'whitelist', ['javascript', 'javascriptreact', 'typescript', 'typescriptreact']), \ 'blacklist': lsp_settings#get('eslint-language-server', 'blacklist', []), \ 'config': lsp_settings#get('eslint-language-server', 'config', lsp_settings#server_config('eslint-language-server')), \ 'workspace_config': lsp_settings#get('eslint-language-server', 'workspace_config', { |