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

Change merge_overlapping to guarantee we dont break the sorting

Browse Source 
In certain cases, we could end up with a unsorted selection list,
leading to broken invariant.
This commit is contained in:
Maxime Coste 2017-06-07 19:30:44 +01:00
parent 1d4093bcdc
commit d9b1ee13d9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/selection.cc
View File

@ -7,13 +7,13 @@
namespace Kakoune namespace Kakoune
{ {
void Selection::merge_with(const Selection& range) void Selection::merge_with(const Selection& other)
{ {
m_cursor = range.m_cursor; m_cursor = other.m_cursor;
if (m_anchor < m_cursor) if (m_anchor < m_cursor)
m_anchor = std::min(m_anchor, range.m_anchor); m_anchor = std::min(m_anchor, other.m_anchor);
if (m_anchor > m_cursor) if (m_anchor > m_cursor)
m_anchor = std::max(m_anchor, range.m_anchor); m_anchor = std::max(m_anchor, other.m_anchor);
} }
SelectionList::SelectionList(Buffer& buffer, Selection s, size_t timestamp) SelectionList::SelectionList(Buffer& buffer, Selection s, size_t timestamp)
@ -100,7 +100,8 @@ Iterator merge_overlapping(Iterator begin, Iterator end, size_t& main, OverlapsF
{ {
if (overlaps(begin[i], begin[j])) if (overlaps(begin[i], begin[j]))
{ {
begin[i].merge_with(begin[j]); begin[i].min() = std::min(begin[i].min(), begin[j].min());
begin[i].max() = std::max(begin[i].max(), begin[j].max());
if (i < main) if (i < main)
--main; --main;
} }