Commit20205d4

committed

fix(inccommand): never preview if parsing command failed

`errormsg` is not always set when parsing the command failed (e.g. whenthe range contains invalid marks). Check the return value is better.

1 parente420cd6 commit20205d4Copy full SHA for 20205d4

File tree

+32

-4

lines changed

+32

-4

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2375,17 +2375,18 @@ static void cmdpreview_close_win(void)`
`2375`	`2375`	`/// 6. Revert all changes made by the preview callback.`
`2376`	`2376`	`staticvoidcmdpreview_show(CommandLineState*s)`
`2377`	`2377`	`{`
	`2378`	`+emsg_off++;// Block errors when parsing the command line, and don't update v:errmsg.`
`2378`	`2379`	`// Parse the command line and return if it fails.`
`2379`	`2380`	`exarg_Tea;`
`2380`	`2381`	`CmdParseInfocmdinfo;`
`2381`	`2382`	`// Copy the command line so we can modify it.`
`2382`	`2383`	`charcmdline=xstrdup((char)ccline.cmdbuff);`
`2383`	`2384`	`char*errormsg=NULL;`
`2384`		`-`
`2385`		`-parse_cmdline(cmdline,&ea,&cmdinfo,&errormsg);`
`2386`		`-if (errormsg!=NULL) {`
	`2385`	`+if (!parse_cmdline(cmdline,&ea,&cmdinfo,&errormsg)) {`
	`2386`	`+emsg_off--;`
`2387`	`2387`	`gotoend;`
`2388`	`2388`	`}`
	`2389`	`+emsg_off--;`
`2389`	`2390`
`2390`	`2391`	`// Swap invalid command range if needed`
`2391`	`2392`	`if ((ea.argt&EX_RANGE)&&ea.line1>ea.line2) {`
`@@ -2409,7 +2410,8 @@ static void cmdpreview_show(CommandLineState *s)`
`2409`	`2410`	`cmdmod_Tsave_cmdmod=cmdmod;`
`2410`	`2411`
`2411`	`2412`	`cmdpreview= true;`
`2412`		`-emsg_silent++;// Block error reporting as the command may be incomplete`
	`2413`	`+emsg_silent++;// Block error reporting as the command may be incomplete,`
	`2414`	`+// but still update v:errmsg`
`2413`	`2415`	`msg_silent++;// Block messages, namely ones that prompt`
`2414`	`2416`	`block_autocmds();// Block events`
`2415`	`2417`	`garray_Tsave_view;`

Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2947,6 +2947,32 @@ it(':substitute with inccommand, allows :redraw before first separator is typed`
`2947`	`2947`	`]])`
`2948`	`2948`	`end)`
`2949`	`2949`
	`2950`	`+it(':substitute with inccommand, does nothing if range contains invalid marks',function()`
	`2951`	`+localscreen=Screen.new(30,6)`
	`2952`	`+clear()`
	`2953`	`+command('set undolevels=-1')`
	`2954`	`+common_setup(screen,'split','test')`
	`2955`	`+feed([[:'a,'bs]])`
	`2956`	`+screen:expect([[`
	`2957`	`+ test \|`
	`2958`	`+ {15:~ }\|`
	`2959`	`+ {15:~ }\|`
	`2960`	`+ {15:~ }\|`
	`2961`	`+ {15:~ }\|`
	`2962`	`+ :'a,'bs^ \|`
	`2963`	`+]])`
	`2964`	`+feed('/')`
	`2965`	`+screen:expect([[`
	`2966`	`+ test \|`
	`2967`	`+ {15:~ }\|`
	`2968`	`+ {15:~ }\|`
	`2969`	`+ {15:~ }\|`
	`2970`	`+ {15:~ }\|`
	`2971`	`+ :'a,'bs/^ \|`
	`2972`	`+]])`
	`2973`	`+eq('',eval('v:errmsg'))`
	`2974`	`+end)`
	`2975`	`+`
`2950`	`2976`	`it(":substitute doesn't crash with inccommand, if undo is empty #12932",function()`
`2951`	`2977`	`localscreen=Screen.new(10,5)`
`2952`	`2978`	`clear()`

Comments

(0)