Change visit(TokenSyntax) function of SyntaxRewriter to return TokenSyntax

Author: ahoppen

CodeGeneration/Sources/generate-swiftbasicformat/BasicFormatFile.swift

@@ -163,7 +163,7 @@ private func createTokenFormatFunction() -> FunctionDecl {
 
         )
       ]),
-      output: "Syntax"
+      output: "TokenSyntax"
     )
   ) {
     VariableDecl("var node = node")
@@ -214,6 +214,6 @@ private func createTokenFormatFunction() -> FunctionDecl {
     SequenceExpr("node.leadingTrivia = node.leadingTrivia.indented(indentation: indentation)")
     SequenceExpr("node.trailingTrivia = node.trailingTrivia.indented(indentation: indentation)")
     SequenceExpr("lastRewrittenToken = node")
-    ReturnStmt("return Syntax(node)")
+    ReturnStmt("return node")
   }
 }

Sources/SwiftBasicFormat/generated/BasicFormat.swift

@@ -2755,7 +2755,7 @@ open class BasicFormat: SyntaxRewriter {
     return Syntax(VersionTupleSyntax(unexpectedBeforeMajorMinor, majorMinor: majorMinor, unexpectedBetweenMajorMinorAndPatchPeriod, patchPeriod: patchPeriod, unexpectedBetweenPatchPeriodAndPatchVersion, patchVersion: patchVersion))
   }
 
