4 files changed, 21 insertions, 36 deletions
diff --git a/lua/nvim-lsp-installer/servers/cssls/init.lua b/lua/nvim-lsp-installer/servers/cssls/init.lua
index fc9f0f80..caa2574a 100644
--- a/lua/nvim-lsp-installer/servers/cssls/init.lua
+++ b/lua/nvim-lsp-installer/servers/cssls/init.lua
@@ -1,13 +1,3 @@
-local server = require("nvim-lsp-installer.server")
-local npm = require("nvim-lsp-installer.installers.npm")
+local create_server = require("nvim-lsp-installer.servers.vscode-langservers-extracted")
 
-local root_dir = server.get_server_root_path("css")
-
-return server.Server:new {
-    name = "cssls",
-    root_dir = root_dir,
-    installer = npm.packages { "vscode-css-languageserver-bin" },
-    default_options = {
-        cmd = { npm.executable(root_dir, "css-languageserver") , "--stdio" },
-    },
-}
+return create_server("cssls", "vscode-css-language-server")
diff --git a/lua/nvim-lsp-installer/servers/html/init.lua b/lua/nvim-lsp-installer/servers/html/init.lua
index 7fce1c82..9f3e4b83 100644
--- a/lua/nvim-lsp-installer/servers/html/init.lua
+++ b/lua/nvim-lsp-installer/servers/html/init.lua
@@ -1,13 +1,3 @@
-local server = require("nvim-lsp-installer.server")
-local npm = require("nvim-lsp-installer.installers.npm")
+local create_server = require("nvim-lsp-installer.servers.vscode-langservers-extracted")
 
-local root_dir = server.get_server_root_path("html")
-
-return server.Server:new {
-    name = "html",
-    root_dir = root_dir,
-    installer = npm.packages { "vscode-html-languageserver-bin" },
-    default_options = {
-        cmd = { npm.executable(root_dir, "html-languageserver"), "--stdio" },
-    },
-}
+return create_server("html", "vscode-html-language-server")
diff --git a/lua/nvim-lsp-installer/servers/jsonls/init.lua b/lua/nvim-lsp-installer/servers/jsonls/init.lua
index cc9ba2bb..186e6d49 100644
--- a/lua/nvim-lsp-installer/servers/jsonls/init.lua
+++ b/lua/nvim-lsp-installer/servers/jsonls/init.lua
@@ -1,13 +1,3 @@
-local server = require("nvim-lsp-installer.server")
-local npm = require("nvim-lsp-installer.installers.npm")
+local create_server = require("nvim-lsp-installer.servers.vscode-langservers-extracted")
 
-local root_dir = server.get_server_root_path("json")
-
-return server.Server:new {
-    name = "jsonls",
-    root_dir = root_dir,
-    installer = npm.packages { "vscode-json-languageserver" },
-    default_options = {
-        cmd = { npm.executable(root_dir, "vscode-json-languageserver"), "--stdio" },
-    },
-}
+return create_server("jsonls", "vscode-json-language-server")
diff --git a/lua/nvim-lsp-installer/servers/vscode-langservers-extracted/init.lua b/lua/nvim-lsp-installer/servers/vscode-langservers-extracted/init.lua
new file mode 100644
index 00000000..84286c3e
--- /dev/null
+++ b/lua/nvim-lsp-installer/servers/vscode-langservers-extracted/init.lua
@@ -0,0 +1,15 @@
+local server = require("nvim-lsp-installer.server")
+local npm = require("nvim-lsp-installer.installers.npm")
+
+local root_dir = server.get_server_root_path("vscode-langservers-extracted")
+
+return function (name, executable)
+    return server.Server:new {
+        name = name,
+        root_dir = root_dir,
+        installer = npm.packages { "vscode-langservers-extracted" },
+        default_options = {
+            cmd = { npm.executable(root_dir, executable), "--stdio" },
+        },
+    }
+end