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

Revert "feat(#2826): remove globals.BUFNR_BY_TABID"

Browse Source 
This reverts commit 2651f9b34a.
This commit is contained in:
Alexander Courtis 2025-08-04 16:38:51 +10:00
parent 2651f9b34a
commit 5dc93f3a8f
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,6 +87,7 @@ function View:log_event(data, bufnr)
vim.api.nvim_get_current_tabpage() = %s\ vim.api.nvim_get_current_tabpage() = %s\
vim.api.nvim_get_current_win() = %s\ vim.api.nvim_get_current_win() = %s\
self.bufnr_by_tabid = %s\ self.bufnr_by_tabid = %s\
globals.BUFNR_BY_TABID = %s\
globals.WINID_BY_TABID = %s\ globals.WINID_BY_TABID = %s\
vim.fn.win_findbuf(bufnr) = %s\ vim.fn.win_findbuf(bufnr) = %s\
data = %s\ data = %s\
@ -96,6 +97,7 @@ function View:log_event(data, bufnr)
vim.api.nvim_get_current_tabpage(), vim.api.nvim_get_current_tabpage(),
vim.api.nvim_get_current_win(), vim.api.nvim_get_current_win(),
vim.inspect(self.bufnr_by_tabid, { newline = "" }), vim.inspect(self.bufnr_by_tabid, { newline = "" }),
vim.inspect(globals.BUFNR_BY_TABID, { newline = "" }),
vim.inspect(globals.WINID_BY_TABID, { newline = "" }), vim.inspect(globals.WINID_BY_TABID, { newline = "" }),
vim.inspect(vim.fn.win_findbuf(bufnr), { newline = "" }), vim.inspect(vim.fn.win_findbuf(bufnr), { newline = "" }),
vim.inspect(data, { newline = "" }), vim.inspect(data, { newline = "" }),
@ -177,7 +179,7 @@ end
---@param bufnr integer ---@param bufnr integer
---@return boolean ---@return boolean
function View:matches_bufnr(bufnr) function View:matches_bufnr(bufnr)
for _, b in pairs(self.bufnr_by_tabid) do for _, b in pairs(globals.BUFNR_BY_TABID) do
if b == bufnr then if b == bufnr then
return true return true
end end
@ -206,6 +208,8 @@ function View:create_buffer(bufnr)
self.bufnr_by_tabid[tabid] = bufnr self.bufnr_by_tabid[tabid] = bufnr
globals.BUFNR_BY_TABID[tabid] = bufnr
vim.api.nvim_buf_set_name(bufnr, "NvimTree_" .. tabid) vim.api.nvim_buf_set_name(bufnr, "NvimTree_" .. tabid)
for _, option in ipairs(BUFFER_OPTIONS) do for _, option in ipairs(BUFFER_OPTIONS) do
@ -540,14 +544,14 @@ end
function View:abandon_current_window() function View:abandon_current_window()
local tab = vim.api.nvim_get_current_tabpage() local tab = vim.api.nvim_get_current_tabpage()
self.bufnr_by_tabid[tab] = nil globals.BUFNR_BY_TABID[tab] = nil
globals.WINID_BY_TABID[tab] = nil globals.WINID_BY_TABID[tab] = nil
end end
function View:abandon_all_windows() function View:abandon_all_windows()
for tab, _ in pairs(vim.api.nvim_list_tabpages()) do for tab, _ in pairs(vim.api.nvim_list_tabpages()) do
self.bufnr_by_tabid[tab] = nil globals.BUFNR_BY_TABID[tab] = nil
globals.WINID_BY_TABID[tab] = nil globals.WINID_BY_TABID[tab] = nil
end end
end end
@ -624,7 +628,7 @@ end
---@param tabid number|nil (optional) the number of the chosen tabpage. Defaults to current tabpage. ---@param tabid number|nil (optional) the number of the chosen tabpage. Defaults to current tabpage.
---@return integer? winid ---@return integer? winid
function View:winid(tabid) function View:winid(tabid)
local bufnr = self.bufnr_by_tabid[tabid] local bufnr = globals.BUFNR_BY_TABID[tabid]
if bufnr then if bufnr then
for _, winid in pairs(vim.api.nvim_tabpage_list_wins(tabid or 0)) do for _, winid in pairs(vim.api.nvim_tabpage_list_wins(tabid or 0)) do
@ -649,7 +653,7 @@ end
function View:get_bufnr() function View:get_bufnr()
local tab = vim.api.nvim_get_current_tabpage() local tab = vim.api.nvim_get_current_tabpage()
return self.bufnr_by_tabid[tab] return globals.BUFNR_BY_TABID[tab]
end end
function View:prevent_buffer_override() function View:prevent_buffer_override()

1
lua/nvim-tree/globals.lua
View File

@ -3,6 +3,7 @@
local M = { local M = {
-- from View -- from View
WINID_BY_TABID = {}, WINID_BY_TABID = {},
BUFNR_BY_TABID = {},
CURSORS = {}, CURSORS = {},
} }