microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-26 19:25:41 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Fix main (#46160)

Browse Source
This commit is contained in:
Orta Therox
2021-10-01 17:50:00 +01:00
committed by GitHub
parent ccc19092ff
commit 1a000c8422
9 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/testRunner/parallel/host.ts
View File

@@ -525,7 +525,7 @@ namespace Harness.Parallel.Host {
completeBar();
progressBars.disable();
const replayRunner = new Mocha.Runner(new Mocha.Suite(""), /*delay*/ false);
const replayRunner = new Mocha.Runner(new Mocha.Suite(""), { delay: false });
replayRunner.started = true;
const createStatsCollector = require("mocha/lib/stats-collector");
createStatsCollector(replayRunner); // manually init stats collector like mocha.run would

2
src/testRunner/parallel/worker.ts
View File

@@ -209,7 +209,7 @@ namespace Harness.Parallel.Worker {
const errors: ErrorInfo[] = [];
const passes: TestInfo[] = [];
const start = +new Date();
const runner = new Mocha.Runner(suite, /*delay*/ false);
const runner = new Mocha.Runner(suite, { delay: false });
runner
.on("start", () => {

6
tests/baselines/reference/multipleClassPropertyModifiersErrors.errors.txt
View File

@@ -1,4 +1,4 @@
tests/cases/compiler/multipleClassPropertyModifiersErrors.ts(4,16): error TS1005: ';' expected.
tests/cases/compiler/multipleClassPropertyModifiersErrors.ts(4,9): error TS1434: Unexpected keyword or identifier.
==== tests/cases/compiler/multipleClassPropertyModifiersErrors.ts (1 errors) ====
@@ -6,8 +6,8 @@ tests/cases/compiler/multipleClassPropertyModifiersErrors.ts(4,16): error TS1005
public public p1;
private private p2;
static static p3;
~~
!!! error TS1005: ';' expected.
~~~~~~
!!! error TS1434: Unexpected keyword or identifier.
public private p4;
private public p5;
public static p6;

6
tests/baselines/reference/parserIndexMemberDeclaration10.errors.txt
View File

@@ -1,9 +1,9 @@
tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration10.ts(2,18): error TS1005: ';' expected.
tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration10.ts(2,11): error TS1434: Unexpected keyword or identifier.
==== tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration10.ts (1 errors) ====
class C {
static static [x: string]: string;
~
!!! error TS1005: ';' expected.
~~~~~~
!!! error TS1434: Unexpected keyword or identifier.
}

6
tests/baselines/reference/parserMemberAccessorDeclaration8.errors.txt
View File

@@ -1,12 +1,12 @@
tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts(2,19): error TS1005: ';' expected.
tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts(2,12): error TS1434: Unexpected keyword or identifier.
tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts(2,23): error TS2378: A 'get' accessor must return a value.
==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts (2 errors) ====
class C {
static static get Foo() { }
~~~
!!! error TS1005: ';' expected.
~~~~~~
!!! error TS1434: Unexpected keyword or identifier.
~~~
!!! error TS2378: A 'get' accessor must return a value.
}

6
tests/baselines/reference/parserMemberFunctionDeclaration2.errors.txt
View File

@@ -1,9 +1,9 @@
tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration2.ts(2,19): error TS1005: ';' expected.
tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration2.ts(2,12): error TS1434: Unexpected keyword or identifier.
==== tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration2.ts (1 errors) ====
class C {
static static Foo() { }
~~~
!!! error TS1005: ';' expected.
~~~~~~
!!! error TS1434: Unexpected keyword or identifier.
}

6
tests/baselines/reference/parserMemberVariableDeclaration2.errors.txt
View File

@@ -1,9 +1,9 @@
tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration2.ts(2,17): error TS1005: ';' expected.
tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration2.ts(2,10): error TS1434: Unexpected keyword or identifier.
==== tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration2.ts (1 errors) ====
class C {
static static Foo;
~~~
!!! error TS1005: ';' expected.
~~~~~~
!!! error TS1434: Unexpected keyword or identifier.
}

12
tests/baselines/reference/staticAsIdentifier.errors.txt
View File

@@ -1,5 +1,5 @@
tests/cases/compiler/staticAsIdentifier.ts(12,19): error TS1005: ';' expected.
tests/cases/compiler/staticAsIdentifier.ts(16,19): error TS1005: ';' expected.
tests/cases/compiler/staticAsIdentifier.ts(12,12): error TS1434: Unexpected keyword or identifier.
tests/cases/compiler/staticAsIdentifier.ts(16,12): error TS1434: Unexpected keyword or identifier.
==== tests/cases/compiler/staticAsIdentifier.ts (2 errors) ====
@@ -15,14 +15,14 @@ tests/cases/compiler/staticAsIdentifier.ts(16,19): error TS1005: ';' expected.
class C3 {
static static p: string;
~
!!! error TS1005: ';' expected.
~~~~~~
!!! error TS1434: Unexpected keyword or identifier.
}
class C4 {
static static foo() {}
~~~
!!! error TS1005: ';' expected.
~~~~~~
!!! error TS1434: Unexpected keyword or identifier.
}
class C5 {

12
tests/baselines/reference/staticModifierAlreadySeen.errors.txt
View File

@@ -1,16 +1,16 @@
tests/cases/compiler/staticModifierAlreadySeen.ts(2,19): error TS1005: ';' expected.
tests/cases/compiler/staticModifierAlreadySeen.ts(2,12): error TS1434: Unexpected keyword or identifier.
tests/cases/compiler/staticModifierAlreadySeen.ts(3,19): error TS1434: Unexpected keyword or identifier.
tests/cases/compiler/staticModifierAlreadySeen.ts(3,19): error TS2300: Duplicate identifier 'static'.
tests/cases/compiler/staticModifierAlreadySeen.ts(3,26): error TS1005: ';' expected.
==== tests/cases/compiler/staticModifierAlreadySeen.ts (3 errors) ====
class C {
static static foo = 1;
~~~
!!! error TS1005: ';' expected.
~~~~~~
!!! error TS1434: Unexpected keyword or identifier.
public static static bar() { }
~~~~~~
!!! error TS1434: Unexpected keyword or identifier.
~~~~~~
!!! error TS2300: Duplicate identifier 'static'.
~~~
!!! error TS1005: ';' expected.
}