Merge pull request #1204 from kimdv/kimdv/remove-dead-code

Author: kimdv

CodeGeneration/Sources/generate-swiftsyntax/templates/basicformat/BasicFormatFile.swift

@@ -189,50 +189,3 @@ let basicFormatFile = SourceFile {
     )
   }
 }
-
-private func createChildVisitCall(childType: SyntaxBuildableType, rewrittenExpr: ExprSyntaxProtocol) -> FunctionCallExpr {
-  let visitCall: FunctionCallExpr
-  if childType.isOptional {
-    visitCall = FunctionCallExpr("\(rewrittenExpr).map(self.visit)")
-  } else {
-    visitCall = FunctionCallExpr("self.visit(\(rewrittenExpr))")
-  }
-  if childType.baseType?.baseName != "Syntax", childType.baseType?.isSyntaxCollection != true, childType.baseType != nil {
-    let optionalChained = childType.optionalChained(expr: visitCall)
-    return FunctionCallExpr("\(optionalChained).cast(\(raw: childType.syntaxBaseName).self)")
-  } else {
-    return visitCall
-  }
-}
-
-private func makeSyntaxCollectionRewriteFunc(node: Node) -> FunctionDecl {
-  let rewriteResultType = node.type.syntaxBaseName
-  return FunctionDecl("""
-
-    open override func visit(_ node: \(node.type.syntaxBaseName)) -> \(rewriteResultType)
-    """) {
-    let formattedChildrenVarLet = node.elementsSeparatedByNewline ? "var" : "let"
-    VariableDecl(
-      """
-      \(raw: formattedChildrenVarLet) formattedChildren = node.map {
-        \(createChildVisitCall(childType: node.collectionElementType, rewrittenExpr: IdentifierExpr(identifier: .dollarIdentifier("$0"))))
-      }
-      """
-    )
-    if node.elementsSeparatedByNewline {
-      SequenceExpr(
-        """
-        formattedChildren = formattedChildren.map {
-          if $0.leadingTrivia?.first?.isNewline == true {
-            return $0
-          } else {
-            return $0.withLeadingTrivia(indentedNewline + ($0.leadingTrivia ?? []))
-          }
-        }
-        """
-      )
-    }
-    ReturnStmt("return \(raw: node.type.syntaxBaseName)(formattedChildren)")
-  }
-}
-

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

@@ -17,17 +17,6 @@ import Utils
 
 let tokensFile = SourceFile(
   leadingTrivia: .docLineComment(generateCopyrightHeader(for: "generate-swiftsyntax"))) {
-    FunctionDecl("""
-    fileprivate func defaultTrivia(presence: SourcePresence, trivia: Trivia) -> Trivia {
-      switch presence {
-      case .present:
-        return trivia
-      case .missing:
-        return []
-      }
-    }
-    """)
-    
     ExtensionDecl("extension TokenSyntax") {
       for token in SYNTAX_TOKENS {
         if token.isKeyword {

Sources/SwiftSyntax/generated/Tokens.swift

@@ -14,15 +14,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-fileprivate func defaultTrivia(presence: SourcePresence, trivia: Trivia) -> Trivia {
-  switch presence {
-  case .present: 
-    return trivia
-  case .missing: 
-    return []
-  }
-}
-
 extension TokenSyntax {
   public static func associatedtypeKeyword(
     leadingTrivia: Trivia = [],