fix: tweaks and maintenance

Author: ruicsh

.luarc.json

@@ -6,6 +6,7 @@
   "workspace.checkThirdParty": false,
   "diagnostics.globals": [
     "vim",
-    "Snacks"
+    "Snacks",
+    "vim.g.*"
   ]
-}
+}

init.lua

@@ -10,7 +10,7 @@ vim.g.maplocalleader = vim.keycode(",")
 -- Load lazy package manager.
 -- https://github.com/folke/lazy.nvim
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not (vim.uv or vim.loop).fs_stat(lazypath) then
+if not vim.uv.fs_stat(lazypath) then
 	local lazyrepo = "https://github.com/folke/lazy.nvim.git"
 	local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
 	if vim.v.shell_error ~= 0 then

lua/lib/fn.lua

@@ -16,54 +16,6 @@ M.is_windows = function()
 	return vim.fn.has("win32") == 1
 end
 
-local spinners = {} -- Store spinner timers by buffer
-local icon_spinner = { "⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏" }
-
-M.start_spinner = function(bufnr, msg)
-	-- Stop any existing spinner for this buffer first to avoid timer leak
-	if spinners[bufnr] then
-		M.stop_spinner(bufnr)
-	end
-
-	local spinner_timer = vim.uv.new_timer()
-	spinners[bufnr] = { idx = 1, timer = spinner_timer }
-
-	spinners[bufnr].timer:start(
-		0,
-		100,
-		vim.schedule_wrap(function()
-			-- Check if the buffer is still valid before updating it
-			if not vim.api.nvim_buf_is_valid(bufnr) then
-				M.stop_spinner(bufnr)
-				return
-			end
-
-			if not spinners[bufnr] then
-				return
-			end
-
-			spinners[bufnr].idx = (spinners[bufnr].idx % #icon_spinner) + 1
-			vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, {
-				icon_spinner[spinners[bufnr].idx] .. " " .. msg,
-				"",
-			})
-			-- Move cursor to the last line only if we're currently in this buffer
-			if vim.api.nvim_get_current_buf() == bufnr then
-				local line_count = vim.api.nvim_buf_line_count(bufnr)
-				pcall(vim.api.nvim_win_set_cursor, 0, { line_count, 0 })
-			end
-		end)
-	)
-end
-
-M.stop_spinner = function(bufnr)
-	if spinners[bufnr] then
-		spinners[bufnr].timer:stop()
-		spinners[bufnr].timer:close()
-		spinners[bufnr] = nil
-	end
-end
-
 M.fmt_relative_time = function(timestamp)
 	-- Get current timestamp for relative time calculations
 	local now = os.time()
@@ -95,15 +47,20 @@ end
 
 -- Returns a list of { key, count } for non-zero diagnostic severities in the given buffer.
 -- key is one of "error", "warning", "information", "hint".
-local DIAGNOSTIC_KEYS = { "error", "warning", "information", "hint" }
+local DIAGNOSTIC_SEVERITIES = {
+	{ key = "error", severity = vim.diagnostic.severity.ERROR },
+	{ key = "warning", severity = vim.diagnostic.severity.WARN },
+	{ key = "information", severity = vim.diagnostic.severity.INFO },
+	{ key = "hint", severity = vim.diagnostic.severity.HINT },
+}
+
 M.diagnostic_counts = function(bufnr)
 	local results = {}
-	for i, key in ipairs(DIAGNOSTIC_KEYS) do
-		local ki = vim.diagnostic.severity[i]
-		local severity = vim.diagnostic.severity[ki]
-		local count = vim.diagnostic.count(bufnr, { severity = severity })[severity]
+	for _, entry in ipairs(DIAGNOSTIC_SEVERITIES) do
+		local s = entry.severity
+		local count = vim.diagnostic.count(bufnr, { severity = s })[s]
 		if count and count > 0 then
-			table.insert(results, { key = key, count = count })
+			table.insert(results, { key = entry.key, count = count })
 		end
 	end
 	return results

lua/plugins/treesitter.lua

