GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

TW-1947: "urgency.over" filter seems to not work correct

Browse source 
- Thanks to Marc Richter.
This commit is contained in:
Paul Beckingham 2018-01-24 23:57:44 -05:00
parent c242730b6d
commit 751ae17b22
4 changed files with 35 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/CLI2.cpp
View file

@ -1279,7 +1279,7 @@ void CLI2::desugarFilterAttributes ()
A2 op ("", Lexer::Type::op);
op.tag ("FILTER");
A2 rhs ("", Lexer::Type::string);
A2 rhs ("", values[0]._lextype);
rhs.tag ("FILTER");
// Special case for '<name>:<value>'.
@ -1372,16 +1372,21 @@ void CLI2::desugarFilterAttributes ()
reconstructed.push_back (op);
// Do not modify this construct without full understanding.
if (values.size () == 1 || ! evalSupported)
// Getting this wrong breaks a whole lot of filtering tests.
if (values.size () > 1 || evalSupported)
{
if (Lexer::isDOM (rhs.attribute ("raw")))
rhs._lextype = Lexer::Type::dom;
for (auto& v : values)
reconstructed.push_back (v);
}
else if (Lexer::isDOM (rhs.attribute ("raw")))
{
rhs._lextype = Lexer::Type::dom;
reconstructed.push_back (rhs);
}
else
for (auto& v : values)
reconstructed.push_back (v);
{
reconstructed.push_back (rhs);
}
found = true;
}