mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-29 06:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(inccommand): parse the command to check if it is previewable

Browse Source 
Free regprog if command isn't previewable

Co-authored-by: zeertzjq <zeertzjq@outlook.com>
This commit is contained in:
Famiu Haque
2022-06-28 11:00:05 +06:00
committed by GitHub
parent 274609a109
commit 7e1cf6b764
4 changed files with 34 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/nvim/ex_getln.c
View File

@@ -2372,7 +2372,7 @@ static void cmdpreview_close_win(void)
}
}
/// Show 'inccommand' preview. It works like this:
/// Show 'inccommand' preview if command is previewable. It works like this:
/// 1. Store current undo information so we can revert to current state later.
/// 2. Execute the preview callback with the parsed command, preview buffer number and preview
/// namespace number as arguments. The preview callback sets the highlight and does the
@@ -2385,12 +2385,15 @@ static void cmdpreview_close_win(void)
/// 5. If the return value of the preview callback is not 0, update the screen while the effects
/// of the preview are still in place.
/// 6. Revert all changes made by the preview callback.
static void cmdpreview_show(CommandLineState *s)
///
/// @return whether preview is shown or not.
static bool cmdpreview_may_show(CommandLineState *s)
{
// Parse the command line and return if it fails.
exarg_T ea;
CmdParseInfo cmdinfo;
// Copy the command line so we can modify it.
int cmdpreview_type = 0;
char *cmdline = xstrdup((char *)ccline.cmdbuff);
char *errormsg = NULL;
emsg_off++; // Block errors when parsing the command line, and don't update v:errmsg
@@ -2400,6 +2403,12 @@ static void cmdpreview_show(CommandLineState *s)
}
emsg_off--;
// Check if command is previewable, if not, don't attempt to show preview
if (!(ea.argt & EX_PREVIEW)) {
vim_regfree(cmdinfo.cmdmod.cmod_filter_regmatch.regprog);
goto end;
}
// Swap invalid command range if needed
if ((ea.argt & EX_RANGE) && ea.line1 > ea.line2) {
linenr_T lnum = ea.line1;
@@ -2454,7 +2463,7 @@ static void cmdpreview_show(CommandLineState *s)
// the preview.
Error err = ERROR_INIT;
try_start();
int cmdpreview_type = execute_cmd(&ea, &cmdinfo, true);
cmdpreview_type = execute_cmd(&ea, &cmdinfo, true);
if (try_end(&err)) {
api_clear_error(&err);
cmdpreview_type = 0;
@@ -2518,14 +2527,9 @@ static void cmdpreview_show(CommandLineState *s)
update_topline(curwin);
redrawcmdline();
// If preview callback returned 0, update screen to clear remnants of an earlier preview.
if (cmdpreview_type == 0) {
cmdpreview = false;
update_screen(SOME_VALID);
}
end:
xfree(cmdline);
return cmdpreview_type != 0;
}
static int command_line_changed(CommandLineState *s)
@@ -2564,9 +2568,9 @@ static int command_line_changed(CommandLineState *s)
&& *p_icm != NUL // 'inccommand' is set
&& curbuf->b_p_ma // buffer is modifiable
&& cmdline_star == 0 // not typing a password
&& cmd_can_preview((char *)ccline.cmdbuff)
&& !vpeekc_any()) {
cmdpreview_show(s);
&& !vpeekc_any()
&& cmdpreview_may_show(s)) {
// 'inccommand' preview has been shown.
} else if (cmdpreview) {
cmdpreview = false;
update_screen(SOME_VALID); // Clear 'inccommand' preview.