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

use more explicit prompts for search and pipe, use color to validate

Browse Source
This commit is contained in:
Maxime Coste 2013-04-06 13:02:16 +02:00
parent 1ab8120147
commit be9bfa479f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.cc
View File

@ -155,7 +155,7 @@ void do_command(Context& context)
void do_pipe(Context& context) void do_pipe(Context& context)
{ {
context.input_handler().prompt("|", get_color("StatusLine"), complete_nothing, context.input_handler().prompt("pipe: ", get_color("Prompt"), complete_nothing,
[](const String& cmdline, PromptEvent event, Context& context) [](const String& cmdline, PromptEvent event, Context& context)
{ {
if (event != PromptEvent::Validate) if (event != PromptEvent::Validate)
@ -174,8 +174,9 @@ void do_pipe(Context& context)
template<SelectMode mode, bool forward> template<SelectMode mode, bool forward>
void do_search(Context& context) void do_search(Context& context)
{ {
const char* prompt = forward ? "search: " : "reverse search: ";
SelectionList selections = context.editor().selections(); SelectionList selections = context.editor().selections();
context.input_handler().prompt("/", get_color("StatusLine"), complete_nothing, context.input_handler().prompt(prompt, get_color("Prompt"), complete_nothing,
[selections](const String& str, PromptEvent event, Context& context) { [selections](const String& str, PromptEvent event, Context& context) {
try try
{ {
@ -185,6 +186,7 @@ void do_search(Context& context)
return; return;
Regex ex{str}; Regex ex{str};
context.input_handler().set_prompt_colors(get_color("Prompt"));
if (event == PromptEvent::Validate) if (event == PromptEvent::Validate)
{ {
if (str.empty()) if (str.empty())
@ -202,6 +204,8 @@ void do_search(Context& context)
{ {
if (event == PromptEvent::Validate) if (event == PromptEvent::Validate)
throw runtime_error("regex error: "_str + err.what()); throw runtime_error("regex error: "_str + err.what());
else
context.input_handler().set_prompt_colors(get_color("Error"));
} }
catch (runtime_error&) catch (runtime_error&)
{ {