Skip to content

Commit f9fb68f

Browse files
committed
Fixed up baselines
1 parent f2e7f9f commit f9fb68f

File tree

103 files changed

+1331
-574
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+1331
-574
lines changed

tests/baselines/reference/ExportAssignment7.errors.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
tests/cases/compiler/ExportAssignment7.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
21
tests/cases/compiler/ExportAssignment7.ts(4,1): error TS2309: An export assignment cannot be used in a module with other exported elements.
32
tests/cases/compiler/ExportAssignment7.ts(4,10): error TS2304: Cannot find name 'B'.
43

54

6-
==== tests/cases/compiler/ExportAssignment7.ts (3 errors) ====
5+
==== tests/cases/compiler/ExportAssignment7.ts (2 errors) ====
76
export class C {
8-
~
9-
!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
107
}
118

129
export = B;

tests/baselines/reference/ExportAssignment8.errors.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
tests/cases/compiler/ExportAssignment8.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
21
tests/cases/compiler/ExportAssignment8.ts(1,1): error TS2309: An export assignment cannot be used in a module with other exported elements.
32
tests/cases/compiler/ExportAssignment8.ts(1,10): error TS2304: Cannot find name 'B'.
43

54

6-
==== tests/cases/compiler/ExportAssignment8.ts (3 errors) ====
5+
==== tests/cases/compiler/ExportAssignment8.ts (2 errors) ====
76
export = B;
87
~~~~~~~~~~~
9-
!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
10-
~~~~~~~~~~~
118
!!! error TS2309: An export assignment cannot be used in a module with other exported elements.
129
~
1310
!!! error TS2304: Cannot find name 'B'.

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.errors.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
tests/cases/conformance/internalModules/DeclarationMerging/part1.ts(1,15): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
21
tests/cases/conformance/internalModules/DeclarationMerging/part2.ts(3,24): error TS2304: Cannot find name 'Point'.
32
tests/cases/conformance/internalModules/DeclarationMerging/part2.ts(7,36): error TS2304: Cannot find name 'Point'.
43
tests/cases/conformance/internalModules/DeclarationMerging/part2.ts(7,54): error TS2304: Cannot find name 'Point'.
54

65

7-
==== tests/cases/conformance/internalModules/DeclarationMerging/part1.ts (1 errors) ====
6+
==== tests/cases/conformance/internalModules/DeclarationMerging/part1.ts (0 errors) ====
87
export module A {
9-
~
10-
!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
118
export interface Point {
129
x: number;
1310
y: number;

tests/baselines/reference/ambientDeclarationsExternal.errors.txt

Lines changed: 0 additions & 28 deletions
This file was deleted.
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
=== tests/cases/conformance/ambient/consumer.ts ===
2+
/// <reference path="decls.ts" />
3+
import imp1 = require('equ');
4+
>imp1 : Symbol(imp1, Decl(consumer.ts, 0, 0))
5+
6+
7+
// Ambient external module members are always exported with or without export keyword when module lacks export assignment
8+
import imp3 = require('equ2');
9+
>imp3 : Symbol(imp3, Decl(consumer.ts, 1, 29))
10+
11+
var n = imp3.x;
12+
>n : Symbol(n, Decl(consumer.ts, 6, 3), Decl(consumer.ts, 7, 3))
13+
>imp3.x : Symbol(imp3.x, Decl(decls.ts, 8, 7))
14+
>imp3 : Symbol(imp3, Decl(consumer.ts, 1, 29))
15+
>x : Symbol(imp3.x, Decl(decls.ts, 8, 7))
16+
17+
var n: number;
18+
>n : Symbol(n, Decl(consumer.ts, 6, 3), Decl(consumer.ts, 7, 3))
19+
20+
=== tests/cases/conformance/ambient/decls.ts ===
21+
22+
// Ambient external module with export assignment
23+
declare module 'equ' {
24+
var x;
25+
>x : Symbol(x, Decl(decls.ts, 3, 7))
26+
27+
export = x;
28+
>x : Symbol(x, Decl(decls.ts, 3, 7))
29+
}
30+
31+
declare module 'equ2' {
32+
var x: number;
33+
>x : Symbol(x, Decl(decls.ts, 8, 7))
34+
}
35+
36+
// Ambient external import declaration referencing ambient external module using top level module name
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
=== tests/cases/conformance/ambient/consumer.ts ===
2+
/// <reference path="decls.ts" />
3+
import imp1 = require('equ');
4+
>imp1 : any
5+
6+
7+
// Ambient external module members are always exported with or without export keyword when module lacks export assignment
8+
import imp3 = require('equ2');
9+
>imp3 : typeof imp3
10+
11+
var n = imp3.x;
12+
>n : number
13+
>imp3.x : number
14+
>imp3 : typeof imp3
15+
>x : number
16+
17+
var n: number;
18+
>n : number
19+
20+
=== tests/cases/conformance/ambient/decls.ts ===
21+
22+
// Ambient external module with export assignment
23+
declare module 'equ' {
24+
var x;
25+
>x : any
26+
27+
export = x;
28+
>x : any
29+
}
30+
31+
declare module 'equ2' {
32+
var x: number;
33+
>x : number
34+
}
35+
36+
// Ambient external import declaration referencing ambient external module using top level module name

tests/baselines/reference/circularReference.errors.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
tests/cases/conformance/externalModules/foo1.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
21
tests/cases/conformance/externalModules/foo1.ts(9,12): error TS2339: Property 'x' does not exist on type 'C1'.
32
tests/cases/conformance/externalModules/foo2.ts(8,12): error TS2339: Property 'y' does not exist on type 'C1'.
43
tests/cases/conformance/externalModules/foo2.ts(13,8): error TS2339: Property 'x' does not exist on type 'C1'.
@@ -26,10 +25,8 @@ tests/cases/conformance/externalModules/foo2.ts(13,8): error TS2339: Property 'x
2625
}
2726
}
2827

