fix(formatter): fixed function formatting with nested quoted parenthesis

closes #698
djlint · Jun 26, 2023 · 6d63a6a · 6d63a6a
1 parent bc15080
commit 6d63a6a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/src/djlint/formatter/indent.py b/src/djlint/formatter/indent.py
@@ -414,7 +414,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_functions.py b/tests/test_nunjucks/test_functions.py
@@ -22,6 +22,12 @@
         ({}),
         id="long line",
     ),
+    pytest.param(
+        ('<span class="nav">{{ _("Orders (Selling)") }}</span>'),
+        ('<span class="nav">{{ _("Orders (Selling)") }}</span>\n'),
+        ({}),
+        id="test quoting",
+    ),
     pytest.param(
         (
             "{{ myfunc({\n"