fix(autocmds): auto-close if file deleted

Author: ruicsh

lua/plugins/sidekick.lua

@@ -55,6 +55,7 @@ return {
 			{ "<c-bslash>", a.send("{selection}"), mode = { "x" }, desc = "Sidekick: Send Visual Selection" },
 			{ "<c-bslash>", a.show, mode = { "n", "t", "i" }, desc = "Sidekick: Focus" },
 			{ "<c-w><c-bslash>", a.toggle, mode = { "n", "t", "i" }, desc = "Sidekick: Toggle" },
+			{ "<c-w><bslash>", a.toggle, mode = { "n", "t", "i" }, desc = "Sidekick: Toggle" },
 		}
 	end,
 }

plugin/autocmds/auto-close-buffer-if-deleted.lua

@@ -18,27 +18,37 @@ local IGNORE_BUFTYPES = {
 	"terminal",
 }
 
-vim.api.nvim_create_autocmd("BufEnter", {
+vim.api.nvim_create_autocmd("FileChangedShell", {
 	group = augroup,
 	callback = function(args)
 		local buf = args.buf
+		if not vim.api.nvim_buf_is_valid(buf) then
+			return
+		end
+
 		local name = vim.api.nvim_buf_get_name(buf)
-		local buftype = vim.bo.buftype
+		local buftype = vim.bo[buf].buftype
 		local ft = vim.bo[buf].filetype
 
 		if
 			name == ""
 			or vim.tbl_contains(IGNORE_BUFTYPES, buftype)
-			or vim.wo.diff
 			or ft == ""
 			or vim.tbl_contains(IGNORE_FILETYPES, ft)
 		then
 			return
 		end
 
+		-- Check if buffer is visible in a diff window
+		for _, win_id in ipairs(vim.api.nvim_list_wins()) do
+			if vim.api.nvim_win_get_buf(win_id) == buf and vim.wo[win_id].diff then
+				return
+			end
+		end
+
 		if vim.fn.filereadable(name) == 0 then
 			vim.schedule(function()
-				if vim.api.nvim_buf_is_loaded(buf) then
+				if vim.api.nvim_buf_is_valid(buf) and vim.api.nvim_buf_is_loaded(buf) then
 					vim.api.nvim_buf_delete(buf, { force = true })
 				end
 			end)

plugin/keymaps/normal.lua

@@ -120,7 +120,7 @@ k("q", function()
 		local buf = vim.api.nvim_get_current_buf()
 		local bufname = vim.api.nvim_buf_get_name(buf)
 		if bufname == "" then
-			return ""
+			return "<nop>"
 		end
 	end
 

plugin/options.lua

@@ -62,12 +62,10 @@ o.tabclose = "uselast" -- Close tab and go to last used tab. `:h 'tabclose'`
 
 -- 8 terminal {{{
 o.title = false -- Show info in the window title. `:h 'title'`
-o.titlelen = 1 -- No limit on title length. `:h 'titlelen'`
-o.titlestring = "" -- Show relative path in terminal title. `:h 'titlestring'`
 -- }}}
 
 -- 9 using the mouse {{{
-o.mouse = "nic" -- Don't enable mouse on Visual mode. `:h 'mouse'`
+o.mouse = "n" -- Only on normal mode. `:h 'mouse'`
 o.mousescroll = "ver:1,hor:0" -- Disable horizonal scroll. `:h 'mousescroll'`
 -- }}}