Support for fully included templates

src/renderer/processor.rs

@@ -99,6 +99,8 @@ pub struct Processor<'a> {
     template_root: &'a Template,
     /// The Tera object with template details
     tera: &'a Tera,
+    /// Context of the processor, to share with included processors
+    context: &'a Value,
     /// The call stack for processing
     call_stack: CallStack<'a>,
     /// The macros organised by template and namespaces
@@ -134,6 +136,7 @@ impl<'a> Processor<'a> {
             template_root,
             tera,
             call_stack,
+            context,
             macros: MacroCollection::from_original_template(&template, &tera),
             should_escape,
             blocks: Vec::new(),
@@ -765,10 +768,15 @@ impl<'a> Processor<'a> {
             Node::Super => buffer.push_str(&self.do_super()?),
             Node::Include(_, ref tpl_name) => {
                 let template = self.tera.get_template(tpl_name)?;
-                self.macros.add_macros_from_template(&self.tera, template)?;
-                self.call_stack.push_include_frame(tpl_name, template);
-                let result = self.render_body(&template.ast)?;
-                self.call_stack.pop();
+                let result = {
+                    let mut processor = Processor::new(
+                        template,
+                        self.tera,
+                        &self.context,
+                        self.should_escape
+                    );
+                    processor.render()?
+                };
                 buffer.push_str(&result);
             }
             _ => unreachable!("render_node -> unexpected node: {:?}", node),

src/renderer/tests/inheritance.rs

@@ -148,3 +148,17 @@ fn render_super_in_grandchild_without_redefining_in_parent_works() {
     let result = tera.render("child", &Context::new());
     assert_eq!(result.unwrap(), "Title - More".to_string());
 }
+
+#[test]
+fn render_inheritance_in_included_template() {
+    let mut tera = Tera::default();
+    tera.add_raw_templates(vec![
+        ("base", "Base - {% include \"child\" %}"),
+        ("parent", "{% block title %}Parent{% endblock %}"),
+        ("child", "{% extends \"parent\" %}{% block title %}{{ super() }} - Child{% endblock %}"),
+    ])
+    .unwrap();
+
+    let result = tera.render("base", &Context::new());
+    assert_eq!(result.unwrap(), "Base - Parent - Child".to_string());
+}