Merge pull request #296 from Riverside-Healthcare/dev

bin/index.js

@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 const process = require('process');
 const { PythonShell } = require('python-shell');
 

docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "djlint_docs",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -41,7 +41,7 @@
     "eleventy-plugin-edit-on-github": "1.1.0",
     "eleventy-plugin-metagen": "1.7.1",
     "esbuild": "0.14.38",
-    "eslint": "8.19.0",
+    "eslint": "8.20.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-plugin-import": "2.26.0",
     "fontawesome-subset": "4.0.0",

setup.cfg

@@ -2,7 +2,7 @@
 ignore_missing_imports = True
 
 [flake8]
-ignore = D103, F401, E501, W503, SIM114, D403, RST219, RST299
+ignore = D103, F401, E501, W503, SIM114, D403, RST219, RST299, E999
 per-file-ignores =
     tests/*: S404,S101,E800,S607,N802,T201,S603,B001,E722
-    **/__init__.py: D104
+    **/__init__.py: D104

src/djlint/helpers.py

@@ -12,7 +12,11 @@ def is_ignored_block_opening(config: Config, item: str) -> bool:
     """
     last_index = 0
     inline = list(
-        re.finditer(config.ignored_blocks, item, flags=re.IGNORECASE | re.VERBOSE)
+        re.finditer(
+            config.ignored_blocks,
+            item,
+            flags=re.IGNORECASE | re.VERBOSE | re.MULTILINE | re.DOTALL,
+        )
     )
 
     if inline:
@@ -29,9 +33,9 @@ def is_ignored_block_opening(config: Config, item: str) -> bool:
 
 
 def is_ignored_block_closing(config: Config, item: str) -> bool:
-    """Find ignored group opening.
+    """Find ignored group closing.
 
-    A valid ignored group opening tag will not be part of a
+    A valid ignored group closing tag will not be part of a
     single line block.
     """
     last_index = 0
@@ -64,7 +68,7 @@ def is_safe_closing_tag(config: Config, item: str) -> bool:
         re.finditer(
             re.compile(
                 config.ignored_inline_blocks + r" | " + config.ignored_blocks,
-                flags=re.IGNORECASE | re.VERBOSE,
+                flags=re.IGNORECASE | re.VERBOSE | re.MULTILINE | re.DOTALL,
             ),
             item,
         )
@@ -88,7 +92,8 @@ def inside_ignored_block(config: Config, html: str, match: re.Match) -> bool:
         for ignored_match in list(
             re.finditer(
                 re.compile(
-                    config.ignored_blocks, re.DOTALL | re.IGNORECASE | re.VERBOSE
+                    config.ignored_blocks,
+                    re.DOTALL | re.IGNORECASE | re.VERBOSE | re.MULTILINE | re.DOTALL,
                 ),
                 html,
             )

src/djlint/lint.py

@@ -112,7 +112,6 @@ def lint_file(config: Config, this_file: Path) -> Dict:
                             }
                         )
             else:
