do not check buffer invariant in do_{erase,insert} as this cause O(n²) behaviour
This commit is contained in:
parent
4fbe2dc6bc
commit
1fd99e7e88
|
@ -321,8 +321,6 @@ void Buffer::do_insert(const BufferIterator& pos, const String& content)
|
||||||
end_it = BufferIterator{*this, { last_line, m_lines[last_line].length() - suffix.length() }};
|
end_it = BufferIterator{*this, { last_line, m_lines[last_line].length() - suffix.length() }};
|
||||||
}
|
}
|
||||||
|
|
||||||
check_invariant();
|
|
||||||
|
|
||||||
for (auto listener : m_change_listeners)
|
for (auto listener : m_change_listeners)
|
||||||
listener->on_insert(begin_it, end_it);
|
listener->on_insert(begin_it, end_it);
|
||||||
}
|
}
|
||||||
|
@ -348,8 +346,6 @@ void Buffer::do_erase(const BufferIterator& begin, const BufferIterator& end)
|
||||||
for (LineCount i = begin.line()+1; i < line_count(); ++i)
|
for (LineCount i = begin.line()+1; i < line_count(); ++i)
|
||||||
m_lines[i].start -= length;
|
m_lines[i].start -= length;
|
||||||
|
|
||||||
check_invariant();
|
|
||||||
|
|
||||||
for (auto listener : m_change_listeners)
|
for (auto listener : m_change_listeners)
|
||||||
listener->on_erase(begin, end);
|
listener->on_erase(begin, end);
|
||||||
}
|
}
|
||||||
|
|
|
@ -168,10 +168,10 @@ public:
|
||||||
const HookManager& hooks() const { return m_hooks; }
|
const HookManager& hooks() const { return m_hooks; }
|
||||||
|
|
||||||
std::unordered_set<BufferChangeListener*>& change_listeners() const { return m_change_listeners; }
|
std::unordered_set<BufferChangeListener*>& change_listeners() const { return m_change_listeners; }
|
||||||
private:
|
|
||||||
friend class BufferIterator;
|
|
||||||
|
|
||||||
void check_invariant() const;
|
void check_invariant() const;
|
||||||
|
private:
|
||||||
|
friend class BufferIterator;
|
||||||
|
|
||||||
struct Line
|
struct Line
|
||||||
{
|
{
|
||||||
|
|
|
@ -88,10 +88,10 @@ void Editor::insert(const String& str, InsertMode mode)
|
||||||
{
|
{
|
||||||
sel.first() = pos;
|
sel.first() = pos;
|
||||||
sel.last() = str.empty() ? pos : utf8::character_start(pos + str.length() - 1);
|
sel.last() = str.empty() ? pos : utf8::character_start(pos + str.length() - 1);
|
||||||
sel.check_invariant();
|
|
||||||
}
|
}
|
||||||
sel.avoid_eol();
|
sel.avoid_eol();
|
||||||
}
|
}
|
||||||
|
check_invariant();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Editor::insert(const memoryview<String>& strings, InsertMode mode)
|
void Editor::insert(const memoryview<String>& strings, InsertMode mode)
|
||||||
|
@ -110,10 +110,10 @@ void Editor::insert(const memoryview<String>& strings, InsertMode mode)
|
||||||
{
|
{
|
||||||
sel.first() = pos;
|
sel.first() = pos;
|
||||||
sel.last() = str.empty() ? pos : utf8::character_start(pos + str.length() - 1);
|
sel.last() = str.empty() ? pos : utf8::character_start(pos + str.length() - 1);
|
||||||
sel.check_invariant();
|
|
||||||
}
|
}
|
||||||
sel.avoid_eol();
|
sel.avoid_eol();
|
||||||
}
|
}
|
||||||
|
check_invariant();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<String> Editor::selections_content() const
|
std::vector<String> Editor::selections_content() const
|
||||||
|
@ -408,6 +408,7 @@ void Editor::check_invariant() const
|
||||||
assert(not m_selections.empty());
|
assert(not m_selections.empty());
|
||||||
assert(m_main_sel < m_selections.size());
|
assert(m_main_sel < m_selections.size());
|
||||||
m_selections.check_invariant();
|
m_selections.check_invariant();
|
||||||
|
buffer().check_invariant();
|
||||||
assert(std::is_sorted(m_selections.begin(), m_selections.end(), compare_selections));
|
assert(std::is_sorted(m_selections.begin(), m_selections.end(), compare_selections));
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -87,7 +87,6 @@ public:
|
||||||
size_t cursor_pos = String::npos);
|
size_t cursor_pos = String::npos);
|
||||||
|
|
||||||
bool is_editing() const { return m_edition_level!= 0; }
|
bool is_editing() const { return m_edition_level!= 0; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
friend struct scoped_edition;
|
friend struct scoped_edition;
|
||||||
void begin_edition();
|
void begin_edition();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user