From 8ea214d125347c43c299e6d351f06a900ed0e585 Mon Sep 17 00:00:00 2001 From: Holger Preu Date: Wed, 14 May 2025 21:51:29 +0200 Subject: [PATCH] changed config for breaking changes of mason 2.0 --- lua/holger/plugins/lsp/lspconfig.lua | 81 +++++++--------------------- lua/holger/plugins/lsp/mason.lua | 6 +-- 2 files changed, 20 insertions(+), 67 deletions(-) diff --git a/lua/holger/plugins/lsp/lspconfig.lua b/lua/holger/plugins/lsp/lspconfig.lua index df13097..16098ca 100644 --- a/lua/holger/plugins/lsp/lspconfig.lua +++ b/lua/holger/plugins/lsp/lspconfig.lua @@ -89,69 +89,26 @@ return { -- local hl = "DiagnosticSign" .. type -- vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" }) -- end + -- + for _, server in ipairs({ + "html", + "cssls", + "tailwindcss", + "lua_ls", + "pyright", + }) do + lspconfig[server].setup({ capabilities = capabilities }) + end - mason_lspconfig.setup_handlers({ - -- default handler for installed servers - function(server_name) - lspconfig[server_name].setup({ - capabilities = capabilities, - }) - end, - ["svelte"] = function() - -- configure svelte server - lspconfig["svelte"].setup({ - capabilities = capabilities, - on_attach = function(client, bufnr) - vim.api.nvim_create_autocmd("BufWritePost", { - pattern = { "*.js", "*.ts" }, - callback = function(ctx) - -- Here use ctx.match instead of ctx.file - client.notify("$/onDidChangeTsOrJsFile", { uri = ctx.match }) - end, - }) - end, - }) - end, - ["graphql"] = function() - -- configure graphql language server - lspconfig["graphql"].setup({ - capabilities = capabilities, - filetypes = { "graphql", "gql", "svelte", "typescriptreact", "javascriptreact" }, - }) - end, - ["emmet_ls"] = function() - -- configure emmet language server - lspconfig["emmet_ls"].setup({ - capabilities = capabilities, - filetypes = { - "html", - "typescriptreact", - "javascriptreact", - "css", - "sass", - "scss", - "less", - "svelte", - }, - }) - end, - ["lua_ls"] = function() - -- configure lua server (with special settings) - lspconfig["lua_ls"].setup({ - capabilities = capabilities, - settings = { - Lua = { - -- make the language server recognize "vim" global - diagnostics = { - globals = { "vim" }, - }, - completion = { - callSnippet = "Replace", - }, - }, - }, - }) - end, + -- lua config + lspconfig.lua_ls.setup({ + capabilities = capabilities, + settings = { + Lua = { + diagnostics = { globals = { "vim" } }, + completion = { callSnippet = "Replace" }, + }, + }, }) end, } diff --git a/lua/holger/plugins/lsp/mason.lua b/lua/holger/plugins/lsp/mason.lua index 2aab305..b9e840e 100644 --- a/lua/holger/plugins/lsp/mason.lua +++ b/lua/holger/plugins/lsp/mason.lua @@ -30,14 +30,10 @@ return { "html", "cssls", "tailwindcss", - "svelte", "lua_ls", - "graphql", - "emmet_ls", - "prismals", "pyright", }, - automatic_installation = true, + automatic_enable = false, }) mason_tool_installer.setup({