mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1351: Return value of getcmdline() inconsistent in CmdlineLeavePre

Browse Source 
Problem:  Return value of getcmdline() inconsistent in CmdlineLeavePre
          when leaving cmdline in different ways (after v9.1.1329).
Solution: Trigger CmdlineLeavePre before calling abandon_cmdline() so
          that getcmdline() can return the command line (zeertzjq).

closes: vim/vim#17218

9240369774
This commit is contained in:
zeertzjq
2025-04-29 07:13:51 +08:00
parent c64cada12e
commit afcc4e95d5
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/ex_getln.c
View File

@@ -871,6 +871,11 @@ static uint8_t *command_line_enter(int firstc, int count, int indent, bool clear
state_enter(&s->state); state_enter(&s->state);
// Trigger CmdlineLeavePre autocommands if not already triggered.
if (!s->event_cmdlineleavepre_triggered) {
trigger_cmd_autocmd(s->cmdline_type, EVENT_CMDLINELEAVEPRE);
}
if (has_event(EVENT_CMDLINELEAVE)) { if (has_event(EVENT_CMDLINELEAVE)) {
save_v_event_T save_v_event; save_v_event_T save_v_event;
dict_T *dict = get_v_event(&save_v_event); dict_T *dict = get_v_event(&save_v_event);
@@ -950,11 +955,6 @@ static uint8_t *command_line_enter(int firstc, int count, int indent, bool clear
need_wait_return = false; need_wait_return = false;
} }
// Trigger CmdlineLeavePre autocommands if not already triggered.
if (!s->event_cmdlineleavepre_triggered) {
trigger_cmd_autocmd(s->cmdline_type, EVENT_CMDLINELEAVEPRE);
}
set_option_direct(kOptInccommand, CSTR_AS_OPTVAL(s->save_p_icm), 0, SID_NONE); set_option_direct(kOptInccommand, CSTR_AS_OPTVAL(s->save_p_icm), 0, SID_NONE);
State = s->save_State; State = s->save_State;
if (cmdpreview != save_cmdpreview) { if (cmdpreview != save_cmdpreview) {

27
test/old/testdir/test_autocmd.vim
View File

@@ -1987,11 +1987,28 @@ func Test_Cmdline_Trigger()
call assert_equal('CmdlineLeavePre', g:log) call assert_equal('CmdlineLeavePre', g:log)
call assert_equal('CmdlineLeave', g:log2) call assert_equal('CmdlineLeave', g:log2)
let g:count = 0 autocmd CmdlineLeavePre * let g:cmdline += [getcmdline()]
autocmd CmdlineLeavePre * let g:count += 1
call feedkeys(":let c = input('? ')\<cr>B\<cr>", "tx") for end_keys in ["\<CR>", "\<NL>", "\<kEnter>", "\<C-C>", "\<Esc>",
call assert_equal(2, g:count) \ "\<C-\>\<C-N>", "\<C-\>\<C-G>"]
unlet! g:count let g:cmdline = []
let g:log = ''
let g:log2 = ''
call assert_equal('', g:log)
let keys = $':echo "hello"{end_keys}'
let msg = keytrans(keys)
call feedkeys(keys, "tx")
call assert_equal(['echo "hello"'], g:cmdline, msg)
call assert_equal('CmdlineLeavePre', g:log, msg)
call assert_equal('CmdlineLeave', g:log2, msg)
endfor
let g:cmdline = []
call feedkeys(":let c = input('? ')\<cr>ABCDE\<cr>", "tx")
call assert_equal(["let c = input('? ')", 'ABCDE'], g:cmdline)
au! CmdlineLeavePre
unlet! g:cmdline
unlet! g:log unlet! g:log
unlet! g:log2 unlet! g:log2
bw! bw!