Merge pull request #1745 from gibachan/rename-detached

Rename detach() to detached

Author: ahoppen

Sources/SwiftBasicFormat/BasicFormat.swift

@@ -437,7 +437,7 @@ open class BasicFormat: SyntaxRewriter {
       return token
     }
 
-    return token.detach().with(\.leadingTrivia, leadingTrivia).with(\.trailingTrivia, trailingTrivia)
+    return token.detached.with(\.leadingTrivia, leadingTrivia).with(\.trailingTrivia, trailingTrivia)
   }
 }
 

Sources/SwiftSyntax/SwiftSyntaxCompatibility.swift

@@ -554,6 +554,13 @@ public extension NamedOpaqueReturnTypeSyntax {
   }
 }
 
+public extension SyntaxProtocol {
+  @available(*, deprecated, message: "Use detached computed property instead.")
+  func detach() -> Self {
+    return detached
+  }
+}
+
 public extension TupleExprSyntax {
   @available(*, deprecated, renamed: "unexpectedBetweenLeftParenAndElements")
   var unexpectedBetweenLeftParenAndElementList: UnexpectedNodesSyntax? {

Sources/SwiftSyntax/Syntax.swift

@@ -225,7 +225,7 @@ extension SyntaxProtocol {
 
   /// Return this subtree with this node as the root, ie. detach this node
   /// from its parent.
-  public func detach() -> Self {
+  public var detached: Self {
     return Syntax(raw: self.raw).cast(Self.self)
   }
 

Sources/SwiftSyntaxMacros/BasicMacroExpansionContext.swift

@@ -80,7 +80,7 @@ extension BasicMacroExpansionContext {
 
   /// Detach the given node, and record where it came from.
   public func detach<Node: SyntaxProtocol>(_ node: Node) -> Node {
-    let detached = node.detach()
+    let detached = node.detached
 
     if let rootSourceFile = node.root.as(SourceFileSyntax.self) {
       addDisconnected(detached, at: node.position, in: rootSourceFile)

Sources/SwiftSyntaxMacros/Syntax+MacroEvaluation.swift

@@ -21,7 +21,7 @@ extension SyntaxProtocol {
       return basicContext.detach(self)
     }
 
-    return self.detach()
+    return self.detached
   }
 }
 

Tests/SwiftSyntaxTest/SyntaxTests.swift

@@ -38,15 +38,15 @@ public class SyntaxTests: XCTestCase {
     )
   }
 
-  public func testDetach() {
+  public func testDetached() {
     let s = StructDeclSyntax(
       structKeyword: .keyword(.struct),
       identifier: .identifier("someStruct"),
       memberBlock: MemberDeclBlockSyntax(leftBrace: .leftBraceToken(), members: [], rightBrace: .rightBraceToken())
     )
 
     XCTAssertEqual(Syntax(s), s.memberBlock.parent)
-    XCTAssertNil(s.memberBlock.detach().parent)
+    XCTAssertNil(s.memberBlock.detached.parent)
   }
 
   public func testCasting() {