Skip to content

Commit 330d63a

Browse files
committed
Accepting new baselines
1 parent 034e8b0 commit 330d63a

File tree

163 files changed

+674
-674
lines changed

Some content is hidden

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

163 files changed

+674
-674
lines changed

tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
1+
tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
22

33

44
==== tests/cases/conformance/internalModules/DeclarationMerging/class.ts (0 errors) ====
@@ -17,7 +17,7 @@ tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): erro
1717
module X.Y {
1818
export module Point {
1919
~~~~~
20-
!!! error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
20+
!!! error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
2121
export var Origin = new Point(0, 0);
2222
}
2323
}

tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
1+
tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
22

33

44
==== tests/cases/conformance/internalModules/DeclarationMerging/class.ts (0 errors) ====
@@ -17,7 +17,7 @@ tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): erro
1717
module X.Y {
1818
export module Point {
1919
~~~~~
20-
!!! error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
20+
!!! error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
2121
export var Origin = new Point(0, 0);
2222
}
2323
}

tests/baselines/reference/ExportAssignment7.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
tests/cases/compiler/ExportAssignment7.ts(1,14): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
1+
tests/cases/compiler/ExportAssignment7.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided.
22
tests/cases/compiler/ExportAssignment7.ts(4,1): error TS2309: An export assignment cannot be used in a module with other exported elements.
33
tests/cases/compiler/ExportAssignment7.ts(4,10): error TS2304: Cannot find name 'B'.
44

55

66
==== tests/cases/compiler/ExportAssignment7.ts (3 errors) ====
77
export class C {
88
~
9-
!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
9+
!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
1010
}
1111

1212
export = B;

tests/baselines/reference/ExportAssignment8.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
tests/cases/compiler/ExportAssignment8.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
1+
tests/cases/compiler/ExportAssignment8.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
22
tests/cases/compiler/ExportAssignment8.ts(1,1): error TS2309: An export assignment cannot be used in a module with other exported elements.
33
tests/cases/compiler/ExportAssignment8.ts(1,10): error TS2304: Cannot find name 'B'.
44

55

66
==== tests/cases/compiler/ExportAssignment8.ts (3 errors) ====
77
export = B;
88
~~~~~~~~~~~
9-
!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
9+
!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
1010
~~~~~~~~~~~
1111
!!! error TS2309: An export assignment cannot be used in a module with other exported elements.
1212
~

tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
1+
tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
22
tests/cases/conformance/internalModules/DeclarationMerging/simple.ts(13,5): error TS2403: Subsequent variable declarations must have the same type. Variable 'fn' must be of type '() => { x: number; y: number; }', but here has type 'typeof Point'.
33
tests/cases/conformance/internalModules/DeclarationMerging/test.ts(2,5): error TS2403: Subsequent variable declarations must have the same type. Variable 'fn' must be of type '() => { x: number; y: number; }', but here has type 'typeof Point'.
44

@@ -14,7 +14,7 @@ tests/cases/conformance/internalModules/DeclarationMerging/test.ts(2,5): error T
1414
module A {
1515
export module Point {
1616
~~~~~
17-
!!! error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
17+
!!! error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
1818
export var Origin = { x: 0, y: 0 };
1919
}
2020
}

tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.errors.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
2-
tests/cases/conformance/internalModules/DeclarationMerging/simple.ts(1,8): error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
1+
tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
2+
tests/cases/conformance/internalModules/DeclarationMerging/simple.ts(1,8): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
33

44

55
==== tests/cases/conformance/internalModules/DeclarationMerging/module.ts (1 errors) ====
66
module X.Y {
77
export module Point {
88
~~~~~
9-
!!! error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
9+
!!! error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
1010
export var Origin = new Point(0, 0);
1111
}
1212
}
@@ -27,7 +27,7 @@ tests/cases/conformance/internalModules/DeclarationMerging/simple.ts(1,8): error
2727
==== tests/cases/conformance/internalModules/DeclarationMerging/simple.ts (1 errors) ====
2828
module A {
2929
~
30-
!!! error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
30+
!!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
3131
export var Instance = new A();
3232
}
3333

tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.errors.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
2-
tests/cases/conformance/internalModules/DeclarationMerging/simple.ts(3,19): error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
1+
tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
2+
tests/cases/conformance/internalModules/DeclarationMerging/simple.ts(3,19): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
33

