Refactor LSP configuration

config/neovim/lua/opdavies/lsp/init.lua

@@ -1,72 +1,79 @@
-local lspconfig = require "lspconfig"
+local cmp_nvim_lsp = require "cmp_nvim_lsp"
-local nvim_status = require "lsp-status"
-
 local handlers = require "opdavies.lsp.handlers"
+local lspconfig = require "lspconfig"
 
 require("neodev").setup {}
 
-local servers = {
+local capabilities = cmp_nvim_lsp.default_capabilities(vim.lsp.protocol.make_client_capabilities())
-  bashls = true,
 
-  cssls = {
+lspconfig.bashls.setup {
-    on_attach = function(client, bufnr)
+  capabilities = capabilities,
+}
+
+lspconfig.cssls.setup {
+  capabilities = capabilities,
+  on_attach = function(_, _)
     vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(handlers.on_publish_diagnostics, {})
   end,
-  },
+}
 
-  gopls = true,
+lspconfig.gopls.setup {
-  html = true,
+  capabilities = capabilities,
+}
 
-  intelephense = {
+lspconfig.html.setup {
-    filetypes = { "php", "module", "test", "inc" },
+  capabilities = capabilities,
-  },
+}
 
-  lua_ls = {
+lspconfig.intelephense.setup {
+  capabilities = capabilities,
+}
+
+lspconfig.lua_ls.setup {
+  capabilities = capabilities,
   settings = {
     Lua = {
       completion = {
         callSnippet = "Replace",
       },
-
       diagnostics = {
         globals = { "vim" },
       },
-
       runtime = {
         version = "LuaJIT",
       },
-
       telemetry = {
         enabled = false,
       },
-
       workspace = {
         library = vim.api.nvim_get_runtime_file("", true),
       },
     },
   },
-  },
+}
 
-  marksman = true,
+lspconfig.marksman.setup {
+  capabilities = capabilities,
+}
 
-  nixd = {
+lspconfig.nixd.setup {
-    command = { "nixd" },
+  capabilities = capabilities,
+  cmd = { "nixd" },
   settings = {
     nixd = {
       nixpkgs = {
         expr = "import <nixpkgs> { }",
       },
-
       formatting = {
         command = "nix fmt",
       },
     },
   },
-  },
+}
 
-  tailwindcss = {
+lspconfig.tailwindcss.setup {
+  capabilities = capabilities,
   filetypes = { "html", "javascript", "twig", "typescript", "vue" },
-
   settings = {
     init_options = {
       userLanguages = {
@@ -74,38 +81,29 @@ local servers = {
       },
     },
   },
-  },
+}
 
-  terraformls = true,
+lspconfig.terraformls.setup {
+  capabilities = capabilities,
+}
 
-  -- TODO: make this work with Vue files.
+lspconfig.tsserver.setup {
-  ts_ls = true,
+  capabilities = capabilities,
+}
 
-  vuels = true,
+lspconfig.vuels.setup {
+  capabilities = capabilities,
+}
 
-  yamlls = {
+lspconfig.yamlls.setup {
+  capabilities = capabilities,
   settings = {
     yaml = {
       keyOrdering = false,
     },
   },
-  },
 }
 
-local capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
-
-for server_name, config in pairs(servers) do
-  if config == true then
-    config = {}
-  end
-
-  config = vim.tbl_deep_extend("force", {}, {
-    capabilities = capabilities,
-  }, config)
-
-  lspconfig[server_name].setup(config)
-end
-
 vim.diagnostic.config {
   float = { source = true },
   signs = true,
@@ -118,19 +116,6 @@ vim.api.nvim_create_autocmd("LspAttach", {
   callback = function()
     local builtin = require "telescope.builtin"
 
-    -- buf_inoremap { "<C-k>", vim.lsp.buf.signature_help }
-    -- buf_nnoremap { "<leader>ca", vim.lsp.buf.code_action }
-    -- buf_nnoremap { "<leader>d", vim.diagnostic.open_float }
-    -- buf_nnoremap { "<leader>rn", vim.lsp.buf.rename }
-    -- buf_nnoremap { "<leader>rr", "<cmd>LspRestart<cr>" }
-    -- buf_nnoremap { "[d", vim.diagnostic.goto_prev }
-    -- buf_nnoremap { "]d", vim.diagnostic.goto_next }
-
-    -- buf_nnoremap { "gD", vim.lsp.buf.declaration }
-    -- buf_nnoremap { "gd", handlers.definition }
-    -- buf_nnoremap { "gi", vim.lsp.buf.implementation }
-    -- buf_nnoremap { "gT", vim.lsp.buf.type_definition }
-
     vim.keymap.set("n", "gd", builtin.lsp_definitions, { buffer = 0 })
     vim.keymap.set("n", "gr", builtin.lsp_references, { buffer = 0 })
     vim.keymap.set("n", "gD", vim.lsp.buf.declaration, { buffer = 0 })