Merge branch 'master' into 2826-remove-view-globals

fix(#3077 ): deleting a directory containing symlinked directory will delete the contents of the linked directory (#3168 )
* fix(#3077) deleting a directory containing symlink file will delete all content inside the symlink * fix(#3077): add diagnostic override TODO --------- Co-authored-by: Alexander Courtis <alex@courtis.org>
2025-07-28 11:30:20 +10:00 · 2025-07-28 09:42:38 +10:00 · 2025-07-28 08:26:33 +10:00 · 2025-07-21 13:22:56 +10:00 · 2025-07-21 13:22:07 +10:00 · 2025-06-21 10:57:48 +10:00
29 changed files with 1148 additions and 927 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,7 +49,7 @@ jobs:
    strategy:
      matrix:
        nvim_version: [ stable, nightly ]
-        luals_version: [ 3.13.9 ]
+        luals_version: [ 3.15.0 ]

    env:
      VIMRUNTIME: /home/runner/nvim-${{ matrix.nvim_version }}/share/nvim/runtime
--- a/doc/nvim-tree-lua.txt
+++ b/doc/nvim-tree-lua.txt
@@ -398,6 +398,7 @@ Following is the default configuration. See |nvim-tree-opts| for details. >lua
      view = {
        centralize_selection = false,
        cursorline = true,
+        cursorlineopt = "both",
        debounce_delay = 15,
        side = "left",
        preserve_window_proportions = false,
@@ -638,6 +639,7 @@ Following is the default configuration. See |nvim-tree-opts| for details. >lua
        },
      },
      experimental = {
+        multi_instance = false,
      },
      log = {
        enable = false,
@@ -649,7 +651,6 @@ Following is the default configuration. See |nvim-tree-opts| for details. >lua
          dev = false,
          diagnostics = false,
          git = false,
-          lifecycle = false,
          profile = false,
          watcher = false,
        },
@@ -771,6 +772,10 @@ initially centralized, see |zz|.
 Enable |cursorline| in the tree window.
  Type: `boolean`, Default: `true`

+*nvim-tree.view.cursorlineopt*
+Set |cursorlineopt| in the tree window.
+  Type: `string`, Default: `"both"`
+
 *nvim-tree.view.debounce_delay*
 Idle milliseconds before some reload / refresh operations.
 Increase if you experience performance issues around screen refresh.
@@ -1515,11 +1520,6 @@ Configuration options for opening a file from nvim-tree.
    Resizes the tree when opening a file.
      Type: `boolean`, Default: `true`

-    *nvim-tree.experimental.actions.open_file.relative_path*
-    Buffers opened by nvim-tree will use with relative paths instead of
-    absolute.
-      Type: `boolean`, Default: `true`
-
    *nvim-tree.actions.open_file.window_picker*
    Window picker configuration.

@@ -2929,43 +2929,71 @@ Decorators may:
 - Set highlight group for the name or icons
 - Override node icon

-Specify decorators and their precedence via |nvim-tree.renderer.decorators|
-e.g. defaults with a user decorator class being overridden only by Cut: >lua
-  {
-    "Git",
-    "Open",
-    "Hidden",
-    "Modified",
-    "Bookmark",
-    "Diagnostics",
-    "Copied",
-    MyDecorator,
-    "Cut",
-  }
+Create a `nvim_tree.api.decorator.UserDecorator` class and register it with
+precedence via |nvim-tree.renderer.decorators|
+
+See |nvim-tree-decorator-example|
+
+See `nvim-tree/_meta/api_decorator.lua` for full class documentation.

-See `nvim-tree/_meta/api_decorator.lua` for full
-`nvim_tree.api.decorator.UserDecorator` class documentation.
-<
 ==============================================================================
 11.1. DECORATOR EXAMPLE                         *nvim-tree-decorator-example*
+
+A decorator class for nodes named "example", overridind all builtin decorators
+except for Cut.
+
+- Highlights node name with `IncSearch`
+- Creates two icons `"1"` and `"2"` placed after the node name, highlighted with
+  `DiffAdd` and `DiffText`
+- Replaces the node icon with `"N"`, highlighted with `Error `
+
+Create a class file `~/.config/nvim/lua/my-decorator.lua`
+
+Require and register it during |nvim-tree-setup|:
+>lua
+  local MyDecorator = require("my-decorator")
+
+  require("nvim-tree").setup({
+    renderer = {
+      decorators = {
+        "Git",
+        "Open",
+        "Hidden",
+        "Modified",
+        "Bookmark",
+        "Diagnostics",
+        "Copied",
+        MyDecorator,
+        "Cut",
+      },
+    },
+  })
+<
+Contents of `my-decorator.lua`:
 >lua
-  ---Create your decorator class
  ---@class (exact) MyDecorator: nvim_tree.api.decorator.UserDecorator
-  ---@field private my_icon nvim_tree.api.HighlightedString
+  ---@field private my_icon1 nvim_tree.api.HighlightedString
+  ---@field private my_icon2 nvim_tree.api.HighlightedString
+  ---@field private my_icon_node nvim_tree.api.HighlightedString
+  ---@field private my_highlight_group string
  local MyDecorator = require("nvim-tree.api").decorator.UserDecorator:extend()

  ---Mandatory constructor  :new()  will be called once per tree render, with no arguments.
  function MyDecorator:new()
-    self.enabled         = true
-    self.highlight_range = "all"
-    self.icon_placement  = "signcolumn"
+    self.enabled            = true
+    self.highlight_range    = "name"
+    self.icon_placement     = "after"

-    -- create your icon once, for convenience
-    self.my_icon         = { str = "I", hl = { "MyIcon" } }
+    -- create your icons and highlights once, applied to every node
+    self.my_icon1           = { str = "1", hl = { "DiffAdd" } }
+    self.my_icon2           = { str = "2", hl = { "DiffText" } }
+    self.my_icon_node       = { str = "N", hl = { "Error" } }
+    self.my_highlight_group = "IncSearch"

-    -- Define the icon sign only once
+    -- Define the icon signs only once
    -- Only needed if you are using icon_placement = "signcolumn"
-    self:define_sign(self.my_icon)
+    -- self:define_sign(self.my_icon1)
+    -- self:define_sign(self.my_icon2)
  end

  ---Override node icon
@@ -2973,33 +3001,35 @@ See `nvim-tree/_meta/api_decorator.lua` for full
  ---@return nvim_tree.api.HighlightedString? icon_node
  function MyDecorator:icon_node(node)
    if node.name == "example" then
-      return self.my_icon
+      return self.my_icon_node
    else
      return nil
    end
  end

-  ---Return one icon for DecoratorIconPlacement
+  ---Return two icons for DecoratorIconPlacement "after"
  ---@param node nvim_tree.api.Node
  ---@return nvim_tree.api.HighlightedString[]? icons
  function MyDecorator:icons(node)
    if node.name == "example" then
-      return { self.my_icon }
+      return { self.my_icon1, self.my_icon2, }
    else
      return nil
    end
  end

-  ---Exactly one highlight group for DecoratorHighlightRange
+  ---Exactly one highlight group for DecoratorHighlightRange "name"
  ---@param node nvim_tree.api.Node
  ---@return string? highlight_group
  function MyDecorator:highlight_group(node)
    if node.name == "example" then
-      return "MyHighlight"
+      return self.my_highlight_group
    else
      return nil
    end
  end
+
+  return MyDecorator
 <
 ==============================================================================
 12. OS SPECIFIC RESTRICTIONS                          *nvim-tree-os-specific*
@@ -3009,9 +3039,6 @@ Windows WSL and PowerShell
 - Executable file detection is disabled as this is non-performant and can
  freeze nvim
 - Some filesystem watcher error related to permissions will not be reported
- Some users have reported unspecified issues with
-  |nvim-tree.experimental.actions.open_file.relative_path|. Please report any
-  issues or disable this feature.

 ==============================================================================
 13. NETRW                                                   *nvim-tree-netrw*
@@ -3146,7 +3173,6 @@ highlight group is not, hard linking as follows: >
 |nvim-tree.diagnostics.show_on_open_dirs|
 |nvim-tree.disable_netrw|
 |nvim-tree.experimental|
-|nvim-tree.experimental.actions.open_file.relative_path|
 |nvim-tree.filesystem_watchers.debounce_delay|
 |nvim-tree.filesystem_watchers.enable|
 |nvim-tree.filesystem_watchers.ignore_dirs|
@@ -3267,6 +3293,7 @@ highlight group is not, hard linking as follows: >
 |nvim-tree.update_focused_file.update_root.ignore_list|
 |nvim-tree.view.centralize_selection|
 |nvim-tree.view.cursorline|
+|nvim-tree.view.cursorlineopt|
 |nvim-tree.view.debounce_delay|
 |nvim-tree.view.float|
 |nvim-tree.view.float.enable|
--- a/lua/nvim-tree.lua
+++ b/lua/nvim-tree.lua
@@ -1,5 +1,4 @@
 local log = require("nvim-tree.log")
-local view = require("nvim-tree.view")
 local utils = require("nvim-tree.utils")
 local actions = require("nvim-tree.actions")
 local core = require("nvim-tree.core")
@@ -74,7 +73,8 @@ function M.change_root(path, bufnr)
 end

 function M.tab_enter()
-  if view.is_visible({ any_tabpage = true }) then
+  local explorer = core.get_explorer()
+  if explorer and explorer.view:is_visible({ any_tabpage = true }, "nvim-tree.tab_enter") then
    local bufname = vim.api.nvim_buf_get_name(0)

    local ft
@@ -89,17 +89,15 @@ function M.tab_enter()
        return
      end
    end
+    explorer.view:open({ focus_tree = false })

-    local explorer = core.get_explorer()
-    if explorer then
-      explorer.window:open({ focus_tree = false })
-      explorer.renderer:draw()
-    end
+    explorer.renderer:draw()
  end
 end

 function M.open_on_directory()
-  local should_proceed = _config.hijack_directories.auto_open or view.is_visible()
+  local explorer = core.get_explorer()
+  local should_proceed = _config.hijack_directories.auto_open or explorer and explorer.view:is_visible(nil, "nvim-tree.open_on_directory")
  if not should_proceed then
    return
  end
@@ -247,6 +245,7 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
  view = {
    centralize_selection = false,
    cursorline = true,
+    cursorlineopt = "both",
    debounce_delay = 15,
    side = "left",
    preserve_window_proportions = false,
@@ -487,6 +486,7 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
    },
  },
  experimental = {
+    multi_instance = false,
  },
  log = {
    enable = false,
@@ -498,7 +498,6 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
      dev = false,
      diagnostics = false,
      git = false,
-      lifecycle = false,
      profile = false,
      watcher = false,
    },
