From 8e0993d49a7bd300190bb949f5ac35720c01d60b Mon Sep 17 00:00:00 2001 From: Taken Date: Sun, 27 Apr 2025 00:12:10 +0200 Subject: [PATCH] Updated config for 0.11 --- lua/taken/plugins/lsp/lspconfig.lua | 36 +++++++++++++---------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/lua/taken/plugins/lsp/lspconfig.lua b/lua/taken/plugins/lsp/lspconfig.lua index 8168248..3016466 100644 --- a/lua/taken/plugins/lsp/lspconfig.lua +++ b/lua/taken/plugins/lsp/lspconfig.lua @@ -11,7 +11,7 @@ return { }, event = { "BufReadPre", "BufNewFile" }, config = function() - local lspconfig = require("lspconfig") + require("lspconfig") local tserrortranslator = require("ts-error-translator") local util = require("lspconfig.util") local on_attach = require("taken.utils.on_attach") @@ -37,20 +37,16 @@ return { "yamlls", "bashls", "marksman", - "eslint", + -- "eslint", } - for _, lsp in ipairs(defaultLsps) do - lspconfig[lsp].setup({ - capabilities = capabilities, - on_attach = on_attach, - }) - end - - -- lua - lspconfig["lua_ls"].setup({ + vim.lsp.config("*", { capabilities = capabilities, on_attach = on_attach, + }) + + -- lua + vim.lsp.config("lua_ls", { settings = { Lua = { hint = { @@ -90,9 +86,7 @@ return { end -- python - lspconfig["pyright"].setup({ - capabilities = capabilities, - on_attach = on_attach, + vim.lsp.config("pyright", { before_init = function(_, config) local python_path = get_python_path(config.root_dir) if python_path == nil then @@ -103,9 +97,7 @@ return { }) -- typescript - lspconfig["ts_ls"].setup({ - capabilities = capabilities, - on_attach = on_attach, + vim.lsp.config("ts_ls", { settings = { typescript = { inlayHints = { @@ -135,12 +127,16 @@ return { }) -- powershell - lspconfig["powershell_es"].setup({ - capabilities = capabilities, - on_attach = on_attach, + vim.lsp.config("powershell_es", { bundle_path = vim.fn.stdpath("data") .. "/mason/packages/powershell-editor-services", }) + vim.lsp.enable(defaultLsps) + vim.lsp.enable("lua_ls") + vim.lsp.enable("pyright") + vim.lsp.enable("ts_ls") + vim.lsp.enable("powershell_es") + tserrortranslator.setup() end, }