Skip caching calls (Resolves #667)

rinja-rs · Apr 19, 2022 · 393060f · 393060f
1 parent fc779e2
commit 393060f
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/askama_shared/src/generator.rs b/askama_shared/src/generator.rs
@@ -1058,11 +1058,12 @@ impl<'a, S: std::hash::BuildHasher> Generator<'a, S> {
                             expr_buf.buf, self.input.escaper
                         ),
                     };
+                    let is_cacheable = !matches!(s, Expr::Call(..));
 
                     use std::collections::hash_map::Entry;
                     let id = match expr_cache.entry(expression.clone()) {
-                        Entry::Occupied(e) => *e.get(),
-                        Entry::Vacant(e) => {
+                        Entry::Occupied(e) if is_cacheable => *e.get(),
+                        e => {
                             let id = self.named;
                             self.named += 1;
 
@@ -1071,7 +1072,10 @@ impl<'a, S: std::hash::BuildHasher> Generator<'a, S> {
                             buf_expr.write(&expression);
                             buf_expr.writeln(",")?;
 
-                            e.insert(id);
+                            if let Entry::Vacant(e) = e {
+                                e.insert(id);
+                            }
+
                             id
                         }
                     };