29-
==== tests/cases/conformance/externalModules/foo1.ts (2 errors) ====
28+
==== tests/cases/conformance/externalModules/foo1.ts (1 errors) ====
3029
import foo2 = require('./foo2');
31-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
32-
!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
3330
export module M1 {
3431
export class C1 {
3532
m1: foo2.M1.C1;

tests/baselines/reference/classAbstractManyKeywords.errors.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractManyKeywords.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
21
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractManyKeywords.ts(1,25): error TS1005: ';' expected.
32
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractManyKeywords.ts(3,1): error TS1128: Declaration or statement expected.
43
tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractManyKeywords.ts(4,17): error TS1005: '=' expected.
54

65

7-
==== tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractManyKeywords.ts (4 errors) ====
6+
==== tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractManyKeywords.ts (3 errors) ====
87
export default abstract class A {}
9-
~~~~~~~~~~~~~~~~~~~~~~~
10-
!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
118
~~~~~
129
!!! error TS1005: ';' expected.
1310
export abstract class B {}

tests/baselines/reference/classMemberInitializerWithLamdaScoping3.errors.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts(4,14): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
21
tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts(8,21): error TS2301: Initializer of instance member variable 'messageHandler' cannot reference identifier 'field1' declared in the constructor.
32

43

54
==== tests/cases/compiler/classMemberInitializerWithLamdaScoping3_0.ts (0 errors) ====
65
var field1: string;
76

8-
==== tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts (2 errors) ====
7+
==== tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts (1 errors) ====
98
declare var console: {
109
log(msg?: any): void;
1110
};
1211
export class Test1 {
13-
~~~~~
14-
!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
1512
constructor(private field1: string) {
1613
}
1714
messageHandler = () => {

tests/baselines/reference/classMemberInitializerWithLamdaScoping4.errors.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
tests/cases/compiler/classMemberInitializerWithLamdaScoping3_0.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
21
tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts(8,21): error TS2304: Cannot find name 'field1'.
32

43

5-
==== tests/cases/compiler/classMemberInitializerWithLamdaScoping3_0.ts (1 errors) ====
4+
==== tests/cases/compiler/classMemberInitializerWithLamdaScoping3_0.ts (0 errors) ====
65
export var field1: string;
7-
~~~~~~~~~~~~~~~~~~~~~~~~~~
8-
!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
96

107
==== tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts (1 errors) ====
118
declare var console: {

0 commit comments

Comments
 (0)