Extract the optional part of canImport to a separate node

Author: StevenWong12

CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift

@@ -204,28 +204,37 @@ public let EXPR_NODES: [Node] = [
         kind: .token(choices: [.token(tokenKind: "IdentifierToken")])
       ),
       Child(
-        name: "Comma",
-        kind: .token(choices: [.token(tokenKind: "CommaToken")]),
+        name: "VersionInfo",
+        kind: .node(kind: "CanImportVersionInfo"),
         isOptional: true
       ),
+      Child(
+        name: "RightParen",
+        kind: .token(choices: [.token(tokenKind: "RightParenToken")])
+      ),
+    ]
+  ),
+
+  Node(
+    name: "CanImportVersionInfo",
+    nameForDiagnostics: nil,
+    kind: "Expr",
+    children: [
+      Child(
+        name: "Comma",
+        kind: .token(choices: [.token(tokenKind: "CommaToken")])
+      ),
       Child(
         name: "Label",
-        kind: .token(choices: [.keyword(text: "_version"), .keyword(text: "_underlyingVersion")]),
-        isOptional: true
+        kind: .token(choices: [.keyword(text: "_version"), .keyword(text: "_underlyingVersion")])
       ),
       Child(
         name: "Colon",
-        kind: .token(choices: [.token(tokenKind: "ColonToken")]),
-        isOptional: true
+        kind: .token(choices: [.token(tokenKind: "ColonToken")])
       ),
       Child(
         name: "VersionTuple",
-        kind: .node(kind: "VersionTuple"),
-        isOptional: true
-      ),
-      Child(
-        name: "RightParen",
-        kind: .token(choices: [.token(tokenKind: "RightParenToken")])
+        kind: .node(kind: "VersionTuple")
       ),
     ]
   ),

Sources/SwiftParser/Expressions.swift

