From f04a4d385c739cf7459166626911afa8e8d494e9 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 4 Mar 2024 09:31:04 +0000 Subject: [PATCH] Simplify LSP server configuration --- lua/opdavies/lsp/init.lua | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/lua/opdavies/lsp/init.lua b/lua/opdavies/lsp/init.lua index a21511f..b7bdd11 100644 --- a/lua/opdavies/lsp/init.lua +++ b/lua/opdavies/lsp/init.lua @@ -71,21 +71,15 @@ end require("neodev").setup {} local servers = { - ansiblels = true, - bashls = true, - cssls = true, - gopls = true, - grammarly = true, - html = true, - rnix = true, - terraformls = true, - tsserver = true, - vuels = true, - + ansiblels = {}, + bashls = {}, + cssls = {}, + gopls = {}, + grammarly = {}, + html = {}, intelephense = { filetypes = { "php", "module", "test", "inc" }, }, - lua_ls = { settings = { Lua = { @@ -101,7 +95,7 @@ local servers = { }, }, }, - + rnix = {}, tailwindcss = { filetypes = { "html", "html.twig", "javascript", "typescript", "vue" }, @@ -111,7 +105,9 @@ local servers = { }, }, }, - + terraformls = {}, + tsserver = {}, + vuels = {}, yamlls = { settings = { yaml = { @@ -122,14 +118,6 @@ local servers = { } local setup_server = function(server, config) - if not config then - return - end - - if type(config) ~= "table" then - config = {} - end - config = vim.tbl_deep_extend("force", { on_init = custom_init, on_attach = custom_attach,