@@ -7,15 +7,15 @@ final class ExpressionTests: XCTestCase {
7
7
AssertParse (
8
8
" let a =#^DIAG^# " ,
9
9
diagnostics: [
10
- DiagnosticSpec ( message: " Expected expression after '=' in variable " )
10
+ DiagnosticSpec ( message: " Expected expression in variable " )
11
11
]
12
12
)
13
13
14
14
AssertParse ( " a ? b : c ? d : e " )
15
15
AssertParse (
16
16
" a ? b :#^DIAG^# " ,
17
17
diagnostics: [
18
- DiagnosticSpec ( message: " Expected expression after ':' " )
18
+ DiagnosticSpec ( message: " Expected expression " )
19
19
]
20
20
)
21
21
}
@@ -102,7 +102,7 @@ final class ExpressionTests: XCTestCase {
102
102
c[#^DIAG^#
103
103
"""# ,
104
104
diagnostics: [
105
- DiagnosticSpec ( message: " Expected value after '[' in subscript " ) ,
105
+ DiagnosticSpec ( message: " Expected value in subscript " ) ,
106
106
DiagnosticSpec ( message: " Expected ']' to end subscript " ) ,
107
107
]
108
108
)
@@ -173,7 +173,7 @@ final class ExpressionTests: XCTestCase {
173
173
,#^END_ARRAY^#
174
174
""" ,
175
175
diagnostics: [
176
- DiagnosticSpec ( locationMarker: " EXPECTED_EXPR " , message: " Expected value after '[' in array element " ) ,
176
+ DiagnosticSpec ( locationMarker: " EXPECTED_EXPR " , message: " Expected value in array element " ) ,
177
177
DiagnosticSpec ( locationMarker: " END_ARRAY " , message: " Expected ']' to end array " ) ,
178
178
]
179
179
)
@@ -183,7 +183,7 @@ final class ExpressionTests: XCTestCase {
183
183
([1:#^DIAG^#)
184
184
""" ,
185
185
diagnostics: [
186
- DiagnosticSpec ( message: " Expected value after ':' in dictionary element " ) ,
186
+ DiagnosticSpec ( message: " Expected value in dictionary element " ) ,
187
187
DiagnosticSpec ( message: " Expected ']' to end dictionary " ) ,
188
188
]
189
189
)
@@ -401,8 +401,8 @@ final class ExpressionTests: XCTestCase {
401
401
\#^AFTER_SLASH^#\(#^AFTER_PAREN^#
402
402
"""## ,
403
403
diagnostics: [
404
- DiagnosticSpec ( locationMarker: " AFTER_SLASH " , message: #"Expected root and expression after '\' in key path"# ) ,
405
- DiagnosticSpec ( locationMarker: " AFTER_PAREN " , message: " Expected value after '(' in tuple " ) ,
404
+ DiagnosticSpec ( locationMarker: " AFTER_SLASH " , message: #"Expected root and expression in key path"# ) ,
405
+ DiagnosticSpec ( locationMarker: " AFTER_PAREN " , message: " Expected value in tuple " ) ,
406
406
DiagnosticSpec ( locationMarker: " AFTER_PAREN " , message: " Expected ')' to end tuple " ) ,
407
407
DiagnosticSpec ( locationMarker: " AFTER_PAREN " , message: " Expected expression in key path " ) ,
408
408
]
@@ -467,8 +467,8 @@ final class ExpressionTests: XCTestCase {
467
467
print "\(i)\"\n#^END^#
468
468
"""# ,
469
469
diagnostics: [
470
- DiagnosticSpec ( locationMarker: " KEY_PATH_1 " , message: " Expected expression after 'n' in key path " ) ,
471
- DiagnosticSpec ( locationMarker: " KEY_PATH_2 " , message: " Expected expression after 'n' in key path " ) ,
470
+ DiagnosticSpec ( locationMarker: " KEY_PATH_1 " , message: " Expected expression in key path " ) ,
471
+ DiagnosticSpec ( locationMarker: " KEY_PATH_2 " , message: " Expected expression in key path " ) ,
472
472
DiagnosticSpec ( locationMarker: " END " , message: #"Expected '"' to end string literal"# ) ,
473
473
DiagnosticSpec ( locationMarker: " END " , message: " Expected '}' to end 'if' statement " ) ,
474
474
DiagnosticSpec ( locationMarker: " END " , message: " Expected '}' to end function " ) ,
@@ -479,7 +479,7 @@ final class ExpressionTests: XCTestCase {
479
479
diagnostics: [
480
480
DiagnosticSpec ( message: " Expected identifier in '#keyPath' expression " ) ,
481
481
DiagnosticSpec ( message: " Expected ')' to end '#keyPath' expression " ) ,
482
- DiagnosticSpec ( locationMarker: " MISSING_VALUE " , message: " Expected value after ':' in function call " ) ,
482
+ DiagnosticSpec ( locationMarker: " MISSING_VALUE " , message: " Expected value in function call " ) ,
483
483
] )
484
484
}
485
485
@@ -488,7 +488,7 @@ final class ExpressionTests: XCTestCase {
488
488
" [(Int) -> #^DIAG^#throws Int]() " ,
489
489
diagnostics: [
490
490
// FIXME: We should suggest to move 'throws' in front of '->'
491
- DiagnosticSpec ( message: " Expected expression after '->' in array element " ) ,
491
+ DiagnosticSpec ( message: " Expected expression in array element " ) ,
492
492
DiagnosticSpec ( message: " Unexpected text 'throws Int' in array " ) ,
493
493
]
494
494
)
@@ -510,7 +510,7 @@ final class ExpressionTests: XCTestCase {
510
510
}
511
511
""" ,
512
512
diagnostics: [
513
- DiagnosticSpec ( message: " Expected expression after ':' in 'do' statement " )
513
+ DiagnosticSpec ( message: " Expected expression in 'do' statement " )
514
514
]
515
515
)
516
516
}
@@ -521,10 +521,10 @@ final class ExpressionTests: XCTestCase {
521
521
let #^VAR_NAME^#:(#^DIAG_1^#..)->#^END^#
522
522
""" ,
523
523
diagnostics: [
524
- DiagnosticSpec ( locationMarker: " VAR_NAME " , message: " Expected pattern after 'let' in variable " ) ,
525
- DiagnosticSpec ( locationMarker: " DIAG_1 " , message: " Expected type after '(' in function type " ) ,
524
+ DiagnosticSpec ( locationMarker: " VAR_NAME " , message: " Expected pattern in variable " ) ,
525
+ DiagnosticSpec ( locationMarker: " DIAG_1 " , message: " Expected type in function type " ) ,
526
526
DiagnosticSpec ( locationMarker: " DIAG_1 " , message: " Unexpected text '..' in function type " ) ,
527
- DiagnosticSpec ( locationMarker: " END " , message: " Expected type after '->' in function type " ) ,
527
+ DiagnosticSpec ( locationMarker: " END " , message: " Expected type in function type " ) ,
528
528
]
529
529
)
530
530
}
@@ -536,7 +536,7 @@ final class ExpressionTests: XCTestCase {
536
536
substructure: Syntax ( TokenSyntax . contextualKeyword ( " async " ) ) ,
537
537
substructureAfterMarker: " ASYNC " ,
538
538
diagnostics: [
539
- DiagnosticSpec ( locationMarker: " END " , message: " Expected expression after '->' " )
539
+ DiagnosticSpec ( locationMarker: " END " , message: " Expected expression " )
540
540
]
541
541
)
542
542
}
0 commit comments