djlint 1.30.0 → 1.30.2

package/tests/test_django/test_blocktrans_trimmed.py

@@ -1,283 +0,0 @@
-"""Test django blocktrans(late) tag.
-
-poetry run pytest tests/test_django/test_blocktrans_trimmed.py
-
-blocktrans/late contents cannot be touched.
-
-leading tag can be indented, but not trailing tag.
-
----
-
-blocktrans/late "trimmed" can be fully formatted.
-
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import config_builder, printer
-
-test_data = [
-    pytest.param(
-        (
-            "{% blocktranslate trimmed %} The width is: {{ width }}{% endblocktranslate %}"
-        ),
-        (
-            "{% blocktranslate trimmed %}\n"
-            "    The width is: {{ width }}\n"
-            "{% endblocktranslate %}\n"
-        ),
-        ({"max_line_length": 10}),
-        id="blocktranslate_no_attr",
-    ),
-    pytest.param(
-        (
-            "{% blocktranslate trimmed %}The width is: {{ width }} {% endblocktranslate %}"
-        ),
-        (
-            "{% blocktranslate trimmed %}\n"
-            "    The width is: {{ width }}\n"
-            "{% endblocktranslate %}\n"
-        ),
-        ({"max_line_length": 10}),
-        id="blocktranslate_with_attr",
-    ),
-    pytest.param(
-        ("{% blocktrans trimmed %} The width is: {{ width }}{% endblocktrans %}"),
-        (
-            "{% blocktrans trimmed %}\n"
-            "    The width is: {{ width }}\n"
-            "{% endblocktrans %}\n"
-        ),
-        ({"max_line_length": 10}),
-        id="blocktrans_no_attr",
-    ),
-    pytest.param(
-        (
-            "{% blocktranslate trimmed %}The width is: {{ width }} {% endblocktranslate %}"
-        ),
-        (
-            "{% blocktranslate trimmed %}\n"
-            "    The width is: {{ width }}\n"
-            "{% endblocktranslate %}\n"
-        ),
-        ({"max_line_length": 10}),
-        id="blocktranslage",
-    ),
-    pytest.param(
-        (
-            "<p>\n"
-            "    {% blocktrans trimmed%}If you have not created an account yet, then please\n"
-            '    <a href="{{ signup_url }}">sign up</a> first.{% endblocktrans %}\n'
-            "</p>\n"
-            "<p>\n"
-            "    {% blocktrans trimmed%}   If you have not created an account yet, then please\n"
-            '    <a href="{{ signup_url }}">sign up</a> first.   {% endblocktrans %}\n'
-            "</p>\n"
-        ),
-        (
-            "<p>\n"
-            "    {% blocktrans trimmed %}\n"
-            "        If you have not created an account yet, then please\n"
-            '        <a href="{{ signup_url }}">sign up</a> first.\n'
-            "    {% endblocktrans %}\n"
-            "</p>\n"
-            "<p>\n"
-            "    {% blocktrans trimmed %}\n"
-            "        If you have not created an account yet, then please\n"
-            '        <a href="{{ signup_url }}">sign up</a> first.\n'
-            "    {% endblocktrans %}\n"
-            "</p>\n"
-        ),
-        ({"max_line_length": 10}),
-        id="blocktrans_with_nested_tags",
-    ),
-    pytest.param(
-        (
-            "<div>\n"
-            '     {% translate "View all" %}\n'
-            "    <br />\n"
-            "     ({% blocktranslate count counter=images|length trimmed %}\n"
-            "            {{ counter }} photo\n"
-            "            {% plural %}\n"
-            "            {{ counter }} photos\n"
-            "{% endblocktranslate %})\n"
-            "     ({% blocktrans count counter=images|length trimmed %}\n"
-            "            {{ counter }} photo\n"
-            "            {% plural %}\n"
-            "            {{ counter }} photos\n"
-            " {% endblocktrans %})\n"
-            "</div>\n"
-        ),
-        (
-            "<div>\n"
-            '    {% translate "View all" %}\n'
-            "    <br />\n"
-            "    (\n"
-            "    {% blocktranslate count counter=images|length trimmed %}\n"
-            "        {{ counter }} photo\n"
-            "    {% plural %}\n"
-            "        {{ counter }} photos\n"
-            "    {% endblocktranslate %}\n"
-            "    )\n"
-            "    (\n"
-            "    {% blocktrans count counter=images|length trimmed %}\n"
-            "        {{ counter }} photo\n"
-            "    {% plural %}\n"
-            "        {{ counter }} photos\n"
-            "    {% endblocktrans %}\n"
-            "    )\n"
-            "</div>\n"
-        ),
-        ({"max_line_length": 10}),
-        id="blocktrans_indent",
-    ),
-    pytest.param(
-        (
-            "<div>\n"
-            '    {% translate "View all" %}\n'
-            "    <br />\n"
-            "   ({% blocktranslate count counter=images|length trimmed %}\n"
-            "            {{ counter }} photo\n"
-            "            {% plural %}\n"
-            "asdf\n"
-            "            {{ counter }} photos\n"
-            "     {% endblocktranslate %})\n"
-            "     ({% blocktrans count counter=images|length trimmed %}\n"
-            "            {{ counter }} photo\n"
-            "           {% plural %}\n"
-            "            {{ counter }} photos\n"
-            "     {% endblocktrans %})\n"
-            "</div>\n"
-        ),
-        (
-            "<div>\n"
-            '    {% translate "View all" %}\n'
-            "    <br />\n"
-            "    (\n"
-            "    {% blocktranslate count counter=images|length trimmed %}\n"
-            "        {{ counter }} photo\n"
-            "    {% plural %}\n"
-            "        asdf\n"
-            "        {{ counter }} photos\n"
-            "    {% endblocktranslate %}\n"
-            "    )\n"
-            "    (\n"
-            "    {% blocktrans count counter=images|length trimmed %}\n"
-            "        {{ counter }} photo\n"
-            "    {% plural %}\n"
-            "        {{ counter }} photos\n"
-            "    {% endblocktrans %}\n"
-            "    )\n"
-            "</div>\n"
-        ),
-        ({"max_line_length": 10}),
-        id="blocktrans_indent_2",
-    ),
-    pytest.param(
-        (
-            "<tr>\n"
-            "    {% if status.stage.value == 0 %}\n"
-            "        {% blocktranslate with obj=status.scanned_objects trimmed%}{{ obj }} objects scanned{% endblocktranslate %}\n"
-            "          {% elif status.stage.value == 2 %}\n"
-            "        {% blocktranslate with obj=status.scanned_objects %}        {{ obj }} objects scanned {% endblocktranslate %}\n"
-            "    {% endif %}\n"
-            "</tr>\n"
-        ),
-        (
-            "<tr>\n"
-            "    {% if status.stage.value == 0 %}\n"
-            "        {% blocktranslate with obj=status.scanned_objects trimmed %}\n"
-            "            {{ obj }} objects scanned\n"
-            "        {% endblocktranslate %}\n"
-            "    {% elif status.stage.value == 2 %}\n"
-            "        {% blocktranslate with obj=status.scanned_objects %}        {{ obj }} objects scanned {% endblocktranslate %}\n"
-            "    {% endif %}\n"
-            "</tr>\n"
-        ),
-        ({"max_line_length": 10}),
-        id="blocktrans_indent_if",
-    ),
-    pytest.param(
-        (
-            "<tr>\n"
-            "    {% if status.stage.value == 0 %}\n"
-            "        {% blocktranslate trimmed with obj=status.scanned_objects %}{{ obj }} objects scanned {% endblocktranslate %}\n"
-            "          {% elif status.stage.value == 2 %}\n"
-            "        {% blocktranslate with obj=status.scanned_objects %} {{ obj }} objects scanned{% endblocktranslate %}\n"
-            "    {% endif %}\n"
-            "</tr>\n"
-        ),
-        (
-            "<tr>\n"
-            "    {% if status.stage.value == 0 %}\n"
-            "        {% blocktranslate trimmed with obj=status.scanned_objects %}\n"
-            "            {{ obj }} objects scanned\n"
-            "        {% endblocktranslate %}\n"
-            "    {% elif status.stage.value == 2 %}\n"
-            "        {% blocktranslate with obj=status.scanned_objects %} {{ obj }} objects scanned{% endblocktranslate %}\n"
-            "    {% endif %}\n"
-            "</tr>\n"
-        ),
-        ({"max_line_length": 10}),
-        id="blocktrans_indent_if_2",
-    ),
-    pytest.param(
-        (
-            "{% autoescape off %}\n"
-            "\n"
-            "  {% blocktrans trimmed %}\n"
-            "  You're receiving this email because you requested a password reset for your user account at {{ site_name }}.\n"
-            "  {% endblocktrans %}\n"
-        ),
-        (
-            "{% autoescape off %}\n"
-            "    {% blocktrans trimmed %}\n"
-            "        You're receiving this email because you requested a password reset for your user account at {{ site_name }}.\n"
-            "    {% endblocktrans %}\n"
-        ),
-        ({"max_line_length": 10}),
-        id="blocktrans_autoescape",
-    ),
-    pytest.param(
-        (
-            "{% autoescape off %}\n"
-            "    {% blocktrans trimmed %}\n"
-            "  You're receiving this email because you requested a password reset for your user account at {{ site_name }}.\n"
-            "      {% endblocktrans %}\n"
-        ),
-        (
-            "{% autoescape off %}\n"
-            "    {% blocktrans trimmed %}\n"
-            "        You're receiving this email because you requested a password reset for your user account at {{ site_name }}.\n"
-            "    {% endblocktrans %}\n"
-        ),
-        ({"max_line_length": 10}),
-        id="blocktrans_autoescape_two",
-    ),
-    pytest.param(
-        (
-            "{% blocktranslate count counter=list|length trimmed  %}\n"
-            "There is only one {{ name }} object.\n"
-            "  {% plural %}   There are {{ counter }} {{ name }} objects.\n"
-            "{% endblocktranslate %}\n"
-        ),
-        (
-            "{% blocktranslate count counter=list|length trimmed %}\n"
-            "    There is only one {{ name }} object.\n"
-            "{% plural %}\n"
-            "    There are {{ counter }} {{ name }} objects.\n"
-            "{% endblocktranslate %}\n"
-        ),
-        ({}),
-        id="plural formatted",
-    ),
-]
-
-
-@pytest.mark.parametrize(("source", "expected", "args"), test_data)
-def test_base(source, expected, args):
-    args["profile"] = "django"
-    output = formatter(config_builder(args), source)
-
-    printer(expected, source, output)
-    assert expected == output

package/tests/test_django/test_comments.py

@@ -1,164 +0,0 @@
-"""Test django comment tag.
-
-poetry run pytest tests/test_django/test_comments.py
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import printer
-
-test_data = [
-    pytest.param(
-        ("{# comment #}{% if this %}<div></div>{% endif %}"),
-        ("{# comment #}\n" "{% if this %}<div></div>{% endif %}\n"),
-        id="dj_comments_tag",
-    ),
-    pytest.param(
-        ('{% comment "Optional note" %}{{ body }}{% endcomment %}'),
-        ('{% comment "Optional note" %}{{ body }}{% endcomment %}\n'),
-        id="multi_line",
-    ),
-    pytest.param(
-        (
-            '<div class="hi">\n'
-            '    <div class="poor">\n'
-            '        <p class="format">\n'
-            "            Lorem ipsum dolor\n"
-            '            <span class="bold">sit</span>\n'
-            "            amet\n"
-            "        </p>\n"
-            '        <img src="./pic.jpg">\n'
-            "    </div>\n"
-            '    <script src="file1.js"></script>\n'
-            '    {% comment %} <script src="file2.js"></script>\n'
-            '    <script src="file3.js"></script> {% endcomment %}\n'
-            '    <script src="file4.js"></script>\n'
-            "</div>"
-        ),
-        (
-            '<div class="hi">\n'
-            '    <div class="poor">\n'
-            '        <p class="format">\n'
-            "            Lorem ipsum dolor\n"
-            '            <span class="bold">sit</span>\n'
-            "            amet\n"
-            "        </p>\n"
-            '        <img src="./pic.jpg">\n'
-            "    </div>\n"
-            '    <script src="file1.js"></script>\n'
-            '    {% comment %} <script src="file2.js"></script>\n'
-            '    <script src="file3.js"></script> {% endcomment %}\n'
-            '    <script src="file4.js"></script>\n'
-            "</div>\n"
-        ),
-        id="nested_multi_line",
-    ),
-    pytest.param(
-        (
-            '<div class="hi">\n'
-            '    <div class="poor">\n'
-            "        {# djlint:off #}\n"
-            '        <p class="format">\n'
-            '            Lorem ipsum dolor <span class="bold">sit</span> amet\n'
-            "        </p>\n"
-            "        {# djlint:on #}\n"
-            '        <img src="./pic.jpg">\n'
-            "    </div>\n"
-            "    <ul>\n"
-            "        {% for i in items %}\n"
-            "            <li>item {{i}}</li>\n"
-            "            {% if i > 10 %}{% endif %}\n"
-            "            <li>item {{i}}</li>\n"
-            "        {% endfor %}\n"
-            "    </ul>\n"
-            "</div>"
-        ),
-        (
-            '<div class="hi">\n'
-            '    <div class="poor">\n'
-            "        {# djlint:off #}\n"
-            '        <p class="format">\n'
-            '            Lorem ipsum dolor <span class="bold">sit</span> amet\n'
-            "        </p>\n"
-            "        {# djlint:on #}\n"
-            '        <img src="./pic.jpg">\n'
-            "    </div>\n"
-            "    <ul>\n"
-            "        {% for i in items %}\n"
-            "            <li>item {{ i }}</li>\n"
-            "            {% if i > 10 %}{% endif %}\n"
-            "            <li>item {{ i }}</li>\n"
-            "        {% endfor %}\n"
-            "    </ul>\n"
-            "</div>\n"
-        ),
-        id="djlint_comment",
-    ),
-    pytest.param(
-        (
-            "<html>\n"
-            "    <head>\n"
-            '        <script src="file1.js"></script>\n'
-            "        {% comment %}\n"
-            '        <script src="file2.js"></script>\n'
-            '        <script src="file3.js"></script>\n'
-            '        <script src="file4.js"></script>\n'
-            "        {% endcomment %}\n"
-            '        <script src="file5.js"></script>\n'
-            "    </head>\n"
-            "    <body></body>\n"
-            "</html>"
-        ),
-        (
-            "<html>\n"
-            "    <head>\n"
-            '        <script src="file1.js"></script>\n'
-            "        {% comment %}\n"
-            '        <script src="file2.js"></script>\n'
-            '        <script src="file3.js"></script>\n'
-            '        <script src="file4.js"></script>\n'
-            "        {% endcomment %}\n"
-            '        <script src="file5.js"></script>\n'
-            "    </head>\n"
-            "    <body></body>\n"
-            "</html>\n"
-        ),
-        id="comment_around_script",
-    ),
-    pytest.param(
-        ("{# <div></div> #}\n" "{% if this %}<div></div>{% endif %}"),
-        ("{# <div></div> #}\n" "{% if this %}<div></div>{% endif %}\n"),
-        id="inline_comment",
-    ),
-    pytest.param(
-        (
-            "<div>\n"
-            "    {% if 1 %}\n"
-            '        <div class="{% if 1 %}class {% else %} class {% endif %}">\n'
-            '            <div class="class"\n'
-            '                 data-parameters="{#?@ViewBag.DefaultFilters#}"\n'
-            '                 data-target="profile-{{ profile_type }}-{{ profile_id }}"></div>\n'
-            "        </div>\n"
-            "    {% endif %}"
-        ),
-        (
-            "<div>\n"
-            "    {% if 1 %}\n"
-            '        <div class="{% if 1 %}class {% else %} class {% endif %}">\n'
-            '            <div class="class"\n'
-            '                 data-parameters="{#?@ViewBag.DefaultFilters#}"\n'
-            '                 data-target="profile-{{ profile_type }}-{{ profile_id }}"></div>\n'
-            "        </div>\n"
-            "    {% endif %}\n"
-        ),
-        id="nested_inline_comment",
-    ),
-]
-
-
-@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, django_config):
-    output = formatter(django_config, source)
-
-    printer(expected, source, output)
-    assert expected == output