@@ -669,10 +668,8 @@ end
 function M.purge_all_state()
  local explorer = core.get_explorer()
  if explorer then
-    explorer.window:close_all_tabs()
-  end
-  view.abandon_all_windows()
-  if explorer then
+    explorer.view:close_all_tabs()
+    explorer.view:abandon_all_windows()
    require("nvim-tree.git").purge_state()
    explorer:destroy()
    core.reset_explorer()
@@ -730,6 +727,7 @@ function M.setup(conf)
  require("nvim-tree.buffers").setup(opts)
  require("nvim-tree.help").setup(opts)
  require("nvim-tree.watcher").setup(opts)
+  require("nvim-tree.multi-instance-debug").setup(opts)

  setup_autocommands(opts)

--- a/lua/nvim-tree/actions/finders/find-file.lua
+++ b/lua/nvim-tree/actions/finders/find-file.lua
@@ -1,5 +1,4 @@
 local log = require("nvim-tree.log")
-local view = require("nvim-tree.view")
 local utils = require("nvim-tree.utils")
 local core = require("nvim-tree.core")

@@ -14,7 +13,7 @@ local running = {}
 ---@param path string relative or absolute
 function M.fn(path)
  local explorer = core.get_explorer()
-  if not explorer or not view.is_visible() then
+  if not explorer or not explorer.view:is_visible(nil, "finders/find-file.fn1") then
    return
  end

@@ -84,9 +83,9 @@ function M.fn(path)
    end)
    :iterate()

-  if found and view.is_visible() then
+  if found and explorer.view:is_visible(nil, "finders/find-file.fn2") then
    explorer.renderer:draw()
-    view.set_cursor({ line, 0 })
+    explorer.view:set_cursor({ line, 0 })
  end

  running[path_real] = false
--- a/lua/nvim-tree/actions/fs/remove-file.lua
+++ b/lua/nvim-tree/actions/fs/remove-file.lua
@@ -18,7 +18,7 @@ local function close_windows(windows)
  -- 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 explorer and explorer.window.float.enable and #vim.api.nvim_list_wins() < 3 then
+  if explorer and explorer.opts.view.float.enable and #vim.api.nvim_list_wins() < 3 then
    return
  end

@@ -36,12 +36,12 @@ local function clear_buffer(absolute_path)
  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 explorer and explorer.window.float.enable) then
+      if buf.hidden == 0 and (#bufs > 1 or explorer and explorer.opts.view.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 explorer and not explorer.window.float.quit_on_focus_loss then
+      if explorer and not explorer.opts.view.float.quit_on_focus_loss then
        vim.api.nvim_set_current_win(tree_winnr)
      end
      if M.config.actions.remove_file.close_window then
@@ -71,9 +71,16 @@ local function remove_dir(cwd)

    -- Type must come from fs_stat and not fs_scandir_next to maintain sshfs compatibility
    local stat = vim.loop.fs_stat(new_cwd)
-    local type = stat and stat.type or nil
+    -- TODO remove once 0.12 is the minimum neovim version
+    -- path incorrectly specified as an integer, fixed upstream for neovim 0.12 https://github.com/neovim/neovim/pull/33872
+    ---@diagnostic disable-next-line: param-type-mismatch
+    local lstat = vim.loop.fs_lstat(new_cwd)

-    if type == "directory" then
+    local type = stat and stat.type or nil
+    -- Checks if file is a link file to ensure deletion of the symlink instead of the file it points to
+    local ltype = lstat and lstat.type or nil
+
+    if type == "directory" and ltype ~= "link" then
      local success = remove_dir(new_cwd)
      if not success then
        return false
--- a/lua/nvim-tree/actions/moves/item.lua
+++ b/lua/nvim-tree/actions/moves/item.lua
@@ -1,5 +1,4 @@
 local utils = require("nvim-tree.utils")
-local view = require("nvim-tree.view")
 local core = require("nvim-tree.core")
 local diagnostics = require("nvim-tree.diagnostics")

@@ -67,9 +66,9 @@ local function move(explorer, where, what, skip_gitignored)
  end

  if nex then
-    view.set_cursor({ nex, 0 })
+    explorer.view:set_cursor({ nex, 0 })
  elseif vim.o.wrapscan and first then
-    view.set_cursor({ first, 0 })
+    explorer.view:set_cursor({ first, 0 })
  end
 end

@@ -189,13 +188,13 @@ local function move_prev_recursive(explorer, what, skip_gitignored)

      -- 4.3)
      if node_init.name == ".." then -- root node
-        view.set_cursor({ 1, 0 })    -- move to root node (position 1)
+        explorer.view:set_cursor({ 1, 0 })    -- move to root node (position 1)
      else
        local node_init_line = utils.find_node_line(node_init)
        if node_init_line < 0 then
          return
        end
-        view.set_cursor({ node_init_line, 0 })
+        explorer.view:set_cursor({ node_init_line, 0 })
      end

      -- 4.4)
--- a/lua/nvim-tree/actions/moves/parent.lua
+++ b/lua/nvim-tree/actions/moves/parent.lua
@@ -1,4 +1,3 @@
-local view = require("nvim-tree.view")
 local utils = require("nvim-tree.utils")

 local DirectoryNode = require("nvim-tree.node.directory")
@@ -25,7 +24,7 @@ function M.fn(should_close)
    local parent = (node:get_parent_of_group() or node).parent

    if not parent or not parent.parent then
-      view.set_cursor({ 1, 0 })
+      node.explorer.view:set_cursor({ 1, 0 })
      return
    end

@@ -33,7 +32,7 @@ function M.fn(should_close)
      return n.absolute_path == parent.absolute_path
    end)

-    view.set_cursor({ line + 1, 0 })
+    node.explorer.view:set_cursor({ line + 1, 0 })
    if should_close then
      parent.open = false
      parent.explorer.renderer:draw()
--- a/lua/nvim-tree/actions/node/open-file.lua
+++ b/lua/nvim-tree/actions/node/open-file.lua
@@ -3,7 +3,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 full_name = require("nvim-tree.renderer.components.full-name")

 local M = {}

@@ -20,9 +20,10 @@ end
 ---Get all windows in the current tabpage that aren't NvimTree.
 ---@return table with valid win_ids
 local function usable_win_ids()
+  local explorer = core.get_explorer()
  local tabpage = vim.api.nvim_get_current_tabpage()
  local win_ids = vim.api.nvim_tabpage_list_wins(tabpage)
-  local tree_winid = view.get_winnr(tabpage)
+  local tree_winid = explorer and explorer.view:get_winid(tabpage, "open-file.usable_win_ids")

  return vim.tbl_filter(function(id)
    local bufid = vim.api.nvim_win_get_buf(id)
@@ -40,7 +41,12 @@ local function usable_win_ids()
    end

    local win_config = vim.api.nvim_win_get_config(id)
-    return id ~= tree_winid and win_config.focusable and not win_config.hide and not win_config.external or false
+    return id ~= tree_winid
+      and id ~= full_name.popup_win
+      and win_config.focusable
+      and not win_config.hide
+      and not win_config.external
+      or false
  end, win_ids)
 end

