Add a function to merge trivia from a node into an existing trivia #1478
Conversation
|
@swift-ci please test |
| /// Creates a new `Trivia` by appending the provided `TriviaPiece` to the end. | ||
| public func appending(_ piece: TriviaPiece) -> Trivia { | ||
| var copy = pieces | ||
| copy.append(piece) | ||
| return Trivia(pieces: copy) | ||
| } |
There was a problem hiding this comment.
Another natural candidate would be appending(_ trivia: Trivia) -> Trivia. I might actually prefer to have a bunch of appending methods instead of overloading +. But that’s not really part of this PR.
There was a problem hiding this comment.
I too prefer appending, I'm happy to do that here if you want. I generally dislike operator overloading 😅
There was a problem hiding this comment.
OK, so let’s get rid of the + overload now 🗑️
There was a problem hiding this comment.
This is used... in quite a few places. I'd rather get this in for now, so another PR it is 😅. I've added the other appending and used it in the + implementations.
There was a problem hiding this comment.
👍🏽 Maybe we can deprecate it in a follow-up PR 🤔
|
This one actually depends on #1477 so I'll wait to re-run tests until it's in. |
The actual `Trivia` definition doesn't need to be generated at all, only the static funcs and vars. Move it into SwiftSyntax proper.
bnbarham
force-pushed
the
merge-trivia
branch
2 times, most recently
from
4808ee2 to
c2557f9
Compare
| @@ -227,7 +227,12 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) { | |||
| case .accessPathComponent: | |||
| assert(layout.count == 5) | |||
| assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self)) | |||
| assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [.tokenKind(.identifier)])) | |||
There was a problem hiding this comment.
Seems like we didn't regenerate in aea4442?
|
@swift-ci please test |
|
@swift-ci please test |
bnbarham
force-pushed
the
merge-trivia
branch
2 times, most recently
from
f83fe74 to
f032eee
Compare
|
@swift-ci please test |
|
@swift-ci please test |
Generally when a node is removed, we need to add its trivia to an existing node. Add a small helper function to aid in this case.
|
@swift-ci please test |
|
@swift-ci please test Windows platform |
Generally when a node is removed, we need to add its trivia to an
existing node. Add a small helper function to aid in this case.