vim/lsp: refactor for better structure, same function

config/nvim/lua/user/plugins/lsp.lua

@@ -9,18 +9,12 @@ local config = function()
   end
   require('lspconfig.ui.windows').default_options = { border = border }
 
-  local capabilities = vim.lsp.protocol.make_client_capabilities()
+  local opts = {
-  local has_cmp_nvim_lsp, cmp = pcall(require, 'cmp_nvim_lsp')
+    capabilities = vim.lsp.protocol.make_client_capabilities(),
-  if has_cmp_nvim_lsp then
-    vim.tbl_deep_extend('force', capabilities, cmp.default_capabilities())
-  end
 
-  local on_attach = function(--[[client]]_, bufnr)
+    on_attach = function(--[[client]]_, bufnr)
       vim.bo.omnifunc = 'v:lua.vim.lsp.omnifunc'  -- do completion with <c-x><c-o>
-
+      local map, opts = vim.keymap.set, { buffer = bufnr }
-    local map = vim.keymap.set
-    local opts = { buffer = bufnr }
-
       map('n', '<space>ca',   vim.lsp.buf.code_action,        opts)
       map('n', '<space>cf',   vim.lsp.buf.format,             opts)
       map('n', 'gD',          vim.lsp.buf.declaration,        opts)
@@ -29,34 +23,31 @@ local config = function()
       map('n', 'gi',          vim.lsp.buf.implementation,     opts)
       map('n', 'grr',         vim.lsp.buf.rename,             opts)
       map('n', 'gt',          vim.lsp.buf.type_definition,    opts)
-  end
+    end,
 
-  local on_init = function(client, --[[init_result]]_)
+    on_init = function(client, --[[init_result]]_)
       -- Opt out of semantic highlighting because it has been casusing the issues
       -- https://github.com/neovim/nvim-lspconfig/issues/2542#issuecomment-1547019213
       if client.server_capabilities then
         client.server_capabilities.semanticTokensProvider = false
       end
+    end,
+  }
+
+  local has_cmp, cmp = pcall(require, 'cmp_nvim_lsp')
+  if has_cmp then
+    vim.tbl_deep_extend('force', opts.capabilities, cmp.default_capabilities())
   end
 
   require('mason').setup {}
   require('mason-lspconfig').setup {}
   require("mason-lspconfig").setup_handlers {
-    -- Default handler.
+    --[[ default = ]] function(server)
-    function(server)
+      require('lspconfig')[server].setup(opts)
-      require('lspconfig')[server].setup {
-        capabilities = capabilities,
-        on_attach = on_attach,
-        on_init = on_init,
-      }
     end,
 
     lua_ls = function()
-      require('lspconfig').lua_ls.setup {
+      require('lspconfig').lua_ls.setup(vim.tbl_extend('force', opts, {
-        capabilities = capabilities,
-        on_attach = on_attach,
-        on_init = on_init,
-
         settings = {
           Lua = {
             -- I'm using lua only inside neovim, so the runtime is LuaJIT.
@@ -72,15 +63,11 @@ local config = function()
             telemetry = { enable = false },
           },
         },
-      }
+      }))
     end,
 
     omnisharp = function()
-      require('lspconfig').omnisharp.setup {
+      require('lspconfig').omnisharp.setup(vim.tbl_extend('force', opts, {
-        capabilities = capabilities,
-        on_attach = on_attach,
-        on_init = on_init,
-
         -- Show unimported types and add`using` directives.
         enable_import_completion = true,
 
@@ -89,7 +76,7 @@ local config = function()
 
         -- Don't include preview versions of the .NET SDK.
         sdk_include_prereleases = false,
-      }
+      }))
     end,
   }
 end