xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix partial regex text being pushed in history

Browse Source
This commit is contained in:
Maxime Coste 2023-11-02 13:00:12 +11:00
parent 8cc4de5bb3
commit a2c41593aa
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/normal.cc
View File

@ -853,23 +853,22 @@ void regex_prompt(Context& context, String prompt, char reg, T func)
context.window().set_position(position); context.window().set_position(position);
context.input_handler().set_prompt_face(context.faces()["Prompt"]); context.input_handler().set_prompt_face(context.faces()["Prompt"]);
RegisterManager::instance()[reg].restore(context, saved_reg);
} }
switch (event) switch (event)
{ {
case PromptEvent::Change: case PromptEvent::Abort: return;
if (not incsearch or str.empty()) case PromptEvent::Change:
return; if (incsearch and not str.empty())
RegisterManager::instance()[reg].set(context, str.str()); RegisterManager::instance()[reg].set(context, str.str());
func(Regex{str, direction_flags(mode)}, event, context); break;
return; case PromptEvent::Validate:
case PromptEvent::Abort: RegisterManager::instance()[reg].set(context, str.str());
RegisterManager::instance()[reg].restore(context, saved_reg); context.push_jump();
return; break;
case PromptEvent::Validate:
context.push_jump();
func(Regex{str.empty() ? default_regex : str, direction_flags(mode)}, event, context);
return;
} }
func(Regex{str.empty() ? default_regex : str, direction_flags(mode)}, event, context);
} }
catch (regex_error& err) catch (regex_error& err)
{ {

1
test/regression/0-intermediate-regex-saved-in-history/cmd Normal file
View File

@ -0,0 +1 @@

1
test/regression/0-intermediate-regex-saved-in-history/in Normal file
View File

@ -0,0 +1 @@
foo bar

1
test/regression/0-intermediate-regex-saved-in-history/kak_selection Normal file
View File

@ -0,0 +1 @@
foo

5
test/regression/0-intermediate-regex-saved-in-history/script Normal file
View File

@ -0,0 +1,5 @@
ui_out -ignore 4
ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "/foo<ret>/b" ] }'
sleep 0.1
ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "ar<ret>/<up><up><ret>" ] }'
ui_out -ignore 1