fixed #34

docs/conf.py

@@ -12,7 +12,7 @@
 project = "djlint"
 copyright = "2021, Riverside Healthcare"
 author = "Christopher Pickering"
-release = "0.4.7"
+release = "0.4.8"
 version = release
 
 # -- General configuration ---------------------------------------------------

docs/djlint/changelog.rst

@@ -1,13 +1,17 @@
 Changelog
 =========
 
+0.4.8
+-----
+- Fixed bug `#34 <https://github.com/Riverside-Healthcare/djLint/issues/34>`_
+
 0.4.7
 -----
 - Moved ``source`` tag to single line tags
 
 0.4.6
 -----
-- fix bug `#31 <https://github.com/Riverside-Healthcare/djLint/issues/31>`_
+- Fixed bug `#31 <https://github.com/Riverside-Healthcare/djLint/issues/31>`_
 
 0.4.5
 -----

pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name="djlint"
-version="0.4.7"
+version="0.4.8"
 description="HTML Template Linter and Formatter"
 license="GPL-3.0-or-later"
 authors=["Christopher Pickering <cpickering@rhc.net>"]

src/djlint/formatter/expand_html.py

@@ -24,16 +24,12 @@ def _flatten_attributes(match: re.Match) -> str:
 def _should_ignore(config: Config, html: str, match: re.Match) -> bool:
     """Do not add whitespace if the tag is in a non indent block."""
     return any(
-        any(
-            ignored_match.start() < match.start(1)
-            and ignored_match.end() > match.end(1)
-            for ignored_match in re.finditer(
-                block % re.escape(match.group(1)),
-                html,
-                re.DOTALL | re.IGNORECASE | re.VERBOSE,
-            )
+        ignored_match.start() < match.start(1) and ignored_match.end() > match.end(1)
+        for ignored_match in re.finditer(
+            config.ignored_blocks,
+            html,
+            re.DOTALL | re.IGNORECASE | re.VERBOSE,
         )
-        for block in config.ignored_blocks
     )
 
 
@@ -78,6 +74,7 @@ def add_html_line(out_format: str, match: re.Match) -> str:
         add_left,
         html,
     )
+
     # <tag>
     html = re.sub(
         re.compile(fr"(<(?:{html_tags})>)(?=[^\n])", flags=re.IGNORECASE | re.VERBOSE),

src/djlint/settings.py

@@ -400,13 +400,13 @@ def __init__(
         """
         )
 
-        self.ignored_blocks: list = [
-            r"<(script|style|pre|textarea).*?(?:%s).*?</(\1)>",
-            r"<!--.*?(?:%s).*?-->",
-            r"{\*.*?(?:%s).*?\*}",
-            r"{\#.*?(?:%s).*?\#}",
-            r"<\?php.*?(?:%s).*?\?>",
-        ]
+        self.ignored_blocks: str = r"""
+              <(script|style|pre|textarea).*?</(\1)>
+            | <!--.*?-->
+            | {\*.*?\*}
+            | {\#.*?\#}
+            | <\?php.*?\?>
+        """
 
         self.ignored_inline_blocks: str = r"""
               <!--.*?-->

tests/test_html.py

@@ -5,7 +5,7 @@
    pytest tests/test_html.py --cov=src/djlint --cov-branch \
           --cov-report xml:coverage.xml --cov-report term-missing
 
-   pytest tests/test_html.py::test_ignored_attributes --cov=src/djlint --cov-branch \
+   pytest tests/test_html.py::test_ignored_block --cov=src/djlint --cov-branch \
           --cov-report xml:coverage.xml --cov-report term-missing
 
 
@@ -217,3 +217,28 @@ def test_picture_source_img_tags(runner: CliRunner, tmp_file: TextIO) -> None:
 </picture>
 """
     )
+
+
+def test_ignored_block(runner: CliRunner, tmp_file: TextIO) -> None:
+    output = reformat(
+        tmp_file,
+        runner,
+        b"""<!-- <span> -->
+    <div><p><span></span></p></div>
+    <!-- <div> -->
+    """,
+    )
+
+    assert output["exit_code"] == 1
+
+    assert (
+        output["text"]
+        == """<!-- <span> -->
+<div>
+    <p>
+        <span></span>
+    </p>
+</div>
+<!-- <div> -->
+"""
+    )