More multiline, and some comment support #7695
Conversation
gamebox
requested review from
joshuawarner32,
bhansconnect and
lukewilliamboswell
| }; | ||
| if (comment) |c| { | ||
| token.offset = c.begin; | ||
| token.extra = .{ .length = if (c.end > c.begin) c.end - c.begin else 0 }; |
There was a problem hiding this comment.
Why would end ever be less than begin?
| @@ -435,9 +449,15 @@ pub const Cursor = struct { | |||
| } | |||
| } else if (b == '#') { | |||
| self.pos += 1; | |||
| const comment_start = self.pos; | |||
There was a problem hiding this comment.
I would rather make this part of the return value (eg in a struct) than stuff this in a field on self
There was a problem hiding this comment.
I was thinking of removing the u16 for the indent completely - since it's no longer used (or needed).
There was a problem hiding this comment.
That makes sense to me!
| if (self.cursor.chompTrivia()) |indent| { | ||
| self.output.pushNewline(indent); | ||
| if (self.cursor.chompTrivia()) |_| { | ||
| self.output.pushNewline(self.cursor.popComment()); |
There was a problem hiding this comment.
Just to clarify this, newlines instead of store the indent now store the index to any comments that appear between lines?
There was a problem hiding this comment.
They store the start and endposition
src/fmt.zig
Outdated
| fmt.push(braces.end()); | ||
| } | ||
|
|
||
| fn formatExpr(fmt: *Formatter, ei: ExprIdx) IR.Region { |
There was a problem hiding this comment.
I noticed the returned region is almost always ignored. What is it actually needed/used for?
There was a problem hiding this comment.
It's used by formatCollection to flush comments and newlines (normalized) between the items
There was a problem hiding this comment.
See fmt.zig:212 above
gamebox
force-pushed
the
formatter-handles-whitespace
branch
from
9e505de to
f1328a6
Compare
gamebox
requested review from
lukewilliamboswell,
bhansconnect,
joshuawarner32 and
smores56
This is ready to merge!