From d1df6d45a40a94fbacb8aacec69a99921d943286 Mon Sep 17 00:00:00 2001 From: Alexander Courtis Date: Thu, 19 Jun 2025 13:43:21 +1000 Subject: [PATCH] refactor(#2826): explorer init logging --- lua/nvim-tree/actions/root/change-dir.lua | 2 +- lua/nvim-tree/core.lua | 5 ++++- lua/nvim-tree/explorer/view.lua | 5 ++--- lua/nvim-tree/lib.lua | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lua/nvim-tree/actions/root/change-dir.lua b/lua/nvim-tree/actions/root/change-dir.lua index f23f3c12..f98d51d3 100644 --- a/lua/nvim-tree/actions/root/change-dir.lua +++ b/lua/nvim-tree/actions/root/change-dir.lua @@ -85,7 +85,7 @@ M.force_dirchange = add_profiling_to(function(foldername, should_open_view) if should_change_dir() then cd(M.options.global, foldername) end - core.init(foldername) + core.init(foldername, "change-dir") end if should_open_view then diff --git a/lua/nvim-tree/core.lua b/lua/nvim-tree/core.lua index fe9125e6..46f6ef69 100644 --- a/lua/nvim-tree/core.lua +++ b/lua/nvim-tree/core.lua @@ -9,9 +9,12 @@ local TreeExplorer = nil local first_init_done = false ---@param foldername string -function M.init(foldername) +---@param callsite string +function M.init(foldername, callsite) local profile = log.profile_start("core init %s", foldername) + log.line("dev", "core.init(%s, %s)", foldername, callsite) + if TreeExplorer then TreeExplorer:destroy() end diff --git a/lua/nvim-tree/explorer/view.lua b/lua/nvim-tree/explorer/view.lua index 2a55ca76..627364a4 100644 --- a/lua/nvim-tree/explorer/view.lua +++ b/lua/nvim-tree/explorer/view.lua @@ -31,7 +31,7 @@ local DEFAULT_PADDING = 1 ---@field private width (fun():integer)|integer|string ---@field private max_width integer ---@field private padding integer ----@field private bufnr_by_tab table for diagnostics during multi instance +---@field private bufnr_by_tab table stored per tab until multi-instance is complete local View = Class:extend() ---@class View @@ -617,7 +617,6 @@ end ---@param callsite string ---@return integer? winid function View:winid(tabpage, callsite) - local winid = nil local bufnr = self.bufnr_by_tab[tabpage] local msg = string.format("View:winid(%3s, %-20.20s)", tabpage, callsite) @@ -625,7 +624,7 @@ function View:winid(tabpage, callsite) if bufnr then for _, w in pairs(vim.api.nvim_tabpage_list_wins(tabpage or 0)) do if vim.api.nvim_win_get_buf(w) == bufnr then - log.line("dev", "%s b%d : w%s", msg, bufnr, winid) + log.line("dev", "%s b%d : w%s", msg, bufnr, w) return w end end diff --git a/lua/nvim-tree/lib.lua b/lua/nvim-tree/lib.lua index b4733624..20fe23db 100644 --- a/lua/nvim-tree/lib.lua +++ b/lua/nvim-tree/lib.lua @@ -102,14 +102,14 @@ function M.open(opts) M.set_target_win() if not core.get_explorer() or opts.path then if opts.path then - core.init(opts.path) + core.init(opts.path, "lib.open - opts.path") else local cwd, err = vim.loop.cwd() if not cwd then notify.error(string.format("current working directory unavailable: %s", err)) return end - core.init(cwd) + core.init(cwd, "lib.open - cwd") end end