@@ -190,7 +196,7 @@ local function open_file_in_tab(filename)
  if M.quit_on_open then
    local explorer = core.get_explorer()
    if explorer then
-      explorer.window:close()
+      explorer.view:close(nil, "open-file.open_file_in_tab")
    end
  end
  if M.relative_path then
@@ -203,7 +209,7 @@ local function drop(filename)
  if M.quit_on_open then
    local explorer = core.get_explorer()
    if explorer then
-      explorer.window:close()
+      explorer.view:close(nil, "open-file.drop")
    end
  end
  if M.relative_path then
@@ -216,7 +222,7 @@ local function tab_drop(filename)
  if M.quit_on_open then
    local explorer = core.get_explorer()
    if explorer then
-      explorer.window:close()
+      explorer.view:close(nil, "open-file.tab_drop")
    end
  end
  if M.relative_path then
@@ -240,7 +246,7 @@ local function on_preview(buf_loaded)
  end
  local explorer = core.get_explorer()
  if explorer then
-    explorer.window:focus()
+    explorer.view:focus()
  end
 end

@@ -312,7 +318,7 @@ local function open_in_new_window(filename, mode)
  local create_new_window = #win_ids == 1 -- This implies that the nvim-tree window is the only one

  local new_window_side = "belowright"
-  if explorer and (explorer.window.side == "right") then
+  if explorer and (explorer.view.side == "right") then
    new_window_side = "aboveleft"
  end

@@ -346,7 +352,7 @@ local function open_in_new_window(filename, mode)
    end
  end

-  if (mode == "preview" or mode == "preview_no_picker") and explorer and explorer.window.float.enable then
+  if (mode == "preview" or mode == "preview_no_picker") and explorer and explorer.opts.view.float.enable then
    -- ignore "WinLeave" autocmd on preview
    -- because the registered "WinLeave"
    -- will kill the floating window immediately
@@ -386,7 +392,12 @@ local function is_already_loaded(filename)
 end

 local function edit_in_current_buf(filename)
-  require("nvim-tree.view").abandon_current_window()
+  local explorer = core.get_explorer()
+
+  if explorer then
+    explorer.view:abandon_current_window()
+  end
+
  if M.relative_path then
    filename = utils.path_relative(filename, vim.fn.getcwd())
  end
@@ -434,7 +445,7 @@ function M.fn(mode, filename)
  end

  if M.resize_window and explorer then
-    explorer.window:resize()
+    explorer.view:resize()
  end

  if mode == "preview" or mode == "preview_no_picker" then
@@ -442,7 +453,7 @@ function M.fn(mode, filename)
  end

  if M.quit_on_open and explorer then
-    explorer.window:close()
+    explorer.view:close(nil, "open-file.fn")
  end
 end

--- 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
--- a/lua/nvim-tree/actions/tree/find-file.lua
+++ b/lua/nvim-tree/actions/tree/find-file.lua
@@ -1,6 +1,5 @@
 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")

 local M = {}
@@ -42,11 +41,11 @@ function M.fn(opts)
  end

  local explorer = core.get_explorer()
-  if explorer and view.is_visible() then
+  if explorer and explorer.view:is_visible(nil, "tree/find-file.fn") then
    -- focus
    if opts.focus then
      lib.set_target_win()
-      explorer.window:focus()
+      explorer.view:focus()
    end
  elseif opts.open then
    -- open
--- a/lua/nvim-tree/actions/tree/open.lua
+++ b/lua/nvim-tree/actions/tree/open.lua
@@ -1,6 +1,5 @@
 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")

 local M = {}
@@ -26,10 +25,10 @@ function M.fn(opts)

  local explorer = core.get_explorer()

-  if explorer and view.is_visible() then
+  if explorer and explorer.view:is_visible(nil, "open.fn") then
    -- focus
    lib.set_target_win()
