Fix-ups to some of the syntax node renames

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift

@@ -726,7 +726,7 @@ public let EXPR_NODES: [Node] = [
 
   // expression segment in a string interpolation expression.
   Node(
-    kind: .exprSegment,
+    kind: .expressionSegment,
     base: .syntax,
     nameForDiagnostics: nil,
     traits: [
@@ -1514,7 +1514,7 @@ public let EXPR_NODES: [Node] = [
     kind: .stringLiteralSegmentList,
     base: .syntaxCollection,
     nameForDiagnostics: nil,
-    elementChoices: [.stringSegment, .exprSegment]
+    elementChoices: [.stringSegment, .expressionSegment]
   ),
 
   // string literal segment in a string interpolation expression.
@@ -1624,9 +1624,10 @@ public let EXPR_NODES: [Node] = [
     traits: ["WithStatements"],
     children: [
       Child(
-        name: "UnknownAttribute",
+        name: "Attribute",
         deprecatedName: "UnknownAttr",
         kind: .node(kind: .attribute),
+        documentation: "The `@unknown` attribute of a default label, if present.",
         isOptional: true
       ),
       Child(

CodeGeneration/Sources/SyntaxSupport/PatternNodes.swift

@@ -13,7 +13,7 @@
 public let PATTERN_NODES: [Node] = [
   // expr-pattern -> expr
   Node(
-    kind: .exprPattern,
+    kind: .expressionPattern,
     base: .pattern,
     nameForDiagnostics: "pattern",
     children: [

CodeGeneration/Sources/SyntaxSupport/StmtNodes.swift

@@ -261,7 +261,7 @@ public let STMT_NODES: [Node] = [
 
   // fallthrough-stmt -> 'fallthrough' ';'?
   Node(
-    kind: .fallThroughtStmt,
+    kind: .fallThroughStmt,
     base: .stmt,
     nameForDiagnostics: "'fallthrough' statement",
     children: [

CodeGeneration/Sources/SyntaxSupport/SyntaxNodeKind.swift

@@ -128,11 +128,11 @@ public enum SyntaxNodeKind: String, CaseIterable {
   case exposeAttributeArguments
   case exprList
   case expr
-  case exprPattern
-  case exprSegment
+  case expressionPattern
+  case expressionSegment
   case expressionStmt
   case extensionDecl
-  case fallThroughtStmt
+  case fallThroughStmt
   case floatLiteralExpr
   case forStmt
   case forceUnwrapExpr
@@ -401,8 +401,6 @@ public enum SyntaxNodeKind: String, CaseIterable {
     case .differentiabilityArguments: return "differentiabilityParams"
     case .differentiabilityArgument: return "differentiabilityParam"
     case .dynamicReplacementAttributeArguments: return "dynamicReplacementArguments"
-    case .exprPattern: return "expressionPattern"
-    case .exprSegment: return "expressionSegment"
     case .forceUnwrapExpr: return "forcedValueExpr"
     case .forStmt: return "forInStmt"
     case .labeledSpecializeArgument: return "labeledSpecializeEntry"
@@ -432,7 +430,7 @@ public enum SyntaxNodeKind: String, CaseIterable {
     case .switchCaseItem: return "caseItem"
     case .closureCaptureClause: return "closureCaptureSignature"
     case .designatedType: return "designatedTypeElement"
-    case .fallThroughtStmt: return "fallthroughStmt"
+    case .fallThroughStmt: return "fallthroughStmt"
     case .patternExpr: return "unresolvedPatternExpr"
     case .subscriptCallExpr: return "subscriptExpr"
     case .unresolvedInfixOperatorExpr: return "binaryOperatorExpr"

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RawSyntaxNodesFile.swift

@@ -113,7 +113,7 @@ let rawSyntaxNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
           let cases = SwitchCaseItemListSyntax {
             for n in SYNTAX_NODES where n.base == node.kind {
               SwitchCaseItemSyntax(
-                pattern: ExprPatternSyntax(
+                pattern: ExpressionPatternSyntax(
                   expression: ExprSyntax(".\(raw: n.varOrCaseName)")
                 )
               )

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxBaseNodesFile.swift

@@ -111,7 +111,7 @@ let syntaxBaseNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
                 SwitchCaseLabelSyntax {
                   for childNode in SYNTAX_NODES where childNode.base == node.kind {
                     SwitchCaseItemSyntax(
-                      pattern: ExprPatternSyntax(
+                      pattern: ExpressionPatternSyntax(
                         expression: ExprSyntax(".\(childNode.varOrCaseName)")
                       )
                     )
@@ -144,7 +144,7 @@ let syntaxBaseNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
                 SwitchCaseLabelSyntax {
                   for childNode in SYNTAX_NODES where childNode.base == node.kind {
                     SwitchCaseItemSyntax(
-                      pattern: ExprPatternSyntax(
+                      pattern: ExpressionPatternSyntax(
                         expression: ExprSyntax(".\(childNode.varOrCaseName)")
                       )
                     )

CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift

@@ -292,7 +292,7 @@ class ValidateSyntaxNodes: XCTestCase {
           message: "child 'ClosingPounds' has a token as its only token choice and should thus be named 'RawStringPoundDelimiter'"
         ),
         ValidationFailure(
-          node: .exprSegment,
+          node: .expressionSegment,
           message: "child 'Pounds' has a token as its only token choice and should thus be named 'RawStringPoundDelimiter'"
         ),
 

Sources/SwiftBasicFormat/BasicFormat.swift

@@ -109,7 +109,7 @@ open class BasicFormat: SyntaxRewriter {
     var ancestor: Syntax = Syntax(token)
     while let parent = ancestor.parent {
       ancestor = parent
-      if ancestor.is(ExprSegmentSyntax.self) {
+      if ancestor.is(ExpressionSegmentSyntax.self) {
         return true
       }
     }

Sources/SwiftParser/Expressions.swift

@@ -2196,7 +2196,7 @@ extension Parser {
         elements.append(
           .switchCase(
             RawSwitchCaseSyntax(
-              unknownAttribute: nil,
+              attribute: nil,
               label: .case(
                 RawSwitchCaseLabelSyntax(
                   caseKeyword: missingToken(.case),
@@ -2290,7 +2290,7 @@ extension Parser {
     let statements = parseSwitchCaseBody()
 
     return RawSwitchCaseSyntax(
-      unknownAttribute: unknownAttr,
+      attribute: unknownAttr,
       label: label,
       statements: statements,
       arena: self.arena

Sources/SwiftParser/Patterns.swift

@@ -252,7 +252,7 @@ extension Parser {
         return RawPatternSyntax(pat.pattern)
       }
       let expr = RawExprSyntax(patternSyntax)
-      return RawPatternSyntax(RawExprPatternSyntax(expression: expr, arena: self.arena))
+      return RawPatternSyntax(RawExpressionPatternSyntax(expression: expr, arena: self.arena))
     }
   }
 }