inccommand: Ignore leading modifiers in the command
This commit is contained in:
parent
e35a66d396
commit
f1f7f3b512
|
@ -9883,7 +9883,7 @@ static void ex_terminal(exarg_T *eap)
|
|||
|
||||
/// Checks if `cmd` is "previewable" (i.e. supported by 'inccommand').
|
||||
///
|
||||
/// @param[in] cmd Commandline to check. May start with a range.
|
||||
/// @param[in] cmd Commandline to check. May start with a range or modifier.
|
||||
///
|
||||
/// @return true if `cmd` is previewable
|
||||
bool cmd_can_preview(char_u *cmd)
|
||||
|
@ -9892,6 +9892,12 @@ bool cmd_can_preview(char_u *cmd)
|
|||
return false;
|
||||
}
|
||||
|
||||
// Ignore any leading modifiers (:keeppatterns, :verbose, etc.)
|
||||
for (int len = modifier_len(cmd); len != 0; len = modifier_len(cmd)) {
|
||||
cmd += len;
|
||||
cmd = skipwhite(cmd);
|
||||
}
|
||||
|
||||
exarg_T ea;
|
||||
// parse the command line
|
||||
ea.cmd = skip_range(cmd, NULL);
|
||||
|
|
|
@ -701,6 +701,25 @@ describe(":substitute, inccommand=split", function()
|
|||
eq(0, eval("&modified"))
|
||||
end)
|
||||
|
||||
it("shows preview when cmd modifiers are present", function()
|
||||
-- one modifier
|
||||
feed(':keeppatterns %s/tw/to')
|
||||
screen:expect([[too lines]], nil, nil, nil, true)
|
||||
feed('<Esc>')
|
||||
screen:expect([[two lines]], nil, nil, nil, true)
|
||||
|
||||
-- multiple modifiers
|
||||
feed(':keeppatterns silent %s/tw/to')
|
||||
screen:expect([[too lines]], nil, nil, nil, true)
|
||||
feed('<Esc>')
|
||||
screen:expect([[two lines]], nil, nil, nil, true)
|
||||
|
||||
-- non-modifier prefix
|
||||
feed(':silent tabedit %s/tw/to')
|
||||
screen:expect([[two lines]], nil, nil, nil, true)
|
||||
feed('<Esc>')
|
||||
end)
|
||||
|
||||
it('shows split window when typing the pattern', function()
|
||||
feed(":%s/tw")
|
||||
screen:expect([[
|
||||
|
@ -1140,6 +1159,25 @@ describe("inccommand=nosplit", function()
|
|||
]])
|
||||
end)
|
||||
|
||||
it("shows preview when cmd modifiers are present", function()
|
||||
-- one modifier
|
||||
feed(':keeppatterns %s/tw/to')
|
||||
screen:expect([[too lines]], nil, nil, nil, true)
|
||||
feed('<Esc>')
|
||||
screen:expect([[two lines]], nil, nil, nil, true)
|
||||
|
||||
-- multiple modifiers
|
||||
feed(':keeppatterns silent %s/tw/to')
|
||||
screen:expect([[too lines]], nil, nil, nil, true)
|
||||
feed('<Esc>')
|
||||
screen:expect([[two lines]], nil, nil, nil, true)
|
||||
|
||||
-- non-modifier prefix
|
||||
feed(':silent tabedit %s/tw/to')
|
||||
screen:expect([[two lines]], nil, nil, nil, true)
|
||||
feed('<Esc>')
|
||||
end)
|
||||
|
||||
it('never shows preview buffer', function()
|
||||
feed_command("set hlsearch")
|
||||
|
||||
|
|
Loading…
Reference in New Issue