Skip to content

fix: propagate custom block and middle tags into <script> and <style> modes #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dnspfio wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: propagate custom block and middle tags into <script> and <style> modes #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions djhtml/modes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,8 +451,6 @@ def __init__(
self.haskell_re = re.compile(r"^ *, ([$\w-]+ *=|[$\w-]+;?)")
self.variable_re = re.compile(r"^ *([$\w-]+ *=|[$\w-]+;?)")
self.previous_line_ended_with_comma = False
self.extra_blocks = {}
self.extra_middle_tags = []

def create_token(
self, raw_token: str, src: str, line: Line
Expand Down Expand Up @@ -638,11 +636,15 @@ def create_token(
token, mode = Token.Text(raw_token, mode=DjHTML), self.return_mode
elif self.tagname == "style":
token, mode = Token.Open(raw_token, mode=DjHTML), DjCSS(
return_mode=self.return_mode
return_mode=self.return_mode,
extra_blocks=self.return_mode.extra_blocks,
extra_middle_tags=self.return_mode.extra_middle_tags,
)
elif self.tagname == "script":
token, mode = Token.Open(raw_token, mode=DjHTML), DjJS(
return_mode=self.return_mode
return_mode=self.return_mode,
extra_blocks=self.return_mode.extra_blocks,
extra_middle_tags=self.return_mode.extra_middle_tags,
)
else:
token, mode = (
Expand Down
6 changes: 5 additions & 1 deletion tests/generate_tokens.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,9 @@
with open(DIR / filename) as html:
with open(DIR / (filename.stem + ".tokens"), "w") as f:
f.write(
DjHTML(html.read(), extra_blocks={"weird_tag": "endweird"}).debug()
DjHTML(
html.read(),
extra_blocks={"weird_tag": "endweird"},
extra_middle_tags=["weird_middle"],
).debug()
)
18 changes: 18 additions & 0 deletions tests/suite/js.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,3 +461,21 @@
/function() {/
return
</script>


<!-- Custom block tag with middle tag inside <script> -->
<script>
f(() => {
{% weird_tag %}
a();
{% weird_middle %}
b();
{% endweird %}
});

{% if foo %}
c();
{% else %}
d();
{% endif %}
</script>
18 changes: 18 additions & 0 deletions tests/suite/js.tokens
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,4 +452,22 @@ Line([Text(' ', mode=DjJS), Text('// The following is no longer broken \\o/',
Line([Text(' ', mode=DjJS), Text('/function() {/', mode=DjJS)], level=1)
Line([Text(' return', mode=DjJS)], level=1)
Line([Close('</script>', mode=DjHTML)])
Line([])
Line([])
Line([Open('<!--', mode=DjHTML, ignore=True), Text(' Custom block tag with middle tag inside <script> ', mode=Comment, ignore=True), Close('-->', mode=DjHTML, ignore=True)], ignore=True)
Line([Text('<', mode=DjHTML), Text('script', mode=InsideHTMLTag, absolute=8), Open('>', mode=DjHTML)])
Line([Text(' f', mode=DjJS), Open('(', mode=DjJS, level=1), Open('(', mode=DjJS, level=1), Close(')', mode=DjJS), Text(' => ', mode=DjJS), Open('{', mode=DjJS, level=1)], level=1)
Line([Text(' ', mode=DjJS), Open('{% weird_tag %}', mode=DjTXT, level=2)], level=2)
Line([Text(' a', mode=DjJS), Open('(', mode=DjJS, level=3), Close(')', mode=DjJS), Text(';', mode=DjJS)], level=3)
Line([Text(' ', mode=DjJS), CloseAndOpen('{% weird_middle %}', mode=DjTXT, level=2)], level=2)
Line([Text(' b', mode=DjJS), Open('(', mode=DjJS, level=3), Close(')', mode=DjJS), Text(';', mode=DjJS)], level=3)
Line([Text(' ', mode=DjJS), Close('{% endweird %}', mode=DjTXT)], level=2)
Line([Text(' ', mode=DjJS), Close('}', mode=DjJS), Close(')', mode=DjJS), Text(';', mode=DjJS)], level=1)
Line([])
Line([Text(' ', mode=DjJS), Open('{% if foo %}', mode=DjTXT, level=1)], level=1)
Line([Text(' c', mode=DjJS), Open('(', mode=DjJS, level=2), Close(')', mode=DjJS), Text(';', mode=DjJS)], level=2)
Line([Text(' ', mode=DjJS), CloseAndOpen('{% else %}', mode=DjTXT, level=1)], level=1)
Line([Text(' d', mode=DjJS), Open('(', mode=DjJS, level=2), Close(')', mode=DjJS), Text(';', mode=DjJS)], level=2)
Line([Text(' ', mode=DjJS), Close('{% endif %}', mode=DjTXT)], level=1)
Line([Close('</script>', mode=DjHTML)])
Line([])