-    explorer.window:focus()
+    explorer.view:focus()
  else
    -- open
    lib.open({
--- a/lua/nvim-tree/actions/tree/resize.lua
+++ b/lua/nvim-tree/actions/tree/resize.lua
@@ -12,8 +12,8 @@ function M.fn(opts)

  if opts == nil then
    -- reset to config values
-    explorer.window:configure_width()
-    explorer.window:resize()
+    explorer.view:configure_width()
+    explorer.view:resize()
    return
  end

@@ -21,19 +21,19 @@ function M.fn(opts)
  local width_cfg = options.width

  if width_cfg ~= nil then
-    explorer.window:configure_width(width_cfg)
-    explorer.window:resize()
+    explorer.view:configure_width(width_cfg)
+    explorer.view:resize()
    return
  end

-  if not explorer.window:is_width_determined() then
+  if not explorer.view: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
-    explorer.window:resize(absolute)
+    explorer.view:resize(absolute)
    return
  end

@@ -44,7 +44,7 @@ function M.fn(opts)
      relative_size = "+" .. relative_size
    end

-    explorer.window:resize(relative_size)
+    explorer.view:resize(relative_size)
    return
  end
 end
--- a/lua/nvim-tree/actions/tree/toggle.lua
+++ b/lua/nvim-tree/actions/tree/toggle.lua
@@ -1,6 +1,5 @@
 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")

 local M = {}
@@ -43,9 +42,9 @@ function M.fn(opts, no_focus, cwd, bang)
    opts.path = nil
  end

-  if explorer and view.is_visible() then
+  if explorer and explorer.view:is_visible(nil, "toggle.fn") then
    -- close
-    explorer.window:close()
+    explorer.view:close(nil, "toggle.fn")
  else
    -- open
    lib.open({
--- a/lua/nvim-tree/api.lua
+++ b/lua/nvim-tree/api.lua
@@ -1,5 +1,4 @@
 local core = require("nvim-tree.core")
-local view = require("nvim-tree.view")
 local utils = require("nvim-tree.utils")
 local actions = require("nvim-tree.actions")
 local appearance_hi_test = require("nvim-tree.appearance.hi-test")
@@ -141,9 +140,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_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.close = wrap_explorer_member("view", "close")
+Api.tree.close_in_this_tab = wrap_explorer_member("view", "close_this_tab_only")
+Api.tree.close_in_all_tabs = wrap_explorer_member("view", "close_all_tabs")
 Api.tree.reload = wrap_explorer("reload_explorer")

 ---@class ApiTreeResizeOpts
@@ -202,12 +201,12 @@ Api.tree.is_tree_buf = wrap(utils.is_nvim_tree_buf)
 ---@field tabpage number|nil
 ---@field any_tabpage boolean|nil default false

-Api.tree.is_visible = wrap(view.is_visible)
+Api.tree.is_visible = wrap_explorer_member("view", "is_visible")

 ---@class ApiTreeWinIdOpts
 ---@field tabpage number|nil default nil

-Api.tree.winid = wrap(view.winid)
+Api.tree.winid = wrap_explorer_member("view", "api_winid")

 Api.fs.create = wrap_node_or_nil(actions.fs.create_file.fn)
 Api.fs.remove = wrap_node(actions.fs.remove_file.fn)
@@ -248,7 +247,7 @@ local function edit(mode, node, edit_opts)
  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
    if explorer then
-      explorer.window:close(cur_tabpage)
+      explorer.view:close(cur_tabpage, "api.edit " .. mode)
    end
  end

@@ -260,7 +259,7 @@ local function edit(mode, node, edit_opts)
      vim.cmd(":tabprev")
    end
    if explorer then
-      explorer.window:focus()
+      explorer.view:focus()
    end
  end
 end
--- a/lua/nvim-tree/commands.lua
+++ b/lua/nvim-tree/commands.lua
@@ -113,7 +113,7 @@ local CMDS = {
    command = function(c)
      local explorer = core.get_explorer()
      if explorer then
-        explorer.window:resize(c.args)
+        explorer.view:resize(c.args)
      end
    end,
  },
--- 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
@@ -54,7 +57,7 @@ end
 ---@return integer
 function M.get_nodes_starting_line()
  local offset = 1
-  if TreeExplorer and TreeExplorer.window:is_root_folder_visible(M.get_cwd()) then
+  if TreeExplorer and TreeExplorer.view:is_root_folder_visible(M.get_cwd()) then
    offset = offset + 1
  end
  if TreeExplorer and TreeExplorer.live_filter.filter then
--- a/lua/nvim-tree/diagnostics.lua
+++ b/lua/nvim-tree/diagnostics.lua
@@ -1,6 +1,5 @@
 local core = require("nvim-tree.core")
 local utils = require("nvim-tree.utils")
-local view = require("nvim-tree.view")
 local log = require("nvim-tree.log")

 local DirectoryNode = require("nvim-tree.node.directory")
@@ -182,10 +181,15 @@ function M.update_coc()
    end
    log.profile_end(profile)

-    local bufnr = view.get_bufnr()
+    local explorer = core.get_explorer()
+
+    local bufnr
+    if explorer then
+      bufnr = explorer.view:get_bufnr("diagnostics.update_coc")
+    end
+
    local should_draw = bufnr and vim.api.nvim_buf_is_valid(bufnr) and vim.api.nvim_buf_is_loaded(bufnr)
    if should_draw then
-      local explorer = core.get_explorer()
      if explorer then
        explorer.renderer:draw()
      end
--- a/lua/nvim-tree/explorer/init.lua
+++ b/lua/nvim-tree/explorer/init.lua
@@ -4,7 +4,6 @@ local core = require("nvim-tree.core")
 local git = require("nvim-tree.git")
 local log = require("nvim-tree.log")
 local utils = require("nvim-tree.utils")
-local view = require("nvim-tree.view")
 local node_factory = require("nvim-tree.node.factory")

 local DirectoryNode = require("nvim-tree.node.directory")
@@ -20,7 +19,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 View = require("nvim-tree.explorer.view")

 local FILTER_REASON = require("nvim-tree.enum").FILTER_REASON

@@ -36,7 +35,7 @@ local config
 ---@field sorters Sorter
 ---@field marks Marks
 ---@field clipboard Clipboard
---@field window Window
+---@field view View
 local Explorer = RootNode:extend()

 ---@class Explorer
@@ -62,13 +61,13 @@ function Explorer:new(args)
  self.open        = true
  self.opts        = config

-  self.clipboard   = Clipboard({ explorer = self })
+  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.renderer    = Renderer({ explorer = self })
-  self.sorters     = Sorter({ explorer = self })
-  self.window      = Window({ explorer = self })
+  self.clipboard   = Clipboard({ explorer = self })
+  self.view        = View({ explorer = self })

  self:create_autocmds()

@@ -84,7 +83,7 @@ function Explorer:destroy()
  self.marks:destroy()
  self.renderer:destroy()
  self.sorters:destroy()
-  self.window:destroy()
+  self.view:destroy()

  vim.api.nvim_del_augroup_by_id(self.augroup_id)

@@ -97,7 +96,7 @@ function Explorer:create_autocmds()
    group = self.augroup_id,
    callback = function()
      appearance.setup()
-      self.window:reset_winhl()
+      self.view:reset_winhl()
      self.renderer:draw()
    end,
  })
@@ -106,9 +105,12 @@ function Explorer:create_autocmds()
    vim.api.nvim_create_autocmd("WinLeave", {
      group = self.augroup_id,
      pattern = "NvimTree_*",
-      callback = function()
+      callback = function(data)
+        if self.opts.experimental.multi_instance then
+          log.line("dev", "WinLeave %s", vim.inspect(data, { newline = "" }))
+        end
        if utils.is_nvim_tree_buf(0) then
-          self.window:close()
+          self.view:close(nil, "WinLeave")
        end
      end,
    })
@@ -170,14 +172,17 @@ function Explorer:create_autocmds()
  vim.api.nvim_create_autocmd("BufWipeout", {
    group = self.augroup_id,
    pattern = "NvimTree_*",
-    callback = function()
+    callback = function(data)
+      if self.opts.experimental.multi_instance then
+        log.line("dev", "BufWipeout %s", vim.inspect(data, { newline = "" }))
+      end
      if not utils.is_nvim_tree_buf(0) then
        return
      end
      if self.opts.actions.open_file.eject then
-        self.window:prevent_buffer_override()
+        self.view:prevent_buffer_override()
      else
-        view.abandon_current_window()
+        self.view:abandon_current_window()
      end
    end,
  })
@@ -527,7 +532,7 @@ function Explorer:reload_explorer()

  local projects = git.reload_all_projects()
  self:refresh_nodes(projects)
-  if view.is_visible() then
+  if self.view:is_visible(nil, "Explorer:reload_explorer") then
    self.renderer:draw()
  end
  event_running = false
@@ -549,7 +554,7 @@ end
 ---nil on no explorer or invalid view win
 ---@return integer[]|nil
 function Explorer:get_cursor_position()
-  local winnr = view.get_winnr()
+  local winnr = self.view:get_winid(nil, "Explorer:get_cursor_position")
  if not winnr or not vim.api.nvim_win_is_valid(winnr) then
    return
  end
@@ -564,7 +569,7 @@ function Explorer:get_node_at_cursor()
    return
  end

-  if cursor[1] == 1 and self.window:is_root_folder_visible(core.get_cwd()) then
+  if cursor[1] == 1 and self.view:is_root_folder_visible(core.get_cwd()) then
    return self
  end

@@ -601,13 +606,13 @@ 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)
+  log.line("dev", "+ %-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)
+  log.line("dev", "- %-15s %d %s", msg, self.uid_explorer, self.absolute_path)
 end

 function Explorer:setup(opts)
--- a/lua/nvim-tree/explorer/live-filter.lua
+++ b/lua/nvim-tree/explorer/live-filter.lua
@@ -1,4 +1,3 @@
-local view = require("nvim-tree.view")
 local utils = require("nvim-tree.utils")

 local Class = require("nvim-tree.classic")
@@ -62,7 +61,7 @@ local overlay_bufnr = 0
 local overlay_winnr = 0

 local function remove_overlay(self)
-  if self.explorer.view.float.enable and self.explorer.view.float.quit_on_focus_loss then
+  if self.explorer.opts.view.float.enable and self.explorer.opts.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_*",
@@ -172,7 +171,7 @@ local function calculate_overlay_win_width(self)
 end

 local function create_overlay(self)
-  if self.explorer.view.float.enable then
+  if self.explorer.opts.view.float.enable then
    -- don't close nvim-tree float when focus is changed to filter window
    vim.api.nvim_clear_autocmds({
      event   = "WinLeave",
@@ -204,13 +203,13 @@ local function create_overlay(self)
 end

 function LiveFilter:start_filtering()
-  self.explorer.window.live_filter.prev_focused_node = self.explorer:get_node_at_cursor()
+  self.explorer.view.live_filter.prev_focused_node = self.explorer:get_node_at_cursor()
  self.filter = self.filter or ""

  self.explorer.renderer:draw()
  local row = require("nvim-tree.core").get_nodes_starting_line() - 1
  local col = #self.prefix > 0 and #self.prefix - 1 or 1
-  view.set_cursor({ row, col })
+  self.explorer.view:set_cursor({ row, col })
  -- needs scheduling to let the cursor move before initializing the window
  vim.schedule(function()
    return create_overlay(self)
@@ -219,7 +218,7 @@ end

 function LiveFilter:clear_filter()
  local node = self.explorer:get_node_at_cursor()
-  local last_node = self.explorer.window.live_filter.prev_focused_node
+  local last_node = self.explorer.view.live_filter.prev_focused_node

  self.filter = nil
  reset_filter(self)
--- a/lua/nvim-tree/explorer/view.lua
+++ b/lua/nvim-tree/explorer/view.lua
@@ -0,0 +1,811 @@
+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 globals = require("nvim-tree.globals")
+
+local Class = require("nvim-tree.classic")
+
+---Window and buffer related settings and operations
+---@class (exact) View: Class
+---@field live_filter table
+---@field side string
+---@field private explorer Explorer
+---@field private adaptive_size boolean
+---@field private winopts table
+---@field private initial_width integer
+---@field private width (fun():integer)|integer|string
+---@field private max_width integer
+---@field private padding integer
+-- TODO multi-instance remove or replace with single member
+---@field private bufnr_by_tabid table<integer, integer>
+-- TODO multi-instance change to single member
+---@field private cursors_by_tabid table<integer, integer[]> as per vim.api.nvim_win_get_cursor
+local View = Class:extend()
+
+---@class View
+---@overload fun(args: ViewArgs): View
+
+---@class (exact) ViewArgs
+---@field explorer Explorer
+
+---@protected
+---@param args ViewArgs
+function View:new(args)
+  args.explorer:log_new("View")
+
+  self.explorer         = args.explorer
+  self.adaptive_size    = false
+  self.side             = (self.explorer.opts.view.side == "right") and "right" or "left"
+  self.live_filter      = { prev_focused_node = nil, }
+  self.bufnr_by_tabid   = {}
+  self.cursors_by_tabid = {}
+
+  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  = self.explorer.opts.view.cursorlineopt,
+    colorcolumn    = "0",
+    wrap           = false,
+    winhl          = appearance.WIN_HL,
+  }
+
+  self:configure_width(self.explorer.opts.view.width)
+  self.initial_width = self:get_width()
+
+  -- TODO multi-instance remove this; delete buffers rather than retaining them
+  local tabid = vim.api.nvim_get_current_tabpage()
+  self.bufnr_by_tabid[tabid] = globals.BUFNR_BY_TABID[tabid]
+end
+
+function View:destroy()
+  self.explorer:log_destroy("View")
+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 },
+}
+
+-- TODO multi-instance remove this; delete buffers rather than retaining them
+---@private
+---@param bufnr integer
+---@return boolean
+function View:matches_bufnr(bufnr)
+  for _, b in pairs(globals.BUFNR_BY_TABID) do
+    if b == bufnr then
+      return true
+    end
+  end
+  return false
+end
+
+-- TODO multi-instance remove this; delete buffers rather than retaining them
+---@private
+function View:wipe_rogue_buffer()
+  for _, bufnr in ipairs(vim.api.nvim_list_bufs()) do
+    if not self:matches_bufnr(bufnr) and utils.is_nvim_tree_buf(bufnr) then
+      pcall(vim.api.nvim_buf_delete, bufnr, { force = true })
+    end
+  end
+end
+
+---@private
+---@param bufnr integer|false|nil
+function View:create_buffer(bufnr)
+  self:wipe_rogue_buffer()
+
+  local tabid = vim.api.nvim_get_current_tabpage()
+
+  bufnr = bufnr or vim.api.nvim_create_buf(false, false)
+
+  -- set both bufnr registries
+  globals.BUFNR_BY_TABID[tabid] = bufnr
+  self.bufnr_by_tabid[tabid] = bufnr
+
+  vim.api.nvim_buf_set_name(bufnr, "NvimTree_" .. tabid)
+
+  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(bufnr)
+
+  events._dispatch_tree_attached_post(bufnr)
+end
+
+---@private
+---@param size (fun():integer)|integer|string
+---@return integer
+function View: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
+
+---@param size (fun():integer)|integer|nil
+---@return integer
+function View:get_width(size)
+  if size then
+    return self:get_size(size)
+  else
+    return self:get_size(self.width)
+  end
+end
+
+local move_tbl = {
+  left = "H",
+  right = "L",
+}
+
+---@private
+function View:set_window_options_and_buffer()
+  pcall(vim.api.nvim_command, "buffer " .. self:get_bufnr("View:set_window_options_and_buffer"))
+
+  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 View:open_win_config()
+  if type(self.explorer.opts.view.float.open_win_config) == "function" then
+    return self.explorer.opts.view.float.open_win_config()
+  else
+    return self.explorer.opts.view.float.open_win_config
+  end
+end
+
+---@private
+function View:open_window()
+  if self.explorer.opts.view.float.enable then
+    vim.api.nvim_open_win(0, true, self:open_win_config())
+  else
+    vim.api.nvim_command("vsp")
+    self:reposition_window()
+  end
+  globals.WINID_BY_TABID[vim.api.nvim_get_current_tabpage()] = vim.api.nvim_get_current_win()
+  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
+
+---save any state that should be preserved on reopening
+---@private
+---@param tabid integer
+function View:save_state(tabid)
+  tabid = tabid or vim.api.nvim_get_current_tabpage()
+  self.cursors_by_tabid[tabid] = vim.api.nvim_win_get_cursor(self:get_winid(tabid, "View:save_tab_state") or 0)
+end
+
+---@private
+---@param tabid integer
+function View:close_internal(tabid)
+  --- BEGIN multi-instance FF
+  if self.explorer.opts.experimental.multi_instance then
+    log.line("dev", "View:close_internal(t%s)", tabid)
+  end
+  --- END multi-instance FF
+
+  if not self:is_visible({ tabpage = tabid }, "View:close_internal") then
+    return
+  end
+  self:save_state(tabid)
+  switch_buf_if_last_buf()
+  local tree_win = self:get_winid(tabid, "View:close_internal")
+  local current_win = vim.api.nvim_get_current_win()
+  for _, win in pairs(vim.api.nvim_tabpage_list_wins(tabid)) 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
+        --- BEGIN multi-instance FF
+        if self.explorer.opts.experimental.multi_instance then
+          log.line("dev", "View:close_internal(t%s) w%s", tabid, tree_win)
+        end
+        --- END multi-instance FF
+        ---
+        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 View:close_this_tab_only()
+  --- BEGIN multi-instance FF
+  if self.explorer.opts.experimental.multi_instance then
+    log.line("dev", "View:close_this_tab_only()")
+  end
+  --- END multi-instance FF
+
+  self:close_internal(vim.api.nvim_get_current_tabpage())
+end
+
+-- TODO this is broken at 1.13.0 - current tab does not close when tab.sync.close is set
+function View:close_all_tabs()
+  log.line("dev", "View:close_all_tabs() globals.WINID_BY_TABID=%s", vim.inspect(globals.WINID_BY_TABID))
+  for tabid, _ in pairs(globals.WINID_BY_TABID) do
+    --- BEGIN multi-instance FF
+    if self.explorer.opts.experimental.multi_instance then
+      log.line("dev", "View:close_all_tabs()")
+    end
+    --- END multi-instance FF
+
+    self:close_internal(tabid)
+  end
+end
+
+---@param tabid integer|nil
+---@param callsite string
+function View:close(tabid, callsite)
+  --- BEGIN multi-instance FF
+  if self.explorer.opts.experimental.multi_instance then
+    log.line("dev", "View:close(t%s, %s)", tabid, callsite)
+  end
+  --- END multi-instance FF
+
+  if self.explorer.opts.tab.sync.close then
+    self:close_all_tabs()
+  elseif tabid then
+    self:close_internal(tabid)
+  else
+    self:close_this_tab_only()
+  end
+end
+
+---@param options table|nil
+function View:open(options)
+  if self:is_visible(nil, "View:open") 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 View: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(self:get_bufnr("View:grow1"), 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(self:get_winid(nil, "View:grow"))
+  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(self:get_bufnr("View:grow2"), 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 View:grow_from_content()
+  if self.adaptive_size then
+    self:grow()
+  end
+end
+
+---@param size string|number|nil
+function View:resize(size)
+  if self.explorer.opts.view.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 self.explorer.opts.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
+  end
+
+  if not self:is_visible(nil, "View:resize") then
+    return
+  end
+
+  local winid = self:get_winid(nil, "View:resize") or 0
+
+  local new_size = self:get_width()
+
+  if new_size ~= vim.api.nvim_win_get_width(winid) then
+    vim.api.nvim_win_set_width(winid, new_size)
+    if not self.explorer.opts.view.preserve_window_proportions then
+      vim.cmd(":wincmd =")
+    end
+  end
+
+  events._dispatch_on_tree_resize(new_size)
+end
+
+---@private
+function View:reposition_window()
+  local move_to = move_tbl[self.side]
+  vim.api.nvim_command("wincmd " .. move_to)
+  self:resize()
+end
+
+---@private
+function View:set_current_win()
+  local current_tab = vim.api.nvim_get_current_tabpage()
+  globals.WINID_BY_TABID[current_tab] = vim.api.nvim_get_current_win()
+end
+
+---@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
+
+---Open the tree in the a window
+---@param opts OpenInWinOpts|nil
+function View: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())
+  globals.WINID_BY_TABID[vim.api.nvim_get_current_tabpage()] = vim.api.nvim_get_current_win()
+  self: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
+
+function View:abandon_current_window()
+  local tab = vim.api.nvim_get_current_tabpage()
+
+  --- BEGIN multi-instance FF
+  if self.explorer.opts.experimental.multi_instance then
+    log.line("dev", "View:abandon_current_window() t%d w%s b%s member b%s %s",
+      tab,
+      globals.WINID_BY_TABID[tab],
+      globals.BUFNR_BY_TABID[tab],
+      self.bufnr_by_tabid[tab],
+      (globals.BUFNR_BY_TABID[tab] == self.bufnr_by_tabid[tab]) and "" or "MISMATCH")
+  end
+  --- END multi-instance FF
+
+  -- reset both bufnr registries
+  globals.BUFNR_BY_TABID[tab] = nil
+  self.bufnr_by_tabid[tab] = nil
+
+  globals.WINID_BY_TABID[tab] = nil
+end
+
+function View:abandon_all_windows()
+  for tab, _ in pairs(vim.api.nvim_list_tabpages()) do
+    globals.BUFNR_BY_TABID[tab] = nil
+    globals.WINID_BY_TABID[tab] = nil
+  end
+end
+
+---@param opts table|nil
+---@param callsite string
+---@return boolean
+function View:is_visible(opts, callsite)
+  local msg
+
+  --- BEGIN multi-instance FF
+  if self.explorer.opts.experimental.multi_instance then
+    msg = string.format("View:is_visible(%s, %-20.20s)", vim.inspect(opts, { newline = "" }), callsite)
+  end
+  --- END multi-instance FF
+
+  if opts and opts.tabpage then
+    --- BEGIN multi-instance FF
+    if self.explorer.opts.experimental.multi_instance then
+      local winid = self:winid(opts.tabpage)
+      local winid_by_tabid = opts.tabpage and globals.WINID_BY_TABID[opts.tabpage] or nil
+      msg = string.format("%s globals.WINID_BY_TABID[%s]=w%s view.winid(%s)=w%s",
+        msg,
+        opts.tabpage, winid_by_tabid,
+        opts.tabpage, winid
+      )
+      if winid ~= winid_by_tabid then
+        msg = string.format("%s MISMATCH", msg)
+        notify.error(msg)
+      end
+      log.line("dev", "%s", msg)
+
+      return winid and vim.api.nvim_win_is_valid(winid) or false
+      --- END multi-instance FF
+    else
+      local winid = globals.WINID_BY_TABID[opts.tabpage]
+      return winid and vim.api.nvim_win_is_valid(winid)
+    end
+  end
+
+  if opts and opts.any_tabpage then
+    for tabid, winid_by_tabid in pairs(globals.WINID_BY_TABID) do
+      --- BEGIN multi-instance FF
+      if self.explorer.opts.experimental.multi_instance then
+        local winid = self:winid(tabid)
+        msg = string.format("%s globals.WINID_BY_TABID[%s]=w%s view.winid(%s)=w%s",
+          msg,
+          tabid, winid_by_tabid,
+          tabid, winid
+        )
+        if winid ~= winid_by_tabid then
+          msg = string.format("%s MISMATCH", msg)
+          notify.error(msg)
+        end
+        log.line("dev", "%s", msg)
+
+        if winid and vim.api.nvim_win_is_valid(winid) then
+          return true
+        end
+        --- END multi-instance FF
+      else
+        if winid_by_tabid and vim.api.nvim_win_is_valid(winid_by_tabid) then
+          return true
+        end
+      end
+    end
+    return false
+  end
+
+  local winid = self:get_winid(nil, "View:is_visible")
+  return winid ~= nil and vim.api.nvim_win_is_valid(winid or 0)
+end
+
+---@param opts table|nil
+function View:set_cursor(opts)
+  if self:is_visible(nil, "View:set_cursor") then
+    pcall(vim.api.nvim_win_set_cursor, self:get_winid(nil, "View:set_cursor"), opts)
+  end
+end
+
+---@param winid number|nil
+---@param open_if_closed boolean|nil
+function View:focus(winid, open_if_closed)
+  local wid = winid or self:get_winid(nil, "View:focus1")
+
+  if vim.api.nvim_win_get_tabpage(wid or 0) ~= vim.api.nvim_win_get_tabpage(0) then
+    self:close(nil, "View:focus")
+    self:open()
+    wid = self:get_winid(nil, "View:focus2")
+  elseif open_if_closed and not self:is_visible(nil, "View:focus") then
+    self:open()
+  end
+
+  if wid then
+    vim.api.nvim_set_current_win(wid)
+  end
+end
+
+--- Retrieve the winid of the open tree.
+---@param opts ApiTreeWinIdOpts|nil
+---@return number|nil winid unlike get_winid(), this returns nil if the nvim-tree window is not visible
+function View:api_winid(opts)
+  local tabpage = opts and opts.tabpage
+  if tabpage == 0 then
+    tabpage = vim.api.nvim_get_current_tabpage()
+  end
+  if self:is_visible({ tabpage = tabpage }, "View:api_winid") then
+    return self:get_winid(tabpage, "View:winid")
+  else
+    return nil
+  end
+end
+
+---restore any state from last close
+function View:restore_state()
+  self:set_cursor(self.cursors_by_tabid[vim.api.nvim_get_current_tabpage()])
+end
+
+--- winid containing the buffer
+---@param tabid number|nil (optional) the number of the chosen tabpage. Defaults to current tabpage.
+---@return integer? winid
+function View:winid(tabid)
+  local bufnr = self.bufnr_by_tabid[tabid]
+
+  if bufnr then
+    for _, winid in pairs(vim.api.nvim_tabpage_list_wins(tabid or 0)) do
+      if vim.api.nvim_win_get_buf(winid) == bufnr then
+        return winid
+      end
+    end
+  end
+end
+
+--- Returns the window number for nvim-tree within the tabpage specified
+---@param tabid number|nil (optional) the number of the chosen tabpage. Defaults to current tabpage.
+---@param callsite string
+---@return number|nil
+function View:get_winid(tabid, callsite)
+  local tabid_param = tabid
+  tabid = tabid or vim.api.nvim_get_current_tabpage()
+  local global_winid = nil
+
+  --- BEGIN multi-instance FF
+  if self.explorer.opts.experimental.multi_instance then
+    local msg_fault = ""
+    if not globals.WINID_BY_TABID[tabid] then
+      msg_fault = "no WINID_BY_TABID"
+    elseif not vim.api.nvim_win_is_valid(globals.WINID_BY_TABID[tabid]) then
+      msg_fault = string.format("invalid globals.WINID_BY_TABID[tabid] %d", globals.WINID_BY_TABID[tabid])
+    else
+      global_winid = globals.WINID_BY_TABID[tabid]
+    end
+
+    local winid = self:winid(tabid)
+
+    if winid ~= global_winid then
+      msg_fault = "MISMATCH"
+    end
+
+    local msg = string.format("View:get_winid(%3s, %-20.20s) globals.WINID_BY_TABID[%s]=w%s view.winid(%s)=w%s %s",
+      tabid_param,
+      callsite,
+      tabid, global_winid,
+      tabid, winid,
+      msg_fault
+    )
+
+    log.line("dev", "%s", msg)
+
+    if winid ~= global_winid then
+      notify.error(msg)
+    end
+
+    return winid
+  end
+  --- END multi-instance FF
+
+  -- legacy codepath
+  if global_winid and vim.api.nvim_win_is_valid(global_winid) then
+    return global_winid
+  end
+end
+
+--- Returns the current nvim tree bufnr
+---@param callsite string
+---@return number
+function View:get_bufnr(callsite)
+  local tab = vim.api.nvim_get_current_tabpage()
+
+  --- BEGIN multi-instance FF
+  if self.explorer.opts.experimental.multi_instance then
+    local msg = string.format("View:get_bufnr(%-20.20s) globals.BUFNR_BY_TABID[%s]=b%s view.bufnr_by_tab[%s]=b%s %s",
+      callsite,
+      tab, globals.BUFNR_BY_TABID[tab],
+      tab, self.bufnr_by_tabid[tab],
+      (globals.BUFNR_BY_TABID[tab] == self.bufnr_by_tabid[tab]) and "" or "MISMATCH"
+    )
+
+    if globals.BUFNR_BY_TABID[tab] ~= self.bufnr_by_tabid[tab] then
+      notify.error(msg)
+    end
+
+    log.line("dev", msg)
+
+    return self.bufnr_by_tabid[tab]
+  end
+  --- END multi-instance FF
+
+  return globals.BUFNR_BY_TABID[tab]
+end
+
+function View:prevent_buffer_override()
+  local view_winid = self:get_winid(nil, "View:prevent_buffer_override")
+  local view_bufnr = self:get_bufnr("View:prevent_buffer_override")
+
+  -- 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, winid in ipairs(globals.WINID_BY_TABID) do
+        if winid == view_winid then
+          globals.WINID_BY_TABID[i] = nil
+          break
+        end
+      end
+    end
+    if curwin ~= view_winid 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 })
+
+    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 View:is_root_folder_visible(cwd)
+  return cwd ~= "/" and self.explorer.opts.renderer.root_folder_label ~= false
+end
+
+-- used on ColorScheme event
+function View:reset_winhl()
+  local winid = self:get_winid(nil, "View:reset_winhl")
+  if winid and vim.api.nvim_win_is_valid(winid) then
+    vim.wo[winid].winhl = appearance.WIN_HL
+  end
+end
+
+---Check if width determined or calculated on-fly
+---@return boolean
+function View:is_width_determined()
+  return type(self.width) ~= "function"
+end
+
+-- These are needed as they are populated only by the user, not configuration
+local DEFAULT_MIN_WIDTH = 30
+local DEFAULT_MAX_WIDTH = -1
+local DEFAULT_PADDING = 1
+
+---Configure width-related config
+---@param width string|function|number|table|nil
+function View: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 View
--- a/lua/nvim-tree/explorer/window.lua
+++ b/lua/nvim-tree/explorer/window.lua
@@ -1,504 +0,0 @@
-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
--- a/lua/nvim-tree/globals.lua
+++ b/lua/nvim-tree/globals.lua
@@ -0,0 +1,10 @@
+-- global state, to be refactored away during multi-instance
+
+local M = {
+  -- from View
+  WINID_BY_TABID = {},
+  BUFNR_BY_TABID = {},
+  CURSORS = {},
+}
+
+return M
--- a/lua/nvim-tree/lib.lua
+++ b/lua/nvim-tree/lib.lua
@@ -1,4 +1,3 @@
-local view = require("nvim-tree.view")
 local core = require("nvim-tree.core")
 local notify = require("nvim-tree.notify")

@@ -12,9 +11,11 @@ local M = {
 }

 function M.set_target_win()
+  local explorer = core.get_explorer()
+
  local id = vim.api.nvim_get_current_win()
-  local tree_id = view.get_winnr()
-  if tree_id and id == tree_id then
+
+  if explorer and id == explorer.view:get_winid(nil, "lib.set_target_win") then
    M.target_winid = 0
    return
  end
@@ -35,7 +36,7 @@ local function open_view_and_draw()
  local cwd = vim.fn.getcwd()

  if explorer then
-    explorer.window:open()
+    explorer.view:open()
  end

  handle_buf_cwd(cwd)
@@ -101,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

@@ -116,24 +117,27 @@ function M.open(opts)

  if should_hijack_current_buf() then
    if explorer then
-      explorer.window:close_this_tab_only()
-      explorer.window:open_in_win()
+      explorer.view:close_this_tab_only()
+      explorer.view:open_in_win()
      explorer.renderer:draw()
    end
  elseif opts.winid then
    if explorer then
-      explorer.window:open_in_win({ hijack_current_buf = false, resize = false, winid = opts.winid })
+      explorer.view:open_in_win({ hijack_current_buf = false, resize = false, winid = opts.winid })
      explorer.renderer:draw()
    end
  elseif opts.current_window then
    if explorer then
-      explorer.window:open_in_win({ hijack_current_buf = false, resize = false })
+      explorer.view:open_in_win({ hijack_current_buf = false, resize = false })
      explorer.renderer:draw()
    end
  else
    open_view_and_draw()
  end
-  view.restore_tab_state()
+
+  if explorer then
+    explorer.view:restore_state()
+  end
 end

 function M.setup(opts)
--- a/lua/nvim-tree/log.lua
+++ b/lua/nvim-tree/log.lua
@@ -1,4 +1,4 @@
---@alias LogTypes "all" | "config" | "copy_paste" | "dev" | "diagnostics" | "git" | "lifecycle" | "profile" | "watcher"
+---@alias LogTypes "all" | "config" | "copy_paste" | "dev" | "diagnostics" | "git"  | "profile" | "watcher"

 ---@type table<LogTypes, boolean>
 local types = {}
--- a/lua/nvim-tree/multi-instance-debug.lua
+++ b/lua/nvim-tree/multi-instance-debug.lua
@@ -0,0 +1,112 @@
+local globals = require("nvim-tree.globals")
+
+local M = {}
+
+--- Debugging only.
+--- Tabs show WINID_BY_TABID winid and BUFNR_BY_TABID 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.explorer.view').tab_line()"
+---   vim.opt.showtabline = 2
+---@return string
+function M.tab_line()
+  local tabids = vim.api.nvim_list_tabpages()
+  local tabid_cur = vim.api.nvim_get_current_tabpage()
+
+  local bufnr_by_tabid = vim.deepcopy(globals.BUFNR_BY_TABID)
+  local winid_by_tabid = vim.deepcopy(globals.WINID_BY_TABID)
+
+  local tl = "%#TabLine#"
+
+  for i, tabid in ipairs(tabids) do
+    -- click to select
+    tl = tl .. "%" .. i .. "T"
+
+    -- style
+    if tabid == tabid_cur then
+      tl = tl .. "%#StatusLine#|"
+    else
+      tl = tl .. "|%#TabLine#"
+    end
+
+    -- tab_id itself
+    tl = tl .. " t" .. tabid
+
+    -- winid, if present
+    local tp = globals.WINID_BY_TABID[tabid]
+    if tp then
+      tl = tl .. " w" .. (tp or "nil")
+    else
+      tl = tl .. "      "
+    end
+
+    -- bufnr, if present
+    local bpt = globals.BUFNR_BY_TABID[tabid]
+    if bpt then
+      tl = tl .. " b" .. bpt
+    else
+      tl = tl .. "   "
+    end
+
+    tl = tl .. " "
+
+    -- remove actively mapped
+    bufnr_by_tabid[tabid] = nil
+    winid_by_tabid[tabid] = nil
+  end
+
+  -- close last and reset
+  tl = tl .. "|%#CursorLine#%T"
+
+  -- collect orphans
+  local orphans = {}
+  for tab_id, bufnr in pairs(bufnr_by_tabid) do
+    orphans[tab_id] = orphans[tab_id] or {}
+    orphans[tab_id].bufnr = bufnr
+  end
+  for tab_id, tp in pairs(winid_by_tabid) do
+    orphans[tab_id] = orphans[tab_id] or {}
+    orphans[tab_id].winid = tp
+  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 winid
+    if orphan.winid then
+      tl = tl .. " w" .. (orphan.winid or "nil")
+    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
+
+function M.setup(opts)
+  if not opts.experimental.multi_instance then
+    return
+  end
+
+  vim.opt.tabline = "%!v:lua.require('nvim-tree.multi-instance-debug').tab_line()"
+  vim.opt.showtabline = 2
+end
+
+return M
--- a/lua/nvim-tree/renderer/builder.lua
+++ b/lua/nvim-tree/renderer/builder.lua
@@ -378,7 +378,7 @@ end

 ---@private
 function Builder:build_header()
-  if self.explorer.window:is_root_folder_visible(self.explorer.absolute_path) then
+  if self.explorer.view: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))
--- a/lua/nvim-tree/renderer/init.lua
+++ b/lua/nvim-tree/renderer/init.lua
@@ -1,5 +1,4 @@
 local log = require("nvim-tree.log")
