tomas.mirchev/nvim-tree.lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(#2126): custom window pickers may create windows (#2140)

Browse Source 
call nvim_list_wins again after the picker is run
This commit is contained in:
Anshuman Medhi
2023-04-16 13:58:10 +08:00
committed by GitHub
parent a8a4834e1a
commit 8f392fa763
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/nvim-tree-lua.txt
View File

@@ -1121,6 +1121,7 @@ Configuration for various actions.
Change the default window picker, can be a string `"default"` or a function. Change the default window picker, can be a string `"default"` or a function.
The function should return the window id that will open the node, The function should return the window id that will open the node,
or `nil` if an invalid window is picked or user cancelled the action. or `nil` if an invalid window is picked or user cancelled the action.
The picker may create a new window.
Type: `string` | `function`, Default: `"default"` Type: `string` | `function`, Default: `"default"`
e.g. s1n7ax/nvim-window-picker plugin: > e.g. s1n7ax/nvim-window-picker plugin: >
window_picker = { window_picker = {

17
lua/nvim-tree/actions/node/open-file.lua
View File

@@ -164,13 +164,13 @@ local function on_preview(buf_loaded)
view.focus() view.focus()
end end
local function get_target_winid(mode, win_ids) local function get_target_winid(mode)
local target_winid local target_winid
if not M.window_picker.enable or mode == "edit_no_picker" then if not M.window_picker.enable or mode == "edit_no_picker" then
target_winid = lib.target_winid target_winid = lib.target_winid
-- first available window -- first available window
if not vim.tbl_contains(win_ids, target_winid) then if not vim.tbl_contains(vim.api.nvim_tabpage_list_wins(0), target_winid) then
target_winid = first_win_id() target_winid = first_win_id()
end end
else else
@@ -201,20 +201,21 @@ local function set_current_win_no_autocmd(winid, autocmd)
vim.opt.eventignore = eventignore vim.opt.eventignore = eventignore
end end
local function open_in_new_window(filename, mode, win_ids) local function open_in_new_window(filename, mode)
if type(mode) ~= "string" then if type(mode) ~= "string" then
mode = "" mode = ""
end end
local target_winid = get_target_winid(mode, win_ids) local target_winid = get_target_winid(mode)
if not target_winid then if not target_winid then
return return
end end
local create_new_window = #vim.api.nvim_list_wins() == 1 local win_ids = vim.api.nvim_list_wins()
local create_new_window = #win_ids == 1 -- This implies that the nvim-tree window is the only one
local new_window_side = (view.View.side == "right") and "aboveleft" or "belowright" local new_window_side = (view.View.side == "right") and "aboveleft" or "belowright"
-- Target is invalid or window does not exist in current tabpage: create new window -- Target is invalid: create new window
if not vim.tbl_contains(win_ids, target_winid) then if not vim.tbl_contains(win_ids, target_winid) then
vim.cmd(new_window_side .. " vsplit") vim.cmd(new_window_side .. " vsplit")
target_winid = vim.api.nvim_get_current_win() target_winid = vim.api.nvim_get_current_win()
@@ -287,8 +288,6 @@ function M.fn(mode, filename)
return edit_in_current_buf(filename) return edit_in_current_buf(filename)
end end
local tabpage = vim.api.nvim_get_current_tabpage()
local win_ids = vim.api.nvim_tabpage_list_wins(tabpage)
local buf_loaded = is_already_loaded(filename) local buf_loaded = is_already_loaded(filename)
local found_win = utils.get_win_buf_from_path(filename) local found_win = utils.get_win_buf_from_path(filename)
@@ -297,7 +296,7 @@ function M.fn(mode, filename)
end end
if not found_win then if not found_win then
open_in_new_window(filename, mode, win_ids) open_in_new_window(filename, mode)
else else
vim.api.nvim_set_current_win(found_win) vim.api.nvim_set_current_win(found_win)
vim.bo.bufhidden = "" vim.bo.bufhidden = ""