Merge pull request #65383 from ahoppen/ahoppen/no-deprecation

[Macros] Remove usages of deprecated methods in SwiftSyntaxMacros

Author: ahoppen

lib/ASTGen/Sources/ASTGen/SourceManager+MacroExpansionContext.swift

@@ -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
@@ -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)))
   }
 }

test/Macros/Inputs/syntax_macro_definitions.swift

@@ -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)
   }
 }
@@ -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 =
       """

test/Macros/macro_expand.swift

@@ -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
   )