-
                 for match in re.finditer(
                     re.compile(
                         pattern, flags=build_flags(rule.get("flags", "re.DOTALL"))

src/djlint/reformat.py

@@ -18,8 +18,11 @@ def reformat_file(config: Config, this_file: Path) -> dict:
     rawcode = this_file.read_text(encoding="utf8")
 
     compressed = compress_html(rawcode, config)
+
     expanded = expand_html(compressed, config)
+
     condensed = condense_html(expanded, config)
+
     indented = indent_html(condensed, config)
 
     beautified_code = indented

src/djlint/rules.yaml

@@ -11,14 +11,15 @@
     - '{%-[^\s]+'
     - '{%[^\s|\-]+'
     # handlebars
-    - '[^{]{#[^\s]+|^{#[^\s]+'
+    - '[^{]{#[^\s-]+|^{#[^\s-]+'
+    - '[^{]{#-[^\s]+|^{#-[^\s]+'
     - '[^{]{\/[^\s]+|^{\/[^\s]+'
     - '[^{]{\@[^\s]+|^{\@[^\s]+'
     # close
     - '[^(\s|^|\-)]+[}|%|#]}'
     - '[^(\s|^)]+\-[}|%|#]}'
     - \s{2,}[}|%|#]}
-    - '{[{|%|#]\s{2,}'
+    - '{[{|%|#]-?\s{2,}'
 - rule:
     name: T002
     message: Double quotes should be used in tags.

src/djlint/settings.py

@@ -341,7 +341,8 @@ def __init__(
             | <\?php
             | <script
             | <!--
-            | [^\{]{\#
+            | [^\{]{\#(?!\s*djlint\:\s*on)
+            | ^{\#(?!\s*djlint\:\s*on)
             | <pre
             | <textarea
             | {%[ ]*?blocktrans(?:late)?[^(?:%})]*?%}
@@ -357,7 +358,7 @@ def __init__(
             | \?>
             | </script
             |  -->
-            # | \#}
+            | ^(?:(?!{\#).)*\#} # lines that have a #}, but not a {#
             | </pre
             | </textarea
             | {\#\s*djlint\:\s*on\s*\#}

tests/test_linter/test_linter.py

@@ -7,7 +7,7 @@
 
    # for a single test
 
-   pytest tests/test_linter/test_linter.py::test_DJ018
+   pytest tests/test_linter/test_linter.py::test_T001
 
 """
 # pylint: disable=C0116,C0103
@@ -41,6 +41,15 @@ def test_T001(runner: CliRunner, tmp_file: TextIO) -> None:
     result = runner.invoke(djlint, [tmp_file.name, "--profile", "nunjucks"])
     assert result.exit_code == 0
 
+    # this test will pass, because the jinja comment is an ignored block
+    write_to_file(tmp_file.name, b"{#-test -#}")
+    result = runner.invoke(djlint, [tmp_file.name, "--profile", "jinja"])
+    assert result.exit_code == 0
+
+    write_to_file(tmp_file.name, b"{#- test -#}")
+    result = runner.invoke(djlint, [tmp_file.name, "--profile", "jinja"])
+    assert result.exit_code == 0
+
 
 def test_T002(runner: CliRunner, tmp_file: TextIO) -> None:
     write_to_file(tmp_file.name, b"{% extends 'this' %}")
@@ -527,6 +536,14 @@ def test_H025(runner: CliRunner, tmp_file: TextIO) -> None:
     result = runner.invoke(djlint, [tmp_file.name])
     assert "H025" not in result.output
 
+    # check closing tag inside a comment
+    write_to_file(
+        tmp_file.name,
+        b'<input {# value="{{ driverId|default(\' asdf \') }}" /> #} value="this">',
+    )
+    result = runner.invoke(djlint, [tmp_file.name])
+    assert "H025" not in result.output
+
 
 def test_H026(runner: CliRunner, tmp_file: TextIO) -> None:
     write_to_file(tmp_file.name, b'<asdf id="" >')

tests/test_twig/test_comments.py

@@ -0,0 +1,49 @@
+"""Djlint tests specific to twig.
+
+run::
+
+   pytest tests/test_twig/test_comments.py --cov=src/djlint --cov-branch \
+          --cov-report xml:coverage.xml --cov-report term-missing
+
+   pytest tests/test_twig/test_comments.py::test_nested --cov=src/djlint --cov-branch \
+          --cov-report xml:coverage.xml --cov-report term-missing
+
+"""
+# pylint: disable=C0116
+
+from typing import TextIO
+
+from click.testing import CliRunner
+
+from tests.conftest import reformat
+
+
+def test_macro(runner: CliRunner, tmp_file: TextIO) -> None:
+    output = reformat(
+        tmp_file,
+        runner,
+        b"""{% if %}
+    {#
+        line
+    #}
+{% endif %}
+""",
+    )
+    assert output.exit_code == 0
+
+    output = reformat(
+        tmp_file,
+        runner,
+        b"""<div>
+    {#
+    multi
+    line
+    comment
+    #}
+</div>
+<div>
+    <p></p>
+</div>
+""",
+    )
+    assert output.exit_code == 0