Manually patch in changes from nvim-lua#1590 to fix compatibility with mason-lspconfig 2.0 and nvim >0.1 that was causing my LSP config not to propogate to the LSP

Author: fadookie

lua/kickstart/plugins/lspconfig.lua

@@ -204,12 +204,19 @@ return {
         },
       }
 
+      -- NOTE: I have patched this file based on the changes in https://github.com/nvim-lua/kickstart.nvim/pull/1590 to fix compatibility with mason-lspconfig 2.0 and nvim >0.11
+
       -- LSP servers and clients are able to communicate to each other what features they support.
       --  By default, Neovim doesn't support everything that is in the LSP specification.
       --  When you add blink.cmp, luasnip, etc. Neovim now has *more* capabilities.
       --  So, we create new capabilities with blink.cmp, and then broadcast that to the servers.
-      local capabilities = require('blink.cmp').get_lsp_capabilities()
+      -- NOTE: The following line is now commented as blink.cmp extends capabilities by default from its internal code:
+      -- https://github.com/Saghen/blink.cmp/blob/102db2f5996a46818661845cf283484870b60450/plugin/blink-cmp.lua
+      -- It has been left here as a comment for educational purposes (as the predecessor completion plugin required this explicit step).
+      --
+      -- local capabilities = require("blink.cmp").get_lsp_capabilities()
 
+      -- Filetypes to load with ltex_plus LSP below
       local ltex_plus_filetypes = {
         'bib',
         'context',
@@ -230,90 +237,111 @@ return {
         'typst',
         'xhtml',
       }
+      -- Language servers can broadly be installed in the following ways:
+      --  1) via the mason package manager; or
+      --  2) via your system's package manager; or
+      --  3) via a release binary from a language server's repo that's accessible somewhere on your system.
 
