Remove name_for_diagnostics='name'

Sources/SwiftSyntax/gyb_generated/syntax_nodes/SyntaxDeclNodes.swift

@@ -694,7 +694,7 @@ public struct TypealiasDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
     case 6:
       return nil
     case 7:
-      return "name"
+      return nil
     case 8:
       return nil
     case 9:
@@ -1163,7 +1163,7 @@ public struct AssociatedtypeDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
     case 6:
       return nil
     case 7:
-      return "name"
+      return nil
     case 8:
       return nil
     case 9:
@@ -2694,7 +2694,7 @@ public struct ClassDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
     case 6:
       return nil
     case 7:
-      return "name"
+      return nil
     case 8:
       return nil
     case 9:
@@ -3214,7 +3214,7 @@ public struct ActorDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
     case 6:
       return nil
     case 7:
-      return "name"
+      return nil
     case 8:
       return nil
     case 9:
@@ -3734,7 +3734,7 @@ public struct StructDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
     case 6:
       return nil
     case 7:
-      return "name"
+      return nil
     case 8:
       return nil
     case 9:
@@ -4254,7 +4254,7 @@ public struct ProtocolDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
     case 6:
       return nil
     case 7:
-      return "name"
+      return nil
     case 8:
       return nil
     case 9:
@@ -4728,7 +4728,7 @@ public struct ExtensionDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
     case 6:
       return nil
     case 7:
-      return "name"
+      return nil
     case 8:
       return nil
     case 9:
@@ -5242,7 +5242,7 @@ public struct FunctionDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
     case 6:
       return nil
     case 7:
-      return "name"
+      return nil
     case 8:
       return nil
     case 9:
@@ -8654,7 +8654,7 @@ public struct EnumDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
     case 6:
       return nil
     case 7:
-      return "name"
+      return nil
     case 8:
       return nil
     case 9:
@@ -9048,7 +9048,7 @@ public struct OperatorDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
     case 6:
       return nil
     case 7:
-      return "name"
+      return nil
     case 8:
       return nil
     case 9:
@@ -9534,7 +9534,7 @@ public struct PrecedenceGroupDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
     case 6:
       return nil
     case 7:
-      return "name"
+      return nil
     case 8:
       return nil
     case 9:

Sources/SwiftSyntax/gyb_generated/syntax_nodes/SyntaxNodes.swift

@@ -8282,7 +8282,7 @@ public struct FunctionParameterSyntax: SyntaxProtocol, SyntaxHashable {
     case 4:
       return nil
     case 5:
-      return "name"
+      return nil
     case 6:
       return nil
     case 7:
@@ -9739,7 +9739,7 @@ public struct EnumCaseElementSyntax: SyntaxProtocol, SyntaxHashable {
     case 0:
       return nil
     case 1:
-      return "name"
+      return nil
     case 2:
       return nil
     case 3:

Sources/SwiftSyntax/gyb_generated/syntax_nodes/SyntaxStmtNodes.swift

@@ -296,7 +296,7 @@ public struct LabeledStmtSyntax: StmtSyntaxProtocol, SyntaxHashable {
     case 0:
       return nil
     case 1:
-      return "name"
+      return "label name"
     case 2:
       return nil
     case 3:

Tests/SwiftParserTest/Declarations.swift

@@ -55,7 +55,7 @@ final class DeclarationTests: XCTestCase {
     AssertParse(
       "func 1️⃣/^notoperator^/ (lhs: Int, rhs: Int) -> Int { 1 / 2 }",
       diagnostics: [
-        DiagnosticSpec(message: "expected name in function"),
+        DiagnosticSpec(message: "expected identifier in function"),
         DiagnosticSpec(message: "unexpected code '/^notoperator^/' before parameter clause")
       ]
     )
@@ -159,7 +159,7 @@ final class DeclarationTests: XCTestCase {
       "protocol P{1️⃣{}case2️⃣",
       diagnostics: [
         DiagnosticSpec(locationMarker: "1️⃣", message: "unexpected code '{}' before enum case"),
-        DiagnosticSpec(locationMarker: "2️⃣", message: "expected name in enum case"),
+        DiagnosticSpec(locationMarker: "2️⃣", message: "expected identifier in enum case"),
         DiagnosticSpec(locationMarker: "2️⃣", message: "expected '}' to end protocol"),
       ])
   }
@@ -689,8 +689,8 @@ final class DeclarationTests: XCTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "name can only start with a letter or underscore, not a number"),
-        DiagnosticSpec(locationMarker: "2️⃣", message: "name can only start with a letter or underscore, not a number"),
+        DiagnosticSpec(locationMarker: "1️⃣", message: "identifier can only start with a letter or underscore, not a number"),
+        DiagnosticSpec(locationMarker: "2️⃣", message: "identifier can only start with a letter or underscore, not a number"),
       ]
     )
   }
