diff options
| author | William Boman <william@redwill.se> | 2023-03-02 02:26:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-02 01:26:52 +0000 |
| commit | 08d074cd0c4d40e5b6033a67246f46072ecfe38e (patch) | |
| tree | 2a09b953b8f2fd6993d1ad875ac954e7a5587e56 | |
| parent | fix(scripts): manually set registries before interacting with mason-registry ... (diff) | |
| download | mason-lspconfig-08d074cd0c4d40e5b6033a67246f46072ecfe38e.tar mason-lspconfig-08d074cd0c4d40e5b6033a67246f46072ecfe38e.tar.gz mason-lspconfig-08d074cd0c4d40e5b6033a67246f46072ecfe38e.tar.bz2 mason-lspconfig-08d074cd0c4d40e5b6033a67246f46072ecfe38e.tar.lz mason-lspconfig-08d074cd0c4d40e5b6033a67246f46072ecfe38e.tar.xz mason-lspconfig-08d074cd0c4d40e5b6033a67246f46072ecfe38e.tar.zst mason-lspconfig-08d074cd0c4d40e5b6033a67246f46072ecfe38e.zip | |
feat(solang): also include $MASON/opt/solang llvm bins (#164)
This will be the new location of LLVM-patched bins once https://github.com/mason-org/mason-registry/ is live.
| -rw-r--r-- | lua/mason-lspconfig/server_configurations/solang/init.lua | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lua/mason-lspconfig/server_configurations/solang/init.lua b/lua/mason-lspconfig/server_configurations/solang/init.lua index a8678af..6dcc7a1 100644 --- a/lua/mason-lspconfig/server_configurations/solang/init.lua +++ b/lua/mason-lspconfig/server_configurations/solang/init.lua @@ -3,11 +3,13 @@ local process = require "mason-core.process" ---@param install_dir string return function(install_dir) + local llvm_bins = { vim.fn.expand(path.concat { install_dir, "llvm*", "bin" }, true, true)[1] } + if vim.env.MASON then + table.insert(llvm_bins, vim.fn.expand "$MASON/opt/solang/llvm15.0/bin") + end return { cmd_env = { - PATH = process.extend_path { - vim.fn.expand(path.concat { install_dir, "llvm*", "bin" }, true, true)[1], - }, + PATH = process.extend_path(llvm_bins), }, } end |