From a009ea2d76786f620739df2b16d5aa0cf7146297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Andr=C3=A9=20Damas?= Date: Mon, 31 Mar 2025 11:19:48 +0100 Subject: [PATCH] reinstalled lspconfig --- lsp/eslint.lua | 37 -------------------------------- lsp/gopls.lua | 5 ----- lsp/jsonls.lua | 20 ----------------- lsp/lemminx.lua | 5 ----- lsp/pyright.lua | 16 -------------- lsp/ruff.lua | 5 ----- lsp/rust-analyzer.lua | 11 ---------- lsp/taplo.lua | 6 ------ lsp/vtsls.lua | 5 ----- lua/lsp/eslint.lua | 1 + lua/lsp/gopls.lua | 1 + lua/lsp/jsonls.lua | 8 +++++++ lua/lsp/lemminx.lua | 1 + {lsp => lua/lsp}/lua_ls.lua | 4 ---- lua/lsp/pyright.lua | 1 + lua/lsp/ruff.lua | 1 + lua/lsp/rust_analyzer.lua | 1 + {lsp => lua/lsp}/tailwindcss.lua | 12 ----------- lua/lsp/taplo.lua | 1 + lua/lsp/vtsls.lua | 1 + {lsp => lua/lsp}/yamlls.lua | 5 ----- lua/plugins/lsp.lua | 17 +++++++++------ 22 files changed, 27 insertions(+), 137 deletions(-) delete mode 100644 lsp/eslint.lua delete mode 100644 lsp/gopls.lua delete mode 100644 lsp/jsonls.lua delete mode 100644 lsp/lemminx.lua delete mode 100644 lsp/pyright.lua delete mode 100644 lsp/ruff.lua delete mode 100644 lsp/rust-analyzer.lua delete mode 100644 lsp/taplo.lua delete mode 100644 lsp/vtsls.lua create mode 100644 lua/lsp/eslint.lua create mode 100644 lua/lsp/gopls.lua create mode 100644 lua/lsp/jsonls.lua create mode 100644 lua/lsp/lemminx.lua rename {lsp => lua/lsp}/lua_ls.lua (75%) create mode 100644 lua/lsp/pyright.lua create mode 100644 lua/lsp/ruff.lua create mode 100644 lua/lsp/rust_analyzer.lua rename {lsp => lua/lsp}/tailwindcss.lua (56%) create mode 100644 lua/lsp/taplo.lua create mode 100644 lua/lsp/vtsls.lua rename {lsp => lua/lsp}/yamlls.lua (76%) diff --git a/lsp/eslint.lua b/lsp/eslint.lua deleted file mode 100644 index 245935e..0000000 --- a/lsp/eslint.lua +++ /dev/null @@ -1,37 +0,0 @@ -return { - cmd = { "vscode-eslint-language-server", "--stdio" }, - filetypes = { "javascript", "javascriptreact", "javascript.jsx", "typescript", "typescriptreact", "typescript.tsx", "vue", "svelte", "astro" }, - root_markers = { ".git" }, - settings = { - codeAction = { - disableRuleComment = { - enable = true, - location = "separateLine" - }, - showDocumentation = { - enable = true - } - }, - codeActionOnSave = { - enable = false, - mode = "all" - }, - experimental = { - useFlatConfig = false - }, - format = true, - nodePath = "", - onIgnoredFiles = "off", - problems = { - shortenToSingleLine = false - }, - quiet = false, - rulesCustomizations = {}, - run = "onType", - useESLintClass = false, - validate = "on", - workingDirectory = { - mode = "location" - } - } -} diff --git a/lsp/gopls.lua b/lsp/gopls.lua deleted file mode 100644 index e7511c9..0000000 --- a/lsp/gopls.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - cmd = { "gopls" }, - filetypes = { "go", "gomod", "gowork", "gotmpl" }, - root_markers = { ".git" }, -} diff --git a/lsp/jsonls.lua b/lsp/jsonls.lua deleted file mode 100644 index b14743a..0000000 --- a/lsp/jsonls.lua +++ /dev/null @@ -1,20 +0,0 @@ -local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities.textDocument.completion.completionItem.snippetSupport = true - -return { - cmd = { "vscode-json-language-server", "--stdio" }, - filetypes = { "json", "jsonc" }, - root_markers = { "." }, - - capabilities = capabilities, - init_options = { - provideFormatter = true - }, - single_file_support = true, - settings = { - json = { - schemas = require('schemastore').json.schemas(), - validate = { enable = true }, - }, - }, -} diff --git a/lsp/lemminx.lua b/lsp/lemminx.lua deleted file mode 100644 index 1a87161..0000000 --- a/lsp/lemminx.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - cmd = { "lemminx" }, - filetypes = { "xml", "xsd", "xsl", "xslt", "svg" }, - root_markers = { "." }, -} diff --git a/lsp/pyright.lua b/lsp/pyright.lua deleted file mode 100644 index d0e8783..0000000 --- a/lsp/pyright.lua +++ /dev/null @@ -1,16 +0,0 @@ -return { - cmd = { "pyright-langserver", "--stdio" }, - filetypes = { "python" }, - root_markers = { "pyproject.toml" }, - - settings = { - python = { - analysis = { - autoSearchPaths = true, - diagnosticMode = "openFilesOnly", - useLibraryCodeForTypes = true - } - } - }, - single_file_support = true -} diff --git a/lsp/ruff.lua b/lsp/ruff.lua deleted file mode 100644 index c1512f6..0000000 --- a/lsp/ruff.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - cmd = { "ruff", "server" }, - filetypes = { "python" }, - root_markers = { "pyproject.toml" }, -} diff --git a/lsp/rust-analyzer.lua b/lsp/rust-analyzer.lua deleted file mode 100644 index 4f050e4..0000000 --- a/lsp/rust-analyzer.lua +++ /dev/null @@ -1,11 +0,0 @@ -return { - cmd = { "rust-analyzer" }, - filetypes = { "rust" }, - root_makers = { "Cargo.toml", ".git" }, - capabilities = { - experimental = { - serverStatusNotification = true - } - }, - single_file_support = true, -} diff --git a/lsp/taplo.lua b/lsp/taplo.lua deleted file mode 100644 index ba264b5..0000000 --- a/lsp/taplo.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - cmd = { "taplo", "lsp", "stdio" }, - filetypes = { "toml" }, - single_file_support = true, - root_markers = { "." } -} diff --git a/lsp/vtsls.lua b/lsp/vtsls.lua deleted file mode 100644 index 786a0c6..0000000 --- a/lsp/vtsls.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - cmd = { "vtsls", "--stdio" }, - filetypes = { "javascript", "javascriptreact", "javascript.jsx", "typescript", "typescriptreact", "typescript.tsx" }, - root_markers = { ".git" }, -} diff --git a/lua/lsp/eslint.lua b/lua/lsp/eslint.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/lua/lsp/eslint.lua @@ -0,0 +1 @@ +return {} diff --git a/lua/lsp/gopls.lua b/lua/lsp/gopls.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/lua/lsp/gopls.lua @@ -0,0 +1 @@ +return {} diff --git a/lua/lsp/jsonls.lua b/lua/lsp/jsonls.lua new file mode 100644 index 0000000..b275f43 --- /dev/null +++ b/lua/lsp/jsonls.lua @@ -0,0 +1,8 @@ +return { + settings = { + json = { + schemas = require('schemastore').json.schemas(), + validate = { enable = true }, + }, + }, +} diff --git a/lua/lsp/lemminx.lua b/lua/lsp/lemminx.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/lua/lsp/lemminx.lua @@ -0,0 +1 @@ +return {} diff --git a/lsp/lua_ls.lua b/lua/lsp/lua_ls.lua similarity index 75% rename from lsp/lua_ls.lua rename to lua/lsp/lua_ls.lua index b30d97a..659d4ad 100644 --- a/lsp/lua_ls.lua +++ b/lua/lsp/lua_ls.lua @@ -1,8 +1,4 @@ return { - cmd = { "lua-language-server" }, - filetypes = { "lua" }, - root_markers = { ".git" }, - settings = { Lua = { runtime = { diff --git a/lua/lsp/pyright.lua b/lua/lsp/pyright.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/lua/lsp/pyright.lua @@ -0,0 +1 @@ +return {} diff --git a/lua/lsp/ruff.lua b/lua/lsp/ruff.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/lua/lsp/ruff.lua @@ -0,0 +1 @@ +return {} diff --git a/lua/lsp/rust_analyzer.lua b/lua/lsp/rust_analyzer.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/lua/lsp/rust_analyzer.lua @@ -0,0 +1 @@ +return {} diff --git a/lsp/tailwindcss.lua b/lua/lsp/tailwindcss.lua similarity index 56% rename from lsp/tailwindcss.lua rename to lua/lsp/tailwindcss.lua index fd430ae..2185174 100644 --- a/lsp/tailwindcss.lua +++ b/lua/lsp/tailwindcss.lua @@ -1,16 +1,4 @@ return { - cmd = { "tailwindcss-language-server", "--stdio" }, - filetypes = { - "aspnetcorerazor", "astro", "astro-markdown", "blade", "clojure", - "django-html", "htmldjango", "edge", "eelixir", "elixir", "ejs", - "erb", "eruby", "gohtml", "gohtmltmpl", "haml", "handlebars", "hbs", - "html", "htmlangular", "html-eex", "heex", "jade", "leaf", "liquid", - "markdown", "mdx", "mustache", "njk", "nunjucks", "php", "razor", - "slim", "twig", "css", "less", "postcss", "sass", "scss", "stylus", - "sugarss", "javascript", "javascriptreact", "reason", "rescript", - "typescript", "typescriptreact", "vue", "svelte", "templ" }, - root_markers = { ".git" }, - settings = { tailwindCSS = { classAttributes = { "class", "className", "classList", "class:list", "ngClass", "pathClassName" }, diff --git a/lua/lsp/taplo.lua b/lua/lsp/taplo.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/lua/lsp/taplo.lua @@ -0,0 +1 @@ +return {} diff --git a/lua/lsp/vtsls.lua b/lua/lsp/vtsls.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/lua/lsp/vtsls.lua @@ -0,0 +1 @@ +return {} diff --git a/lsp/yamlls.lua b/lua/lsp/yamlls.lua similarity index 76% rename from lsp/yamlls.lua rename to lua/lsp/yamlls.lua index b4858d4..57c40e0 100644 --- a/lsp/yamlls.lua +++ b/lua/lsp/yamlls.lua @@ -1,8 +1,4 @@ return { - cmd = { "yaml-language-server", "--stdio" }, - filetypes = { "yaml", "yaml.docker-compose", "yaml.gitlab" }, - root_markers = { "." }, - settings = { yaml = { schemaStore = { @@ -20,5 +16,4 @@ return { } } }, - single_file_support = true } diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 4c8ab57..ddff3eb 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -23,12 +23,6 @@ local format_on_save = function(client, bufnr) end end -local configs = {} -for _, v in ipairs(vim.api.nvim_get_runtime_file('lsp/*', true)) do - local name = vim.fn.fnamemodify(v, ':t:r') - configs[name] = true -end -vim.lsp.enable(vim.tbl_keys(configs)) vim.api.nvim_create_autocmd('LspAttach', { callback = function(args) @@ -57,6 +51,17 @@ vim.diagnostic.config({ }) return { + { + "neovim/nvim-lspconfig", + config = function() + local lspconfig = require('lspconfig') + for _, v in ipairs(vim.api.nvim_get_runtime_file('lua/lsp/*', true)) do + local name = vim.fn.fnamemodify(v, ':t:r') + local cfg = require("lsp/" .. name) + lspconfig[name].setup(cfg) + end + end + }, { "williamboman/mason.nvim",