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

Proper linear time insert completion insertion

Browse Source 
The previous solution, ad9b090ddf, was
failing when completion was not replacing any text, as going through
SelectionList was not permitting to replace empty ranges.

Handle replacement as first a deletion then an insert to get fast
update, as having a list of forward deletions and then a list
for forwad insertion is much faster to update than a list of
interleaved delete/insert.
This commit is contained in:
Maxime Coste 2017-06-09 13:50:00 +01:00
parent f310db639c
commit 64aa6f3fb4
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/insert_completer.cc
View File

@ -3,6 +3,7 @@
#include "buffer_manager.hh" #include "buffer_manager.hh"
#include "buffer_utils.hh" #include "buffer_utils.hh"
#include "client.hh" #include "client.hh"
#include "changes.hh"
#include "context.hh" #include "context.hh"
#include "display_buffer.hh" #include "display_buffer.hh"
#include "face_registry.hh" #include "face_registry.hh"
@ -373,19 +374,29 @@ void InsertCompleter::select(int offset, Vector<Key>& keystrokes)
const auto suffix_len = std::max(0_byte, buffer.distance(cursor_pos, m_completions.end)); const auto suffix_len = std::max(0_byte, buffer.distance(cursor_pos, m_completions.end));
auto ref = buffer.string(m_completions.begin, m_completions.end); auto ref = buffer.string(m_completions.begin, m_completions.end);
Vector<Selection> ranges; ForwardChangesTracker changes_tracker;
size_t timestamp = buffer.timestamp();
Vector<BufferCoord> positions;
for (auto& sel : selections) for (auto& sel : selections)
{ {
const auto& cursor = sel.cursor(); auto pos = buffer.iterator_at(changes_tracker.get_new_coord_tolerant(sel.cursor()));
auto pos = buffer.iterator_at(cursor); if (pos.coord().column >= prefix_len and (pos + suffix_len) != buffer.end() and
if (cursor.column >= prefix_len and (pos + suffix_len) != buffer.end() and
std::equal(ref.begin(), ref.end(), pos - prefix_len)) std::equal(ref.begin(), ref.end(), pos - prefix_len))
ranges.push_back({(pos - prefix_len).coord(), (pos + suffix_len - 1).coord()}); {
positions.push_back(buffer.erase((pos - prefix_len).coord(),
(pos + suffix_len).coord()));
changes_tracker.update(buffer, timestamp);
}
} }
if (not ranges.empty())
SelectionList{buffer, std::move(ranges)}.insert(candidate.completion, InsertMode::Replace);
selections.update();
changes_tracker = ForwardChangesTracker{};
for (auto pos : positions)
{
buffer.insert(changes_tracker.get_new_coord_tolerant(pos), candidate.completion);
changes_tracker.update(buffer, timestamp);
}
selections.update();
m_completions.end = cursor_pos; m_completions.end = cursor_pos;
m_completions.begin = buffer.advance(cursor_pos, -candidate.completion.length()); m_completions.begin = buffer.advance(cursor_pos, -candidate.completion.length());
m_completions.timestamp = buffer.timestamp(); m_completions.timestamp = buffer.timestamp();