44

55
==== tests/cases/conformance/internalModules/DeclarationMerging/module.ts (1 errors) ====
66
module A {
77
export module Point {
88
~~~~~
9-
!!! error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
9+
!!! error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
1010
export var Origin = { x: 0, y: 0 };
1111
}
1212
}
@@ -24,7 +24,7 @@ tests/cases/conformance/internalModules/DeclarationMerging/simple.ts(3,19): erro
2424

2525
export module Point {
2626
~~~~~
27-
!!! error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
27+
!!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
2828
export var Origin = { x: 0, y: 0 };
2929
}
3030

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tests/cases/conformance/internalModules/DeclarationMerging/part1.ts(1,15): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
1+
tests/cases/conformance/internalModules/DeclarationMerging/part1.ts(1,15): error TS1148: Cannot compile modules unless the '--module' flag is provided.
22
tests/cases/conformance/internalModules/DeclarationMerging/part2.ts(3,24): error TS2304: Cannot find name 'Point'.
33
tests/cases/conformance/internalModules/DeclarationMerging/part2.ts(7,36): error TS2304: Cannot find name 'Point'.
44
tests/cases/conformance/internalModules/DeclarationMerging/part2.ts(7,54): error TS2304: Cannot find name 'Point'.
@@ -7,7 +7,7 @@ tests/cases/conformance/internalModules/DeclarationMerging/part2.ts(7,54): error
77
==== tests/cases/conformance/internalModules/DeclarationMerging/part1.ts (1 errors) ====
88
export module A {
99
~
10-
!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
10+
!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
1111
export interface Point {
1212
x: number;
1313
y: number;

tests/baselines/reference/ambientDeclarationsExternal.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
tests/cases/conformance/ambient/consumer.ts(2,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
1+
tests/cases/conformance/ambient/consumer.ts(2,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
22

33

44
==== tests/cases/conformance/ambient/consumer.ts (1 errors) ====
55
/// <reference path="decls.ts" />
66
import imp1 = require('equ');
77
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
8-
!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
8+
!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
99

1010

1111
// Ambient external module members are always exported with or without export keyword when module lacks export assignment

tests/baselines/reference/ambientErrors.errors.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ tests/cases/conformance/ambient/ambientErrors.ts(38,13): error TS1039: Initializ
1111
tests/cases/conformance/ambient/ambientErrors.ts(39,23): error TS1184: An implementation cannot be declared in ambient contexts.
1212
tests/cases/conformance/ambient/ambientErrors.ts(40,14): error TS1184: An implementation cannot be declared in ambient contexts.
1313
tests/cases/conformance/ambient/ambientErrors.ts(41,22): error TS1184: An implementation cannot be declared in ambient contexts.
14-
tests/cases/conformance/ambient/ambientErrors.ts(47,20): error TS2435: Ambient external modules cannot be nested in other modules.
15-
tests/cases/conformance/ambient/ambientErrors.ts(51,16): error TS2436: Ambient external module declaration cannot specify relative module name.
14+
tests/cases/conformance/ambient/ambientErrors.ts(47,20): error TS2435: Ambient modules cannot be nested in other modules.
15+
tests/cases/conformance/ambient/ambientErrors.ts(51,16): error TS2436: Ambient module declaration cannot specify relative module name.
1616
tests/cases/conformance/ambient/ambientErrors.ts(57,5): error TS2309: An export assignment cannot be used in a module with other exported elements.
1717

1818

@@ -91,13 +91,13 @@ tests/cases/conformance/ambient/ambientErrors.ts(57,5): error TS2309: An export
9191
module M2 {
9292
declare module 'nope' { }
9393
~~~~~~
94-
!!! error TS2435: Ambient external modules cannot be nested in other modules.
94+
!!! error TS2435: Ambient modules cannot be nested in other modules.
9595
}
9696

9797
// Ambient external module with a string literal name that isn't a top level external module name
9898
declare module '../foo' { }
9999
~~~~~~~~
100-
!!! error TS2436: Ambient external module declaration cannot specify relative module name.
100+
!!! error TS2436: Ambient module declaration cannot specify relative module name.
101101

102102
// Ambient external module with export assignment and other exported members
103103
declare module 'bar' {

0 commit comments

Comments
 (0)