package/tests/test_django/test_filter.py

@@ -1,30 +0,0 @@
-"""Test django filter tag.
-
-poetry run pytest tests/test_django/test_filter.py
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import printer
-
-test_data = [
-    pytest.param(
-        (
-            "{% filter force_escape|lower %}This text will be HTML-escaped, and will appear in all lowercase.{% endfilter %}"
-        ),
-        (
-            "{% filter force_escape|lower %}\n"
-            "    This text will be HTML-escaped, and will appear in all lowercase.\n"
-            "{% endfilter %}\n"
-        ),
-        id="filter_tag",
-    ),
-]
-
-
-@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, django_config):
-    output = formatter(django_config, source)
-
-    printer(expected, source, output)
-    assert expected == output

package/tests/test_django/test_for.py

@@ -1,34 +0,0 @@
-"""Test django for tag.
-
-poetry run pytest tests/test_django/test_for.py
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import printer
-
-test_data = [
-    pytest.param(
-        (
-            "<ul>{% for athlete in athlete_list %}<li>{{ athlete.name }}</li>{% empty %}<li>Sorry, no athletes in this list.</li>{% endfor %}</ul>"
-        ),
-        (
-            "<ul>\n"
-            "    {% for athlete in athlete_list %}\n"
-            "        <li>{{ athlete.name }}</li>\n"
-            "    {% empty %}\n"
-            "        <li>Sorry, no athletes in this list.</li>\n"
-            "    {% endfor %}\n"
-            "</ul>\n"
-        ),
-        id="for_tag",
-    ),
-]
-
-
-@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, django_config):
-    output = formatter(django_config, source)
-
-    printer(expected, source, output)
-    assert expected == output