-  open override func visit(_ node: TokenSyntax) -> Syntax {
+  open override func visit(_ node: TokenSyntax) -> TokenSyntax {
     var node = node
     switch node.tokenKind {
     case .associatedtypeKeyword: 
@@ -3208,6 +3208,6 @@ open class BasicFormat: SyntaxRewriter {
     node.leadingTrivia = node.leadingTrivia.indented(indentation: indentation)
     node.trailingTrivia = node.trailingTrivia.indented(indentation: indentation)
     lastRewrittenToken = node
-    return Syntax(node)
+    return node
   }
 }

Sources/SwiftParser/Diagnostics/DiagnosticExtensions.swift

@@ -97,7 +97,7 @@ extension FixIt.Changes {
   /// Makes the `token` present, moving it in front of the previous token's trivia.
   static func makePresentBeforeTrivia(_ token: TokenSyntax) -> Self {
     if let previousToken = token.previousToken(viewMode: .sourceAccurate) {
-      var presentToken = PresentMaker().visit(token).as(TokenSyntax.self)!
+      var presentToken = PresentMaker().visit(token)
       if !previousToken.trailingTrivia.isEmpty {
         presentToken = presentToken.withTrailingTrivia(previousToken.trailingTrivia)
       }

Sources/SwiftParser/Diagnostics/PresenceUtils.swift

@@ -45,7 +45,7 @@ extension SyntaxProtocol {
 
 /// Transforms a syntax tree by making all missing tokens present.
 class PresentMaker: SyntaxRewriter {
-  override func visit(_ token: TokenSyntax) -> Syntax {
+  override func visit(_ token: TokenSyntax) -> TokenSyntax {
     if token.presence == .missing {
       let presentToken: TokenSyntax
       let (rawKind, text) = token.tokenKind.decomposeToRaw()
@@ -57,7 +57,7 @@ class PresentMaker: SyntaxRewriter {
       }
       return BasicFormat().visit(presentToken)
     } else {
-      return Syntax(token)
+      return token
     }
   }
 
@@ -126,10 +126,10 @@ class PresentMaker: SyntaxRewriter {
 }
 
 class MissingMaker: SyntaxRewriter {
-  override func visit(_ node: TokenSyntax) -> Syntax {
+  override func visit(_ node: TokenSyntax) -> TokenSyntax {
     guard node.presence == .present else {
-      return Syntax(node)
+      return node
     }
-    return Syntax(TokenSyntax(node.tokenKind, presence: .missing))
+    return TokenSyntax(node.tokenKind, presence: .missing)
   }
 }

Sources/SwiftSyntax/SyntaxRewriter.swift.gyb

@@ -43,8 +43,8 @@ open class SyntaxRewriter {
   /// Visit a `TokenSyntax`.
   ///   - Parameter node: the node that is being visited
   ///   - Returns: the rewritten node
-  open func visit(_ token: TokenSyntax) -> Syntax {
-    return Syntax(token)
+  open func visit(_ token: TokenSyntax) -> TokenSyntax {
+    return token
   }
 
   /// Visit an `UnknownSyntax`.
@@ -123,7 +123,7 @@ open class SyntaxRewriter {
     visitPre(node._syntaxNode)
     defer { visitPost(node._syntaxNode) }
     if let newNode = visitAny(node._syntaxNode) { return newNode }
-    return visit(node)
+    return Syntax(visit(node))
   }
 
   /// Implementation detail of visit(_:). Do not call directly.

Sources/SwiftSyntax/gyb_generated/SyntaxRewriter.swift

@@ -1973,8 +1973,8 @@ open class SyntaxRewriter {
   /// Visit a `TokenSyntax`.
   ///   - Parameter node: the node that is being visited
   ///   - Returns: the rewritten node
-  open func visit(_ token: TokenSyntax) -> Syntax {
-    return Syntax(token)
+  open func visit(_ token: TokenSyntax) -> TokenSyntax {
+    return token
   }
 
   /// Visit an `UnknownSyntax`.
@@ -4884,7 +4884,7 @@ open class SyntaxRewriter {
     visitPre(node._syntaxNode)
     defer { visitPost(node._syntaxNode) }
     if let newNode = visitAny(node._syntaxNode) { return newNode }
-    return visit(node)
+    return Syntax(visit(node))
   }
 
   /// Implementation detail of visit(_:). Do not call directly.

Sources/SwiftSyntaxBuilder/Indenter.swift

@@ -41,12 +41,12 @@ class Indenter: SyntaxRewriter {
     return Indenter(indentation: indentation).visit(Syntax(node)).as(SyntaxType.self)!
   }
 
-  public override func visit(_ token: TokenSyntax) -> Syntax {
-    return Syntax(TokenSyntax(
+  public override func visit(_ token: TokenSyntax) -> TokenSyntax {
+    return TokenSyntax(
       token.tokenKind,
       leadingTrivia: token.leadingTrivia.indented(indentation: indentation),
       trailingTrivia: token.trailingTrivia.indented(indentation: indentation),
       presence: token.presence
-    ))
+    )
   }
 }

Sources/lit-test-helper/main.swift

@@ -214,13 +214,13 @@ func getSwiftLanguageVersionInfo(args: CommandLineArguments) -> (languageVersion
 
 /// Rewrites a parsed tree with all constructed nodes.
 class TreeReconstructor : SyntaxRewriter {
-  override func visit(_ token: TokenSyntax) -> Syntax {
+  override func visit(_ token: TokenSyntax) -> TokenSyntax {
     let token = TokenSyntax(
       token.tokenKind,
       leadingTrivia: token.leadingTrivia,
       trailingTrivia: token.trailingTrivia,
       presence: token.presence)
-    return Syntax(token)
+    return token
   }
 }
 

Tests/SwiftParserTest/Assertions.swift

@@ -144,7 +144,7 @@ class FixItApplier: SyntaxRewriter {
     return nil
   }
 
-  override func visit(_ node: TokenSyntax) -> Syntax {
+  override func visit(_ node: TokenSyntax) -> TokenSyntax {
     var modifiedNode = node
     for change in changes {
       switch change {
@@ -156,7 +156,7 @@ class FixItApplier: SyntaxRewriter {
         break
       }
     }
-    return Syntax(modifiedNode)
+    return modifiedNode
   }
 
   /// If `messages` is `nil`, applies all Fix-Its in `diagnostics` to `tree` and returns the fixed syntax tree.

Tests/SwiftSyntaxParserTest/SyntaxVisitorTests.swift

@@ -99,8 +99,8 @@ public class SyntaxVisitorTests: XCTestCase {
 
   public func testRewriteTrivia() {
     class TriviaRemover: SyntaxRewriter {
-      override func visit(_ token: TokenSyntax) -> Syntax {
-        return Syntax(token.withTrailingTrivia(.zero))
+      override func visit(_ token: TokenSyntax) -> TokenSyntax {
+        return token.withTrailingTrivia(.zero)
       }
     }
 

Tests/SwiftSyntaxTest/VisitorTests.swift

@@ -125,11 +125,11 @@ public class VisitorTests: XCTestCase {
     class RewritingTreePrinter: SyntaxRewriter {
       var out = ""
 
-      override func visit(_ node: TokenSyntax) -> Syntax {
+      override func visit(_ node: TokenSyntax) -> TokenSyntax {
         out += node.leadingTrivia.description
         out += node.text
         out += node.trailingTrivia.description
-        return Syntax(node)
+        return node
       }