Skip to content

Commit 3045794

Browse files
committed
Don't drop token presence
`with(Leading|Trailing)Trivia` was dropping the token's source presence for materialized tokens. Make sure to include it.
1 parent 6dabd36 commit 3045794

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Sources/SwiftSyntax/Raw/RawSyntax.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ extension RawSyntax {
219219
kind: tokenView.formKind(),
220220
leadingTrivia: leadingTrivia,
221221
trailingTrivia: tokenView.formTrailingTrivia(),
222+
presence: tokenView.presence,
222223
arena: arena)
223224
case .layout(let layoutView):
224225
for (index, child) in layoutView.children.enumerated() {
@@ -242,6 +243,7 @@ extension RawSyntax {
242243
kind: tokenView.formKind(),
243244
leadingTrivia: tokenView.formLeadingTrivia(),
244245
trailingTrivia: trailingTrivia,
246+
presence: tokenView.presence,
245247
arena: arena)
246248
case .layout(let layoutView):
247249
for (index, child) in layoutView.children.enumerated().reversed() {
@@ -545,7 +547,7 @@ extension RawSyntax {
545547
kind: TokenKind,
546548
leadingTrivia: Trivia,
547549
trailingTrivia: Trivia,
548-
presence: SourcePresence = .present,
550+
presence: SourcePresence,
549551
arena: SyntaxArena
550552
) -> RawSyntax {
551553
let decomposed = kind.decomposeToRaw()

Sources/SwiftSyntax/Raw/RawSyntaxTokenView.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ public struct RawSyntaxTokenView {
153153
kind: newValue,
154154
leadingTrivia: formLeadingTrivia(),
155155
trailingTrivia: formTrailingTrivia(),
156+
presence: presence,
156157
arena: arena)
157158
case .materializedToken(var payload):
158159
let decomposed = newValue.decomposeToRaw()

0 commit comments

Comments
 (0)