package/tests/test_django/test_if.py

@@ -1,34 +0,0 @@
-"""Test django if tag.
-
-poetry run pytest tests/test_django/test_if.py
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import printer
-
-test_data = [
-    pytest.param(
-        (
-            "{% if athlete_list %}Number of athletes: {{ athlete_list|length }}{% elif athlete_in_locker_room_list %}Athletes should be out of the locker room soon!{% else %}No athletes.{% endif %}"
-        ),
-        (
-            "{% if athlete_list %}\n"
-            "    Number of athletes: {{ athlete_list|length }}\n"
-            "{% elif athlete_in_locker_room_list %}\n"
-            "    Athletes should be out of the locker room soon!\n"
-            "{% else %}\n"
-            "    No athletes.\n"
-            "{% endif %}\n"
-        ),
-        id="if_tag",
-    ),
-]
-
-
-@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, django_config):
-    output = formatter(django_config, source)
-
-    printer(expected, source, output)
-    assert expected == output

package/tests/test_django/test_ifchanged.py

@@ -1,37 +0,0 @@
-"""Test django ifchanged tag.
-
-poetry run pytest tests/test_django/test_ifchanged.py
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import printer
-
-test_data = [
-    pytest.param(
-        (
-            '{% for match in matches %}<div style="background-color:"pink">{% ifchanged match.ballot_id %}{% cycle "red" "blue" %}{% else %}gray{% endifchanged %}{{ match }}</div>{% endfor %}'
-        ),
-        (
-            "{% for match in matches %}\n"
-            '    <div style="background-color:"pink">\n'
-            "        {% ifchanged match.ballot_id %}\n"
-            '            {% cycle "red" "blue" %}\n'
-            "        {% else %}\n"
-            "            gray\n"
-            "        {% endifchanged %}\n"
-            "        {{ match }}\n"
-            "    </div>\n"
-            "{% endfor %}\n"
-        ),
-        id="ifchanged_tag",
-    ),
-]
-
-
-@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, django_config):
-    output = formatter(django_config, source)
-
-    printer(expected, source, output)
-    assert expected == output

