fix(ignored code): fixed formatting of ignore code inside django comm…

…ent blocks closes #569
djlint · Apr 4, 2023 · 120460d · 120460d
1 parent fb8bf5e
commit 120460d
Show file tree

Hide file tree

Showing 8 changed files with 397 additions and 378 deletions.
diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/docs/package.json b/docs/package.json
@@ -19,7 +19,7 @@
     "@fontsource/crimson-pro": "^4.5.11",
     "@fontsource/rasa": "^4.5.14",
     "@quasibit/eleventy-plugin-schema": "^1.11.0",
-    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@rollup/plugin-node-resolve": "^15.0.2",
     "@sindresorhus/slugify": "^2.2.0",
     "animate-sass": "^0.8.2",
     "animate.css": "github:animate-css/animate.css",
@@ -37,15 +37,15 @@
     "@fortawesome/fontawesome-free": "^6.4.0",
     "@fullhuman/postcss-purgecss": "5.0.0",
     "@toycode/markdown-it-class": "1.2.4",
-    "algoliasearch": "^4.16.0",
+    "algoliasearch": "^4.17.0",
     "autoprefixer": "^10.4.14",
     "bulma": "0.9.4",
     "bulma-pricingtable": "0.2.0",
     "cssnano": "^6.0.0",
     "cz-conventional-changelog": "3.3.0",
     "eleventy-plugin-edit-on-github": "1.1.0",
     "eleventy-plugin-metagen": "1.7.11",
-    "esbuild": "^0.17.14",
+    "esbuild": "^0.17.15",
     "eslint": "^8.36.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-plugin-import": "2.27.5",

diff --git a/docs/src/_data/i18n/index.js b/docs/src/_data/i18n/index.js
@@ -151,4 +151,9 @@ module.exports = {
     fr: 'djLint a été créé à l\'origine pour être utilisé dans les projets <a href="https://atlas.bi" target="_blank">Atlas</a> par l\'équipe <a href="https://github.com/riverside-Healthcare/" target="_blank">Riverside Healthcare Analytics</a>.',
     ru: 'Изначально djLint был создан для использования в проектах <a href="https://atlas.bi" target="_blank">Atlas</a> командой <a href="https://github.com/riverside-Healthcare/" target="_blank">Riverside Healthcare Analytics</a>.',
   },
+  site_analytics: {
+    'en-US': 'Site Analytics',
+    fr: 'Site Analytics',
+    ru: 'Аналитика сайта',
+  },
 };
diff --git a/docs/src/_includes/foot.njk b/docs/src/_includes/foot.njk
@@ -17,6 +17,9 @@
                 <p class="has-text-grey-dark has-text-right mt-2">
                     <small>{{ "footer_credits" | i18n | safe }}</small>
                 </p>
+                <p class="has-text-right pt-3">
+                  <a href="https://analytics.djlint.com/share/fdd3vGz2/djlint.com" target="_blank"><small>{{ "site_analytics" | i18n }}</small></a>
+                </p>
             </div>
         </div>
     </div>

diff --git a/src/djlint/formatter/compress.py b/src/djlint/formatter/compress.py
@@ -5,6 +5,7 @@
 
 import regex as re
 
+from ..helpers import child_of_ignored_block
 from ..settings import Config
 
 
@@ -18,8 +19,12 @@ def _flatten_attributes(match: re.Match) -> str:
         Attribute name can be in group one or group 2.
         for now, skipping if they are anywhere
 
-        even ignored blocks attributes can be formatted.
+        tags starting ignored blocks can have their attributes formatted,
+        for example <textarea class="..." id="..."> can be formatted.
         """
+        if child_of_ignored_block(config, html, match):
+            return match.group()
+
         # pylint: disable=C0209
         return "{} {}{}".format(
             match.group(1),

diff --git a/src/djlint/reformat.py b/src/djlint/reformat.py
@@ -26,8 +26,9 @@ def reformat_file(config: Config, this_file: Path) -> dict:
 
     condensed = clean_whitespace(expanded, config)
 
-    beautified_code = indent_html(condensed, config)
-    beautified_code = condense_html(beautified_code, config)
+    indented_code = indent_html(condensed, config)
+
+    beautified_code = condense_html(indented_code, config)
 
     if config.format_css:
         beautified_code = format_css(beautified_code, config)

diff --git a/src/djlint/settings.py b/src/djlint/settings.py
@@ -405,7 +405,7 @@ def __init__(
             | </pre
             | </textarea
             | {\#\s*djlint\:\s*on\s*\#}
-            | {%[ ]+?endcomment[ ]+?%}
+            | (?<!djlint:off\s*?){%[ ]+?endcomment[ ]+?%}
             | {{!--\s*djlint\:on\s*--}}
             | {{-?\s*/\*\s*djlint\:on\s*\*/\s*-?}}
             | {%[ ]*?endblocktrans(?:late)?[^(?:%})]*?%}
@@ -646,7 +646,7 @@ def __init__(
             | <\?php.*?\?>
             | {%[ ]*?blocktranslate\b[^(?:%})]*?%}.*?{%[ ]*?endblocktranslate[ ]*?%}
             | {%[ ]*?blocktrans\b[^(?:%})]*?%}.*?{%[ ]*?endblocktrans[ ]*?%}
-            | {%[ ]*?comment\b[^(?:%})]*?%}.*?(?={%[ ]*?endcomment[ ]*?%})
+            | {%[ ]*?comment\b[^(?:%})]*?%}(?:(?!djlint:(?:off|on)).)*?(?={%[ ]*?endcomment[ ]*?%})
             | ^---[\s\S]+?---
         """
 
@@ -669,7 +669,7 @@ def __init__(
             | {\*.*?\*}
             | {\#(?!.*djlint:[ ]*?(?:off|on)\b).*\#}
             | <\?php.*?\?>
-            | {%[ ]*?comment\b[^(?:%})]*?%}.*?{%[ ]*?endcomment[ ]*?%}
+            | {%[ ]*?comment\b[^(?:%})]*?%}(?:(?!djlint:(?:off|on)).)*?{%[ ]*?endcomment[ ]*?%}
             | {%[ ]*?blocktranslate\b[^(?:%})]*?%}.*?{%[ ]*?endblocktranslate[ ]*?%}
             | {%[ ]*?blocktrans\b[^(?:%})]*?%}.*?{%[ ]*?endblocktrans[ ]*?%}
         """

diff --git a/tests/test_config/test_ignores/html_two.html b/tests/test_config/test_ignores/html_two.html
@@ -5,3 +5,8 @@
 </div>
 </div>
 {# djlint:on #}
+
+{% comment %} djlint:a {% endcomment %}
+        <a class="a"
+           href="b">變更密碼</a>
+{% comment %} djlint:on {% endcomment %}