reverted changes

Author: art-divin

Sources/SwiftSyntaxMacroExpansion/MacroSystem.swift

@@ -398,7 +398,7 @@ public class AttributeRemover: SyntaxRewriter {
     self.predicate = predicate
   }
 
-  public override func visitAttributeListSyntax(_ node: AttributeListSyntax) -> AttributeListSyntax {
+  public override func visit(_ node: AttributeListSyntax) -> AttributeListSyntax {
     var filteredAttributes: [AttributeListSyntax.Element] = []
     for case .attribute(let attribute) in node {
       if self.predicate(attribute) {
@@ -584,7 +584,7 @@ private class MacroApplication<Context: MacroExpansionContext>: SyntaxRewriter {
     return nil
   }
 
-  override func visitCodeBlockItemListSyntax(_ node: CodeBlockItemListSyntax) -> CodeBlockItemListSyntax {
+  override func visit(_ node: CodeBlockItemListSyntax) -> CodeBlockItemListSyntax {
     var newItems: [CodeBlockItemSyntax] = []
     func addResult(_ node: CodeBlockItemSyntax) {
       // Expand freestanding macro.
@@ -600,7 +600,7 @@ private class MacroApplication<Context: MacroExpansionContext>: SyntaxRewriter {
         newItems.append(node)
       case .notAMacro:
         // Recurse on the child node
-        newItems.append(visitCodeBlockItemSyntax(node))
+        newItems.append(visit(node))
       }
 
       // Expand any peer macro on this item.
@@ -625,7 +625,7 @@ private class MacroApplication<Context: MacroExpansionContext>: SyntaxRewriter {
     return CodeBlockItemListSyntax(newItems)
   }
 
-  override func visitMemberBlockItemListSyntax(_ node: MemberBlockItemListSyntax) -> MemberBlockItemListSyntax {
+  override func visit(_ node: MemberBlockItemListSyntax) -> MemberBlockItemListSyntax {
     let parentDeclGroup = node
       .parent?
       .as(MemberBlockSyntax.self)?
@@ -645,7 +645,7 @@ private class MacroApplication<Context: MacroExpansionContext>: SyntaxRewriter {
         newItems.append(node)
       case .notAMacro:
         // Recurse on the child node.
-        newItems.append(visitMemberBlockItemSyntax(node))
+        newItems.append(visit(node))
       }
 
       // Expand any peer macro on this member.
@@ -691,8 +691,8 @@ private class MacroApplication<Context: MacroExpansionContext>: SyntaxRewriter {
     return .init(newItems)
   }
 
-  override func visitVariableDeclSyntax(_ node: VariableDeclSyntax) -> DeclSyntax {
-    var node = super.visitVariableDeclSyntax(node).cast(VariableDeclSyntax.self)
+  override func visit(_ node: VariableDeclSyntax) -> DeclSyntax {
+    var node = super.visit(node).cast(VariableDeclSyntax.self)
 
     guard !macroAttributes(attachedTo: DeclSyntax(node), ofType: AccessorMacro.Type.self).isEmpty else {
       return DeclSyntax(node)
@@ -706,8 +706,8 @@ private class MacroApplication<Context: MacroExpansionContext>: SyntaxRewriter {
     return DeclSyntax(node)
   }
 
-  override func visitSubscriptDeclSyntax(_ node: SubscriptDeclSyntax) -> DeclSyntax {
-    var node = super.visitSubscriptDeclSyntax(node).cast(SubscriptDeclSyntax.self)
+  override func visit(_ node: SubscriptDeclSyntax) -> DeclSyntax {
+    var node = super.visit(node).cast(SubscriptDeclSyntax.self)
     node.accessorBlock = expandAccessors(of: node, existingAccessors: node.accessorBlock)
     return DeclSyntax(node)
   }

Sources/_SwiftSyntaxTestSupport/SyntaxProtocol+Initializer.swift

@@ -39,27 +39,27 @@ private class InitializerExprFormat: BasicFormat {
     return formattedChildren
   }
 
-  override func visitLabeledExprListSyntax(_ node: LabeledExprListSyntax) -> LabeledExprListSyntax {
+  override func visit(_ node: LabeledExprListSyntax) -> LabeledExprListSyntax {
     let children = node.children(viewMode: .all)
     // If the function only takes a single argument, display it on the same line
     if let callee = node.parent?.as(FunctionCallExprSyntax.self)?.calledExpression.as(MemberAccessExprSyntax.self), callee.base == nil {
       // This is a constructor for tokens. Write them on a single line
-      return super.visitLabeledExprListSyntax(node)
+      return super.visit(node)
     }
     if children.count > 1 {
       return LabeledExprListSyntax(formatChildrenSeparatedByNewline(children: children, elementType: LabeledExprSyntax.self))
     } else {
-      return super.visitLabeledExprListSyntax(node)
+      return super.visit(node)
     }
   }
 
-  override func visitArrayElementListSyntax(_ node: ArrayElementListSyntax) -> ArrayElementListSyntax {
+  override func visit(_ node: ArrayElementListSyntax) -> ArrayElementListSyntax {
     let children = node.children(viewMode: .all)
     // Short array literals are presented on one line, list each element on a different line.
     if node.description.count > 30 {
       return ArrayElementListSyntax(formatChildrenSeparatedByNewline(children: children, elementType: ArrayElementSyntax.self))
     } else {
-      return super.visitArrayElementListSyntax(node)
+      return super.visit(node)
     }
   }
 }

Tests/SwiftParserTest/Assertions.swift

@@ -680,19 +680,19 @@ extension ParserTestCase {
 /// the closing quote of a multi-line string literals has impact on how much
 /// leading trivia is stripped from the literal’s content.
 class TriviaRemover: SyntaxRewriter {
-  override func visitStringLiteralExprSyntax(_ node: StringLiteralExprSyntax) -> ExprSyntax {
+  override func visit(_ node: StringLiteralExprSyntax) -> ExprSyntax {
     if node.openingQuote.tokenKind == .multilineStringQuote {
       return ExprSyntax(node)
     } else {
-      return super.visitStringLiteralExprSyntax(node)
+      return super.visit(node)
     }
   }
 
-  override func visitSimpleStringLiteralExprSyntax(_ node: SimpleStringLiteralExprSyntax) -> ExprSyntax {
+  override func visit(_ node: SimpleStringLiteralExprSyntax) -> ExprSyntax {
     if node.openingQuote.tokenKind == .multilineStringQuote {
       return ExprSyntax(node)
     } else {
-      return super.visitSimpleStringLiteralExprSyntax(node)
+      return super.visit(node)
     }
   }
 

Tests/SwiftSyntaxBuilderTest/StringInterpolationTests.swift

@@ -242,7 +242,7 @@ final class StringInterpolationTests: XCTestCase {
         """
     )
     class Rewriter: SyntaxRewriter {
-      override func visitFunctionDeclSyntax(_ node: FunctionDeclSyntax) -> DeclSyntax {
+      override func visit(_ node: FunctionDeclSyntax) -> DeclSyntax {
         let newFunc = DeclSyntax("func newName() {}")
           .with(\.leadingTrivia, node.leadingTrivia)
           .with(\.trailingTrivia, node.trailingTrivia)