package/tests/test_django/test_include.py

@@ -1,24 +0,0 @@
-"""Test django include tag.
-
-poetry run pytest tests/test_django/test_include.py
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import printer
-
-test_data = [
-    pytest.param(
-        ('{% include "this" %}{% include "that" %}'),
-        ('{% include "this" %}\n' '{% include "that" %}\n'),
-        id="include_tag",
-    ),
-]
-
-
-@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, django_config):
-    output = formatter(django_config, source)
-
-    printer(expected, source, output)
-    assert expected == output

package/tests/test_django/test_load.py

@@ -1,24 +0,0 @@
-"""Test django load tag.
-
-poetry run pytest tests/test_django/test_load.py
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import printer
-
-test_data = [
-    pytest.param(
-        ("{% block content %}{% load i18n %}{% endblock %}"),
-        ("{% block content %}\n" "    {% load i18n %}\n" "{% endblock %}\n"),
-        id="load_tag",
-    ),
-]
-
-
-@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, django_config):
-    output = formatter(django_config, source)
-
-    printer(expected, source, output)
-    assert expected == output

package/tests/test_django/test_quoted.py

@@ -1,34 +0,0 @@
-"""Test django quoted tags.
-
-poetry run pytest tests/test_django/test_filter.py
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import printer
-
-test_data = [
-    pytest.param(
-        (
-            "<h1>\n"
-            '    {% if condition1 %}<span class="cls"></span>{% endif %}\n'
-            ' {% if condition2 %}"{{ text }}"{% endif %}\n'
-            "     </h1>\n"
-        ),
-        (
-            "<h1>\n"
-            '    {% if condition1 %}<span class="cls"></span>{% endif %}\n'
-            '    {% if condition2 %}"{{ text }}"{% endif %}\n'
-            "</h1>\n"
-        ),
-        id="issue #640",
-    ),
-]
-
-
-@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, django_config):
-    output = formatter(django_config, source)
-
-    printer(expected, source, output)
-    assert expected == output