gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

CLI2: ::aliasExpansion now expands in both _args and _original_args

Browse Source
This commit is contained in:
Paul Beckingham
2015-06-16 21:39:16 -04:00
parent bb283de1dd
commit 9ea2702696
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/CLI2.cpp
View File

@@ -900,8 +900,7 @@ void CLI2::aliasExpansion ()
raw = i.attribute ("raw"); raw = i.attribute ("raw");
if (_aliases.find (raw) != _aliases.end ()) if (_aliases.find (raw) != _aliases.end ())
{ {
auto lexed = Lexer::split (_aliases[raw]); for (auto& l : Lexer::split (_aliases[raw]))
for (auto& l : lexed)
{ {
A2 a (l, Lexer::Type::word); A2 a (l, Lexer::Type::word);
a.tag ("ALIAS"); a.tag ("ALIAS");
@@ -917,6 +916,23 @@ void CLI2::aliasExpansion ()
} }
_args = reconstructed; _args = reconstructed;
std::vector <std::string> reconstructedOriginals;
for (auto& i : _original_args)
{
if (_aliases.find (i) != _aliases.end ())
{
for (auto& l : Lexer::split (_aliases[i]))
reconstructedOriginals.push_back (l);
action = true;
changes = true;
}
else
reconstructedOriginals.push_back (i);
}
_original_args = reconstructedOriginals;
} }
while (action && counter++ < safetyValveDefault); while (action && counter++ < safetyValveDefault);