-local view = require("nvim-tree.view")
 local events = require("nvim-tree.events")

 local Class = require("nvim-tree.classic")
@@ -102,28 +101,29 @@ function Renderer:render_hl(bufnr, hl_range_args)
 end

 function Renderer:draw()
-  local bufnr = view.get_bufnr()
+  local bufnr = self.explorer.view:get_bufnr("Renderer:draw")
  if not bufnr or not vim.api.nvim_buf_is_loaded(bufnr) then
    return
  end
+  local winid = self.explorer.view:get_winid(nil, "Renderer:draw")

  local profile = log.profile_start("draw")

-  local cursor = vim.api.nvim_win_get_cursor(view.get_winnr() or 0)
+  local cursor = vim.api.nvim_win_get_cursor(winid or 0)

  local builder = Builder(self.explorer):build()

  self:_draw(bufnr, builder.lines, builder.hl_range_args, builder.signs, builder.extmarks, builder.virtual_lines)

  if cursor and #builder.lines >= cursor[1] then
-    vim.api.nvim_win_set_cursor(view.get_winnr() or 0, cursor)
+    vim.api.nvim_win_set_cursor(winid or 0, cursor)
  end

-  self.explorer.window:grow_from_content()
+  self.explorer.view:grow_from_content()

  log.profile_end(profile)

