From 47df34c0f000429511fda7982e3ef1b4cd2d4569 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Sun, 6 Aug 2017 14:59:19 +0200 Subject: Expand include node to template source during code generation --- askama_derive/src/generator.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'askama_derive/src/generator.rs') diff --git a/askama_derive/src/generator.rs b/askama_derive/src/generator.rs index d5ddd16..e24aaa8 100644 --- a/askama_derive/src/generator.rs +++ b/askama_derive/src/generator.rs @@ -292,8 +292,10 @@ impl<'a> Generator<'a> { self.writeln("}"); } - fn handle_include(&mut self, ws: &WS, src: &str) { + fn handle_include(&mut self, ws: &WS, path: &str) { self.prepare_ws(ws); + let path = path::find_template_from_path(&path, None); + let src = path::get_template_source(&path); let nodes = parser::parse(&src); let mut gen = self.child(); gen.handle(&nodes); @@ -319,8 +321,8 @@ impl<'a> Generator<'a> { Node::BlockDef(ref ws1, name, ref block_nodes, ref ws2) => { self.write_block_def(ws1, name, block_nodes, ws2); } - Node::Include(ref ws, ref src) => { - self.handle_include(ws, src); + Node::Include(ref ws, ref path) => { + self.handle_include(ws, path); }, Node::Extends(_) => { panic!("no extends or block definition allowed in content"); -- cgit