@@ -817,7 +817,7 @@ final class DeclarationTests: XCTestCase {
       diagnostics: [
         DiagnosticSpec(locationMarker: "1️⃣", message: "expected ':' in parameter"),
         DiagnosticSpec(locationMarker: "3️⃣", message: "expected ')' to end parameter clause"),
-        DiagnosticSpec(locationMarker: "4️⃣", message: "expected name and member block in struct"),
+        DiagnosticSpec(locationMarker: "4️⃣", message: "expected identifier and member block in struct"),
         DiagnosticSpec(locationMarker: "4️⃣", message: "extraneous code ': Int) {}' at top level"),
       ]
     )
@@ -1024,7 +1024,7 @@ final class DeclarationTests: XCTestCase {
     AssertParse(
       "associatedtype 1️⃣5s",
       diagnostics: [
-        DiagnosticSpec(message: "name can only start with a letter or underscore, not a number"),
+        DiagnosticSpec(message: "identifier can only start with a letter or underscore, not a number"),
       ]
     )
   }
@@ -1127,7 +1127,7 @@ final class DeclarationTests: XCTestCase {
     AssertParse(
       "func 1️⃣{}",
       diagnostics: [
-        DiagnosticSpec(message: "expected name and function signature in function")
+        DiagnosticSpec(message: "expected identifier and function signature in function")
       ]
     )
   }

Tests/SwiftParserTest/translated/DeprecatedWhereTests.swift

@@ -182,7 +182,7 @@ final class DeprecatedWhereTests: XCTestCase {
         DiagnosticSpec(locationMarker: "2️⃣", message: "expected inherited type in generic parameter"),
         DiagnosticSpec(locationMarker: "2️⃣", message: "expected '>' to end generic parameter clause"),
         DiagnosticSpec(locationMarker: "2️⃣", message: "expected parameter clause in function signature"),
-        DiagnosticSpec(locationMarker: "3️⃣", message: "expected name and member block in protocol"),
+        DiagnosticSpec(locationMarker: "3️⃣", message: "expected identifier and member block in protocol"),
         DiagnosticSpec(locationMarker: "3️⃣", message: "extraneous code '<ProtoA, ProtoB> where T: ProtoC>(x: T) {}' at top level"),
       ]
     )
@@ -199,7 +199,7 @@ final class DeprecatedWhereTests: XCTestCase {
         DiagnosticSpec(locationMarker: "2️⃣", message: "expected inherited type in generic parameter"),
         DiagnosticSpec(locationMarker: "2️⃣", message: "expected '>' to end generic parameter clause"),
         DiagnosticSpec(locationMarker: "2️⃣", message: "expected parameter clause in function signature"),
-        DiagnosticSpec(locationMarker: "3️⃣", message: "expected name and member block in protocol"),
+        DiagnosticSpec(locationMarker: "3️⃣", message: "expected identifier and member block in protocol"),
         DiagnosticSpec(locationMarker: "3️⃣", message: "extraneous code '<ProtoA, ProtoB> where T: ProtoC>(x: T) where T: ProtoD {}' at top level"),
       ]
     )

Tests/SwiftParserTest/translated/DollarIdentifierTests.swift

@@ -57,7 +57,7 @@ final class DollarIdentifierTests: XCTestCase {
       """,
       diagnostics: [
         // TODO: Old parser expected error on line 2: '$' is not an identifier; use backticks to escape it, Fix-It replacements: 9 - 10 = '`$`'
-        DiagnosticSpec(message: "expected name and member block in class"),
+        DiagnosticSpec(message: "expected identifier and member block in class"),
       ]
     )
   }
@@ -71,7 +71,7 @@ final class DollarIdentifierTests: XCTestCase {
       """,
       diagnostics: [
         // TODO: Old parser expected error on line 2: '$' is not an identifier; use backticks to escape it, Fix-It replacements: 8 - 9 = '`$`'
-        DiagnosticSpec(message: "expected name and member block in enum"),
+        DiagnosticSpec(message: "expected identifier and member block in enum"),
       ]
     )
   }
