Relative multi-line HTML elements #83
Conversation
Reintroduces "relative multi-line" indentation to DjHTML:
<long-html-tag
attribute1="value"
attribute2="value"
attribute3="value"/>
However, this only happens when the tag name is followed by a newline.
Otherwise, "absolute multi-line" indentation will be used:
<long-html-tag attribute1="value"
attribute2="value"
attribute3="value"/>
This is a good rule, but also the last rule I'm willing to add regarding
multi-line indentation. Our users deserve a stable set of indentation
principles, and this is it. No more bikeshedding.
JaapJoris
force-pushed
the
relative-multiline
branch
from
aee3d7d
to
cff1640
Compare
| if tag := re.match(tagname + r"[ \t]*\n", src): | ||
| # Use "relative" multi-line indendation instead | ||
| absolute = False | ||
| token.indents = True |
There was a problem hiding this comment.
Admittedly, this is "cheating" a bit because it changes an "internal" attribute of a token has already been created. It saves a whole bunch of if/else statements though, especially further down where the > token is created.
There was a problem hiding this comment.
I think it's avoidable too :).
Edit: after reviewing the handling of >, it still is avoidable here, just not there.
| if tag := re.match(tagname + r"[ \t]*\n", src): | ||
| # Use "relative" multi-line indendation instead | ||
| absolute = False | ||
| token.indents = True |
There was a problem hiding this comment.
I think it's avoidable too :).
Edit: after reviewing the handling of >, it still is avoidable here, just not there.
| @@ -549,6 +556,8 @@ def create_token(self, raw_token, src, line): | |||
| token = Token.Text(raw_token, mode=InsideHTMLTag, **self.offsets) | |||
| elif not self.inside_attr and raw_token == "/>": | |||
| token, mode = Token.Text(raw_token, mode=DjHTML), self.return_mode | |||
| if not self.absolute: | |||
There was a problem hiding this comment.
This is replaceable by an if that return Text or Close depending on self.absolute.
| @@ -565,6 +574,8 @@ def create_token(self, raw_token, src, line): | |||
| Token.Open(raw_token, mode=DjHTML), | |||
| self.return_mode, | |||
| ) | |||
| if not self.absolute: | |||
There was a problem hiding this comment.
This particular case is indeed problematic without token.dedents. Solveable, but problematic.
There was a problem hiding this comment.
I don't mind "cheating" with tokens this way. It's actually quite elegant, and if we did it everywhere we wouldn't need the separate Open, Close, and CloseAndOpen classes at all. So I'll leave it in just to remind my future self that this is also a possibility.
Thanks for reviewing!
Reintroduces "relative multi-line" indentation to DjHTML:
However, this only happens when the tag name is followed by a newline.
Otherwise, "absolute multi-line" indentation will be used:
This is a good rule, but also the last rule I'm willing to add regarding
multi-line indentation. Our users deserve a stable set of indentation
principles, and this is it. No more bikeshedding.