diff options
| author | William Boman <william@redwill.se> | 2021-10-03 21:15:32 +0200 |
|---|---|---|
| committer | William Boman <william@redwill.se> | 2021-10-03 21:38:34 +0200 |
| commit | 2f9a3800b976fb88f99a805dbb53f6ff6290a7ab (patch) | |
| tree | ac91b777cb05b44993e5b22f7aeff34f79c43f8b /lua | |
| parent | platform: add more arch aliases (diff) | |
| download | mason-2f9a3800b976fb88f99a805dbb53f6ff6290a7ab.tar mason-2f9a3800b976fb88f99a805dbb53f6ff6290a7ab.tar.gz mason-2f9a3800b976fb88f99a805dbb53f6ff6290a7ab.tar.bz2 mason-2f9a3800b976fb88f99a805dbb53f6ff6290a7ab.tar.lz mason-2f9a3800b976fb88f99a805dbb53f6ff6290a7ab.tar.xz mason-2f9a3800b976fb88f99a805dbb53f6ff6290a7ab.tar.zst mason-2f9a3800b976fb88f99a805dbb53f6ff6290a7ab.zip | |
assign to local var for less verbose expressions
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/nvim-lsp-installer/servers/denols/init.lua | 16 | ||||
| -rw-r--r-- | lua/nvim-lsp-installer/servers/omnisharp/init.lua | 16 | ||||
| -rw-r--r-- | lua/nvim-lsp-installer/servers/rust_analyzer/init.lua | 28 | ||||
| -rw-r--r-- | lua/nvim-lsp-installer/servers/terraformls/init.lua | 25 |
4 files changed, 45 insertions, 40 deletions
diff --git a/lua/nvim-lsp-installer/servers/denols/init.lua b/lua/nvim-lsp-installer/servers/denols/init.lua index f2131ff1..85245cf1 100644 --- a/lua/nvim-lsp-installer/servers/denols/init.lua +++ b/lua/nvim-lsp-installer/servers/denols/init.lua @@ -5,6 +5,8 @@ local Data = require "nvim-lsp-installer.data" local std = require "nvim-lsp-installer.installers.std" local context = require "nvim-lsp-installer.installers.context" +local coalesce, when = Data.coalesce, Data.when + return function(name, root_dir) return server.Server:new { name = name, @@ -12,16 +14,16 @@ return function(name, root_dir) installer = { context.github_release_file( "denoland/deno", - Data.coalesce( - Data.when( + coalesce( + when( platform.is_mac, - Data.coalesce( - Data.when(platform.arch == "arm64", "deno-aarch64-apple-darwin.zip"), - Data.when(platform.arch == "x64", "deno-x86_64-apple-darwin.zip") + coalesce( + when(platform.arch == "arm64", "deno-aarch64-apple-darwin.zip"), + when(platform.arch == "x64", "deno-x86_64-apple-darwin.zip") ) ), - Data.when(platform.is_linux, "deno-x86_64-unknown-linux-gnu.zip"), - Data.when(platform.is_win, "deno-x86_64-pc-windows-msvc.zip") + when(platform.is_linux, "deno-x86_64-unknown-linux-gnu.zip"), + when(platform.is_win, "deno-x86_64-pc-windows-msvc.zip") ) ), context.capture(function(ctx) diff --git a/lua/nvim-lsp-installer/servers/omnisharp/init.lua b/lua/nvim-lsp-installer/servers/omnisharp/init.lua index fb7f99bf..3b0f542e 100644 --- a/lua/nvim-lsp-installer/servers/omnisharp/init.lua +++ b/lua/nvim-lsp-installer/servers/omnisharp/init.lua @@ -5,6 +5,8 @@ local Data = require "nvim-lsp-installer.data" local std = require "nvim-lsp-installer.installers.std" local context = require "nvim-lsp-installer.installers.context" +local coalesce, when = Data.coalesce, Data.when + return function(name, root_dir) return server.Server:new { name = name, @@ -12,14 +14,14 @@ return function(name, root_dir) installer = { context.github_release_file( "OmniSharp/omnisharp-roslyn", - Data.coalesce( - Data.when(platform.is_mac, "omnisharp-osx.zip"), - Data.when(platform.is_linux and platform.arch == "x64", "omnisharp-linux-x64.zip"), - Data.when( + coalesce( + when(platform.is_mac, "omnisharp-osx.zip"), + when(platform.is_linux and platform.arch == "x64", "omnisharp-linux-x64.zip"), + when( platform.is_win, - Data.coalesce( - Data.when(platform.arch == "x64", "omnisharp-win-x64.zip"), - Data.when(platform.arch == "arm64", "omnisharp-win-arm64.zip") + coalesce( + when(platform.arch == "x64", "omnisharp-win-x64.zip"), + when(platform.arch == "arm64", "omnisharp-win-arm64.zip") ) ) ) diff --git a/lua/nvim-lsp-installer/servers/rust_analyzer/init.lua b/lua/nvim-lsp-installer/servers/rust_analyzer/init.lua index c81e37b1..fc843964 100644 --- a/lua/nvim-lsp-installer/servers/rust_analyzer/init.lua +++ b/lua/nvim-lsp-installer/servers/rust_analyzer/init.lua @@ -5,26 +5,28 @@ local std = require "nvim-lsp-installer.installers.std" local context = require "nvim-lsp-installer.installers.context" local Data = require "nvim-lsp-installer.data" -local target = Data.coalesce( - Data.when( +local coalesce, when = Data.coalesce, Data.when + +local target = coalesce( + when( platform.is_mac, - Data.coalesce( - Data.when(platform.arch == "arm64", "rust-analyzer-aarch64-apple-darwin.gz"), - Data.when(platform.arch == "x64", "rust-analyzer-x86_64-apple-darwin.gz") + coalesce( + when(platform.arch == "arm64", "rust-analyzer-aarch64-apple-darwin.gz"), + when(platform.arch == "x64", "rust-analyzer-x86_64-apple-darwin.gz") ) ), - Data.when( + when( platform.is_linux, - Data.coalesce( - Data.when(platform.arch == "arm64", "rust-analyzer-aarch64-unknown-linux-gnu.gz"), - Data.when(platform.arch == "x64", "rust-analyzer-x86_64-unknown-linux-gnu.gz") + coalesce( + when(platform.arch == "arm64", "rust-analyzer-aarch64-unknown-linux-gnu.gz"), + when(platform.arch == "x64", "rust-analyzer-x86_64-unknown-linux-gnu.gz") ) ), - Data.when( + when( platform.is_win, - Data.coalesce( - Data.when(platform.arch == "arm64", "rust-analyzer-aarch64-pc-windows-msvc.gz"), - Data.when(platform.arch == "x64", "rust-analyzer-x86_64-pc-windows-msvc.gz") + coalesce( + when(platform.arch == "arm64", "rust-analyzer-aarch64-pc-windows-msvc.gz"), + when(platform.arch == "x64", "rust-analyzer-x86_64-pc-windows-msvc.gz") ) ) ) diff --git a/lua/nvim-lsp-installer/servers/terraformls/init.lua b/lua/nvim-lsp-installer/servers/terraformls/init.lua index fac9a3ef..e400e2ce 100644 --- a/lua/nvim-lsp-installer/servers/terraformls/init.lua +++ b/lua/nvim-lsp-installer/servers/terraformls/init.lua @@ -5,6 +5,8 @@ local std = require "nvim-lsp-installer.installers.std" local context = require "nvim-lsp-installer.installers.context" local Data = require "nvim-lsp-installer.data" +local coalesce, when = Data.coalesce, Data.when + return function(name, root_dir) return server.Server:new { name = name, @@ -12,25 +14,22 @@ return function(name, root_dir) installer = { context.github_release_file("hashicorp/terraform-ls", function(version) return Data.coalesce( - Data.when( + when( platform.is_mac, - Data.coalesce( - Data.when(platform.arch == "arm64", "terraform-ls_%s_darwin_arm64.zip"), - Data.when(platform.arch == "x64", "terraform-ls_%s_darwin_amd64.zip") + coalesce( + when(platform.arch == "arm64", "terraform-ls_%s_darwin_arm64.zip"), + when(platform.arch == "x64", "terraform-ls_%s_darwin_amd64.zip") ) ), - Data.when( + when( platform.is_linux, - Data.coalesce( - Data.when(platform.arch == "arm64", "terraform-ls_%s_linux_arm64.zip"), - Data.when(platform.arch == "arm", "terraform-ls_%s_linux_arm.zip"), - Data.when(platform.arch == "x64", "terraform-ls_%s_linux_amd64.zip") + coalesce( + when(platform.arch == "arm64", "terraform-ls_%s_linux_arm64.zip"), + when(platform.arch == "arm", "terraform-ls_%s_linux_arm.zip"), + when(platform.arch == "x64", "terraform-ls_%s_linux_amd64.zip") ) ), - Data.when( - platform.is_win, - Data.coalesce(Data.when(platform.arch == "x64", "terraform-ls_%s_windows_amd64.zip")) - ) + when(platform.is_win, coalesce(when(platform.arch == "x64", "terraform-ls_%s_windows_amd64.zip"))) ):format(version:gsub("^v", "")) end), context.capture(function(ctx) |
