Merge branch 'master' into julia

15 files changed, 42 insertions, 16 deletions

diff --git a/settings/cl-lsp.vim b/settings/cl-lsp.vim
index 46c3b5a..e613350 100644
--- a/settings/cl-lsp.vim
+++ b/settings/cl-lsp.vim
@@ -2,7 +2,7 @@ augroup vimlsp_settings_cl_lsp
   au!
   LspRegisterServer {
       \ 'name': 'cl-lsp',
-      \ 'cmd': {server_info->lsp_settings#get('cl-lsp', 'cmd', {key, name-> ['ros', '-Q', '--', trim(filter(systemlist("ros version"), 'v:val=~"^homedir"')[0][8:], '"''') . '/bin/cl-lsp', 'stdio']})},
+      \ 'cmd': {server_info->lsp_settings#get('cl-lsp', 'cmd', {key, name-> ['ros', '-Q', '--', trim(filter(systemlist('ros version'), 'v:val=~"^homedir"')[0][8:], '"''') . '/bin/cl-lsp', 'stdio']})},
       \ 'root_uri':{server_info->lsp_settings#get('cl-lsp', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))},
       \ 'initialization_options': lsp_settings#get('cl-lsp', 'initialization_options', {}),
       \ 'whitelist': lsp_settings#get('cl-lsp', 'whitelist', ['lisp']),
diff --git a/settings/css-languageserver.vim b/settings/css-languageserver.vim
index 3e4dc4f..de414c2 100644
--- a/settings/css-languageserver.vim
+++ b/settings/css-languageserver.vim
@@ -7,7 +7,7 @@ augroup vimlsp_settings_css_languageserver
       \ 'initialization_options': lsp_settings#get('css-languageserver', 'initialization_options', v:null),
       \ 'whitelist': lsp_settings#get('css-languageserver', 'whitelist', ['css', 'less', 'sass']),
       \ 'blacklist': lsp_settings#get('css-languageserver', 'blacklist', []),
-      \ 'config': lsp_settings#get('css-languageserver', 'config', {}),
+      \ 'config': lsp_settings#get('css-languageserver', 'config', {'typed_pattern': '-\?[a-zA-Z_]\+[_a-zA-Z0-9-]\+$'}),
       \ 'workspace_config': lsp_settings#get('css-languageserver', 'workspace_config', {
       \   'css': {'lint': {'validProperties': []}},
       \   'less': {'lint': {'validProperties': []}},
diff --git a/settings/digestif.vim b/settings/digestif.vim
index f7b8e8a..2fbe709 100644
--- a/settings/digestif.vim
+++ b/settings/digestif.vim
@@ -4,7 +4,7 @@ augroup vimlsp_settings_digestif
       \ 'name': 'digestif',
       \ 'cmd': {server_info->lsp_settings#get('digestif', 'cmd', [lsp_settings#exec_path('digestif')])},
       \ 'root_uri':{server_info->lsp_settings#get('digestif', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))},
-      \ 'initialization_options': lsp_settings#get('digestif', 'initialization_options', {"diagnostics": "true"}),
+      \ 'initialization_options': lsp_settings#get('digestif', 'initialization_options', {'diagnostics': 'true'}),
       \ 'whitelist': lsp_settings#get('digestif', 'whitelist', ['plaintex', 'tex']),
       \ 'blacklist': lsp_settings#get('digestif', 'blacklist', []),
       \ 'config': lsp_settings#get('digestif', 'config', {}),
diff --git a/settings/dls.vim b/settings/dls.vim
index a4fe3e1..b27b1b9 100644
--- a/settings/dls.vim
+++ b/settings/dls.vim
@@ -4,7 +4,7 @@ augroup vimlsp_settings_dls
       \ 'name': 'dls',
       \ 'cmd': {server_info->lsp_settings#get('dls', 'cmd', [lsp_settings#exec_path('dls')])},
       \ 'root_uri':{server_info->lsp_settings#get('dls', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))},
-      \ 'initialization_options': lsp_settings#get('dls', 'initialization_options', {"diagnostics": "true"}),
+      \ 'initialization_options': lsp_settings#get('dls', 'initialization_options', {'diagnostics': 'true'}),
       \ 'whitelist': lsp_settings#get('dls', 'whitelist', ['d']),
       \ 'blacklist': lsp_settings#get('dls', 'blacklist', []),
       \ 'config': lsp_settings#get('dls', 'config', {}),
diff --git a/settings/glslls.vim b/settings/glslls.vim
new file mode 100644
index 0000000..078fc66
--- /dev/null
+++ b/settings/glslls.vim
@@ -0,0 +1,13 @@
+augroup vimlsp_settings_glslls
+  au!
+  LspRegisterServer {
+      \ 'name': 'glslls',
+      \ 'cmd': {server_info->lsp_settings#get('glslls', 'cmd', [lsp_settings#exec_path('glslls'), '--stdin'])},
+      \ 'root_uri':{server_info->lsp_settings#get('glslls', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))},
+      \ 'initialization_options': lsp_settings#get('glslls', 'initialization_options', v:null),
+      \ 'whitelist': lsp_settings#get('glslls', 'whitelist', ['glsl']),
+      \ 'blacklist': lsp_settings#get('glslls', 'blacklist', []),
+      \ 'config': lsp_settings#get('glslls', 'config', {}),
+      \ 'workspace_config': lsp_settings#get('glslls', 'workspace_config', {name, key->{'json': {'format': {'enable': v:true}, 'schemas': json_decode(join(readfile(expand('<sfile>:h:h') . '/data/catalog.json'), "\n"))['schemas']}}}),
+      \ }
+augroup END
diff --git a/settings/gql-language-server.vim b/settings/gql-language-server.vim
index 8fe118d..4217c4b 100644
--- a/settings/gql-language-server.vim
+++ b/settings/gql-language-server.vim
@@ -4,7 +4,7 @@ augroup vimlsp_settings_gql_language_server
       \ 'name': 'gql-language-server',
       \ 'cmd': {server_info->lsp_settings#get('gql-language-server', 'cmd', [lsp_settings#exec_path('gql-language-server'), '--stdio'])},
       \ 'root_uri':{server_info->lsp_settings#get('gql-language-server', 'root_uri', lsp_settings#root_uri(extend(['package.json', 'tsconfig.json', '.gqlconfig'], g:lsp_settings_root_markers)))},
-      \ 'initialization_options': lsp_settings#get('gql-language-server', 'initialization_options', {"diagnostics": "true"}),
+      \ 'initialization_options': lsp_settings#get('gql-language-server', 'initialization_options', {'diagnostics': 'true'}),
       \ 'whitelist': lsp_settings#get('gql-language-server', 'whitelist', ['graphql']),
       \ 'blacklist': lsp_settings#get('gql-language-server', 'blacklist', []),
       \ 'config': lsp_settings#get('gql-language-server', 'config', {}),
diff --git a/settings/html-languageserver.vim b/settings/html-languageserver.vim
index 7855505..edecd24 100644
--- a/settings/html-languageserver.vim
+++ b/settings/html-languageserver.vim
@@ -7,7 +7,7 @@ augroup vimlsp_settings_html_languageserver
       \ 'initialization_options': lsp_settings#get('html-languageserver', 'initialization_options', {'embeddedLanguages': {'css': v:true, 'javascript': v:true}}),
       \ 'whitelist': lsp_settings#get('html-languageserver', 'whitelist', ['html']),
       \ 'blacklist': lsp_settings#get('html-languageserver', 'blacklist', []),
-      \ 'config': lsp_settings#get('html-languageserver', 'config', {}),
+      \ 'config': lsp_settings#get('html-languageserver', 'config', {'typed_pattern': '\(/\|k\+\)$'}),
       \ 'workspace_config': lsp_settings#get('html-languageserver', 'workspace_config', {}),
       \ }
 augroup END
diff --git a/settings/javascript-typescript-stdio.vim b/settings/javascript-typescript-stdio.vim
index 9d3f645..14762be 100644
--- a/settings/javascript-typescript-stdio.vim
+++ b/settings/javascript-typescript-stdio.vim
@@ -4,8 +4,8 @@ augroup vimlsp_settings_javascript_typescript_stdio
       \ 'name': 'javascript-typescript-stdio',
       \ 'cmd': {server_info->lsp_settings#get('javascript-typescript-stdio', 'cmd', [lsp_settings#exec_path('javascript-typescript-stdio')])},
       \ 'root_uri':{server_info->lsp_settings#get('javascript-typescript-stdio', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))},
-      \ 'initialization_options': lsp_settings#get('javascript-typescript-stdio', 'initialization_options', {"diagnostics": "true"}),
-      \ 'whitelist': lsp_settings#get('javascript-typescript-stdio', 'whitelist', ['javascript', 'javascriptreact']),
+      \ 'initialization_options': lsp_settings#get('javascript-typescript-stdio', 'initialization_options', {'diagnostics': 'true'}),
+      \ 'whitelist': lsp_settings#get('javascript-typescript-stdio', 'whitelist', ['javascript', 'javascriptreact', 'javascript.jsx']),
       \ 'blacklist': lsp_settings#get('javascript-typescript-stdio', 'blacklist', []),
       \ 'config': lsp_settings#get('javascript-typescript-stdio', 'config', {}),
       \ 'workspace_config': lsp_settings#get('javascript-typescript-stdio', 'workspace_config', {}),
diff --git a/settings/metals.vim b/settings/metals.vim
index 376d5f5..d0cdd53 100644
--- a/settings/metals.vim
+++ b/settings/metals.vim
@@ -7,7 +7,7 @@ augroup vimlsp_settings_metals
       \ 'initialization_options': lsp_settings#get('metals', 'initialization_options', v:null),
       \ 'whitelist': lsp_settings#get('metals', 'whitelist', ['scala', 'sbt']),
       \ 'blacklist': lsp_settings#get('metals', 'blacklist', []),
-      \ 'config': lsp_settings#get('metals', 'config', {}),
+      \ 'config': lsp_settings#get('metals', 'config', {'typed_pattern': '\k\zs'}),
       \ 'workspace_config': lsp_settings#get('metals', 'workspace_config', {}),
       \ }
 augroup END
diff --git a/settings/nimlsp.vim b/settings/nimlsp.vim
index 70a59a8..f467dc6 100644
--- a/settings/nimlsp.vim
+++ b/settings/nimlsp.vim
@@ -4,7 +4,7 @@ augroup vimlsp_settings_nimlsp
       \ 'name': 'nimlsp',
       \ 'cmd': {server_info->lsp_settings#get('nimlsp', 'cmd', [lsp_settings#exec_path('nimlsp')])},
       \ 'root_uri':{server_info->lsp_settings#get('nimlsp', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))},
-      \ 'initialization_options': lsp_settings#get('nimlsp', 'initialization_options', {"diagnostics": "true"}),
+      \ 'initialization_options': lsp_settings#get('nimlsp', 'initialization_options', {'diagnostics': 'true'}),
       \ 'whitelist': lsp_settings#get('nimlsp', 'whitelist', ['nim']),
       \ 'blacklist': lsp_settings#get('nimlsp', 'blacklist', []),
       \ 'config': lsp_settings#get('nimlsp', 'config', {}),
diff --git a/settings/powershell-languageserver.vim b/settings/powershell-languageserver.vim
new file mode 100644
index 0000000..105cd19
--- /dev/null
+++ b/settings/powershell-languageserver.vim
@@ -0,0 +1,13 @@
+augroup vimlsp_settings_powershell_languageserver
+  au!
+  LspRegisterServer {
+      \ 'name': 'powershell-languageserver',
+      \ 'cmd': {server_info->lsp_settings#get('powershell-languageserver', 'cmd', [lsp_settings#exec_path('powershell-languageserver')])},
+      \ 'root_uri':{server_info->lsp_settings#get('powershell-languageserver', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))},
+      \ 'initialization_options': lsp_settings#get('powershell-languageserver', 'initialization_options', v:null),
+      \ 'whitelist': lsp_settings#get('powershell-languageserver', 'whitelist', ['ps1']),
+      \ 'blacklist': lsp_settings#get('powershell-languageserver', 'blacklist', []),
+      \ 'config': lsp_settings#get('solargraph', 'config', {'typed_pattern': '\(\$[a-zA-Z0-9_:]*\|\k\+\)$'}),
+      \ 'workspace_config': lsp_settings#get('powershell-languageserver', 'workspace_config', {}),
+      \ }
+augroup END
diff --git a/settings/solargraph.vim b/settings/solargraph.vim
index 9373975..3b723ee 100644
--- a/settings/solargraph.vim
+++ b/settings/solargraph.vim
@@ -4,10 +4,10 @@ augroup vimlsp_settings_solargraph
       \ 'name': 'solargraph',
       \ 'cmd': {server_info->lsp_settings#get('solargraph', 'cmd', [lsp_settings#exec_path('solargraph'), 'stdio'])},
       \ 'root_uri':{server_info->lsp_settings#get('solargraph', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))},
-      \ 'initialization_options': lsp_settings#get('solargraph', 'initialization_options', {"diagnostics": "true"}),
+      \ 'initialization_options': lsp_settings#get('solargraph', 'initialization_options', {'diagnostics': 'true'}),
       \ 'whitelist': lsp_settings#get('solargraph', 'whitelist', ['ruby']),
       \ 'blacklist': lsp_settings#get('solargraph', 'blacklist', []),
-      \ 'config': lsp_settings#get('solargraph', 'config', {}),
+      \ 'config': lsp_settings#get('solargraph', 'config', {'typed_pattern': '\([$@]\k*\|\k\+\)$'}),
       \ 'workspace_config': lsp_settings#get('solargraph', 'workspace_config', {}),
       \ }
 augroup END
diff --git a/settings/texlab.vim b/settings/texlab.vim
index 94d4321..f9bce25 100644
--- a/settings/texlab.vim
+++ b/settings/texlab.vim
@@ -4,7 +4,7 @@ augroup vimlsp_settings_texlab
       \ 'name': 'texlab',
       \ 'cmd': {server_info->lsp_settings#get('texlab', 'cmd', [lsp_settings#exec_path('texlab')])},
       \ 'root_uri':{server_info->lsp_settings#get('texlab', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))},
-      \ 'initialization_options': lsp_settings#get('texlab', 'initialization_options', {"diagnostics": "true"}),
+      \ 'initialization_options': lsp_settings#get('texlab', 'initialization_options', {'diagnostics': 'true'}),
       \ 'whitelist': lsp_settings#get('texlab', 'whitelist', ['plaintex', 'tex']),
       \ 'blacklist': lsp_settings#get('texlab', 'blacklist', []),
       \ 'config': lsp_settings#get('texlab', 'config', {}),
diff --git a/settings/typescript-language-server.vim b/settings/typescript-language-server.vim
index 17b2db3..adf4838 100644
--- a/settings/typescript-language-server.vim
+++ b/settings/typescript-language-server.vim
@@ -4,8 +4,8 @@ augroup vimlsp_settings_typescript_language_server
       \ 'name': 'typescript-language-server',
       \ 'cmd': {server_info->lsp_settings#get('typescript-language-server', 'cmd', [lsp_settings#exec_path('typescript-language-server'), '--stdio'])},
       \ 'root_uri':{server_info->lsp_settings#get('typescript-language-server', 'root_uri', lsp_settings#root_uri(extend(['package.json', 'tsconfig.json'], g:lsp_settings_root_markers)))},
-      \ 'initialization_options': lsp_settings#get('typescript-language-server', 'initialization_options', {"diagnostics": "true"}),
-      \ 'whitelist': lsp_settings#get('typescript-language-server', 'whitelist', ['javascript', 'javascriptreact', 'typescript', 'typescriptreact']),
+      \ 'initialization_options': lsp_settings#get('typescript-language-server', 'initialization_options', {'diagnostics': 'true'}),
+      \ 'whitelist': lsp_settings#get('typescript-language-server', 'whitelist', ['javascript', 'javascriptreact', 'typescript', 'typescriptreact', 'typescript.tsx']),
       \ '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', {}),
diff --git a/settings/vls.vim b/settings/vls.vim
index 7bb3845..d2c73a4 100644
--- a/settings/vls.vim
+++ b/settings/vls.vim
@@ -4,7 +4,7 @@ augroup vimlsp_settings_vls
       \ 'name': 'vls',
       \ 'cmd': {server_info->lsp_settings#get('vls', 'cmd', [lsp_settings#exec_path('vls'), '--stdio'])},
       \ 'root_uri':{server_info->lsp_settings#get('vls', 'root_uri', lsp_settings#root_uri(extend(['package.json'], g:lsp_settings_root_markers)))},
-      \ 'initialization_options': lsp_settings#get('vls', 'initialization_options', {'config': {'vetur': {'useWorkspaceDependencies': v:false, 'validation': {'template': v:true, 'style': v:true, 'script': v:true}, 'completion': {'autoImport': v:false, 'useScaffoldSnippets': v:false, 'tagCasing': 'kebab'}, 'format': {'defaultFormatter': {'js': v:none, 'ts': v:none}, 'defaultFormatterOptions': {}, 'scriptInitialIndent': v:false, 'styleInitialIndent': v:false}, 'dev': {'logLevel': 'DEBUG'}}, 'css': {}, 'html': {'suggest': {}}, 'javascript': {'format': {}}, 'typescript': {'format': {}}, 'emmet': {}, 'stylusSupremacy': {}}}),
+      \ 'initialization_options': lsp_settings#get('vls', 'initialization_options', {'config': {'vetur': {'useWorkspaceDependencies': v:false, 'validation': {'template': v:true, 'style': v:true, 'script': v:true}, 'completion': {'autoImport': v:false, 'useScaffoldSnippets': v:false, 'tagCasing': 'kebab'}, 'format': {'defaultFormatter': {'js': '', 'ts': ''}, 'defaultFormatterOptions': {}, 'scriptInitialIndent': v:false, 'styleInitialIndent': v:false}, 'dev': {'logLevel': 'DEBUG'}}, 'css': {}, 'html': {'suggest': {}}, 'javascript': {'format': {}}, 'typescript': {'format': {}}, 'emmet': {}, 'stylusSupremacy': {}}}),
       \ 'whitelist': lsp_settings#get('vls', 'whitelist', ['vue']),
       \ 'blacklist': lsp_settings#get('vls', 'blacklist', []),
       \ 'config': lsp_settings#get('vls', 'config', {}),