From 6a31d0ebc796ef216afb27404a0f900216c4ef2a Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Sat, 23 Jun 2018 12:43:06 +1000 Subject: [PATCH] Fix auto escaping of command argument completion --- src/command_manager.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/command_manager.cc b/src/command_manager.cc index 9209509d..7c6c669d 100644 --- a/src/command_manager.cc +++ b/src/command_manager.cc @@ -676,11 +676,10 @@ Completions CommandManager::complete(const Context& context, context, flags, params, tokens.size() - 2, cursor_pos_in_token), start); - if (not completions.quoted and token.type != Token::Type::RawQuoted) + if (not completions.quoted and token.type == Token::Type::Raw) { - StringView to_escape = token.type == Token::Type::Raw ? "% \t;" : "%"; - for (auto& candidate : completions.candidates) - candidate = escape(candidate, to_escape, '\\'); + for (auto& c : completions.candidates) + c = (not c.empty() and contains("%'\"", c[0]) ? "\\" : "") + escape(c, "; \t", '\\'); } return completions;