From 2cdf86d6745d3dcd06fbd6687b68fb76894a16a5 Mon Sep 17 00:00:00 2001 From: Frank LENORMAND Date: Sat, 23 Nov 2019 08:47:14 +0100 Subject: src: Complete register names in `%reg{}` expansions Builtin registers have name aliases that can be completed upon when using a `%reg{}` expansion from the prompt. --- src/register_manager.cc | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'src/register_manager.cc') diff --git a/src/register_manager.cc b/src/register_manager.cc index 3abbd61b..37c93628 100644 --- a/src/register_manager.cc +++ b/src/register_manager.cc @@ -7,23 +7,24 @@ namespace Kakoune { +static const HashMap reg_names = { + { "slash", '/' }, + { "dquote", '"' }, + { "pipe", '|' }, + { "caret", '^' }, + { "arobase", '@' }, + { "percent", '%' }, + { "dot", '.' }, + { "hash", '#' }, + { "underscore", '_' }, + { "colon", ':' } +}; + Register& RegisterManager::operator[](StringView reg) const { if (reg.length() == 1) return (*this)[reg[0_byte]]; - static const HashMap reg_names = { - { "slash", '/' }, - { "dquote", '"' }, - { "pipe", '|' }, - { "caret", '^' }, - { "arobase", '@' }, - { "percent", '%' }, - { "dot", '.' }, - { "hash", '#' }, - { "underscore", '_' }, - { "colon", ':' } - }; auto it = reg_names.find(reg); if (it == reg_names.end()) throw runtime_error(format("no such register: '{}'", reg)); @@ -47,4 +48,9 @@ void RegisterManager::add_register(Codepoint c, std::unique_ptr reg) reg_ptr = std::move(reg); } +CandidateList RegisterManager::complete_register_name(StringView prefix, ByteCount cursor_pos) const +{ + return complete(prefix, cursor_pos, reg_names | transform([](auto& i) { return i.key; }) | gather>()); +} + } -- cgit v1.2.3