Skip to content

Commit 64806ae

Browse files
committed
[Test] Fix up macros using optional trivia API
swiftlang/swift-syntax#1477 makes `leadingTrivia` and `trailingTrivia` non-optional. (cherry picked from commit 2ad8db4)
1 parent a1a1b05 commit 64806ae

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

test/Macros/Inputs/syntax_macro_definitions.swift

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ public struct ColorLiteralMacro: ExpressionMacro {
2626
of: macro.argumentList, with: "_colorLiteralRed"
2727
)
2828
let initSyntax: ExprSyntax = ".init(\(argList))"
29-
if let leadingTrivia = macro.leadingTrivia {
30-
return initSyntax.with(\.leadingTrivia, leadingTrivia)
31-
}
32-
return initSyntax
29+
return initSyntax.with(\.leadingTrivia, macro.leadingTrivia)
3330
}
3431
}
3532

@@ -48,10 +45,7 @@ public struct FileIDMacro: ExpressionMacro {
4845
}
4946

5047
let fileLiteral: ExprSyntax = "\(literal: fileID)"
51-
if let leadingTrivia = macro.leadingTrivia {
52-
return fileLiteral.with(\.leadingTrivia, leadingTrivia)
53-
}
54-
return fileLiteral
48+
return fileLiteral.with(\.leadingTrivia, macro.leadingTrivia)
5549
}
5650
}
5751

0 commit comments

Comments
 (0)