Skip to content

Commit c1ab7e6

Browse files
ahoppenahoppen
authored
Merge pull request #982 from ahoppen/ahoppen/remove-name-name-for-diags
Remove name_for_diagnostics='name'
2 parents 1f966fa + 46a85d6 commit c1ab7e6

File tree

12 files changed

+77
-77
lines changed

12 files changed

+77
-77
lines changed

‎Sources/SwiftSyntax/gyb_generated/syntax_nodes/SyntaxDeclNodes.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ public struct TypealiasDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
694694
case 6:
695695
return nil
696696
case 7:
697-
return "name"
697+
return nil
698698
case 8:
699699
return nil
700700
case 9:
@@ -1163,7 +1163,7 @@ public struct AssociatedtypeDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
11631163
case 6:
11641164
return nil
11651165
case 7:
1166-
return "name"
1166+
return nil
11671167
case 8:
11681168
return nil
11691169
case 9:
@@ -2694,7 +2694,7 @@ public struct ClassDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
26942694
case 6:
26952695
return nil
26962696
case 7:
2697-
return "name"
2697+
return nil
26982698
case 8:
26992699
return nil
27002700
case 9:
@@ -3214,7 +3214,7 @@ public struct ActorDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
32143214
case 6:
32153215
return nil
32163216
case 7:
3217-
return "name"
3217+
return nil
32183218
case 8:
32193219
return nil
32203220
case 9:
@@ -3734,7 +3734,7 @@ public struct StructDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
37343734
case 6:
37353735
return nil
37363736
case 7:
3737-
return "name"
3737+
return nil
37383738
case 8:
37393739
return nil
37403740
case 9:
@@ -4254,7 +4254,7 @@ public struct ProtocolDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
42544254
case 6:
42554255
return nil
42564256
case 7:
4257-
return "name"
4257+
return nil
42584258
case 8:
42594259
return nil
42604260
case 9:
@@ -4728,7 +4728,7 @@ public struct ExtensionDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
47284728
case 6:
47294729
return nil
47304730
case 7:
4731-
return "name"
4731+
return nil
47324732
case 8:
47334733
return nil
47344734
case 9:
@@ -5242,7 +5242,7 @@ public struct FunctionDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
52425242
case 6:
52435243
return nil
52445244
case 7:
5245-
return "name"
5245+
return nil
52465246
case 8:
52475247
return nil
52485248
case 9:
@@ -8654,7 +8654,7 @@ public struct EnumDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
86548654
case 6:
86558655
return nil
86568656
case 7:
8657-
return "name"
8657+
return nil
86588658
case 8:
86598659
return nil
86608660
case 9:
@@ -9048,7 +9048,7 @@ public struct OperatorDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
90489048
case 6:
90499049
return nil
90509050
case 7:
9051-
return "name"
9051+
return nil
90529052
case 8:
90539053
return nil
90549054
case 9:
@@ -9534,7 +9534,7 @@ public struct PrecedenceGroupDeclSyntax: DeclSyntaxProtocol, SyntaxHashable {
95349534
case 6:
95359535
return nil
95369536
case 7:
9537-
return "name"
9537+
return nil
95389538
case 8:
95399539
return nil
95409540
case 9:

‎Sources/SwiftSyntax/gyb_generated/syntax_nodes/SyntaxNodes.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8282,7 +8282,7 @@ public struct FunctionParameterSyntax: SyntaxProtocol, SyntaxHashable {
82828282
case 4:
82838283
return nil
82848284
case 5:
8285-
return "name"
8285+
return nil
82868286
case 6:
82878287
return nil
82888288
case 7:
@@ -9739,7 +9739,7 @@ public struct EnumCaseElementSyntax: SyntaxProtocol, SyntaxHashable {
97399739
case 0:
97409740
return nil
97419741
case 1:
9742-
return "name"
9742+
return nil
97439743
case 2:
97449744
return nil
97459745
case 3:

‎Sources/SwiftSyntax/gyb_generated/syntax_nodes/SyntaxStmtNodes.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ public struct LabeledStmtSyntax: StmtSyntaxProtocol, SyntaxHashable {
296296
case 0:
297297
return nil
298298
case 1:
299-
return "name"
299+
return "label name"
300300
case 2:
301301
return nil
302302
case 3:

‎Tests/SwiftParserTest/Declarations.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ final class DeclarationTests: XCTestCase {
5555
AssertParse(
5656
"func 1️⃣/^notoperator^/ (lhs: Int, rhs: Int) -> Int { 1 / 2 }",
5757
diagnostics: [
58-
DiagnosticSpec(message: "expected name in function"),
58+
DiagnosticSpec(message: "expected identifier in function"),
5959
DiagnosticSpec(message: "unexpected code '/^notoperator^/' before parameter clause")
6060
]
6161
)
@@ -159,7 +159,7 @@ final class DeclarationTests: XCTestCase {
159159
"protocol P{1️⃣{}case2️⃣",
160160
diagnostics: [
161161
DiagnosticSpec(locationMarker: "1️⃣", message: "unexpected code '{}' before enum case"),
162-
DiagnosticSpec(locationMarker: "2️⃣", message: "expected name in enum case"),
162+
DiagnosticSpec(locationMarker: "2️⃣", message: "expected identifier in enum case"),
163163
DiagnosticSpec(locationMarker: "2️⃣", message: "expected '}' to end protocol"),
164164
])
165165
}
@@ -689,8 +689,8 @@ final class DeclarationTests: XCTestCase {
689689
}
690690
""",
691691
diagnostics: [
692-
DiagnosticSpec(locationMarker: "1️⃣", message: "name can only start with a letter or underscore, not a number"),
693-
DiagnosticSpec(locationMarker: "2️⃣", message: "name can only start with a letter or underscore, not a number"),
692+
DiagnosticSpec(locationMarker: "1️⃣", message: "identifier can only start with a letter or underscore, not a number"),
693+
DiagnosticSpec(locationMarker: "2️⃣", message: "identifier can only start with a letter or underscore, not a number"),
694694
]
695695
)
696696
}
@@ -819,7 +819,7 @@ final class DeclarationTests: XCTestCase {
819819
diagnostics: [
820820
DiagnosticSpec(locationMarker: "1️⃣", message: "expected ':' in parameter"),
821821
DiagnosticSpec(locationMarker: "3️⃣", message: "expected ')' to end parameter clause"),
822-
DiagnosticSpec(locationMarker: "4️⃣", message: "expected name and member block in struct"),
822+
DiagnosticSpec(locationMarker: "4️⃣", message: "expected identifier and member block in struct"),
823823
DiagnosticSpec(locationMarker: "4️⃣", message: "extraneous code ': Int) {}' at top level"),
824824
]
825825
)
@@ -1026,7 +1026,7 @@ final class DeclarationTests: XCTestCase {
10261026
AssertParse(
10271027
"associatedtype 1️⃣5s",
10281028
diagnostics: [
1029-
DiagnosticSpec(message: "name can only start with a letter or underscore, not a number"),
1029+
DiagnosticSpec(message: "identifier can only start with a letter or underscore, not a number"),
10301030
]
10311031
)
10321032
}
@@ -1129,7 +1129,7 @@ final class DeclarationTests: XCTestCase {
11291129
AssertParse(
11301130
"func 1️⃣{}",
11311131
diagnostics: [
1132-
DiagnosticSpec(message: "expected name and function signature in function")
1132+
DiagnosticSpec(message: "expected identifier and function signature in function")
11331133
]
11341134
)
11351135
}

‎Tests/SwiftParserTest/translated/DeprecatedWhereTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ final class DeprecatedWhereTests: XCTestCase {
182182
DiagnosticSpec(locationMarker: "2️⃣", message: "expected inherited type in generic parameter"),
183183
DiagnosticSpec(locationMarker: "2️⃣", message: "expected '>' to end generic parameter clause"),
184184
DiagnosticSpec(locationMarker: "2️⃣", message: "expected parameter clause in function signature"),
185-
DiagnosticSpec(locationMarker: "3️⃣", message: "expected name and member block in protocol"),
185+
DiagnosticSpec(locationMarker: "3️⃣", message: "expected identifier and member block in protocol"),
186186
DiagnosticSpec(locationMarker: "3️⃣", message: "extraneous code '<ProtoA, ProtoB> where T: ProtoC>(x: T) {}' at top level"),
187187
]
188188
)
@@ -199,7 +199,7 @@ final class DeprecatedWhereTests: XCTestCase {
199199
DiagnosticSpec(locationMarker: "2️⃣", message: "expected inherited type in generic parameter"),
200200
DiagnosticSpec(locationMarker: "2️⃣", message: "expected '>' to end generic parameter clause"),
201201
DiagnosticSpec(locationMarker: "2️⃣", message: "expected parameter clause in function signature"),
202-
DiagnosticSpec(locationMarker: "3️⃣", message: "expected name and member block in protocol"),
202+
DiagnosticSpec(locationMarker: "3️⃣", message: "expected identifier and member block in protocol"),
203203
DiagnosticSpec(locationMarker: "3️⃣", message: "extraneous code '<ProtoA, ProtoB> where T: ProtoC>(x: T) where T: ProtoD {}' at top level"),
204204
]
205205
)

‎Tests/SwiftParserTest/translated/DollarIdentifierTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ final class DollarIdentifierTests: XCTestCase {
5757
""",
5858
diagnostics: [
5959
// TODO: Old parser expected error on line 2: '$' is not an identifier; use backticks to escape it, Fix-It replacements: 9 - 10 = '`$`'
60-
DiagnosticSpec(message: "expected name and member block in class"),
60+
DiagnosticSpec(message: "expected identifier and member block in class"),
6161
]
6262
)
6363
}
@@ -71,7 +71,7 @@ final class DollarIdentifierTests: XCTestCase {
7171
""",
7272
diagnostics: [
7373
// TODO: Old parser expected error on line 2: '$' is not an identifier; use backticks to escape it, Fix-It replacements: 8 - 9 = '`$`'
74-
DiagnosticSpec(message: "expected name and member block in enum"),
74+
DiagnosticSpec(message: "expected identifier and member block in enum"),
7575
]
7676
)
7777
}
@@ -85,7 +85,7 @@ final class DollarIdentifierTests: XCTestCase {
8585
""",
8686
diagnostics: [
8787
// TODO: Old parser expected error on line 2: '$' is not an identifier; use backticks to escape it, Fix-It replacements: 10 - 11 = '`$`'
88-
DiagnosticSpec(message: "expected name and member block in struct"),
88+
DiagnosticSpec(message: "expected identifier and member block in struct"),
8989
]
9090
)
9191
}
@@ -102,7 +102,7 @@ final class DollarIdentifierTests: XCTestCase {
102102
diagnostics: [
103103
// TODO: Old parser expected error on line 2: '$' is not an identifier; use backticks to escape it, Fix-It replacements: 8 - 9 = '`$`'
104104
// TODO: Old parser expected error on line 2: '$' is not an identifier; use backticks to escape it, Fix-It replacements: 10 - 11 = '`$`'
105-
DiagnosticSpec(locationMarker: "1️⃣", message: "expected name in function"),
105+
DiagnosticSpec(locationMarker: "1️⃣", message: "expected identifier in function"),
106106
DiagnosticSpec(locationMarker: "1️⃣", message: "unexpected code '$' before parameter clause"),
107107
DiagnosticSpec(locationMarker: "2️⃣", message: "expected type in parameter"),
108108
DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code '$ dollarParam: Int' in parameter clause"),

‎Tests/SwiftParserTest/translated/EnumTests.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ final class EnumTests: XCTestCase {
247247
}
248248
""",
249249
diagnostics: [
250-
DiagnosticSpec(locationMarker: "1️⃣", message: "name can only start with a letter or underscore, not a number"),
250+
DiagnosticSpec(locationMarker: "1️⃣", message: "identifier can only start with a letter or underscore, not a number"),
251251
DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code ':' in enum"),
252252
]
253253
)
@@ -275,7 +275,7 @@ final class EnumTests: XCTestCase {
275275
}
276276
""",
277277
diagnostics: [
278-
DiagnosticSpec(locationMarker: "1️⃣", message: "expected name in enum case"),
278+
DiagnosticSpec(locationMarker: "1️⃣", message: "expected identifier in enum case"),
279279
DiagnosticSpec(locationMarker: "2️⃣", message: "expected ':' and type in parameter"),
280280
DiagnosticSpec(locationMarker: "3️⃣", message: "expected type in parameter"),
281281
DiagnosticSpec(locationMarker: "3️⃣", message: "unexpected code '0' in parameter clause"),
@@ -331,7 +331,7 @@ final class EnumTests: XCTestCase {
331331
}
332332
""",
333333
diagnostics: [
334-
DiagnosticSpec(message: "expected name in enum case"),
334+
DiagnosticSpec(message: "expected identifier in enum case"),
335335
]
336336
)
337337
}
@@ -344,7 +344,7 @@ final class EnumTests: XCTestCase {
344344
}
345345
""",
346346
diagnostics: [
347-
DiagnosticSpec(message: "expected name in enum case"),
347+
DiagnosticSpec(message: "expected identifier in enum case"),
348348
DiagnosticSpec(message: "unexpected code ':' in enum"),
349349
]
350350
)
@@ -418,7 +418,7 @@ final class EnumTests: XCTestCase {
418418
diagnostics: [
419419
DiagnosticSpec(locationMarker: "1️⃣", message: "'_' cannot be used as an identifier here"),
420420
DiagnosticSpec(locationMarker: "2️⃣", message: "'_' cannot be used as an identifier here"),
421-
DiagnosticSpec(locationMarker: "3️⃣", message: "expected name in enum case"),
421+
DiagnosticSpec(locationMarker: "3️⃣", message: "expected identifier in enum case"),
422422
]
423423
)
424424
}
@@ -1287,7 +1287,7 @@ final class EnumTests: XCTestCase {
12871287
}
12881288
""",
12891289
diagnostics: [
1290-
DiagnosticSpec(message: "expected name in enum case"),
1290+
DiagnosticSpec(message: "expected identifier in enum case"),
12911291
]
12921292
)
12931293
}
@@ -1301,7 +1301,7 @@ final class EnumTests: XCTestCase {
13011301
}
13021302
""",
13031303
diagnostics: [
1304-
DiagnosticSpec(message: "expected name in enum case"),
1304+
DiagnosticSpec(message: "expected identifier in enum case"),
13051305
]
13061306
)
13071307
}
@@ -1329,8 +1329,8 @@ final class EnumTests: XCTestCase {
13291329
}
13301330
"""#,
13311331
diagnostics: [
1332-
DiagnosticSpec(locationMarker: "1️⃣", message: "expected name in enum case"),
1333-
DiagnosticSpec(locationMarker: "2️⃣", message: "expected name in enum case"),
1332+
DiagnosticSpec(locationMarker: "1️⃣", message: "expected identifier in enum case"),
1333+
DiagnosticSpec(locationMarker: "2️⃣", message: "expected identifier in enum case"),
13341334
]
13351335
)
13361336
}

0 commit comments

Comments
 (0)