From e65ef77e6cc12c68b28b5fe65758e6d09d64b96d Mon Sep 17 00:00:00 2001
From: William Boman <william@redwill.se>
Date: Sat, 28 May 2022 16:20:00 +0200
Subject: refactor(solang): don't download llvm (#729)

This is now assumed to be installed on the system instead.
---
 lua/nvim-lsp-installer/servers/solang/init.lua | 64 +++++++-------------------
 1 file changed, 16 insertions(+), 48 deletions(-)

(limited to 'lua')

diff --git a/lua/nvim-lsp-installer/servers/solang/init.lua b/lua/nvim-lsp-installer/servers/solang/init.lua
index 05c36a3f..77d8783b 100644
--- a/lua/nvim-lsp-installer/servers/solang/init.lua
+++ b/lua/nvim-lsp-installer/servers/solang/init.lua
@@ -1,5 +1,4 @@
 local server = require "nvim-lsp-installer.server"
-local path = require "nvim-lsp-installer.core.path"
 local functional = require "nvim-lsp-installer.core.functional"
 local platform = require "nvim-lsp-installer.core.platform"
 local process = require "nvim-lsp-installer.core.process"
@@ -9,61 +8,30 @@ local github = require "nvim-lsp-installer.core.managers.github"
 local coalesce, when = functional.coalesce, functional.when
 
 return function(name, root_dir)
-    ---@async
-    local function download_solang()
-        local source = github.release_file {
-            repo = "hyperledger-labs/solang",
-            asset_file = coalesce(
-                when(platform.is_mac and platform.arch == "x64", "solang-mac-intel"),
-                when(platform.is_mac and platform.arch == "arm64", "solang-mac-arm"),
-                when(platform.is_linux and platform.arch == "arm64", "solang-linux-arm64"),
-                when(platform.is_linux and platform.arch == "x64", "solang-linux-x86-64"),
-                when(platform.is_win, "solang.exe")
-            ),
-        }
-        source.with_receipt()
-        std.download_file(source.download_url, platform.is_win and "solang.exe" or "solang")
-        std.chmod("+x", { "solang" })
-        return source
-    end
-
-    ---@async
-    local function download_llvm()
-        local source = github.release_file {
-            repo = "hyperledger-labs/solang",
-            asset_file = coalesce(
-                when(platform.is_mac and platform.arch == "x64", "llvm13.0-mac-intel.tar.xz"),
-                when(platform.is_mac and platform.arch == "arm64", "llvm13.0-mac-arm.tar.xz"),
-                when(platform.is_linux and platform.arch == "x64", "llvm13.0-linux-x86-64.tar.xz"),
-                when(platform.is_linux and platform.arch == "arm64", "llvm13.0-linux-arm64.tar.xz"),
-                when(platform.is_win, "llvm13.0-win.zip")
-            ),
-        }
-        if platform.is_win then
-            std.download_file(source.download_url, "llvm.zip")
-            std.unzip("llvm.zip", ".")
-        else
-            std.download_file(source.download_url, "llvm.tar.xz")
-            std.untar "llvm.tar.xz"
-        end
-    end
-
     return server.Server:new {
         name = name,
         root_dir = root_dir,
         homepage = "https://solang.readthedocs.io/en/latest/",
         languages = { "solidity" },
-        ---@param ctx InstallContext
-        installer = function(ctx)
-            ctx:run_concurrently { download_solang, download_llvm }
+        ---@async
+        installer = function()
+            local source = github.download_release_file({
+                repo = "hyperledger-labs/solang",
+                out_file = platform.is.win and "solang.exe" or "solang",
+                asset_file = coalesce(
+                    when(platform.is.mac_x64, "solang-mac-intel"),
+                    when(platform.is.mac_arm64, "solang-mac-arm"),
+                    when(platform.is.linux_arm64, "solang-linux-arm64"),
+                    when(platform.is.linux_x64, "solang-linux-x86-64"),
+                    when(platform.is.win_x64, "solang.exe")
+                ),
+            }).with_receipt()
+            std.chmod("+x", { "solang" })
+            return source
         end,
         default_options = {
             cmd_env = {
-                PATH = process.extend_path {
-                    path.concat { root_dir },
-                    path.concat { root_dir, "llvm13.0", "bin" },
-                    path.concat { root_dir, "llvm12.0", "bin" }, -- kept for backwards compatibility
-                },
+                PATH = process.extend_path { root_dir },
             },
         },
     }
-- 
cgit v1.2.3-70-g09d2