Merge pull request #341 from Kijewski/pr-missing-block

derive: fail if requested template block is missing

rinja_derive/src/lib.rs

@@ -284,22 +284,24 @@ fn build_template_item(
 
     let ctx = &contexts[&input.path];
     let heritage = if !ctx.blocks.is_empty() || ctx.extends.is_some() {
-        let heritage = Heritage::new(ctx, &contexts);
-
-        if let Some((block_name, block_span)) = input.block {
-            if !heritage.blocks.contains_key(&block_name) {
-                return Err(CompileError::no_file_info(
-                    format_args!("cannot find block `{block_name}`"),
-                    Some(block_span),
-                ));
-            }
-        }
-
-        Some(heritage)
+        Some(Heritage::new(ctx, &contexts))
     } else {
         None
     };
 
+    if let Some((block_name, block_span)) = input.block {
+        let has_block = match &heritage {
+            Some(heritage) => heritage.blocks.contains_key(block_name),
+            None => ctx.blocks.contains_key(block_name),
+        };
+        if !has_block {
+            return Err(CompileError::no_file_info(
+                format_args!("cannot find block `{block_name}`"),
+                Some(block_span),
+            ));
+        }
+    }
+
     if input.print == Print::Ast || input.print == Print::All {
         eprintln!("{:?}", templates[&input.path].nodes());
     }

testing/templates/no-block-with-base-template.txt

@@ -0,0 +1 @@
+{% extends "no-block-with-include-times-2.txt" %}

testing/templates/no-block-with-include-times-2.txt

@@ -0,0 +1 @@
+{% include "no-block-with-include.txt" %}

testing/templates/no-block-with-include.txt

@@ -0,0 +1 @@
+{% include "no-block.txt" %}

testing/tests/ui/no-block.rs

@@ -0,0 +1,28 @@
+use rinja::Template;
+
+#[derive(Template)]
+#[template(
+    ext = "txt",
+    source = "{% block not_a %}{% endblock %}",
+    block = "a"
+)]
+struct SourceTemplate;
+
+#[derive(Template)]
+#[template(path = "no-block.txt", block = "a")]
+struct PathTemplate;
+
+#[derive(Template)]
+#[template(path = "no-block-with-include.txt", block = "a")]
+struct NoBlockWithInclude;
+
+#[derive(Template)]
+#[template(path = "no-block-with-include-times-2.txt", block = "a")]
+struct NoBlockWithIncludeTimes2;
+
+#[derive(Template)]
+#[template(path = "no-block-with-base-template.txt", block = "a")]
+struct NoBlockWithBaseTemplate;
+
+fn main() {
+}

testing/tests/ui/no-block.stderr

@@ -0,0 +1,29 @@
+error: cannot find block `a`
+ --> tests/ui/no-block.rs:7:13
+  |
+7 |     block = "a"
+  |             ^^^
+
+error: cannot find block `a`
+  --> tests/ui/no-block.rs:12:43
+   |
+12 | #[template(path = "no-block.txt", block = "a")]
+   |                                           ^^^
+
+error: cannot find block `a`
+  --> tests/ui/no-block.rs:16:56
+   |
+16 | #[template(path = "no-block-with-include.txt", block = "a")]
+   |                                                        ^^^
+
+error: cannot find block `a`
+  --> tests/ui/no-block.rs:20:64
+   |
+20 | #[template(path = "no-block-with-include-times-2.txt", block = "a")]
+   |                                                                ^^^
+
+error: cannot find block `a`
+  --> tests/ui/no-block.rs:24:62
+   |
+24 | #[template(path = "no-block-with-base-template.txt", block = "a")]
+   |                                                              ^^^