From ea766722a54509799433438002b1f6c0c8b18e41 Mon Sep 17 00:00:00 2001 From: Christopher Pickering Date: Wed, 24 Aug 2022 08:30:30 -0500 Subject: [PATCH] fix(t001): fixed false positive on multiline template tags closes #350 --- src/djlint/rules.yaml | 4 ++-- tests/test_linter/test_linter.py | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/djlint/rules.yaml b/src/djlint/rules.yaml index 42fac5e..1660adf 100644 --- a/src/djlint/rules.yaml +++ b/src/djlint/rules.yaml @@ -18,8 +18,8 @@ # close - '[^(\s|^|\-)]+[}|%|#]}' - '[^(\s|^)]+\-[}|%|#]}' - - \s{2,}[}|%|#]} - - '{[{|%|#]-?\s{2,}' + - '[^\s][ ]{2,}[}|%|#]}' + - '{[{|%|#]-?[ ]{2,}' - rule: name: T002 message: Double quotes should be used in tags. diff --git a/tests/test_linter/test_linter.py b/tests/test_linter/test_linter.py index bab55b9..a22537c 100644 --- a/tests/test_linter/test_linter.py +++ b/tests/test_linter/test_linter.py @@ -50,6 +50,18 @@ def test_T001(runner: CliRunner, tmp_file: TextIO) -> None: result = runner.invoke(djlint, [tmp_file.name, "--profile", "jinja"]) assert result.exit_code == 0 + # test line break around tag + write_to_file( + tmp_file.name, + b"""
+ {% + ("SashaNose", "1"), + %} +
""", + ) + result = runner.invoke(djlint, [tmp_file.name, "--profile", "jinja"]) + assert "T001" not in result.output + def test_T002(runner: CliRunner, tmp_file: TextIO) -> None: write_to_file(tmp_file.name, b"{% extends 'this' %}")