Add elm-language-server, json-languageserver

8 files changed, 69 insertions, 1 deletions

diff --git a/installer/install-elm-language-server.cmd b/installer/install-elm-language-server.cmd
new file mode 100644
index 0000000..9b58339
--- /dev/null
+++ b/installer/install-elm-language-server.cmd
@@ -0,0 +1,5 @@
+@echo off
+
+cd %~dp0
+
+call npm_install elm-language-server "@elm-tooling/elm-language-server"
diff --git a/installer/install-elm-language-server.sh b/installer/install-elm-language-server.sh
new file mode 100755
index 0000000..e0a1b27
--- /dev/null
+++ b/installer/install-elm-language-server.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+cd $(dirname $0)
+
+. ./npm.sh
+npm_install elm-languageserver "@elm-tooling/elm-language-server"
diff --git a/installer/install-html-languageserver.cmd b/installer/install-html-languageserver.cmd
index 90ac626..0f17784 100644
--- a/installer/install-html-languageserver.cmd
+++ b/installer/install-html-languageserver.cmd
@@ -2,4 +2,4 @@
 
 cd %~dp0
 
-call npm_install html-languageserver vscode-html-languageserver-bin
+call npm_install html-languageserver vscode-json-languageserver-bin
diff --git a/installer/install-json-languageserver.cmd b/installer/install-json-languageserver.cmd
new file mode 100644
index 0000000..8e76105
--- /dev/null
+++ b/installer/install-json-languageserver.cmd
@@ -0,0 +1,5 @@
+@echo off
+
+cd %~dp0
+
+call npm_install json-languageserver vscode-json-languageserver-bin
diff --git a/installer/install-json-languageserver.sh b/installer/install-json-languageserver.sh
new file mode 100755
index 0000000..8e5c2f2
--- /dev/null
+++ b/installer/install-json-languageserver.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ./npm.sh
+npm_install json-languageserver vscode-json-languageserver-bin
diff --git a/settings.json b/settings.json
index c679dbd..992d02d 100644
--- a/settings.json
+++ b/settings.json
@@ -188,5 +188,21 @@
         "java"
       ]
     }
+  ],
+  "elm": [
+    {
+      "command": "elm-language-server",
+      "requires": [
+        "npm"
+      ]
+    }
+  ],
+  "json": [
+    {
+      "command": "json-languageserver",
+      "requires": [
+        "npm"
+      ]
+    }
   ]
 }
diff --git a/settings/elm-language-server.vim b/settings/elm-language-server.vim
new file mode 100644
index 0000000..8a65f89
--- /dev/null
+++ b/settings/elm-language-server.vim
@@ -0,0 +1,13 @@
+augroup vimlsp_settings_elm_language_server
+  au!
+  LspRegisterServer {
+      \ 'name': 'elm-language-server',
+      \ 'cmd': {server_info->lsp_settings#get('elm-language-server', 'cmd', [lsp_settings#exec_path('elm-language-server')])},
+      \ 'root_uri':{server_info->lsp_settings#get('elm-language-server', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
+      \ 'initialization_options': lsp_settings#get('elm-language-server', 'initialization_options', {"diagnostics": "true"}),
+      \ 'whitelist': lsp_settings#get('elm-language-server', 'whitelist', ['elm', 'elm.tsx']),
+      \ 'blacklist': lsp_settings#get('elm-language-server', 'blacklist', []),
+      \ 'config': lsp_settings#get('elm-language-server', 'config', {}),
+      \ 'workspace_config': lsp_settings#get('elm-language-server', 'workspace_config', {}),
+      \ }
+augroup END
diff --git a/settings/json-languageserver.vim b/settings/json-languageserver.vim
new file mode 100644
index 0000000..626df64
--- /dev/null
+++ b/settings/json-languageserver.vim
@@ -0,0 +1,13 @@
+augroup vimlsp_settings_json_languageserver
+  au!
+  LspRegisterServer {
+      \ 'name': 'json-languageserver',
+      \ 'cmd': {server_info->lsp_settings#get('json-languageserver', 'cmd', [lsp_settings#exec_path('json-languageserver'), '--stdio'])},
+      \ 'root_uri':{server_info->lsp_settings#get('json-langserver', 'root_uri', lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), ['.git/'])))},
+      \ 'initialization_options': lsp_settings#get('json-languageserver', 'initialization_options', v:null),
+      \ 'whitelist': lsp_settings#get('json-languageserver', 'whitelist', ['json']),
+      \ 'blacklist': lsp_settings#get('json-languageserver', 'blacklist', []),
+      \ 'config': lsp_settings#get('json-languageserver', 'config', {}),
+      \ 'workspace_config': lsp_settings#get('json-languageserver', 'workspace_config', {}),
+      \ }
+augroup END