Skip to content

Commit c3bd12d

Browse files
jakebaileyjakebailey
committed
Merge branch 'main' into tsgo-port
2 parents 9fece54 + 7b8cb3b commit c3bd12d

File tree

29 files changed

+153
-153
lines changed

29 files changed

+153
-153
lines changed

‎src/compiler/diagnosticMessages.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,7 @@
11111111
"category": "Error",
11121112
"code": 1343
11131113
},
1114-
"'A label is not allowed here.": {
1114+
"A label is not allowed here.": {
11151115
"category": "Error",
11161116
"code": 1344
11171117
},

‎tests/baselines/reference/ambientWithStatements(alwaysstrict=true).errors.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ambientWithStatements.ts(2,5): error TS1036: Statements are not allowed in ambient contexts.
22
ambientWithStatements.ts(3,5): error TS1104: A 'continue' statement can only be used within an enclosing iteration statement.
3-
ambientWithStatements.ts(10,5): error TS1344: 'A label is not allowed here.
3+
ambientWithStatements.ts(10,5): error TS1344: A label is not allowed here.
44
ambientWithStatements.ts(11,5): error TS1108: A 'return' statement can only be used within a function body.
55
ambientWithStatements.ts(25,5): error TS1101: 'with' statements are not allowed in strict mode.
66
ambientWithStatements.ts(25,5): error TS2410: The 'with' statement is not supported. All symbols in a 'with' block will have type 'any'.
@@ -22,7 +22,7 @@ ambientWithStatements.ts(25,5): error TS2410: The 'with' statement is not suppor
2222
1;
2323
L: var y;
2424
~
25-
!!! error TS1344: 'A label is not allowed here.
25+
!!! error TS1344: A label is not allowed here.
2626
return;
2727
~~~~~~
2828
!!! error TS1108: A 'return' statement can only be used within a function body.

‎tests/baselines/reference/constDeclarations-invalidContexts(alwaysstrict=true).errors.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ constDeclarations-invalidContexts.ts(15,1): error TS1101: 'with' statements are
66
constDeclarations-invalidContexts.ts(15,1): error TS2410: The 'with' statement is not supported. All symbols in a 'with' block will have type 'any'.
77
constDeclarations-invalidContexts.ts(19,5): error TS1156: 'const' declarations can only be declared inside a block.
88
constDeclarations-invalidContexts.ts(22,5): error TS1156: 'const' declarations can only be declared inside a block.
9-
constDeclarations-invalidContexts.ts(25,5): error TS1344: 'A label is not allowed here.
9+
constDeclarations-invalidContexts.ts(25,5): error TS1344: A label is not allowed here.
1010
constDeclarations-invalidContexts.ts(25,12): error TS1156: 'const' declarations can only be declared inside a block.
11-
constDeclarations-invalidContexts.ts(28,21): error TS1344: 'A label is not allowed here.
11+
constDeclarations-invalidContexts.ts(28,21): error TS1344: A label is not allowed here.
1212
constDeclarations-invalidContexts.ts(28,29): error TS1156: 'const' declarations can only be declared inside a block.
1313

1414

@@ -55,14 +55,14 @@ constDeclarations-invalidContexts.ts(28,29): error TS1156: 'const' declarations
5555
if (true)
5656
label: const c8 = 0;
5757
~~~~~
58-
!!! error TS1344: 'A label is not allowed here.
58+
!!! error TS1344: A label is not allowed here.
5959
~~~~~~~~~~~~~
6060
!!! error TS1156: 'const' declarations can only be declared inside a block.
6161

6262
while (false)
6363
label2: label3: label4: const c9 = 0;
6464
~~~~~~
65-
!!! error TS1344: 'A label is not allowed here.
65+
!!! error TS1344: A label is not allowed here.
6666
~~~~~~~~~~~~~
6767
!!! error TS1156: 'const' declarations can only be declared inside a block.
6868

‎tests/baselines/reference/constDeclarations-scopes(alwaysstrict=true).errors.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
constDeclarations-scopes.ts(27,1): error TS1101: 'with' statements are not allowed in strict mode.
22
constDeclarations-scopes.ts(27,1): error TS2410: The 'with' statement is not supported. All symbols in a 'with' block will have type 'any'.
3-
constDeclarations-scopes.ts(43,5): error TS1344: 'A label is not allowed here.
4-
constDeclarations-scopes.ts(48,21): error TS1344: 'A label is not allowed here.
3+
constDeclarations-scopes.ts(43,5): error TS1344: A label is not allowed here.
4+
constDeclarations-scopes.ts(48,21): error TS1344: A label is not allowed here.
55

66

77
==== constDeclarations-scopes.ts (4 errors) ====
@@ -53,14 +53,14 @@ constDeclarations-scopes.ts(48,21): error TS1344: 'A label is not allowed here.
5353
if (true) {
5454
label: const c = 0;
5555
~~~~~
56-
!!! error TS1344: 'A label is not allowed here.
56+
!!! error TS1344: A label is not allowed here.
5757
n = c;
5858
}
5959

6060
while (false) {
6161
label2: label3: label4: const c = 0;
6262
~~~~~~
63-
!!! error TS1344: 'A label is not allowed here.
63+
!!! error TS1344: A label is not allowed here.
6464
n = c;
6565
}
6666

‎tests/baselines/reference/constDeclarations-validContexts(alwaysstrict=true).errors.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
constDeclarations-validContexts.ts(18,1): error TS1101: 'with' statements are not allowed in strict mode.
22
constDeclarations-validContexts.ts(18,1): error TS2410: The 'with' statement is not supported. All symbols in a 'with' block will have type 'any'.
3-
constDeclarations-validContexts.ts(31,5): error TS1344: 'A label is not allowed here.
4-
constDeclarations-validContexts.ts(35,21): error TS1344: 'A label is not allowed here.
5-
constDeclarations-validContexts.ts(64,9): error TS1344: 'A label is not allowed here.
3+
constDeclarations-validContexts.ts(31,5): error TS1344: A label is not allowed here.
4+
constDeclarations-validContexts.ts(35,21): error TS1344: A label is not allowed here.
5+
constDeclarations-validContexts.ts(64,9): error TS1344: A label is not allowed here.
66

77

88
==== constDeclarations-validContexts.ts (5 errors) ====
@@ -42,13 +42,13 @@ constDeclarations-validContexts.ts(64,9): error TS1344: 'A label is not allowed
4242
if (true) {
4343
label: const c8 = 0;
4444
~~~~~
45-
!!! error TS1344: 'A label is not allowed here.
45+
!!! error TS1344: A label is not allowed here.
4646
}
4747

4848
while (false) {
4949
label2: label3: label4: const c9 = 0;
5050
~~~~~~
51-
!!! error TS1344: 'A label is not allowed here.
51+
!!! error TS1344: A label is not allowed here.
5252
}
5353

5454
// Try/catch/finally
@@ -79,7 +79,7 @@ constDeclarations-validContexts.ts(64,9): error TS1344: 'A label is not allowed
7979
const c16 = 0
8080
label17: const c17 = 0;
8181
~~~~~~~
82-
!!! error TS1344: 'A label is not allowed here.
82+
!!! error TS1344: A label is not allowed here.
8383
}
8484
}
8585

