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

CLI2: Fixed bug in ::findCommand

Browse Source 
- If an argument is an exact match for a command ('projects'), it is a command.
- If an argument is not an exact match for command ('project'), but is an exact
  match for an attribute, it is not a command.
- If an argument fails the above tests, but canonicalizes to a command, it is a
  command.
This commit is contained in:
Paul Beckingham
2015-06-22 16:01:01 -04:00
parent 5d98acef29
commit 4b68fea674
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/CLI2.cpp
View File

@@ -807,9 +807,13 @@ bool CLI2::findCommand ()
// task project=foo list // task project=foo list
// ^cmd ^cmd // ^cmd ^cmd
// ^attribute // ^attribute
if (canonicalize (canonical, "cmd", raw) && if (exactMatch ("cmd", raw))
! exactMatch ("attribute", raw)) canonical = raw;
{ else if (exactMatch ("attribute", raw))
continue;
else if (! canonicalize (canonical, "cmd", raw))
continue;
a.attribute ("canonical", canonical); a.attribute ("canonical", canonical);
a.tag ("CMD"); a.tag ("CMD");
@@ -822,7 +826,6 @@ bool CLI2::findCommand ()
// Stop and indicate command found. // Stop and indicate command found.
return true; return true;
} }
}
// Indicate command not found. // Indicate command not found.
return false; return false;