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

Display the capture used in select/split prompt

Browse Source 
Fixes #770
This commit is contained in:
Maxime Coste 2016-08-27 10:54:52 +01:00
parent 2bf100bdd0
commit 85f54a77ac
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/normal.cc
View File

@ -590,12 +590,12 @@ void paste_all(Context& context, NormalParams params)
} }
template<typename T> template<typename T>
void regex_prompt(Context& context, const String prompt, T func) void regex_prompt(Context& context, String prompt, T func)
{ {
CharCoord position = context.has_window() ? context.window().position() : CharCoord{}; CharCoord position = context.has_window() ? context.window().position() : CharCoord{};
SelectionList selections = context.selections(); SelectionList selections = context.selections();
context.input_handler().prompt( context.input_handler().prompt(
prompt, "", get_face("Prompt"), PromptFlags::None, complete_nothing, std::move(prompt), "", get_face("Prompt"), PromptFlags::None, complete_nothing,
[=](StringView str, PromptEvent event, Context& context) mutable { [=](StringView str, PromptEvent event, Context& context) mutable {
try try
{ {
@ -716,7 +716,9 @@ void select_regex(Context& context, NormalParams params)
{ {
const char reg = to_lower(params.reg ? params.reg : '/'); const char reg = to_lower(params.reg ? params.reg : '/');
unsigned capture = (unsigned)params.count; unsigned capture = (unsigned)params.count;
regex_prompt(context, "select:", [reg, capture](Regex ex, PromptEvent event, Context& context) { auto prompt = capture ? format("select (capture {}):", capture) : "select:"_str;
regex_prompt(context, std::move(prompt),
[reg, capture](Regex ex, PromptEvent event, Context& context) {
if (ex.empty()) if (ex.empty())
ex = Regex{context.main_sel_register_value(reg)}; ex = Regex{context.main_sel_register_value(reg)};
else if (event == PromptEvent::Validate) else if (event == PromptEvent::Validate)
@ -730,7 +732,9 @@ void split_regex(Context& context, NormalParams params)
{ {
const char reg = to_lower(params.reg ? params.reg : '/'); const char reg = to_lower(params.reg ? params.reg : '/');
unsigned capture = (unsigned)params.count; unsigned capture = (unsigned)params.count;
regex_prompt(context, "split:", [reg, capture](Regex ex, PromptEvent event, Context& context) { auto prompt = capture ? format("split (on capture {}):", capture) : "split:"_str;
regex_prompt(context, std::move(prompt),
[reg, capture](Regex ex, PromptEvent event, Context& context) {
if (ex.empty()) if (ex.empty())
ex = Regex{context.main_sel_register_value(reg)}; ex = Regex{context.main_sel_register_value(reg)};
else if (event == PromptEvent::Validate) else if (event == PromptEvent::Validate)