diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-02-10 14:07:41 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-02-10 14:07:41 +0000 |
commit | 74a0a5b26d0180f3ea89e9495dff6a26f0df23cb (patch) | |
tree | d991dcc0a35f17657c6f591d51b46dcff9a167b3 | |
parent | 9da17d7c57071c306565da6a35c3704db1916b78 (diff) |
patch 8.2.4338: an error from an expression mapping messes up the displayv8.2.4338
Problem: An error from an expression mapping messes up the display.
Solution: When the expression results in an empty string return K_IGNORE.
In cmdline mode redraw the command line. (closes #9726)
-rw-r--r-- | src/getchar.c | 24 | ||||
-rw-r--r-- | src/testdir/dumps/Test_map_expr_2.dump | 10 | ||||
-rw-r--r-- | src/testdir/dumps/Test_map_expr_3.dump | 10 | ||||
-rw-r--r-- | src/testdir/dumps/Test_map_expr_4.dump | 10 | ||||
-rw-r--r-- | src/testdir/test_mapping.vim | 32 | ||||
-rw-r--r-- | src/version.c | 2 |
6 files changed, 88 insertions, 0 deletions
diff --git a/src/getchar.c b/src/getchar.c index c7a1cca1a6..8513679de8 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -2840,6 +2840,7 @@ handle_mapping( int save_may_garbage_collect = may_garbage_collect; int was_screen_col = screen_cur_col; int was_screen_row = screen_cur_row; + int prev_did_emsg = did_emsg; vgetc_busy = 0; may_garbage_collect = FALSE; @@ -2852,6 +2853,29 @@ handle_mapping( windgoto(was_screen_row, was_screen_col); out_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]; + + vim_free(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; } diff --git a/src/testdir/dumps/Test_map_expr_2.dump b/src/testdir/dumps/Test_map_expr_2.dump new file mode 100644 index 0000000000..270a23344e --- /dev/null +++ b/src/testdir/dumps/Test_map_expr_2.dump @@ -0,0 +1,10 @@ +> +0&#ffffff0@74 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|0|,|0|-|1| @8|A|l@1| diff --git a/src/testdir/dumps/Test_map_expr_3.dump b/src/testdir/dumps/Test_map_expr_3.dump new file mode 100644 index 0000000000..6404e8cdbf --- /dev/null +++ b/src/testdir/dumps/Test_map_expr_3.dump @@ -0,0 +1,10 @@ +|~+0#4040ff13#ffffff0| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|:+0#0000000&|a|b|c| @70 +|E+0#ffffff16#e000002|r@1|o|r| |d|e|t|e|c|t|e|d| |w|h|i|l|e| |p|r|o|c|e|s@1|i|n|g| |f|u|n|c|t|i|o|n| |F|u|n|c|[|1|]|.@1|f|u|n|c|t|i|o|n| |F|u|n|c|:| +0#0000000#ffffff0@10 +|l+0#af5f00255&|i|n|e| @3|1|:| +0#0000000&@64 +|E+0#ffffff16#e000002|6|0|5|:| |E|x|c|e|p|t|i|o|n| |n|o|t| |c|a|u|g|h|t|:| |t|e|s|t| +0#0000000#ffffff0@42 +|:|a|b|c> @70 diff --git a/src/testdir/dumps/Test_map_expr_4.dump b/src/testdir/dumps/Test_map_expr_4.dump new file mode 100644 index 0000000000..270a23344e --- /dev/null +++ b/src/testdir/dumps/Test_map_expr_4.dump @@ -0,0 +1,10 @@ +> +0&#ffffff0@74 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|0|,|0|-|1| @8|A|l@1| diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim index b9c9fa528e..e18927cfcf 100644 --- a/src/testdir/test_mapping.vim +++ b/src/testdir/test_mapping.vim @@ -549,6 +549,38 @@ func Test_expr_map_restore_cursor() call delete('XtestExprMap') 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 TermWait(buf) + 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:') diff --git a/src/version.c b/src/version.c index a02fefdc4c..db2a923921 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4338, +/**/ 4337, /**/ 4336, |