fix caller logic

Signed-off-by: Michael Pollind <[email protected]>

Author: pollend

askama_derive/src/generator.rs

@@ -87,6 +87,7 @@ struct Generator<'a, 'h> {
     /// Set of called macros we are currently in. Used to prevent (indirect) recursions.
     seen_macros: Vec<(&'a Macro<'a>, Option<FileInfo<'a>>)>,
     /// Set of callers to forward into the macro.
+    seen_callers: Vec<&'a Call<'a>>,
     current_caller: Option<&'a Call<'a>>,
 }
 
@@ -114,6 +115,7 @@ impl<'a, 'h> Generator<'a, 'h> {
             is_in_filter_block,
             seen_macros: Vec::new(),
             current_caller: None,
+            seen_callers: vec![],
         }
     }
 

askama_derive/src/generator/node.rs

@@ -637,6 +637,7 @@ impl<'a> Generator<'a, '_> {
         } else {
             self.seen_macros.push((def, ctx.file_info_of(call.span())));
         }
+        self.seen_callers.push(call);
         self.current_caller = Some(call);
         self.flush_ws(ws1); // Cannot handle_ws() here: whitespace from macro definition comes first
         let size_hint = self.push_locals(|this| {
@@ -760,6 +761,7 @@ impl<'a> Generator<'a, '_> {
             Ok(size_hint)
         })?;
         self.prepare_ws(ws1);
+        self.seen_callers.pop();
         self.seen_macros.pop();
         self.current_caller = None;
         Ok(size_hint)
@@ -1177,7 +1179,7 @@ impl<'a> Generator<'a, '_> {
                     buf.write('}');
                     Ok(size_hint)
                 })?;
-                self.current_caller = Some(def);
+                self.current_caller = self.seen_callers.last().map(|v| &**v);
                 return Ok(size_hint);
             }
         }

testing/tests/macro.rs

@@ -261,22 +261,37 @@ fn test_caller_in_caller() {
     #[template(
         source = r#"
         {%- macro test2() -%}
-            {{~ caller("bb") ~}}
-        {%- endmacro -%}
+            {{ caller("bb") }}
+        {%~ endmacro -%}
         {%- macro test() -%}
-            {{~ caller("a") ~}}
+            {{ caller("a") }}
+            {%~ call(b) test2() -%}
+                five: {{ b }}
+            {%~ endcall -%}
+        {%- endmacro -%}
+        {%- macro test3() -%}
+            {{ caller("cc") }}
         {%- endmacro -%}
+        {%- macro test4() -%}
+            {{ caller("dd") }}
+        {%~ endmacro -%}
         {%- call(a) test() -%}
             {%- call(b) test2() -%}
                 one: {{ b }}
+            {%~ endcall -%}
+            {%- call(b) test3() -%}
+                two: {{ b }}
+                {%- call(b) test4() -%}
+                    three: {{ b }}
+                {%~ endcall -%}
             {%- endcall -%}
-            two: {{- a -}}
-        {%- endcall -%}
+            four: {{ a }}
+        {%~ endcall -%}
         "#,
         ext = "txt"
     )]
     struct CallerInCaller; 
-    assert_eq!(CallerInCaller.render().unwrap(), "one: bbtwo:a");
+    assert_eq!(CallerInCaller.render().unwrap(), "one: bb\n\ntwo: ccthree: dd\n\nfour: a\n\nfive: bb\n\n");
 }