diff --git a/src/djlint/formatter/compress.py b/src/djlint/formatter/compress.py
index 1092ef5a..d0969c32 100644
--- a/src/djlint/formatter/compress.py
+++ b/src/djlint/formatter/compress.py
@@ -25,21 +25,69 @@ def _flatten_attributes(match: re.Match) -> str:
if child_of_ignored_block(config, html, match):
return match.group()
+ close = match.group(3) if "/" not in match.group(3) else f" {match.group(3)}"
+
# pylint: disable=C0209
return "{} {}{}".format(
match.group(1),
" ".join(x.strip() for x in match.group(2).strip().splitlines()),
- match.group(3),
+ close,
)
# put attributes on one line
html = re.sub(
re.compile(
- rf"(<(?:{config.indent_html_tags}))\s((?:\"[^\"]*\"|'[^']*'|{{{{(?:(?!}}}}).)*}}}}|{{%(?:(?!%}}).)*%}}|[^'\">{{}}])+)(/?>)",
+ rf"(<(?:{config.indent_html_tags}))\s((?:\s*?(?:\"[^\"]*\"|'[^']*'|{{{{(?:(?!}}}}).)*}}}}|{{%(?:(?!%}}).)*%}}|[^'\">{{}}\/\s]))+)\s*?(/?>)",
flags=re.IGNORECASE | re.MULTILINE | re.VERBOSE,
),
_flatten_attributes,
html,
)
+ # put closing tags back on one line
+ #
+ html = re.sub(
+ re.compile(
+ rf"()",
+ flags=re.IGNORECASE | re.MULTILINE | re.VERBOSE,
+ ),
+ r"\1\2",
+ html,
+ )
+
+ # remove extra space from empty tags
+ #
+ # ^
+ html = re.sub(
+ re.compile(
+ rf"(<(?:{config.indent_html_tags}))\s*?(>)",
+ flags=re.IGNORECASE | re.MULTILINE | re.VERBOSE,
+ ),
+ r"\1\2",
+ html,
+ )
+
+ # ensure space before closing tag
+ #
+ # ^
+ html = re.sub(
+ re.compile(
+ rf"(<(?:{config.indent_html_tags}))\s*?(/>)",
+ flags=re.IGNORECASE | re.MULTILINE | re.VERBOSE,
+ ),
+ r"\1 \2",
+ html,
+ )
+
+ # cleanup whitespace in doctype
+ html = re.sub(
+ re.compile(
+ r"({}\/\s]))+)\s*?(>)",
+ flags=re.IGNORECASE | re.MULTILINE | re.VERBOSE,
+ ),
+ r"\1 \2\3",
+ html,
+ )
+
return html
diff --git a/src/djlint/formatter/indent.py b/src/djlint/formatter/indent.py
index 01494694..de8f905a 100644
--- a/src/djlint/formatter/indent.py
+++ b/src/djlint/formatter/indent.py
@@ -200,7 +200,7 @@ def indent_html(rawcode: str, config: Config) -> str:
tmp = re.sub(
re.compile(
- rf"(\s*?)(<(?:{config.indent_html_tags})\b)((?:\"[^\"]*\"|'[^']*'|{{[^}}]*}}|[^'\">{{}}])+?)(/?>)",
+ rf"(\s*?)(<(?:{config.indent_html_tags})\b)((?:\"[^\"]*\"|'[^']*'|{{[^}}]*}}|[^'\">{{}}\/])+?)(\s?/?>)",
re.VERBOSE | re.IGNORECASE,
),
func,
diff --git a/tests/test_config/test_format_attribute_template_tags/html-one.html b/tests/test_config/test_format_attribute_template_tags/html-one.html
index 18bbcfc7..e82e71b9 100644
--- a/tests/test_config/test_format_attribute_template_tags/html-one.html
+++ b/tests/test_config/test_format_attribute_template_tags/html-one.html
@@ -3,10 +3,10 @@
then something neat
{% else %}
that is long stuff asdf and more even
- {% endif %}"/>
+ {% endif %}" />
+ alt="report image" />
None:
output = reformat(
tmp_file,
runner,
- b'\n',
+ b'\n',
)
assert output.exit_code == 0
@@ -58,7 +58,7 @@ def test_without_config(runner: CliRunner, tmp_file: TextIO) -> None:
output.text
== r"""
+ alt="report image" />
"""
)
diff --git a/tests/test_config/test_preserve_blank_lines/html_one.html b/tests/test_config/test_preserve_blank_lines/html_one.html
index c5ac12b2..4a0a27ea 100644
--- a/tests/test_config/test_preserve_blank_lines/html_one.html
+++ b/tests/test_config/test_preserve_blank_lines/html_one.html
@@ -1,3 +1,3 @@
{% block someblock %}{% endblock %}
-
-
+
+
diff --git a/tests/test_html/test_attributes.py b/tests/test_html/test_attributes.py
index c25b3edd..d3b2f7dc 100644
--- a/tests/test_html/test_attributes.py
+++ b/tests/test_html/test_attributes.py
@@ -44,7 +44,7 @@
' calc(100vw - 30px)"\n'
' class="richtext-image imageblock overflow {{ value.image_position }} lazy"\n'
' title="{{ value.image.title }}"\n'
- ' alt="Block image"/>\n'
+ ' alt="Block image" />\n'
),
id="srcset",
),
@@ -62,7 +62,7 @@
' style="width:100px;\n'
" cursor: text;\n"
' border:1px solid pink"\n'
- ' required="true"/>\n'
+ ' required="true" />\n'
),
id="long_attributes",
),
@@ -195,7 +195,7 @@
' class="form-control"\n'
' type="text"\n'
' name="driver_id"\n'
- " value=\"{{ id|default(' sample_text ') }}\"/>\n"
+ " value=\"{{ id|default(' sample_text ') }}\" />\n"
),
id="another_boolean_after_tag",
),
@@ -477,11 +477,10 @@
' target="_blank"\n'
' role="tab"\n'
' href="https://yandex.ru/news?msid=1581089780.29024.161826.172442&mlid=1581088893.glob_225"\n'
- ' rel="noopener">...\n"
- " \n"
- " \n"
+ ' rel="noopener">...\n'
+ " \n"
" \n"
+ "\n"
),
id="class_bem2",
),
@@ -594,7 +593,7 @@
' src="https://s.yimg.com/rz/p/yahoo_frontpage_en-US_s_f_p_205x58_frontpage_2x.png"\n'
' height="58px"\n'
' width="205px"\n'
- ' alt="Yahoo"/>\n'
+ ' alt="Yahoo" />\n'
" \n"
" \n"
" \n"
@@ -755,7 +754,7 @@
' /assets/visual.png 805w"\n'
' sizes="(max-width: 66rem) 100vw,\n'
' 66rem"\n'
- ' alt=""/>\n'
+ ' alt="" />\n'
'
\n'
+ ' alt="" />\n'
'\n'
+ ' alt="" />\n'
'![]()
\n'
"\n"
'![]()
\n'
+ ' alt="" />\n'
'\n'
+ ' alt="" />\n'
'\n'
+ ' alt="" />\n'
'![]()
\n'
"\n"
'
\n'
+ ' alt="" />\n'
),
id="src_set",
),
diff --git a/tests/test_html/test_bracket_same_line.py b/tests/test_html/test_bracket_same_line.py
index 501c02ea..3462f9d2 100644
--- a/tests/test_html/test_bracket_same_line.py
+++ b/tests/test_html/test_bracket_same_line.py
@@ -141,12 +141,12 @@
),
(
'
\n'
- '\n'
- '\n'
- '\n'
- '\n'
- '\n'
+ ' src="./1.jpg" />\n'
+ '\n'
+ '\n'
+ '\n'
+ '\n'
+ '\n'
),
id="void",
),
@@ -157,12 +157,12 @@
),
(
'\n'
- '\n'
- '\n'
- '\n'
- '\n'
- '\n'
+ ' src="./1.jpg" />\n'
+ '\n'
+ '\n'
+ '\n'
+ '\n'
+ '\n'
),
id="void_braket_same_line",
),
diff --git a/tests/test_html/test_comments.py b/tests/test_html/test_comments.py
index ff026b77..8af19319 100644
--- a/tests/test_html/test_comments.py
+++ b/tests/test_html/test_comments.py
@@ -123,11 +123,11 @@
" \n"
"
\n'
"\n"
'