Rename a couple name for diagnsotics based on new syntax names

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift

@@ -280,7 +280,7 @@ public let DECL_NODES: [Node] = [
       Child(
         name: "InheritanceClause",
         kind: .node(kind: .inheritanceClause),
-        nameForDiagnostics: "type inheritance clause",
+        nameForDiagnostics: "inheritance clause",
         isOptional: true
       ),
       Child(
@@ -742,7 +742,7 @@ public let DECL_NODES: [Node] = [
         name: "DefaultValue",
         deprecatedName: "DefaultArgument",
         kind: .node(kind: .initializerClause),
-        nameForDiagnostics: "default argument",
+        nameForDiagnostics: "default value",
         documentation: "If the parameter has a default value, the initializer clause describing the default value.",
         isOptional: true
       ),
@@ -1087,7 +1087,7 @@ public let DECL_NODES: [Node] = [
         name: "DefaultValue",
         deprecatedName: "DefaultArgument",
         kind: .node(kind: .initializerClause),
-        nameForDiagnostics: "default argument",
+        nameForDiagnostics: "default value",
         isOptional: true
       ),
       Child(
@@ -2194,7 +2194,7 @@ public let DECL_NODES: [Node] = [
       Child(
         name: "InheritanceClause",
         kind: .node(kind: .inheritanceClause),
-        nameForDiagnostics: "type inheritance clause",
+        nameForDiagnostics: "inheritance clause",
         documentation: "The struct declaration inheritance clause describing one or more conformances for this struct declaration.",
         isOptional: true
       ),

CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift

@@ -310,7 +310,7 @@ public let EXPR_NODES: [Node] = [
   Node(
     kind: .closureCapture,
     base: .syntax,
-    nameForDiagnostics: "closure capture item",
+    nameForDiagnostics: "closure capture",
     traits: [
       "WithTrailingComma"
     ],
@@ -346,7 +346,7 @@ public let EXPR_NODES: [Node] = [
   Node(
     kind: .closureCaptureClause,
     base: .syntax,
-    nameForDiagnostics: "closure capture signature",
+    nameForDiagnostics: "closure capture clause",
     children: [
       Child(
         name: "LeftSquare",

Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift

@@ -33,7 +33,7 @@ private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
   case \ActorDeclSyntax.genericParameterClause:
     return "generic parameter clause"
   case \ActorDeclSyntax.inheritanceClause:
-    return "type inheritance clause"
+    return "inheritance clause"
   case \ActorDeclSyntax.genericWhereClause:
     return "generic where clause"
   case \ArrayElementSyntax.expression:
@@ -117,7 +117,7 @@ private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
   case \EnumCaseParameterSyntax.type:
     return "type"
   case \EnumCaseParameterSyntax.defaultValue:
-    return "default argument"
+    return "default value"
   case \EnumDeclSyntax.attributes:
     return "attributes"
   case \EnumDeclSyntax.modifiers:
@@ -167,7 +167,7 @@ private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
   case \FunctionParameterSyntax.type:
     return "type"
   case \FunctionParameterSyntax.defaultValue:
-    return "default argument"
+    return "default value"
   case \GenericParameterSyntax.eachKeyword:
     return "parameter pack specifier"
   case \GenericParameterSyntax.name:
@@ -317,7 +317,7 @@ private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
   case \StructDeclSyntax.genericParameterClause:
     return "generic parameter clause"
   case \StructDeclSyntax.inheritanceClause:
-    return "type inheritance clause"
+    return "inheritance clause"
   case \StructDeclSyntax.genericWhereClause:
     return "generic where clause"
   case \SubscriptCallExprSyntax.calledExpression:

Sources/SwiftParserDiagnostics/generated/SyntaxKindNameForDiagnostics.swift

@@ -72,11 +72,11 @@ extension SyntaxKind {
     case .classDecl:
       return "class"
     case .closureCaptureClause:
-      return "closure capture signature"
+      return "closure capture clause"
     case .closureCaptureSpecifier:
       return "closure capture specifier"
     case .closureCapture:
-      return "closure capture item"
+      return "closure capture"
     case .closureExpr:
       return "closure"
     case .closureParameterClause:

Tests/SwiftParserTest/TypeTests.swift

@@ -99,12 +99,12 @@ final class TypeTests: XCTestCase {
       diagnostics: [
         DiagnosticSpec(
           locationMarker: "1️⃣",
-          message: "expected identifier in closure capture item",
+          message: "expected identifier in closure capture",
           fixIts: ["insert identifier"]
         ),
         DiagnosticSpec(
           locationMarker: "1️⃣",
-          message: "unexpected 'class' keyword in closure capture signature"
+          message: "unexpected 'class' keyword in closure capture clause"
         ),
         DiagnosticSpec(
           locationMarker: "2️⃣",
@@ -123,16 +123,16 @@ final class TypeTests: XCTestCase {
       "{[n1️⃣`]in}",
       { ExprSyntax.parse(from: &$0) },
       diagnostics: [
-        DiagnosticSpec(message: "unexpected code '`' in closure capture signature")
+        DiagnosticSpec(message: "unexpected code '`' in closure capture clause")
       ]
     )
 
     assertParse(
       "{[weak1️⃣^]in}",
       { ExprSyntax.parse(from: &$0) },
       diagnostics: [
-        DiagnosticSpec(message: "expected identifier in closure capture item", fixIts: ["insert identifier"]),
-        DiagnosticSpec(message: "unexpected code '^' in closure capture signature"),
+        DiagnosticSpec(message: "expected identifier in closure capture", fixIts: ["insert identifier"]),
+        DiagnosticSpec(message: "unexpected code '^' in closure capture clause"),
       ],
       fixedSource: """
         {[weak <#identifier#>^]in}