1 files changed, 18 insertions, 17 deletions
diff --git a/lua/nvim-lsp-installer/servers/sumneko_lua/init.lua b/lua/nvim-lsp-installer/servers/sumneko_lua/init.lua
index 7ad00ebe..696679b0 100644
--- a/lua/nvim-lsp-installer/servers/sumneko_lua/init.lua
+++ b/lua/nvim-lsp-installer/servers/sumneko_lua/init.lua
@@ -1,32 +1,33 @@
 local server = require "nvim-lsp-installer.server"
-local installers = require "nvim-lsp-installer.installers"
 local path = require "nvim-lsp-installer.path"
-local zx = require "nvim-lsp-installer.installers.zx"
+local platform = require "nvim-lsp-installer.platform"
+local Data = require "nvim-lsp-installer.data"
+local std = require "nvim-lsp-installer.installers.std"
 
-local root_dir = server.get_server_root_path "lua"
+local root_dir = server.get_server_root_path "sumneko_lua"
 
-local uname_alias = {
-    Darwin = "macOS",
-}
-local uname = vim.fn.system("uname"):gsub("%s+", "")
-local bin_dir = uname_alias[uname] or uname
+local bin_dir = Data.coalesce(
+    Data.when(platform.is_mac, "macOS"),
+    Data.when(platform.is_unix, "Linux"),
+    Data.when(platform.is_win, "Windows")
+)
 
 return server.Server:new {
     name = "sumneko_lua",
     root_dir = root_dir,
-    installer = installers.when {
-        unix = zx.file "./install.mjs",
+    installer = {
+        std.unzip_remote "https://github.com/sumneko/vscode-lua/releases/download/v2.3.6/lua-2.3.6.vsix",
+        -- see https://github.com/sumneko/vscode-lua/pull/43
+        std.chmod(
+            "+x",
+            { "extension/server/bin/macOS/lua-language-server", "extension/server/bin/Linux/lua-language-server" }
+        ),
     },
-    pre_install_check = function()
-        if vim.fn.executable "ninja" ~= 1 then
-            error "ninja not installed (see https://github.com/ninja-build/ninja/wiki/Pre-built-Ninja-packages)"
-        end
-    end,
     default_options = {
         cmd = {
-            path.concat { root_dir, "bin", bin_dir, "lua-language-server" },
+            path.concat { root_dir, "extension", "server", "bin", bin_dir, "lua-language-server" },
             "-E",
-            path.concat { root_dir, "main.lua" },
+            path.concat { root_dir, "extension", "server", "main.lua" },
         },
         settings = {
             Lua = {