Fix #1015: Specific mixture of quotes and escaped quotes (e.g. in a json string in an html attribute) breaks the html

djlint/formatter/indent.py

@@ -273,10 +273,7 @@ def fix_handlebars_template_tags(
             func = partial(format_attributes, config, item)
 
             tmp = re.sub(
-                rf"(\s*?)(<(?:{config.indent_html_tags}))\s((?:\"[^\"]*\"|'[^']*'|{{[^}}]*}}|[^'\">{{}}\/])+?)(\s?/?>)",
-                func,
-                tmp,
-                flags=RE_FLAGS_IX,
+                config.indent_html_tags_regex, func, tmp, flags=RE_FLAGS_IX
             )
 
         # turn off raw block if we hit end - for one line raw blocks, but not an inline raw

djlint/settings.py

@@ -727,14 +727,43 @@ def __init__(
         """
         )
 
-        self.html_tag_regex = r"""
+        self.template_tags = r"""
+        {{(?:(?!}}).)*}}|{%(?:(?!%}).)*%}
+        """
+
+        self.html_tag_attribute_regex = rf"""
+            ((?:\s*?(?:
+                \"(?:{self.template_tags}|\\\"|[^\"])*\"
+                |'(?:{self.template_tags}|\\'|[^'])*'
+                |{self.template_tags}
+                |[^'\">{{}}/\s]|/(?!>)
+            ))+)?
+        """
+
+        self.html_tag_regex = rf"""
             (</?(?:!(?!--))?) # an opening bracket (< or </ or <!), but not a comment
             ([^\s>!\[]+\b) # a tag name
-            ((?:\s*?(?:\"[^\"]*\"|'[^']*'|{{(?:(?!}}).)*}}|{%(?:(?!%}).)*%}|[^'\">{}/\s]|/(?!>)))+)? # any attributes
+            {self.html_tag_attribute_regex} # any attributes
             \s*? # potentially some whitespace
             (/?>) # a closing bracket (/> or >)
         """
 
+        self.indent_html_tags_attribute_regex = rf"""
+            \s((?:
+                (?<!\\)\"(?:{self.template_tags}|\\\"|[^\"])*\"
+                |(?<!\\)'(?:{self.template_tags}|\\'|[^'])*'
+                |{self.template_tags}
+                |[^'\">{{}}\/]
+            )+?)
+        """
+
+        self.indent_html_tags_regex: str = rf"""
+            (\s*?)
+            (<(?:{self.indent_html_tags}))
+            {self.indent_html_tags_attribute_regex}
+            (\s*?/?>)
+        """
+
         self.attribute_style_pattern: str = (
             r"^(.*?)(style=)([\"|'])(([^\"']+?;)+?)\3"
         )

tests/test_config/test_max_attribute_length.py

@@ -103,6 +103,18 @@
         ({"max_attribute_length": 3, "custom_html": "[\\w\\-]+"}),
         id="long tag custom_html",
     ),
+    pytest.param(
+        (
+            '<option data-json=\'{ "icon": "<img class=\\"ss\\">" }\' {% if True %}selected{% endif %}>'
+        ),
+        (
+            '<option data-json=\'{ "icon": "<img class=\\"ss\\">" }\'\n'
+            "    {% if True %}selected{% endif %}\n"
+            "    >\n"
+        ),
+        ({"max_attribute_length": 1}),
+        id="with_html_tag_in_attribute_escaped_and_template_tag",
+    ),
 ]