-      -- Enable the following language servers
-      --  Feel free to add/remove any LSPs that you want here. They will automatically be installed.
-      --
-      --  Add any additional override configuration in the following tables. Available keys are:
-      --  - cmd (table): Override the default command used to start the server
-      --  - filetypes (table): Override the default list of associated filetypes for the server
-      --  - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features.
-      --  - settings (table): Override the default settings passed when initializing the server.
-      --        For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
+      -- The servers table comprises of the following sub-tables:
+      -- 1. mason
+      -- 2. others
+      -- Both these tables have an identical structure of language server names as keys and
+      -- a table of language server configuration as values.
+      ---@class LspServersConfig
+      ---@field mason table<string, vim.lsp.Config>
+      ---@field others table<string, vim.lsp.Config>
       local servers = {
-        -- gopls = {},
-        -- pyright = {},
-        -- rust_analyzer = {},
-        -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
+        -- Enable the following language servers
+        --  Feel free to add/remove any LSPs that you want here. They will automatically be installed.
         --
-        awk_ls = {},
-        bashls = {},
-        clangd = {}, -- TODO: setup compile_commands.json generation for any projects that need to use this LSP
-        -- csharp_ls = {}, -- or use omnisharp or rosyln_ls instead?
-        omnisharp = {},
-        css_variables = {},
-        cssls = {},
-        docker_compose_language_service = {},
-        dockerls = {},
-        eslint = {},
-        -- gdscript = {}, -- TODO: in docs but causes mason error
-        -- gdshader_lsp = {}, -- TODO: in docs but causes mason error
-        gh_actions_ls = {},
-        gitlab_ci_ls = {},
-        glsl_analyzer = {},
-        gradle_ls = {},
-        graphql = {},
-        groovyls = {},
-        html = {},
-        -- java_language_server = {}, -- Note - for fancier use cases jdtls lsp or nvim-jdtls plugin may be better -- TODO: mason errors during install
-        jqls = {},
-        jsonls = {},
-        kotlin_language_server = {},
-        ltex_plus = {
-          filetypes = ltex_plus_filetypes,
-          settings = {
-            ltex = {
-              enabled = ltex_plus_filetypes,
+        --  Add any additional override configuration in the following tables. Available keys are:
+        --  - cmd (table): Override the default command used to start the server
+        --  - filetypes (table): Override the default list of associated filetypes for the server
+        --  - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features.
+        --  - settings (table): Override the default settings passed when initializing the server.
+        --        For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
+        --
+        --  Feel free to add/remove any LSPs here that you want to install via Mason. They will automatically be installed and setup.
+        mason = {
+          -- gopls = {},
+          -- pyright = {},
+          -- rust_analyzer = {},
+          -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
+          --
+          awk_ls = {},
+          bashls = {},
+          clangd = {}, -- TODO: setup compile_commands.json generation for any projects that need to use this LSP
+          -- csharp_ls = {}, -- or use omnisharp or rosyln_ls instead?
+          omnisharp = {},
+          css_variables = {},
+          cssls = {},
+          docker_compose_language_service = {},
+          dockerls = {},
+          eslint = {},
+          -- gdscript = {}, -- TODO: in docs but causes mason error
+          -- gdshader_lsp = {}, -- TODO: in docs but causes mason error
+          gh_actions_ls = {},
+          gitlab_ci_ls = {},
+          glsl_analyzer = {},
+          gradle_ls = {},
+          graphql = {},
+          groovyls = {},
+          html = {},
+          -- java_language_server = {}, -- Note - for fancier use cases jdtls lsp or nvim-jdtls plugin may be better -- TODO: mason errors during install
+          jqls = {},
+          jsonls = {},
+          kotlin_language_server = {},
+          ltex_plus = {
+            filetypes = ltex_plus_filetypes,
+            settings = {
+              ltex = {
+                enabled = ltex_plus_filetypes,
+              },
             },
-          },
-        }, -- LaTeX, Markdown, etc. LSP
-
-        lua_ls = {
-          -- cmd = { ... },
-          -- filetypes = { ... },
-          -- capabilities = {},
-          settings = {
-            Lua = {
-              completion = {
-                callSnippet = 'Replace',
+          }, -- LaTeX, Markdown, etc. LSP
+
+          lua_ls = {
+            -- cmd = { ... },
+            -- filetypes = { ... },
+            -- capabilities = {},
+            settings = {
+              Lua = {
+                completion = {
+                  callSnippet = 'Replace',
+                },
+                -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
+                -- diagnostics = { disable = { 'missing-fields' } },
               },
-              -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
-              -- diagnostics = { disable = { 'missing-fields' } },
             },
           },
-        },
 
-        -- metals = {}, -- Scala LSP -- TODO: in docs but causes mason error
-        perlnavigator = {}, -- Other ones that have about the same level of activity are perlls and perlpls
-        pico8_ls = {},
-        ruby_lsp = {}, -- or use solargraph? see also standardrb, syntax_tree, and typeprof
-        spyglassmc_language_server = {}, -- Minecraft datapacks, may require additional configuration
-        sqls = {}, -- See also the confusingly similarly named sqlls, and sqruff
-        terraformls = {}, -- This is the official hashicorp one, see also terraform_lsp
-        tflint = {},
-        typos_lsp = {}, -- Code spellchecker
-
-        -- Some languages (like typescript) have entire language plugins that can be useful:
-        --    https://github.com/pmizio/typescript-tools.nvim
-        --
-        -- But for many setups, the LSP (`ts_ls`) will work just fine
-        ts_ls = {}, -- see also ts_query_ls, tsgo
+          -- metals = {}, -- Scala LSP -- TODO: in docs but causes mason error
+          perlnavigator = {}, -- Other ones that have about the same level of activity are perlls and perlpls
+          pico8_ls = {},
+          ruby_lsp = {}, -- or use solargraph? see also standardrb, syntax_tree, and typeprof
+          spyglassmc_language_server = {}, -- Minecraft datapacks, may require additional configuration
+          sqls = {}, -- See also the confusingly similarly named sqlls, and sqruff
+          terraformls = {}, -- This is the official hashicorp one, see also terraform_lsp
+          tflint = {},
+          typos_lsp = {}, -- Code spellchecker
+
+          -- Some languages (like typescript) have entire language plugins that can be useful:
+          --    https://github.com/pmizio/typescript-tools.nvim
+          --
+          -- But for many setups, the LSP (`ts_ls`) will work just fine
+          ts_ls = {}, -- see also ts_query_ls, tsgo
 
-        vacuum = {}, -- OpenAPI/Swagger linter/analyzer, requires filetypes to be registered
-        vimls = {}, -- Vimscript
-        yamlls = {},
+          vacuum = {}, -- OpenAPI/Swagger linter/analyzer, requires filetypes to be registered
+          vimls = {}, -- Vimscript
+          yamlls = {},
 
-        -- TODO: There are a shitload of python LSPs - research and pick one
+          -- TODO: There are a shitload of python LSPs - research and pick one
+        },
+        -- This table contains config for all language servers that are *not* installed via Mason.
+        -- Structure is identical to the mason table from above.
+        others = {
+          -- dartls = {},
+        },
       }
 
       -- Ensure the servers and tools above are installed
@@ -329,26 +357,31 @@ return {
       --
       -- You can add other tools here that you want Mason to install
       -- for you, so that they are available from within Neovim.
-      local ensure_installed = vim.tbl_keys(servers or {})
+      local ensure_installed = vim.tbl_keys(servers.mason or {})
       vim.list_extend(ensure_installed, {
         'stylua', -- Used to format Lua code
       })
       require('mason-tool-installer').setup { ensure_installed = ensure_installed }
 
+      -- Either merge all additional server configs from the `servers.mason` and `servers.others` tables
+      -- to the default language server configs as provided by nvim-lspconfig or
+      -- define a custom server config that's unavailable on nvim-lspconfig.
+      for server, config in pairs(vim.tbl_extend('keep', servers.mason, servers.others)) do
+        if not vim.tbl_isempty(config) then
+          vim.lsp.config(server, config)
+        end
+      end
+
+      -- After configuring our language servers, we now enable them
       require('mason-lspconfig').setup {
         ensure_installed = {}, -- explicitly set to an empty table (Kickstart populates installs via mason-tool-installer)
-        automatic_installation = false,
-        handlers = {
-          function(server_name)
-            local server = servers[server_name] or {}
-            -- This handles overriding only values explicitly passed
-            -- by the server configuration above. Useful when disabling
-            -- certain features of an LSP (for example, turning off formatting for ts_ls)
-            server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
-            require('lspconfig')[server_name].setup(server)
-          end,
-        },
+        automatic_enable = true, -- automatically run vim.lsp.enable() for all servers that are installed via Mason
       }
+
+      -- Manually run vim.lsp.enable for all language servers that are *not* installed via Mason
+      if not vim.tbl_isempty(servers.others) then
+        vim.lsp.enable(vim.tbl_keys(servers.others))
+      end
     end,
   },
 }