From 9fa460fcfc233329795fe75ea2f5873cd121a653 Mon Sep 17 00:00:00 2001
From: yaegassy <yaegassy@users.noreply.github.com>
Date: Mon, 24 Feb 2020 23:55:03 +0900
Subject: Update eslint-server (vscode-eslint) to version 2

---
 settings/eslint-language-server.vim | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

(limited to 'settings')

diff --git a/settings/eslint-language-server.vim b/settings/eslint-language-server.vim
index 7377846..9f6a590 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,
+      \   'codeActionOnSave': {
+      \     'enable': v:true,
+      \     'mode': 'all',
+      \   },
+      \ 	'codeAction': {
+      \ 		'disableRuleComment': {
+      \ 			'enable': v:true,
+      \ 			'location': 'separateLine',
+      \ 		},
+      \ 		'showDocumentation': {
+      \ 			'enable': v:true,
+      \ 		},
+      \ 	},
+      \   'format': v:false,
+      \   'quiet': v:false,
+      \   'onIgnoredFiles': 'off',
       \   'options': {},
       \   'run': 'onType',
       \   'nodePath': v:null,
-      \   'quiet': v:false,
-      \   'workspaceFolder': v:null,
-      \   'codeAction': {
-      \     'disableRuleComment': {
-      \       'enable': v:true,
-      \       'location': 'separateLine'
-      \     },
-      \     'showDocumentation': {
-      \       'enable': v:true
-      \     }
-      \   }
-      \ },
+      \ }),
       \ }
 augroup END
-- 
cgit v1.2.3-54-g00ecf


From 6ae88c37f5c8a1afc4149c32d7fc03e3898c3d94 Mon Sep 17 00:00:00 2001
From: yaegassy <yaegassy@users.noreply.github.com>
Date: Tue, 25 Feb 2020 00:59:34 +0900
Subject: fix indent

---
 settings/eslint-language-server.vim | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'settings')

diff --git a/settings/eslint-language-server.vim b/settings/eslint-language-server.vim
index 9f6a590..f6dd6e3 100644
--- a/settings/eslint-language-server.vim
+++ b/settings/eslint-language-server.vim
@@ -15,15 +15,15 @@ augroup vimlsp_settings_eslint_language_server
       \     'enable': v:true,
       \     'mode': 'all',
       \   },
-      \ 	'codeAction': {
-      \ 		'disableRuleComment': {
-      \ 			'enable': v:true,
-      \ 			'location': 'separateLine',
-      \ 		},
-      \ 		'showDocumentation': {
-      \ 			'enable': v:true,
-      \ 		},
-      \ 	},
+      \   'codeAction': {
+      \     'disableRuleComment': {
+      \       'enable': v:true,
+      \       'location': 'separateLine',
+      \     },
+      \     'showDocumentation': {
+      \       'enable': v:true,
+      \     },
+      \   },
       \   'format': v:false,
       \   'quiet': v:false,
       \   'onIgnoredFiles': 'off',
-- 
cgit v1.2.3-54-g00ecf