Commit801faea

authored

fix(input): use correct grid when restoring cursor for <expr> mapping (#19047)

1 parentc943252 commit801faeaCopy full SHA for 801faea

File tree

+24

-6

lines changed

+24

-6

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2122,6 +2122,7 @@ static int handle_mapping(int keylenp, bool timedout, int *mapdepth)`
`2122`	`2122`	`constboolsave_may_garbage_collect=may_garbage_collect;`
`2123`	`2123`	`constintsave_cursor_row=ui_current_row();`
`2124`	`2124`	`constintsave_cursor_col=ui_current_col();`
	`2125`	`+consthandle_Tsave_cursor_grid=ui_cursor_grid();`
`2125`	`2126`	`constintprev_did_emsg=did_emsg;`
`2126`	`2127`
`2127`	`2128`	`vgetc_busy=0;`
`@@ -2135,7 +2136,7 @@ static int handle_mapping(int keylenp, bool timedout, int *mapdepth)`
`2135`	`2136`
`2136`	`2137`	`// The mapping may do anything, but we expect it to take care of`
`2137`	`2138`	`// redrawing. Do put the cursor back where it was.`
`2138`		`-ui_cursor_goto(save_cursor_row,save_cursor_col);`
	`2139`	`+ui_grid_cursor_goto(save_cursor_grid,save_cursor_row,save_cursor_col);`
`2139`	`2140`	`ui_flush();`
`2140`	`2141`
`2141`	`2142`	`// If an error was displayed and the expression returns an empty`

Lines changed: 5 additions & 0 deletions

Lines changed: 17 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ n asdf1 qwert`
`86`	`86`	`end)`
`87`	`87`	`end)`
`88`	`88`
`89`		`-describe(':*map cursor and redrawing',function()`
	`89`	`+describe('Screen',function()`
`90`	`90`	`localscreen`
`91`	`91`	`before_each(function()`
`92`	`92`	`clear()`
`@@ -149,6 +149,18 @@ describe(':*map cursor and redrawing', function()`
`149`	`149`	`]])`
`150`	`150`	`end)`
`151`	`151`
	`152`	`+it('cursor position does not move after empty-string :cmap <expr> #19046',function()`
	`153`	`+command([[cnoremap <expr> <F2> '']])`
	`154`	`+feed(':<F2>')`
	`155`	`+screen:expect([[`
	`156`	`+ \|`
	`157`	`+ ~ \|`
	`158`	`+ ~ \|`
	`159`	`+ ~ \|`
	`160`	`+ :^ \|`
	`161`	`+]])`
	`162`	`+end)`
	`163`	`+`
`152`	`164`	`it('cursor is restored after :map <expr> which redraws statusline vim-patch:8.1.2336',function()`
`153`	`165`	`exec([[`
`154`	`166`	`call setline(1, ['one', 'two', 'three'])`
`@@ -157,12 +169,12 @@ describe(':*map cursor and redrawing', function()`
`157`	`169`	`hi! link StatusLine ErrorMsg`
`158`	`170`	`noremap <expr> <C-B> Func()`
`159`	`171`	`func Func()`
`160`		`- let g:on = !get(g:, 'on', 0)`
`161`		`- redraws`
`162`		`- return ''`
	`172`	`+ let g:on = !get(g:, 'on', 0)`
	`173`	`+ redraws`
	`174`	`+ return ''`
`163`	`175`	`endfunc`
`164`	`176`	`func Status()`
`165`		`- return get(g:, 'on', 0) ? '[on]' : ''`
	`177`	`+ return get(g:, 'on', 0) ? '[on]' : ''`
`166`	`178`	`endfunc`
`167`	`179`	`set stl=%{Status()}`
`168`	`180`	`]])`

Comments

(0)