mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: parse repeated condition negations

Browse source
This commit is contained in:
immanuwell 2026-05-08 20:10:22 +04:00 • committed by sxyazi
parent 92b9ea3794
commit f8705f00d3
No known key found for this signature in database
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
yazi-shared/src/condition.rs
View file

@ -72,7 +72,10 @@ impl Condition {
let op = ConditionOp::new(token);
match op {
ConditionOp::Or | ConditionOp::And | ConditionOp::Not => {
while matches!(stack.last(), Some(last) if last.prec() >= op.prec()) {
while matches!(
stack.last(),
Some(last) if last.prec() > op.prec() || (op != ConditionOp::Not && last.prec() == op.prec())
) {
output.push(stack.pop().unwrap());
}
stack.push(op);
@ -129,3 +132,21 @@ impl Condition {
if stack.len() == 1 { Some(stack[0]) } else { None }
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_condition_not() -> anyhow::Result<()> {
let cond: Condition = "!!dir".parse()?;
assert!(cond.eval(|s| s == "dir").unwrap());
assert!(!cond.eval(|_| false).unwrap());
let cond: Condition = "!!!dir".parse()?;
assert!(!cond.eval(|s| s == "dir").unwrap());
assert!(cond.eval(|_| false).unwrap());
Ok(())
}
}