IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17432 from zeertzjq/vim-8.1.2336

Browse Source 
vim-patch:8.1.2336,8.2.{4338,4401}: mapping cursor and redrawing patches
This commit is contained in:
zeertzjq 2022-02-27 10:51:11 +08:00 committed by GitHub
commit 8bf3a3e303
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 280 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/nvim/getchar.c
View File

@ -1949,8 +1949,11 @@ static int handle_mapping(int *keylenp, bool *timedout, int *mapdepth)
// expression. Also save and restore the command line
// for "normal :".
if (mp->m_expr) {
int save_vgetc_busy = vgetc_busy;
const int save_vgetc_busy = vgetc_busy;
const bool save_may_garbage_collect = may_garbage_collect;
const int save_cursor_row = ui_current_row();
const int save_cursor_col = ui_current_col();
const int prev_did_emsg = did_emsg;
vgetc_busy = 0;
may_garbage_collect = false;
@ -1960,6 +1963,32 @@ static int handle_mapping(int *keylenp, bool *timedout, int *mapdepth)
save_m_str = vim_strsave(mp->m_str);
}
map_str = eval_map_expr(mp, NUL);
// The mapping may do anything, but we expect it to take care of
// redrawing. Do put the cursor back where it was.
ui_cursor_goto(save_cursor_row, save_cursor_col);
ui_flush();
// If an error was displayed and the expression returns an empty
// string, generate a <Nop> to allow for a redraw.
if (prev_did_emsg != did_emsg && (map_str == NULL || *map_str == NUL)) {
char_u buf[4];
xfree(map_str);
buf[0] = K_SPECIAL;
buf[1] = KS_EXTRA;
buf[2] = KE_IGNORE;
buf[3] = NUL;
map_str = vim_strsave(buf);
if (State & CMDLINE) {
// redraw the command below the error
msg_didout = true;
if (msg_row < cmdline_row) {
msg_row = cmdline_row;
}
redrawcmd();
}
}
vgetc_busy = save_vgetc_busy;
may_garbage_collect = save_may_garbage_collect;
} else {
@ -3490,6 +3519,7 @@ static void showmap(mapblock_T *mp, bool local)
if (p_verbose > 0) {
last_set_msg(mp->m_script_ctx);
}
msg_clr_eos();
ui_flush(); // show one line at a time
}

78
src/nvim/testdir/test_mapping.vim
View File

