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

command_manager: only remove last eol in %sh{} expansions

Browse Source 
This makes it possible to keep significant EOL in shell expansions (e.g.
for use with clipboard helpers).
This commit is contained in:
Cole Helbling 2021-01-02 19:45:31 -08:00
parent 958a943121
commit 7cde146807
No known key found for this signature in database
GPG Key ID: B37E0F2371016A4C
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/command_manager.cc
View File

@ -323,14 +323,9 @@ expand_token(const Token& token, const Context& context, const ShellContext& she
content, context, {}, ShellManager::Flags::WaitForStdout, content, context, {}, ShellManager::Flags::WaitForStdout,
shell_context).first; shell_context).first;
int trailing_eol_count = 0; if (str.back() == '\n')
for (auto c : str | reverse()) str.resize(str.length() - 1, 0);
{
if (c != '\n')
break;
++trailing_eol_count;
}
str.resize(str.length() - trailing_eol_count, 0);
return {str}; return {str};
} }
case Token::Type::RegisterExpand: case Token::Type::RegisterExpand: