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

Tweak completion quoting behaviour once again

Browse Source 
Quote by wrapping in quotes if we are replacing the whole token,
using backspaces if the completion only adds to it.

This ensure that the inserted completion will be correctly parsed
once validated.

Fixes #4121
This commit is contained in:
Maxime Coste 2021-03-31 17:15:31 +11:00
parent c507863a00
commit d1e19727ff
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/command_manager.cc
View File

@ -669,16 +669,18 @@ Completions CommandManager::complete(const Context& context,
const auto& token = tokens.back(); const auto& token = tokens.back();
auto requote = [](Completions completions, Token::Type token_type) { auto requote = [](Completions completions, Token::Type token_type) {
if ((completions.flags & Completions::Flags::Quoted) or if (completions.flags & Completions::Flags::Quoted)
completions.start != 0)
return completions; return completions;
if (token_type == Token::Type::Raw) if (token_type == Token::Type::Raw)
{ {
for (auto& c : completions.candidates) const bool at_token_start = completions.start == 0;
for (auto& candidate : completions.candidates)
{ {
if (c.substr(0_byte, 1_byte) == "%" or any_of(c, [](auto i) { return contains("; \t'\"", i); })) const StringView to_escape = ";\n \t";
c = quote(c); if ((at_token_start and candidate.substr(0_byte, 1_byte) == "%") or
any_of(candidate, [&](auto c) { return contains(to_escape, c); }))
candidate = at_token_start ? quote(candidate) : escape(candidate, to_escape, '\\');
} }
} }
else if (token_type == Token::Type::RawQuoted) else if (token_type == Token::Type::RawQuoted)