Skip to content

Commit 1a000c8

Browse files
author
Orta Therox
authored
Fix main (microsoft#46160)
1 parent ccc1909 commit 1a000c8

9 files changed

+29
-29
lines changed

‎src/testRunner/parallel/host.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ namespace Harness.Parallel.Host {
525525
completeBar();
526526
progressBars.disable();
527527

528-
const replayRunner = new Mocha.Runner(new Mocha.Suite(""), /*delay*/ false);
528+
const replayRunner = new Mocha.Runner(new Mocha.Suite(""), { delay: false });
529529
replayRunner.started = true;
530530
const createStatsCollector = require("mocha/lib/stats-collector");
531531
createStatsCollector(replayRunner); // manually init stats collector like mocha.run would

‎src/testRunner/parallel/worker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ namespace Harness.Parallel.Worker {
209209
const errors: ErrorInfo[] = [];
210210
const passes: TestInfo[] = [];
211211
const start = +new Date();
212-
const runner = new Mocha.Runner(suite, /*delay*/ false);
212+
const runner = new Mocha.Runner(suite, { delay: false });
213213

214214
runner
215215
.on("start", () => {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
tests/cases/compiler/multipleClassPropertyModifiersErrors.ts(4,16): error TS1005: ';' expected.
1+
tests/cases/compiler/multipleClassPropertyModifiersErrors.ts(4,9): error TS1434: Unexpected keyword or identifier.
22

33

44
==== tests/cases/compiler/multipleClassPropertyModifiersErrors.ts (1 errors) ====
55
class C {
66
public public p1;
77
private private p2;
88
static static p3;
9-
~~
10-
!!! error TS1005: ';' expected.
9+
~~~~~~
10+
!!! error TS1434: Unexpected keyword or identifier.
1111
public private p4;
1212
private public p5;
1313
public static p6;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration10.ts(2,18): error TS1005: ';' expected.
1+
tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration10.ts(2,11): error TS1434: Unexpected keyword or identifier.
22

33

44
==== tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration10.ts (1 errors) ====
55
class C {
66
static static [x: string]: string;
7-
~
8-
!!! error TS1005: ';' expected.
7+
~~~~~~
8+
!!! error TS1434: Unexpected keyword or identifier.
99
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts(2,19): error TS1005: ';' expected.
1+
tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts(2,12): error TS1434: Unexpected keyword or identifier.
22
tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts(2,23): error TS2378: A 'get' accessor must return a value.
33

44

55
==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts (2 errors) ====
66
class C {
77
static static get Foo() { }
8-
~~~
9-
!!! error TS1005: ';' expected.
8+
~~~~~~
9+
!!! error TS1434: Unexpected keyword or identifier.
1010
~~~
1111
!!! error TS2378: A 'get' accessor must return a value.
1212
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration2.ts(2,19): error TS1005: ';' expected.
1+
tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration2.ts(2,12): error TS1434: Unexpected keyword or identifier.
22

33

44
==== tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration2.ts (1 errors) ====
55
class C {
66
static static Foo() { }
7-
~~~
8-
!!! error TS1005: ';' expected.
7+
~~~~~~
8+
!!! error TS1434: Unexpected keyword or identifier.
99
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration2.ts(2,17): error TS1005: ';' expected.
1+
tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration2.ts(2,10): error TS1434: Unexpected keyword or identifier.
22

33

44
==== tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration2.ts (1 errors) ====
55
class C {
66
static static Foo;
7-
~~~
8-
!!! error TS1005: ';' expected.
7+
~~~~~~
8+
!!! error TS1434: Unexpected keyword or identifier.
99
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
tests/cases/compiler/staticAsIdentifier.ts(12,19): error TS1005: ';' expected.
2-
tests/cases/compiler/staticAsIdentifier.ts(16,19): error TS1005: ';' expected.
1+
tests/cases/compiler/staticAsIdentifier.ts(12,12): error TS1434: Unexpected keyword or identifier.
2+
tests/cases/compiler/staticAsIdentifier.ts(16,12): error TS1434: Unexpected keyword or identifier.
33

44

55
==== tests/cases/compiler/staticAsIdentifier.ts (2 errors) ====
@@ -15,14 +15,14 @@ tests/cases/compiler/staticAsIdentifier.ts(16,19): error TS1005: ';' expected.
1515

1616
class C3 {
1717
static static p: string;
18-
~
19-
!!! error TS1005: ';' expected.
18+
~~~~~~
19+
!!! error TS1434: Unexpected keyword or identifier.
2020
}
2121

2222
class C4 {
2323
static static foo() {}
24-
~~~
25-
!!! error TS1005: ';' expected.
24+
~~~~~~
25+
!!! error TS1434: Unexpected keyword or identifier.
2626
}
2727

2828
class C5 {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
tests/cases/compiler/staticModifierAlreadySeen.ts(2,19): error TS1005: ';' expected.
1+
tests/cases/compiler/staticModifierAlreadySeen.ts(2,12): error TS1434: Unexpected keyword or identifier.
2+
tests/cases/compiler/staticModifierAlreadySeen.ts(3,19): error TS1434: Unexpected keyword or identifier.
23
tests/cases/compiler/staticModifierAlreadySeen.ts(3,19): error TS2300: Duplicate identifier 'static'.
3-
tests/cases/compiler/staticModifierAlreadySeen.ts(3,26): error TS1005: ';' expected.
44

55

66
==== tests/cases/compiler/staticModifierAlreadySeen.ts (3 errors) ====
77
class C {
88
static static foo = 1;
9-
~~~
10-
!!! error TS1005: ';' expected.
9+
~~~~~~
10+
!!! error TS1434: Unexpected keyword or identifier.
1111
public static static bar() { }
1212
~~~~~~
13+
!!! error TS1434: Unexpected keyword or identifier.
14+
~~~~~~
1315
!!! error TS2300: Duplicate identifier 'static'.
14-
~~~
15-
!!! error TS1005: ';' expected.
1616
}

0 commit comments

Comments
 (0)