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

src: Complete register names in %reg{} expansions

Browse Source 
Builtin registers have name aliases that can be completed upon when
using a `%reg{}` expansion from the prompt.
This commit is contained in:
Frank LENORMAND 2019-11-23 08:47:14 +01:00
parent 936bd923ea
commit 2cdf86d674
3 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/command_manager.cc
View File

@ -675,6 +675,11 @@ Completions CommandManager::complete(const Context& context,
switch (token.type) switch (token.type)
{ {
case Token::Type::RegisterExpand:
return {start , cursor_pos,
RegisterManager::instance().complete_register_name(
token.content, cursor_pos_in_token) };
case Token::Type::OptionExpand: case Token::Type::OptionExpand:
return {start , cursor_pos, return {start , cursor_pos,
GlobalScope::instance().option_registry().complete_option_name( GlobalScope::instance().option_registry().complete_option_name(

16
src/register_manager.cc
View File

@ -7,11 +7,6 @@
namespace Kakoune namespace Kakoune
{ {
Register& RegisterManager::operator[](StringView reg) const
{
if (reg.length() == 1)
return (*this)[reg[0_byte]];
static const HashMap<String, Codepoint> reg_names = { static const HashMap<String, Codepoint> reg_names = {
{ "slash", '/' }, { "slash", '/' },
{ "dquote", '"' }, { "dquote", '"' },
@ -24,6 +19,12 @@ Register& RegisterManager::operator[](StringView reg) const
{ "underscore", '_' }, { "underscore", '_' },
{ "colon", ':' } { "colon", ':' }
}; };
Register& RegisterManager::operator[](StringView reg) const
{
if (reg.length() == 1)
return (*this)[reg[0_byte]];
auto it = reg_names.find(reg); auto it = reg_names.find(reg);
if (it == reg_names.end()) if (it == reg_names.end())
throw runtime_error(format("no such register: '{}'", reg)); throw runtime_error(format("no such register: '{}'", reg));
@ -47,4 +48,9 @@ void RegisterManager::add_register(Codepoint c, std::unique_ptr<Register> reg)
reg_ptr = std::move(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<Vector<String>>());
}
} }

2
src/register_manager.hh
View File

@ -2,6 +2,7 @@
#define register_manager_hh_INCLUDED #define register_manager_hh_INCLUDED
#include "array_view.hh" #include "array_view.hh"
#include "completion.hh"
#include "exception.hh" #include "exception.hh"
#include "utils.hh" #include "utils.hh"
#include "hash_map.hh" #include "hash_map.hh"
@ -146,6 +147,7 @@ public:
Register& operator[](StringView reg) const; Register& operator[](StringView reg) const;
Register& operator[](Codepoint c) const; Register& operator[](Codepoint c) const;
void add_register(Codepoint c, std::unique_ptr<Register> reg); void add_register(Codepoint c, std::unique_ptr<Register> reg);
CandidateList complete_register_name(StringView prefix, ByteCount cursor_pos) const;
protected: protected:
HashMap<Codepoint, std::unique_ptr<Register>, MemoryDomain::Registers> m_registers; HashMap<Codepoint, std::unique_ptr<Register>, MemoryDomain::Registers> m_registers;