Hopiu/djLint
1
0
Fork 0
mirror of https://github.com/Hopiu/djLint.git synced 2026-05-03 19:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed #154, added test

Browse source
This commit is contained in:
Christopher Pickering 2021-12-14 10:24:17 +01:00
parent 736a03307f
commit bec3623a4d
No known key found for this signature in database
GPG key ID: E14DB3B0A0FACF84
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/djlint/formatter/condense.py
View file

@ -89,7 +89,7 @@ def condense_html(html: str, config: Config) -> str:
# put short template tags back on one line
html = re.sub(
re.compile(
rf"({{%-?[ ]*?({config.optional_single_line_template_tags})[^\n(?:%}})]*?%}})\s*([^%\n]*?)\s*?({{%-?[ ]+?end(\2)[ ]*?%}})",
rf"({{%-?[ ]*?({config.optional_single_line_template_tags})[^\n(?:%}})]*?%}})\s*?([ ]*?[^%\n]*?[ ]*?)\s*?({{%-?[ ]+?end(\2)[ ]*?%}})",
flags=re.IGNORECASE | re.MULTILINE | re.VERBOSE,
),
func,

1
src/djlint/formatter/indent.py
View file

@ -142,6 +142,7 @@ def indent_html(rawcode: str, config: Config) -> str:
elif is_block_raw is False:
# get leading space, and attributes
func = partial(format_attributes, config)
tmp = re.sub(
re.compile(
fr"(\s*?)(<(?:{config.indent_html_tags})\b)((?:\"[^\"]*\"|'[^']*'|{{[^}}]*}}|[^'\">{{}}])+?)(/?>)",

8
tests/test_config_format_attribute_template_tags.py
View file

@ -41,6 +41,14 @@ def test_without_config(runner: CliRunner, tmp_file: TextIO) -> None:
assert output.exit_code == 0
output = reformat(
tmp_file,
runner,
b'<a href="#"\n class="list-group-item{% if not is_allowed %} disabled{% endif %}">foo</a>\n',
)
assert output.exit_code == 0
output = reformat(
tmp_file,
runner,