reverted changes

Author: art-divin

Sources/SwiftOperators/OperatorTable+Semantics.swift

@@ -96,7 +96,7 @@ extension OperatorTable {
         errors.append(error)
       }
 
-      override func visitOperatorDeclSyntax(
+      override func visit(
         _ node: OperatorDeclSyntax
       ) -> SyntaxVisitorContinueKind {
         opPrecedence.record(
@@ -106,7 +106,7 @@ extension OperatorTable {
         return .skipChildren
       }
 
-      override func visitPrecedenceGroupDeclSyntax(
+      override func visit(
         _ node: PrecedenceGroupDeclSyntax
       ) -> SyntaxVisitorContinueKind {
         opPrecedence.record(
@@ -117,19 +117,19 @@ extension OperatorTable {
       }
 
       // Only visit top-level entities to find operators and precedence groups.
-      override func visitSourceFileSyntax(
+      override func visit(
         _ node: SourceFileSyntax
       ) -> SyntaxVisitorContinueKind {
         return .visitChildren
       }
 
-      override func visitCodeBlockItemListSyntax(
+      override func visit(
         _ node: CodeBlockItemListSyntax
       ) -> SyntaxVisitorContinueKind {
         return .visitChildren
       }
 
-      override func visitCodeBlockItemSyntax(
+      override func visit(
         _ node: CodeBlockItemSyntax
       ) -> SyntaxVisitorContinueKind {
         return .visitChildren

Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift

@@ -107,7 +107,7 @@ public struct SourceRange: Hashable, Codable {
 fileprivate class SourceLocationCollector: SyntaxVisitor {
   private var sourceLocationDirectives: [PoundSourceLocationSyntax] = []
 
-  override func visitPoundSourceLocationSyntax(_ node: PoundSourceLocationSyntax) -> SyntaxVisitorContinueKind {
+  override func visit(_ node: PoundSourceLocationSyntax) -> SyntaxVisitorContinueKind {
     sourceLocationDirectives.append(node)
     return .skipChildren
   }

Sources/SwiftSyntax/SourceLocation.swift

@@ -71,48 +71,48 @@ fileprivate class ParameterReplacementVisitor: SyntaxAnyVisitor {
   }
 
   // Integer literals
-  override func visitIntegerLiteralExprSyntax(_ node: IntegerLiteralExprSyntax) -> SyntaxVisitorContinueKind {
+  override func visit(_ node: IntegerLiteralExprSyntax) -> SyntaxVisitorContinueKind {
     .visitChildren
   }
 
   // Floating point literals
-  override func visitFloatLiteralExprSyntax(_ node: FloatLiteralExprSyntax) -> SyntaxVisitorContinueKind {
+  override func visit(_ node: FloatLiteralExprSyntax) -> SyntaxVisitorContinueKind {
     .visitChildren
   }
 
   // nil literals
-  override func visitNilLiteralExprSyntax(_ node: NilLiteralExprSyntax) -> SyntaxVisitorContinueKind {
+  override func visit(_ node: NilLiteralExprSyntax) -> SyntaxVisitorContinueKind {
     .visitChildren
   }
 
   // String literals
-  override func visitStringLiteralExprSyntax(_ node: StringLiteralExprSyntax) -> SyntaxVisitorContinueKind {
+  override func visit(_ node: StringLiteralExprSyntax) -> SyntaxVisitorContinueKind {
     .visitChildren
   }
 
   // Array literals
-  override func visitArrayExprSyntax(_ node: ArrayExprSyntax) -> SyntaxVisitorContinueKind {
+  override func visit(_ node: ArrayExprSyntax) -> SyntaxVisitorContinueKind {
     .visitChildren
   }
 
   // Dictionary literals
-  override func visitDictionaryExprSyntax(_ node: DictionaryExprSyntax) -> SyntaxVisitorContinueKind {
+  override func visit(_ node: DictionaryExprSyntax) -> SyntaxVisitorContinueKind {
     .visitChildren
   }
 
   // Tuple literals
-  override func visitTupleExprSyntax(_ node: TupleExprSyntax) -> SyntaxVisitorContinueKind {
+  override func visit(_ node: TupleExprSyntax) -> SyntaxVisitorContinueKind {
     .visitChildren
   }
 
   // Macro uses.
-  override func visitMacroExpansionExprSyntax(_ node: MacroExpansionExprSyntax) -> SyntaxVisitorContinueKind {
+  override func visit(_ node: MacroExpansionExprSyntax) -> SyntaxVisitorContinueKind {
     .visitChildren
   }
 
   // References to declarations. Only accept those that refer to a parameter
   // of a macro.
-  override func visitDeclReferenceExprSyntax(_ node: DeclReferenceExprSyntax) -> SyntaxVisitorContinueKind {
+  override func visit(_ node: DeclReferenceExprSyntax) -> SyntaxVisitorContinueKind {
     let baseName = node.baseName
     let signature = macro.signature
 
@@ -234,9 +234,9 @@ private final class MacroExpansionRewriter: SyntaxRewriter {
     super.init(viewMode: .sourceAccurate)
   }
 
-  override func visitDeclReferenceExprSyntax(_ node: DeclReferenceExprSyntax) -> ExprSyntax {
+  override func visit(_ node: DeclReferenceExprSyntax) -> ExprSyntax {
     guard let parameterIndex = parameterReplacements[node] else {
-      return super.visitDeclReferenceExprSyntax(node)
+      return super.visit(node)
     }
 
     // Swap in the argument for this parameter
@@ -266,7 +266,7 @@ extension MacroDeclSyntax {
         }
       ),
       arguments: arguments
-    ).visitMacroExpansionExprSyntax(definition)
+    ).visit(definition)
   }
 
   /// Given a freestanding macro expansion syntax node that references this

Sources/SwiftSyntaxMacroExpansion/MacroReplacement.swift

@@ -19,7 +19,7 @@ import _SwiftSyntaxTestSupport
 private class ExprSequenceSearcher: SyntaxAnyVisitor {
   var foundSequenceExpr = false
 
-  override func visitSequenceExprSyntax(
+  override func visit(
     _ node: SequenceExprSyntax
   ) -> SyntaxVisitorContinueKind {
     foundSequenceExpr = true
@@ -43,7 +43,7 @@ extension SyntaxProtocol {
 /// A syntax rewriter that folds explicitly-parenthesized sequence expressions
 /// into  a structured syntax tree.
 class ExplicitParenFolder: SyntaxRewriter {
-  override func visitTupleExprSyntax(_ node: TupleExprSyntax) -> ExprSyntax {
+  override func visit(_ node: TupleExprSyntax) -> ExprSyntax {
     // Identify syntax nodes of the form (x (op) y), which is a
     // TupleExprSyntax(SequenceExpr(x, (op), y)).
     guard node.elements.count == 1,

Tests/SwiftOperatorsTest/OperatorTableTests.swift

@@ -311,7 +311,7 @@ public class StringLiteralRepresentedLiteralValueTests: ParserTestCase {
       literals[line]?[index]
     }
 
-    override func visitStringLiteralExprSyntax(_ node: StringLiteralExprSyntax) -> SyntaxVisitorContinueKind {
+    override func visit(_ node: StringLiteralExprSyntax) -> SyntaxVisitorContinueKind {
       let line = UInt(locationConverter?.location(for: node.position).line ?? 0)
       literals[line, default: []].append(node)
       return .visitChildren

Tests/SwiftParserTest/StringLiteralRepresentedLiteralValueTests.swift

@@ -135,7 +135,7 @@ public class SyntaxVisitorTests: XCTestCase {
   public func testBasic() {
     class FuncCounter: SyntaxVisitor {
       var funcCount = 0
-      override func visitFunctionDeclSyntax(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind {
+      override func visit(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind {
         funcCount += 1
         return .visitChildren
       }
@@ -150,7 +150,7 @@ public class SyntaxVisitorTests: XCTestCase {
 
   public func testRewritingNodeWithEmptyChild() {
     class ClosureRewriter: SyntaxRewriter {
-      override func visitClosureExprSyntax(_ node: ClosureExprSyntax) -> ExprSyntax {
+      override func visit(_ node: ClosureExprSyntax) -> ExprSyntax {
         // Perform a no-op transform that requires rebuilding the node.
         return ExprSyntax(node.with(\.statements, node.statements))
       }
@@ -181,15 +181,15 @@ public class SyntaxVisitorTests: XCTestCase {
     let rewriter = VisitAnyRewriter(transform: { _ in
       return TokenSyntax.identifier("")
     })
-    let rewritten = rewriter.visitDeclReferenceExprSyntax(parsed)
+    let rewritten = rewriter.visit(parsed)
     XCTAssertEqual(rewritten.description, "")
   }
 
   public func testSyntaxRewriterVisitCollection() {
     class VisitCollections: SyntaxVisitor {
       var numberOfCodeBlockItems = 0
 
-      override func visitCodeBlockItemListSyntax(_ items: CodeBlockItemListSyntax) -> SyntaxVisitorContinueKind {
+      override func visit(_ items: CodeBlockItemListSyntax) -> SyntaxVisitorContinueKind {
         numberOfCodeBlockItems += items.count
         return .visitChildren
       }
@@ -203,9 +203,9 @@ public class SyntaxVisitorTests: XCTestCase {
   public func testVisitorClass() {
     class FuncCounter: SyntaxVisitor {
       var funcCount = 0
-      override func visitFunctionDeclSyntax(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind {
+      override func visit(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind {
         funcCount += 1
-        return super.visitFunctionDeclSyntax(node)
+        return super.visit(node)
       }
     }
     let sourceFile = Self.nestedFunctionsFile

Tests/SwiftSyntaxTest/SyntaxVisitorTests.swift

@@ -20,7 +20,7 @@ public class VisitorTests: XCTestCase {
     class MissingExprChecker: SyntaxVisitor {
       var didSeeMissingExprSyntax = false
 
-      override func visitMissingExprSyntax(_ node: MissingExprSyntax) -> SyntaxVisitorContinueKind {
+      override func visit(_ node: MissingExprSyntax) -> SyntaxVisitorContinueKind {
         didSeeMissingExprSyntax = true
         return .visitChildren
       }