Skip to content

Commit 1d49300

Browse files
committed
(mini.deps) Update confirm buffer to set metadata with eventual window being current.
1 parent 5f162a9 commit 1d49300

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

lua/mini/deps.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -1401,8 +1401,8 @@ H.show_confirm_buf = function(lines, name, exec_on_write)
14011401
local buf_id = vim.api.nvim_create_buf(true, true)
14021402
H.buf_set_name(buf_id, name)
14031403
vim.api.nvim_buf_set_lines(buf_id, 0, -1, false, lines)
1404-
vim.bo[buf_id].buftype, vim.bo[buf_id].filetype, vim.bo[buf_id].modified = 'acwrite', 'minideps-confirm', false
14051404
vim.cmd('tab sbuffer ' .. buf_id)
1405+
vim.bo[buf_id].buftype, vim.bo[buf_id].filetype, vim.bo[buf_id].modified = 'acwrite', 'minideps-confirm', false
14061406
local tab_num, win_id = vim.api.nvim_tabpage_get_number(0), vim.api.nvim_get_current_win()
14071407

14081408
local delete_buffer = vim.schedule_wrap(function()

tests/test_deps.lua

+10
Original file line numberDiff line numberDiff line change
@@ -1295,10 +1295,15 @@ T['update()']['Confirm buffer'] = new_set({
12951295
}
12961296
]])
12971297

1298+
-- Confirmation buffer should be configurable in `FileType` event with
1299+
-- window being current (so as to `vim.wo` can work)
1300+
child.cmd('au FileType minideps-confirm lua _G.minideps_ft_win_id = vim.api.nvim_get_current_win()')
1301+
12981302
update()
12991303
eq(#get_spawn_log(), 15)
13001304
eq(#get_notify_log(), 3)
13011305
validate_confirm_buf('mini-deps://confirm-update')
1306+
eq(child.lua_get('_G.minideps_ft_win_id') == child.api.nvim_get_current_win(), true)
13021307

13031308
child.lua([[
13041309
_G.prev_update = MiniDeps.update
@@ -1855,13 +1860,18 @@ local clean = forward_lua('MiniDeps.clean')
18551860
T['clean()']['works'] = function()
18561861
child.set_size(15, 80)
18571862

1863+
-- Confirmation buffer should be configurable in `FileType` event with
1864+
-- window being current (so as to `vim.wo` can work)
1865+
child.cmd('au FileType minideps-confirm lua _G.minideps_ft_win_id = vim.api.nvim_get_current_win()')
1866+
18581867
clean()
18591868

18601869
-- By default should show confirmation buffer
18611870
child.set_cursor(1, 0)
18621871
child.wo.wrap = false
18631872
child.expect_screenshot()
18641873
validate_confirm_buf('mini-deps://confirm-clean')
1874+
eq(child.lua_get('_G.minideps_ft_win_id') == child.api.nvim_get_current_win(), true)
18651875

18661876
-- Should reveal concealed full path
18671877
child.set_cursor(9, 0)

0 commit comments

Comments
 (0)