mawww/kakoune
1
1
Fork 0
mirror of https://github.com/mawww/kakoune.git synced 2025-01-05 19:18:03 +03:00
Code Issues Projects Releases Wiki Activity

Fix reverse search when extending

Browse Source
This commit is contained in:
Maxime Coste 2014-09-25 13:29:53 +01:00
parent 4c4d3cdd38
commit ecf8047bcc
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/normal.cc
View File

@ -421,7 +421,7 @@ void select_next_match(const Buffer& buffer, SelectionList& selections,
if (mode == SelectMode::Replace) if (mode == SelectMode::Replace)
{ {
for (auto& sel : selections) for (auto& sel : selections)
sel = find_next_match<direction>(buffer, sel, regex); sel = keep_direction(find_next_match<direction>(buffer, sel, regex), sel);
} }
if (mode == SelectMode::Extend) if (mode == SelectMode::Extend)
{ {
@ -430,7 +430,10 @@ void select_next_match(const Buffer& buffer, SelectionList& selections,
} }
else if (mode == SelectMode::Append) else if (mode == SelectMode::Append)
{ {
selections.push_back(find_next_match<direction>(buffer, selections.main(), regex)); auto sel = keep_direction(
find_next_match<direction>(buffer, selections.main(), regex),
selections.main());
selections.push_back(std::move(sel));
selections.set_main_index(selections.size() - 1); selections.set_main_index(selections.size() - 1);
} }
selections.sort_and_merge_overlapping(); selections.sort_and_merge_overlapping();

2
src/selectors.hh
View File

@ -281,7 +281,7 @@ Selection find_next_match(const Buffer& buffer, const Selection& sel, const Rege
if (direction == Backward) if (direction == Backward)
std::swap(begin, end); std::swap(begin, end);
return keep_direction({begin.coord(), end.coord(), std::move(captures)}, sel); return {begin.coord(), end.coord(), std::move(captures)};
} }
void select_all_matches(SelectionList& selections, void select_all_matches(SelectionList& selections,