Merge pull request #171 from yaegassy/eslint-server-v2

Update eslint-server (vscode-eslint) to version 2

3 files changed, 33 insertions, 28 deletions

diff --git a/installer/install-eslint-language-server.cmd b/installer/install-eslint-language-server.cmd
index 846638d..ee71b53 100644
--- a/installer/install-eslint-language-server.cmd
+++ b/installer/install-eslint-language-server.cmd
@@ -1,13 +1,14 @@
-@echo off
-
-git clone "https://github.com/microsoft/vscode-eslint" .
-git checkout release/1.9.1
-call npm install
-call npm run compile:server
-
-echo @echo off ^
-
-node %%~dp0\server\out\eslintServer.js --stdio %%* ^
-
-> eslint-language-server.cmd
-
+@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

+

+echo @echo off ^

+

+node %%~dp0\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 05beeb3..df6e4f9 100755
--- a/installer/install-eslint-language-server.sh
+++ b/installer/install-eslint-language-server.sh
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
 git clone "https://github.com/microsoft/vscode-eslint" .
-git checkout release/1.9.1
+git checkout release/2.0.15
 npm install
+npm --prefix ./server install ./server
 npm run compile:server
 
 cat <<EOF >eslint-language-server
diff --git a/settings/eslint-language-server.vim b/settings/eslint-language-server.vim
index 7377846..f6dd6e3 100644
--- a/settings/eslint-language-server.vim
+++ b/settings/eslint-language-server.vim
@@ -8,25 +8,28 @@ augroup vimlsp_settings_eslint_language_server
       \ 'whitelist': lsp_settings#get('eslint-language-server', 'whitelist', ['javascript', 'javascriptreact', 'typescript', 'typescriptreact', 'typescript.tsx']),
       \ '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': {
-      \   'validate': v:true,
+      \ 'workspace_config': lsp_settings#get('eslint-language-server', 'workspace_config', {
+      \   'validate': 'probe',
       \   'packageManager': 'npm',
-      \   'autoFix': v:true,
-      \   'autoFixOnSave': v:true,
-      \   'options': {},
-      \   'run': 'onType',
-      \   'nodePath': v:null,
-      \   'quiet': v:false,
-      \   'workspaceFolder': v:null,
+      \   'codeActionOnSave': {
+      \     'enable': v:true,
+      \     'mode': 'all',
+      \   },
       \   'codeAction': {
       \     'disableRuleComment': {
       \       'enable': v:true,
-      \       'location': 'separateLine'
+      \       'location': 'separateLine',
       \     },
       \     'showDocumentation': {
-      \       'enable': v:true
-      \     }
-      \   }
-      \ },
+      \       'enable': v:true,
+      \     },
+      \   },
+      \   'format': v:false,
+      \   'quiet': v:false,
+      \   'onIgnoredFiles': 'off',
+      \   'options': {},
+      \   'run': 'onType',
+      \   'nodePath': v:null,
+      \ }),
       \ }
 augroup END