wyj/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-09-17 20:58:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(events)!: trigger CursorMoved later on switching window (#23711)

Browse Source
This commit is contained in:
zeertzjq 2023-06-04 09:09:22 +08:00 committed by GitHub
parent 96e19533f6
commit 700cab0068
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
runtime/doc/autocmd.txt
View File

@ -505,8 +505,7 @@ CursorMoved After the cursor was moved in Normal or Visual
"x", "rx" or "p".
Not always triggered when there is typeahead,
while executing commands in a script file, or
when an operator is pending. Always triggered
when moving to another window.
when an operator is pending.
For an example see |match-parens|.
Note: Cannot be skipped with |:noautocmd|.
Careful: This is triggered very often, don't

2
runtime/doc/news.txt
View File

@ -30,6 +30,8 @@ The following changes may require adaptations in user config or plugins.
set mousemodel=popup
set keymodel=startsel,stopsel
<
• When switching windows, |CursorMoved| autocommands trigger when Nvim is back
in the main loop rather than immediately. This is more compatible with Vim.
• |LspRequest| autocmd was promoted from a |User| autocmd to a first class
citizen.

3
src/nvim/window.c
View File

@ -4903,8 +4903,7 @@ static void win_enter_ext(win_T *const wp, const int flags)
if (other_buffer) {
apply_autocmds(EVENT_BUFENTER, NULL, NULL, false, curbuf);
}
apply_autocmds(EVENT_CURSORMOVED, NULL, NULL, false, curbuf);
curwin->w_last_cursormoved = curwin->w_cursor;
curwin->w_last_cursormoved.lnum = 0;
}
maketitle();

18
test/functional/autocmd/cursormoved_spec.lua
View File

@ -5,19 +5,23 @@ local eq = helpers.eq
local eval = helpers.eval
local funcs = helpers.funcs
local source = helpers.source
local command = helpers.command
describe('CursorMoved', function()
before_each(clear)
it('is triggered by changing windows', function()
it('is triggered after BufEnter when changing or splitting windows #11878 #12031', function()
source([[
let g:cursormoved = 0
vsplit
autocmd CursorMoved * let g:cursormoved += 1
wincmd w
wincmd w
call setline(1, 'foo')
let g:log = []
autocmd BufEnter * let g:log += ['BufEnter' .. expand("<abuf>")]
autocmd CursorMoved * let g:log += ['CursorMoved' .. expand("<abuf>")]
]])
eq(2, eval('g:cursormoved'))
eq({}, eval('g:log'))
command('new')
eq({'BufEnter2', 'CursorMoved2'}, eval('g:log'))
command('wincmd w')
eq({'BufEnter2', 'CursorMoved2', 'BufEnter1', 'CursorMoved1'}, eval('g:log'))
end)
it("is not triggered by functions that don't change the window", function()

2
test/functional/ui/float_spec.lua
View File

@ -79,7 +79,7 @@ describe('float window', function()
api.nvim_buf_set_lines(buf, 0, -1, true, contents)
local winnr = vim.fn.win_id2win(floatwin)
api.nvim_command('wincmd p')
api.nvim_command('autocmd CursorMoved * ++once '..winnr..'wincmd c')
api.nvim_command('autocmd BufEnter * ++once '..winnr..'wincmd c')
return buf, floatwin
end
crashes{'foo'}