diff --git a/doc/nvim-tree-lua.txt b/doc/nvim-tree-lua.txt index 55fa98b61fb..4859ad8700e 100644 --- a/doc/nvim-tree-lua.txt +++ b/doc/nvim-tree-lua.txt @@ -649,6 +649,7 @@ Following is the default configuration. See |nvim-tree-opts| for details. >lua dev = false, diagnostics = false, git = false, + lifecycle = false, profile = false, watcher = false, }, diff --git a/lua/nvim-tree.lua b/lua/nvim-tree.lua index c4cdbcf74f0..f7509d077fe 100644 --- a/lua/nvim-tree.lua +++ b/lua/nvim-tree.lua @@ -89,10 +89,10 @@ function M.tab_enter() return end end - view.open({ focus_tree = false }) local explorer = core.get_explorer() if explorer then + explorer.window:open({ focus_tree = false }) explorer.renderer:draw() end end @@ -150,21 +150,6 @@ local function setup_autocommands(opts) vim.api.nvim_create_autocmd(name, vim.tbl_extend("force", default_opts, custom_opts)) end - -- prevent new opened file from opening in the same window as nvim-tree - create_nvim_tree_autocmd("BufWipeout", { - pattern = "NvimTree_*", - callback = function() - if not utils.is_nvim_tree_buf(0) then - return - end - if opts.actions.open_file.eject then - view._prevent_buffer_override() - else - view.abandon_current_window() - end - end, - }) - if opts.tab.sync.open then create_nvim_tree_autocmd("TabEnter", { callback = vim.schedule_wrap(M.tab_enter) }) end @@ -226,17 +211,6 @@ local function setup_autocommands(opts) }) end - if opts.view.float.enable and opts.view.float.quit_on_focus_loss then - create_nvim_tree_autocmd("WinLeave", { - pattern = "NvimTree_*", - callback = function() - if utils.is_nvim_tree_buf(0) then - view.close() - end - end, - }) - end - -- Handles event dispatch when tree is closed by `:q` create_nvim_tree_autocmd("WinClosed", { pattern = "*", @@ -524,6 +498,7 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS dev = false, diagnostics = false, git = false, + lifecycle = false, profile = false, watcher = false, }, @@ -692,9 +667,11 @@ local function localise_default_opts() end function M.purge_all_state() - view.close_all_tabs() - view.abandon_all_windows() local explorer = core.get_explorer() + if explorer then + explorer.window:close_all_tabs() + end + view.abandon_all_windows() if explorer then require("nvim-tree.git").purge_state() explorer:destroy() @@ -748,7 +725,6 @@ function M.setup(conf) require("nvim-tree.explorer.watch").setup(opts) require("nvim-tree.git").setup(opts) require("nvim-tree.git.utils").setup(opts) - require("nvim-tree.view").setup(opts) require("nvim-tree.lib").setup(opts) require("nvim-tree.renderer.components").setup(opts) require("nvim-tree.buffers").setup(opts) diff --git a/lua/nvim-tree/actions/fs/clipboard.lua b/lua/nvim-tree/actions/fs/clipboard.lua index 3f3ed37c94d..aa9ae2c8664 100644 --- a/lua/nvim-tree/actions/fs/clipboard.lua +++ b/lua/nvim-tree/actions/fs/clipboard.lua @@ -31,6 +31,8 @@ local Clipboard = Class:extend() ---@protected ---@param args ClipboardArgs function Clipboard:new(args) + args.explorer:log_new("Clipboard") + self.explorer = args.explorer self.data = { @@ -42,6 +44,10 @@ function Clipboard:new(args) self.reg = self.explorer.opts.actions.use_system_clipboard and "+" or "1" end +function Clipboard:destroy() + self.explorer:log_destroy("Clipboard") +end + ---@param source string ---@param destination string ---@return boolean diff --git a/lua/nvim-tree/actions/fs/remove-file.lua b/lua/nvim-tree/actions/fs/remove-file.lua index 8a0f67cda3a..0c5fa3626c4 100644 --- a/lua/nvim-tree/actions/fs/remove-file.lua +++ b/lua/nvim-tree/actions/fs/remove-file.lua @@ -1,7 +1,6 @@ local core = require("nvim-tree.core") local utils = require("nvim-tree.utils") local events = require("nvim-tree.events") -local view = require("nvim-tree.view") local lib = require("nvim-tree.lib") local notify = require("nvim-tree.notify") @@ -14,10 +13,12 @@ local M = { ---@param windows integer[] local function close_windows(windows) + local explorer = core.get_explorer() + -- Prevent from closing when the win count equals 1 or 2, -- where the win to remove could be the last opened. -- For details see #2503. - if view.View.float.enable and #vim.api.nvim_list_wins() < 3 then + if explorer and explorer.window.float.enable and #vim.api.nvim_list_wins() < 3 then return end @@ -30,16 +31,17 @@ end ---@param absolute_path string local function clear_buffer(absolute_path) + local explorer = core.get_explorer() local bufs = vim.fn.getbufinfo({ bufloaded = 1, buflisted = 1 }) for _, buf in pairs(bufs) do if buf.name == absolute_path then local tree_winnr = vim.api.nvim_get_current_win() - if buf.hidden == 0 and (#bufs > 1 or view.View.float.enable) then + if buf.hidden == 0 and (#bufs > 1 or explorer and explorer.window.float.enable) then vim.api.nvim_set_current_win(buf.windows[1]) vim.cmd(":bn") end vim.api.nvim_buf_delete(buf.bufnr, { force = true }) - if not view.View.float.quit_on_focus_loss then + if explorer and not explorer.window.float.quit_on_focus_loss then vim.api.nvim_set_current_win(tree_winnr) end if M.config.actions.remove_file.close_window then diff --git a/lua/nvim-tree/actions/node/open-file.lua b/lua/nvim-tree/actions/node/open-file.lua index 55885e3f7f4..fe9f23800ed 100644 --- a/lua/nvim-tree/actions/node/open-file.lua +++ b/lua/nvim-tree/actions/node/open-file.lua @@ -2,6 +2,7 @@ local lib = require("nvim-tree.lib") local notify = require("nvim-tree.notify") local utils = require("nvim-tree.utils") +local core = require("nvim-tree.core") local view = require("nvim-tree.view") local M = {} @@ -187,7 +188,10 @@ end local function open_file_in_tab(filename) if M.quit_on_open then - view.close() + local explorer = core.get_explorer() + if explorer then + explorer.window:close() + end end if M.relative_path then filename = utils.path_relative(filename, vim.fn.getcwd()) @@ -197,7 +201,10 @@ end local function drop(filename) if M.quit_on_open then - view.close() + local explorer = core.get_explorer() + if explorer then + explorer.window:close() + end end if M.relative_path then filename = utils.path_relative(filename, vim.fn.getcwd()) @@ -207,7 +214,10 @@ end local function tab_drop(filename) if M.quit_on_open then - view.close() + local explorer = core.get_explorer() + if explorer then + explorer.window:close() + end end if M.relative_path then filename = utils.path_relative(filename, vim.fn.getcwd()) @@ -228,7 +238,10 @@ local function on_preview(buf_loaded) once = true, }) end - view.focus() + local explorer = core.get_explorer() + if explorer then + explorer.window:focus() + end end local function get_target_winid(mode) @@ -273,6 +286,8 @@ local function set_current_win_no_autocmd(winid, autocmd) end local function open_in_new_window(filename, mode) + local explorer = core.get_explorer() + if type(mode) ~= "string" then mode = "" end @@ -295,7 +310,11 @@ local function open_in_new_window(filename, mode) end, vim.api.nvim_list_wins()) local create_new_window = #win_ids == 1 -- This implies that the nvim-tree window is the only one - local new_window_side = (view.View.side == "right") and "aboveleft" or "belowright" + + local new_window_side = "belowright" + if explorer and (explorer.window.side == "right") then + new_window_side = "aboveleft" + end -- Target is invalid: create new window if not vim.tbl_contains(win_ids, target_winid) then @@ -327,7 +346,7 @@ local function open_in_new_window(filename, mode) end end - if (mode == "preview" or mode == "preview_no_picker") and view.View.float.enable then + if (mode == "preview" or mode == "preview_no_picker") and explorer and explorer.window.float.enable then -- ignore "WinLeave" autocmd on preview -- because the registered "WinLeave" -- will kill the floating window immediately @@ -378,6 +397,8 @@ end ---@param filename string ---@return nil function M.fn(mode, filename) + local explorer = core.get_explorer() + if type(mode) ~= "string" then mode = "" end @@ -412,16 +433,16 @@ function M.fn(mode, filename) vim.bo.bufhidden = "" end - if M.resize_window then - view.resize() + if M.resize_window and explorer then + explorer.window:resize() end if mode == "preview" or mode == "preview_no_picker" then return on_preview(buf_loaded) end - if M.quit_on_open then - view.close() + if M.quit_on_open and explorer then + explorer.window:close() end end diff --git a/lua/nvim-tree/actions/tree/find-file.lua b/lua/nvim-tree/actions/tree/find-file.lua index 8a05bf6db45..1c5c425678f 100644 --- a/lua/nvim-tree/actions/tree/find-file.lua +++ b/lua/nvim-tree/actions/tree/find-file.lua @@ -41,11 +41,12 @@ function M.fn(opts) return end - if view.is_visible() then + local explorer = core.get_explorer() + if explorer and view.is_visible() then -- focus if opts.focus then lib.set_target_win() - view.focus() + explorer.window:focus() end elseif opts.open then -- open diff --git a/lua/nvim-tree/actions/tree/open.lua b/lua/nvim-tree/actions/tree/open.lua index ff2da837b87..8ea7e1fab7f 100644 --- a/lua/nvim-tree/actions/tree/open.lua +++ b/lua/nvim-tree/actions/tree/open.lua @@ -1,3 +1,4 @@ +local core = require("nvim-tree.core") local lib = require("nvim-tree.lib") local view = require("nvim-tree.view") local finders_find_file = require("nvim-tree.actions.finders.find-file") @@ -23,10 +24,12 @@ function M.fn(opts) opts.path = nil end - if view.is_visible() then + local explorer = core.get_explorer() + + if explorer and view.is_visible() then -- focus lib.set_target_win() - view.focus() + explorer.window:focus() else -- open lib.open({ diff --git a/lua/nvim-tree/actions/tree/resize.lua b/lua/nvim-tree/actions/tree/resize.lua index e8d4e950729..7c88cb91d7d 100644 --- a/lua/nvim-tree/actions/tree/resize.lua +++ b/lua/nvim-tree/actions/tree/resize.lua @@ -1,14 +1,19 @@ -local view = require("nvim-tree.view") +local core = require("nvim-tree.core") local M = {} ---Resize the tree, persisting the new size. ---@param opts ApiTreeResizeOpts|nil function M.fn(opts) + local explorer = core.get_explorer() + if not explorer then + return + end + if opts == nil then -- reset to config values - view.configure_width() - view.resize() + explorer.window:configure_width() + explorer.window:resize() return end @@ -16,19 +21,19 @@ function M.fn(opts) local width_cfg = options.width if width_cfg ~= nil then - view.configure_width(width_cfg) - view.resize() + explorer.window:configure_width(width_cfg) + explorer.window:resize() return end - if not view.is_width_determined() then + if not explorer.window:is_width_determined() then -- {absolute} and {relative} do nothing when {width} is a function. return end local absolute = options.absolute if type(absolute) == "number" then - view.resize(absolute) + explorer.window:resize(absolute) return end @@ -39,7 +44,7 @@ function M.fn(opts) relative_size = "+" .. relative_size end - view.resize(relative_size) + explorer.window:resize(relative_size) return end end diff --git a/lua/nvim-tree/actions/tree/toggle.lua b/lua/nvim-tree/actions/tree/toggle.lua index 10aa978467e..60313951a75 100644 --- a/lua/nvim-tree/actions/tree/toggle.lua +++ b/lua/nvim-tree/actions/tree/toggle.lua @@ -1,3 +1,4 @@ +local core = require("nvim-tree.core") local lib = require("nvim-tree.lib") local view = require("nvim-tree.view") local finders_find_file = require("nvim-tree.actions.finders.find-file") @@ -10,6 +11,8 @@ local M = {} ---@param cwd boolean|nil legacy -> opts.path ---@param bang boolean|nil legacy -> opts.update_root function M.fn(opts, no_focus, cwd, bang) + local explorer = core.get_explorer() + -- legacy arguments if type(opts) == "boolean" then opts = { @@ -40,9 +43,9 @@ function M.fn(opts, no_focus, cwd, bang) opts.path = nil end - if view.is_visible() then + if explorer and view.is_visible() then -- close - view.close() + explorer.window:close() else -- open lib.open({ diff --git a/lua/nvim-tree/api.lua b/lua/nvim-tree/api.lua index 39fba07d52d..b64ccf02726 100644 --- a/lua/nvim-tree/api.lua +++ b/lua/nvim-tree/api.lua @@ -141,9 +141,9 @@ Api.tree.focus = Api.tree.open ---@field focus boolean|nil default true Api.tree.toggle = wrap(actions.tree.toggle.fn) -Api.tree.close = wrap(view.close) -Api.tree.close_in_this_tab = wrap(view.close_this_tab_only) -Api.tree.close_in_all_tabs = wrap(view.close_all_tabs) +Api.tree.close = wrap_explorer_member("window", "close") +Api.tree.close_in_this_tab = wrap_explorer_member("window", "close_this_tab_only") +Api.tree.close_in_all_tabs = wrap_explorer_member("window", "close_all_tabs") Api.tree.reload = wrap_explorer("reload_explorer") ---@class ApiTreeResizeOpts @@ -239,13 +239,17 @@ local function edit(mode, node, edit_opts) local path = file_link and file_link.link_to or node.absolute_path local cur_tabpage = vim.api.nvim_get_current_tabpage() + local explorer = core.get_explorer() + actions.node.open_file.fn(mode, path) edit_opts = edit_opts or {} local mode_unsupported_quit_on_open = mode == "drop" or mode == "tab_drop" or mode == "edit_in_place" if not mode_unsupported_quit_on_open and edit_opts.quit_on_open then - view.close(cur_tabpage) + if explorer then + explorer.window:close(cur_tabpage) + end end local mode_unsupported_focus = mode == "drop" or mode == "tab_drop" or mode == "edit_in_place" @@ -255,7 +259,9 @@ local function edit(mode, node, edit_opts) if mode == "tabnew" then vim.cmd(":tabprev") end - view.focus() + if explorer then + explorer.window:focus() + end end end diff --git a/lua/nvim-tree/appearance/init.lua b/lua/nvim-tree/appearance/init.lua index 61714af644e..e3e3ab26690 100644 --- a/lua/nvim-tree/appearance/init.lua +++ b/lua/nvim-tree/appearance/init.lua @@ -134,6 +134,29 @@ M.HIGHLIGHT_GROUPS = { { group = "NvimTreeDiagnosticHintFolderHL", link = "NvimTreeDiagnosticHintFileHL" }, } +-- winhighlight for most cases +M.WIN_HL = table.concat({ + "EndOfBuffer:NvimTreeEndOfBuffer", + "CursorLine:NvimTreeCursorLine", + "CursorLineNr:NvimTreeCursorLineNr", + "LineNr:NvimTreeLineNr", + "WinSeparator:NvimTreeWinSeparator", + "StatusLine:NvimTreeStatusLine", + "StatusLineNC:NvimTreeStatuslineNC", + "SignColumn:NvimTreeSignColumn", + "Normal:NvimTreeNormal", + "NormalNC:NvimTreeNormalNC", + "NormalFloat:NvimTreeNormalFloat", + "FloatBorder:NvimTreeNormalFloatBorder", +}, ",") + +-- winhighlight for help +M.WIN_HL_HELP = table.concat({ + "NormalFloat:NvimTreeNormalFloat", + "WinSeparator:NvimTreeWinSeparator", + "CursorLine:NvimTreeCursorLine", +}, ",") + -- nvim-tree highlight groups to legacy M.LEGACY_LINKS = { NvimTreeModifiedIcon = "NvimTreeModifiedFile", diff --git a/lua/nvim-tree/commands.lua b/lua/nvim-tree/commands.lua index bff880c14fd..afac3e25573 100644 --- a/lua/nvim-tree/commands.lua +++ b/lua/nvim-tree/commands.lua @@ -1,5 +1,5 @@ local api = require("nvim-tree.api") -local view = require("nvim-tree.view") +local core = require("nvim-tree.core") local M = {} @@ -111,7 +111,10 @@ local CMDS = { bar = true, }, command = function(c) - view.resize(c.args) + local explorer = core.get_explorer() + if explorer then + explorer.window:resize(c.args) + end end, }, { diff --git a/lua/nvim-tree/core.lua b/lua/nvim-tree/core.lua index 60d4a0a6f6a..5db9e0f2361 100644 --- a/lua/nvim-tree/core.lua +++ b/lua/nvim-tree/core.lua @@ -1,6 +1,5 @@ local events = require("nvim-tree.events") local notify = require("nvim-tree.notify") -local view = require("nvim-tree.view") local log = require("nvim-tree.log") local M = {} @@ -55,7 +54,7 @@ end ---@return integer function M.get_nodes_starting_line() local offset = 1 - if view.is_root_folder_visible(M.get_cwd()) then + if TreeExplorer and TreeExplorer.window:is_root_folder_visible(M.get_cwd()) then offset = offset + 1 end if TreeExplorer and TreeExplorer.live_filter.filter then diff --git a/lua/nvim-tree/explorer/filters.lua b/lua/nvim-tree/explorer/filters.lua index 62230687e40..6066e8a32bc 100644 --- a/lua/nvim-tree/explorer/filters.lua +++ b/lua/nvim-tree/explorer/filters.lua @@ -23,6 +23,8 @@ local Filters = Class:extend() ---@protected ---@param args FiltersArgs function Filters:new(args) + args.explorer:log_new("Filters") + self.explorer = args.explorer self.ignore_list = {} self.exclude_list = self.explorer.opts.filters.exclude @@ -50,6 +52,10 @@ function Filters:new(args) end end +function Filters:destroy() + self.explorer:log_destroy("Filters") +end + ---@private ---@param path string ---@return boolean diff --git a/lua/nvim-tree/explorer/init.lua b/lua/nvim-tree/explorer/init.lua index 58972164afe..7b8a494da52 100644 --- a/lua/nvim-tree/explorer/init.lua +++ b/lua/nvim-tree/explorer/init.lua @@ -20,6 +20,7 @@ local LiveFilter = require("nvim-tree.explorer.live-filter") local Sorter = require("nvim-tree.explorer.sorter") local Clipboard = require("nvim-tree.actions.fs.clipboard") local Renderer = require("nvim-tree.renderer") +local Window = require("nvim-tree.explorer.window") local FILTER_REASON = require("nvim-tree.enum").FILTER_REASON @@ -35,6 +36,7 @@ local config ---@field sorters Sorter ---@field marks Marks ---@field clipboard Clipboard +---@field window Window local Explorer = RootNode:extend() ---@class Explorer @@ -55,15 +57,18 @@ function Explorer:new(args) self.uid_explorer = vim.loop.hrtime() self.augroup_id = vim.api.nvim_create_augroup("NvimTree_Explorer_" .. self.uid_explorer, {}) - self.open = true - self.opts = config + self:log_new("Explorer") - self.sorters = Sorter({ explorer = self }) - self.renderer = Renderer({ explorer = self }) - self.filters = Filters({ explorer = self }) - self.live_filter = LiveFilter({ explorer = self }) - self.marks = Marks({ explorer = self }) - self.clipboard = Clipboard({ explorer = self }) + self.open = true + self.opts = config + + self.clipboard = Clipboard({ explorer = self }) + self.filters = Filters({ explorer = self }) + self.live_filter = LiveFilter({ explorer = self }) + self.marks = Marks({ explorer = self }) + self.renderer = Renderer({ explorer = self }) + self.sorters = Sorter({ explorer = self }) + self.window = Window({ explorer = self }) self:create_autocmds() @@ -71,7 +76,15 @@ function Explorer:new(args) end function Explorer:destroy() - log.line("dev", "Explorer:destroy") + self.explorer:log_destroy("Explorer") + + self.clipboard:destroy() + self.filters:destroy() + self.live_filter:destroy() + self.marks:destroy() + self.renderer:destroy() + self.sorters:destroy() + self.window:destroy() vim.api.nvim_del_augroup_by_id(self.augroup_id) @@ -84,11 +97,23 @@ function Explorer:create_autocmds() group = self.augroup_id, callback = function() appearance.setup() - view.reset_winhl() + self.window:reset_winhl() self.renderer:draw() end, }) + if self.opts.view.float.enable and self.opts.view.float.quit_on_focus_loss then + vim.api.nvim_create_autocmd("WinLeave", { + group = self.augroup_id, + pattern = "NvimTree_*", + callback = function() + if utils.is_nvim_tree_buf(0) then + self.window:close() + end + end, + }) + end + vim.api.nvim_create_autocmd("BufWritePost", { group = self.augroup_id, callback = function() @@ -141,6 +166,22 @@ function Explorer:create_autocmds() end, }) + -- prevent new opened file from opening in the same window as nvim-tree + vim.api.nvim_create_autocmd("BufWipeout", { + group = self.augroup_id, + pattern = "NvimTree_*", + callback = function() + if not utils.is_nvim_tree_buf(0) then + return + end + if self.opts.actions.open_file.eject then + self.window:prevent_buffer_override() + else + view.abandon_current_window() + end + end, + }) + vim.api.nvim_create_autocmd("BufEnter", { group = self.augroup_id, pattern = "NvimTree_*", @@ -523,7 +564,7 @@ function Explorer:get_node_at_cursor() return end - if cursor[1] == 1 and view.is_root_folder_visible(core.get_cwd()) then + if cursor[1] == 1 and self.window:is_root_folder_visible(core.get_cwd()) then return self end @@ -557,6 +598,18 @@ function Explorer:get_nodes() return self:clone() end +---Log a lifecycle message with uid_explorer and absolute_path +---@param msg string? +function Explorer:log_new(msg) + log.line("lifecycle", "+ %-15s %d %s", msg, self.uid_explorer, self.absolute_path) +end + +---Log a lifecycle message with uid_explorer and absolute_path +---@param msg string? +function Explorer:log_destroy(msg) + log.line("lifecycle", "- %-15s %d %s", msg, self.uid_explorer, self.absolute_path) +end + function Explorer:setup(opts) config = opts end diff --git a/lua/nvim-tree/explorer/live-filter.lua b/lua/nvim-tree/explorer/live-filter.lua index 62a7dd9ef64..54552f8543a 100644 --- a/lua/nvim-tree/explorer/live-filter.lua +++ b/lua/nvim-tree/explorer/live-filter.lua @@ -21,12 +21,18 @@ local LiveFilter = Class:extend() ---@protected ---@param args LiveFilterArgs function LiveFilter:new(args) + args.explorer:log_new("LiveFilter") + self.explorer = args.explorer self.prefix = self.explorer.opts.live_filter.prefix self.always_show_folders = self.explorer.opts.live_filter.always_show_folders self.filter = nil end +function LiveFilter:destroy() + self.explorer:log_destroy("LiveFilter") +end + ---@param node_ Node? local function reset_filter(self, node_) node_ = node_ or self.explorer @@ -56,14 +62,14 @@ local overlay_bufnr = 0 local overlay_winnr = 0 local function remove_overlay(self) - if view.View.float.enable and view.View.float.quit_on_focus_loss then + if self.explorer.view.float.enable and self.explorer.view.float.quit_on_focus_loss then -- return to normal nvim-tree float behaviour when filter window is closed vim.api.nvim_create_autocmd("WinLeave", { pattern = "NvimTree_*", group = vim.api.nvim_create_augroup("NvimTree", { clear = false }), callback = function() if utils.is_nvim_tree_buf(0) then - view.close() + self.explorer.view:close() end end, }) @@ -156,7 +162,7 @@ end ---@return integer local function calculate_overlay_win_width(self) - local wininfo = vim.fn.getwininfo(view.get_winnr())[1] + local wininfo = vim.fn.getwininfo(self.explorer.view:get_winnr())[1] if wininfo then return wininfo.width - wininfo.textoff - #self.prefix @@ -166,7 +172,7 @@ local function calculate_overlay_win_width(self) end local function create_overlay(self) - if view.View.float.enable then + if self.explorer.view.float.enable then -- don't close nvim-tree float when focus is changed to filter window vim.api.nvim_clear_autocmds({ event = "WinLeave", @@ -198,7 +204,7 @@ local function create_overlay(self) end function LiveFilter:start_filtering() - view.View.live_filter.prev_focused_node = self.explorer:get_node_at_cursor() + self.explorer.window.live_filter.prev_focused_node = self.explorer:get_node_at_cursor() self.filter = self.filter or "" self.explorer.renderer:draw() @@ -213,7 +219,7 @@ end function LiveFilter:clear_filter() local node = self.explorer:get_node_at_cursor() - local last_node = view.View.live_filter.prev_focused_node + local last_node = self.explorer.window.live_filter.prev_focused_node self.filter = nil reset_filter(self) diff --git a/lua/nvim-tree/explorer/sorter.lua b/lua/nvim-tree/explorer/sorter.lua index 799cfa481b1..4e69d36eac6 100644 --- a/lua/nvim-tree/explorer/sorter.lua +++ b/lua/nvim-tree/explorer/sorter.lua @@ -19,9 +19,15 @@ local Sorter = Class:extend() ---@protected ---@param args SorterArgs function Sorter:new(args) + args.explorer:log_new("Sorter") + self.explorer = args.explorer end +function Sorter:destroy() + self.explorer:log_destroy("Sorter") +end + ---Create a shallow copy of a portion of a list. ---@param t table ---@param first integer First index, inclusive diff --git a/lua/nvim-tree/explorer/window.lua b/lua/nvim-tree/explorer/window.lua new file mode 100644 index 00000000000..e6685fc85a7 --- /dev/null +++ b/lua/nvim-tree/explorer/window.lua @@ -0,0 +1,504 @@ +local appearance = require("nvim-tree.appearance") +local events = require("nvim-tree.events") +local utils = require("nvim-tree.utils") +local log = require("nvim-tree.log") +local notify = require("nvim-tree.notify") +local view = require("nvim-tree.view") + +local Class = require("nvim-tree.classic") + +---@class OpenInWinOpts +---@field hijack_current_buf boolean|nil default true +---@field resize boolean|nil default true +---@field winid number|nil 0 or nil for current + +local DEFAULT_MIN_WIDTH = 30 +local DEFAULT_MAX_WIDTH = -1 +local DEFAULT_PADDING = 1 + +---@class (exact) Window: Class +---@field live_filter table +---@field side string +---@field float table +---@field private explorer Explorer +---@field private adaptive_size boolean +---@field private centralize_selection boolean +---@field private hide_root_folder boolean +---@field private winopts table +---@field private height integer +---@field private preserve_window_proportions boolean +---@field private initial_width integer +---@field private width (fun():integer)|integer|string +---@field private max_width integer +---@field private padding integer +local Window = Class:extend() + +---@class Window +---@overload fun(args: WindowArgs): Window + +---@class (exact) WindowArgs +---@field explorer Explorer + +---@protected +---@param args WindowArgs +function Window:new(args) + args.explorer:log_new("Window") + + self.explorer = args.explorer + self.adaptive_size = false + self.centralize_selection = self.explorer.opts.view.centralize_selection + self.float = self.explorer.opts.view.float + self.height = self.explorer.opts.view.height + self.hide_root_folder = self.explorer.opts.renderer.root_folder_label == false + self.preserve_window_proportions = self.explorer.opts.view.preserve_window_proportions + self.side = (self.explorer.opts.view.side == "right") and "right" or "left" + self.live_filter = { prev_focused_node = nil, } + + self.winopts = { + relativenumber = self.explorer.opts.view.relativenumber, + number = self.explorer.opts.view.number, + list = false, + foldenable = false, + winfixwidth = true, + winfixheight = true, + spell = false, + signcolumn = self.explorer.opts.view.signcolumn, + foldmethod = "manual", + foldcolumn = "0", + cursorcolumn = false, + cursorline = self.explorer.opts.view.cursorline, + cursorlineopt = "both", + colorcolumn = "0", + wrap = false, + winhl = appearance.WIN_HL, + } + + self:configure_width(self.explorer.opts.view.width) + self.initial_width = self:get_width() +end + +function Window:destroy() + self.explorer:log_destroy("Window") +end + +---@type { name: string, value: any }[] +local BUFFER_OPTIONS = { + { name = "bufhidden", value = "wipe" }, + { name = "buflisted", value = false }, + { name = "buftype", value = "nofile" }, + { name = "filetype", value = "NvimTree" }, + { name = "modifiable", value = false }, + { name = "swapfile", value = false }, +} + +---@private +---@param bufnr integer|false|nil +function Window:create_buffer(bufnr) + view.wipe_rogue_buffer() + + local tab = view.create_buffer(bufnr) + + vim.api.nvim_buf_set_name(view.get_bufnr(), "NvimTree_" .. tab) + + bufnr = view.get_bufnr() + for _, option in ipairs(BUFFER_OPTIONS) do + vim.api.nvim_set_option_value(option.name, option.value, { buf = bufnr }) + end + + require("nvim-tree.keymap").on_attach(view.get_bufnr()) + + events._dispatch_tree_attached_post(view.get_bufnr()) +end + +---@private +---@param size (fun():integer)|integer|string +---@return integer +function Window:get_size(size) + if type(size) == "number" then + return size + elseif type(size) == "function" then + return self:get_size(size()) + end + local size_as_number = tonumber(size:sub(0, -2)) + local percent_as_decimal = size_as_number / 100 + return math.floor(vim.o.columns * percent_as_decimal) +end + +---@private +---@param size (fun():integer)|integer|nil +---@return integer +function Window:get_width(size) + if size then + return self:get_size(size) + else + return self:get_size(self.width) + end +end + +---@private +function Window:set_window_options_and_buffer() + pcall(vim.api.nvim_command, "buffer " .. view.get_bufnr()) + + if vim.fn.has("nvim-0.10") == 1 then + local eventignore = vim.api.nvim_get_option_value("eventignore", {}) + vim.api.nvim_set_option_value("eventignore", "all", {}) + + for k, v in pairs(self.winopts) do + vim.api.nvim_set_option_value(k, v, { scope = "local" }) + end + + vim.api.nvim_set_option_value("eventignore", eventignore, {}) + else + local eventignore = vim.api.nvim_get_option("eventignore") ---@diagnostic disable-line: deprecated + vim.api.nvim_set_option("eventignore", "all") ---@diagnostic disable-line: deprecated + + -- #3009 vim.api.nvim_win_set_option does not set local scope without explicit winid. + -- Revert to opt_local instead of propagating it through for just the 0.10 path. + for k, v in pairs(self.winopts) do + vim.opt_local[k] = v + end + + vim.api.nvim_set_option("eventignore", eventignore) ---@diagnostic disable-line: deprecated + end +end + +---@private +---@return table +function Window:open_win_config() + if type(self.float.open_win_config) == "function" then + return self.float.open_win_config() + else + return self.float.open_win_config + end +end + +---@private +function Window:open_window() + if self.float.enable then + vim.api.nvim_open_win(0, true, self:open_win_config()) + else + vim.api.nvim_command("vsp") + self:reposition_window() + end + view.setup_tabpage(vim.api.nvim_get_current_tabpage()) + self:set_window_options_and_buffer() +end + +---@param buf integer +---@return boolean +local function is_buf_displayed(buf) + return vim.api.nvim_buf_is_valid(buf) and vim.fn.buflisted(buf) == 1 +end + +---@return number|nil +local function get_alt_or_next_buf() + local alt_buf = vim.fn.bufnr("#") + if is_buf_displayed(alt_buf) then + return alt_buf + end + + for _, buf in ipairs(vim.api.nvim_list_bufs()) do + if is_buf_displayed(buf) then + return buf + end + end +end + +local function switch_buf_if_last_buf() + if #vim.api.nvim_list_wins() == 1 then + local buf = get_alt_or_next_buf() + if buf then + vim.cmd("sb" .. buf) + else + vim.cmd("new") + end + end +end + +---@param tabpage integer +local function close(tabpage) + if not view.is_visible({ tabpage = tabpage }) then + return + end + view.save_tab_state(tabpage) + switch_buf_if_last_buf() + local tree_win = view.get_winnr(tabpage) + local current_win = vim.api.nvim_get_current_win() + for _, win in pairs(vim.api.nvim_tabpage_list_wins(tabpage)) do + if vim.api.nvim_win_get_config(win).relative == "" then + local prev_win = vim.fn.winnr("#") -- this tab only + if tree_win == current_win and prev_win > 0 then + vim.api.nvim_set_current_win(vim.fn.win_getid(prev_win)) + end + if vim.api.nvim_win_is_valid(tree_win or 0) then + local success, error = pcall(vim.api.nvim_win_close, tree_win or 0, true) + if not success then + notify.debug("Failed to close window: " .. error) + return + end + end + return + end + end +end + +function Window:close_this_tab_only() + close(vim.api.nvim_get_current_tabpage()) +end + +function Window:close_all_tabs() + view.all_tabs_callback(function(t) + close(t) + end) +end + +---@param tabpage integer|nil +function Window:close(tabpage) + if self.explorer.opts.tab.sync.close then + self:close_all_tabs() + elseif tabpage then + close(tabpage) + else + self:close_this_tab_only() + end +end + +---@param options table|nil +function Window:open(options) + if view.is_visible() then + return + end + + local profile = log.profile_start("view open") + + events._dispatch_on_tree_pre_open() + self:create_buffer() + self:open_window() + self:resize() + + local opts = options or { focus_tree = true } + if not opts.focus_tree then + vim.cmd("wincmd p") + end + events._dispatch_on_tree_open() + + log.profile_end(profile) +end + +---@private +function Window:grow() + local starts_at = self:is_root_folder_visible(require("nvim-tree.core").get_cwd()) and 1 or 0 + local lines = vim.api.nvim_buf_get_lines(view.get_bufnr(), starts_at, -1, false) + -- number of columns of right-padding to indicate end of path + local padding = self:get_size(self.padding) + + -- account for sign/number columns etc. + local wininfo = vim.fn.getwininfo(view.get_winnr()) + if type(wininfo) == "table" and type(wininfo[1]) == "table" then + padding = padding + wininfo[1].textoff + end + + local resizing_width = self.initial_width - padding + local max_width + + -- maybe bound max + if self.max_width == -1 then + max_width = -1 + else + max_width = self:get_width(self.max_width) - padding + end + + local ns_id = vim.api.nvim_get_namespaces()["NvimTreeExtmarks"] + for line_nr, l in pairs(lines) do + local count = vim.fn.strchars(l) + -- also add space for right-aligned icons + local extmarks = vim.api.nvim_buf_get_extmarks(view.get_bufnr(), ns_id, { line_nr, 0 }, { line_nr, -1 }, { details = true }) + count = count + utils.extmarks_length(extmarks) + if resizing_width < count then + resizing_width = count + end + if self.adaptive_size and max_width >= 0 and resizing_width >= max_width then + resizing_width = max_width + break + end + end + self:resize(resizing_width + padding) +end + +function Window:grow_from_content() + if self.adaptive_size then + self:grow() + end +end + +---@param size string|number|nil +function Window:resize(size) + if self.float.enable and not self.adaptive_size then + -- if the floating windows's adaptive size is not desired, then the + -- float size should be defined in view.float.open_win_config + return + end + + if type(size) == "string" then + size = vim.trim(size) + local first_char = size:sub(1, 1) + size = tonumber(size) + + if first_char == "+" or first_char == "-" then + size = self.width + size + end + end + + if type(size) == "number" and size <= 0 then + return + end + + if size then + self.width = size + self.height = size + end + + if not view.is_visible() then + return + end + + local winnr = view.get_winnr() or 0 + + local new_size = self:get_width() + + if new_size ~= vim.api.nvim_win_get_width(winnr) then + vim.api.nvim_win_set_width(winnr, new_size) + if not self.preserve_window_proportions then + vim.cmd(":wincmd =") + end + end + + events._dispatch_on_tree_resize(new_size) +end + +---@private +function Window:reposition_window() + vim.api.nvim_command("wincmd " .. (self.side == "left" and "H" or "L")) + self:resize() +end + +---Open the tree in the a window +---@param opts OpenInWinOpts|nil +function Window:open_in_win(opts) + opts = opts or { hijack_current_buf = true, resize = true } + events._dispatch_on_tree_pre_open() + if opts.winid and vim.api.nvim_win_is_valid(opts.winid) then + vim.api.nvim_set_current_win(opts.winid) + end + self:create_buffer(opts.hijack_current_buf and vim.api.nvim_get_current_buf()) + view.setup_tabpage(vim.api.nvim_get_current_tabpage()) + view.set_current_win() + self:set_window_options_and_buffer() + if opts.resize then + self:reposition_window() + self:resize() + end + events._dispatch_on_tree_open() +end + +---@param winnr number|nil +---@param open_if_closed boolean|nil +function Window:focus(winnr, open_if_closed) + local wnr = winnr or view.get_winnr() + + if vim.api.nvim_win_get_tabpage(wnr or 0) ~= vim.api.nvim_win_get_tabpage(0) then + self:close() + self:open() + wnr = view.get_winnr() + elseif open_if_closed and not view.is_visible() then + self:open() + end + + if wnr then + vim.api.nvim_set_current_win(wnr) + end +end + +function Window:prevent_buffer_override() + local view_winnr = view.get_winnr() + local view_bufnr = view.get_bufnr() + + -- need to schedule to let the new buffer populate the window + -- because this event needs to be run on bufWipeout. + -- Otherwise the curwin/curbuf would match the view buffer and the view window. + vim.schedule(function() + local curwin = vim.api.nvim_get_current_win() + local curwinconfig = vim.api.nvim_win_get_config(curwin) + local curbuf = vim.api.nvim_win_get_buf(curwin) + local bufname = vim.api.nvim_buf_get_name(curbuf) + + if not bufname:match("NvimTree") then + view.clear_tabpage(view_winnr) + end + if curwin ~= view_winnr or bufname == "" or curbuf == view_bufnr then + return + end + + -- patch to avoid the overriding window to be fixed in size + -- might need a better patch + vim.cmd("setlocal nowinfixwidth") + vim.cmd("setlocal nowinfixheight") + self:open({ focus_tree = false }) + + self.explorer.renderer:draw() + + pcall(vim.api.nvim_win_close, curwin, { force = true }) + + -- to handle opening a file using :e when nvim-tree is on floating mode + -- falling back to the current window instead of creating a new one + if curwinconfig.relative ~= "" then + require("nvim-tree.actions.node.open-file").fn("edit_in_place", bufname) + else + require("nvim-tree.actions.node.open-file").fn("edit", bufname) + end + end) +end + +---@param cwd string|nil +---@return boolean +function Window:is_root_folder_visible(cwd) + return cwd ~= "/" and not self.hide_root_folder +end + +-- used on ColorScheme event +function Window:reset_winhl() + local winnr = view.get_winnr() + if winnr and vim.api.nvim_win_is_valid(winnr) then + vim.wo[view.get_winnr()].winhl = appearance.WIN_HL + end +end + +---Check if width determined or calculated on-fly +---@return boolean +function Window:is_width_determined() + return type(self.width) ~= "function" +end + +---Configure width-related config +---@param width string|function|number|table|nil +function Window:configure_width(width) + if type(width) == "table" then + self.adaptive_size = true + self.width = width.min or DEFAULT_MIN_WIDTH + self.max_width = width.max or DEFAULT_MAX_WIDTH + self.padding = width.padding or DEFAULT_PADDING + elseif width == nil then + if self.explorer.opts.view.width ~= nil then + -- if we had input config - fallback to it + self:configure_width(self.explorer.opts.view.width) + else + -- otherwise - restore initial width + self.width = self.initial_width + end + else + self.adaptive_size = false + self.width = width + end +end + +return Window diff --git a/lua/nvim-tree/help.lua b/lua/nvim-tree/help.lua index a5a0dbd6b4a..34f6db2d836 100644 --- a/lua/nvim-tree/help.lua +++ b/lua/nvim-tree/help.lua @@ -1,3 +1,4 @@ +local appearance = require("nvim-tree.appearance") local keymap = require("nvim-tree.keymap") local api = {} -- circular dependency @@ -5,12 +6,6 @@ local PAT_MOUSE = "^<.*Mouse" local PAT_CTRL = "^ local types = {} diff --git a/lua/nvim-tree/marks/init.lua b/lua/nvim-tree/marks/init.lua index c940f999983..e0fe9a3086e 100644 --- a/lua/nvim-tree/marks/init.lua +++ b/lua/nvim-tree/marks/init.lua @@ -25,11 +25,17 @@ local Marks = Class:extend() ---@protected ---@param args MarksArgs function Marks:new(args) + args.explorer:log_new("Marks") + self.explorer = args.explorer self.marks = {} end +function Marks:destroy() + self.explorer:log_destroy("Marks") +end + ---Clear all marks and reload if watchers disabled ---@private function Marks:clear_reload() diff --git a/lua/nvim-tree/renderer/builder.lua b/lua/nvim-tree/renderer/builder.lua index 819660e5306..a2f8964c439 100644 --- a/lua/nvim-tree/renderer/builder.lua +++ b/lua/nvim-tree/renderer/builder.lua @@ -1,6 +1,5 @@ local notify = require("nvim-tree.notify") local utils = require("nvim-tree.utils") -local view = require("nvim-tree.view") local Class = require("nvim-tree.classic") @@ -379,7 +378,7 @@ end ---@private function Builder:build_header() - if view.is_root_folder_visible(self.explorer.absolute_path) then + if self.explorer.window:is_root_folder_visible(self.explorer.absolute_path) then local root_name = self:format_root_name(self.explorer.opts.renderer.root_folder_label) table.insert(self.lines, root_name) self:insert_highlight({ "NvimTreeRootFolder" }, 0, string.len(root_name)) diff --git a/lua/nvim-tree/renderer/components/full-name.lua b/lua/nvim-tree/renderer/components/full-name.lua index 6c41f3909d9..0dc18f47d30 100644 --- a/lua/nvim-tree/renderer/components/full-name.lua +++ b/lua/nvim-tree/renderer/components/full-name.lua @@ -1,7 +1,7 @@ -local M = {} - +local appearance = require("nvim-tree.appearance") local utils = require("nvim-tree.utils") -local view = require("nvim-tree.view") + +local M = {} local function hide(win) if win then @@ -72,7 +72,7 @@ local function show(opts) style = "minimal", border = "none" }) - vim.wo[M.popup_win].winhl = view.View.winopts.winhl + vim.wo[M.popup_win].winhl = appearance.WIN_HL local ns_id = vim.api.nvim_get_namespaces()["NvimTreeHighlights"] local extmarks = vim.api.nvim_buf_get_extmarks(0, ns_id, { line_nr - 1, 0 }, { line_nr - 1, -1 }, { details = true }) diff --git a/lua/nvim-tree/renderer/init.lua b/lua/nvim-tree/renderer/init.lua index 30af27e81b9..f5f9cc06186 100644 --- a/lua/nvim-tree/renderer/init.lua +++ b/lua/nvim-tree/renderer/init.lua @@ -26,9 +26,15 @@ local Renderer = Class:extend() ---@protected ---@param args RendererArgs function Renderer:new(args) + args.explorer:log_new("Renderer") + self.explorer = args.explorer end +function Renderer:destroy() + self.explorer:log_destroy("Renderer") +end + ---@private ---@param bufnr number ---@param lines string[] @@ -113,7 +119,7 @@ function Renderer:draw() vim.api.nvim_win_set_cursor(view.get_winnr() or 0, cursor) end - view.grow_from_content() + self.explorer.window:grow_from_content() log.profile_end(profile) diff --git a/lua/nvim-tree/utils.lua b/lua/nvim-tree/utils.lua index 9396ba9d52f..7d92d1c415f 100644 --- a/lua/nvim-tree/utils.lua +++ b/lua/nvim-tree/utils.lua @@ -143,10 +143,16 @@ function M.find_node(nodes, fn) return node.group_next and { node.group_next } or (node.open and #node.nodes > 0 and node.nodes) end) :iterate() - i = require("nvim-tree.view").is_root_folder_visible() and i or i - 1 - if node and node.explorer.live_filter.filter then - i = i + 1 + + if node then + if not node.explorer.window:is_root_folder_visible() then + i = i - 1 + end + if node.explorer.live_filter.filter then + i = i + 1 + end end + return node, i end @@ -652,32 +658,29 @@ function M.is_executable(absolute_path) end end ----List of all option info/values ----@param opts vim.api.keyset.option passed directly to vim.api.nvim_get_option_info2 and vim.api.nvim_get_option_value ----@param was_set boolean filter was_set ----@return { info: vim.api.keyset.get_option_info, val: any }[] -function M.enumerate_options(opts, was_set) - local res = {} +---@class UtilEnumerateOptionsOpts +---@field keyset_opts vim.api.keyset.option +---@field was_set boolean? as per vim.api.keyset.get_option_info - local infos = vim.tbl_filter(function(info) - if opts.buf and info.scope ~= "buf" then - return false - elseif opts.win and info.scope ~= "win" then - return false +---Option name/values +---@param opts UtilEnumerateOptionsOpts +---@return table +function M.enumerate_options(opts) + -- enumerate all options, limiting buf and win scopes + return vim.tbl_map(function(info) + if opts.keyset_opts.buf and info.scope ~= "buf" then + return nil + elseif opts.keyset_opts.win and info.scope ~= "win" then + return nil else - return true + -- optional, lazy was_set check + if not opts.was_set or vim.api.nvim_get_option_info2(info.name, opts.keyset_opts).was_set then + return vim.api.nvim_get_option_value(info.name, opts.keyset_opts) + else + return nil + end end end, vim.api.nvim_get_all_options_info()) - - for _, info in vim.spairs(infos) do - local _, info2 = pcall(vim.api.nvim_get_option_info2, info.name, opts) - if not was_set or info2.was_set then - local val = pcall(vim.api.nvim_get_option_value, info.name, opts) - table.insert(res, { info = info2, val = val }) - end - end - - return res end return M diff --git a/lua/nvim-tree/view.lua b/lua/nvim-tree/view.lua index 4ce95bfb6f4..e32c04520b8 100644 --- a/lua/nvim-tree/view.lua +++ b/lua/nvim-tree/view.lua @@ -1,60 +1,107 @@ -local events = require("nvim-tree.events") local utils = require("nvim-tree.utils") -local log = require("nvim-tree.log") -local notify = require("nvim-tree.notify") - ----@class OpenInWinOpts ----@field hijack_current_buf boolean|nil default true ----@field resize boolean|nil default true ----@field winid number|nil 0 or nil for current local M = {} -local DEFAULT_MIN_WIDTH = 30 -local DEFAULT_MAX_WIDTH = -1 -local DEFAULT_PADDING = 1 - -M.View = { - adaptive_size = false, - centralize_selection = false, - tabpages = {}, - cursors = {}, - hide_root_folder = false, - live_filter = { - prev_focused_node = nil, - }, - winopts = { - relativenumber = false, - number = false, - list = false, - foldenable = false, - winfixwidth = true, - winfixheight = true, - spell = false, - signcolumn = "yes", - foldmethod = "manual", - foldcolumn = "0", - cursorcolumn = false, - cursorline = true, - cursorlineopt = "both", - colorcolumn = "0", - wrap = false, - winhl = table.concat({ - "EndOfBuffer:NvimTreeEndOfBuffer", - "CursorLine:NvimTreeCursorLine", - "CursorLineNr:NvimTreeCursorLineNr", - "LineNr:NvimTreeLineNr", - "WinSeparator:NvimTreeWinSeparator", - "StatusLine:NvimTreeStatusLine", - "StatusLineNC:NvimTreeStatuslineNC", - "SignColumn:NvimTreeSignColumn", - "Normal:NvimTreeNormal", - "NormalNC:NvimTreeNormalNC", - "NormalFloat:NvimTreeNormalFloat", - "FloatBorder:NvimTreeNormalFloatBorder", - }, ","), - }, -} +local BUFNR_PER_TAB = {} +local CURSORS = {} +local TABPAGES = {} + +--- Debugging only. +--- Tabs show TABPAGES winnr and BUFNR_PER_TAB bufnr for the tab. +--- Orphans for inexistent tab_ids are shown at the right. +--- lib.target_winid is always shown at the right next to a close button. +--- Enable with: +--- vim.opt.tabline = "%!v:lua.require('nvim-tree.view').tab_line()" +--- vim.opt.showtabline = 2 +function M.tab_line() + local tab_ids = vim.api.nvim_list_tabpages() + local cur_tab_id = vim.api.nvim_get_current_tabpage() + + local bufnr_per_tab = vim.deepcopy(BUFNR_PER_TAB) + local tabpages = vim.deepcopy(TABPAGES) + + local tl = "%#TabLine#" + + for i, tab_id in ipairs(tab_ids) do + -- click to select + tl = tl .. "%" .. i .. "T" + + -- style + if tab_id == cur_tab_id then + tl = tl .. "%#StatusLine#|" + else + tl = tl .. "|%#TabLine#" + end + + -- tab_id itself + tl = tl .. " t" .. tab_id + + -- winnr, if present + local tp = TABPAGES[tab_id] + if tp then + tl = tl .. " w" .. tp.winnr + else + tl = tl .. " " + end + + -- bufnr, if present + local bpt = BUFNR_PER_TAB[tab_id] + if bpt then + tl = tl .. " b" .. bpt + else + tl = tl .. " " + end + + tl = tl .. " " + + -- remove actively mapped + bufnr_per_tab[tab_id] = nil + tabpages[tab_id] = nil + end + + -- close last and reset + tl = tl .. "|%#CursorLine#%T" + + -- collect orphans + local orphans = {} + for tab_id, bufnr in pairs(bufnr_per_tab) do + orphans[tab_id] = orphans[tab_id] or {} + orphans[tab_id].bufnr = bufnr + end + for tab_id, tp in pairs(tabpages) do + orphans[tab_id] = orphans[tab_id] or {} + orphans[tab_id].winnr = tp.winnr + end + + -- right-align + tl = tl .. "%=%#TabLine#" + + -- print orphans + for tab_id, orphan in pairs(orphans) do + -- inexistent tab + tl = tl .. "%#error#| t" .. tab_id + + -- maybe winnr + if orphan.winnr then + tl = tl .. " w" .. orphan.winnr + else + tl = tl .. " " + end + + -- maybe bufnr + if orphan.bufnr then + tl = tl .. " b" .. orphan.bufnr + else + tl = tl .. " " + end + tl = tl .. " " + end + + -- target win id and close button + tl = tl .. "|%#TabLine# twi" .. (require("nvim-tree.lib").target_winid or "?") .. " %999X| X |" + + return tl +end -- The initial state of a tab local tabinitial = { @@ -64,18 +111,6 @@ local tabinitial = { winnr = nil, } -local BUFNR_PER_TAB = {} - ----@type { name: string, value: any }[] -local BUFFER_OPTIONS = { - { name = "bufhidden", value = "wipe" }, - { name = "buflisted", value = false }, - { name = "buftype", value = "nofile" }, - { name = "filetype", value = "NvimTree" }, - { name = "modifiable", value = false }, - { name = "swapfile", value = false }, -} - ---@param bufnr integer ---@return boolean local function matches_bufnr(bufnr) @@ -87,7 +122,7 @@ local function matches_bufnr(bufnr) return false end -local function wipe_rogue_buffer() +function M.wipe_rogue_buffer() for _, bufnr in ipairs(vim.api.nvim_list_bufs()) do if not matches_bufnr(bufnr) and utils.is_nvim_tree_buf(bufnr) then pcall(vim.api.nvim_buf_delete, bufnr, { force = true }) @@ -96,345 +131,52 @@ local function wipe_rogue_buffer() end ---@param bufnr integer|boolean|nil -local function create_buffer(bufnr) - wipe_rogue_buffer() - +---@return integer tab +function M.create_buffer(bufnr) local tab = vim.api.nvim_get_current_tabpage() BUFNR_PER_TAB[tab] = bufnr or vim.api.nvim_create_buf(false, false) - vim.api.nvim_buf_set_name(M.get_bufnr(), "NvimTree_" .. tab) - - bufnr = M.get_bufnr() - for _, option in ipairs(BUFFER_OPTIONS) do - vim.api.nvim_set_option_value(option.name, option.value, { buf = bufnr }) - end - - require("nvim-tree.keymap").on_attach(M.get_bufnr()) - - events._dispatch_tree_attached_post(M.get_bufnr()) -end - ----@param size (fun():integer)|integer|string ----@return integer -local function get_size(size) - if type(size) == "number" then - return size - elseif type(size) == "function" then - return get_size(size()) - end - local size_as_number = tonumber(size:sub(0, -2)) - local percent_as_decimal = size_as_number / 100 - return math.floor(vim.o.columns * percent_as_decimal) -end - ----@param size (fun():integer)|integer|nil ----@return integer -local function get_width(size) - if size then - return get_size(size) - else - return get_size(M.View.width) - end + return tab end -local move_tbl = { - left = "H", - right = "L", -} - -- setup_tabpage sets up the initial state of a tab ---@param tabpage integer -local function setup_tabpage(tabpage) +function M.setup_tabpage(tabpage) local winnr = vim.api.nvim_get_current_win() - M.View.tabpages[tabpage] = vim.tbl_extend("force", M.View.tabpages[tabpage] or tabinitial, { winnr = winnr }) -end - -local function set_window_options_and_buffer() - pcall(vim.api.nvim_command, "buffer " .. M.get_bufnr()) - - if vim.fn.has("nvim-0.10") == 1 then - local eventignore = vim.api.nvim_get_option_value("eventignore", {}) - vim.api.nvim_set_option_value("eventignore", "all", {}) - - for k, v in pairs(M.View.winopts) do - vim.api.nvim_set_option_value(k, v, { scope = "local" }) - end - - vim.api.nvim_set_option_value("eventignore", eventignore, {}) - else - local eventignore = vim.api.nvim_get_option("eventignore") ---@diagnostic disable-line: deprecated - vim.api.nvim_set_option("eventignore", "all") ---@diagnostic disable-line: deprecated - - -- #3009 vim.api.nvim_win_set_option does not set local scope without explicit winid. - -- Revert to opt_local instead of propagating it through for just the 0.10 path. - for k, v in pairs(M.View.winopts) do - vim.opt_local[k] = v - end - - vim.api.nvim_set_option("eventignore", eventignore) ---@diagnostic disable-line: deprecated - end -end - ----@return table -local function open_win_config() - if type(M.View.float.open_win_config) == "function" then - return M.View.float.open_win_config() - else - return M.View.float.open_win_config - end -end - -local function open_window() - if M.View.float.enable then - vim.api.nvim_open_win(0, true, open_win_config()) - else - vim.api.nvim_command("vsp") - M.reposition_window() - end - setup_tabpage(vim.api.nvim_get_current_tabpage()) - set_window_options_and_buffer() -end - ----@param buf integer ----@return boolean -local function is_buf_displayed(buf) - return vim.api.nvim_buf_is_valid(buf) and vim.fn.buflisted(buf) == 1 -end - ----@return number|nil -local function get_alt_or_next_buf() - local alt_buf = vim.fn.bufnr("#") - if is_buf_displayed(alt_buf) then - return alt_buf - end - - for _, buf in ipairs(vim.api.nvim_list_bufs()) do - if is_buf_displayed(buf) then - return buf - end - end -end - -local function switch_buf_if_last_buf() - if #vim.api.nvim_list_wins() == 1 then - local buf = get_alt_or_next_buf() - if buf then - vim.cmd("sb" .. buf) - else - vim.cmd("new") - end - end + TABPAGES[tabpage] = vim.tbl_extend("force", TABPAGES[tabpage] or tabinitial, { winnr = winnr }) end -- save_tab_state saves any state that should be preserved across redraws. ---@param tabnr integer -local function save_tab_state(tabnr) +function M.save_tab_state(tabnr) local tabpage = tabnr or vim.api.nvim_get_current_tabpage() - M.View.cursors[tabpage] = vim.api.nvim_win_get_cursor(M.get_winnr(tabpage) or 0) -end - ----@param tabpage integer -local function close(tabpage) - if not M.is_visible({ tabpage = tabpage }) then - return - end - save_tab_state(tabpage) - switch_buf_if_last_buf() - local tree_win = M.get_winnr(tabpage) - local current_win = vim.api.nvim_get_current_win() - for _, win in pairs(vim.api.nvim_tabpage_list_wins(tabpage)) do - if vim.api.nvim_win_get_config(win).relative == "" then - local prev_win = vim.fn.winnr("#") -- this tab only - if tree_win == current_win and prev_win > 0 then - vim.api.nvim_set_current_win(vim.fn.win_getid(prev_win)) - end - if vim.api.nvim_win_is_valid(tree_win or 0) then - local success, error = pcall(vim.api.nvim_win_close, tree_win or 0, true) - if not success then - notify.debug("Failed to close window: " .. error) - return - end - end - return - end - end -end - -function M.close_this_tab_only() - close(vim.api.nvim_get_current_tabpage()) -end - -function M.close_all_tabs() - for tabpage, _ in pairs(M.View.tabpages) do - close(tabpage) - end + CURSORS[tabpage] = vim.api.nvim_win_get_cursor(M.get_winnr(tabpage) or 0) end ----@param tabpage integer|nil -function M.close(tabpage) - if M.View.tab.sync.close then - M.close_all_tabs() - elseif tabpage then - close(tabpage) - else - M.close_this_tab_only() - end -end - ----@param options table|nil -function M.open(options) - if M.is_visible() then - return - end - - local profile = log.profile_start("view open") - - events._dispatch_on_tree_pre_open() - create_buffer() - open_window() - M.resize() - - local opts = options or { focus_tree = true } - if not opts.focus_tree then - vim.cmd("wincmd p") - end - events._dispatch_on_tree_open() - - log.profile_end(profile) -end - -local function grow() - local starts_at = M.is_root_folder_visible(require("nvim-tree.core").get_cwd()) and 1 or 0 - local lines = vim.api.nvim_buf_get_lines(M.get_bufnr(), starts_at, -1, false) - -- number of columns of right-padding to indicate end of path - local padding = get_size(M.View.padding) - - -- account for sign/number columns etc. - local wininfo = vim.fn.getwininfo(M.get_winnr()) - if type(wininfo) == "table" and type(wininfo[1]) == "table" then - padding = padding + wininfo[1].textoff - end - - local resizing_width = M.View.initial_width - padding - local max_width - - -- maybe bound max - if M.View.max_width == -1 then - max_width = -1 - else - max_width = get_width(M.View.max_width) - padding - end - - local ns_id = vim.api.nvim_get_namespaces()["NvimTreeExtmarks"] - for line_nr, l in pairs(lines) do - local count = vim.fn.strchars(l) - -- also add space for right-aligned icons - local extmarks = vim.api.nvim_buf_get_extmarks(M.get_bufnr(), ns_id, { line_nr, 0 }, { line_nr, -1 }, { details = true }) - count = count + utils.extmarks_length(extmarks) - if resizing_width < count then - resizing_width = count - end - if M.View.adaptive_size and max_width >= 0 and resizing_width >= max_width then - resizing_width = max_width - break - end - end - M.resize(resizing_width + padding) -end - -function M.grow_from_content() - if M.View.adaptive_size then - grow() - end -end - ----@param size string|number|nil -function M.resize(size) - if M.View.float.enable and not M.View.adaptive_size then - -- if the floating windows's adaptive size is not desired, then the - -- float size should be defined in view.float.open_win_config - return - end - - if type(size) == "string" then - size = vim.trim(size) - local first_char = size:sub(1, 1) - size = tonumber(size) - - if first_char == "+" or first_char == "-" then - size = M.View.width + size - end - end - - if type(size) == "number" and size <= 0 then - return - end - - if size then - M.View.width = size - M.View.height = size - end - - if not M.is_visible() then - return +---@param fn fun(tabpage: integer) +function M.all_tabs_callback(fn) + for tabpage, _ in pairs(TABPAGES) do + fn(tabpage) end - - local winnr = M.get_winnr() or 0 - - local new_size = get_width() - - if new_size ~= vim.api.nvim_win_get_width(winnr) then - vim.api.nvim_win_set_width(winnr, new_size) - if not M.View.preserve_window_proportions then - vim.cmd(":wincmd =") - end - end - - events._dispatch_on_tree_resize(new_size) end -function M.reposition_window() - local move_to = move_tbl[M.View.side] - vim.api.nvim_command("wincmd " .. move_to) - M.resize() -end - -local function set_current_win() +function M.set_current_win() local current_tab = vim.api.nvim_get_current_tabpage() - M.View.tabpages[current_tab].winnr = vim.api.nvim_get_current_win() -end - ----Open the tree in the a window ----@param opts OpenInWinOpts|nil -function M.open_in_win(opts) - opts = opts or { hijack_current_buf = true, resize = true } - events._dispatch_on_tree_pre_open() - if opts.winid and vim.api.nvim_win_is_valid(opts.winid) then - vim.api.nvim_set_current_win(opts.winid) - end - create_buffer(opts.hijack_current_buf and vim.api.nvim_get_current_buf()) - setup_tabpage(vim.api.nvim_get_current_tabpage()) - set_current_win() - set_window_options_and_buffer() - if opts.resize then - M.reposition_window() - M.resize() - end - events._dispatch_on_tree_open() + TABPAGES[current_tab].winnr = vim.api.nvim_get_current_win() end function M.abandon_current_window() local tab = vim.api.nvim_get_current_tabpage() BUFNR_PER_TAB[tab] = nil - if M.View.tabpages[tab] then - M.View.tabpages[tab].winnr = nil + if TABPAGES[tab] then + TABPAGES[tab].winnr = nil end end function M.abandon_all_windows() for tab, _ in pairs(vim.api.nvim_list_tabpages()) do BUFNR_PER_TAB[tab] = nil - if M.View.tabpages[tab] then - M.View.tabpages[tab].winnr = nil + if TABPAGES[tab] then + TABPAGES[tab].winnr = nil end end end @@ -443,15 +185,15 @@ end ---@return boolean function M.is_visible(opts) if opts and opts.tabpage then - if M.View.tabpages[opts.tabpage] == nil then + if TABPAGES[opts.tabpage] == nil then return false end - local winnr = M.View.tabpages[opts.tabpage].winnr + local winnr = TABPAGES[opts.tabpage].winnr return winnr and vim.api.nvim_win_is_valid(winnr) end if opts and opts.any_tabpage then - for _, v in pairs(M.View.tabpages) do + for _, v in pairs(TABPAGES) do if v.winnr and vim.api.nvim_win_is_valid(v.winnr) then return true end @@ -469,24 +211,6 @@ function M.set_cursor(opts) end end ----@param winnr number|nil ----@param open_if_closed boolean|nil -function M.focus(winnr, open_if_closed) - local wnr = winnr or M.get_winnr() - - if vim.api.nvim_win_get_tabpage(wnr or 0) ~= vim.api.nvim_win_get_tabpage(0) then - M.close() - M.open() - wnr = M.get_winnr() - elseif open_if_closed and not M.is_visible() then - M.open() - end - - if wnr then - vim.api.nvim_set_current_win(wnr) - end -end - --- Retrieve the winid of the open tree. ---@param opts ApiTreeWinIdOpts|nil ---@return number|nil winid unlike get_winnr(), this returns nil if the nvim-tree window is not visible @@ -505,7 +229,7 @@ end --- Restores the state of a NvimTree window if it was initialized before. function M.restore_tab_state() local tabpage = vim.api.nvim_get_current_tabpage() - M.set_cursor(M.View.cursors[tabpage]) + M.set_cursor(CURSORS[tabpage]) end --- Returns the window number for nvim-tree within the tabpage specified @@ -513,7 +237,7 @@ end ---@return number|nil function M.get_winnr(tabpage) tabpage = tabpage or vim.api.nvim_get_current_tabpage() - local tabinfo = M.View.tabpages[tabpage] + local tabinfo = TABPAGES[tabpage] if tabinfo and tabinfo.winnr and vim.api.nvim_win_is_valid(tabinfo.winnr) then return tabinfo.winnr end @@ -525,115 +249,14 @@ function M.get_bufnr() return BUFNR_PER_TAB[vim.api.nvim_get_current_tabpage()] end -function M._prevent_buffer_override() - local view_winnr = M.get_winnr() - local view_bufnr = M.get_bufnr() - - -- need to schedule to let the new buffer populate the window - -- because this event needs to be run on bufWipeout. - -- Otherwise the curwin/curbuf would match the view buffer and the view window. - vim.schedule(function() - local curwin = vim.api.nvim_get_current_win() - local curwinconfig = vim.api.nvim_win_get_config(curwin) - local curbuf = vim.api.nvim_win_get_buf(curwin) - local bufname = vim.api.nvim_buf_get_name(curbuf) - - if not bufname:match("NvimTree") then - for i, tabpage in ipairs(M.View.tabpages) do - if tabpage.winnr == view_winnr then - M.View.tabpages[i] = nil - break - end - end - end - if curwin ~= view_winnr or bufname == "" or curbuf == view_bufnr then - return - end - - -- patch to avoid the overriding window to be fixed in size - -- might need a better patch - vim.cmd("setlocal nowinfixwidth") - vim.cmd("setlocal nowinfixheight") - M.open({ focus_tree = false }) - - local explorer = require("nvim-tree.core").get_explorer() - if explorer then - explorer.renderer:draw() - end - - pcall(vim.api.nvim_win_close, curwin, { force = true }) - - -- to handle opening a file using :e when nvim-tree is on floating mode - -- falling back to the current window instead of creating a new one - if curwinconfig.relative ~= "" then - require("nvim-tree.actions.node.open-file").fn("edit_in_place", bufname) - else - require("nvim-tree.actions.node.open-file").fn("edit", bufname) - end - end) -end - ----@param cwd string|nil ----@return boolean -function M.is_root_folder_visible(cwd) - return cwd ~= "/" and not M.View.hide_root_folder -end - --- used on ColorScheme event -function M.reset_winhl() - local winnr = M.get_winnr() - if winnr and vim.api.nvim_win_is_valid(winnr) then - vim.wo[M.get_winnr()].winhl = M.View.winopts.winhl - end -end - ----Check if width determined or calculated on-fly ----@return boolean -function M.is_width_determined() - return type(M.View.width) ~= "function" -end - ----Configure width-related config ----@param width string|function|number|table|nil -function M.configure_width(width) - if type(width) == "table" then - M.View.adaptive_size = true - M.View.width = width.min or DEFAULT_MIN_WIDTH - M.View.max_width = width.max or DEFAULT_MAX_WIDTH - M.View.padding = width.padding or DEFAULT_PADDING - elseif width == nil then - if M.config.width ~= nil then - -- if we had input config - fallback to it - M.configure_width(M.config.width) - else - -- otherwise - restore initial width - M.View.width = M.View.initial_width +---@param winnr number|nil +function M.clear_tabpage(winnr) + for i, tabpage in ipairs(TABPAGES) do + if tabpage.winnr == winnr then + TABPAGES[i] = nil + break end - else - M.View.adaptive_size = false - M.View.width = width end end -function M.setup(opts) - local options = opts.view or {} - M.View.centralize_selection = options.centralize_selection - M.View.side = (options.side == "right") and "right" or "left" - M.View.height = options.height - M.View.hide_root_folder = opts.renderer.root_folder_label == false - M.View.tab = opts.tab - M.View.preserve_window_proportions = options.preserve_window_proportions - M.View.winopts.cursorline = options.cursorline - M.View.winopts.number = options.number - M.View.winopts.relativenumber = options.relativenumber - M.View.winopts.signcolumn = options.signcolumn - M.View.float = options.float - M.on_attach = opts.on_attach - - M.config = options - M.configure_width(options.width) - - M.View.initial_width = get_width() -end - return M