Skip to content

fix: indent optional-chaining (?.) continuation lines in JS mode #133

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: indent optional-chaining (?.) continuation lines in JS mode #133

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
2 changes: 1 addition & 1 deletion djhtml/modes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ def create_token(
# Tokens that mess with relative offset
elif raw_token.lstrip().startswith("..."):
token = Token.Text(raw_token, mode=DjJS)
elif not line and raw_token.lstrip().startswith((".", ": ", "? ")):
elif not line and raw_token.lstrip().startswith((".", "?.", ": ", "? ")):
token = Token.Text(raw_token, mode=DjJS, relative=1)
elif not line and raw_token in ["if", "else", "for", "while"]:
token = Token.Text(raw_token, mode=DjJS, **self.offsets)
Expand Down
8 changes: 8 additions & 0 deletions tests/suite/js.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,14 @@
</script>


<!-- Optional-chaining (?.) continuation lines -->
<script>
const ids = a?.b
?.filter(o => o > 0)
.map(o => o.id) || [];
</script>


<!-- Quoted strings with escaped quotes -->
<script>
var foo = '\'{'
Expand Down
8 changes: 8 additions & 0 deletions tests/suite/js.tokens
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,14 @@ Line([Text(' : baz', mode=DjJS, relative=1)], level=2)
Line([Close('</script>', mode=DjHTML)])
Line([])
Line([])
Line([Open('<!--', mode=DjHTML, ignore=True), Text(' Optional-chaining (?.) continuation lines ', 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(' ', mode=DjJS), Text('const ', mode=DjJS), Text('ids = a?.b', mode=DjJS, absolute=6)], level=1)
Line([Text(' ?.filter', mode=DjJS, relative=1), Open('(', mode=DjJS, level=2), Text('o => o > 0', mode=DjJS), Close(')', mode=DjJS)], level=2)
Line([Text(' .map', mode=DjJS, relative=1), Open('(', mode=DjJS, level=2), Text('o => o.id', mode=DjJS), Close(')', mode=DjJS), Text(' || ', mode=DjJS), Open('[', mode=DjJS, level=2), Close(']', mode=DjJS), Text(';', mode=DjJS)], level=2)
Line([Close('</script>', mode=DjHTML)])
Line([])
Line([])
Line([Open('<!--', mode=DjHTML, ignore=True), Text(' Quoted strings with escaped quotes ', 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(' ', mode=DjJS), Text('var ', mode=DjJS), Text('foo = ', mode=DjJS, absolute=4), Text("'\\'{'", mode=DjJS, relative=1, absolute=4)], level=1)
Expand Down