* feat: add quit_on_open opt to api.node.open.edit * fix: fix missing @param annotation * feat: add focus opt to api.node.open.edit * fix: fix focus == false behaviour on api.node.open.tab command * fix: add optional tabpage integer parameter to view.close if tabpage is not nil, then the function closes the tabpage in this specific tabpage * fix: fix quit_on_open == true behaviour on api.node.open.tab command * fix: add check to not use new opts for certain edit modes * fix: add docs for new opts --------- Co-authored-by: Alexander Courtis <alex@courtis.org>
This commit is contained in:
@@ -222,21 +222,46 @@ Api.fs.copy.absolute_path = wrap_node(wrap_explorer_member("clipboard", "copy_ab
|
||||
Api.fs.copy.filename = wrap_node(wrap_explorer_member("clipboard", "copy_filename"))
|
||||
Api.fs.copy.basename = wrap_node(wrap_explorer_member("clipboard", "copy_basename"))
|
||||
Api.fs.copy.relative_path = wrap_node(wrap_explorer_member("clipboard", "copy_path"))
|
||||
---
|
||||
---@class NodeEditOpts
|
||||
---@field quit_on_open boolean|nil default false
|
||||
---@field focus boolean|nil default true
|
||||
|
||||
---@param mode string
|
||||
---@param node Node
|
||||
local function edit(mode, node)
|
||||
---@param edit_opts NodeEditOpts?
|
||||
local function edit(mode, node, edit_opts)
|
||||
local file_link = node:as(FileLinkNode)
|
||||
local path = file_link and file_link.link_to or node.absolute_path
|
||||
local cur_tabpage = vim.api.nvim_get_current_tabpage()
|
||||
|
||||
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)
|
||||
end
|
||||
|
||||
local mode_unsupported_focus = mode == "drop" or mode == "tab_drop" or mode == "edit_in_place"
|
||||
local focus = edit_opts.focus == nil or edit_opts.focus == true
|
||||
if not mode_unsupported_focus and not focus then
|
||||
-- if mode == "tabnew" a new tab will be opened and we need to focus back to the previous tab
|
||||
if mode == "tabnew" then
|
||||
vim.cmd(":tabprev")
|
||||
end
|
||||
view.focus()
|
||||
end
|
||||
end
|
||||
|
||||
---@param mode string
|
||||
---@param toggle_group boolean?
|
||||
---@return fun(node: Node)
|
||||
---@return fun(node: Node, edit_opts: NodeEditOpts?)
|
||||
local function open_or_expand_or_dir_up(mode, toggle_group)
|
||||
---@param node Node
|
||||
return function(node)
|
||||
---@param edit_opts NodeEditOpts?
|
||||
return function(node, edit_opts)
|
||||
local root = node:as(RootNode)
|
||||
local dir = node:as(DirectoryNode)
|
||||
|
||||
@@ -245,7 +270,7 @@ local function open_or_expand_or_dir_up(mode, toggle_group)
|
||||
elseif dir then
|
||||
dir:expand_or_collapse(toggle_group)
|
||||
elseif not toggle_group then
|
||||
edit(mode, node)
|
||||
edit(mode, node, edit_opts)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -270,9 +270,12 @@ function M.close_all_tabs()
|
||||
end
|
||||
end
|
||||
|
||||
function M.close()
|
||||
---@param tabpage integer|nil
|
||||
function M.close(tabpage)
|
||||
if M.View.tab.sync.close then
|
||||
M.close_all_tabs()
|
||||
elseif tabpage then
|
||||
close(tabpage)
|
||||
else
|
||||
M.close_this_tab_only()
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user