A couple more renames of SwiftSyntax nodes

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift

@@ -190,7 +190,8 @@ public let ATTRIBUTE_NODES: [Node] = [
     traits: ["WithTrailingComma"],
     children: [
       Child(
-        name: "AvailabilityVersionRestriction",
+        name: "PlatformVersion",
+        deprecatedName: "AvailabilityVersionRestriction",
         kind: .node(kind: .platformVersion)
       ),
       Child(

CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift

@@ -1384,8 +1384,7 @@ public let EXPR_NODES: [Node] = [
       Child(
         name: "Operator",
         deprecatedName: "OperatorToken",
-        kind: .token(choices: [.token(tokenKind: "PrefixOperatorToken")]),
-        isOptional: true
+        kind: .token(choices: [.token(tokenKind: "PrefixOperatorToken")])
       ),
       Child(
         name: "Expression",

Sources/SwiftIDEUtils/SyntaxClassification.swift

@@ -65,7 +65,7 @@ extension SyntaxClassification {
     switch keyPath {
     case \AttributeSyntax.attributeName:
       return (.attribute, true)
-    case \PlatformVersionItemSyntax.availabilityVersionRestriction:
+    case \PlatformVersionItemSyntax.platformVersion:
       return (.keyword, false)
     case \AvailabilityVersionRestrictionSyntax.platform:
       return (.keyword, false)

Sources/SwiftParser/Attributes.swift

@@ -914,7 +914,7 @@ extension Parser {
       keepGoing = self.consume(if: .comma)
       elements.append(
         RawPlatformVersionItemSyntax(
-          availabilityVersionRestriction: versionRestriction,
+          platformVersion: versionRestriction,
           trailingComma: keepGoing,
           arena: self.arena
         )
@@ -974,7 +974,7 @@ extension Parser {
       keepGoing = self.consume(if: .comma)
       platforms.append(
         RawPlatformVersionItemSyntax(
-          availabilityVersionRestriction: restriction,
+          platformVersion: restriction,
           trailingComma: keepGoing,
           arena: self.arena
         )

Sources/SwiftParser/IncrementalParseTransition.swift

@@ -35,7 +35,7 @@ extension Parser {
   }
 }
 
-/// Accepts a re-used ``Syntax`` node that `IncrementalParseTransition`
+/// Accepts a re-used `Syntax` node that `IncrementalParseTransition`
 /// determined they should be re-used for a parse invocation.
 ///
 /// The client can use this information to potentially avoid unnecessary work

Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift

@@ -1043,8 +1043,7 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
         addDiagnostic(unexpected, UnknownDirectiveError(unexpected: unexpected), handledNodes: [unexpected.id, node.baseName.id])
       } else if let availability = unexpected.first?.as(AvailabilityConditionSyntax.self) {
         if let prefixOperatorExpr = node.parent?.as(PrefixOperatorExprSyntax.self),
-          let operatorToken = prefixOperatorExpr.operator,
-          operatorToken.text == "!",
+          prefixOperatorExpr.operator.text == "!",
           let conditionElement = prefixOperatorExpr.parent?.as(ConditionElementSyntax.self)
         {
           // Diagnose !#available(...) and !#unavailable(...)
@@ -1059,7 +1058,10 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
             NegatedAvailabilityCondition(availabilityCondition: availability, negatedAvailabilityKeyword: negatedAvailabilityKeyword),
             fixIts: [
               FixIt(
-                message: ReplaceTokensFixIt(replaceTokens: [operatorToken, availability.availabilityKeyword], replacements: [negatedAvailabilityKeyword]),
+                message: ReplaceTokensFixIt(
+                  replaceTokens: [prefixOperatorExpr.operator, availability.availabilityKeyword],
+                  replacements: [negatedAvailabilityKeyword]
+                ),
                 changes: [
                   .replace(oldNode: Syntax(conditionElement), newNode: Syntax(negatedConditionElement))
                 ]

Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift

@@ -2437,12 +2437,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
     return "pattern"
   case \PatternExprSyntax.unexpectedAfterPattern:
     return "unexpectedAfterPattern"
-  case \PlatformVersionItemSyntax.unexpectedBeforeAvailabilityVersionRestriction:
-    return "unexpectedBeforeAvailabilityVersionRestriction"
-  case \PlatformVersionItemSyntax.availabilityVersionRestriction:
-    return "availabilityVersionRestriction"
-  case \PlatformVersionItemSyntax.unexpectedBetweenAvailabilityVersionRestrictionAndTrailingComma:
-    return "unexpectedBetweenAvailabilityVersionRestrictionAndTrailingComma"
+  case \PlatformVersionItemSyntax.unexpectedBeforePlatformVersion:
+    return "unexpectedBeforePlatformVersion"
+  case \PlatformVersionItemSyntax.platformVersion:
+    return "platformVersion"
+  case \PlatformVersionItemSyntax.unexpectedBetweenPlatformVersionAndTrailingComma:
+    return "unexpectedBetweenPlatformVersionAndTrailingComma"
   case \PlatformVersionItemSyntax.trailingComma:
     return "trailingComma"
   case \PlatformVersionItemSyntax.unexpectedAfterTrailingComma:

Sources/SwiftSyntax/generated/RenamedChildrenCompatibility.swift

@@ -5767,6 +5767,61 @@ extension PatternBindingSyntax {
   }
 }
 
+extension PlatformVersionItemSyntax {
+  @available(*, deprecated, renamed: "unexpectedBeforePlatformVersion")
+  public var unexpectedBeforeAvailabilityVersionRestriction: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBeforePlatformVersion
+    }
+    set {
+      unexpectedBeforePlatformVersion = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "platformVersion")
+  public var availabilityVersionRestriction: PlatformVersionSyntax {
+    get {
+      return platformVersion
+    }
+    set {
+      platformVersion = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "unexpectedBetweenPlatformVersionAndTrailingComma")
+  public var unexpectedBetweenAvailabilityVersionRestrictionAndTrailingComma: UnexpectedNodesSyntax? {
+    get {
+      return unexpectedBetweenPlatformVersionAndTrailingComma
+    }
+    set {
+      unexpectedBetweenPlatformVersionAndTrailingComma = newValue
+    }
+  }
+  
+  @available(*, deprecated, renamed: "PlatformVersionItemSyntax(leadingTrivia:_:platformVersion:_:trailingComma:_:trailingTrivia:)")
+  @_disfavoredOverload
+  public init(
+      leadingTrivia: Trivia? = nil,
+      _ unexpectedBeforeAvailabilityVersionRestriction: UnexpectedNodesSyntax? = nil,
+      availabilityVersionRestriction: PlatformVersionSyntax,
+      _ unexpectedBetweenAvailabilityVersionRestrictionAndTrailingComma: UnexpectedNodesSyntax? = nil,
+      trailingComma: TokenSyntax? = nil,
+      _ unexpectedAfterTrailingComma: UnexpectedNodesSyntax? = nil,
+      trailingTrivia: Trivia? = nil
+    
+  ) {
+    self.init(
+        leadingTrivia: leadingTrivia, 
+        unexpectedBeforeAvailabilityVersionRestriction, 
+        platformVersion: availabilityVersionRestriction, 
+        unexpectedBetweenAvailabilityVersionRestrictionAndTrailingComma, 
+        trailingComma: trailingComma, 
+        unexpectedAfterTrailingComma, 
+        trailingTrivia: trailingTrivia
+      )
+  }
+}
+
 extension PostfixOperatorExprSyntax {
   @available(*, deprecated, renamed: "unexpectedBetweenExpressionAndOperator")
   public var unexpectedBetweenExpressionAndOperatorToken: UnexpectedNodesSyntax? {
@@ -6354,7 +6409,7 @@ extension PrefixOperatorExprSyntax {
   }
 
   @available(*, deprecated, renamed: "operator")
-  public var operatorToken: TokenSyntax? {
+  public var operatorToken: TokenSyntax {
     get {
       return `operator`
     }
@@ -6398,7 +6453,7 @@ extension PrefixOperatorExprSyntax {
   public init(
       leadingTrivia: Trivia? = nil,
       _ unexpectedBeforeOperatorToken: UnexpectedNodesSyntax? = nil,
-      operatorToken: TokenSyntax? = nil,
+      operatorToken: TokenSyntax,
       _ unexpectedBetweenOperatorTokenAndPostfixExpression: UnexpectedNodesSyntax? = nil,
       postfixExpression: some ExprSyntaxProtocol,
       _ unexpectedAfterPostfixExpression: UnexpectedNodesSyntax? = nil,

Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift

@@ -16273,34 +16273,34 @@ public struct RawPlatformVersionItemSyntax: RawSyntaxNodeProtocol {
   }
 
   public init(
-      _ unexpectedBeforeAvailabilityVersionRestriction: RawUnexpectedNodesSyntax? = nil, 
-      availabilityVersionRestriction: RawPlatformVersionSyntax, 
-      _ unexpectedBetweenAvailabilityVersionRestrictionAndTrailingComma: RawUnexpectedNodesSyntax? = nil, 
+      _ unexpectedBeforePlatformVersion: RawUnexpectedNodesSyntax? = nil, 
+      platformVersion: RawPlatformVersionSyntax, 
+      _ unexpectedBetweenPlatformVersionAndTrailingComma: RawUnexpectedNodesSyntax? = nil, 
       trailingComma: RawTokenSyntax?, 
       _ unexpectedAfterTrailingComma: RawUnexpectedNodesSyntax? = nil, 
       arena: __shared SyntaxArena
     ) {
     let raw = RawSyntax.makeLayout(
       kind: .platformVersionItem, uninitializedCount: 5, arena: arena) { layout in
       layout.initialize(repeating: nil)
-      layout[0] = unexpectedBeforeAvailabilityVersionRestriction?.raw
-      layout[1] = availabilityVersionRestriction.raw
-      layout[2] = unexpectedBetweenAvailabilityVersionRestrictionAndTrailingComma?.raw
+      layout[0] = unexpectedBeforePlatformVersion?.raw
+      layout[1] = platformVersion.raw
+      layout[2] = unexpectedBetweenPlatformVersionAndTrailingComma?.raw
       layout[3] = trailingComma?.raw
       layout[4] = unexpectedAfterTrailingComma?.raw
     }
     self.init(unchecked: raw)
   }
 
-  public var unexpectedBeforeAvailabilityVersionRestriction: RawUnexpectedNodesSyntax? {
+  public var unexpectedBeforePlatformVersion: RawUnexpectedNodesSyntax? {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 
-  public var availabilityVersionRestriction: RawPlatformVersionSyntax {
+  public var platformVersion: RawPlatformVersionSyntax {
     layoutView.children[1].map(RawPlatformVersionSyntax.init(raw:))!
   }
 
-  public var unexpectedBetweenAvailabilityVersionRestrictionAndTrailingComma: RawUnexpectedNodesSyntax? {
+  public var unexpectedBetweenPlatformVersionAndTrailingComma: RawUnexpectedNodesSyntax? {
     layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 
@@ -17361,7 +17361,7 @@ public struct RawPrefixOperatorExprSyntax: RawExprSyntaxNodeProtocol {
 
   public init(
       _ unexpectedBeforeOperator: RawUnexpectedNodesSyntax? = nil, 
-      operator: RawTokenSyntax?, 
+      operator: RawTokenSyntax, 
       _ unexpectedBetweenOperatorAndExpression: RawUnexpectedNodesSyntax? = nil, 
       expression: RawExprSyntax, 
       _ unexpectedAfterExpression: RawUnexpectedNodesSyntax? = nil, 
@@ -17371,7 +17371,7 @@ public struct RawPrefixOperatorExprSyntax: RawExprSyntaxNodeProtocol {
       kind: .prefixOperatorExpr, uninitializedCount: 5, arena: arena) { layout in
       layout.initialize(repeating: nil)
       layout[0] = unexpectedBeforeOperator?.raw
-      layout[1] = `operator`?.raw
+      layout[1] = `operator`.raw
       layout[2] = unexpectedBetweenOperatorAndExpression?.raw
       layout[3] = expression.raw
       layout[4] = unexpectedAfterExpression?.raw
@@ -17383,8 +17383,8 @@ public struct RawPrefixOperatorExprSyntax: RawExprSyntaxNodeProtocol {
     layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
   }
 
-  public var `operator`: RawTokenSyntax? {
-    layoutView.children[1].map(RawTokenSyntax.init(raw:))
+  public var `operator`: RawTokenSyntax {
+    layoutView.children[1].map(RawTokenSyntax.init(raw:))!
   }
 
   public var unexpectedBetweenOperatorAndExpression: RawUnexpectedNodesSyntax? {

Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift

@@ -2122,7 +2122,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
   case .prefixOperatorExpr:
     assert(layout.count == 5)
     assertNoError(kind, 0, verify(layout[0], as: RawUnexpectedNodesSyntax?.self))
-    assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax?.self, tokenChoices: [.tokenKind(.prefixOperator)]))
+    assertNoError(kind, 1, verify(layout[1], as: RawTokenSyntax.self, tokenChoices: [.tokenKind(.prefixOperator)]))
     assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))
     assertNoError(kind, 3, verify(layout[3], as: RawExprSyntax.self))
     assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))