Refactor and annotate functions in history handling (#1304)

josh-project · Mar 6, 2024 · dd07045 · dd07045
1 parent 5e414ce
commit dd07045
Show file tree

Hide file tree

Showing 2 changed files with 131 additions and 71 deletions.
diff --git a/josh-core/src/filter/mod.rs b/josh-core/src/filter/mod.rs
@@ -833,12 +833,18 @@ pub fn unapply<'a>(
     }
 
     if let Op::Chain(a, b) = to_op(filter) {
-        let i = if let Ok(i) = invert(a) { invert(i)? } else { a };
-        let p = apply(transaction, i, parent_tree.clone())?;
+        // If filter "a" is invertable, use "invert(invert(a))" version of it, otherwise use as is
+        let a_normalized = if let Ok(a_inverted) = invert(a) {
+            invert(a_inverted)?
+        } else {
+            a
+        };
+        let filtered_parent_tree = apply(transaction, a_normalized, parent_tree.clone())?;
+
         return unapply(
             transaction,
             a,
-            unapply(transaction, b, tree, p)?,
+            unapply(transaction, b, tree, filtered_parent_tree)?,
             parent_tree,
         );
     }