Skip to content

[5.9][Test] Fix up macros using optional trivia API #64874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 4, 2023
Merged

[5.9][Test] Fix up macros using optional trivia API #64874

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions test/Macros/Inputs/syntax_macro_definitions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@ public struct ColorLiteralMacro: ExpressionMacro {
of: macro.argumentList, with: "_colorLiteralRed"
)
let initSyntax: ExprSyntax = ".init(\(argList))"
if let leadingTrivia = macro.leadingTrivia {
return initSyntax.with(\.leadingTrivia, leadingTrivia)
}
return initSyntax
return initSyntax.with(\.leadingTrivia, macro.leadingTrivia)
}
}

Expand All @@ -48,10 +45,7 @@ public struct FileIDMacro: ExpressionMacro {
}

let fileLiteral: ExprSyntax = "\(literal: fileID)"
if let leadingTrivia = macro.leadingTrivia {
return fileLiteral.with(\.leadingTrivia, leadingTrivia)
}
return fileLiteral
return fileLiteral.with(\.leadingTrivia, macro.leadingTrivia)
}
}

Expand Down