Merge branch 'main' into nvchad

Author: ayamir

lazy-lock.json

@@ -17,7 +17,7 @@
   "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
   "codecompanion-history.nvim": { "branch": "main", "commit": "811b9af74c8fd4752a3422acf2379fba0639a96c" },
-  "codecompanion.nvim": { "branch": "main", "commit": "311219d5045fe8096bd21e0a7396855aafe7d663" },
+  "codecompanion.nvim": { "branch": "main", "commit": "638b643a17a656a34d15c884e1fd059d0992d660" },
   "copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" },
   "copilot.lua": { "branch": "master", "commit": "0f2fd3829dd27d682e46c244cf48d9715726f612" },
   "crates.nvim": { "branch": "main", "commit": "fe66681d97a1eefddb5d7e48bd427b2cb0271881" },
@@ -50,7 +50,7 @@
   "mason.nvim": { "branch": "main", "commit": "9e25c98d4826998460926f8c5c2284848d80ae89" },
   "mini.align": { "branch": "main", "commit": "0202e1662a7a03a95cefd6851795ceae5e87b9b3" },
   "mini.cursorword": { "branch": "main", "commit": "52834085b4ad175a050343cd96c4517def711cc5" },
-  "neoconf.nvim": { "branch": "main", "commit": "b109d170e580f85d9d41f0145cbdb1aa7caaa6fe" },
+  "neoconf.nvim": { "branch": "main", "commit": "8d9a8e9926a9b390b2dd94b1c2b0d1307dbfe6c8" },
   "neoscroll.nvim": { "branch": "master", "commit": "f957373912e88579e26fdaea4735450ff2ef5c9c" },
   "none-ls.nvim": { "branch": "main", "commit": "46f2713c88a0b4e4bf134b59577659851ddd31cf" },
   "nvim-bqf": { "branch": "main", "commit": "17680cda3538913e88dd4c6456c837db9ace40ae" },

lua/core/global.lua

@@ -10,7 +10,7 @@ function global:load_variables()
 	self.cache_dir = vim.fn.stdpath("cache")
 	self.data_dir = string.format("%s/site/", vim.fn.stdpath("data"))
 	self.modules_dir = self.vim_path .. "/modules"
-	self.home = self.is_windows and os.getenv("USERPROFILE") or os.getenv("HOME")
+	self.home = self.is_windows and vim.env.USERPROFILE or vim.env.HOME
 end
 
 global:load_variables()

lua/core/options.lua

@@ -116,7 +116,7 @@ local function load_options()
 	end
 
 	-- Custom python provider
-	local conda_prefix = os.getenv("CONDA_PREFIX")
+	local conda_prefix = vim.env.CONDA_PREFIX
 	if not isempty(conda_prefix) then
 		vim.g.python_host_prog = use_if_defined(vim.g.python_host_prog, conda_prefix .. "/bin/python")
 		vim.g.python3_host_prog = use_if_defined(vim.g.python3_host_prog, conda_prefix .. "/bin/python")

lua/modules/configs/completion/lsp.lua

@@ -1,21 +1,25 @@
 return function()
-	local nvim_lsp = require("lspconfig")
 	require("completion.neoconf").setup()
 	require("completion.mason").setup()
 	require("completion.mason-lspconfig").setup()
 
 	local opts = {
 		capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()),
 	}
-	-- Setup lsps that are not supported by `mason.nvim` but supported by `nvim-lspconfig` here.
+	-- Configure LSPs that are not supported by `mason.nvim` but are available in `nvim-lspconfig`.
+	-- First call |vim.lsp.config()|, then |vim.lsp.enable()| (or use `register_server`, see below)
+	-- to ensure the language server is properly configured and starts automatically.
 	if vim.fn.executable("dart") == 1 then
 		local ok, _opts = pcall(require, "user.configs.lsp-servers.dartls")
 		if not ok then
 			_opts = require("completion.servers.dartls")
 		end
 		local final_opts = vim.tbl_deep_extend("keep", _opts, opts)
-		nvim_lsp.dartls.setup(final_opts)
+		require("modules.utils").register_server("dartls", final_opts)
 	end
 
 	pcall(require, "user.configs.lsp")
+
+	-- Start LSPs
+	pcall(vim.cmd.LspStart)
 end

lua/modules/configs/completion/mason-lspconfig.lua

@@ -1,11 +1,17 @@
 local M = {}
 
 M.setup = function()
+	local is_windows = require("core.global").is_windows
+
 	local lsp_deps = require("core.settings").lsp_deps
