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

Re-tweak command name completion behaviour

Browse Source 
It turns out the fix for #4061 was breaking auto-selection with
space of command names.
This commit is contained in:
Maxime Coste 2021-03-02 20:18:19 +11:00
parent bdee3abd88
commit eb292f1f00
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/command_manager.cc
View File

@ -627,7 +627,7 @@ Completions CommandManager::complete_command_name(const Context& context, String
return {0, query.length(), return {0, query.length(),
Kakoune::complete(query, query.length(), concatenated(commands, aliases)), Kakoune::complete(query, query.length(), concatenated(commands, aliases)),
Completions::Flags::Menu | Completions::Flags::NoEmpty | Completions::Flags::Quoted}; Completions::Flags::Menu | Completions::Flags::NoEmpty};
} }
Completions CommandManager::complete_module_name(StringView query) const Completions CommandManager::complete_module_name(StringView query) const
@ -682,12 +682,7 @@ Completions CommandManager::complete(const Context& context,
} }
} }
else if (token_type == Token::Type::RawQuoted) else if (token_type == Token::Type::RawQuoted)
{
--completions.start;
completions.flags |= Completions::Flags::Quoted; completions.flags |= Completions::Flags::Quoted;
for (auto& c : completions.candidates)
c = quote(c);
}
else else
kak_assert(false); kak_assert(false);
@ -702,7 +697,7 @@ Completions CommandManager::complete(const Context& context,
token.type == Token::Type::RawQuoted)) token.type == Token::Type::RawQuoted))
{ {
StringView query = command_line.substr(start, cursor_pos_in_token); StringView query = command_line.substr(start, cursor_pos_in_token);
return offset_pos(complete_command_name(context, query), start); return offset_pos(requote(complete_command_name(context, query), token.type), start);
} }
switch (token.type) switch (token.type)