@@ -27,6 +27,7 @@ local LANGUAGES = {
 	"lua",
 	"luadoc",
 	"markdown",
+	"markdown_inline",
 	"nginx",
 	"nu",
 	"powershell",

lua/plugins/treesitter.windows.lua

@@ -20,6 +20,7 @@ local LANGUAGES = {
 	"lua",
 	"luadoc",
 	"markdown",
+	"markdown_inline",
 	"nu",
 	"powershell",
 	"regex",

plugin/config/statusline.lua

@@ -2,21 +2,44 @@
 
 local T = require("lib")
 
+local statusline_augroup = vim.api.nvim_create_augroup("ruicsh/config/statusline", { clear = true })
+
 -- Hoist requires out of the hot render path
 local devicons = require("nvim-web-devicons")
 
--- Cache for dynamic file icon highlight group to avoid set_hl on every redraw
-local icon_hl_cache = {}
+-- Cache for git root to avoid vim.fs.root() on every statusline redraw
 
--- Cache git root to avoid vim.fs.root() on every statusline redraw
 local cached_git_root = vim.fs.root(0, ".git")
 vim.api.nvim_create_autocmd({ "BufEnter", "DirChanged" }, {
-	group = vim.api.nvim_create_augroup("ruicsh/config/statusline", { clear = true }),
+	group = statusline_augroup,
 	callback = function()
 		cached_git_root = vim.fs.root(0, ".git")
 	end,
 })
 
+-- Pre-create icon highlight groups at startup so the hot render path never calls nvim_set_hl
+vim.api.nvim_create_autocmd("VimEnter", {
+	group = statusline_augroup,
+	callback = function()
+		local ok, icons = pcall(devicons.get_icons)
+		if not ok or not icons then
+			return
+		end
+		local seen = {}
+		for _, icon_data in pairs(icons) do
+			if icon_data.name and not seen[icon_data.name] then
+				seen[icon_data.name] = true
+				local src_hl = "DevIcon" .. icon_data.name
+				local dst_hl = "StatusLineFileIcon_" .. icon_data.name
+				-- Only create if the source highlight group exists (defensive)
+				if vim.fn.hlexists(src_hl) == 1 then
+					vim.api.nvim_set_hl(0, dst_hl, { link = src_hl })
+				end
+			end
+		end
+	end,
+})
+
 local function sep()
 	return "%#StatusLineSeparator#|%#StatusLine#"
 end
@@ -146,13 +169,11 @@ local function c_filename()
 			local relpath = vim.fn.fnamemodify(fullpath, ":.:h")
 			local icon, icon_color = devicons.get_icon(filename, nil, { default = true })
 
-			-- Icon with color (only call set_hl when the color changes)
+			-- Icon with color (highlight group pre-created at VimEnter)
 			if icon and icon_color then
-				local hl_group = "StatusLineFileIconDynamic"
-				if icon_hl_cache[hl_group] ~= icon_color then
-					vim.api.nvim_set_hl(0, hl_group, { link = icon_color })
-					icon_hl_cache[hl_group] = icon_color
-				end
+				-- icon_color is already a highlight group name like "DevIconLua"
+				-- Map to our namespaced group: "DevIconFoo" -> "StatusLineFileIcon_Foo"
+				local hl_group = icon_color:gsub("^DevIcon", "StatusLineFileIcon_")
 				line = line .. "%#" .. hl_group .. "#" .. icon .. " "
 			end
 			line = line .. "%#StatusLineFilename#" .. filename

plugin/custom/lsp-highlight-references.lua

@@ -17,15 +17,26 @@ vim.api.nvim_create_autocmd("LspAttach", {
 		end
 
 		vim.api.nvim_create_autocmd({ "CursorHold", "InsertLeave" }, {
+			group = augroup,
 			buffer = bufnr,
 			callback = vim.lsp.buf.document_highlight,
 			desc = "Highlight references under the cursor",
 		})
 
 		vim.api.nvim_create_autocmd({ "CursorMoved", "InsertEnter" }, {
+			group = augroup,
 			buffer = bufnr,
 			callback = vim.lsp.buf.clear_references,
 			desc = "Clear highlight references",
 		})
 	end,
 })
+
+vim.api.nvim_create_autocmd("LspDetach", {
+	group = augroup,
+	callback = function(args)
+		vim.api.nvim_clear_autocmds({ buffer = args.buf, group = augroup })
+	end,
+	desc = "Clean up buffer-local reference highlight autocmds",
+})
+

plugin/custom/vim-messages.lua

@@ -17,6 +17,20 @@ vim.api.nvim_create_user_command("VimMessages", function()
 		end
 	end
 
+	-- Reuse existing window if still open
+	if vim_messages_winnr and vim.api.nvim_win_is_valid(vim_messages_winnr) then
+		local buf = vim.api.nvim_win_get_buf(vim_messages_winnr)
+		vim.api.nvim_set_option_value("modifiable", true, { buf = buf })
+		vim.api.nvim_buf_set_lines(buf, 0, -1, false, filtered_lines)
+		vim.api.nvim_set_option_value("modifiable", false, { buf = buf })
+
+		-- Set cursor to the last line
+		vim.api.nvim_win_set_cursor(vim_messages_winnr, { vim.api.nvim_buf_line_count(buf), 0 })
+		return
+	end
+
+	vim_messages_winnr = nil
+
 	-- Calculate dimensions for floating window
 	local width = vim.o.columns
 	local height = math.floor(vim.o.lines * 0.4)

plugin/keymaps/normal.lua

@@ -50,8 +50,8 @@ k("J", "mzJ`z:delmarks z<cr>", { desc = "Join lines" })
 -- Save file
 k("<c-s>", "<cmd>silent! update | redraw<cr>", { desc = "Save" })
 
--- Don't store on register when changing text or deleting a character.
-local black_hole_commands = { "C", "c", "cc", "x", "X" }
+-- Don't store on register when deleting a character.
+local black_hole_commands = { "x", "X" }
 for _, key in pairs(black_hole_commands) do
 	k(key, '"_' .. key) -- `:h "_`
 end

plugin/keymaps/visual.lua

@@ -42,16 +42,6 @@ k("<c-s>", "<cmd>silent! update | redraw<cr>", { desc = "Save" })
 k(">", ">gv") -- Reselect after indent
 k("<", "<gv") -- Reselect after dedent
 
--- http://www.kevinli.co/posts/2017-01-19-multiple-cursors-in-500-bytes-of-vimscript/
-local function replace_selection(direction)
-	vim.g.mc = vim.api.nvim_replace_termcodes("y/\\V<c-r>=escape(@\", '/')<cr><cr>", true, true, true)
-	return function()
-		return vim.g.mc .. "``cg" .. direction
-	end
-end
-k("cn", replace_selection("n"), { expr = true, desc = "Change selection (forward)" })
-k("cN", replace_selection("N"), { expr = true, desc = "Change selection (backward)" })
-
 -- Same behaviour for `I`/`A` as in normal mode
 -- https://www.reddit.com/r/neovim/comments/1k4efz8/comment/moelhto/
 k("<s-i>", function()