@@ -85,7 +85,7 @@ final class DollarIdentifierTests: XCTestCase {
       """,
       diagnostics: [
         // TODO: Old parser expected error on line 2: '$' is not an identifier; use backticks to escape it, Fix-It replacements: 10 - 11 = '`$`'
-        DiagnosticSpec(message: "expected name and member block in struct"),
+        DiagnosticSpec(message: "expected identifier and member block in struct"),
       ]
     )
   }
@@ -102,7 +102,7 @@ final class DollarIdentifierTests: XCTestCase {
       diagnostics: [
         // TODO: Old parser expected error on line 2: '$' is not an identifier; use backticks to escape it, Fix-It replacements: 8 - 9 = '`$`'
         // TODO: Old parser expected error on line 2: '$' is not an identifier; use backticks to escape it, Fix-It replacements: 10 - 11 = '`$`'
-        DiagnosticSpec(locationMarker: "1️⃣", message: "expected name in function"),
+        DiagnosticSpec(locationMarker: "1️⃣", message: "expected identifier in function"),
         DiagnosticSpec(locationMarker: "1️⃣", message: "unexpected code '$' before parameter clause"),
         DiagnosticSpec(locationMarker: "2️⃣", message: "expected type in parameter"),
         DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code '$ dollarParam: Int' in parameter clause"),

Tests/SwiftParserTest/translated/EnumTests.swift

@@ -247,7 +247,7 @@ final class EnumTests: XCTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "name can only start with a letter or underscore, not a number"),
+        DiagnosticSpec(locationMarker: "1️⃣", message: "identifier can only start with a letter or underscore, not a number"),
         DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code ':' in enum"),
       ]
     )
@@ -275,7 +275,7 @@ final class EnumTests: XCTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "expected name in enum case"),
+        DiagnosticSpec(locationMarker: "1️⃣", message: "expected identifier in enum case"),
         DiagnosticSpec(locationMarker: "2️⃣", message: "expected ':' and type in parameter"),
         DiagnosticSpec(locationMarker: "3️⃣", message: "expected type in parameter"),
         DiagnosticSpec(locationMarker: "3️⃣", message: "unexpected code '0' in parameter clause"),
@@ -331,7 +331,7 @@ final class EnumTests: XCTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected name in enum case"),
+        DiagnosticSpec(message: "expected identifier in enum case"),
       ]
     )
   }
@@ -344,7 +344,7 @@ final class EnumTests: XCTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected name in enum case"),
+        DiagnosticSpec(message: "expected identifier in enum case"),
         DiagnosticSpec(message: "unexpected code ':' in enum"),
       ]
     )
@@ -418,7 +418,7 @@ final class EnumTests: XCTestCase {
       diagnostics: [
         DiagnosticSpec(locationMarker: "1️⃣", message: "'_' cannot be used as an identifier here"),
         DiagnosticSpec(locationMarker: "2️⃣", message: "'_' cannot be used as an identifier here"),
-        DiagnosticSpec(locationMarker: "3️⃣", message: "expected name in enum case"),
+        DiagnosticSpec(locationMarker: "3️⃣", message: "expected identifier in enum case"),
       ]
     )
   }
@@ -1287,7 +1287,7 @@ final class EnumTests: XCTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected name in enum case"),
+        DiagnosticSpec(message: "expected identifier in enum case"),
       ]
     )
   }
@@ -1301,7 +1301,7 @@ final class EnumTests: XCTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected name in enum case"),
+        DiagnosticSpec(message: "expected identifier in enum case"),
       ]
     )
   }
@@ -1329,8 +1329,8 @@ final class EnumTests: XCTestCase {
       }
       """#,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "expected name in enum case"),
-        DiagnosticSpec(locationMarker: "2️⃣", message: "expected name in enum case"),
+        DiagnosticSpec(locationMarker: "1️⃣", message: "expected identifier in enum case"),
+        DiagnosticSpec(locationMarker: "2️⃣", message: "expected identifier in enum case"),
       ]
     )
   }