Pull in LSP config fix from nvim-lua/kickstart.nvim#1475

Author: dfles

.config/nvim/init.lua

@@ -260,9 +260,7 @@ require("lazy").setup({
         severity_sort = true,
         float = {
           border = "rounded",
-          source = function(diag)
-            return diag.source and ("[" .. diag.source .. "]") or nil
-          end,
+          source = "if_many",
         },
         underline = { severity = vim.diagnostic.severity.ERROR },
         signs = vim.g.have_nerd_font and {
@@ -288,78 +286,63 @@ require("lazy").setup({
       --  So, we create new capabilities with blink.cmp, and then broadcast that to the servers.
       local capabilities = require("blink.cmp").get_lsp_capabilities()
 
-      -- 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/
       local servers = {
-        -- clangd = {},
-        -- gopls = {},
-        -- pyright = {},
-        -- rust_analyzer = {},
-        -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
-        --
-        -- 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 = {},
-        --
-
+        stylua = {},
         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' } },
             },
           },
         },
+        basedpyright = {
+          handlers = {
+            ["textDocument/publishDiagnostics"] = function() end,
+          },
+          settings = {
+            basedpyright = {
+              analysis = {
+                exclude = {
+                  "**/frontend",
+                  "**/node_modules",
+                  "**/.ruff_cache",
+                  "**/.mypy_cache",
+                  "**/.pytest_cache",
+                  "**/dist",
+                  "**/build",
+                  "**/__pycache__",
+                },
+              },
+            },
+          },
+        },
+        vtsls = {},
+        prettier = {},
+        terraformls = {},
+        sqlfmt = {},
       }
 
-      -- Ensure the servers and tools above are installed
-      --
-      -- To check the current status of installed tools and/or manually install
-      -- other tools, you can run
-      --    :Mason
-      --
-      -- You can press `g?` for help in this menu.
-      --
-      -- `mason` had to be setup earlier: to configure its options see the
-      -- `dependencies` table for `nvim-lspconfig` above.
-      --
-      -- 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 {})
-      vim.list_extend(ensure_installed, {
-        "stylua", -- Used to format Lua code
-      })
-      require("mason-tool-installer").setup({ ensure_installed = ensure_installed })
-
+      ---@type MasonLspconfigSettings
+      ---@diagnostic disable-next-line: missing-fields
       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 = vim.tbl_keys(servers or {}),
       })
+
+      require("mason-tool-installer").setup({ ensure_installed = vim.tbl_keys(servers) })
+
+      -- Installed LSPs are configured and enabled automatically with mason-lspconfig
+      -- The loop below is for overriding the default configuration of LSPs with the ones in the servers table
+      for server_name, config in pairs(servers) do
+        vim.lsp.config(server_name, config)
+      end
     end,
   },
 

.config/nvim/lua/plugins/python.lua

@@ -90,42 +90,6 @@ local debug_configs = {
 }
 
 return {
-  -- LSP
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        basedpyright = {
-          settings = {
-            basedpyright = {
-              analysis = {
-                typeCheckingMode = "off",
-                diagnosticMode = "openFilesOnly",
-                useLibraryCodeForTypes = true,
-                autoSearchPaths = true,
-                autoImportCompletions = true,
-                exclude = {
-                  "**/frontend",
-                  "**/node_modules",
-                  "**/.ruff_cache",
-                  "**/.mypy_cache",
-                  "**/.pytest_cache",
-                  "**/dist",
-                  "**/build",
-                  "**/__pycache__",
-                },
-              },
-            },
-          },
-          on_attach = function(client, bufnr)
-            -- Disable basedpyright diagnostics completely
-            -- We use mypy via nvim-lint instead for type checking
-            client.server_capabilities.diagnosticProvider = nil
-          end,
-        },
-      },
-    },
-  },
   -- Linting
   {
     "mfussenegger/nvim-lint",