Merge pull request #2792 from mateusrodriguesxyz/root-detached-node

Use root node for detached node lookup in location retrieval

Author: ahoppen

Sources/SwiftSyntaxMacroExpansion/BasicMacroExpansionContext.swift

@@ -210,7 +210,7 @@ extension BasicMacroExpansionContext: MacroExpansionContext {
       // The syntax node came from the source file itself.
       rootSourceFile = directRootSourceFile
       offsetAdjustment = .zero
-    } else if let nodeInOriginalTree = sharedState.detachedNodes[Syntax(node)] {
+    } else if let nodeInOriginalTree = sharedState.detachedNodes[node.root] {
       // The syntax node came from a disconnected root, so adjust for that.
       rootSourceFile = nodeInOriginalTree.root.as(SourceFileSyntax.self)
       offsetAdjustment = SourceLength(utf8Length: nodeInOriginalTree.position.utf8Offset)

Tests/SwiftSyntaxMacroExpansionTest/BodyMacroTests.swift

@@ -155,4 +155,50 @@ final class BodyMacroTests: XCTestCase {
       macros: ["EmptyBody": EmptyBodyMacro.self]
     )
   }
+
+  func testBodyNodeLocationFromContext() {
+    struct SourceLocationMacro: BodyMacro {
+      public static var formatMode: FormatMode { .disabled }
+
+      public static func expansion(
+        of node: AttributeSyntax,
+        providingBodyFor declaration: some DeclSyntaxProtocol & WithOptionalCodeBlockSyntax,
+        in context: some MacroExpansionContext
+      ) throws -> [CodeBlockItemSyntax] {
+        guard let statements = declaration.body?.statements else {
+          return []
+        }
+        let body =
+          if let location = context.location(of: statements, at: .afterLeadingTrivia, filePathMode: .filePath) {
+            CodeBlockItemListSyntax {
+              "#sourceLocation(file: \(location.file), line: \(location.line))"
+              statements
+              "#sourceLocation()"
+            }
+          } else {
+            statements
+          }
+        return body.map(\.self)
+      }
+    }
+
+    assertMacroExpansion(
+      """
+      @SourceLocationMacro
+      func f() {
+        let x: Int = 1
+      }
+      """,
+      expandedSource:
+        """
+        func f() {
+          #sourceLocation(file: "test.swift", line: 3)
+          let x: Int = 1
+          #sourceLocation()
+        }
+        """,
+      macros: ["SourceLocationMacro": SourceLocationMacro.self],
+      indentationWidth: indentationWidth
+    )
+  }
 }