Skip to content

[Macros] Remove usages of deprecated methods in SwiftSyntaxMacros #65383

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
ahoppen merged 1 commit into from
Apr 23, 2023
Merged

[Macros] Remove usages of deprecated methods in SwiftSyntaxMacros #65383

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions lib/ASTGen/Sources/ASTGen/SourceManager+MacroExpansionContext.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ extension SourceManager.MacroExpansionContext: MacroExpansionContext {
of node: Node,
at position: PositionInSyntaxNode,
filePathMode: SourceLocationFilePathMode
) -> SourceLocation? {
) -> AbstractSourceLocation? {
guard let (sourceFile, rootPosition) = sourceManager.rootSourceFile(of: node),
let exportedSourceFile =
sourceManager.exportedSourceFilesBySyntax[sourceFile]?.pointee
Expand Down Expand Up @@ -127,6 +127,6 @@ extension SourceManager.MacroExpansionContext: MacroExpansionContext {

// Do the location lookup.
let converter = SourceLocationConverter(file: fileName, tree: sourceFile)
return converter.location(for: rootPosition.advanced(by: offsetWithinSyntaxNode))
return AbstractSourceLocation(converter.location(for: rootPosition.advanced(by: offsetWithinSyntaxNode)))
}
}
4 changes: 2 additions & 2 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 @@ -42,7 +42,7 @@ public struct FileIDMacro: ExpressionMacro {
throw CustomError.message("can't find location for macro")
}

let fileLiteral: ExprSyntax = "\(literal: sourceLoc.file)"
let fileLiteral: ExprSyntax = "\(sourceLoc.file)"
return fileLiteral.with(\.leadingTrivia, macro.leadingTrivia)
}
}
Expand Down Expand Up @@ -565,7 +565,7 @@ public struct AddExtMembers: MemberMacro {
providingMembersOf decl: some DeclGroupSyntax,
in context: some MacroExpansionContext
) throws -> [DeclSyntax] {
let uniqueClassName = context.createUniqueName("uniqueClass")
let uniqueClassName = context.makeUniqueName("uniqueClass")

let instanceMethod: DeclSyntax =
"""
Expand Down
4 changes: 2 additions & 2 deletions test/Macros/macro_expand.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ func testAddBlocker(a: Int, b: Int, c: Int, oa: OnlyAdds) {

// Test source location information.
func testSourceLocations(x: Int, yolo: Int, zulu: Int) {
// CHECK-MACRO-PRINTED: Source range for LHS is MacroUser/macro_expand.swift: [[@LINE+3]]:5-[[@LINE+3]]:13
// CHECK-MACRO-PRINTED: Source range for LHS is MacroUser/macro_expand.swift: [[@LINE+2]]:5-[[@LINE+2]]:6
// CHECK-MACRO-PRINTED: Source range for LHS is "MacroUser/macro_expand.swift": [[@LINE+3]]:5-[[@LINE+3]]:13
// CHECK-MACRO-PRINTED: Source range for LHS is "MacroUser/macro_expand.swift": [[@LINE+2]]:5-[[@LINE+2]]:6
_ = #leftHandOperandFinder(
x + yolo + zulu
)
Expand Down