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

7 files changed, 67 insertions, 14 deletions

diff --git a/settings/dls.vim b/settings/dls.vim
new file mode 100644
index 0000000..fc7a9dd
--- /dev/null
+++ b/settings/dls.vim
@@ -0,0 +1,13 @@
+augroup vimlsp_settings_dls
+  au!
+  LspRegisterServer {
+      \ '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(['.git/']))},
+      \ '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', {}),
+      \ 'workspace_config': lsp_settings#get('dls', 'workspace_config', {}),
+      \ }
+augroup END
diff --git a/settings/elixir-ls.vim b/settings/elixir-ls.vim
new file mode 100644
index 0000000..6695e0c
--- /dev/null
+++ b/settings/elixir-ls.vim
@@ -0,0 +1,14 @@
+augroup vimlsp_settings_elixir_ls
+  au!
+  LspRegisterServer {
+      \ 'name': 'elixir-ls',
+      \ 'cmd': {server_info->lsp_settings#get('elixir-ls', 'cmd', [lsp_settings#exec_path('elixir-ls')])},
+      \ 'root_uri':{server_info->lsp_settings#get('elixir-ls', 'root_uri', lsp_settings#root_uri(['.git/']))},
+      \ 'initialization_options': lsp_settings#get('elixir-ls', 'initialization_options', v:null),
+      \ 'whitelist': lsp_settings#get('elixir-ls', 'whitelist', ['elixir']),
+      \ 'blacklist': lsp_settings#get('elixir-ls', 'blacklist', []),
+      \ 'config': lsp_settings#get('elixir-ls', 'config', {}),
+      \ 'workspace_config': lsp_settings#get('elixir-ls', 'workspace_config', {}),
+      \ }
+augroup END
+
diff --git a/settings/javascript-typescript-langserver.vim b/settings/javascript-typescript-langserver.vim
deleted file mode 100644
index 72afeb0..0000000
--- a/settings/javascript-typescript-langserver.vim
+++ /dev/null
@@ -1,13 +0,0 @@
-augroup vimlsp_settings_javascript_typescript_langserver
-  au!
-  LspRegisterServer {
-      \ 'name': 'javascript-typescript-langserver',
-      \ 'cmd': {server_info->lsp_settings#get('javascript-typescript-langserver', 'cmd', [lsp_settings#exec_path('javascript-typescript-langserver')])},
-      \ 'root_uri':{server_info->lsp_settings#get('javascript-typescript-langserver', 'root_uri', lsp_settings#root_uri(['.git/']))},
-      \ 'initialization_options': lsp_settings#get('javascript-typescript-langserver', 'initialization_options', {"diagnostics": "true"}),
-      \ 'whitelist': lsp_settings#get('javascript-typescript-langserver', 'whitelist', ['javascript', 'javascriptreact']),
-      \ 'blacklist': lsp_settings#get('javascript-typescript-langserver', 'blacklist', []),
-      \ 'config': lsp_settings#get('javascript-typescript-langserver', 'config', {}),
-      \ 'workspace_config': lsp_settings#get('javascript-typescript-langserver', 'workspace_config', {}),
-      \ }
-augroup END
diff --git a/settings/javascript-typescript-stdio.vim b/settings/javascript-typescript-stdio.vim
new file mode 100644
index 0000000..eb370d5
--- /dev/null
+++ b/settings/javascript-typescript-stdio.vim
@@ -0,0 +1,13 @@
+augroup vimlsp_settings_javascript_typescript_stdio
+  au!
+  LspRegisterServer {
+      \ '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(['.git/']))},
+      \ 'initialization_options': lsp_settings#get('javascript-typescript-stdio', 'initialization_options', {"diagnostics": "true"}),
+      \ 'whitelist': lsp_settings#get('javascript-typescript-stdio', 'whitelist', ['javascript', 'javascriptreact']),
+      \ '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', {}),
+      \ }
+augroup END
diff --git a/settings/nimlsp.vim b/settings/nimlsp.vim
new file mode 100644
index 0000000..95c71e1
--- /dev/null
+++ b/settings/nimlsp.vim
@@ -0,0 +1,13 @@
+augroup vimlsp_settings_nimlsp
+  au!
+  LspRegisterServer {
+      \ '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(['.git/']))},
+      \ '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', {}),
+      \ 'workspace_config': lsp_settings#get('nimlsp', 'workspace_config', {}),
+      \ }
+augroup END
diff --git a/settings/texlab.vim b/settings/texlab.vim
new file mode 100644
index 0000000..3cdee7d
--- /dev/null
+++ b/settings/texlab.vim
@@ -0,0 +1,13 @@
+augroup vimlsp_settings_texlab
+  au!
+  LspRegisterServer {
+      \ '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(['.git/']))},
+      \ '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', {}),
+      \ 'workspace_config': lsp_settings#get('texlab', 'workspace_config', {}),
+      \ }
+augroup END
diff --git a/settings/typescript-language-server.vim b/settings/typescript-language-server.vim
index 8b62b67..438696c 100644
--- a/settings/typescript-language-server.vim
+++ b/settings/typescript-language-server.vim
@@ -5,7 +5,7 @@ augroup vimlsp_settings_typescript_language_server
       \ 'cmd': {server_info->lsp_settings#get('typescript-language-server', 'cmd', [lsp_settings#exec_path('typescript-language-server'), '--stdio', '--tsserver-path', lsp_settings#exec_path('tsserver')])},
       \ 'root_uri':{server_info->lsp_settings#get('typescript-language-server', 'root_uri', lsp_settings#root_uri(['.git/', 'package.json']))},
       \ 'initialization_options': lsp_settings#get('typescript-language-server', 'initialization_options', {"diagnostics": "true"}),
-      \ 'whitelist': lsp_settings#get('typescript-language-server', 'whitelist', ['typescript', 'typescriptreact']),
+      \ 'whitelist': lsp_settings#get('typescript-language-server', 'whitelist', ['javascript', 'typescript', 'typescriptreact']),
       \ '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', {}),