From e938d724f16ef06cbc97a4fedc20d56edf34e7f2 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Mon, 22 Jul 2024 17:43:37 +1000 Subject: Handle word completion when recording macros Make last insert and macro recording closer together, paving the way towards moving last insert to a register. Use a FunctionRef for insert completer key insertion support. --- src/insert_completer.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/insert_completer.cc') diff --git a/src/insert_completer.cc b/src/insert_completer.cc index 3e1bcd2d..73c08a43 100644 --- a/src/insert_completer.cc +++ b/src/insert_completer.cc @@ -416,7 +416,7 @@ InsertCompleter::~InsertCompleter() m_options.unregister_watcher(*this); } -void InsertCompleter::select(int index, bool relative, Vector* keystrokes) +void InsertCompleter::select(int index, bool relative, FunctionRef record_key) { m_enabled = true; if (not setup_ifn()) @@ -453,14 +453,13 @@ void InsertCompleter::select(int index, bool relative, Vector* keystrokes) m_context.client().menu_select(m_current_candidate); } - if (keystrokes) { for (auto i = 0_byte; i < prefix_len; ++i) - keystrokes->emplace_back(Key::Backspace); + record_key(Key::Backspace); for (auto i = 0_byte; i < suffix_len; ++i) - keystrokes->emplace_back(Key::Delete); + record_key(Key::Delete); for (auto& c : candidate.completion) - keystrokes->emplace_back(c); + record_key(c); } if (not candidate.on_select.empty()) -- cgit v1.2.3