diff options
| author | adalessa <dalessandro.ariel@gmail.com> | 2023-02-23 09:04:41 +0100 |
|---|---|---|
| committer | adalessa <dalessandro.ariel@gmail.com> | 2023-02-23 09:04:41 +0100 |
| commit | 914ba277c332532fac161f9f3e5a00bc250590e6 (patch) | |
| tree | 3942c55a131a7958db516094b2840bc569a04e4a | |
| parent | e5f14dce3b58c374b5445252577c450afe61c759 (diff) | |
| download | nvim-conf-914ba277c332532fac161f9f3e5a00bc250590e6.tar.gz nvim-conf-914ba277c332532fac161f9f3e5a00bc250590e6.zip | |
feat: refactor lsp structure to support global install of servers
| -rw-r--r-- | lazy-lock.json | 10 | ||||
| -rw-r--r-- | lua/alpha/lsp/init.lua | 12 | ||||
| -rw-r--r-- | lua/alpha/lsp/mason.lua | 15 | ||||
| -rw-r--r-- | lua/alpha/lsp/servers.lua | 101 | ||||
| -rw-r--r-- | lua/alpha/lsp/setups.lua | 78 |
5 files changed, 113 insertions, 103 deletions
diff --git a/lazy-lock.json b/lazy-lock.json index abff0e6..667a6e0 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -19,7 +19,7 @@ "fzf.vim": { "branch": "master", "commit": "dc71692255b62d1f67dc55c8e51ab1aa467b1d46" }, "git-worktree.nvim": { "branch": "master", "commit": "d7f4e2584e81670154f07ca9fa5dd791d9c1b458" }, "gitsigns.nvim": { "branch": "main", "commit": "f388995990aba04cfdc7c3ab870c33e280601109" }, - "harpoon": { "branch": "master", "commit": "fa3d8f725ab658dd2a9d4ab66f245c874431662c" }, + "harpoon": { "branch": "master", "commit": "f7040fd0c44e7a4010369136547de5604b9c22a1" }, "hydra.nvim": { "branch": "master", "commit": "3ced42c0b6a6c85583ff0f221635a7f4c1ab0dd0" }, "icon-picker.nvim": { "branch": "master", "commit": "66d37ceae84099ca76235de44466829eb37118c2" }, "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, @@ -30,12 +30,12 @@ "markdown-preview.nvim": { "branch": "main", "commit": "cc05a30393e2bf9f12e2d59fc35a1aa928ed1727" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "93e58e100f37ef4fb0f897deeed20599dae9d128" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "6ca38efeb0406dea8da6c97f61d6f6ef30ab0576" }, - "mason.nvim": { "branch": "main", "commit": "5b9fd3822d686092c7ee08adfcbd2c764def22c5" }, + "mason.nvim": { "branch": "main", "commit": "11e34da70dc531e5d917fd4303db2d81258f6ada" }, "mind.nvim": { "branch": "v2.2", "commit": "79e0ca131d5e37dfa65f3f0e725d99742e4ff783" }, "neogen": { "branch": "main", "commit": "93d997dbddfe084e77ba4541c54a7b8bfd754fb1" }, "null-ls.nvim": { "branch": "main", "commit": "689cdd78f70af20a37b5309ebc287ac645ae4f76" }, - "nvim-autopairs": { "branch": "master", "commit": "bde7a1b4534e0a4c2451a738379cd628ba65eba7" }, - "nvim-cmp": { "branch": "main", "commit": "ba7a53478d0726683d1597ad1e814695033dcb4b" }, + "nvim-autopairs": { "branch": "master", "commit": "d80d93f182262a91674f472e90488f67a7230fe7" }, + "nvim-cmp": { "branch": "main", "commit": "7cd39409e7378fa711624687d3b430b8a56c3af9" }, "nvim-dap": { "branch": "master", "commit": "fd291e970aa7c46ba2c49448f7d2c94cc7828f4e" }, "nvim-dap-go": { "branch": "main", "commit": "b4ded7de579b4e2a85c203388233b54bf1028816" }, "nvim-dap-ui": { "branch": "master", "commit": "bf9f0c4768ce8cb99ac0b99cf06ae6f91c906a1a" }, @@ -45,7 +45,7 @@ "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" }, "nvim-projectconfig": { "branch": "master", "commit": "05fd34831e170db269d1b84597615bcdcdde930e" }, "nvim-transparent": { "branch": "main", "commit": "4c3c392f285378e606d154bee393b6b3dd18059c" }, - "nvim-treesitter": { "branch": "master", "commit": "ba35d094c1dfffa652e9c20971c51bd5271c1d25" }, + "nvim-treesitter": { "branch": "master", "commit": "454876fc6d25a699178cb66aeda4014dedb765f3" }, "nvim-treesitter-refactor": { "branch": "master", "commit": "75f5895cc662d61eb919da8050b7a0124400d589" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "2f3583001e2bf793480f38cf0d055571787b0259" }, "nvim-web-devicons": { "branch": "master", "commit": "4709a504d2cd2680fb511675e64ef2790d491d36" }, diff --git a/lua/alpha/lsp/init.lua b/lua/alpha/lsp/init.lua index 01bb3c1..07dc50c 100644 --- a/lua/alpha/lsp/init.lua +++ b/lua/alpha/lsp/init.lua @@ -2,13 +2,13 @@ -- install servers and tools require "alpha.lsp.mason" -local setups = require "alpha.lsp.setups" local lspconfig = require "lspconfig" -require("mason-lspconfig").setup_handlers { - function(server_name) - lspconfig[server_name].setup(setups[server_name]()) - end, -} +local servers = R "alpha.lsp.servers" + + +for server, setup in pairs(servers) do + lspconfig[server].setup(setup()) +end require "alpha.lsp.null-ls" diff --git a/lua/alpha/lsp/mason.lua b/lua/alpha/lsp/mason.lua index 345301a..5ad4b77 100644 --- a/lua/alpha/lsp/mason.lua +++ b/lua/alpha/lsp/mason.lua @@ -1,12 +1,25 @@ local mason = require "mason" local mason_lspconfig = require "mason-lspconfig" +local servers = require "alpha.lsp.servers" +local lspconfig = require "lspconfig" mason.setup() +local mason_servers = {} + +-- TODO: can be improve checking the setup function to see if sets the cmd +for server, value in pairs(servers) do + local cmd = lspconfig[server].document_config.default_config.cmd[1] + if vim.fn.executable(cmd) == 0 then + table.insert(mason, server) + end +end + mason_lspconfig.setup { - ensure_installed = require "alpha.lsp.servers", + ensure_installed = mason_servers, } +-- filter the list for the ones not globally installed require("mason-tool-installer").setup { ensure_installed = require "alpha.lsp.tools", } diff --git a/lua/alpha/lsp/servers.lua b/lua/alpha/lsp/servers.lua index fc18153..56e4a76 100644 --- a/lua/alpha/lsp/servers.lua +++ b/lua/alpha/lsp/servers.lua @@ -1,15 +1,90 @@ +local lsp_attach = require "alpha.lsp.attach" + +local lsp_flags = { + debounce_text_changes = 150, +} + +local default = function() + return { + on_attach = lsp_attach, + flags = lsp_flags, + } + end + return { - "emmet_ls", - "gopls", - "html", - "jsonls", - "lua_ls", - "marksman", - "nil_ls", - "phpactor", - "rust_analyzer", - "svelte", - "tailwindcss", - "tsserver", - "volar", + ["emmet_ls"] = function() + local capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()) + + return { + on_attach = lsp_attach, + flags = lsp_flags, + capabilities = capabilities, + filetypes = { "html", "typescriptreact", "javascriptreact", "css", "sass", "scss", "less", "blade", "vue" }, + } + end, + ["gopls"] = function() + return { + on_attach = lsp_attach, + flags = lsp_flags, + } + end, + ["html"] = default, + ["jsonls"] = default, + ["lua_ls"] = function() + return { + on_attach = lsp_attach, + flags = lsp_flags, + settings = { + Lua = { + runtime = { + version = "LuaJIT", + }, + diagnostics = { + globals = { "vim" }, + }, + workspace = { + library = vim.api.nvim_get_runtime_file("", true), + checkThirdParty = false, + }, + telemetry = { + enable = false, + }, + }, + }, + } + end, + ["marksman"] = default, + ["nil_ls"] = default, + ["phpactor"] = function() + return { + on_attach = lsp_attach, + flags = lsp_flags, + filetypes = { "php", "cucumber" }, + } + end, + ["rust_analyzer"] = function() + return { + on_attach = lsp_attach, + flags = lsp_flags, + settings = { + ["rust-analyzer"] = { + checkOnSave = { + allFeatures = true, + overrideCommand = { + "cargo", + "clippy", + "--workspace", + "--message-format=json", + "--all-targets", + "--all-features", + }, + }, + }, + }, + } + end, + ["svelte"] = default, + ["tailwindcss"] = default, + ["tsserver"] = default, + ["volar"] = default, } diff --git a/lua/alpha/lsp/setups.lua b/lua/alpha/lsp/setups.lua deleted file mode 100644 index 34d3dd8..0000000 --- a/lua/alpha/lsp/setups.lua +++ /dev/null @@ -1,78 +0,0 @@ -local lsp_attach = require "alpha.lsp.attach" - -local lsp_flags = { - debounce_text_changes = 150, -} - -return setmetatable({ - rust_analyzer = function() - return { - on_attach = lsp_attach, - flags = lsp_flags, - settings = { - ["rust-analyzer"] = { - checkOnSave = { - allFeatures = true, - overrideCommand = { - "cargo", - "clippy", - "--workspace", - "--message-format=json", - "--all-targets", - "--all-features", - }, - }, - }, - }, - } - end, - phpactor = function() - return { - on_attach = lsp_attach, - flags = lsp_flags, - filetypes = { "php", "cucumber" }, - } - end, - emmet_ls = function() - local capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()) - - return { - on_attach = lsp_attach, - flags = lsp_flags, - capabilities = capabilities, - filetypes = { "html", "typescriptreact", "javascriptreact", "css", "sass", "scss", "less", "blade", "vue" }, - } - end, - lua_ls = function() - return { - on_attach = lsp_attach, - flags = lsp_flags, - settings = { - Lua = { - runtime = { - version = "LuaJIT", - }, - diagnostics = { - globals = { "vim" }, - }, - workspace = { - library = vim.api.nvim_get_runtime_file("", true), - checkThirdParty = false, - }, - telemetry = { - enable = false, - }, - }, - }, - } - end, -}, { - __index = function() - return function() - return { - on_attach = lsp_attach, - flags = lsp_flags, - } - end - end, -}) |