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

Keep selection direction on split/select/search

Browse Source
This commit is contained in:
Maxime Coste 2014-09-18 00:34:23 +01:00
parent be85eb5d0b
commit dd2bdea8dd
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/selectors.cc
View File

@ -516,9 +516,10 @@ void select_all_matches(SelectionList& selections, const Regex& regex)
for (auto& match : *re_it) for (auto& match : *re_it)
captures.emplace_back(match.first, match.second); captures.emplace_back(match.first, match.second);
result.push_back({ begin.coord(), result.push_back(
keep_direction({ begin.coord(),
(begin == end ? end : utf8::previous(end, begin)).coord(), (begin == end ? end : utf8::previous(end, begin)).coord(),
std::move(captures) }); std::move(captures) }, sel));
} }
} }
if (result.empty()) if (result.empty())
@ -542,11 +543,11 @@ void split_selections(SelectionList& selections, const Regex& regex)
{ {
BufferIterator end = (*re_it)[0].first; BufferIterator end = (*re_it)[0].first;
result.push_back({ begin.coord(), (begin == end) ? end.coord() : utf8::previous(end, begin).coord() }); result.push_back(keep_direction({ begin.coord(), (begin == end) ? end.coord() : utf8::previous(end, begin).coord() }, sel));
begin = (*re_it)[0].second; begin = (*re_it)[0].second;
} }
if (begin.coord() <= sel.max()) if (begin.coord() <= sel.max())
result.push_back({ begin.coord(), sel.max() }); result.push_back(keep_direction({ begin.coord(), sel.max() }, sel));
} }
selections = std::move(result); selections = std::move(result);
} }

9
src/selectors.hh
View File

@ -9,6 +9,13 @@
namespace Kakoune namespace Kakoune
{ {
inline Selection keep_direction(Selection res, const Selection& ref)
{
if ((res.cursor() < res.anchor()) != (ref.cursor() < ref.anchor()))
std::swap<ByteCoord>(res.cursor(), res.anchor());
return res;
}
inline void clear_selections(SelectionList& selections) inline void clear_selections(SelectionList& selections)
{ {
for (auto& sel : selections) for (auto& sel : selections)
@ -274,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 {begin.coord(), end.coord(), std::move(captures)}; return keep_direction({begin.coord(), end.coord(), std::move(captures)}, sel);
} }
void select_all_matches(SelectionList& selections, void select_all_matches(SelectionList& selections,