-  events._dispatch_on_tree_rendered(bufnr, view.get_winnr())
+  events._dispatch_on_tree_rendered(bufnr, winid)
 end

 return Renderer
--- a/lua/nvim-tree/utils.lua
+++ b/lua/nvim-tree/utils.lua
@@ -145,7 +145,7 @@ function M.find_node(nodes, fn)
    :iterate()

  if node then
-    if not node.explorer.window:is_root_folder_visible() then
+    if not node.explorer.view:is_root_folder_visible() then
      i = i - 1
    end
    if node.explorer.live_filter.filter then
@@ -543,7 +543,10 @@ function M.focus_file(path)
  local _, i = M.find_node(require("nvim-tree.core").get_explorer().nodes, function(node)
    return node.absolute_path == path
  end)
-  require("nvim-tree.view").set_cursor({ i + 1, 1 })
+  local explorer = require("nvim-tree.core").get_explorer()
+  if explorer then
+    explorer.view:set_cursor({ i + 1, 1 })
+  end
 end

 ---Focus node passed as parameter if visible, otherwise focus first visible parent.
@@ -563,7 +566,7 @@ function M.focus_node_or_parent(node)
    end)

    if found_node or node.parent == nil then
-      require("nvim-tree.view").set_cursor({ i + 1, 1 })
+      explorer.view:set_cursor({ i + 1, 1 })
      break
    end

