* 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
This commit is contained in:
committed by
GitHub
parent
d54a1875a9
commit
0a06f65bf0
@@ -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(view.close)
|
||||
Api.tree.close_in_this_tab = wrap(view.close_this_tab_only)
|
||||
Api.tree.close_in_all_tabs = wrap(view.close_all_tabs)
|
||||
Api.tree.close = wrap_explorer_member("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)
|
||||
@@ -239,13 +238,17 @@ local function edit(mode, node, edit_opts)
|
||||
local path = file_link and file_link.link_to or node.absolute_path
|
||||
local cur_tabpage = vim.api.nvim_get_current_tabpage()
|
||||
|
||||
local explorer = core.get_explorer()
|
||||
|
||||
actions.node.open_file.fn(mode, path)
|
||||
|
||||
edit_opts = edit_opts or {}
|
||||
|
||||
local mode_unsupported_quit_on_open = mode == "drop" or mode == "tab_drop" or mode == "edit_in_place"
|
||||
if not mode_unsupported_quit_on_open and edit_opts.quit_on_open then
|
||||
view.close(cur_tabpage)
|
||||
if explorer then
|
||||
explorer.view:close(cur_tabpage, "api.edit " .. mode)
|
||||
end
|
||||
end
|
||||
|
||||
local mode_unsupported_focus = mode == "drop" or mode == "tab_drop" or mode == "edit_in_place"
|
||||
@@ -255,7 +258,9 @@ local function edit(mode, node, edit_opts)
|
||||
if mode == "tabnew" then
|
||||
vim.cmd(":tabprev")
|
||||
end
|
||||
view.focus()
|
||||
if explorer then
|
||||
explorer.view:focus()
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user