Merge pull request #1852 from bnbarham/cherry-diag-perf

[5.9] Allow rewrite to detach from the node's parent

Author: bnbarham

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxRewriterFile.swift

@@ -42,10 +42,13 @@ let syntaxRewriterFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
 
     DeclSyntax(
       """
-      /// Rewrite `node` and anchor, making sure that the rewritten node also has
-      /// a parent if `node` had one.
-      public func rewrite<SyntaxType: SyntaxProtocol>(_ node: SyntaxType) -> Syntax {
+      /// Rewrite `node`, keeping its parent unless `detach` is `true`.
+      public func rewrite<SyntaxType: SyntaxProtocol>(_ node: SyntaxType, detach: Bool = false) -> Syntax {
         let rewritten = self.visit(node.data)
+        if detach {
+          return rewritten
+        }
+
         return withExtendedLifetime(rewritten) {
           return Syntax(node.data.replacingSelf(rewritten.raw, arena: SyntaxArena()))
         }
@@ -100,7 +103,7 @@ let syntaxRewriterFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
       /// Visit any Syntax node.
       ///   - Parameter node: the node that is being visited
       ///   - Returns: the rewritten node
-      @available(*, deprecated, renamed: "rewrite(_:)")
+      @available(*, deprecated, renamed: "rewrite(_:detach:)")
       public func visit(_ node: Syntax) -> Syntax {
         return visit(node.data)
       }

Sources/SwiftParserDiagnostics/DiagnosticExtensions.swift

@@ -93,7 +93,7 @@ extension FixIt.MultiNodeChange {
     guard let node = node else {
       return FixIt.MultiNodeChange(primitiveChanges: [])
     }
-    var changes = [FixIt.Change.replace(oldNode: Syntax(node), newNode: MissingMaker().rewrite(node))]
+    var changes = [FixIt.Change.replace(oldNode: Syntax(node), newNode: MissingMaker().rewrite(node, detach: true))]
     if transferTrivia {
       changes += FixIt.MultiNodeChange.transferTriviaAtSides(from: [node]).primitiveChanges
     }
@@ -138,7 +138,7 @@ extension FixIt.MultiNodeChange {
     leadingTrivia: Trivia? = nil,
     trailingTrivia: Trivia? = nil
   ) -> Self {
-    var presentNode = MissingNodesBasicFormatter(viewMode: .fixedUp).rewrite(node)
+    var presentNode = MissingNodesBasicFormatter(viewMode: .fixedUp).rewrite(node, detach: true)
     presentNode = PresentMaker().rewrite(presentNode)
 
     if let leadingTrivia = leadingTrivia {

Sources/SwiftSyntax/generated/SyntaxRewriter.swift

@@ -28,10 +28,13 @@ open class SyntaxRewriter {
     self.viewMode = viewMode
   }
 
-  /// Rewrite `node` and anchor, making sure that the rewritten node also has
-  /// a parent if `node` had one.
-  public func rewrite<SyntaxType: SyntaxProtocol>(_ node: SyntaxType) -> Syntax {
+  /// Rewrite `node`, keeping its parent unless `detach` is `true`.
+  public func rewrite<SyntaxType: SyntaxProtocol>(_ node: SyntaxType, detach: Bool = false) -> Syntax {
     let rewritten = self.visit(node.data)
+    if detach {
+      return rewritten
+    }
+
     return withExtendedLifetime(rewritten) {
       return Syntax(node.data.replacingSelf(rewritten.raw, arena: SyntaxArena()))
     }
@@ -68,7 +71,7 @@ open class SyntaxRewriter {
   /// Visit any Syntax node.
   ///   - Parameter node: the node that is being visited
   ///   - Returns: the rewritten node
-  @available(*, deprecated, renamed: "rewrite(_:)")
+  @available(*, deprecated, renamed: "rewrite(_:detach:)")
   public func visit(_ node: Syntax) -> Syntax {
     return visit(node.data)
   }