tomas.mirchev/nvim-tree.lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(#2826): fuller error messages

Browse Source
This commit is contained in:
Alexander Courtis 2025-06-19 16:25:32 +10:00
parent 0a06f65bf0
commit 6e7ce8771b
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
lua/nvim-tree/explorer/view.lua
View File

@ -638,45 +638,46 @@ end
---@param callsite string ---@param callsite string
---@return number|nil ---@return number|nil
function View:get_winnr(tabpage, callsite) function View:get_winnr(tabpage, callsite)
local tabid = tabpage or vim.api.nvim_get_current_tabpage()
local tabinfo = globals.TABPAGES[tabid]
local tabinfo_winid = nil
if self.explorer.opts.experimental.multi_instance then if self.explorer.opts.experimental.multi_instance then
local msg = string.format("View:get_winnr(%3s, %-20.20s)", tabpage, callsite) local msg_fault = ""
tabpage = tabpage or vim.api.nvim_get_current_tabpage()
local tabinfo = globals.TABPAGES[tabpage]
local ret = nil
if not tabinfo then if not tabinfo then
msg = string.format("%s t%d no tabinfo", msg, tabpage) msg_fault = "no tabinfo"
elseif not tabinfo.winnr then elseif not tabinfo.winnr then
msg = string.format("%s t%d no tabinfo.winnr", msg, tabpage) msg_fault = "no tabinfo.winnr"
elseif not vim.api.nvim_win_is_valid(tabinfo.winnr) then elseif not vim.api.nvim_win_is_valid(tabinfo.winnr) then
msg = string.format("%s t%d invalid tabinfo.winnr %d", msg, tabpage, tabinfo.winnr) msg_fault = string.format("invalid tabinfo.winnr %d", tabinfo.winnr)
else else
msg = string.format("%s t%d w%d", msg, tabpage, tabinfo.winnr) tabinfo_winid = tabinfo.winnr
ret = tabinfo.winnr
end end
local winid = self:winid(tabpage, "View:get_winnr") local winid = self:winid(tabid, "View:get_winnr")
if ret ~= winid then
if ret then if winid ~= tabinfo_winid then
msg = string.format("%s winid_from_bufnr w%s MISMATCH", msg, winid) msg_fault = "MISMATCH"
else
msg = string.format("%s winid_from_bufnr w%s STALE", msg, winid)
end
notify.error(string.format("View:get_winnr w%s View:winnr w%s MISMATCH", ret, winid))
end end
local msg = string.format("View:get_winnr(%3s, %-20.20s) globals.TABPAGES[%s].winnr=w%s view.winid(%s)=w%s %s",
tabpage,
callsite,
tabid, tabinfo_winid,
tabid, winid,
msg_fault
)
log.line("dev", "%s", msg) log.line("dev", "%s", msg)
return ret if winid ~= tabinfo_winid then
else notify.error(msg)
tabpage = tabpage or vim.api.nvim_get_current_tabpage() end
local tabinfo = globals.TABPAGES[tabpage] end
if tabinfo and tabinfo.winnr and vim.api.nvim_win_is_valid(tabinfo.winnr) then if tabinfo and tabinfo.winnr and vim.api.nvim_win_is_valid(tabinfo.winnr) then
return tabinfo.winnr return tabinfo.winnr
end end
end
end end
--- Returns the current nvim tree bufnr --- Returns the current nvim tree bufnr
@ -685,19 +686,18 @@ end
function View:get_bufnr(callsite) function View:get_bufnr(callsite)
local tab = vim.api.nvim_get_current_tabpage() local tab = vim.api.nvim_get_current_tabpage()
if self.explorer.opts.experimental.multi_instance then if self.explorer.opts.experimental.multi_instance then
log.line("dev", "View:get_bufnr(%-20.20s) t%d global b%s member b%s %s", local msg = string.format("View:get_bufnr(%-20.20s) globals.BUFNR_PER_TAB[%s]=b%s view.bufnr_by_tab[%s]=b%s MISMATCH",
callsite, callsite,
tab, tab, globals.BUFNR_PER_TAB[tab],
globals.BUFNR_PER_TAB[tab], tab, self.bufnr_by_tab[tab],
self.bufnr_by_tab[tab], (globals.BUFNR_PER_TAB[tab] == self.bufnr_by_tab[tab]) and "" or "MISMATCH"
(globals.BUFNR_PER_TAB[tab] == self.bufnr_by_tab[tab]) and "" or "MISMATCH") )
if globals.BUFNR_PER_TAB[tab] ~= self.bufnr_by_tab[tab] then if globals.BUFNR_PER_TAB[tab] ~= self.bufnr_by_tab[tab] then
notify.error(string.format("View:get_bufnr globals.BUFNR_PER_TAB[%s] b%s view.bufnr_by_tab[%s] b%s MISMATCH", notify.error(msg)
tab, globals.BUFNR_PER_TAB[tab],
tab, self.bufnr_by_tab[tab]
))
end end
log.line("dev", msg)
end end
return globals.BUFNR_PER_TAB[tab] return globals.BUFNR_PER_TAB[tab]
end end