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

do_select: do not propagate errors on incremental search

Browse Source
This commit is contained in:
Maxime Coste 2012-12-11 18:46:20 +01:00
parent 892b65b355
commit e36bc74f43
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main.cc
View File

@ -137,21 +137,34 @@ void do_search(Context& context)
SelectionList selections = context.editor().selections();
context.input_handler().prompt("/", complete_nothing,
[selections](const String& str, PromptEvent event, Context& context) {
context.editor().select(selections);
if (str.empty() or event == PromptEvent::Abort)
return;
String ex = str;
if (event == PromptEvent::Validate)
try
{
if (ex.empty())
ex = RegisterManager::instance()['/'].values(context)[0];
else
RegisterManager::instance()['/'] = ex;
context.push_jump();
context.editor().select(selections);
if (str.empty() or event == PromptEvent::Abort)
return;
String ex = str;
if (event == PromptEvent::Validate)
{
if (ex.empty())
ex = RegisterManager::instance()['/'].values(context)[0];
else
RegisterManager::instance()['/'] = ex;
context.push_jump();
}
context.editor().select(std::bind(select_next_match, _1, ex), mode);
}
context.editor().select(std::bind(select_next_match, _1, ex), mode);
catch (runtime_error&)
{
context.editor().select(selections);
// only validation should propagate errors,
// incremental search should not.
if (event == PromptEvent::Validate)
throw;
}
}, context);
}