From 614ed6d16ff5aa71d0522bc819cce59a91f7164c Mon Sep 17 00:00:00 2001 From: larros Date: Sun, 1 Oct 2017 18:00:05 +0200 Subject: Fix whitespace handling for macros and imports (#55) Resolves https://github.com/djc/askama/issues/52. * Fix of review comments --- testing/templates/import.html | 6 ++++-- testing/templates/macro.html | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) (limited to 'testing/templates') diff --git a/testing/templates/import.html b/testing/templates/import.html index 87d7969..51ddd2f 100644 --- a/testing/templates/import.html +++ b/testing/templates/import.html @@ -1,2 +1,4 @@ -{% import "macro.html" -%} -{%- call thrice(s) %} + +{%- import "macro.html" -%} + +{% call thrice(s) %} diff --git a/testing/templates/macro.html b/testing/templates/macro.html index d3ab77a..30ea742 100644 --- a/testing/templates/macro.html +++ b/testing/templates/macro.html @@ -1,5 +1,13 @@ -{% macro thrice(param) -%} - {{ param }} {{ param }} {{ param }} -{%- endmacro %} +1 -{%- call thrice(s) %} +{%- macro thrice(param) -%} + +{{ param }} {{ param }} {{ param }} + +{%- endmacro -%} + +2 + +{%- call thrice(s) -%} + +3 -- cgit