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

Minor cleanup in SelectionList methods

Browse Source
This commit is contained in:
Maxime Coste 2014-05-17 12:13:49 +01:00
parent 211b78f536
commit 079d34b82a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/normal.cc
View File

@ -79,7 +79,7 @@ void insert(Buffer& buffer, SelectionList& selections, const String& str)
} }
} }
if (mode == InsertMode::Replace) if (mode == InsertMode::Replace)
selections.set_timestamp(buffer.timestamp()); selections.update_timestamp();
else else
selections.update(); selections.update();
selections.avoid_eol(); selections.avoid_eol();
@ -108,7 +108,7 @@ void insert(Buffer& buffer, SelectionList& selections, memoryview<String> string
} }
} }
if (mode == InsertMode::Replace) if (mode == InsertMode::Replace)
selections.set_timestamp(buffer.timestamp()); selections.update_timestamp();
else else
selections.update(); selections.update();
selections.avoid_eol(); selections.avoid_eol();

4
src/selection.hh
View File

@ -86,6 +86,7 @@ struct SelectionList
m_selections = std::move(list); m_selections = std::move(list);
m_main = size()-1; m_main = size()-1;
sort_and_merge_overlapping(); sort_and_merge_overlapping();
update_timestamp();
check_invariant(); check_invariant();
return *this; return *this;
} }
@ -115,7 +116,6 @@ struct SelectionList
} }
size_t size() const { return m_selections.size(); } size_t size() const { return m_selections.size(); }
bool empty() const { return m_selections.empty(); }
bool operator==(const SelectionList& other) const { return m_buffer == other.m_buffer and m_selections == other.m_selections; } bool operator==(const SelectionList& other) const { return m_buffer == other.m_buffer and m_selections == other.m_selections; }
bool operator!=(const SelectionList& other) const { return !((*this) == other); } bool operator!=(const SelectionList& other) const { return !((*this) == other); }
@ -149,7 +149,7 @@ struct SelectionList
const Buffer& buffer() const { return *m_buffer; } const Buffer& buffer() const { return *m_buffer; }
size_t timestamp() const { return m_timestamp; } size_t timestamp() const { return m_timestamp; }
void set_timestamp(size_t timestamp) { m_timestamp = timestamp; } void update_timestamp() { m_timestamp = m_buffer->timestamp(); }
private: private:
size_t m_main = 0; size_t m_main = 0;