fix(formatter): fixed issue with spaceless macro tags having spacess …

…added before - closes #667
djlint · May 30, 2023 · 5593937 · 5593937
1 parent 9b50021
commit 5593937
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/djlint/formatter/indent.py b/src/djlint/formatter/indent.py
@@ -405,7 +405,7 @@ def format_function(config: Config, html: str, match: re.Match) -> str:
     # format function contents
     beautified_code = re.sub(
         re.compile(
-            r"([ ]*)({{)[ ]*?((?:(?!}}).)*?\w)(\([^\)]*?\)[ ]*)((?:(?!}}).)*?}})",
+            r"([ ]*)({{-?\+?)[ ]*?((?:(?!}}).)*?\w)(\([^\)]*?\)[ ]*)((?:(?!}}).)*?-?\+?}})",
             flags=re.IGNORECASE | re.MULTILINE | re.VERBOSE | re.DOTALL,
         ),
         func,

diff --git a/tests/test_nunjucks/test_set.py b/tests/test_nunjucks/test_set.py
@@ -169,6 +169,12 @@
         ({}),
         id="don't add parenth to lists",
     ),
+    pytest.param(
+        ('{{- foo("bar") -}}'),
+        ('{{- foo("bar") -}}\n'),
+        ({}),
+        id="don't break spaceless tags #667",
+    ),
 ]