@ -1,6 +1,8 @@
" Tests for mappings and abbreviations
source shared.vim
source check.vim
source screendump.vim
func Test_abbreviation()
" abbreviation with 0x80 should work
@ -451,6 +453,82 @@ func Test_expr_map_gets_cursor()
nunmap !
endfunc
func Test_expr_map_restore_cursor()
CheckScreendump
let lines =<< trim END
call setline(1, ['one', 'two', 'three'])
2
set ls=2
hi! link StatusLine ErrorMsg
noremap <expr> <C-B> Func()
func Func()
let g:on = !get(g:, 'on', 0)
redraws
return ''
endfunc
func Status()
return get(g:, 'on', 0) ? '[on]' : ''
endfunc
set stl=%{Status()}
END
call writefile(lines, 'XtestExprMap')
let buf = RunVimInTerminal('-S XtestExprMap', #{rows: 10})
call term_sendkeys(buf, "\<C-B>")
call VerifyScreenDump(buf, 'Test_map_expr_1', {})
" clean up
call StopVimInTerminal(buf)
call delete('XtestExprMap')
endfunc
func Test_map_listing()
CheckScreendump
let lines =<< trim END
nmap a b
END
call writefile(lines, 'XtestMapList')
let buf = RunVimInTerminal('-S XtestMapList', #{rows: 6})
call term_sendkeys(buf, ": nmap a\<CR>")
call VerifyScreenDump(buf, 'Test_map_list_1', {})
" clean up
call StopVimInTerminal(buf)
call delete('XtestMapList')
endfunc
func Test_expr_map_error()
CheckScreendump
let lines =<< trim END
func Func()
throw 'test'
return ''
endfunc
nnoremap <expr> <F2> Func()
cnoremap <expr> <F2> Func()
call test_override('ui_delay', 10)
END
call writefile(lines, 'XtestExprMap')
let buf = RunVimInTerminal('-S XtestExprMap', #{rows: 10})
call term_sendkeys(buf, "\<F2>")
call TermWait(buf)
call term_sendkeys(buf, "\<CR>")
call VerifyScreenDump(buf, 'Test_map_expr_2', {})
call term_sendkeys(buf, ":abc\<F2>")
call VerifyScreenDump(buf, 'Test_map_expr_3', {})
call term_sendkeys(buf, "\<Esc>0")
call VerifyScreenDump(buf, 'Test_map_expr_4', {})
" clean up
call StopVimInTerminal(buf)
call delete('XtestExprMap')
endfunc
" Test for mapping errors
func Test_map_error()
call assert_fails('unmap', 'E474:')

164
test/functional/ex_cmds/map_spec.lua
View File

@ -1,6 +1,8 @@
local helpers = require("test.functional.helpers")(after_each)
local Screen = require('test.functional.ui.screen')
local eq = helpers.eq
local exec = helpers.exec
local feed = helpers.feed
local meths = helpers.meths
local clear = helpers.clear
@ -26,3 +28,165 @@ describe(':*map', function()
expect('-foo-')
end)
end)
describe(':*map cursor and redrawing', function()
local screen
before_each(function()
clear()
screen = Screen.new(20, 5)
screen:attach()
end)
it('cursor is restored after :map <expr> which calls input()', function()
command('map <expr> x input("> ")')
screen:expect([[
^ |
~ |
~ |
~ |
|
]])
feed('x')
screen:expect([[
|
~ |
~ |
~ |
> ^ |
]])
feed('\n')
screen:expect([[
^ |
~ |
~ |
~ |
> |
]])
end)
it('cursor is restored after :imap <expr> which calls input()', function()
command('imap <expr> x input("> ")')
feed('i')
screen:expect([[
^ |
~ |
~ |
~ |
-- INSERT -- |
]])
feed('x')
screen:expect([[
|
~ |
~ |
~ |
> ^ |
]])
feed('\n')
screen:expect([[
^ |
~ |
~ |
~ |
> |
]])
end)
it('cursor is restored after :map <expr> which redraws statusline vim-patch:8.1.2336', function()
exec([[
call setline(1, ['one', 'two', 'three'])
2
set ls=2
hi! link StatusLine ErrorMsg
noremap <expr> <C-B> Func()
func Func()
let g:on = !get(g:, 'on', 0)
redraws
return ''
endfunc
func Status()
return get(g:, 'on', 0) ? '[on]' : ''
endfunc
set stl=%{Status()}
]])
feed('<C-B>')
screen:expect([[
one |
^two |
three |
[on] |
|
]])
end)
it('error in :nmap <expr> does not mess up display vim-patch:4.2.4338', function()
screen:try_resize(40, 5)
command('nmap <expr> <F2> execute("throw 42")')
feed('<F2>')
screen:expect([[
|
|
Error detected while processing : |
E605: Exception not caught: 42 |
Press ENTER or type command to continue^ |
]])
feed('<CR>')
screen:expect([[
^ |
~ |
~ |
~ |
|
]])
end)
it('error in :cmap <expr> handled correctly vim-patch:4.2.4338', function()
screen:try_resize(40, 5)
command('cmap <expr> <F2> execute("throw 42")')
feed(':echo "foo')
screen:expect([[
|
~ |
~ |
~ |
:echo "foo^ |
]])
feed('<F2>')
screen:expect([[
|
:echo "foo |
Error detected while processing : |
E605: Exception not caught: 42 |
:echo "foo^ |
]])
feed('"')
screen:expect([[
|
:echo "foo |
Error detected while processing : |
E605: Exception not caught: 42 |
:echo "foo"^ |
]])
feed('\n')
screen:expect([[
:echo "foo |
Error detected while processing : |
E605: Exception not caught: 42 |
foo |
Press ENTER or type command to continue^ |
]])
end)
it('listing mappings clears command line vim-patch:8.2.4401', function()
screen:try_resize(40, 5)
command('nmap a b')
feed(': nmap a<CR>')
screen:expect([[
^ |
~ |
~ |
~ |
n a b |
]])
end)
end)

13
test/functional/ui/cmdline_highlight_spec.lua
View File

@ -33,7 +33,7 @@ before_each(function()
let g:NUM_LVLS = 4
function Redraw()
mode
return ''
return "\<Ignore>"
endfunction
let g:id = ''
cnoremap <expr> {REDRAW} Redraw()
@ -42,7 +42,7 @@ before_each(function()
let Cb = g:Nvim_color_input{g:id}
let out = input({'prompt': ':', 'highlight': Cb})
let g:out{id} = out
return (a:do_return ? out : '')
return (a:do_return ? out : "\<Ignore>")
endfunction
nnoremap <expr> {PROMPT} DoPrompt(0)
cnoremap <expr> {PROMPT} DoPrompt(1)
@ -410,7 +410,7 @@ describe('Command-line coloring', function()
end)
it('stops executing callback after a number of errors', function()
set_color_cb('SplittedMultibyteStart')
start_prompt('let x = "«»«»«»«»«»"\n')
start_prompt('let x = "«»«»«»«»«»"')
screen:expect([[
{EOB:~ }|
{EOB:~ }|
@ -419,7 +419,7 @@ describe('Command-line coloring', function()
:let x = " |
{ERR:E5405: Chunk 0 start 10 splits multibyte}|
{ERR: character} |
^:let x = "«»«»«»«»«»" |
:let x = "«»«»«»«»«»"^ |
]])
feed('\n')
screen:expect([[
@ -432,6 +432,7 @@ describe('Command-line coloring', function()
{EOB:~ }|
|
]])
feed('\n')
eq('let x = "«»«»«»«»«»"', meths.get_var('out'))
local msg = '\nE5405: Chunk 0 start 10 splits multibyte character'
eq(msg:rep(1), funcs.execute('messages'))
@ -474,14 +475,14 @@ describe('Command-line coloring', function()
]])
feed('\n')
screen:expect([[
|
^ |
{EOB:~ }|
{EOB:~ }|
{EOB:~ }|
{EOB:~ }|
{EOB:~ }|
{EOB:~ }|
^:echo 42 |
:echo 42 |
]])
feed('\n')
eq('echo 42', meths.get_var('out'))