summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMaxime Coste <mawww@kakoune.org>2021-03-02 20:18:19 +1100
committerMaxime Coste <mawww@kakoune.org>2021-03-02 20:20:58 +1100
commiteb292f1f00570965fa25aa4509ceccfd6049ecdb (patch)
treed37c2cc6d465c207931ca89a3376b4097eeb7a06 /src
parentbdee3abd88ebc88ef39d47c6c8c63694d90bd3f2 (diff)
Re-tweak command name completion behaviour
It turns out the fix for #4061 was breaking auto-selection with space of command names.
Diffstat (limited to 'src')
-rw-r--r--src/command_manager.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/command_manager.cc b/src/command_manager.cc
index 7e0d6503..1e1f2035 100644
--- a/src/command_manager.cc
+++ b/src/command_manager.cc
@@ -627,7 +627,7 @@ Completions CommandManager::complete_command_name(const Context& context, String
return {0, query.length(),
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
@@ -682,12 +682,7 @@ Completions CommandManager::complete(const Context& context,
}
}
else if (token_type == Token::Type::RawQuoted)
- {
- --completions.start;
completions.flags |= Completions::Flags::Quoted;
- for (auto& c : completions.candidates)
- c = quote(c);
- }
else
kak_assert(false);
@@ -702,7 +697,7 @@ Completions CommandManager::complete(const Context& context,
token.type == Token::Type::RawQuoted))
{
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)