‎tests/baselines/reference/invalidDoWhileBreakStatements.errors.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ invalidDoWhileBreakStatements.ts(8,4): error TS1116: A 'break' statement can onl
33
invalidDoWhileBreakStatements.ts(14,9): error TS1107: Jump target cannot cross function boundary.
44
invalidDoWhileBreakStatements.ts(21,9): error TS1107: Jump target cannot cross function boundary.
55
invalidDoWhileBreakStatements.ts(27,5): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
6-
invalidDoWhileBreakStatements.ts(33,1): error TS1344: 'A label is not allowed here.
6+
invalidDoWhileBreakStatements.ts(33,1): error TS1344: A label is not allowed here.
77
invalidDoWhileBreakStatements.ts(37,5): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
88

99

@@ -52,7 +52,7 @@ invalidDoWhileBreakStatements.ts(37,5): error TS1116: A 'break' statement can on
5252
// label on non-loop statement
5353
NINE:
5454
~~~~
55-
!!! error TS1344: 'A label is not allowed here.
55+
!!! error TS1344: A label is not allowed here.
5656
var y = 12;
5757

5858
do {

‎tests/baselines/reference/invalidDoWhileContinueStatements.errors.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ invalidDoWhileContinueStatements.ts(8,4): error TS1115: A 'continue' statement c
33
invalidDoWhileContinueStatements.ts(14,9): error TS1107: Jump target cannot cross function boundary.
44
invalidDoWhileContinueStatements.ts(21,9): error TS1107: Jump target cannot cross function boundary.
55
invalidDoWhileContinueStatements.ts(27,5): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
6-
invalidDoWhileContinueStatements.ts(33,1): error TS1344: 'A label is not allowed here.
6+
invalidDoWhileContinueStatements.ts(33,1): error TS1344: A label is not allowed here.
77
invalidDoWhileContinueStatements.ts(37,5): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
88

99

@@ -52,7 +52,7 @@ invalidDoWhileContinueStatements.ts(37,5): error TS1115: A 'continue' statement
5252
// label on non-loop statement
5353
NINE:
5454
~~~~
55-
!!! error TS1344: 'A label is not allowed here.
55+
!!! error TS1344: A label is not allowed here.
5656
var y = 12;
5757

5858
do {

‎tests/baselines/reference/invalidForBreakStatements.errors.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ invalidForBreakStatements.ts(8,9): error TS1116: A 'break' statement can only ju
33
invalidForBreakStatements.ts(14,9): error TS1107: Jump target cannot cross function boundary.
44
invalidForBreakStatements.ts(21,9): error TS1107: Jump target cannot cross function boundary.
55
invalidForBreakStatements.ts(27,5): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
6-
invalidForBreakStatements.ts(32,1): error TS1344: 'A label is not allowed here.
6+
invalidForBreakStatements.ts(32,1): error TS1344: A label is not allowed here.
77
invalidForBreakStatements.ts(36,5): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
88

99

@@ -51,7 +51,7 @@ invalidForBreakStatements.ts(36,5): error TS1116: A 'break' statement can only j
5151
// label on non-loop statement
5252
NINE:
5353
~~~~
54-
!!! error TS1344: 'A label is not allowed here.
54+
!!! error TS1344: A label is not allowed here.
5555
var y = 12;
5656

5757
for(;;) {

‎tests/baselines/reference/invalidForContinueStatements.errors.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ invalidForContinueStatements.ts(8,9): error TS1115: A 'continue' statement can o
33
invalidForContinueStatements.ts(14,9): error TS1107: Jump target cannot cross function boundary.
44
invalidForContinueStatements.ts(21,9): error TS1107: Jump target cannot cross function boundary.
55
invalidForContinueStatements.ts(27,5): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
6-
invalidForContinueStatements.ts(32,1): error TS1344: 'A label is not allowed here.
6+
invalidForContinueStatements.ts(32,1): error TS1344: A label is not allowed here.
77
invalidForContinueStatements.ts(36,5): error TS1115: A 'continue' statement can only jump to a label of an enclosing iteration statement.
88

99

@@ -51,7 +51,7 @@ invalidForContinueStatements.ts(36,5): error TS1115: A 'continue' statement can
5151
// label on non-loop statement
5252
NINE:
5353
~~~~
54-
!!! error TS1344: 'A label is not allowed here.
54+
!!! error TS1344: A label is not allowed here.
5555
var y = 12;
5656

5757
for(;;) {

‎tests/baselines/reference/invalidForInBreakStatements.errors.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ invalidForInBreakStatements.ts(8,19): error TS1116: A 'break' statement can only
33
invalidForInBreakStatements.ts(14,9): error TS1107: Jump target cannot cross function boundary.
44
invalidForInBreakStatements.ts(21,9): error TS1107: Jump target cannot cross function boundary.
55
invalidForInBreakStatements.ts(27,5): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
6-
invalidForInBreakStatements.ts(33,1): error TS1344: 'A label is not allowed here.
6+
invalidForInBreakStatements.ts(33,1): error TS1344: A label is not allowed here.
77
invalidForInBreakStatements.ts(37,5): error TS1116: A 'break' statement can only jump to a label of an enclosing statement.
88

99

@@ -52,7 +52,7 @@ invalidForInBreakStatements.ts(37,5): error TS1116: A 'break' statement can only
5252
// label on non-loop statement
5353
NINE:
5454
~~~~
55-
!!! error TS1344: 'A label is not allowed here.
55+
!!! error TS1344: A label is not allowed here.
5656
var y = 12;
5757

5858
for (var x in {}) {

0 commit comments

Comments
 (0)