Merge pull request #1638 from whiteio/whiteio/rename-accesspathsyntax-to-importpathsyntax

Rename `AccessPathSyntax` to `ImportPathSyntax`

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift

@@ -11,9 +11,8 @@
 //===----------------------------------------------------------------------===//
 
 public let DECL_NODES: [Node] = [
-  // FIXME: technically misnamed; should be "ImportPathComponent"
   Node(
-    name: "AccessPathComponent",
+    name: "ImportPathComponent",
     nameForDiagnostics: nil,
     kind: "Syntax",
     children: [
@@ -30,12 +29,11 @@ public let DECL_NODES: [Node] = [
     ]
   ),
 
-  // FIXME: technically misnamed; should be "ImportPath"
   Node(
-    name: "AccessPath",
+    name: "ImportPath",
     nameForDiagnostics: nil,
     kind: "SyntaxCollection",
-    element: "AccessPathComponent"
+    element: "ImportPathComponent"
   ),
 
   Node(
@@ -1094,7 +1092,7 @@ public let DECL_NODES: [Node] = [
       ),
       Child(
         name: "Path",
-        kind: .collection(kind: "AccessPath", collectionElementName: "PathComponent"),
+        kind: .collection(kind: "ImportPath", collectionElementName: "PathComponent"),
         description: "The path to the module, submodule or symbol being imported."
       ),
     ]

Sources/SwiftParser/Declarations.swift

@@ -310,7 +310,7 @@ extension Parser {
   ) -> RawImportDeclSyntax {
     let (unexpectedBeforeImportKeyword, importKeyword) = self.eat(handle)
     let kind = self.parseImportKind()
-    let path = self.parseImportAccessPath()
+    let path = self.parseImportPath()
     return RawImportDeclSyntax(
       attributes: attrs.attributes,
       modifiers: attrs.modifiers,
@@ -369,22 +369,22 @@ extension Parser {
   }
 
   @_spi(RawSyntax)
-  public mutating func parseImportAccessPath() -> RawAccessPathSyntax {
-    var elements = [RawAccessPathComponentSyntax]()
+  public mutating func parseImportPath() -> RawImportPathSyntax {
+    var elements = [RawImportPathComponentSyntax]()
     var keepGoing: RawTokenSyntax? = nil
     var loopProgress = LoopProgressCondition()
     repeat {
       let name = self.parseAnyIdentifier()
       keepGoing = self.consume(if: .period)
       elements.append(
-        RawAccessPathComponentSyntax(
+        RawImportPathComponentSyntax(
           name: name,
           trailingDot: keepGoing,
           arena: self.arena
         )
       )
     } while keepGoing != nil && loopProgress.evaluate(currentToken)
-    return RawAccessPathSyntax(elements: elements, arena: self.arena)
+    return RawImportPathSyntax(elements: elements, arena: self.arena)
   }
 }
 

Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift

@@ -16,8 +16,6 @@ import SwiftSyntax
 
 private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
   switch keyPath {
-  case \AccessPathComponentSyntax.name:
-    return "name"
   case \AccessorDeclSyntax.attributes:
     return "attributes"
   case \AccessorDeclSyntax.modifier:
@@ -198,6 +196,8 @@ private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
     return "attributes"
   case \ImportDeclSyntax.modifiers:
     return "modifiers"
+  case \ImportPathComponentSyntax.name:
+    return "name"
   case \InitializerDeclSyntax.attributes:
     return "attributes"
   case \InitializerDeclSyntax.modifiers:

Sources/SwiftSyntax/Documentation.docc/generated/SwiftSyntax.md

@@ -194,8 +194,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 - <doc:SwiftSyntax/SyntaxChildren>
 - <doc:SwiftSyntax/SyntaxChildrenIndex>
 - <doc:SwiftSyntax/SyntaxChildrenIndexData>
-- <doc:SwiftSyntax/AccessPathSyntax>
-- <doc:SwiftSyntax/AccessPathComponentSyntax>
 - <doc:SwiftSyntax/AccessorListSyntax>
 - <doc:SwiftSyntax/AccessorDeclSyntax>
 - <doc:SwiftSyntax/ArrayElementListSyntax>
@@ -250,6 +248,8 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 - <doc:SwiftSyntax/GenericRequirementSyntax>
 - <doc:SwiftSyntax/IfConfigClauseListSyntax>
 - <doc:SwiftSyntax/IfConfigClauseSyntax>
+- <doc:SwiftSyntax/ImportPathSyntax>
+- <doc:SwiftSyntax/ImportPathComponentSyntax>
 - <doc:SwiftSyntax/InheritedTypeListSyntax>
 - <doc:SwiftSyntax/InheritedTypeSyntax>
 - <doc:SwiftSyntax/KeyPathComponentListSyntax>

Sources/SwiftSyntax/SwiftSyntaxCompatibility.swift

@@ -19,3 +19,9 @@ public extension DeclGroupSyntax {
     return self.memberBlock
   }
 }
+
+@available(*, deprecated, renamed: "ImportPathSyntax")
+public typealias AccessPathSyntax = ImportPathSyntax
+
+@available(*, deprecated, renamed: "ImportPathComponentSyntax")
+public typealias AccessPathComponentSyntax = ImportPathComponentSyntax

Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift

@@ -17,16 +17,6 @@
 @_spi(RawSyntax)
 public func childName(_ keyPath: AnyKeyPath) -> String? {
   switch keyPath {
-  case \AccessPathComponentSyntax.unexpectedBeforeName:
-    return "unexpectedBeforeName"
-  case \AccessPathComponentSyntax.name:
-    return "name"
-  case \AccessPathComponentSyntax.unexpectedBetweenNameAndTrailingDot:
-    return "unexpectedBetweenNameAndTrailingDot"
-  case \AccessPathComponentSyntax.trailingDot:
-    return "trailingDot"
-  case \AccessPathComponentSyntax.unexpectedAfterTrailingDot:
-    return "unexpectedAfterTrailingDot"
   case \AccessorBlockSyntax.unexpectedBeforeLeftBrace:
     return "unexpectedBeforeLeftBrace"
   case \AccessorBlockSyntax.leftBrace:
@@ -1689,6 +1679,16 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "path"
   case \ImportDeclSyntax.unexpectedAfterPath:
     return "unexpectedAfterPath"
+  case \ImportPathComponentSyntax.unexpectedBeforeName:
+    return "unexpectedBeforeName"
+  case \ImportPathComponentSyntax.name:
+    return "name"
+  case \ImportPathComponentSyntax.unexpectedBetweenNameAndTrailingDot:
+    return "unexpectedBetweenNameAndTrailingDot"
+  case \ImportPathComponentSyntax.trailingDot:
+    return "trailingDot"
+  case \ImportPathComponentSyntax.unexpectedAfterTrailingDot:
+    return "unexpectedAfterTrailingDot"
   case \InOutExprSyntax.unexpectedBeforeAmpersand:
     return "unexpectedBeforeAmpersand"
   case \InOutExprSyntax.ampersand:

Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift

@@ -53,22 +53,6 @@ open class SyntaxAnyVisitor: SyntaxVisitor {
     visitAnyPost(node._syntaxNode)
   }
 
-  override open func visit(_ node: AccessPathComponentSyntax) -> SyntaxVisitorContinueKind {
-    return visitAny(node._syntaxNode)
-  }
-  
-  override open func visitPost(_ node: AccessPathComponentSyntax) {
-    visitAnyPost(node._syntaxNode)
-  }
-  
-  override open func visit(_ node: AccessPathSyntax) -> SyntaxVisitorContinueKind {
-    return visitAny(node._syntaxNode)
-  }
-  
-  override open func visitPost(_ node: AccessPathSyntax) {
-    visitAnyPost(node._syntaxNode)
-  }
-  
   override open func visit(_ node: AccessorBlockSyntax) -> SyntaxVisitorContinueKind {
     return visitAny(node._syntaxNode)
   }
@@ -1149,6 +1133,22 @@ open class SyntaxAnyVisitor: SyntaxVisitor {
     visitAnyPost(node._syntaxNode)
   }
 
+  override open func visit(_ node: ImportPathComponentSyntax) -> SyntaxVisitorContinueKind {
+    return visitAny(node._syntaxNode)
+  }
+  
+  override open func visitPost(_ node: ImportPathComponentSyntax) {
+    visitAnyPost(node._syntaxNode)
+  }
+  
+  override open func visit(_ node: ImportPathSyntax) -> SyntaxVisitorContinueKind {
+    return visitAny(node._syntaxNode)
+  }
+  
+  override open func visitPost(_ node: ImportPathSyntax) {
+    visitAnyPost(node._syntaxNode)
+  }
+  
   override open func visit(_ node: InOutExprSyntax) -> SyntaxVisitorContinueKind {
     return visitAny(node._syntaxNode)
   }

Sources/SwiftSyntax/generated/SyntaxBaseNodes.swift

@@ -684,8 +684,6 @@ extension Syntax {
   public static var structure: SyntaxNodeStructure {
     return .choices([
           .node(TokenSyntax.self),
-          .node(AccessPathComponentSyntax.self),
-          .node(AccessPathSyntax.self),
           .node(AccessorBlockSyntax.self),
           .node(AccessorDeclSyntax.self),
           .node(AccessorEffectSpecifiersSyntax.self),
@@ -821,6 +819,8 @@ extension Syntax {
           .node(ImplementsAttributeArgumentsSyntax.self),
           .node(ImplicitlyUnwrappedOptionalTypeSyntax.self),
           .node(ImportDeclSyntax.self),
+          .node(ImportPathComponentSyntax.self),
+          .node(ImportPathSyntax.self),
           .node(InOutExprSyntax.self),
           .node(InfixOperatorExprSyntax.self),
           .node(InheritedTypeListSyntax.self),