--- a/lua/nvim-tree/view.lua
+++ b/lua/nvim-tree/view.lua
@@ -1,262 +0,0 @@
-local utils = require("nvim-tree.utils")
-
-local M = {}
-
-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 = {
-  -- The position of the cursor { line, column }
-  cursor = { 0, 0 },
-  -- The NvimTree window number
-  winnr = nil,
-}
-
---@param bufnr integer
---@return boolean
-local function matches_bufnr(bufnr)
-  for _, b in pairs(BUFNR_PER_TAB) do
-    if b == bufnr then
-      return true
-    end
-  end
-  return false
-end
-
-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 })
-    end
-  end
-end
-
---@param bufnr integer|boolean|nil
---@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)
-  return tab
-end
-
-- setup_tabpage sets up the initial state of a tab
---@param tabpage integer
-function M.setup_tabpage(tabpage)
-  local winnr = vim.api.nvim_get_current_win()
-  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
-function M.save_tab_state(tabnr)
-  local tabpage = tabnr or vim.api.nvim_get_current_tabpage()
-  CURSORS[tabpage] = vim.api.nvim_win_get_cursor(M.get_winnr(tabpage) or 0)
-end
-
---@param fn fun(tabpage: integer)
-function M.all_tabs_callback(fn)
-  for tabpage, _ in pairs(TABPAGES) do
-    fn(tabpage)
-  end
-end
-
-function M.set_current_win()
-  local current_tab = vim.api.nvim_get_current_tabpage()
-  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 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 TABPAGES[tab] then
-      TABPAGES[tab].winnr = nil
-    end
-  end
-end
-
---@param opts table|nil
---@return boolean
-function M.is_visible(opts)
-  if opts and opts.tabpage then
-    if TABPAGES[opts.tabpage] == nil then
-      return false
-    end
-    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(TABPAGES) do
-      if v.winnr and vim.api.nvim_win_is_valid(v.winnr) then
-        return true
-      end
-    end
-    return false
-  end
-
-  return M.get_winnr() ~= nil and vim.api.nvim_win_is_valid(M.get_winnr() or 0)
-end
-
---@param opts table|nil
-function M.set_cursor(opts)
-  if M.is_visible() then
-    pcall(vim.api.nvim_win_set_cursor, M.get_winnr(), opts)
-  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
-function M.winid(opts)
-  local tabpage = opts and opts.tabpage
-  if tabpage == 0 then
-    tabpage = vim.api.nvim_get_current_tabpage()
-  end
-  if M.is_visible({ tabpage = tabpage }) then
-    return M.get_winnr(tabpage)
-  else
-    return nil
-  end
-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(CURSORS[tabpage])
-end
-
--- Returns the window number for nvim-tree within the tabpage specified
---@param tabpage number|nil (optional) the number of the chosen tabpage. Defaults to current tabpage.
---@return number|nil
-function M.get_winnr(tabpage)
-  tabpage = tabpage or vim.api.nvim_get_current_tabpage()
-  local tabinfo = TABPAGES[tabpage]
-  if tabinfo and tabinfo.winnr and vim.api.nvim_win_is_valid(tabinfo.winnr) then
-    return tabinfo.winnr
-  end
-end
-
--- Returns the current nvim tree bufnr
---@return number
-function M.get_bufnr()
-  return BUFNR_PER_TAB[vim.api.nvim_get_current_tabpage()]
-end
-
---@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
-  end
-end
-
-return M
Author	SHA1	Message	Date
Alexander Courtis	ec5d41f182	Merge branch 'master' into 2826-remove-view-globals	2025-07-28 11:30:20 +10:00
alexfinger21	10db6943cb	fix(#3077 ): deleting a directory containing symlinked directory will delete the contents of the linked directory (#3168 ) * fix(#3077) deleting a directory containing symlink file will delete all content inside the symlink * fix(#3077): add diagnostic override TODO --------- Co-authored-by: Alexander Courtis <alex@courtis.org>	2025-07-28 09:42:38 +10:00
Alexander Courtis	5737649ca9	Merge branch 'master' into 2826-remove-view-globals	2025-07-28 08:26:33 +10:00
Tomasz N	543ed3cac2	fix(picker): exclude full_name window id from the choice (#3165 ) Problem: `full_name` window from is considered as usable by picker Solution: exclude its ID (also true for nil values) Co-authored-by: Alexander Courtis <alex@courtis.org>	2025-07-21 13:22:56 +10:00
Alexander Courtis	2a386fe567	ci: luals_version 3.13.9 -> 3.15.0 (#3167 )	2025-07-21 13:22:07 +10:00
Alexander Courtis	b0b49552c9	docs: polish example decorator (#3160 )	2025-06-21 10:57:48 +10:00
Alexander Courtis	fee19f491d	Merge branch 'master' into 2826-remove-view-globals	2025-06-20 13:48:22 +10:00
Alexander Courtis	8eb5e0bfd1	feat(#3157 ): add view.cursorlineopt (#3158 ) fix(#3157): add view.cursorlineopt	2025-06-20 13:46:38 +10:00
Alexander Courtis	0830436cca	refactor(#2826 ): consistency check returns new	2025-06-20 13:11:21 +10:00
Alexander Courtis	51b269dc71	refactor(#2826 ): move global CURSORS to view member	2025-06-20 12:52:58 +10:00
Alexander Courtis	82cc80ffa4	Revert "refactor(#2826 ): move global CURSORS to view member" This reverts commit `d84dfad1c3`.	2025-06-20 12:47:04 +10:00
Alexander Courtis	d84dfad1c3	refactor(#2826 ): move global CURSORS to view member	2025-06-20 12:46:30 +10:00
Alexander Courtis	4d6c42356a	refactor(#2826 ): more consistency checking	2025-06-20 12:36:09 +10:00
Alexander Courtis	d72f85f524	refactor(#2826 ): more consistency checking	2025-06-20 12:33:16 +10:00
Alexander Courtis	e875f15b32	refactor(#2826 ): consistent naming of tabid	2025-06-20 12:01:24 +10:00
Alexander Courtis	83fdff7c4a	refactor(#2826 ): globals.TABPAGES -> WINID_PER_TAB	2025-06-20 11:18:38 +10:00
Alexander Courtis	09ec00c085	refactor(#2826 ): get_winid returns new after consistency check	2025-06-20 10:01:12 +10:00
Alexander Courtis	3615c7dffe	refactor(#2826 ): temporarily reuse BUFNR_PER_TAB in view constructor	2025-06-20 09:33:07 +10:00
Alexander Courtis	5fbd6745eb	refactor(#2826 ): remove unused view member height	2025-06-20 09:19:33 +10:00
Alexander Courtis	f1e9d5165c	refactor(#2826 ): remove unused view members centralize_selection and preserve_window_proportions	2025-06-20 09:12:29 +10:00
Alexander Courtis	414e576bc2	refactor(#2826 ): remove unnecessary view members float, hide_root_folder; use explorer opts	2025-06-20 09:03:19 +10:00
Alexander Courtis	de2ae0b06f	refactor(#2826 ): consistent use of buffer registry, tidy, add todos	2025-06-20 08:32:40 +10:00
Alexander Courtis	d6cd465462	refactor(#2826 ): winnr->winid consistently	2025-06-19 16:46:27 +10:00
Alexander Courtis	b7e9789850	refactor(#2826 ): winnr->winid in view/globals, remove redundant get_winid and get_bufnr calls	2025-06-19 16:44:19 +10:00
Alexander Courtis	6e7ce8771b	refactor(#2826 ): fuller error messages	2025-06-19 16:25:32 +10:00
Alexander Courtis	0a06f65bf0	refactor(#2826 ): move view to instanced window class (#3153 ) * refactor(#2826): singleton View class, WIP * refactor(#2826): singleton View class, WIP * refactor(#2826): singleton View class, WIP * refactor(#2826): singleton View class, WIP * refactor(#2826): singleton View class, WIP * refactor(#2826): singleton View class, WIP * refactor(#2826): singleton View class, WIP * refactor(#2826): singleton View class * refactor(#2826): View is an Explorer member * refactor(#2826): move autocmds to Explorer * refactor(#2826): API uses Explorer's View * refactor(#2826): move View into Explorer package * refactor(#2826): retain necessary view globals * refactor(#2826): move all winhl to appearance constants * refactor(#2826): add lifecycle logging to all Explorer members * refactor(#2826): fix bad cherry-pick * refactor(#2826): better enumerate_options function * refactor(#2826): add View.tab_line for debugging * refactor(#2826): default lifecycle log off * refactor(#2826): add experimental.multi_instance_debug, split globals out of view, move diagnostics to its own module * refactor(#2826): instrument View:get_winnr * refactor(#2826): instrument View:setup_tabpage * refactor(#2826): instrument View:set_current_win, View:prevent_buffer_override * refactor(#2826): instrument View:get_bufnr * refactor(#2826): track member bufnr -> winid with global * refactor(#2826): tidy experiment names and logs * vim: nvim-tree: track bufnr via buffer-update channel * vim: nvim-tree: more logging * vim: nvim-tree: revert: track bufnr via buffer-update channel * refactor(#2826): notify error on view winid and bufnr mismatches * refactor(#2826): notify error on view winid and bufnr mismatches * refactor(#2826): explorer init logging	2025-06-19 15:45:55 +10:00