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

Editor: merge_overlapping -> sort_and_merge_overlapping

Browse Source
This commit is contained in:
Maxime Coste 2012-12-31 13:56:52 +01:00
parent dc9635a247
commit 18b35a3ab3
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/editor.cc
View File

@ -130,11 +130,11 @@ std::vector<String> Editor::selections_content() const
return contents; return contents;
} }
static void merge_overlapping(SelectionList& selections) static void sort_and_merge_overlapping(SelectionList& selections)
{ {
assert(std::is_sorted(selections.begin(), selections.end(), std::sort(selections.begin(), selections.end(),
[](const Selection& lhs, const Selection& rhs) [](const Selection& lhs, const Selection& rhs)
{ return lhs.begin() < rhs.begin(); })); { return lhs.begin() < rhs.begin(); });
for (size_t i = 0; i < selections.size()-1;) for (size_t i = 0; i < selections.size()-1;)
{ {
if (overlaps(selections[i], selections[i+1])) if (overlaps(selections[i], selections[i+1]))
@ -159,7 +159,7 @@ void Editor::move_selections(CharCount offset, SelectMode mode)
sel = Selection(mode == SelectMode::Extend ? sel.first() : last, last); sel = Selection(mode == SelectMode::Extend ? sel.first() : last, last);
sel.avoid_eol(); sel.avoid_eol();
} }
merge_overlapping(m_selections); sort_and_merge_overlapping(m_selections);
} }
void Editor::move_selections(LineCount offset, SelectMode mode) void Editor::move_selections(LineCount offset, SelectMode mode)
@ -173,7 +173,7 @@ void Editor::move_selections(LineCount offset, SelectMode mode)
sel = Selection(mode == SelectMode::Extend ? sel.first() : last, last); sel = Selection(mode == SelectMode::Extend ? sel.first() : last, last);
sel.avoid_eol(); sel.avoid_eol();
} }
merge_overlapping(m_selections); sort_and_merge_overlapping(m_selections);
} }
void Editor::clear_selections() void Editor::clear_selections()
@ -219,7 +219,7 @@ void Editor::select(const BufferIterator& iterator, SelectMode mode)
{ {
for (auto& sel : m_selections) for (auto& sel : m_selections)
sel.last() = iterator; sel.last() = iterator;
merge_overlapping(m_selections); sort_and_merge_overlapping(m_selections);
} }
else if (mode == SelectMode::Append) else if (mode == SelectMode::Append)
assert(false); assert(false);
@ -258,7 +258,7 @@ void Editor::select(const Selector& selector, SelectMode mode)
sel.captures() = std::move(res.captures()); sel.captures() = std::move(res.captures());
} }
} }
merge_overlapping(m_selections); sort_and_merge_overlapping(m_selections);
} }
struct nothing_selected : public runtime_error struct nothing_selected : public runtime_error
@ -286,7 +286,7 @@ void Editor::multi_select(const MultiSelector& selector)
} }
if (new_selections.empty()) if (new_selections.empty())
throw nothing_selected(); throw nothing_selected();
merge_overlapping(new_selections); sort_and_merge_overlapping(new_selections);
m_selections = std::move(new_selections); m_selections = std::move(new_selections);
} }