+	local mason_registry = require("mason-registry")
+	local mason_lspconfig = require("mason-lspconfig")
 
 	require("lspconfig.ui.windows").default_options.border = "rounded"
 	require("modules.utils").load_plugin("mason-lspconfig", {
 		ensure_installed = lsp_deps,
+		-- Skip auto enable because we are loading language servers lazily
+		automatic_enable = false,
 	})
 
 	vim.diagnostic.config({
@@ -51,16 +57,16 @@ please REMOVE your LSP configuration (rust_analyzer.lua) from the `servers` dire
 
 		if not ok then
 			-- Default to use factory config for server(s) that doesn't include a spec
-			vim.lsp.config(lsp_name, opts)
-			vim.lsp.enable(lsp_name)
+			require("modules.utils").register_server(lsp_name, opts)
 		elseif type(custom_handler) == "function" then
-			--- Case where language server requires its own setup
-			--- Make sure to call require("lspconfig")[lsp_name].setup() in the function
-			--- See `clangd.lua` for example.
+			-- Case where language server requires its own setup
+			-- Be sure to call `vim.lsp.config()` within the setup function.
+			-- Refer to |vim.lsp.config()| for documentation.
+			-- For an example, see `clangd.lua`.
 			custom_handler(opts)
 			vim.lsp.enable(lsp_name)
 		elseif type(custom_handler) == "table" then
-			vim.lsp.config(
+			require("modules.utils").register_server(
 				lsp_name,
 				vim.tbl_deep_extend(
 					"force",
@@ -69,7 +75,6 @@ please REMOVE your LSP configuration (rust_analyzer.lua) from the `servers` dire
 					custom_handler
 				)
 			)
-			vim.lsp.enable(lsp_name)
 		else
 			vim.notify(
 				string.format(
@@ -83,9 +88,98 @@ please REMOVE your LSP configuration (rust_analyzer.lua) from the `servers` dire
 		end
 	end
 
-	for _, lsp in ipairs(lsp_deps) do
-		mason_lsp_handler(lsp)
+	---A simplified mimic of <mason-lspconfig 1.x>'s `setup_handlers` callback.
+	---Invoked for each Mason package (name or `Package` object) to configure its language server.
+	---@param pkg string|{name: string} Either the package name (string) or a Package object
+	local function setup_lsp_for_package(pkg)
+		-- First try to grab the builtin mappings
+		local mappings = mason_lspconfig.get_mappings().package_to_lspconfig
+		-- If empty or nil, build it by hand
+		if not mappings or vim.tbl_isempty(mappings) then
+			mappings = {}
+			for _, spec in ipairs(mason_registry.get_all_package_specs()) do
+				local lspconfig = vim.tbl_get(spec, "neovim", "lspconfig")
+				if lspconfig then
+					mappings[spec.name] = lspconfig
+				end
+			end
+		end
+
+		-- Figure out the package name and lookup
+		local name = type(pkg) == "string" and pkg or pkg.name
+		local srv = mappings[name]
+		if not srv then
+			return
+		end
+
+		-- Invoke the handler
+		mason_lsp_handler(srv)
+	end
+
+	for _, pkg in ipairs(mason_registry.get_installed_package_names()) do
+		setup_lsp_for_package(pkg)
 	end
+
+	-- Hook into Mason's package install event to install extra plugins for pylsp (black, ruff, rope),
+	-- then configure the installed package's LSP using setup_lsp_for_package.
+	mason_registry:on(
+		"package:install:success",
+		vim.schedule_wrap(function(pkg)
+			if pkg.name == "python-lsp-server" then
+				local venv = vim.fn.stdpath("data") .. "/mason/packages/python-lsp-server/venv"
+				local python = is_windows and venv .. "/Scripts/python.exe" or venv .. "/bin/python"
+				local black = is_windows and venv .. "/Scripts/black.exe" or venv .. "/bin/black"
+				local ruff = is_windows and venv .. "/Scripts/ruff.exe" or venv .. "/bin/ruff"
+
+				require("plenary.job")
+					:new({
+						command = python,
+						args = {
+							"-m",
+							"pip",
+							"install",
+							"-U",
+							"--disable-pip-version-check",
+							"python-lsp-black",
+							"python-lsp-ruff",
+							"pylsp-rope",
+						},
+						cwd = venv,
+						env = { VIRTUAL_ENV = venv },
+						on_exit = function()
+							if vim.fn.executable(black) == 1 and vim.fn.executable(ruff) == 1 then
+								vim.notify(
+									"Finished installing pylsp plugins",
+									vim.log.levels.INFO,
+									{ title = "[lsp] Install Status" }
+								)
+							else
+								vim.notify(
+									"Failed to install pylsp plugins. [Executable not found]",
+									vim.log.levels.ERROR,
+									{ title = "[lsp] Install Failure" }
+								)
+							end
+						end,
+						on_start = function()
+							vim.notify(
+								"Now installing pylsp plugins...",
+								vim.log.levels.INFO,
+								{ title = "[lsp] Install Status", timeout = 6000 }
+							)
+						end,
+						on_stderr = function(_, msg_stream)
+							if msg_stream then
+								vim.notify(msg_stream, vim.log.levels.ERROR, { title = "[lsp] Install Failure" })
+							end
+						end,
+					})
+					:start()
+			end
+
+			setup_lsp_for_package(pkg)
+		end)
+	)
 end
 
 return M

lua/modules/configs/completion/mason.lua

@@ -1,11 +1,6 @@
 local M = {}
 
 M.setup = function()
-	local is_windows = require("core.global").is_windows
-
-	local mason_registry = require("mason-registry")
-	require("lspconfig.ui.windows").default_options.border = "rounded"
-
 	local icons = {
 		ui = require("modules.utils.icons").get("ui", true),
 		misc = require("modules.utils.icons").get("misc", true),
@@ -31,66 +26,6 @@ M.setup = function()
 			},
 		},
 	})
-
-	-- Additional plugins for pylsp
-	mason_registry:on(
-		"package:install:success",
-		vim.schedule_wrap(function(pkg)
-			if pkg.name ~= "python-lsp-server" then
-				return
-			end
-
-			local venv = vim.fn.stdpath("data") .. "/mason/packages/python-lsp-server/venv"
-			local python = is_windows and venv .. "/Scripts/python.exe" or venv .. "/bin/python"
-			local black = is_windows and venv .. "/Scripts/black.exe" or venv .. "/bin/black"
-			local ruff = is_windows and venv .. "/Scripts/ruff.exe" or venv .. "/bin/ruff"
-
-			require("plenary.job")
-				:new({
-					command = python,
-					args = {
-						"-m",
-						"pip",
-						"install",
-						"-U",
-						"--disable-pip-version-check",
-						"python-lsp-black",
-						"python-lsp-ruff",
-						"pylsp-rope",
-					},
-					cwd = venv,
-					env = { VIRTUAL_ENV = venv },
-					on_exit = function()
-						if vim.fn.executable(black) == 1 and vim.fn.executable(ruff) == 1 then
-							vim.notify(
-								"Finished installing pylsp plugins",
-								vim.log.levels.INFO,
-								{ title = "[lsp] Install Status" }
-							)
-						else
-							vim.notify(
-								"Failed to install pylsp plugins. [Executable not found]",
-								vim.log.levels.ERROR,
-								{ title = "[lsp] Install Failure" }
-							)
-						end
-					end,
-					on_start = function()
-						vim.notify(
-							"Now installing pylsp plugins...",
-							vim.log.levels.INFO,
-							{ title = "[lsp] Install Status", timeout = 6000 }
-						)
-					end,
-					on_stderr = function(_, msg_stream)
-						if msg_stream then
-							vim.notify(msg_stream, vim.log.levels.ERROR, { title = "[lsp] Install Failure" })
-						end
-					end,
-				})
-				:start()
-		end)
-	)
 end
 
 return M

lua/modules/configs/completion/servers/clangd.lua

@@ -35,7 +35,7 @@ end
 
 -- https://github.com/neovim/nvim-lspconfig/blob/master/lua/lspconfig/configs/clangd.lua
 return function(defaults)
-	require("lspconfig").clangd.setup({
+	vim.lsp.config("clangd", {
 		on_attach = defaults.on_attach,
 		capabilities = vim.tbl_deep_extend("keep", { offsetEncoding = { "utf-16", "utf-8" } }, defaults.capabilities),
 		single_file_support = true,

lua/modules/configs/editor/persisted.lua

@@ -1,16 +1,4 @@
 return function()
-	vim.api.nvim_create_autocmd("User", {
-		pattern = "PersistedLoadPost",
-		desc = "Fix LSP/Highlighting on auto session restore",
-		callback = function()
-			local bufname = vim.api.nvim_buf_get_name(0)
-			if bufname and bufname ~= "" then
-				vim.defer_fn(function()
-					vim.cmd("edit")
-				end, 1)
-			end
-		end,
-	})
 	require("modules.utils").load_plugin("persisted", {
 		save_dir = vim.fn.expand(vim.fn.stdpath("data") .. "/sessions/"),
 		autostart = true,

lua/modules/configs/lang/render-markdown.lua

@@ -14,7 +14,7 @@ return function()
 		-- This enables hiding any added text on the line the cursor is on
 		-- This does have a performance penalty as we must listen to the 'CursorMoved' event
 		anti_conceal = { enabled = true },
-		-- The level of logs to write to file: vim.fn.stdpath('state') .. '/render-markdown.log'
+		-- The level of logs to write to file: vim.fn.stdpath("state") .. "/render-markdown.log"
 		-- Only intended to be used for plugin development / debugging
 		log_level = "error",
 	})

lua/modules/configs/tool/dap/clients/delve.lua

@@ -24,10 +24,7 @@ return function()
 
 	dap.adapters.go = {
 		type = "executable",
-		command = "node",
-		args = {
-			vim.fn.expand("$MASON") .. "/packages/go-debug-adapter" .. "/extension/dist/debugAdapter.js",
-		},
+		command = vim.fn.exepath("go-debug-adapter"), -- Find go-debug-adapter on $PATH
 	}
 	dap.configurations.go = {
 		{