@@ -2597,20 +2597,15 @@ extension Parser {
 
     let (unexpectedBeforeImportPath, importPath) = self.expect(.identifier)
 
-    let comma = self.consume(if: .comma)
+    var versionInfo: RawCanImportVersionInfoSyntax?
 
-    var unexpectedBeforeLabel: RawUnexpectedNodesSyntax?
-    var label: RawTokenSyntax?
-
-    var unexpectedBeforeColon: RawUnexpectedNodesSyntax?
-    var colon: RawTokenSyntax?
-    var version: RawVersionTupleSyntax?
+    if let comma = self.consume(if: .comma) {
+      let (unexpectedBeforeLabel, label) = self.expect(.keyword(._version), .keyword(._underlyingVersion), default: .keyword(._version))
+      let (unexpectedBeforeColon, colon) = self.expect(.colon)
 
-    if comma != nil {
-      (unexpectedBeforeLabel, label) = self.expect(.keyword(._version), .keyword(._underlyingVersion), default: .keyword(._version))
-      (unexpectedBeforeColon, colon) = self.expect(.colon)
+      let version = self.parseVersionTuple(maxComponentCount: 4)
 
-      version = self.parseVersionTuple(maxComponentCount: 4)
+      versionInfo = RawCanImportVersionInfoSyntax(comma: comma, unexpectedBeforeLabel, label: label, unexpectedBeforeColon, colon: colon, versionTuple: version, arena: self.arena)
     }
 
     let (unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)
@@ -2622,12 +2617,7 @@ extension Parser {
         leftParen: leftParen,
         unexpectedBeforeImportPath,
         importPath: importPath,
-        comma: comma,
-        unexpectedBeforeLabel,
-        label: label,
-        unexpectedBeforeColon,
-        colon: colon,
-        versionTuple: version,
+        versionInfo: versionInfo,
         unexpectedBeforeRightParen,
         rightParen: rightParen,
         arena: self.arena

Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift

@@ -536,20 +536,8 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
       return .skipChildren
     }
 
-    if let label = node.label,
-      label.presence == .missing
-    {
-      addDiagnostic(
-        label,
-        .canImportWrongSecondParameterLabel,
-        handledNodes: [label.id]
-      )
-
-      handledNodes.append(contentsOf: [node.unexpectedBetweenLabelAndColon?.id, node.colon?.id, node.versionTuple?.id].compactMap { $0 })
-    }
-
-    if let versionTuple = node.versionTuple,
-      let unexpectedVersionTuple = node.unexpectedBetweenVersionTupleAndRightParen
+    if let versionTuple = node.versionInfo?.versionTuple,
+      let unexpectedVersionTuple = node.unexpectedBetweenVersionInfoAndRightParen
     {
       if versionTuple.major.presence == .missing {
         addDiagnostic(
@@ -569,6 +557,24 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
     return .visitChildren
   }
 
+  public override func visit(_ node: CanImportVersionInfoSyntax) -> SyntaxVisitorContinueKind {
+    if shouldSkip(node) {
+      return .skipChildren
+    }
+
+    if node.label.presence == .missing {
+      addDiagnostic(
+        node.label,
+        .canImportWrongSecondParameterLabel,
+        handledNodes: [node.label.id]
+      )
+
+      handledNodes.append(contentsOf: [node.unexpectedBetweenLabelAndColon?.id, node.colon.id, node.versionTuple.id].compactMap { $0 })
+    }
+
+    return .visitChildren
+  }
+
   public override func visit(_ node: ConditionElementSyntax) -> SyntaxVisitorContinueKind {
     if shouldSkip(node) {
       return .skipChildren

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

@@ -94,6 +94,7 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 - <doc:SwiftSyntax/BooleanLiteralExprSyntax>
 - <doc:SwiftSyntax/BorrowExprSyntax>
 - <doc:SwiftSyntax/CanImportExprSyntax>
+- <doc:SwiftSyntax/CanImportVersionInfoSyntax>
 - <doc:SwiftSyntax/ClosureExprSyntax>
 - <doc:SwiftSyntax/DictionaryExprSyntax>
 - <doc:SwiftSyntax/DiscardAssignmentExprSyntax>

Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift

@@ -411,28 +411,34 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "unexpectedBetweenLeftParenAndImportPath"
   case \CanImportExprSyntax.importPath:
     return "importPath"
-  case \CanImportExprSyntax.unexpectedBetweenImportPathAndComma:
-    return "unexpectedBetweenImportPathAndComma"
-  case \CanImportExprSyntax.comma:
+  case \CanImportExprSyntax.unexpectedBetweenImportPathAndVersionInfo:
+    return "unexpectedBetweenImportPathAndVersionInfo"
+  case \CanImportExprSyntax.versionInfo:
+    return "versionInfo"
+  case \CanImportExprSyntax.unexpectedBetweenVersionInfoAndRightParen:
+    return "unexpectedBetweenVersionInfoAndRightParen"
+  case \CanImportExprSyntax.rightParen:
+    return "rightParen"
+  case \CanImportExprSyntax.unexpectedAfterRightParen:
+    return "unexpectedAfterRightParen"
+  case \CanImportVersionInfoSyntax.unexpectedBeforeComma:
+    return "unexpectedBeforeComma"
+  case \CanImportVersionInfoSyntax.comma:
     return "comma"
-  case \CanImportExprSyntax.unexpectedBetweenCommaAndLabel:
+  case \CanImportVersionInfoSyntax.unexpectedBetweenCommaAndLabel:
     return "unexpectedBetweenCommaAndLabel"
-  case \CanImportExprSyntax.label:
+  case \CanImportVersionInfoSyntax.label:
     return "label"
-  case \CanImportExprSyntax.unexpectedBetweenLabelAndColon:
+  case \CanImportVersionInfoSyntax.unexpectedBetweenLabelAndColon:
     return "unexpectedBetweenLabelAndColon"
-  case \CanImportExprSyntax.colon:
+  case \CanImportVersionInfoSyntax.colon:
     return "colon"
-  case \CanImportExprSyntax.unexpectedBetweenColonAndVersionTuple:
+  case \CanImportVersionInfoSyntax.unexpectedBetweenColonAndVersionTuple:
     return "unexpectedBetweenColonAndVersionTuple"
-  case \CanImportExprSyntax.versionTuple:
+  case \CanImportVersionInfoSyntax.versionTuple:
     return "versionTuple"
-  case \CanImportExprSyntax.unexpectedBetweenVersionTupleAndRightParen:
-    return "unexpectedBetweenVersionTupleAndRightParen"
-  case \CanImportExprSyntax.rightParen:
-    return "rightParen"
-  case \CanImportExprSyntax.unexpectedAfterRightParen:
-    return "unexpectedAfterRightParen"
+  case \CanImportVersionInfoSyntax.unexpectedAfterVersionTuple:
+    return "unexpectedAfterVersionTuple"
   case \CaseItemSyntax.unexpectedBeforePattern:
     return "unexpectedBeforePattern"
   case \CaseItemSyntax.pattern:

Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift

@@ -325,6 +325,14 @@ open class SyntaxAnyVisitor: SyntaxVisitor {
     visitAnyPost(node._syntaxNode)
   }
 
+  override open func visit(_ node: CanImportVersionInfoSyntax) -> SyntaxVisitorContinueKind {
+    return visitAny(node._syntaxNode)
+  }
+  
+  override open func visitPost(_ node: CanImportVersionInfoSyntax) {
+    visitAnyPost(node._syntaxNode)
+  }
+  
   override open func visit(_ node: CaseItemListSyntax) -> SyntaxVisitorContinueKind {
     return visitAny(node._syntaxNode)
   }

Sources/SwiftSyntax/generated/SyntaxBaseNodes.swift

@@ -206,7 +206,7 @@ public struct ExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
 
   public init?<S: SyntaxProtocol>(_ node: S) {
     switch node.raw.kind {
-    case .arrayExpr, .arrowExpr, .asExpr, .assignmentExpr, .awaitExpr, .binaryOperatorExpr, .booleanLiteralExpr, .borrowExpr, .canImportExpr, .closureExpr, .dictionaryExpr, .discardAssignmentExpr, .editorPlaceholderExpr, .floatLiteralExpr, .forcedValueExpr, .functionCallExpr, .identifierExpr, .ifExpr, .inOutExpr, .infixOperatorExpr, .integerLiteralExpr, .isExpr, .keyPathExpr, .macroExpansionExpr, .memberAccessExpr, .missingExpr, .moveExpr, .nilLiteralExpr, .optionalChainingExpr, .packElementExpr, .packExpansionExpr, .postfixIfConfigExpr, .postfixUnaryExpr, .prefixOperatorExpr, .regexLiteralExpr, .sequenceExpr, .specializeExpr, .stringLiteralExpr, .subscriptExpr, .superRefExpr, .switchExpr, .ternaryExpr, .tryExpr, .tupleExpr, .typeExpr, .unresolvedAsExpr, .unresolvedIsExpr, .unresolvedPatternExpr, .unresolvedTernaryExpr:
+    case .arrayExpr, .arrowExpr, .asExpr, .assignmentExpr, .awaitExpr, .binaryOperatorExpr, .booleanLiteralExpr, .borrowExpr, .canImportExpr, .canImportVersionInfo, .closureExpr, .dictionaryExpr, .discardAssignmentExpr, .editorPlaceholderExpr, .floatLiteralExpr, .forcedValueExpr, .functionCallExpr, .identifierExpr, .ifExpr, .inOutExpr, .infixOperatorExpr, .integerLiteralExpr, .isExpr, .keyPathExpr, .macroExpansionExpr, .memberAccessExpr, .missingExpr, .moveExpr, .nilLiteralExpr, .optionalChainingExpr, .packElementExpr, .packExpansionExpr, .postfixIfConfigExpr, .postfixUnaryExpr, .prefixOperatorExpr, .regexLiteralExpr, .sequenceExpr, .specializeExpr, .stringLiteralExpr, .subscriptExpr, .superRefExpr, .switchExpr, .ternaryExpr, .tryExpr, .tupleExpr, .typeExpr, .unresolvedAsExpr, .unresolvedIsExpr, .unresolvedPatternExpr, .unresolvedTernaryExpr:
       self._syntaxNode = node._syntaxNode
     default:
       return nil
@@ -218,7 +218,7 @@ public struct ExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
   /// is undefined.
   internal init(_ data: SyntaxData) {
     switch data.raw.kind {
-    case .arrayExpr, .arrowExpr, .asExpr, .assignmentExpr, .awaitExpr, .binaryOperatorExpr, .booleanLiteralExpr, .borrowExpr, .canImportExpr, .closureExpr, .dictionaryExpr, .discardAssignmentExpr, .editorPlaceholderExpr, .floatLiteralExpr, .forcedValueExpr, .functionCallExpr, .identifierExpr, .ifExpr, .inOutExpr, .infixOperatorExpr, .integerLiteralExpr, .isExpr, .keyPathExpr, .macroExpansionExpr, .memberAccessExpr, .missingExpr, .moveExpr, .nilLiteralExpr, .optionalChainingExpr, .packElementExpr, .packExpansionExpr, .postfixIfConfigExpr, .postfixUnaryExpr, .prefixOperatorExpr, .regexLiteralExpr, .sequenceExpr, .specializeExpr, .stringLiteralExpr, .subscriptExpr, .superRefExpr, .switchExpr, .ternaryExpr, .tryExpr, .tupleExpr, .typeExpr, .unresolvedAsExpr, .unresolvedIsExpr, .unresolvedPatternExpr, .unresolvedTernaryExpr:
+    case .arrayExpr, .arrowExpr, .asExpr, .assignmentExpr, .awaitExpr, .binaryOperatorExpr, .booleanLiteralExpr, .borrowExpr, .canImportExpr, .canImportVersionInfo, .closureExpr, .dictionaryExpr, .discardAssignmentExpr, .editorPlaceholderExpr, .floatLiteralExpr, .forcedValueExpr, .functionCallExpr, .identifierExpr, .ifExpr, .inOutExpr, .infixOperatorExpr, .integerLiteralExpr, .isExpr, .keyPathExpr, .macroExpansionExpr, .memberAccessExpr, .missingExpr, .moveExpr, .nilLiteralExpr, .optionalChainingExpr, .packElementExpr, .packExpansionExpr, .postfixIfConfigExpr, .postfixUnaryExpr, .prefixOperatorExpr, .regexLiteralExpr, .sequenceExpr, .specializeExpr, .stringLiteralExpr, .subscriptExpr, .superRefExpr, .switchExpr, .ternaryExpr, .tryExpr, .tupleExpr, .typeExpr, .unresolvedAsExpr, .unresolvedIsExpr, .unresolvedPatternExpr, .unresolvedTernaryExpr:
       break
     default:
       preconditionFailure("Unable to create ExprSyntax from \(data.raw.kind)")
@@ -263,6 +263,7 @@ public struct ExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
           .node(BooleanLiteralExprSyntax.self),
           .node(BorrowExprSyntax.self),
           .node(CanImportExprSyntax.self),
+          .node(CanImportVersionInfoSyntax.self),
           .node(ClosureExprSyntax.self),
           .node(DictionaryExprSyntax.self),
           .node(DiscardAssignmentExprSyntax.self),
@@ -719,6 +720,7 @@ extension Syntax {
           .node(BorrowExprSyntax.self),
           .node(BreakStmtSyntax.self),
           .node(CanImportExprSyntax.self),
+          .node(CanImportVersionInfoSyntax.self),
           .node(CaseItemListSyntax.self),
           .node(CaseItemSyntax.self),
           .node(CatchClauseListSyntax.self),

Sources/SwiftSyntax/generated/SyntaxEnum.swift

@@ -50,6 +50,7 @@ public enum SyntaxEnum {
   case borrowExpr(BorrowExprSyntax)
   case breakStmt(BreakStmtSyntax)
   case canImportExpr(CanImportExprSyntax)
+  case canImportVersionInfo(CanImportVersionInfoSyntax)
   case caseItemList(CaseItemListSyntax)
   case caseItem(CaseItemSyntax)
   case catchClauseList(CatchClauseListSyntax)
@@ -364,6 +365,8 @@ public extension Syntax {
       return .breakStmt(BreakStmtSyntax(self)!)
     case .canImportExpr:
       return .canImportExpr(CanImportExprSyntax(self)!)
+    case .canImportVersionInfo:
+      return .canImportVersionInfo(CanImportVersionInfoSyntax(self)!)
     case .caseItemList:
       return .caseItemList(CaseItemListSyntax(self)!)
     case .caseItem:

Sources/SwiftSyntax/generated/SyntaxKind.swift

@@ -50,6 +50,7 @@ public enum SyntaxKind {
   case borrowExpr
   case breakStmt
   case canImportExpr
+  case canImportVersionInfo
   case caseItemList
   case caseItem
   case catchClauseList
@@ -481,6 +482,8 @@ public enum SyntaxKind {
       return BreakStmtSyntax.self
     case .canImportExpr:
       return CanImportExprSyntax.self
+    case .canImportVersionInfo:
+      return CanImportVersionInfoSyntax.self
     case .caseItemList:
       return CaseItemListSyntax.self
     case .caseItem:

Sources/SwiftSyntax/generated/SyntaxRewriter.swift

@@ -263,6 +263,13 @@ open class SyntaxRewriter {
     return ExprSyntax(visitChildren(node))
   }
 
+  /// Visit a `CanImportVersionInfoSyntax`.
+  ///   - Parameter node: the node that is being visited
+  ///   - Returns: the rewritten node
+  open func visit(_ node: CanImportVersionInfoSyntax) -> ExprSyntax {
+    return ExprSyntax(visitChildren(node))
+  }
+  
   /// Visit a `CaseItemListSyntax`.
   ///   - Parameter node: the node that is being visited
   ///   - Returns: the rewritten node
@@ -2479,6 +2486,20 @@ open class SyntaxRewriter {
     return Syntax(visit(node))
   }
 
+  /// Implementation detail of visit(_:). Do not call directly.
+  private func visitImplCanImportVersionInfoSyntax(_ data: SyntaxData) -> Syntax {
+    let node = CanImportVersionInfoSyntax(data)
+    // Accessing _syntaxNode directly is faster than calling Syntax(node)
+    visitPre(node._syntaxNode)
+    defer {
+      visitPost(node._syntaxNode)
+    }
+    if let newNode = visitAny(node._syntaxNode) {
+      return newNode
+    }
+    return Syntax(visit(node))
+  }
+  
   /// Implementation detail of visit(_:). Do not call directly.
   private func visitImplCaseItemListSyntax(_ data: SyntaxData) -> Syntax {
     let node = CaseItemListSyntax(data)
@@ -5921,6 +5942,8 @@ open class SyntaxRewriter {
       return visitImplBreakStmtSyntax
     case .canImportExpr:
       return visitImplCanImportExprSyntax
+    case .canImportVersionInfo:
+      return visitImplCanImportVersionInfoSyntax
     case .caseItemList:
       return visitImplCaseItemListSyntax
     case .caseItem:
@@ -6475,6 +6498,8 @@ open class SyntaxRewriter {
       return visitImplBreakStmtSyntax(data)
     case .canImportExpr:
       return visitImplCanImportExprSyntax(data)
+    case .canImportVersionInfo:
+      return visitImplCanImportVersionInfoSyntax(data)
     case .caseItemList:
       return visitImplCaseItemListSyntax(data)
     case .caseItem:

Sources/SwiftSyntax/generated/SyntaxTransform.swift

@@ -189,6 +189,11 @@ public protocol SyntaxTransformVisitor {
   ///   - Returns: the sum of whatever the child visitors return.
   func visit(_ node: CanImportExprSyntax) -> ResultType
 
+  /// Visiting `CanImportVersionInfoSyntax` specifically.
+  ///   - Parameter node: the node we are visiting.
+  ///   - Returns: the sum of whatever the child visitors return.
+  func visit(_ node: CanImportVersionInfoSyntax) -> ResultType
+  
   /// Visiting `CaseItemListSyntax` specifically.
   ///   - Parameter node: the node we are visiting.
   ///   - Returns: the sum of whatever the child visitors return.
@@ -1623,6 +1628,13 @@ extension SyntaxTransformVisitor {
     visitAny(Syntax(node))
   }
 
+  /// Visiting `CanImportVersionInfoSyntax` specifically.
+  ///   - Parameter node: the node we are visiting.
+  ///   - Returns: nil by default.
+  public func visit(_ node: CanImportVersionInfoSyntax) -> ResultType {
+    visitAny(Syntax(node))
+  }
+  
   /// Visiting `CaseItemListSyntax` specifically.
   ///   - Parameter node: the node we are visiting.
   ///   - Returns: nil by default.
@@ -3361,6 +3373,8 @@ extension SyntaxTransformVisitor {
       return visit(derived)
     case .canImportExpr(let derived):
       return visit(derived)
+    case .canImportVersionInfo(let derived):
+      return visit(derived)
     case .caseItemList(let derived):
       return visit(derived)
     case .caseItem(let derived):