From fd52e8c71c7001dcf08ce30948fcf39ad8665b7b Mon Sep 17 00:00:00 2001
From: Oliver Haas <ohaas@e1plus.de>
Date: Sun, 10 Nov 2024 10:57:24 +0100
Subject: [PATCH 1/5] fix: preline json html thing

---
 djlint/formatter/indent.py                    |  3 +-
 djlint/settings.py                            | 33 +++++++++++++++++--
 .../test_config/test_max_attribute_length.py  | 12 +++++++
 tests/test_html/test_attributes.py            |  6 +---
 4 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/djlint/formatter/indent.py b/djlint/formatter/indent.py
index 130c8a847..218cb518e 100644
--- a/djlint/formatter/indent.py
+++ b/djlint/formatter/indent.py
@@ -260,6 +260,7 @@ def fix_handlebars_template_tags(
         else:
             tmp = item + "\n"
 
+        # TODO(oliverhaas): This block fails in the end
         # if a opening raw tag then start ignoring.. only if there is no closing tag
         # on the same line
         if is_ignored_block_opening_:
@@ -273,7 +274,7 @@ def fix_handlebars_template_tags(
             func = partial(format_attributes, config, item)
 
             tmp = re.sub(
-                rf"(\s*?)(<(?:{config.indent_html_tags}))\s((?:\"[^\"]*\"|'[^']*'|{{[^}}]*}}|[^'\">{{}}\/])+?)(\s?/?>)",
+                config.indent_html_tags_regex,
                 func,
                 tmp,
                 flags=RE_FLAGS_IX,
diff --git a/djlint/settings.py b/djlint/settings.py
index e81be3605..503f051f2 100644
--- a/djlint/settings.py
+++ b/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"
         )
diff --git a/tests/test_config/test_max_attribute_length.py b/tests/test_config/test_max_attribute_length.py
index 041870c65..d66634991 100644
--- a/tests/test_config/test_max_attribute_length.py
+++ b/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",
+    ),
 ]
 
 
diff --git a/tests/test_html/test_attributes.py b/tests/test_html/test_attributes.py
index d5817f2e7..9943a60e1 100644
--- a/tests/test_html/test_attributes.py
+++ b/tests/test_html/test_attributes.py
@@ -5,16 +5,12 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 import pytest
 
 from djlint.reformat import formatter
+from djlint.settings import Config
 from tests.conftest import printer
 
-if TYPE_CHECKING:
-    from djlint.settings import Config
-
 test_data = [
     pytest.param(
         (

From 1bda6ed0862b42264621ae4b78e12ecd22d9df1f Mon Sep 17 00:00:00 2001
From: Oliver Haas <ohaas@e1plus.de>
Date: Sun, 10 Nov 2024 11:22:25 +0100
Subject: [PATCH 2/5] fix: missing } in test

---
 tests/test_config/test_max_attribute_length.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_config/test_max_attribute_length.py b/tests/test_config/test_max_attribute_length.py
index d66634991..8e4ab0b8e 100644
--- a/tests/test_config/test_max_attribute_length.py
+++ b/tests/test_config/test_max_attribute_length.py
@@ -105,10 +105,10 @@
     ),
     pytest.param(
         (
-            "<option data-json='{ \"icon\": \"<img class=\\\"ss\\\">\"' {% if True %}selected{% endif %}>"
+            "<option data-json='{ \"icon\": \"<img class=\\\"ss\\\">\" }' {% if True %}selected{% endif %}>"
         ),
         (
-            "<option data-json='{ \"icon\": \"<img class=\\\"ss\\\">\"'\n"
+            "<option data-json='{ \"icon\": \"<img class=\\\"ss\\\">\" }'\n"
             "    {% if True %}selected{% endif %}\n"
             "    >\n"
         ),

From bb53fc02eb6e7ac80a199712973bcdd4447f20cc Mon Sep 17 00:00:00 2001
From: Oliver Haas <ohaas@e1plus.de>
Date: Sun, 10 Nov 2024 11:23:19 +0100
Subject: [PATCH 3/5] chore: remove comment

---
 djlint/formatter/indent.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/djlint/formatter/indent.py b/djlint/formatter/indent.py
index 218cb518e..d76123f12 100644
--- a/djlint/formatter/indent.py
+++ b/djlint/formatter/indent.py
@@ -260,7 +260,6 @@ def fix_handlebars_template_tags(
         else:
             tmp = item + "\n"
 
-        # TODO(oliverhaas): This block fails in the end
         # if a opening raw tag then start ignoring.. only if there is no closing tag
         # on the same line
         if is_ignored_block_opening_:

From 54a7b3181ba4ca64dffbed209accdf10ae5e11cc Mon Sep 17 00:00:00 2001
From: Oliver Haas <ohaas@e1plus.de>
Date: Sun, 10 Nov 2024 11:24:03 +0100
Subject: [PATCH 4/5] revert: unnecessary changes

---
 tests/test_html/test_attributes.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/test_html/test_attributes.py b/tests/test_html/test_attributes.py
index 9943a60e1..d5817f2e7 100644
--- a/tests/test_html/test_attributes.py
+++ b/tests/test_html/test_attributes.py
@@ -5,12 +5,16 @@
 
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 import pytest
 
 from djlint.reformat import formatter
-from djlint.settings import Config
 from tests.conftest import printer
 
+if TYPE_CHECKING:
+    from djlint.settings import Config
+
 test_data = [
     pytest.param(
         (

From 05b3be8b8fc08dd9f78039e80343899e1ae969ab Mon Sep 17 00:00:00 2001
From: Oliver Haas <ohaas@e1plus.de>
Date: Sun, 10 Nov 2024 14:51:14 +0100
Subject: [PATCH 5/5] chore: ruff

---
 djlint/formatter/indent.py                     | 5 +----
 tests/test_config/test_max_attribute_length.py | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/djlint/formatter/indent.py b/djlint/formatter/indent.py
index d76123f12..20ee9a5fc 100644
--- a/djlint/formatter/indent.py
+++ b/djlint/formatter/indent.py
@@ -273,10 +273,7 @@ def fix_handlebars_template_tags(
             func = partial(format_attributes, config, item)
 
             tmp = re.sub(
-                config.indent_html_tags_regex,
-                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
diff --git a/tests/test_config/test_max_attribute_length.py b/tests/test_config/test_max_attribute_length.py
index 8e4ab0b8e..fde52d0ba 100644
--- a/tests/test_config/test_max_attribute_length.py
+++ b/tests/test_config/test_max_attribute_length.py
@@ -105,10 +105,10 @@
     ),
     pytest.param(
         (
-            "<option data-json='{ \"icon\": \"<img class=\\\"ss\\\">\" }' {% if True %}selected{% endif %}>"
+            '<option data-json=\'{ "icon": "<img class=\\"ss\\">" }\' {% if True %}selected{% endif %}>'
         ),
         (
-            "<option data-json='{ \"icon\": \"<img class=\\\"ss\\\">\" }'\n"
+            '<option data-json=\'{ "icon": "<img class=\\"ss\\">" }\'\n'
             "    {% if True %}selected{% endif %}\n"
             "    >\n"
         ),