add support LspInstall where possible

8 files changed, 38 insertions, 11 deletions

diff --git a/lua/lsp/bash-ls.lua b/lua/lsp/bash-ls.lua
index 723f71ca..9131e9c9 100644
--- a/lua/lsp/bash-ls.lua
+++ b/lua/lsp/bash-ls.lua
@@ -1,2 +1,5 @@
 -- npm i -g bash-language-server
-require'lspconfig'.bashls.setup {on_attach = require'lsp'.common_on_attach}
+require'lspconfig'.bashls.setup {
+    cmd = {DATA_PATH .. "/lspinstall/bash/node_modules/.bin/bash-language-server", "start"},
+    on_attach = require'lsp'.common_on_attach
+}
diff --git a/lua/lsp/css-ls.lua b/lua/lsp/css-ls.lua
index 0da8868d..f68256a4 100644
--- a/lua/lsp/css-ls.lua
+++ b/lua/lsp/css-ls.lua
@@ -1,2 +1,8 @@
 -- npm install -g vscode-css-languageserver-bin
-require'lspconfig'.cssls.setup {on_attach = require'lsp'.common_on_attach}
+require'lspconfig'.cssls.setup {
+    cmd = {
+        "node", DATA_PATH .. "/lspinstall/css/vscode-css/css-language-features/server/dist/node/cssServerMain.js",
+        "--stdio"
+    },
+    on_attach = require'lsp'.common_on_attach
+}
diff --git a/lua/lsp/docker-ls.lua b/lua/lsp/docker-ls.lua
index 96a6babb..b477a239 100644
--- a/lua/lsp/docker-ls.lua
+++ b/lua/lsp/docker-ls.lua
@@ -1,2 +1,6 @@
 -- npm install -g dockerfile-language-server-nodejs
-require'lspconfig'.dockerls.setup {on_attach = require'lsp'.common_on_attach}
+require'lspconfig'.dockerls.setup {
+    cmd = {DATA_PATH .. "/lspinstall/dockerfile/node_modules/.bin/docker-langserver", "--stdio"},
+    on_attach = require'lsp'.common_on_attach,
+	root_dir = vim.loop.cwd
+}
diff --git a/lua/lsp/efm-general-ls.lua b/lua/lsp/efm-general-ls.lua
index 3b9243a0..23df2c74 100644
--- a/lua/lsp/efm-general-ls.lua
+++ b/lua/lsp/efm-general-ls.lua
@@ -45,6 +45,7 @@ local markdownPandocFormat = {formatCommand = 'pandoc -f markdown -t gfm -sp --t
 
 require"lspconfig".efm.setup {
     -- init_options = {initializationOptions},
+	cmd = { DATA_PATH .. "/lspinstall/efm/efm-langserver" },
     init_options = {documentFormatting = true, codeAction = false},
     filetypes = {"lua", "python", "javascriptreact", "javascript", "sh", "html", "css", "json", "yaml", "markdown"},
     settings = {
diff --git a/lua/lsp/html-ls.lua b/lua/lsp/html-ls.lua
index 94908031..f3027fb8 100644
--- a/lua/lsp/html-ls.lua
+++ b/lua/lsp/html-ls.lua
@@ -2,4 +2,8 @@
 local capabilities = vim.lsp.protocol.make_client_capabilities()
 capabilities.textDocument.completion.completionItem.snippetSupport = true
 
-require'lspconfig'.html.setup {on_attach = require'lsp'.common_on_attach, capabilities = capabilities}
+require'lspconfig'.html.setup {
+    cmd = {"node", DATA_PATH .. "/lspinstall/html/vscode-html/html-language-features/server/dist/node/htmlServerMain.js", "--stdio"},
+    on_attach = require'lsp'.common_on_attach,
+    capabilities = capabilities
+}
diff --git a/lua/lsp/json-ls.lua b/lua/lsp/json-ls.lua
index 57c13224..952673ac 100644
--- a/lua/lsp/json-ls.lua
+++ b/lua/lsp/json-ls.lua
@@ -1,11 +1,16 @@
 -- npm install -g vscode-json-languageserver
 require'lspconfig'.jsonls.setup {
+    cmd = {
+        "node", DATA_PATH .. "/lspinstall/json/vscode-json/json-language-features/server/dist/node/jsonServerMain.js",
+        "--stdio"
+    },
     on_attach = require'lsp'.common_on_attach,
+
     commands = {
-      Format = {
-        function()
-          vim.lsp.buf.range_formatting({},{0,0},{vim.fn.line("$"),0})
-        end
-      }
+        Format = {
+            function()
+                vim.lsp.buf.range_formatting({}, {0, 0}, {vim.fn.line("$"), 0})
+            end
+        }
     }
 }
diff --git a/lua/lsp/vim-ls.lua b/lua/lsp/vim-ls.lua
index f2dcb79b..39beb119 100644
--- a/lua/lsp/vim-ls.lua
+++ b/lua/lsp/vim-ls.lua
@@ -1,2 +1,5 @@
 -- npm install -g vim-language-server
-require'lspconfig'.vimls.setup {on_attach = require'lsp'.common_on_attach}
+require'lspconfig'.vimls.setup {
+    cmd = {DATA_PATH .. "/lspinstall/vim/node_modules/.bin/vim-language-server", "--stdio"},
+    on_attach = require'lsp'.common_on_attach
+}
diff --git a/lua/lsp/yaml-ls.lua b/lua/lsp/yaml-ls.lua
index e611572b..3fbc41e4 100644
--- a/lua/lsp/yaml-ls.lua
+++ b/lua/lsp/yaml-ls.lua
@@ -1,4 +1,5 @@
 -- npm install -g yaml-language-server
 require'lspconfig'.yamlls.setup{
-    -- on_attach = require'lsp'.common_on_attach,
+	cmd = {DATA_PATH .. "/lspinstall/yaml/node_modules/.bin/yaml-language-server", "--stdio"},
+    on_attach = require'lsp'.common_on_attach,
 }