From 69ef16afa8293b1e6836c1eefb796e366deabdfd Mon Sep 17 00:00:00 2001
From: Christopher Pickering <christopher.pickering@keemail.me>
Date: Mon, 1 Aug 2022 07:32:20 -0500
Subject: [PATCH] fix(linter): disabling linter rules should not disable
 formatting

closes #316
---
 src/djlint/settings.py                        |  4 ++--
 tests/test_config/test_ignores/html_two.html  |  7 ++++++
 tests/test_config/test_ignores/test_config.py | 24 ++++++++++++++++---
 3 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 tests/test_config/test_ignores/html_two.html

diff --git a/src/djlint/settings.py b/src/djlint/settings.py
index 1f08069..eb29fdc 100644
--- a/src/djlint/settings.py
+++ b/src/djlint/settings.py
@@ -355,8 +355,8 @@ class Config:
             | <\?php
             | <script
             | <!--
-            | [^\{]{\#(?!\s*djlint\:\s*on)
-            | ^{\#(?!\s*djlint\:\s*on)
+            | [^\{]{\#(?!\s*djlint\:\s*(?:on|off))
+            | ^{\#(?!\s*djlint\:\s*(?:on|off))
             | <pre
             | <textarea
             | {%[ ]*?blocktrans(?:late)?[^(?:%})]*?%}
diff --git a/tests/test_config/test_ignores/html_two.html b/tests/test_config/test_ignores/html_two.html
new file mode 100644
index 0000000..df53617
--- /dev/null
+++ b/tests/test_config/test_ignores/html_two.html
@@ -0,0 +1,7 @@
+{# djlint:off H021 #}
+<div>
+<div>
+{{ test }}
+</div>
+</div>
+{# djlint:on #}
diff --git a/tests/test_config/test_ignores/test_config.py b/tests/test_config/test_ignores/test_config.py
index 6bfe971..0bc8bac 100644
--- a/tests/test_config/test_ignores/test_config.py
+++ b/tests/test_config/test_ignores/test_config.py
@@ -2,12 +2,12 @@
 
 run::
 
-   pytest tests/test_config.py --cov=src/djlint --cov-branch \
+   pytest tests/test_config/test_ignores/test_config.py --cov=src/djlint --cov-branch \
           --cov-report xml:coverage.xml --cov-report term-missing
 
 for a single test, run::
 
-   pytest tests/test_config.py::test_custom_html --cov=src/djlint \
+   pytest tests/test_config/test_ignores/test_config.py::test_custom_html --cov=src/djlint \
      --cov-branch --cov-report xml:coverage.xml --cov-report term-missing
 
 """
@@ -20,6 +20,24 @@ from src.djlint import main as djlint
 
 
 def test_ignores(runner: CliRunner) -> None:
-    result = runner.invoke(djlint, ["tests/test_config/test_ignores"])
+    result = runner.invoke(djlint, ["tests/test_config/test_ignores/html.html"])
     assert """Linted 1 file, found 0 errors.""" in result.output
     assert result.exit_code == 0
+
+
+def test_ignored_rule_does_not_disable_formatting(runner: CliRunner) -> None:
+    result = runner.invoke(
+        djlint, ["tests/test_config/test_ignores/html_two.html", "--check"]
+    )
+    print(result.output)
+    assert (
+        """ {# djlint:off H021 #}
+ <div>
+-<div>
+-{{ test }}
+-</div>
++    <div>{{ test }}</div>
+ </div>
+ {# djlint:on #}"""
+        in result.output
+    )