Merge pull request #171 from GuillaumeGomez/fix-invalid-cond-opt

Fix invalid condition optimization
rinja-rs · Sep 11, 2024 · 548036f · 548036f
2 parents 7ff1629 + d85a3cb
commit 548036f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/rinja_derive/src/generator.rs b/rinja_derive/src/generator.rs
@@ -445,7 +445,10 @@ impl<'a> Generator<'a> {
                         EvaluatedResult::AlwaysTrue,
                         WithSpan::new(Expr::BoolLit(true), ""),
                     ),
-                    EvaluatedResult::Unknown => (EvaluatedResult::Unknown, expr),
+                    EvaluatedResult::Unknown => (
+                        EvaluatedResult::Unknown,
+                        WithSpan::new(Expr::Unary("!", Box::new(expr)), span),
+                    ),
                 }
             }
             Expr::Unary(_, _) => (EvaluatedResult::Unknown, WithSpan::new(expr, span)),

diff --git a/rinja_derive/src/tests.rs b/rinja_derive/src/tests.rs
@@ -393,6 +393,24 @@ match (
         &[("y", "u32")],
         3,
     );
+
+    // Ensure that the `!` is kept .
+    compare(
+        "{% if y is defined && !y %}bla{% endif %}",
+        r#"if *(&(!self.y) as &::core::primitive::bool) {
+    writer.write_str("bla")?;
+}"#,
+        &[("y", "bool")],
+        3,
+    );
+    compare(
+        "{% if y is defined && !(y) %}bla{% endif %}",
+        r#"if *(&(!(self.y)) as &::core::primitive::bool) {
+    writer.write_str("bla")?;
+}"#,
+        &[("y", "bool")],
+        3,
+    );
 }
 
 #[test]