diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 66742c94f057e..13bf154ea372f 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -47998,9 +47998,30 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { const sourceFile = getSourceFileOfNode(node); const pos = getNonModifierTokenPosOfNode(node); const span = getSpanOfTokenAtPosition(sourceFile, pos); - suggestionDiagnostics.add( - createFileDiagnostic(sourceFile, span.start, span.length, Diagnostics.A_namespace_declaration_should_not_be_declared_using_the_module_keyword_Please_use_the_namespace_keyword_instead), - ); + + // Check if ignoreDeprecations should suppress this error + const shouldSuppress = compilerOptions.ignoreDeprecations === "6.0"; + + if (shouldSuppress) { + // When suppressed by ignoreDeprecations, keep as suggestion + const suggestionDiagnostic = createFileDiagnostic( + sourceFile, + span.start, + span.length, + Diagnostics.A_namespace_declaration_should_not_be_declared_using_the_module_keyword_Please_use_the_namespace_keyword_instead, + ); + suggestionDiagnostics.add(suggestionDiagnostic); + } + else { + // Generate error for module keyword usage in namespace declarations + const errorDiagnostic = createFileDiagnostic( + sourceFile, + span.start, + span.length, + Diagnostics.The_module_keyword_is_not_allowed_for_namespace_declarations_Use_the_namespace_keyword_instead, + ); + diagnostics.add(errorDiagnostic); + } } } diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 22ac200a0dcee..836c71f8f9cd3 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1849,6 +1849,10 @@ "category": "Error", "code": 1546 }, + "The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead.": { + "category": "Error", + "code": 1547 + }, "The types of '{0}' are incompatible between these types.": { "category": "Error", diff --git a/tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.js b/tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.js index fe910c120b7b2..266bc0d6c031a 100644 --- a/tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.js +++ b/tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.ts] //// //// [module.d.ts] -declare module Point { +declare namespace Point { export var Origin: { x: number; y: number; } } diff --git a/tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.symbols b/tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.symbols index b82453bb26fb3..89a3c86ccf078 100644 --- a/tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.symbols +++ b/tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.ts] //// === module.d.ts === -declare module Point { +declare namespace Point { >Point : Symbol(Point, Decl(module.d.ts, 0, 0), Decl(function.d.ts, 0, 0)) export var Origin: { x: number; y: number; } diff --git a/tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.types b/tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.types index 39bd39b358535..51d750b292d56 100644 --- a/tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.types +++ b/tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.ts] //// === module.d.ts === -declare module Point { +declare namespace Point { >Point : typeof Point > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.js b/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.js index fd57d75d9b8f3..e5cd0192637af 100644 --- a/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.js @@ -1,8 +1,8 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientWithSameNameAndCommonRoot.ts] //// //// [module.d.ts] -declare module A { - export module Point { +declare namespace A { + export namespace Point { export var Origin: { x: number; y: number; @@ -11,7 +11,7 @@ declare module A { } //// [class.d.ts] -declare module A { +declare namespace A { export class Point { constructor(x: number, y: number); x: number; diff --git a/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.symbols b/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.symbols index 4df1fa7203ecc..aad2021e9b08e 100644 --- a/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.symbols +++ b/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientWithSameNameAndCommonRoot.ts] //// === module.d.ts === -declare module A { +declare namespace A { >A : Symbol(A, Decl(module.d.ts, 0, 0), Decl(class.d.ts, 0, 0)) - export module Point { ->Point : Symbol(Point, Decl(module.d.ts, 0, 18), Decl(class.d.ts, 0, 18)) + export namespace Point { +>Point : Symbol(Point, Decl(module.d.ts, 0, 21), Decl(class.d.ts, 0, 21)) export var Origin: { >Origin : Symbol(Origin, Decl(module.d.ts, 2, 18)) @@ -20,11 +20,11 @@ declare module A { } === class.d.ts === -declare module A { +declare namespace A { >A : Symbol(A, Decl(module.d.ts, 0, 0), Decl(class.d.ts, 0, 0)) export class Point { ->Point : Symbol(Point, Decl(module.d.ts, 0, 18), Decl(class.d.ts, 0, 18)) +>Point : Symbol(Point, Decl(module.d.ts, 0, 21), Decl(class.d.ts, 0, 21)) constructor(x: number, y: number); >x : Symbol(x, Decl(class.d.ts, 2, 20)) @@ -47,14 +47,14 @@ var p: { x: number; y: number; } var p = A.Point.Origin; >p : Symbol(p, Decl(test.ts, 0, 3), Decl(test.ts, 1, 3), Decl(test.ts, 2, 3)) >A.Point.Origin : Symbol(A.Point.Origin, Decl(module.d.ts, 2, 18)) ->A.Point : Symbol(A.Point, Decl(module.d.ts, 0, 18), Decl(class.d.ts, 0, 18)) +>A.Point : Symbol(A.Point, Decl(module.d.ts, 0, 21), Decl(class.d.ts, 0, 21)) >A : Symbol(A, Decl(module.d.ts, 0, 0), Decl(class.d.ts, 0, 0)) ->Point : Symbol(A.Point, Decl(module.d.ts, 0, 18), Decl(class.d.ts, 0, 18)) +>Point : Symbol(A.Point, Decl(module.d.ts, 0, 21), Decl(class.d.ts, 0, 21)) >Origin : Symbol(A.Point.Origin, Decl(module.d.ts, 2, 18)) var p = new A.Point(0, 0); // unexpected error here, bug 840000 >p : Symbol(p, Decl(test.ts, 0, 3), Decl(test.ts, 1, 3), Decl(test.ts, 2, 3)) ->A.Point : Symbol(A.Point, Decl(module.d.ts, 0, 18), Decl(class.d.ts, 0, 18)) +>A.Point : Symbol(A.Point, Decl(module.d.ts, 0, 21), Decl(class.d.ts, 0, 21)) >A : Symbol(A, Decl(module.d.ts, 0, 0), Decl(class.d.ts, 0, 0)) ->Point : Symbol(A.Point, Decl(module.d.ts, 0, 18), Decl(class.d.ts, 0, 18)) +>Point : Symbol(A.Point, Decl(module.d.ts, 0, 21), Decl(class.d.ts, 0, 21)) diff --git a/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.types b/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.types index 9dfdfee91e6bc..05bbd79c92f5d 100644 --- a/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.types +++ b/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.types @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientWithSameNameAndCommonRoot.ts] //// === module.d.ts === -declare module A { +declare namespace A { >A : typeof A > : ^^^^^^^^ - export module Point { + export namespace Point { >Point : typeof Point > : ^^^^^^^^^^^^ @@ -25,7 +25,7 @@ declare module A { } === class.d.ts === -declare module A { +declare namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js b/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js index b9338ff0ab505..5ae2a13fd7014 100644 --- a/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js @@ -1,8 +1,8 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.ts] //// //// [module.d.ts] -declare module A { - export module Point { +declare namespace A { + export namespace Point { export var Origin: { x: number; y: number; @@ -11,7 +11,7 @@ declare module A { } //// [classPoint.ts] -module A { +namespace A { export class Point { constructor(public x: number, public y: number) { } } diff --git a/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.symbols b/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.symbols index 274a46b665e06..5d13e4067be51 100644 --- a/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.symbols +++ b/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.ts] //// === module.d.ts === -declare module A { +declare namespace A { >A : Symbol(A, Decl(module.d.ts, 0, 0), Decl(classPoint.ts, 0, 0)) - export module Point { ->Point : Symbol(Point, Decl(module.d.ts, 0, 18), Decl(classPoint.ts, 0, 10)) + export namespace Point { +>Point : Symbol(Point, Decl(module.d.ts, 0, 21), Decl(classPoint.ts, 0, 13)) export var Origin: { >Origin : Symbol(Origin, Decl(module.d.ts, 2, 18)) @@ -20,11 +20,11 @@ declare module A { } === classPoint.ts === -module A { +namespace A { >A : Symbol(A, Decl(module.d.ts, 0, 0), Decl(classPoint.ts, 0, 0)) export class Point { ->Point : Symbol(Point, Decl(module.d.ts, 0, 18), Decl(classPoint.ts, 0, 10)) +>Point : Symbol(Point, Decl(module.d.ts, 0, 21), Decl(classPoint.ts, 0, 13)) constructor(public x: number, public y: number) { } >x : Symbol(Point.x, Decl(classPoint.ts, 2, 20)) @@ -41,14 +41,14 @@ var p: { x: number; y: number; } var p = A.Point.Origin; >p : Symbol(p, Decl(test.ts, 0, 3), Decl(test.ts, 1, 3), Decl(test.ts, 2, 3)) >A.Point.Origin : Symbol(A.Point.Origin, Decl(module.d.ts, 2, 18)) ->A.Point : Symbol(A.Point, Decl(module.d.ts, 0, 18), Decl(classPoint.ts, 0, 10)) +>A.Point : Symbol(A.Point, Decl(module.d.ts, 0, 21), Decl(classPoint.ts, 0, 13)) >A : Symbol(A, Decl(module.d.ts, 0, 0), Decl(classPoint.ts, 0, 0)) ->Point : Symbol(A.Point, Decl(module.d.ts, 0, 18), Decl(classPoint.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(module.d.ts, 0, 21), Decl(classPoint.ts, 0, 13)) >Origin : Symbol(A.Point.Origin, Decl(module.d.ts, 2, 18)) var p = new A.Point(0, 0); // unexpected error here, bug 840000 >p : Symbol(p, Decl(test.ts, 0, 3), Decl(test.ts, 1, 3), Decl(test.ts, 2, 3)) ->A.Point : Symbol(A.Point, Decl(module.d.ts, 0, 18), Decl(classPoint.ts, 0, 10)) +>A.Point : Symbol(A.Point, Decl(module.d.ts, 0, 21), Decl(classPoint.ts, 0, 13)) >A : Symbol(A, Decl(module.d.ts, 0, 0), Decl(classPoint.ts, 0, 0)) ->Point : Symbol(A.Point, Decl(module.d.ts, 0, 18), Decl(classPoint.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(module.d.ts, 0, 21), Decl(classPoint.ts, 0, 13)) diff --git a/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.types b/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.types index 280e9ba03bb85..df2a2ba9de1a4 100644 --- a/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.types +++ b/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.types @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.ts] //// === module.d.ts === -declare module A { +declare namespace A { >A : typeof A > : ^^^^^^^^ - export module Point { + export namespace Point { >Point : typeof Point > : ^^^^^^^^^^^^ @@ -25,7 +25,7 @@ declare module A { } === classPoint.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.js b/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.js index 90bed5cfd914d..b18fd32dae902 100644 --- a/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.js +++ b/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.ts] //// //// [module.d.ts] -declare module Point { +declare namespace Point { export var Origin: { x: number; y: number; } } diff --git a/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.symbols b/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.symbols index b24ae8c7471fe..58fe73f5ee869 100644 --- a/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.symbols +++ b/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.ts] //// === module.d.ts === -declare module Point { +declare namespace Point { >Point : Symbol(Point, Decl(module.d.ts, 0, 0), Decl(function.ts, 0, 0)) export var Origin: { x: number; y: number; } diff --git a/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.types b/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.types index ab16963cf4100..42f4285683396 100644 --- a/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.types +++ b/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.ts] //// === module.d.ts === -declare module Point { +declare namespace Point { >Point : typeof Point > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.errors.txt b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.errors.txt index ce6f836d168c6..3f343e8db2c68 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.errors.txt +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.errors.txt @@ -14,7 +14,7 @@ ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts(46,15): err value: T; } - module clodule1 { + namespace clodule1 { function f(x: T) { } ~ !!! error TS2304: Cannot find name 'T'. @@ -26,7 +26,7 @@ ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts(46,15): err value: T; } - module clodule2 { + namespace clodule2 { var x: T; ~ !!! error TS2304: Cannot find name 'T'. @@ -45,7 +45,7 @@ ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts(46,15): err value: T; } - module clodule3 { + namespace clodule3 { export var y = { id: T }; ~ !!! error TS2304: Cannot find name 'T'. @@ -57,7 +57,7 @@ ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts(46,15): err value: T; } - module clodule4 { + namespace clodule4 { class D { name: T; ~ diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js index 8dc0f6cd84cc4..c338dc64e2b55 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js @@ -9,7 +9,7 @@ class clodule1{ value: T; } -module clodule1 { +namespace clodule1 { function f(x: T) { } } @@ -19,7 +19,7 @@ class clodule2{ value: T; } -module clodule2 { +namespace clodule2 { var x: T; class D{ @@ -34,7 +34,7 @@ class clodule3{ value: T; } -module clodule3 { +namespace clodule3 { export var y = { id: T }; } @@ -44,7 +44,7 @@ class clodule4{ value: T; } -module clodule4 { +namespace clodule4 { class D { name: T; } diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.symbols b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.symbols index 01a91f6155152..eb350e88b0908 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.symbols +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.symbols @@ -15,11 +15,11 @@ class clodule1{ >T : Symbol(T, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 2, 15)) } -module clodule1 { +namespace clodule1 { >clodule1 : Symbol(clodule1, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 0, 0), Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 6, 1)) function f(x: T) { } ->f : Symbol(f, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 8, 17)) +>f : Symbol(f, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 8, 20)) >x : Symbol(x, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 9, 15)) >T : Symbol(T) } @@ -36,7 +36,7 @@ class clodule2{ >T : Symbol(T, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 12, 15)) } -module clodule2 { +namespace clodule2 { >clodule2 : Symbol(clodule2, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 10, 1), Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 16, 1)) var x: T; @@ -69,7 +69,7 @@ class clodule3{ >T : Symbol(T, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 27, 15)) } -module clodule3 { +namespace clodule3 { >clodule3 : Symbol(clodule3, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 25, 1), Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 31, 1)) export var y = { id: T }; @@ -89,11 +89,11 @@ class clodule4{ >T : Symbol(T, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 37, 15)) } -module clodule4 { +namespace clodule4 { >clodule4 : Symbol(clodule4, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 35, 1), Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 41, 1)) class D { ->D : Symbol(D, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 43, 17)) +>D : Symbol(D, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 43, 20)) name: T; >name : Symbol(D.name, Decl(ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts, 44, 13)) diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types index 9bce00088aa1c..607ff436a0e5a 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types @@ -16,7 +16,7 @@ class clodule1{ > : ^ } -module clodule1 { +namespace clodule1 { >clodule1 : typeof clodule1 > : ^^^^^^^^^^^^^^^ @@ -40,7 +40,7 @@ class clodule2{ > : ^ } -module clodule2 { +namespace clodule2 { >clodule2 : typeof clodule2 > : ^^^^^^^^^^^^^^^ @@ -75,7 +75,7 @@ class clodule3{ > : ^ } -module clodule3 { +namespace clodule3 { >clodule3 : typeof clodule3 > : ^^^^^^^^^^^^^^^ @@ -103,7 +103,7 @@ class clodule4{ > : ^ } -module clodule4 { +namespace clodule4 { >clodule4 : typeof clodule4 > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.errors.txt b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.errors.txt index 4fdf96cc4fee2..19aae27496a5c 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.errors.txt +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.errors.txt @@ -12,7 +12,7 @@ ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFu !!! error TS2300: Duplicate identifier 'fn'. } - module clodule { + namespace clodule { // error: duplicate identifier expected export function fn(x: T, y: T): T { ~~ diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js index 30517849bd828..e16c84c4342e5 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js @@ -8,7 +8,7 @@ class clodule { static fn(id: U) { } } -module clodule { +namespace clodule { // error: duplicate identifier expected export function fn(x: T, y: T): T { return x; diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.symbols b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.symbols index 98c1dc7a8c670..bc28121b9ddee 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.symbols +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.symbols @@ -19,12 +19,12 @@ class clodule { >U : Symbol(U, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts, 4, 14)) } -module clodule { +namespace clodule { >clodule : Symbol(clodule, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts, 0, 0), Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts, 5, 1)) // error: duplicate identifier expected export function fn(x: T, y: T): T { ->fn : Symbol(fn, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts, 7, 16)) +>fn : Symbol(fn, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts, 7, 19)) >T : Symbol(T, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts, 9, 23)) >x : Symbol(x, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts, 9, 26)) >T : Symbol(T, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts, 9, 23)) diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.types b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.types index b5d83b085fe32..cb04e32ce79e6 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.types +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.types @@ -20,7 +20,7 @@ class clodule { > : ^ } -module clodule { +namespace clodule { >clodule : typeof clodule > : ^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.errors.txt b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.errors.txt index e85d3f1c32c2a..ac95f1b8897b3 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.errors.txt +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.errors.txt @@ -12,7 +12,7 @@ ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStati !!! error TS2300: Duplicate identifier 'fn'. } - module clodule { + namespace clodule { // error: duplicate identifier expected export function fn(x: T, y: T): T { ~~ diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js index 58640ad1de03c..892a7e4c1ed5c 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js @@ -8,7 +8,7 @@ class clodule { static fn(id: string) { } } -module clodule { +namespace clodule { // error: duplicate identifier expected export function fn(x: T, y: T): T { return x; diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.symbols b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.symbols index 2e9f3c9f709b7..30aa21d4586b1 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.symbols +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.symbols @@ -17,12 +17,12 @@ class clodule { >id : Symbol(id, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts, 4, 14)) } -module clodule { +namespace clodule { >clodule : Symbol(clodule, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts, 0, 0), Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts, 5, 1)) // error: duplicate identifier expected export function fn(x: T, y: T): T { ->fn : Symbol(fn, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts, 7, 16)) +>fn : Symbol(fn, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts, 7, 19)) >T : Symbol(T, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts, 9, 23)) >x : Symbol(x, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts, 9, 26)) >T : Symbol(T, Decl(ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts, 9, 23)) diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.types b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.types index 4c07c54074623..857ec6d0c7a87 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.types +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.types @@ -20,7 +20,7 @@ class clodule { > : ^^^^^^ } -module clodule { +namespace clodule { >clodule : typeof clodule > : ^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.errors.txt b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.errors.txt index 10513ef9e6d1e..42c3a1487e0cc 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.errors.txt +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.errors.txt @@ -9,7 +9,7 @@ ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics private static sfn(id: string) { return 42; } } - module clodule { + namespace clodule { // error: duplicate identifier expected export function fn(x: T, y: T): number { return clodule.sfn('a'); diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js index dea890d7551cb..c624c170d13e6 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js @@ -8,7 +8,7 @@ class clodule { private static sfn(id: string) { return 42; } } -module clodule { +namespace clodule { // error: duplicate identifier expected export function fn(x: T, y: T): number { return clodule.sfn('a'); diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.symbols b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.symbols index 43c6761d59973..a909e76064056 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.symbols +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.symbols @@ -17,12 +17,12 @@ class clodule { >id : Symbol(id, Decl(ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts, 4, 23)) } -module clodule { +namespace clodule { >clodule : Symbol(clodule, Decl(ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts, 0, 0), Decl(ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts, 5, 1)) // error: duplicate identifier expected export function fn(x: T, y: T): number { ->fn : Symbol(fn, Decl(ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts, 7, 16)) +>fn : Symbol(fn, Decl(ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts, 7, 19)) >T : Symbol(T, Decl(ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts, 9, 23)) >x : Symbol(x, Decl(ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts, 9, 26)) >T : Symbol(T, Decl(ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts, 9, 23)) diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.types b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.types index dab3a189612fd..ebd42a57c98c8 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.types +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.types @@ -22,7 +22,7 @@ class clodule { > : ^^ } -module clodule { +namespace clodule { >clodule : typeof clodule > : ^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.errors.txt b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.errors.txt index 5c973d3184374..1f04eb714def2 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.errors.txt +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.errors.txt @@ -13,14 +13,14 @@ ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts(20 !!! error TS2300: Duplicate identifier 'Origin'. } - module Point { + namespace Point { export function Origin() { return null; } //expected duplicate identifier error ~~~~~~ !!! error TS2300: Duplicate identifier 'Origin'. } - module A { + namespace A { export class Point { constructor(public x: number, public y: number) { } @@ -29,7 +29,7 @@ ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts(20 !!! error TS2300: Duplicate identifier 'Origin'. } - export module Point { + export namespace Point { export function Origin() { return ""; }//expected duplicate identifier error ~~~~~~ !!! error TS2300: Duplicate identifier 'Origin'. diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js index 4b9db74210d12..0affe190c890c 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js @@ -7,19 +7,19 @@ class Point { static Origin(): Point { return { x: 0, y: 0 }; } // unexpected error here bug 840246 } -module Point { +namespace Point { export function Origin() { return null; } //expected duplicate identifier error } -module A { +namespace A { export class Point { constructor(public x: number, public y: number) { } static Origin(): Point { return { x: 0, y: 0 }; } // unexpected error here bug 840246 } - export module Point { + export namespace Point { export function Origin() { return ""; }//expected duplicate identifier error } } diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.symbols b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.symbols index c3f8496f50638..b56ac4e7ef673 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.symbols +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.symbols @@ -15,19 +15,19 @@ class Point { >y : Symbol(y, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 3, 43)) } -module Point { +namespace Point { >Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 0, 0), Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 4, 1)) export function Origin() { return null; } //expected duplicate identifier error ->Origin : Symbol(Origin, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 6, 14)) +>Origin : Symbol(Origin, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 6, 17)) } -module A { +namespace A { >A : Symbol(A, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 8, 1)) export class Point { ->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 16, 5)) +>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 16, 5)) constructor(public x: number, public y: number) { } >x : Symbol(Point.x, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 13, 20)) @@ -35,15 +35,15 @@ module A { static Origin(): Point { return { x: 0, y: 0 }; } // unexpected error here bug 840246 >Origin : Symbol(Point.Origin, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 13, 59)) ->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 16, 5)) +>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 16, 5)) >x : Symbol(x, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 15, 41)) >y : Symbol(y, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 15, 47)) } - export module Point { ->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 16, 5)) + export namespace Point { +>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 16, 5)) export function Origin() { return ""; }//expected duplicate identifier error ->Origin : Symbol(Origin, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 18, 25)) +>Origin : Symbol(Origin, Decl(ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts, 18, 28)) } } diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.types b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.types index 38c458d09c754..4b335c14e22b7 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.types +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.types @@ -26,7 +26,7 @@ class Point { > : ^ } -module Point { +namespace Point { >Point : typeof Point > : ^^^^^^^^^^^^ @@ -36,7 +36,7 @@ module Point { } -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -65,7 +65,7 @@ module A { > : ^ } - export module Point { + export namespace Point { >Point : typeof Point > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js index 05a7992430e6e..32359be4c4f0f 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js @@ -7,19 +7,19 @@ class Point { static Origin(): Point { return { x: 0, y: 0 }; } } -module Point { +namespace Point { function Origin() { return ""; }// not an error, since not exported } -module A { +namespace A { export class Point { constructor(public x: number, public y: number) { } static Origin(): Point { return { x: 0, y: 0 }; } } - export module Point { + export namespace Point { function Origin() { return ""; }// not an error since not exported } } diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.symbols b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.symbols index 374aa13a84987..eb121294d5cfb 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.symbols +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.symbols @@ -15,19 +15,19 @@ class Point { >y : Symbol(y, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 3, 43)) } -module Point { +namespace Point { >Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 0, 0), Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 4, 1)) function Origin() { return ""; }// not an error, since not exported ->Origin : Symbol(Origin, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 6, 14)) +>Origin : Symbol(Origin, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 6, 17)) } -module A { +namespace A { >A : Symbol(A, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 8, 1)) export class Point { ->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 16, 5)) +>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 16, 5)) constructor(public x: number, public y: number) { } >x : Symbol(Point.x, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 13, 20)) @@ -35,15 +35,15 @@ module A { static Origin(): Point { return { x: 0, y: 0 }; } >Origin : Symbol(Point.Origin, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 13, 59)) ->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 16, 5)) +>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 16, 5)) >x : Symbol(x, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 15, 41)) >y : Symbol(y, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 15, 47)) } - export module Point { ->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 16, 5)) + export namespace Point { +>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 16, 5)) function Origin() { return ""; }// not an error since not exported ->Origin : Symbol(Origin, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 18, 25)) +>Origin : Symbol(Origin, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 18, 28)) } } diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types index 8d0b68c7ae14a..efada91d84289 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types @@ -26,7 +26,7 @@ class Point { > : ^ } -module Point { +namespace Point { >Point : typeof Point > : ^^^^^^^^^^^^ @@ -38,7 +38,7 @@ module Point { } -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -67,7 +67,7 @@ module A { > : ^ } - export module Point { + export namespace Point { >Point : typeof Point > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.errors.txt b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.errors.txt index e42c4b7e66a8b..3f3a45469bf8b 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.errors.txt +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.errors.txt @@ -13,14 +13,14 @@ ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts(20,20): !!! error TS2300: Duplicate identifier 'Origin'. } - module Point { + namespace Point { export var Origin = ""; //expected duplicate identifier error ~~~~~~ !!! error TS2300: Duplicate identifier 'Origin'. } - module A { + namespace A { export class Point { constructor(public x: number, public y: number) { } @@ -29,7 +29,7 @@ ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts(20,20): !!! error TS2300: Duplicate identifier 'Origin'. } - export module Point { + export namespace Point { export var Origin = ""; //expected duplicate identifier error ~~~~~~ !!! error TS2300: Duplicate identifier 'Origin'. diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js index 24a032ed00385..6c04a594c133f 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js @@ -7,19 +7,19 @@ class Point { static Origin: Point = { x: 0, y: 0 }; } -module Point { +namespace Point { export var Origin = ""; //expected duplicate identifier error } -module A { +namespace A { export class Point { constructor(public x: number, public y: number) { } static Origin: Point = { x: 0, y: 0 }; } - export module Point { + export namespace Point { export var Origin = ""; //expected duplicate identifier error } } diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.symbols b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.symbols index 4c21038bd4754..6beb771f76afa 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.symbols +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.symbols @@ -15,7 +15,7 @@ class Point { >y : Symbol(y, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 3, 34)) } -module Point { +namespace Point { >Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 0, 0), Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 4, 1)) export var Origin = ""; //expected duplicate identifier error @@ -23,11 +23,11 @@ module Point { } -module A { +namespace A { >A : Symbol(A, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 8, 1)) export class Point { ->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 16, 5)) +>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 16, 5)) constructor(public x: number, public y: number) { } >x : Symbol(Point.x, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 13, 20)) @@ -35,13 +35,13 @@ module A { static Origin: Point = { x: 0, y: 0 }; >Origin : Symbol(Point.Origin, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 13, 59)) ->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 16, 5)) +>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 16, 5)) >x : Symbol(x, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 15, 32)) >y : Symbol(y, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 15, 38)) } - export module Point { ->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 16, 5)) + export namespace Point { +>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 16, 5)) export var Origin = ""; //expected duplicate identifier error >Origin : Symbol(Origin, Decl(ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts, 19, 18)) diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.types b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.types index fef199544f268..3d452d0e72425 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.types +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.types @@ -26,7 +26,7 @@ class Point { > : ^ } -module Point { +namespace Point { >Point : typeof Point > : ^^^^^^^^^^^^ @@ -38,7 +38,7 @@ module Point { } -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -67,7 +67,7 @@ module A { > : ^ } - export module Point { + export namespace Point { >Point : typeof Point > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js index 9d84a57d7de15..62a5c6e1dacce 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js @@ -7,19 +7,19 @@ class Point { static Origin: Point = { x: 0, y: 0 }; } -module Point { +namespace Point { var Origin = ""; // not an error, since not exported } -module A { +namespace A { export class Point { constructor(public x: number, public y: number) { } static Origin: Point = { x: 0, y: 0 }; } - export module Point { + export namespace Point { var Origin = ""; // not an error since not exported } } diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.symbols b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.symbols index 706a207c386ef..273b486db6b7a 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.symbols +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.symbols @@ -15,7 +15,7 @@ class Point { >y : Symbol(y, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 3, 34)) } -module Point { +namespace Point { >Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 0, 0), Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 4, 1)) var Origin = ""; // not an error, since not exported @@ -23,11 +23,11 @@ module Point { } -module A { +namespace A { >A : Symbol(A, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 8, 1)) export class Point { ->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 16, 5)) +>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 16, 5)) constructor(public x: number, public y: number) { } >x : Symbol(Point.x, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 13, 20)) @@ -35,13 +35,13 @@ module A { static Origin: Point = { x: 0, y: 0 }; >Origin : Symbol(Point.Origin, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 13, 59)) ->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 16, 5)) +>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 16, 5)) >x : Symbol(x, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 15, 32)) >y : Symbol(y, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 15, 38)) } - export module Point { ->Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 16, 5)) + export namespace Point { +>Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 11, 13), Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 16, 5)) var Origin = ""; // not an error since not exported >Origin : Symbol(Origin, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 19, 11)) diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types index a3fab777b3eaa..8ec69a972accd 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types @@ -26,7 +26,7 @@ class Point { > : ^ } -module Point { +namespace Point { >Point : typeof Point > : ^^^^^^^^^^^^ @@ -38,7 +38,7 @@ module Point { } -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -67,7 +67,7 @@ module A { > : ^ } - export module Point { + export namespace Point { >Point : typeof Point > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.errors.txt b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.errors.txt index 4c67c17831b78..44c45ddb35581 100644 --- a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.errors.txt +++ b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.errors.txt @@ -1,8 +1,16 @@ -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. +class.ts(1,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +class.ts(1,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +module.ts(1,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +module.ts(1,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +module.ts(2,22): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged. -==== class.ts (0 errors) ==== +==== class.ts (2 errors) ==== module X.Y { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. export class Point { constructor(x: number, y: number) { this.x = x; @@ -13,10 +21,14 @@ module.ts(2,19): error TS2433: A namespace declaration cannot be in a different } } -==== module.ts (1 errors) ==== +==== module.ts (3 errors) ==== module X.Y { - export module Point { - ~~~~~ + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export namespace Point { + ~~~~~ !!! error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged. export var Origin = new Point(0, 0); } @@ -33,7 +45,7 @@ module.ts(2,19): error TS2433: A namespace declaration cannot be in a different id: string; } - module A { + namespace A { export var Instance = new A(); } diff --git a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.js b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.js index a6ca39648ae61..57d6560cd1477 100644 --- a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.js @@ -14,7 +14,7 @@ module X.Y { //// [module.ts] module X.Y { - export module Point { + export namespace Point { export var Origin = new Point(0, 0); } } @@ -30,7 +30,7 @@ class A { id: string; } -module A { +namespace A { export var Instance = new A(); } diff --git a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.symbols b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.symbols index 9732ddf70b90f..4dec5fa331253 100644 --- a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.symbols +++ b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.symbols @@ -37,7 +37,7 @@ module X.Y { >X : Symbol(X, Decl(class.ts, 0, 0), Decl(module.ts, 0, 0)) >Y : Symbol(Y, Decl(class.ts, 0, 9), Decl(module.ts, 0, 9)) - export module Point { + export namespace Point { >Point : Symbol(Point, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12)) export var Origin = new Point(0, 0); @@ -75,7 +75,7 @@ class A { >id : Symbol(A.id, Decl(simple.ts, 0, 9)) } -module A { +namespace A { >A : Symbol(A, Decl(simple.ts, 0, 0), Decl(simple.ts, 2, 1)) export var Instance = new A(); diff --git a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.types b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.types index d043af729d2f4..aa8139c9779ea 100644 --- a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.types +++ b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.types @@ -58,7 +58,7 @@ module X.Y { >Y : typeof Y > : ^^^^^^^^ - export module Point { + export namespace Point { >Point : typeof Point > : ^^^^^^^^^^^^ @@ -127,7 +127,7 @@ class A { > : ^^^^^^ } -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.errors.txt b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.errors.txt index 4c67c17831b78..44c45ddb35581 100644 --- a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.errors.txt +++ b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.errors.txt @@ -1,8 +1,16 @@ -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. +class.ts(1,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +class.ts(1,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +module.ts(1,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +module.ts(1,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +module.ts(2,22): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged. -==== class.ts (0 errors) ==== +==== class.ts (2 errors) ==== module X.Y { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. export class Point { constructor(x: number, y: number) { this.x = x; @@ -13,10 +21,14 @@ module.ts(2,19): error TS2433: A namespace declaration cannot be in a different } } -==== module.ts (1 errors) ==== +==== module.ts (3 errors) ==== module X.Y { - export module Point { - ~~~~~ + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export namespace Point { + ~~~~~ !!! error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged. export var Origin = new Point(0, 0); } @@ -33,7 +45,7 @@ module.ts(2,19): error TS2433: A namespace declaration cannot be in a different id: string; } - module A { + namespace A { export var Instance = new A(); } diff --git a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.js b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.js index 9187c99c84038..68499c458a642 100644 --- a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.js +++ b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.js @@ -14,7 +14,7 @@ module X.Y { //// [module.ts] module X.Y { - export module Point { + export namespace Point { export var Origin = new Point(0, 0); } } @@ -30,7 +30,7 @@ class A { id: string; } -module A { +namespace A { export var Instance = new A(); } diff --git a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.symbols b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.symbols index 66292440b05de..2f4993175f896 100644 --- a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.symbols +++ b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.symbols @@ -37,7 +37,7 @@ module X.Y { >X : Symbol(X, Decl(class.ts, 0, 0), Decl(module.ts, 0, 0)) >Y : Symbol(Y, Decl(class.ts, 0, 9), Decl(module.ts, 0, 9)) - export module Point { + export namespace Point { >Point : Symbol(Point, Decl(class.ts, 0, 12), Decl(module.ts, 0, 12)) export var Origin = new Point(0, 0); @@ -75,7 +75,7 @@ class A { >id : Symbol(A.id, Decl(simple.ts, 0, 9)) } -module A { +namespace A { >A : Symbol(A, Decl(simple.ts, 0, 0), Decl(simple.ts, 2, 1)) export var Instance = new A(); diff --git a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.types b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.types index 948e8c440a4be..89fed0a74a873 100644 --- a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.types +++ b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.types @@ -58,7 +58,7 @@ module X.Y { >Y : typeof Y > : ^^^^^^^^ - export module Point { + export namespace Point { >Point : typeof Point > : ^^^^^^^^^^^^ @@ -127,7 +127,7 @@ class A { > : ^^^^^^ } -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/ES5SymbolProperty2.errors.txt b/tests/baselines/reference/ES5SymbolProperty2.errors.txt index 21ade634ca8b0..0f56d06ae641b 100644 --- a/tests/baselines/reference/ES5SymbolProperty2.errors.txt +++ b/tests/baselines/reference/ES5SymbolProperty2.errors.txt @@ -2,7 +2,7 @@ ES5SymbolProperty2.ts(10,11): error TS2585: 'Symbol' only refers to a type, but ==== ES5SymbolProperty2.ts (1 errors) ==== - module M { + namespace M { var Symbol: any; export class C { diff --git a/tests/baselines/reference/ES5SymbolProperty2.js b/tests/baselines/reference/ES5SymbolProperty2.js index c7b34e17f1a17..2bb2480bd32ef 100644 --- a/tests/baselines/reference/ES5SymbolProperty2.js +++ b/tests/baselines/reference/ES5SymbolProperty2.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/Symbols/ES5SymbolProperty2.ts] //// //// [ES5SymbolProperty2.ts] -module M { +namespace M { var Symbol: any; export class C { diff --git a/tests/baselines/reference/ES5SymbolProperty2.symbols b/tests/baselines/reference/ES5SymbolProperty2.symbols index 5b93a97c553d1..9a30823f4193b 100644 --- a/tests/baselines/reference/ES5SymbolProperty2.symbols +++ b/tests/baselines/reference/ES5SymbolProperty2.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/Symbols/ES5SymbolProperty2.ts] //// === ES5SymbolProperty2.ts === -module M { +namespace M { >M : Symbol(M, Decl(ES5SymbolProperty2.ts, 0, 0)) var Symbol: any; diff --git a/tests/baselines/reference/ES5SymbolProperty2.types b/tests/baselines/reference/ES5SymbolProperty2.types index bb881741d6254..6a5020e91b108 100644 --- a/tests/baselines/reference/ES5SymbolProperty2.types +++ b/tests/baselines/reference/ES5SymbolProperty2.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/Symbols/ES5SymbolProperty2.ts] //// === ES5SymbolProperty2.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.js b/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.js index a1f1d12ba161b..60db514328ab2 100644 --- a/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.js @@ -5,7 +5,7 @@ enum enumdule { Red, Blue } -module enumdule { +namespace enumdule { export class Point { constructor(public x: number, public y: number) { } diff --git a/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.symbols b/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.symbols index 9a076862270df..728e551be1441 100644 --- a/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.symbols +++ b/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.symbols @@ -9,11 +9,11 @@ enum enumdule { >Blue : Symbol(enumdule.Blue, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 1, 8)) } -module enumdule { +namespace enumdule { >enumdule : Symbol(enumdule, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 0, 0), Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 2, 1)) export class Point { ->Point : Symbol(Point, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 4, 17)) +>Point : Symbol(Point, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 4, 20)) constructor(public x: number, public y: number) { } >x : Symbol(Point.x, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 7, 20)) @@ -38,7 +38,7 @@ var y: { x: number; y: number }; var y = new enumdule.Point(0, 0); >y : Symbol(y, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 14, 3), Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 15, 3)) ->enumdule.Point : Symbol(enumdule.Point, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 4, 17)) +>enumdule.Point : Symbol(enumdule.Point, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 4, 20)) >enumdule : Symbol(enumdule, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 0, 0), Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 2, 1)) ->Point : Symbol(enumdule.Point, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 4, 17)) +>Point : Symbol(enumdule.Point, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 4, 20)) diff --git a/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types b/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types index 6eb5814cd7d18..171d4e43f5b3b 100644 --- a/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types +++ b/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types @@ -12,7 +12,7 @@ enum enumdule { > : ^^^^^^^^^^^^^ } -module enumdule { +namespace enumdule { >enumdule : typeof enumdule > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.js b/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.js index 1feeb5834938e..5e55dc15be60a 100644 --- a/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.js +++ b/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWhichExtendsInterfaceWithInaccessibleType.ts] //// //// [ExportClassWhichExtendsInterfaceWithInaccessibleType.ts] -module A { +namespace A { interface Point { x: number; diff --git a/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.symbols b/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.symbols index 8f2590b2a16bc..5d184f45f7a17 100644 --- a/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.symbols +++ b/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWhichExtendsInterfaceWithInaccessibleType.ts] //// === ExportClassWhichExtendsInterfaceWithInaccessibleType.ts === -module A { +namespace A { >A : Symbol(A, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 0, 0)) interface Point { ->Point : Symbol(Point, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 0, 13)) x: number; >x : Symbol(Point.x, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 2, 21)) @@ -16,12 +16,12 @@ module A { fromOrigin(p: Point): number; >fromOrigin : Symbol(Point.fromOrigin, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 4, 18)) >p : Symbol(p, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 6, 19)) ->Point : Symbol(Point, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 0, 13)) } export class Point2d implements Point { >Point2d : Symbol(Point2d, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 7, 5)) ->Point : Symbol(Point, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 0, 13)) constructor(public x: number, public y: number) { } >x : Symbol(Point2d.x, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 10, 20)) @@ -30,7 +30,7 @@ module A { fromOrigin(p: Point) { >fromOrigin : Symbol(Point2d.fromOrigin, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 10, 59)) >p : Symbol(p, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 12, 19)) ->Point : Symbol(Point, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 0, 13)) return 1; } diff --git a/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.types b/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.types index fdf5cf210f021..d42398e96c448 100644 --- a/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.types +++ b/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWhichExtendsInterfaceWithInaccessibleType.ts] //// === ExportClassWhichExtendsInterfaceWithInaccessibleType.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js index 1e847b1f1829e..450891120fd51 100644 --- a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js +++ b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts] //// //// [ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts] -module A { +namespace A { export class Point { x: number; diff --git a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.symbols b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.symbols index d546a59855f7d..0317aaa7d8005 100644 --- a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.symbols +++ b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts] //// === ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts === -module A { +namespace A { >A : Symbol(A, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 0)) export class Point { ->Point : Symbol(Point, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 13)) x: number; >x : Symbol(Point.x, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 2, 24)) @@ -16,13 +16,13 @@ module A { export var Origin: Point = { x: 0, y: 0 }; >Origin : Symbol(Origin, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 7, 14)) ->Point : Symbol(Point, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 13)) >x : Symbol(x, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 7, 32)) >y : Symbol(y, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 7, 38)) export class Point3d extends Point { >Point3d : Symbol(Point3d, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 7, 46)) ->Point : Symbol(Point, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 13)) z: number; >z : Symbol(Point3d.z, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 9, 40)) @@ -38,7 +38,7 @@ module A { export class Line{ >Line : Symbol(Line, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 13, 56)) >TPoint : Symbol(TPoint, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 15, 22)) ->Point : Symbol(Point, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 13)) constructor(public start: TPoint, public end: TPoint) { } >start : Symbol(Line.start, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 16, 20)) diff --git a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types index 51fb4a932f2a4..f8fae2aa5542d 100644 --- a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types +++ b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts] //// === ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.js b/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.js index c989af97c4961..9a2fcad55accc 100644 --- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.js +++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts] //// //// [ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts] -module A { +namespace A { class Point { x: number; diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.symbols b/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.symbols index 98b386447d722..c8a7bdebc85ab 100644 --- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.symbols +++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts] //// === ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts === -module A { +namespace A { >A : Symbol(A, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 0)) class Point { ->Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 13)) x: number; >x : Symbol(Point.x, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 2, 17)) @@ -19,11 +19,11 @@ module A { [idx: number]: Point; >idx : Symbol(idx, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 9, 9)) ->Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 13)) [idx: string]: Point; >idx : Symbol(idx, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 10, 9)) ->Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 13)) } } diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.types b/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.types index 7357676a59733..b8a6cadb8b578 100644 --- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.types +++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts] //// === ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js index eb5cab521ba77..6cbc55e50dbe3 100644 --- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js +++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts] //// //// [ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts] -module A { +namespace A { class Point { x: number; diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.symbols b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.symbols index 22ec31dbf33d1..03fd353c68bb8 100644 --- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.symbols +++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts] //// === ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts === -module A { +namespace A { >A : Symbol(A, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 0)) class Point { ->Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 13)) x: number; >x : Symbol(Point.x, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 2, 17)) @@ -16,13 +16,13 @@ module A { export var Origin: Point = { x: 0, y: 0 }; >Origin : Symbol(Origin, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 7, 14)) ->Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 13)) >x : Symbol(x, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 7, 32)) >y : Symbol(y, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 7, 38)) export class Point3d extends Point { >Point3d : Symbol(Point3d, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 7, 46)) ->Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 13)) z: number; >z : Symbol(Point3d.z, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 9, 40)) @@ -38,7 +38,7 @@ module A { export class Line{ >Line : Symbol(Line, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 13, 56)) >TPoint : Symbol(TPoint, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 15, 22)) ->Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 13)) constructor(public start: TPoint, public end: TPoint) { } >start : Symbol(Line.start, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 16, 20)) @@ -49,9 +49,9 @@ module A { static fromorigin2d(p: Point): Line{ >fromorigin2d : Symbol(Line.fromorigin2d, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 16, 65)) >p : Symbol(p, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 18, 28)) ->Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 13)) >Line : Symbol(Line, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 13, 56)) ->Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 13)) return null; } diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types index 63ad5111ad3aa..fa9d6173b45da 100644 --- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types +++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts] //// === ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.js b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.js index a2484637bbdd8..ad6d2b8e60e7b 100644 --- a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.js +++ b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts] //// //// [ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts] -module A { +namespace A { export class Point { x: number; diff --git a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.symbols b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.symbols index 542478e745680..d5da417a8cb37 100644 --- a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.symbols +++ b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts] //// === ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts === -module A { +namespace A { >A : Symbol(A, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 0, 0)) export class Point { ->Point : Symbol(Point, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 0, 13)) x: number; >x : Symbol(Point.x, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 2, 24)) @@ -19,15 +19,15 @@ module A { constructor(public start: Point, public end: Point) { } >start : Symbol(Line.start, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 8, 20)) ->Point : Symbol(Point, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 0, 13)) >end : Symbol(Line.end, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 8, 40)) ->Point : Symbol(Point, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 0, 13)) } export function fromOrigin(p: Point): Line { >fromOrigin : Symbol(fromOrigin, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 9, 5)) >p : Symbol(p, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 11, 31)) ->Point : Symbol(Point, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 0, 13)) >Line : Symbol(Line, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 5, 5)) return new Line({ x: 0, y: 0 }, p); diff --git a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types index 7a9e5205d7625..91c3fca585fac 100644 --- a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types +++ b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts] //// === ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.js b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.js index 43b5800156161..f8fa7861814ab 100644 --- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.js +++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts] //// //// [ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts] -module A { +namespace A { class Point { x: number; diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.symbols b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.symbols index d62e5e1ae38e6..6258bc7146f7a 100644 --- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.symbols +++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts] //// === ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts === -module A { +namespace A { >A : Symbol(A, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 0, 0)) class Point { ->Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 0, 13)) x: number; >x : Symbol(Point.x, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 2, 17)) @@ -19,15 +19,15 @@ module A { constructor(public start: Point, public end: Point) { } >start : Symbol(Line.start, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 8, 20)) ->Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 0, 13)) >end : Symbol(Line.end, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 8, 40)) ->Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 0, 13)) } export function fromOrigin(p: Point): Line { >fromOrigin : Symbol(fromOrigin, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 9, 5)) >p : Symbol(p, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 11, 31)) ->Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 0, 13)) >Line : Symbol(Line, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 5, 5)) return new Line({ x: 0, y: 0 }, p); diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types index ec8bc29175fe7..5dc8327048b4d 100644 --- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types +++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts] //// === ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.js b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.js index fabf8e908d7f6..d6489f6061f5f 100644 --- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.js +++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts] //// //// [ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts] -module A { +namespace A { export class Point { x: number; diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.symbols b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.symbols index d166e5013bdc2..3b611220423e5 100644 --- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.symbols +++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts] //// === ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts === -module A { +namespace A { >A : Symbol(A, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 0, 0)) export class Point { ->Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 0, 13)) x: number; >x : Symbol(Point.x, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 2, 24)) @@ -19,15 +19,15 @@ module A { constructor(public start: Point, public end: Point) { } >start : Symbol(Line.start, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 8, 20)) ->Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 0, 13)) >end : Symbol(Line.end, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 8, 40)) ->Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 0, 13)) } export function fromOrigin(p: Point): Line { >fromOrigin : Symbol(fromOrigin, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 9, 5)) >p : Symbol(p, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 11, 31)) ->Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 0, 13)) >Line : Symbol(Line, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 5, 5)) return new Line({ x: 0, y: 0 }, p); diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types index 36ce1aa0845e7..53764ea6ffd77 100644 --- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types +++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts] //// === ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js b/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js index c0d988fc50933..10b640014b997 100644 --- a/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js +++ b/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts] //// //// [ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts] -module A { +namespace A { export interface Point { x: number; diff --git a/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.symbols b/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.symbols index abe9e5ffe3835..ef47ab1a9b8f3 100644 --- a/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.symbols +++ b/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts] //// === ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts === -module A { +namespace A { >A : Symbol(A, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 0)) export interface Point { ->Point : Symbol(Point, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 13)) x: number; >x : Symbol(Point.x, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 2, 28)) @@ -16,13 +16,13 @@ module A { export var Origin: Point = { x: 0, y: 0 }; >Origin : Symbol(Origin, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 7, 14)) ->Point : Symbol(Point, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 13)) >x : Symbol(x, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 7, 32)) >y : Symbol(y, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 7, 38)) export interface Point3d extends Point { >Point3d : Symbol(Point3d, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 7, 46)) ->Point : Symbol(Point, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 13)) z: number; >z : Symbol(Point3d.z, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 9, 44)) @@ -38,7 +38,7 @@ module A { export interface Line{ >Line : Symbol(Line, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 13, 56)) >TPoint : Symbol(TPoint, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 15, 26)) ->Point : Symbol(Point, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 13)) new (start: TPoint, end: TPoint); >start : Symbol(start, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 16, 13)) diff --git a/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types b/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types index b7815335623c1..d329f1c0d1da6 100644 --- a/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types +++ b/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts] //// === ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.js b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.js index 7f7ef1985bda7..28905bae6926b 100644 --- a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.js +++ b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts] //// //// [ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts] -module A { +namespace A { interface Point { x: number; diff --git a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.symbols b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.symbols index 43ef4358d3d29..290c45ac5d79d 100644 --- a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.symbols +++ b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts] //// === ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts === -module A { +namespace A { >A : Symbol(A, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 0)) interface Point { ->Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 13)) x: number; >x : Symbol(Point.x, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 2, 21)) @@ -19,11 +19,11 @@ module A { [idx: number]: Point; >idx : Symbol(idx, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 9, 9)) ->Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 13)) [idx: string]: Point; >idx : Symbol(idx, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 10, 9)) ->Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 13)) } } diff --git a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.types b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.types index f92fec33a1ca5..ecea0ae5c4fe1 100644 --- a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.types +++ b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts] //// === ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts === -module A { +namespace A { interface Point { x: number; diff --git a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.js b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.js index a039e21360e06..c2a40862fc35f 100644 --- a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.js +++ b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts] //// //// [ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts] -module A { +namespace A { interface Point { x: number; diff --git a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.symbols b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.symbols index 08c1ce2b878d6..b63fb7b6c33f0 100644 --- a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.symbols +++ b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts] //// === ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts === -module A { +namespace A { >A : Symbol(A, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 0)) interface Point { ->Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 13)) x: number; >x : Symbol(Point.x, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 2, 21)) @@ -16,13 +16,13 @@ module A { export var Origin: Point = { x: 0, y: 0 }; >Origin : Symbol(Origin, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 7, 14)) ->Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 13)) >x : Symbol(x, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 7, 32)) >y : Symbol(y, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 7, 38)) export interface Point3d extends Point { >Point3d : Symbol(Point3d, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 7, 46)) ->Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 13)) z: number; >z : Symbol(Point3d.z, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 9, 44)) @@ -38,7 +38,7 @@ module A { export interface Line{ >Line : Symbol(Line, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 13, 56)) >TPoint : Symbol(TPoint, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 15, 26)) ->Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 13)) new (start: TPoint, end: TPoint); >start : Symbol(start, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 16, 13)) diff --git a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.types b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.types index d524b106b6e82..3be01d4f9ff57 100644 --- a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.types +++ b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts] //// === ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js index 0ca38c274534a..9f493380db4c9 100644 --- a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js +++ b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js @@ -1,13 +1,13 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportModuleWithAccessibleTypesOnItsExportedMembers.ts] //// //// [ExportModuleWithAccessibleTypesOnItsExportedMembers.ts] -module A { +namespace A { export class Point { constructor(public x: number, public y: number) { } } - export module B { + export namespace B { export var Origin: Point = new Point(0, 0); export class Line { diff --git a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.symbols b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.symbols index 1d7aa6f269ef8..10d76af51da35 100644 --- a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.symbols +++ b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.symbols @@ -1,40 +1,40 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportModuleWithAccessibleTypesOnItsExportedMembers.ts] //// === ExportModuleWithAccessibleTypesOnItsExportedMembers.ts === -module A { +namespace A { >A : Symbol(A, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 0)) export class Point { ->Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 13)) constructor(public x: number, public y: number) { } >x : Symbol(Point.x, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 3, 20)) >y : Symbol(Point.y, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 3, 37)) } - export module B { + export namespace B { >B : Symbol(B, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 4, 5)) export var Origin: Point = new Point(0, 0); >Origin : Symbol(Origin, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 7, 18)) ->Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 10)) ->Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 13)) +>Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 13)) export class Line { >Line : Symbol(Line, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 7, 51)) constructor(start: Point, end: Point) { >start : Symbol(start, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 10, 24)) ->Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 13)) >end : Symbol(end, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 10, 37)) ->Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 13)) } static fromOrigin(p: Point) { >fromOrigin : Symbol(Line.fromOrigin, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 12, 13)) >p : Symbol(p, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 14, 30)) ->Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 13)) return new Line({ x: 0, y: 0 }, p); >Line : Symbol(Line, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 7, 51)) diff --git a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types index 180f772f4c58b..5c7796ec897ce 100644 --- a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types +++ b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportModuleWithAccessibleTypesOnItsExportedMembers.ts] //// === ExportModuleWithAccessibleTypesOnItsExportedMembers.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -16,7 +16,7 @@ module A { > : ^^^^^^ } - export module B { + export namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.js b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.js index 0862ac319de28..6f31bca303164 100644 --- a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.js +++ b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts] //// //// [ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts] -module A { +namespace A { class Point { constructor(public x: number, public y: number) { } diff --git a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.symbols b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.symbols index 6548eb50a723d..798b2d180949c 100644 --- a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.symbols +++ b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts] //// === ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts === -module A { +namespace A { >A : Symbol(A, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 0, 0)) class Point { ->Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 0, 13)) constructor(public x: number, public y: number) { } >x : Symbol(Point.x, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 3, 20)) @@ -14,15 +14,15 @@ module A { export var Origin: Point = { x: 0, y: 0 }; >Origin : Symbol(Origin, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 6, 14)) ->Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 0, 13)) >x : Symbol(x, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 6, 32)) >y : Symbol(y, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 6, 38)) export var Unity = { start: new Point(0, 0), end: new Point(1, 0) }; >Unity : Symbol(Unity, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 8, 14)) >start : Symbol(start, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 8, 24)) ->Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 0, 13)) >end : Symbol(end, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 8, 48)) ->Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 0, 13)) } diff --git a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.types b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.types index 1ede2d434df65..a8c6538829366 100644 --- a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.types +++ b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts] //// === ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.js b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.js index 3949eba847d04..1c4f77934b6a6 100644 --- a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.js +++ b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts] //// //// [ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts] -module A { +namespace A { class Point { constructor(public x: number, public y: number) { } diff --git a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.symbols b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.symbols index 216d52e6ef5e8..323220d81b49a 100644 --- a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.symbols +++ b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts] //// === ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts === -module A { +namespace A { >A : Symbol(A, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 0)) class Point { ->Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 13)) constructor(public x: number, public y: number) { } >x : Symbol(Point.x, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 3, 20)) @@ -18,16 +18,16 @@ module A { top: { left: Point, right: Point }, >top : Symbol(top, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 6, 29)) >left : Symbol(left, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 7, 14)) ->Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 13)) >right : Symbol(right, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 7, 27)) ->Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 13)) bottom: { left: Point, right: Point } >bottom : Symbol(bottom, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 7, 43)) >left : Symbol(left, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 8, 17)) ->Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 13)) >right : Symbol(right, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 8, 30)) ->Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 13)) } = null; } diff --git a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.types b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.types index bd528ac22d7ca..9a6c4fd317d36 100644 --- a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.types +++ b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts] //// === ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.js b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.js index 28ceb3cd41c94..6a209583d3531 100644 --- a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.js +++ b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts] //// //// [ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts] -module A { +namespace A { class B { id: number; } diff --git a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.symbols b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.symbols index cc5f8b384a33b..2610b9f9ed0fd 100644 --- a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.symbols +++ b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts] //// === ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts === -module A { +namespace A { >A : Symbol(A, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 0, 0)) class B { ->B : Symbol(B, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 0, 10)) +>B : Symbol(B, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 0, 13)) id: number; >id : Symbol(B.id, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 1, 13)) @@ -14,10 +14,10 @@ module A { export var beez: Array; >beez : Symbol(beez, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 5, 14)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->B : Symbol(B, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 0, 10)) +>B : Symbol(B, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 0, 13)) export var beez2 = new Array(); >beez2 : Symbol(beez2, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 6, 14)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->B : Symbol(B, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 0, 10)) +>B : Symbol(B, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 0, 13)) } diff --git a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types index 8dd1069d088d1..95ac9902c6cf7 100644 --- a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types +++ b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts] //// === ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.js b/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.js index ee1533d2eeee8..d9d0454085ee7 100644 --- a/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.js +++ b/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportVariableWithAccessibleTypeInTypeAnnotation.ts] //// //// [ExportVariableWithAccessibleTypeInTypeAnnotation.ts] -module A { +namespace A { export interface Point { x: number; diff --git a/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.symbols b/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.symbols index a0c71904bae86..be0539b2871b4 100644 --- a/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.symbols +++ b/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportVariableWithAccessibleTypeInTypeAnnotation.ts] //// === ExportVariableWithAccessibleTypeInTypeAnnotation.ts === -module A { +namespace A { >A : Symbol(A, Decl(ExportVariableWithAccessibleTypeInTypeAnnotation.ts, 0, 0)) export interface Point { ->Point : Symbol(Point, Decl(ExportVariableWithAccessibleTypeInTypeAnnotation.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportVariableWithAccessibleTypeInTypeAnnotation.ts, 0, 13)) x: number; >x : Symbol(Point.x, Decl(ExportVariableWithAccessibleTypeInTypeAnnotation.ts, 2, 28)) @@ -17,7 +17,7 @@ module A { // valid since Point is exported export var Origin: Point = { x: 0, y: 0 }; >Origin : Symbol(Origin, Decl(ExportVariableWithAccessibleTypeInTypeAnnotation.ts, 8, 14)) ->Point : Symbol(Point, Decl(ExportVariableWithAccessibleTypeInTypeAnnotation.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportVariableWithAccessibleTypeInTypeAnnotation.ts, 0, 13)) >x : Symbol(x, Decl(ExportVariableWithAccessibleTypeInTypeAnnotation.ts, 8, 32)) >y : Symbol(y, Decl(ExportVariableWithAccessibleTypeInTypeAnnotation.ts, 8, 38)) } diff --git a/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.types b/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.types index b95b6f74f915f..21625cce03e78 100644 --- a/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.types +++ b/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportVariableWithAccessibleTypeInTypeAnnotation.ts] //// === ExportVariableWithAccessibleTypeInTypeAnnotation.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.js b/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.js index cfe7b458a23bd..a7915c1caee7c 100644 --- a/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.js +++ b/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportVariableWithInaccessibleTypeInTypeAnnotation.ts] //// //// [ExportVariableWithInaccessibleTypeInTypeAnnotation.ts] -module A { +namespace A { export interface Point { x: number; diff --git a/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.symbols b/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.symbols index 6f827c586d8ea..a0676f522adfd 100644 --- a/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.symbols +++ b/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportVariableWithInaccessibleTypeInTypeAnnotation.ts] //// === ExportVariableWithInaccessibleTypeInTypeAnnotation.ts === -module A { +namespace A { >A : Symbol(A, Decl(ExportVariableWithInaccessibleTypeInTypeAnnotation.ts, 0, 0)) export interface Point { ->Point : Symbol(Point, Decl(ExportVariableWithInaccessibleTypeInTypeAnnotation.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportVariableWithInaccessibleTypeInTypeAnnotation.ts, 0, 13)) x: number; >x : Symbol(Point.x, Decl(ExportVariableWithInaccessibleTypeInTypeAnnotation.ts, 2, 28)) @@ -17,13 +17,13 @@ module A { // valid since Point is exported export var Origin: Point = { x: 0, y: 0 }; >Origin : Symbol(Origin, Decl(ExportVariableWithInaccessibleTypeInTypeAnnotation.ts, 8, 14)) ->Point : Symbol(Point, Decl(ExportVariableWithInaccessibleTypeInTypeAnnotation.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportVariableWithInaccessibleTypeInTypeAnnotation.ts, 0, 13)) >x : Symbol(x, Decl(ExportVariableWithInaccessibleTypeInTypeAnnotation.ts, 8, 32)) >y : Symbol(y, Decl(ExportVariableWithInaccessibleTypeInTypeAnnotation.ts, 8, 38)) interface Point3d extends Point { >Point3d : Symbol(Point3d, Decl(ExportVariableWithInaccessibleTypeInTypeAnnotation.ts, 8, 46)) ->Point : Symbol(Point, Decl(ExportVariableWithInaccessibleTypeInTypeAnnotation.ts, 0, 10)) +>Point : Symbol(Point, Decl(ExportVariableWithInaccessibleTypeInTypeAnnotation.ts, 0, 13)) z: number; >z : Symbol(Point3d.z, Decl(ExportVariableWithInaccessibleTypeInTypeAnnotation.ts, 10, 37)) diff --git a/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.types b/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.types index 0b78f671e138d..c554ad06e2004 100644 --- a/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.types +++ b/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ExportVariableWithInaccessibleTypeInTypeAnnotation.ts] //// === ExportVariableWithInaccessibleTypeInTypeAnnotation.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.errors.txt b/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.errors.txt index d71944866d1d7..4bdcd4f5687e2 100644 --- a/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.errors.txt +++ b/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.errors.txt @@ -1,19 +1,19 @@ -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. +module.ts(2,22): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged. 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'. 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'. ==== function.ts (0 errors) ==== - module A { + namespace A { export function Point() { return { x: 0, y: 0 }; } } ==== module.ts (1 errors) ==== - module A { - export module Point { - ~~~~~ + namespace A { + export namespace Point { + ~~~~~ !!! error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged. export var Origin = { x: 0, y: 0 }; } @@ -32,13 +32,13 @@ test.ts(2,5): error TS2403: Subsequent variable declarations must have the same ==== simple.ts (1 errors) ==== - module B { + namespace B { export function Point() { return { x: 0, y: 0 }; } - export module Point { + export namespace Point { export var Origin = { x: 0, y: 0 }; } } diff --git a/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.js b/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.js index daa56620014bd..28bb71b193794 100644 --- a/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.js @@ -1,15 +1,15 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndCommonRoot.ts] //// //// [function.ts] -module A { +namespace A { export function Point() { return { x: 0, y: 0 }; } } //// [module.ts] -module A { - export module Point { +namespace A { + export namespace Point { export var Origin = { x: 0, y: 0 }; } } @@ -24,13 +24,13 @@ var cl = A.Point.Origin; // not expected to be an error. //// [simple.ts] -module B { +namespace B { export function Point() { return { x: 0, y: 0 }; } - export module Point { + export namespace Point { export var Origin = { x: 0, y: 0 }; } } diff --git a/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.symbols b/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.symbols index eee0fbb91767c..b95f57f862089 100644 --- a/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.symbols +++ b/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndCommonRoot.ts] //// === function.ts === -module A { +namespace A { >A : Symbol(A, Decl(function.ts, 0, 0), Decl(module.ts, 0, 0)) export function Point() { ->Point : Symbol(Point, Decl(function.ts, 0, 10), Decl(module.ts, 0, 10)) +>Point : Symbol(Point, Decl(function.ts, 0, 13), Decl(module.ts, 0, 13)) return { x: 0, y: 0 }; >x : Symbol(x, Decl(function.ts, 2, 16)) @@ -14,11 +14,11 @@ module A { } === module.ts === -module A { +namespace A { >A : Symbol(A, Decl(function.ts, 0, 0), Decl(module.ts, 0, 0)) - export module Point { ->Point : Symbol(Point, Decl(function.ts, 0, 10), Decl(module.ts, 0, 10)) + export namespace Point { +>Point : Symbol(Point, Decl(function.ts, 0, 13), Decl(module.ts, 0, 13)) export var Origin = { x: 0, y: 0 }; >Origin : Symbol(Origin, Decl(module.ts, 2, 18)) @@ -35,9 +35,9 @@ var fn: () => { x: number; y: number }; var fn = A.Point; >fn : Symbol(fn, Decl(test.ts, 0, 3), Decl(test.ts, 1, 3), Decl(simple.ts, 11, 3), Decl(simple.ts, 12, 3)) ->A.Point : Symbol(A.Point, Decl(function.ts, 0, 10), Decl(module.ts, 0, 10)) +>A.Point : Symbol(A.Point, Decl(function.ts, 0, 13), Decl(module.ts, 0, 13)) >A : Symbol(A, Decl(function.ts, 0, 0), Decl(module.ts, 0, 0)) ->Point : Symbol(A.Point, Decl(function.ts, 0, 10), Decl(module.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(function.ts, 0, 13), Decl(module.ts, 0, 13)) var cl: { x: number; y: number; } >cl : Symbol(cl, Decl(test.ts, 3, 3), Decl(test.ts, 4, 3), Decl(test.ts, 5, 3), Decl(simple.ts, 14, 3), Decl(simple.ts, 15, 3) ... and 1 more) @@ -46,33 +46,33 @@ var cl: { x: number; y: number; } var cl = A.Point(); >cl : Symbol(cl, Decl(test.ts, 3, 3), Decl(test.ts, 4, 3), Decl(test.ts, 5, 3), Decl(simple.ts, 14, 3), Decl(simple.ts, 15, 3) ... and 1 more) ->A.Point : Symbol(A.Point, Decl(function.ts, 0, 10), Decl(module.ts, 0, 10)) +>A.Point : Symbol(A.Point, Decl(function.ts, 0, 13), Decl(module.ts, 0, 13)) >A : Symbol(A, Decl(function.ts, 0, 0), Decl(module.ts, 0, 0)) ->Point : Symbol(A.Point, Decl(function.ts, 0, 10), Decl(module.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(function.ts, 0, 13), Decl(module.ts, 0, 13)) var cl = A.Point.Origin; // not expected to be an error. >cl : Symbol(cl, Decl(test.ts, 3, 3), Decl(test.ts, 4, 3), Decl(test.ts, 5, 3), Decl(simple.ts, 14, 3), Decl(simple.ts, 15, 3) ... and 1 more) >A.Point.Origin : Symbol(A.Point.Origin, Decl(module.ts, 2, 18)) ->A.Point : Symbol(A.Point, Decl(function.ts, 0, 10), Decl(module.ts, 0, 10)) +>A.Point : Symbol(A.Point, Decl(function.ts, 0, 13), Decl(module.ts, 0, 13)) >A : Symbol(A, Decl(function.ts, 0, 0), Decl(module.ts, 0, 0)) ->Point : Symbol(A.Point, Decl(function.ts, 0, 10), Decl(module.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(function.ts, 0, 13), Decl(module.ts, 0, 13)) >Origin : Symbol(A.Point.Origin, Decl(module.ts, 2, 18)) === simple.ts === -module B { +namespace B { >B : Symbol(B, Decl(simple.ts, 0, 0)) export function Point() { ->Point : Symbol(Point, Decl(simple.ts, 0, 10), Decl(simple.ts, 4, 5)) +>Point : Symbol(Point, Decl(simple.ts, 0, 13), Decl(simple.ts, 4, 5)) return { x: 0, y: 0 }; >x : Symbol(x, Decl(simple.ts, 3, 16)) >y : Symbol(y, Decl(simple.ts, 3, 22)) } - export module Point { ->Point : Symbol(Point, Decl(simple.ts, 0, 10), Decl(simple.ts, 4, 5)) + export namespace Point { +>Point : Symbol(Point, Decl(simple.ts, 0, 13), Decl(simple.ts, 4, 5)) export var Origin = { x: 0, y: 0 }; >Origin : Symbol(Origin, Decl(simple.ts, 7, 18)) @@ -88,9 +88,9 @@ var fn: () => { x: number; y: number }; var fn = B.Point; // not expected to be an error. bug 840000: [corelang] Function of fundule not assignalbe as expected >fn : Symbol(fn, Decl(test.ts, 0, 3), Decl(test.ts, 1, 3), Decl(simple.ts, 11, 3), Decl(simple.ts, 12, 3)) ->B.Point : Symbol(B.Point, Decl(simple.ts, 0, 10), Decl(simple.ts, 4, 5)) +>B.Point : Symbol(B.Point, Decl(simple.ts, 0, 13), Decl(simple.ts, 4, 5)) >B : Symbol(B, Decl(simple.ts, 0, 0)) ->Point : Symbol(B.Point, Decl(simple.ts, 0, 10), Decl(simple.ts, 4, 5)) +>Point : Symbol(B.Point, Decl(simple.ts, 0, 13), Decl(simple.ts, 4, 5)) var cl: { x: number; y: number; } >cl : Symbol(cl, Decl(test.ts, 3, 3), Decl(test.ts, 4, 3), Decl(test.ts, 5, 3), Decl(simple.ts, 14, 3), Decl(simple.ts, 15, 3) ... and 1 more) @@ -99,15 +99,15 @@ var cl: { x: number; y: number; } var cl = B.Point(); >cl : Symbol(cl, Decl(test.ts, 3, 3), Decl(test.ts, 4, 3), Decl(test.ts, 5, 3), Decl(simple.ts, 14, 3), Decl(simple.ts, 15, 3) ... and 1 more) ->B.Point : Symbol(B.Point, Decl(simple.ts, 0, 10), Decl(simple.ts, 4, 5)) +>B.Point : Symbol(B.Point, Decl(simple.ts, 0, 13), Decl(simple.ts, 4, 5)) >B : Symbol(B, Decl(simple.ts, 0, 0)) ->Point : Symbol(B.Point, Decl(simple.ts, 0, 10), Decl(simple.ts, 4, 5)) +>Point : Symbol(B.Point, Decl(simple.ts, 0, 13), Decl(simple.ts, 4, 5)) var cl = B.Point.Origin; >cl : Symbol(cl, Decl(test.ts, 3, 3), Decl(test.ts, 4, 3), Decl(test.ts, 5, 3), Decl(simple.ts, 14, 3), Decl(simple.ts, 15, 3) ... and 1 more) >B.Point.Origin : Symbol(B.Point.Origin, Decl(simple.ts, 7, 18)) ->B.Point : Symbol(B.Point, Decl(simple.ts, 0, 10), Decl(simple.ts, 4, 5)) +>B.Point : Symbol(B.Point, Decl(simple.ts, 0, 13), Decl(simple.ts, 4, 5)) >B : Symbol(B, Decl(simple.ts, 0, 0)) ->Point : Symbol(B.Point, Decl(simple.ts, 0, 10), Decl(simple.ts, 4, 5)) +>Point : Symbol(B.Point, Decl(simple.ts, 0, 13), Decl(simple.ts, 4, 5)) >Origin : Symbol(B.Point.Origin, Decl(simple.ts, 7, 18)) diff --git a/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.types b/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.types index da0e9c66d64ba..16053f0ec11f9 100644 --- a/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.types +++ b/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndCommonRoot.ts] //// === function.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -24,11 +24,11 @@ module A { } === module.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ - export module Point { + export namespace Point { >Point : typeof Point > : ^^^^^^^^^^^^ @@ -103,7 +103,7 @@ var cl = A.Point.Origin; // not expected to be an error. === simple.ts === -module B { +namespace B { >B : typeof B > : ^^^^^^^^ @@ -124,7 +124,7 @@ module B { > : ^ } - export module Point { + export namespace Point { >Point : typeof Point > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.js b/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.js index 13302ea391a09..15d86e1c7325e 100644 --- a/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.js +++ b/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.js @@ -1,15 +1,15 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndDifferentCommonRoot.ts] //// //// [function.ts] -module A { +namespace A { export function Point() { return { x: 0, y: 0 }; } } //// [module.ts] -module B { - export module Point { +namespace B { + export namespace Point { export var Origin = { x: 0, y: 0 }; } } diff --git a/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.symbols b/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.symbols index cc72de3138d05..f215a3ecc0721 100644 --- a/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.symbols +++ b/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndDifferentCommonRoot.ts] //// === function.ts === -module A { +namespace A { >A : Symbol(A, Decl(function.ts, 0, 0)) export function Point() { ->Point : Symbol(Point, Decl(function.ts, 0, 10)) +>Point : Symbol(Point, Decl(function.ts, 0, 13)) return { x: 0, y: 0 }; >x : Symbol(x, Decl(function.ts, 2, 16)) @@ -14,11 +14,11 @@ module A { } === module.ts === -module B { +namespace B { >B : Symbol(B, Decl(module.ts, 0, 0)) - export module Point { ->Point : Symbol(Point, Decl(module.ts, 0, 10)) + export namespace Point { +>Point : Symbol(Point, Decl(module.ts, 0, 13)) export var Origin = { x: 0, y: 0 }; >Origin : Symbol(Origin, Decl(module.ts, 2, 18)) @@ -35,9 +35,9 @@ var fn: () => { x: number; y: number }; var fn = A.Point; >fn : Symbol(fn, Decl(test.ts, 0, 3), Decl(test.ts, 1, 3)) ->A.Point : Symbol(A.Point, Decl(function.ts, 0, 10)) +>A.Point : Symbol(A.Point, Decl(function.ts, 0, 13)) >A : Symbol(A, Decl(function.ts, 0, 0)) ->Point : Symbol(A.Point, Decl(function.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(function.ts, 0, 13)) var cl: { x: number; y: number; } >cl : Symbol(cl, Decl(test.ts, 3, 3), Decl(test.ts, 4, 3)) @@ -47,8 +47,8 @@ var cl: { x: number; y: number; } var cl = B.Point.Origin; >cl : Symbol(cl, Decl(test.ts, 3, 3), Decl(test.ts, 4, 3)) >B.Point.Origin : Symbol(B.Point.Origin, Decl(module.ts, 2, 18)) ->B.Point : Symbol(B.Point, Decl(module.ts, 0, 10)) +>B.Point : Symbol(B.Point, Decl(module.ts, 0, 13)) >B : Symbol(B, Decl(module.ts, 0, 0)) ->Point : Symbol(B.Point, Decl(module.ts, 0, 10)) +>Point : Symbol(B.Point, Decl(module.ts, 0, 13)) >Origin : Symbol(B.Point.Origin, Decl(module.ts, 2, 18)) diff --git a/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.types b/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.types index 4e7b739d3199a..82a6c73a89f6d 100644 --- a/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.types +++ b/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndDifferentCommonRoot.ts] //// === function.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -24,11 +24,11 @@ module A { } === module.ts === -module B { +namespace B { >B : typeof B > : ^^^^^^^^ - export module Point { + export namespace Point { >Point : typeof Point > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/FunctionDeclaration7.errors.txt b/tests/baselines/reference/FunctionDeclaration7.errors.txt index 9f4446f3613f3..e22c882cac5a4 100644 --- a/tests/baselines/reference/FunctionDeclaration7.errors.txt +++ b/tests/baselines/reference/FunctionDeclaration7.errors.txt @@ -2,7 +2,7 @@ FunctionDeclaration7.ts(2,13): error TS2391: Function implementation is missing ==== FunctionDeclaration7.ts (1 errors) ==== - module M { + namespace M { function foo(); ~~~ !!! error TS2391: Function implementation is missing or not immediately following the declaration. diff --git a/tests/baselines/reference/FunctionDeclaration7.js b/tests/baselines/reference/FunctionDeclaration7.js index 5d4aabcb4c627..4990bf8f4bd9e 100644 --- a/tests/baselines/reference/FunctionDeclaration7.js +++ b/tests/baselines/reference/FunctionDeclaration7.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/FunctionDeclaration7.ts] //// //// [FunctionDeclaration7.ts] -module M { +namespace M { function foo(); } diff --git a/tests/baselines/reference/FunctionDeclaration7.symbols b/tests/baselines/reference/FunctionDeclaration7.symbols index a651b0cf91121..995bbce277e46 100644 --- a/tests/baselines/reference/FunctionDeclaration7.symbols +++ b/tests/baselines/reference/FunctionDeclaration7.symbols @@ -1,9 +1,9 @@ //// [tests/cases/compiler/FunctionDeclaration7.ts] //// === FunctionDeclaration7.ts === -module M { +namespace M { >M : Symbol(M, Decl(FunctionDeclaration7.ts, 0, 0)) function foo(); ->foo : Symbol(foo, Decl(FunctionDeclaration7.ts, 0, 10)) +>foo : Symbol(foo, Decl(FunctionDeclaration7.ts, 0, 13)) } diff --git a/tests/baselines/reference/FunctionDeclaration7.types b/tests/baselines/reference/FunctionDeclaration7.types index 3ee26599ebee7..cce32c1c0e80c 100644 --- a/tests/baselines/reference/FunctionDeclaration7.types +++ b/tests/baselines/reference/FunctionDeclaration7.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/FunctionDeclaration7.ts] //// === FunctionDeclaration7.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/InvalidNonInstantiatedModule.errors.txt b/tests/baselines/reference/InvalidNonInstantiatedModule.errors.txt index c8f357bada3d6..499c4593e9495 100644 --- a/tests/baselines/reference/InvalidNonInstantiatedModule.errors.txt +++ b/tests/baselines/reference/InvalidNonInstantiatedModule.errors.txt @@ -3,7 +3,7 @@ InvalidNonInstantiatedModule.ts(7,15): error TS2708: Cannot use namespace 'M' as ==== InvalidNonInstantiatedModule.ts (2 errors) ==== - module M { + namespace M { export interface Point { x: number; y: number } } diff --git a/tests/baselines/reference/InvalidNonInstantiatedModule.js b/tests/baselines/reference/InvalidNonInstantiatedModule.js index 6d63561ad12d8..5b585a42fb304 100644 --- a/tests/baselines/reference/InvalidNonInstantiatedModule.js +++ b/tests/baselines/reference/InvalidNonInstantiatedModule.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/moduleDeclarations/InvalidNonInstantiatedModule.ts] //// //// [InvalidNonInstantiatedModule.ts] -module M { +namespace M { export interface Point { x: number; y: number } } diff --git a/tests/baselines/reference/InvalidNonInstantiatedModule.symbols b/tests/baselines/reference/InvalidNonInstantiatedModule.symbols index ea63b484a4c38..04d8094df1436 100644 --- a/tests/baselines/reference/InvalidNonInstantiatedModule.symbols +++ b/tests/baselines/reference/InvalidNonInstantiatedModule.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/moduleDeclarations/InvalidNonInstantiatedModule.ts] //// === InvalidNonInstantiatedModule.ts === -module M { +namespace M { >M : Symbol(M, Decl(InvalidNonInstantiatedModule.ts, 0, 0)) export interface Point { x: number; y: number } ->Point : Symbol(Point, Decl(InvalidNonInstantiatedModule.ts, 0, 10)) +>Point : Symbol(Point, Decl(InvalidNonInstantiatedModule.ts, 0, 13)) >x : Symbol(Point.x, Decl(InvalidNonInstantiatedModule.ts, 1, 28)) >y : Symbol(Point.y, Decl(InvalidNonInstantiatedModule.ts, 1, 39)) } diff --git a/tests/baselines/reference/InvalidNonInstantiatedModule.types b/tests/baselines/reference/InvalidNonInstantiatedModule.types index 0553535e83863..fead7ee18c5cb 100644 --- a/tests/baselines/reference/InvalidNonInstantiatedModule.types +++ b/tests/baselines/reference/InvalidNonInstantiatedModule.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/moduleDeclarations/InvalidNonInstantiatedModule.ts] //// === InvalidNonInstantiatedModule.ts === -module M { +namespace M { export interface Point { x: number; y: number } >x : number > : ^^^^^^ diff --git a/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.errors.txt b/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.errors.txt index 1da20e5604fa3..47c25ad4b9d41 100644 --- a/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.errors.txt +++ b/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.errors.txt @@ -1,19 +1,31 @@ -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. -simple.ts(1,8): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. +classPoint.ts(1,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +classPoint.ts(1,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +module.ts(1,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +module.ts(1,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +module.ts(2,22): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged. +simple.ts(1,11): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. simple.ts(2,31): error TS2449: Class 'A' used before its declaration. -==== module.ts (1 errors) ==== +==== module.ts (3 errors) ==== module X.Y { - export module Point { - ~~~~~ + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export namespace Point { + ~~~~~ !!! error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged. export var Origin = new Point(0, 0); } } -==== classPoint.ts (0 errors) ==== +==== classPoint.ts (2 errors) ==== module X.Y { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. // duplicate identifier export class Point { constructor(x: number, y: number) { @@ -26,8 +38,8 @@ simple.ts(2,31): error TS2449: Class 'A' used before its declaration. } ==== simple.ts (2 errors) ==== - module A { - ~ + namespace A { + ~ !!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. export var Instance = new A(); ~ diff --git a/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.js b/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.js index 699e7ce7678c5..2624369f9833d 100644 --- a/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.js @@ -2,7 +2,7 @@ //// [module.ts] module X.Y { - export module Point { + export namespace Point { export var Origin = new Point(0, 0); } } @@ -21,7 +21,7 @@ module X.Y { } //// [simple.ts] -module A { +namespace A { export var Instance = new A(); } diff --git a/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.symbols b/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.symbols index b7dd1c03a9978..185dcd65831c1 100644 --- a/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.symbols +++ b/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.symbols @@ -5,7 +5,7 @@ module X.Y { >X : Symbol(X, Decl(module.ts, 0, 0), Decl(classPoint.ts, 0, 0)) >Y : Symbol(Y, Decl(module.ts, 0, 9), Decl(classPoint.ts, 0, 9)) - export module Point { + export namespace Point { >Point : Symbol(Point, Decl(module.ts, 0, 12), Decl(classPoint.ts, 0, 12)) export var Origin = new Point(0, 0); @@ -48,7 +48,7 @@ module X.Y { } === simple.ts === -module A { +namespace A { >A : Symbol(A, Decl(simple.ts, 0, 0), Decl(simple.ts, 2, 1)) export var Instance = new A(); diff --git a/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.types b/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.types index f7c21cf263593..f77858f7245be 100644 --- a/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.types +++ b/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.types @@ -7,7 +7,7 @@ module X.Y { >Y : typeof Y > : ^^^^^^^^ - export module Point { + export namespace Point { >Point : typeof Point > : ^^^^^^^^^^^^ @@ -78,7 +78,7 @@ module X.Y { } === simple.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.js b/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.js index 3d0b677e3a6f5..e9f9583ff3fec 100644 --- a/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndEnumWithSameNameAndCommonRoot.ts] //// //// [ModuleAndEnumWithSameNameAndCommonRoot.ts] -module enumdule { +namespace enumdule { export class Point { constructor(public x: number, public y: number) { } diff --git a/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.symbols b/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.symbols index 1596b691f780d..059486e2247fb 100644 --- a/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.symbols +++ b/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndEnumWithSameNameAndCommonRoot.ts] //// === ModuleAndEnumWithSameNameAndCommonRoot.ts === -module enumdule { +namespace enumdule { >enumdule : Symbol(enumdule, Decl(ModuleAndEnumWithSameNameAndCommonRoot.ts, 0, 0), Decl(ModuleAndEnumWithSameNameAndCommonRoot.ts, 5, 1)) export class Point { ->Point : Symbol(Point, Decl(ModuleAndEnumWithSameNameAndCommonRoot.ts, 0, 17)) +>Point : Symbol(Point, Decl(ModuleAndEnumWithSameNameAndCommonRoot.ts, 0, 20)) constructor(public x: number, public y: number) { } >x : Symbol(Point.x, Decl(ModuleAndEnumWithSameNameAndCommonRoot.ts, 3, 20)) @@ -38,7 +38,7 @@ var y: { x: number; y: number }; var y = new enumdule.Point(0, 0); >y : Symbol(y, Decl(ModuleAndEnumWithSameNameAndCommonRoot.ts, 14, 3), Decl(ModuleAndEnumWithSameNameAndCommonRoot.ts, 15, 3)) ->enumdule.Point : Symbol(enumdule.Point, Decl(ModuleAndEnumWithSameNameAndCommonRoot.ts, 0, 17)) +>enumdule.Point : Symbol(enumdule.Point, Decl(ModuleAndEnumWithSameNameAndCommonRoot.ts, 0, 20)) >enumdule : Symbol(enumdule, Decl(ModuleAndEnumWithSameNameAndCommonRoot.ts, 0, 0), Decl(ModuleAndEnumWithSameNameAndCommonRoot.ts, 5, 1)) ->Point : Symbol(enumdule.Point, Decl(ModuleAndEnumWithSameNameAndCommonRoot.ts, 0, 17)) +>Point : Symbol(enumdule.Point, Decl(ModuleAndEnumWithSameNameAndCommonRoot.ts, 0, 20)) diff --git a/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.types b/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.types index 86293d379a2ee..01fdfc70038f9 100644 --- a/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.types +++ b/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndEnumWithSameNameAndCommonRoot.ts] //// === ModuleAndEnumWithSameNameAndCommonRoot.ts === -module enumdule { +namespace enumdule { >enumdule : typeof enumdule > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.errors.txt b/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.errors.txt index d88cb56a78592..1e306488f2e81 100644 --- a/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.errors.txt +++ b/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.errors.txt @@ -1,18 +1,18 @@ -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. -simple.ts(3,19): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. +module.ts(2,22): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged. +simple.ts(3,22): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. ==== module.ts (1 errors) ==== - module A { - export module Point { - ~~~~~ + namespace A { + export namespace Point { + ~~~~~ !!! error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged. export var Origin = { x: 0, y: 0 }; } } ==== function.ts (0 errors) ==== - module A { + namespace A { // duplicate identifier error export function Point() { return { x: 0, y: 0 }; @@ -20,10 +20,10 @@ simple.ts(3,19): error TS2434: A namespace declaration cannot be located prior t } ==== simple.ts (1 errors) ==== - module B { + namespace B { - export module Point { - ~~~~~ + export namespace Point { + ~~~~~ !!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. export var Origin = { x: 0, y: 0 }; } diff --git a/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.js b/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.js index e9b8f44f89543..b4441249deafd 100644 --- a/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.js @@ -1,14 +1,14 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndFunctionWithSameNameAndCommonRoot.ts] //// //// [module.ts] -module A { - export module Point { +namespace A { + export namespace Point { export var Origin = { x: 0, y: 0 }; } } //// [function.ts] -module A { +namespace A { // duplicate identifier error export function Point() { return { x: 0, y: 0 }; @@ -16,9 +16,9 @@ module A { } //// [simple.ts] -module B { +namespace B { - export module Point { + export namespace Point { export var Origin = { x: 0, y: 0 }; } diff --git a/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.symbols b/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.symbols index 1d7870cdbc128..d566a4ce5fa7c 100644 --- a/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.symbols +++ b/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndFunctionWithSameNameAndCommonRoot.ts] //// === module.ts === -module A { +namespace A { >A : Symbol(A, Decl(module.ts, 0, 0), Decl(function.ts, 0, 0)) - export module Point { ->Point : Symbol(Point, Decl(module.ts, 0, 10), Decl(function.ts, 0, 10)) + export namespace Point { +>Point : Symbol(Point, Decl(module.ts, 0, 13), Decl(function.ts, 0, 13)) export var Origin = { x: 0, y: 0 }; >Origin : Symbol(Origin, Decl(module.ts, 2, 18)) @@ -15,12 +15,12 @@ module A { } === function.ts === -module A { +namespace A { >A : Symbol(A, Decl(module.ts, 0, 0), Decl(function.ts, 0, 0)) // duplicate identifier error export function Point() { ->Point : Symbol(Point, Decl(module.ts, 0, 10), Decl(function.ts, 0, 10)) +>Point : Symbol(Point, Decl(module.ts, 0, 13), Decl(function.ts, 0, 13)) return { x: 0, y: 0 }; >x : Symbol(x, Decl(function.ts, 3, 16)) @@ -29,11 +29,11 @@ module A { } === simple.ts === -module B { +namespace B { >B : Symbol(B, Decl(simple.ts, 0, 0)) - export module Point { ->Point : Symbol(Point, Decl(simple.ts, 4, 5), Decl(simple.ts, 0, 10)) + export namespace Point { +>Point : Symbol(Point, Decl(simple.ts, 4, 5), Decl(simple.ts, 0, 13)) export var Origin = { x: 0, y: 0 }; >Origin : Symbol(Origin, Decl(simple.ts, 3, 18)) @@ -43,7 +43,7 @@ module B { // duplicate identifier error export function Point() { ->Point : Symbol(Point, Decl(simple.ts, 4, 5), Decl(simple.ts, 0, 10)) +>Point : Symbol(Point, Decl(simple.ts, 4, 5), Decl(simple.ts, 0, 13)) return { x: 0, y: 0 }; >x : Symbol(x, Decl(simple.ts, 8, 16)) diff --git a/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.types b/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.types index 7ba0f08a7fc64..bfe323a31d42b 100644 --- a/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.types +++ b/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.types @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndFunctionWithSameNameAndCommonRoot.ts] //// === module.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ - export module Point { + export namespace Point { >Point : typeof Point > : ^^^^^^^^^^^^ @@ -26,7 +26,7 @@ module A { } === function.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -50,11 +50,11 @@ module A { } === simple.ts === -module B { +namespace B { >B : typeof B > : ^^^^^^^^ - export module Point { + export namespace Point { >Point : typeof Point > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.errors.txt b/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.errors.txt index 0e64c5ff2118a..0f10f1b7194b8 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.errors.txt +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.errors.txt @@ -3,7 +3,7 @@ ModuleWithExportedAndNonExportedClasses.ts(31,17): error TS2339: Property 'A2' d ==== ModuleWithExportedAndNonExportedClasses.ts (2 errors) ==== - module A { + namespace A { export class A { id: number; name: string; diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.js b/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.js index af72b31e8b739..d9b0c2039686c 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.js +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedClasses.ts] //// //// [ModuleWithExportedAndNonExportedClasses.ts] -module A { +namespace A { export class A { id: number; name: string; diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.symbols b/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.symbols index d564c1174c2f4..67c3c04468f04 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.symbols +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedClasses.ts] //// === ModuleWithExportedAndNonExportedClasses.ts === -module A { +namespace A { >A : Symbol(A, Decl(ModuleWithExportedAndNonExportedClasses.ts, 0, 0)) export class A { ->A : Symbol(A, Decl(ModuleWithExportedAndNonExportedClasses.ts, 0, 10)) +>A : Symbol(A, Decl(ModuleWithExportedAndNonExportedClasses.ts, 0, 13)) id: number; >id : Symbol(A.id, Decl(ModuleWithExportedAndNonExportedClasses.ts, 1, 20)) @@ -61,9 +61,9 @@ var a: { id: number; name: string }; var a = new A.A(); >a : Symbol(a, Decl(ModuleWithExportedAndNonExportedClasses.ts, 23, 3), Decl(ModuleWithExportedAndNonExportedClasses.ts, 24, 3)) ->A.A : Symbol(A.A, Decl(ModuleWithExportedAndNonExportedClasses.ts, 0, 10)) +>A.A : Symbol(A.A, Decl(ModuleWithExportedAndNonExportedClasses.ts, 0, 13)) >A : Symbol(A, Decl(ModuleWithExportedAndNonExportedClasses.ts, 0, 0)) ->A : Symbol(A.A, Decl(ModuleWithExportedAndNonExportedClasses.ts, 0, 10)) +>A : Symbol(A.A, Decl(ModuleWithExportedAndNonExportedClasses.ts, 0, 13)) var AG = new A.AG() >AG : Symbol(AG, Decl(ModuleWithExportedAndNonExportedClasses.ts, 26, 3)) diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.types b/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.types index 61f34242e1e08..16e98f05dd1eb 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.types +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedClasses.ts] //// === ModuleWithExportedAndNonExportedClasses.ts === -module A { +namespace A { >A : typeof globalThis.A > : ^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.errors.txt b/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.errors.txt index 5d2d48c0ac130..19c9183ec4c08 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.errors.txt +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.errors.txt @@ -2,7 +2,7 @@ ModuleWithExportedAndNonExportedEnums.ts(10,11): error TS2339: Property 'Day' do ==== ModuleWithExportedAndNonExportedEnums.ts (1 errors) ==== - module A { + namespace A { export enum Color { Red, Blue } enum Day { Monday, Tuesday } } diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.js b/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.js index c554648284727..2cdf02f5f97de 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.js +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedEnums.ts] //// //// [ModuleWithExportedAndNonExportedEnums.ts] -module A { +namespace A { export enum Color { Red, Blue } enum Day { Monday, Tuesday } } diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.symbols b/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.symbols index 15bbb275a9c22..2bfcf11eea6a3 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.symbols +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedEnums.ts] //// === ModuleWithExportedAndNonExportedEnums.ts === -module A { +namespace A { >A : Symbol(A, Decl(ModuleWithExportedAndNonExportedEnums.ts, 0, 0)) export enum Color { Red, Blue } ->Color : Symbol(Color, Decl(ModuleWithExportedAndNonExportedEnums.ts, 0, 10)) +>Color : Symbol(Color, Decl(ModuleWithExportedAndNonExportedEnums.ts, 0, 13)) >Red : Symbol(Color.Red, Decl(ModuleWithExportedAndNonExportedEnums.ts, 1, 23)) >Blue : Symbol(Color.Blue, Decl(ModuleWithExportedAndNonExportedEnums.ts, 1, 28)) @@ -19,11 +19,11 @@ module A { var a: A.Color = A.Color.Red; >a : Symbol(a, Decl(ModuleWithExportedAndNonExportedEnums.ts, 6, 3)) >A : Symbol(A, Decl(ModuleWithExportedAndNonExportedEnums.ts, 0, 0)) ->Color : Symbol(A.Color, Decl(ModuleWithExportedAndNonExportedEnums.ts, 0, 10)) +>Color : Symbol(A.Color, Decl(ModuleWithExportedAndNonExportedEnums.ts, 0, 13)) >A.Color.Red : Symbol(A.Color.Red, Decl(ModuleWithExportedAndNonExportedEnums.ts, 1, 23)) ->A.Color : Symbol(A.Color, Decl(ModuleWithExportedAndNonExportedEnums.ts, 0, 10)) +>A.Color : Symbol(A.Color, Decl(ModuleWithExportedAndNonExportedEnums.ts, 0, 13)) >A : Symbol(A, Decl(ModuleWithExportedAndNonExportedEnums.ts, 0, 0)) ->Color : Symbol(A.Color, Decl(ModuleWithExportedAndNonExportedEnums.ts, 0, 10)) +>Color : Symbol(A.Color, Decl(ModuleWithExportedAndNonExportedEnums.ts, 0, 13)) >Red : Symbol(A.Color.Red, Decl(ModuleWithExportedAndNonExportedEnums.ts, 1, 23)) // error not exported diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.types b/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.types index 218eae8eb05db..b3efbf14fcb15 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.types +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedEnums.ts] //// === ModuleWithExportedAndNonExportedEnums.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.errors.txt b/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.errors.txt index eda91f4cb1a8a..8da10e756fc09 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.errors.txt +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.errors.txt @@ -3,7 +3,7 @@ ModuleWithExportedAndNonExportedFunctions.ts(29,14): error TS2551: Property 'fng ==== ModuleWithExportedAndNonExportedFunctions.ts (2 errors) ==== - module A { + namespace A { export function fn(s: string) { return true; diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.js b/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.js index b181424e599cf..f052fe9bc91cf 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.js +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedFunctions.ts] //// //// [ModuleWithExportedAndNonExportedFunctions.ts] -module A { +namespace A { export function fn(s: string) { return true; diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.symbols b/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.symbols index 3473533cf6708..e2bb26e6d2bb5 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.symbols +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedFunctions.ts] //// === ModuleWithExportedAndNonExportedFunctions.ts === -module A { +namespace A { >A : Symbol(A, Decl(ModuleWithExportedAndNonExportedFunctions.ts, 0, 0)) export function fn(s: string) { ->fn : Symbol(fn, Decl(ModuleWithExportedAndNonExportedFunctions.ts, 0, 10)) +>fn : Symbol(fn, Decl(ModuleWithExportedAndNonExportedFunctions.ts, 0, 13)) >s : Symbol(s, Decl(ModuleWithExportedAndNonExportedFunctions.ts, 2, 23)) return true; @@ -48,9 +48,9 @@ var fn: (s: string) => boolean; var fn = A.fn; >fn : Symbol(fn, Decl(ModuleWithExportedAndNonExportedFunctions.ts, 20, 3), Decl(ModuleWithExportedAndNonExportedFunctions.ts, 21, 3)) ->A.fn : Symbol(A.fn, Decl(ModuleWithExportedAndNonExportedFunctions.ts, 0, 10)) +>A.fn : Symbol(A.fn, Decl(ModuleWithExportedAndNonExportedFunctions.ts, 0, 13)) >A : Symbol(A, Decl(ModuleWithExportedAndNonExportedFunctions.ts, 0, 0)) ->fn : Symbol(A.fn, Decl(ModuleWithExportedAndNonExportedFunctions.ts, 0, 10)) +>fn : Symbol(A.fn, Decl(ModuleWithExportedAndNonExportedFunctions.ts, 0, 13)) var fng: (s: T) => U; >fng : Symbol(fng, Decl(ModuleWithExportedAndNonExportedFunctions.ts, 23, 3), Decl(ModuleWithExportedAndNonExportedFunctions.ts, 24, 3)) diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.types b/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.types index 73a4a2b513ba5..99a1b52d9b999 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.types +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedFunctions.ts] //// === ModuleWithExportedAndNonExportedFunctions.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.errors.txt b/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.errors.txt index 5578e472334e7..e63ecb32bbf40 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.errors.txt +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.errors.txt @@ -2,7 +2,7 @@ ModuleWithExportedAndNonExportedImportAlias.ts(37,21): error TS2339: Property 'L ==== ModuleWithExportedAndNonExportedImportAlias.ts (1 errors) ==== - module A { + namespace A { export interface Point { x: number; y: number; @@ -13,13 +13,13 @@ ModuleWithExportedAndNonExportedImportAlias.ts(37,21): error TS2339: Property 'L } } - module B { + namespace B { export class Line { constructor(public start: A.Point, public end: A.Point) { } } } - module Geometry { + namespace Geometry { export import Points = A; import Lines = B; diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.js b/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.js index 6546aab5783e7..c666185e82bf9 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.js +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedImportAlias.ts] //// //// [ModuleWithExportedAndNonExportedImportAlias.ts] -module A { +namespace A { export interface Point { x: number; y: number; @@ -12,13 +12,13 @@ module A { } } -module B { +namespace B { export class Line { constructor(public start: A.Point, public end: A.Point) { } } } -module Geometry { +namespace Geometry { export import Points = A; import Lines = B; diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.symbols b/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.symbols index 46a2e22d85568..fed487902a726 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.symbols +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedImportAlias.ts] //// === ModuleWithExportedAndNonExportedImportAlias.ts === -module A { +namespace A { >A : Symbol(A, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 0, 0)) export interface Point { ->Point : Symbol(Point, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 0, 10)) +>Point : Symbol(Point, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 0, 13)) x: number; >x : Symbol(Point.x, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 1, 28)) @@ -16,34 +16,34 @@ module A { interface Point3d extends Point { >Point3d : Symbol(Point3d, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 4, 5)) ->Point : Symbol(Point, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 0, 10)) +>Point : Symbol(Point, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 0, 13)) z: number; >z : Symbol(Point3d.z, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 6, 37)) } } -module B { +namespace B { >B : Symbol(B, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 9, 1)) export class Line { ->Line : Symbol(Line, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 11, 10)) +>Line : Symbol(Line, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 11, 13)) constructor(public start: A.Point, public end: A.Point) { } >start : Symbol(Line.start, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 13, 20)) >A : Symbol(A, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 0, 0)) ->Point : Symbol(A.Point, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 0, 13)) >end : Symbol(Line.end, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 13, 42)) >A : Symbol(A, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 0, 0)) ->Point : Symbol(A.Point, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 0, 13)) } } -module Geometry { +namespace Geometry { >Geometry : Symbol(Geometry, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 15, 1)) export import Points = A; ->Points : Symbol(Points, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 17, 17)) +>Points : Symbol(Points, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 17, 20)) >A : Symbol(Points, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 0, 0)) import Lines = B; @@ -52,8 +52,8 @@ module Geometry { export var Origin: Points.Point = { x: 0, y: 0 }; >Origin : Symbol(Origin, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 21, 14)) ->Points : Symbol(Points, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 17, 17)) ->Point : Symbol(Points.Point, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 0, 10)) +>Points : Symbol(Points, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 17, 20)) +>Point : Symbol(Points.Point, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 0, 13)) >x : Symbol(x, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 21, 39)) >y : Symbol(y, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 21, 45)) @@ -61,10 +61,10 @@ module Geometry { export var Unit: Lines.Line = new Lines.Line(Origin, { x: 1, y: 0 }); >Unit : Symbol(Unit, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 24, 14)) >Lines : Symbol(Lines, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 18, 29)) ->Line : Symbol(Lines.Line, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 11, 10)) ->Lines.Line : Symbol(Lines.Line, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 11, 10)) +>Line : Symbol(Lines.Line, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 11, 13)) +>Lines.Line : Symbol(Lines.Line, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 11, 13)) >Lines : Symbol(Lines, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 18, 29)) ->Line : Symbol(Lines.Line, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 11, 10)) +>Line : Symbol(Lines.Line, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 11, 13)) >Origin : Symbol(Origin, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 21, 14)) >x : Symbol(x, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 24, 58)) >y : Symbol(y, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 24, 64)) @@ -79,8 +79,8 @@ var p: { x: number; y: number }; var p: Geometry.Points.Point; >p : Symbol(p, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 28, 3), Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 29, 3), Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 30, 3)) >Geometry : Symbol(Geometry, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 15, 1)) ->Points : Symbol(Geometry.Points, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 17, 17)) ->Point : Symbol(A.Point, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 0, 10)) +>Points : Symbol(Geometry.Points, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 17, 20)) +>Point : Symbol(A.Point, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 0, 13)) var p = Geometry.Origin; >p : Symbol(p, Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 28, 3), Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 29, 3), Decl(ModuleWithExportedAndNonExportedImportAlias.ts, 30, 3)) diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.types b/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.types index 2c9bcc56bbbf0..2f7e84a9ab624 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.types +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedImportAlias.ts] //// === ModuleWithExportedAndNonExportedImportAlias.ts === -module A { +namespace A { export interface Point { x: number; >x : number @@ -19,7 +19,7 @@ module A { } } -module B { +namespace B { >B : typeof B > : ^^^^^^^^ @@ -39,7 +39,7 @@ module B { } } -module Geometry { +namespace Geometry { >Geometry : typeof Geometry > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedVariables.errors.txt b/tests/baselines/reference/ModuleWithExportedAndNonExportedVariables.errors.txt index b53616c66dbc3..cdf664898d0ff 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedVariables.errors.txt +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedVariables.errors.txt @@ -2,7 +2,7 @@ ModuleWithExportedAndNonExportedVariables.ts(11,11): error TS2339: Property 'y' ==== ModuleWithExportedAndNonExportedVariables.ts (1 errors) ==== - module A { + namespace A { export var x = 'hello world' var y = 12; } diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedVariables.js b/tests/baselines/reference/ModuleWithExportedAndNonExportedVariables.js index 4c2a824c0233e..20dc6c94f4798 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedVariables.js +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedVariables.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedVariables.ts] //// //// [ModuleWithExportedAndNonExportedVariables.ts] -module A { +namespace A { export var x = 'hello world' var y = 12; } diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedVariables.symbols b/tests/baselines/reference/ModuleWithExportedAndNonExportedVariables.symbols index 26e8a51dedbd4..88a17b211c326 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedVariables.symbols +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedVariables.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedVariables.ts] //// === ModuleWithExportedAndNonExportedVariables.ts === -module A { +namespace A { >A : Symbol(A, Decl(ModuleWithExportedAndNonExportedVariables.ts, 0, 0)) export var x = 'hello world' diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedVariables.types b/tests/baselines/reference/ModuleWithExportedAndNonExportedVariables.types index e33fc7d5830ff..d5f4da5b5745b 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedVariables.types +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedVariables.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedVariables.ts] //// === ModuleWithExportedAndNonExportedVariables.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/NonInitializedExportInInternalModule.errors.txt b/tests/baselines/reference/NonInitializedExportInInternalModule.errors.txt index 38c0480c6bf35..20fd93f7c5cb8 100644 --- a/tests/baselines/reference/NonInitializedExportInInternalModule.errors.txt +++ b/tests/baselines/reference/NonInitializedExportInInternalModule.errors.txt @@ -4,7 +4,7 @@ NonInitializedExportInInternalModule.ts(4,10): error TS1123: Variable declaratio ==== NonInitializedExportInInternalModule.ts (3 errors) ==== - module Inner { + namespace Inner { var; !!! error TS1123: Variable declaration list cannot be empty. @@ -28,7 +28,7 @@ NonInitializedExportInInternalModule.ts(4,10): error TS1123: Variable declaratio export let x, y, z; } - module C { + namespace C { export var a = 1, b, c = 2; export var x, y, z; } diff --git a/tests/baselines/reference/NonInitializedExportInInternalModule.js b/tests/baselines/reference/NonInitializedExportInInternalModule.js index 0e4bd13bfb8ea..0273474a2c11c 100644 --- a/tests/baselines/reference/NonInitializedExportInInternalModule.js +++ b/tests/baselines/reference/NonInitializedExportInInternalModule.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/NonInitializedExportInInternalModule.ts] //// //// [NonInitializedExportInInternalModule.ts] -module Inner { +namespace Inner { var; let; const; @@ -19,7 +19,7 @@ module Inner { export let x, y, z; } - module C { + namespace C { export var a = 1, b, c = 2; export var x, y, z; } diff --git a/tests/baselines/reference/NonInitializedExportInInternalModule.symbols b/tests/baselines/reference/NonInitializedExportInInternalModule.symbols index 70f757d815ccb..62f7c0d2e5258 100644 --- a/tests/baselines/reference/NonInitializedExportInInternalModule.symbols +++ b/tests/baselines/reference/NonInitializedExportInInternalModule.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/NonInitializedExportInInternalModule.ts] //// === NonInitializedExportInInternalModule.ts === -module Inner { +namespace Inner { >Inner : Symbol(Inner, Decl(NonInitializedExportInInternalModule.ts, 0, 0)) var; @@ -45,7 +45,7 @@ module Inner { >z : Symbol(z, Decl(NonInitializedExportInInternalModule.ts, 15, 24)) } - module C { + namespace C { >C : Symbol(C, Decl(NonInitializedExportInInternalModule.ts, 16, 5)) export var a = 1, b, c = 2; diff --git a/tests/baselines/reference/NonInitializedExportInInternalModule.types b/tests/baselines/reference/NonInitializedExportInInternalModule.types index a1da3d7d020f9..4c715dc8fe518 100644 --- a/tests/baselines/reference/NonInitializedExportInInternalModule.types +++ b/tests/baselines/reference/NonInitializedExportInInternalModule.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/exportDeclarations/NonInitializedExportInInternalModule.ts] //// === NonInitializedExportInInternalModule.ts === -module Inner { +namespace Inner { >Inner : typeof Inner > : ^^^^^^^^^^^^ @@ -65,7 +65,7 @@ module Inner { > : ^^^ } - module C { + namespace C { >C : typeof C > : ^^^^^^^^ diff --git a/tests/baselines/reference/Protected2.errors.txt b/tests/baselines/reference/Protected2.errors.txt index 6affb6084ade0..c863922eb81e7 100644 --- a/tests/baselines/reference/Protected2.errors.txt +++ b/tests/baselines/reference/Protected2.errors.txt @@ -1,8 +1,11 @@ Protected2.ts(1,1): error TS1044: 'protected' modifier cannot appear on a module or namespace element. +Protected2.ts(1,11): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. -==== Protected2.ts (1 errors) ==== +==== Protected2.ts (2 errors) ==== protected module M { ~~~~~~~~~ !!! error TS1044: 'protected' modifier cannot appear on a module or namespace element. + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. } \ No newline at end of file diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.errors.txt b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.errors.txt new file mode 100644 index 0000000000000..f8d5660f204f9 --- /dev/null +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.errors.txt @@ -0,0 +1,52 @@ +TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts(20,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts(20,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts(20,12): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts (3 errors) ==== + namespace A { + export class Point { + x: number; + y: number; + } + } + + namespace A { + class Point { + fromCarthesian(p: A.Point) { + return { x: p.x, y: p.y }; + } + } + } + + // ensure merges as expected + var p: { x: number; y: number; }; + var p: A.Point; + + module X.Y.Z { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export class Line { + length: number; + } + } + + namespace X { + export namespace Y { + export namespace Z { + class Line { + name: string; + } + } + } + } + + // ensure merges as expected + var l: { length: number; } + var l: X.Y.Z.Line; + + \ No newline at end of file diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js index 1edd319cfb27c..a036ce577deb3 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js @@ -1,14 +1,14 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts] //// //// [TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts] -module A { +namespace A { export class Point { x: number; y: number; } } -module A { +namespace A { class Point { fromCarthesian(p: A.Point) { return { x: p.x, y: p.y }; @@ -26,9 +26,9 @@ module X.Y.Z { } } -module X { - export module Y { - export module Z { +namespace X { + export namespace Y { + export namespace Z { class Line { name: string; } diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.symbols b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.symbols index bfbb80eff0db6..3bed0000baeaa 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.symbols +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts] //// === TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts === -module A { +namespace A { >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 5, 1)) export class Point { ->Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 0, 10)) +>Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 0, 13)) x: number; >x : Symbol(Point.x, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 1, 24)) @@ -15,17 +15,17 @@ module A { } } -module A { +namespace A { >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 5, 1)) class Point { ->Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 7, 10)) +>Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 7, 13)) fromCarthesian(p: A.Point) { >fromCarthesian : Symbol(Point.fromCarthesian, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 8, 17)) >p : Symbol(p, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 9, 23)) >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 5, 1)) ->Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 0, 10)) +>Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 0, 13)) return { x: p.x, y: p.y }; >x : Symbol(x, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 10, 20)) @@ -49,12 +49,12 @@ var p: { x: number; y: number; }; var p: A.Point; >p : Symbol(p, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 16, 3), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 17, 3)) >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 5, 1)) ->Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 0, 13)) module X.Y.Z { >X : Symbol(X, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 17, 15), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 23, 1)) ->Y : Symbol(Y, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 19, 9), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 25, 10)) ->Z : Symbol(Z, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 19, 11), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 26, 21)) +>Y : Symbol(Y, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 19, 9), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 25, 13)) +>Z : Symbol(Z, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 19, 11), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 26, 24)) export class Line { >Line : Symbol(Line, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 19, 14)) @@ -64,17 +64,17 @@ module X.Y.Z { } } -module X { +namespace X { >X : Symbol(X, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 17, 15), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 23, 1)) - export module Y { ->Y : Symbol(Y, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 19, 9), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 25, 10)) + export namespace Y { +>Y : Symbol(Y, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 19, 9), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 25, 13)) - export module Z { ->Z : Symbol(Z, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 19, 11), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 26, 21)) + export namespace Z { +>Z : Symbol(Z, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 19, 11), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 26, 24)) class Line { ->Line : Symbol(Line, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 27, 25)) +>Line : Symbol(Line, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 27, 28)) name: string; >name : Symbol(Line.name, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 28, 24)) @@ -91,8 +91,8 @@ var l: { length: number; } var l: X.Y.Z.Line; >l : Symbol(l, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 36, 3), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 37, 3)) >X : Symbol(X, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 17, 15), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 23, 1)) ->Y : Symbol(X.Y, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 19, 9), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 25, 10)) ->Z : Symbol(X.Y.Z, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 19, 11), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 26, 21)) +>Y : Symbol(X.Y, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 19, 9), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 25, 13)) +>Z : Symbol(X.Y.Z, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 19, 11), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 26, 24)) >Line : Symbol(X.Y.Z.Line, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 19, 14)) diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.types index 1fb48486d72bf..f13ff0dc01d9b 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.types +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts] //// === TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -19,7 +19,7 @@ module A { } } -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -91,15 +91,15 @@ module X.Y.Z { } } -module X { +namespace X { >X : typeof X > : ^^^^^^^^ - export module Y { + export namespace Y { >Y : typeof Y > : ^^^^^^^^ - export module Z { + export namespace Z { >Z : typeof Z > : ^^^^^^^^ diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.errors.txt b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.errors.txt new file mode 100644 index 0000000000000..1c8c2abeef711 --- /dev/null +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.errors.txt @@ -0,0 +1,55 @@ +TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts(19,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts(19,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts(19,12): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts(26,12): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts(26,21): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts (5 errors) ==== + namespace A { + export interface Point { + x: number; + y: number; + toCarth(): Point; + } + } + + namespace A { + interface Point { + fromCarth(): Point; + } + } + + // ensure merges as expected + var p: { x: number; y: number; toCarth(): A.Point; }; + var p: A.Point; + + module X.Y.Z { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export interface Line { + new (start: A.Point, end: A.Point); + } + } + + namespace X { + export module Y.Z { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Line { + start: A.Point; + end: A.Point; + } + } + } + + // ensure merges as expected + var l: { new (s: A.Point, e: A.Point); } + var l: X.Y.Z.Line; + \ No newline at end of file diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.js index 9a6d81ac46268..a3c119db347a6 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts] //// //// [TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts] -module A { +namespace A { export interface Point { x: number; y: number; @@ -9,7 +9,7 @@ module A { } } -module A { +namespace A { interface Point { fromCarth(): Point; } @@ -25,7 +25,7 @@ module X.Y.Z { } } -module X { +namespace X { export module Y.Z { interface Line { start: A.Point; diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.symbols b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.symbols index 6a3602a5572b6..e1345cb45bc00 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.symbols +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts] //// === TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts === -module A { +namespace A { >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 6, 1)) export interface Point { ->Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 10)) +>Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 13)) x: number; >x : Symbol(Point.x, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 1, 28)) @@ -15,19 +15,19 @@ module A { toCarth(): Point; >toCarth : Symbol(Point.toCarth, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 3, 18)) ->Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 10)) +>Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 13)) } } -module A { +namespace A { >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 6, 1)) interface Point { ->Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 8, 10)) +>Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 8, 13)) fromCarth(): Point; >fromCarth : Symbol(Point.fromCarth, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 9, 21)) ->Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 8, 10)) +>Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 8, 13)) } } @@ -38,16 +38,16 @@ var p: { x: number; y: number; toCarth(): A.Point; }; >y : Symbol(y, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 15, 19)) >toCarth : Symbol(toCarth, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 15, 30)) >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 6, 1)) ->Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 13)) var p: A.Point; >p : Symbol(p, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 15, 3), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 16, 3)) >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 6, 1)) ->Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 13)) module X.Y.Z { >X : Symbol(X, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 16, 15), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 22, 1)) ->Y : Symbol(Y, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 18, 9), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 24, 10)) +>Y : Symbol(Y, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 18, 9), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 24, 13)) >Z : Symbol(Z, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 18, 11), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 25, 20)) export interface Line { @@ -56,18 +56,18 @@ module X.Y.Z { new (start: A.Point, end: A.Point); >start : Symbol(start, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 20, 13)) >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 6, 1)) ->Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 13)) >end : Symbol(end, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 20, 28)) >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 6, 1)) ->Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 13)) } } -module X { +namespace X { >X : Symbol(X, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 16, 15), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 22, 1)) export module Y.Z { ->Y : Symbol(Y, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 18, 9), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 24, 10)) +>Y : Symbol(Y, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 18, 9), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 24, 13)) >Z : Symbol(Z, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 18, 11), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 25, 20)) interface Line { @@ -76,12 +76,12 @@ module X { start: A.Point; >start : Symbol(Line.start, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 26, 24)) >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 6, 1)) ->Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 13)) end: A.Point; >end : Symbol(Line.end, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 27, 27)) >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 6, 1)) ->Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 13)) } } } @@ -91,15 +91,15 @@ var l: { new (s: A.Point, e: A.Point); } >l : Symbol(l, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 34, 3), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 35, 3)) >s : Symbol(s, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 34, 14)) >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 6, 1)) ->Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 13)) >e : Symbol(e, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 34, 25)) >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 6, 1)) ->Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 13)) var l: X.Y.Z.Line; >l : Symbol(l, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 34, 3), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 35, 3)) >X : Symbol(X, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 16, 15), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 22, 1)) ->Y : Symbol(X.Y, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 18, 9), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 24, 10)) +>Y : Symbol(X.Y, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 18, 9), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 24, 13)) >Z : Symbol(X.Y.Z, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 18, 11), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 25, 20)) >Line : Symbol(X.Y.Z.Line, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 18, 14)) diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.types index 5ca61445d6af7..3ec889f104b86 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.types +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts] //// === TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts === -module A { +namespace A { export interface Point { x: number; >x : number @@ -17,7 +17,7 @@ module A { } } -module A { +namespace A { interface Point { fromCarth(): Point; >fromCarth : () => Point @@ -58,7 +58,7 @@ module X.Y.Z { } } -module X { +namespace X { export module Y.Z { interface Line { start: A.Point; diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.js index 16c37108d3f0a..54f168e3f52e0 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.js @@ -1,13 +1,13 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.ts] //// //// [part1.ts] -module A { +namespace A { export interface Point { x: number; y: number; } - export module Utils { + export namespace Utils { export function mirror(p: T) { return { x: p.y, y: p.x }; } @@ -16,11 +16,11 @@ module A { } //// [part2.ts] -module A { +namespace A { // not a collision, since we don't export var Origin: string = "0,0"; - export module Utils { + export namespace Utils { export class Plane { constructor(public tl: Point, public br: Point) { } } diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.symbols b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.symbols index 6cc0d81c1b6f3..62c14c350f784 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.symbols +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.ts] //// === part1.ts === -module A { +namespace A { >A : Symbol(A, Decl(part1.ts, 0, 0), Decl(part2.ts, 0, 0)) export interface Point { ->Point : Symbol(Point, Decl(part1.ts, 0, 10)) +>Point : Symbol(Point, Decl(part1.ts, 0, 13)) x: number; >x : Symbol(Point.x, Decl(part1.ts, 1, 28)) @@ -14,13 +14,13 @@ module A { >y : Symbol(Point.y, Decl(part1.ts, 2, 18)) } - export module Utils { + export namespace Utils { >Utils : Symbol(Utils, Decl(part1.ts, 4, 5), Decl(part2.ts, 2, 31)) export function mirror(p: T) { ->mirror : Symbol(mirror, Decl(part1.ts, 6, 25)) +>mirror : Symbol(mirror, Decl(part1.ts, 6, 28)) >T : Symbol(T, Decl(part1.ts, 7, 31)) ->Point : Symbol(Point, Decl(part1.ts, 0, 10)) +>Point : Symbol(Point, Decl(part1.ts, 0, 13)) >p : Symbol(p, Decl(part1.ts, 7, 48)) >T : Symbol(T, Decl(part1.ts, 7, 31)) @@ -37,30 +37,30 @@ module A { } export var Origin: Point = { x: 0, y: 0 }; >Origin : Symbol(Origin, Decl(part1.ts, 11, 14)) ->Point : Symbol(Point, Decl(part1.ts, 0, 10)) +>Point : Symbol(Point, Decl(part1.ts, 0, 13)) >x : Symbol(x, Decl(part1.ts, 11, 32)) >y : Symbol(y, Decl(part1.ts, 11, 38)) } === part2.ts === -module A { +namespace A { >A : Symbol(A, Decl(part1.ts, 0, 0), Decl(part2.ts, 0, 0)) // not a collision, since we don't export var Origin: string = "0,0"; >Origin : Symbol(Origin, Decl(part2.ts, 2, 7)) - export module Utils { + export namespace Utils { >Utils : Symbol(Utils, Decl(part1.ts, 4, 5), Decl(part2.ts, 2, 31)) export class Plane { ->Plane : Symbol(Plane, Decl(part2.ts, 4, 25)) +>Plane : Symbol(Plane, Decl(part2.ts, 4, 28)) constructor(public tl: Point, public br: Point) { } >tl : Symbol(Plane.tl, Decl(part2.ts, 6, 24)) ->Point : Symbol(Point, Decl(part1.ts, 0, 10)) +>Point : Symbol(Point, Decl(part1.ts, 0, 13)) >br : Symbol(Plane.br, Decl(part2.ts, 6, 41)) ->Point : Symbol(Point, Decl(part1.ts, 0, 10)) +>Point : Symbol(Point, Decl(part1.ts, 0, 13)) } } } @@ -76,7 +76,7 @@ var o: { x: number; y: number }; var o: A.Point; >o : Symbol(o, Decl(part3.ts, 2, 3), Decl(part3.ts, 3, 3), Decl(part3.ts, 4, 3), Decl(part3.ts, 5, 3)) >A : Symbol(A, Decl(part1.ts, 0, 0), Decl(part2.ts, 0, 0)) ->Point : Symbol(A.Point, Decl(part1.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(part1.ts, 0, 13)) var o = A.Origin; >o : Symbol(o, Decl(part3.ts, 2, 3), Decl(part3.ts, 3, 3), Decl(part3.ts, 4, 3), Decl(part3.ts, 5, 3)) @@ -86,35 +86,35 @@ var o = A.Origin; var o = A.Utils.mirror(o); >o : Symbol(o, Decl(part3.ts, 2, 3), Decl(part3.ts, 3, 3), Decl(part3.ts, 4, 3), Decl(part3.ts, 5, 3)) ->A.Utils.mirror : Symbol(A.Utils.mirror, Decl(part1.ts, 6, 25)) +>A.Utils.mirror : Symbol(A.Utils.mirror, Decl(part1.ts, 6, 28)) >A.Utils : Symbol(A.Utils, Decl(part1.ts, 4, 5), Decl(part2.ts, 2, 31)) >A : Symbol(A, Decl(part1.ts, 0, 0), Decl(part2.ts, 0, 0)) >Utils : Symbol(A.Utils, Decl(part1.ts, 4, 5), Decl(part2.ts, 2, 31)) ->mirror : Symbol(A.Utils.mirror, Decl(part1.ts, 6, 25)) +>mirror : Symbol(A.Utils.mirror, Decl(part1.ts, 6, 28)) >o : Symbol(o, Decl(part3.ts, 2, 3), Decl(part3.ts, 3, 3), Decl(part3.ts, 4, 3), Decl(part3.ts, 5, 3)) var p: { tl: A.Point; br: A.Point }; >p : Symbol(p, Decl(part3.ts, 7, 3), Decl(part3.ts, 8, 3), Decl(part3.ts, 9, 3)) >tl : Symbol(tl, Decl(part3.ts, 7, 8)) >A : Symbol(A, Decl(part1.ts, 0, 0), Decl(part2.ts, 0, 0)) ->Point : Symbol(A.Point, Decl(part1.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(part1.ts, 0, 13)) >br : Symbol(br, Decl(part3.ts, 7, 21)) >A : Symbol(A, Decl(part1.ts, 0, 0), Decl(part2.ts, 0, 0)) ->Point : Symbol(A.Point, Decl(part1.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(part1.ts, 0, 13)) var p: A.Utils.Plane; >p : Symbol(p, Decl(part3.ts, 7, 3), Decl(part3.ts, 8, 3), Decl(part3.ts, 9, 3)) >A : Symbol(A, Decl(part1.ts, 0, 0), Decl(part2.ts, 0, 0)) >Utils : Symbol(A.Utils, Decl(part1.ts, 4, 5), Decl(part2.ts, 2, 31)) ->Plane : Symbol(A.Utils.Plane, Decl(part2.ts, 4, 25)) +>Plane : Symbol(A.Utils.Plane, Decl(part2.ts, 4, 28)) var p = new A.Utils.Plane(o, { x: 1, y: 1 }); >p : Symbol(p, Decl(part3.ts, 7, 3), Decl(part3.ts, 8, 3), Decl(part3.ts, 9, 3)) ->A.Utils.Plane : Symbol(A.Utils.Plane, Decl(part2.ts, 4, 25)) +>A.Utils.Plane : Symbol(A.Utils.Plane, Decl(part2.ts, 4, 28)) >A.Utils : Symbol(A.Utils, Decl(part1.ts, 4, 5), Decl(part2.ts, 2, 31)) >A : Symbol(A, Decl(part1.ts, 0, 0), Decl(part2.ts, 0, 0)) >Utils : Symbol(A.Utils, Decl(part1.ts, 4, 5), Decl(part2.ts, 2, 31)) ->Plane : Symbol(A.Utils.Plane, Decl(part2.ts, 4, 25)) +>Plane : Symbol(A.Utils.Plane, Decl(part2.ts, 4, 28)) >o : Symbol(o, Decl(part3.ts, 2, 3), Decl(part3.ts, 3, 3), Decl(part3.ts, 4, 3), Decl(part3.ts, 5, 3)) >x : Symbol(x, Decl(part3.ts, 9, 30)) >y : Symbol(y, Decl(part3.ts, 9, 36)) diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types index df868ced09330..46ce76161054e 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.ts] //// === part1.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -15,7 +15,7 @@ module A { > : ^^^^^^ } - export module Utils { + export namespace Utils { >Utils : typeof Utils > : ^^^^^^^^^^^^ @@ -62,7 +62,7 @@ module A { } === part2.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -73,7 +73,7 @@ module A { >"0,0" : "0,0" > : ^^^^^ - export module Utils { + export namespace Utils { >Utils : typeof Utils > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.errors.txt b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.errors.txt index 63afa98aa5cbc..bde3fec3d28af 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.errors.txt +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.errors.txt @@ -1,11 +1,14 @@ TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts(2,18): error TS2300: Duplicate identifier 'Point'. TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts(10,18): error TS2300: Duplicate identifier 'Point'. +TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts(16,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts(16,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts(16,12): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts(17,18): error TS2300: Duplicate identifier 'Line'. TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts(26,26): error TS2300: Duplicate identifier 'Line'. -==== TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts (4 errors) ==== - module A { +==== TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts (7 errors) ==== + namespace A { export class Point { ~~~~~ !!! error TS2300: Duplicate identifier 'Point'. @@ -14,7 +17,7 @@ TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts(26,26): error } } - module A{ + namespace A{ // expected error export class Point { ~~~~~ @@ -25,6 +28,12 @@ TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts(26,26): error } module X.Y.Z { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. export class Line { ~~~~ !!! error TS2300: Duplicate identifier 'Line'. @@ -32,9 +41,9 @@ TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts(26,26): error } } - module X { - export module Y { - export module Z { + namespace X { + export namespace Y { + export namespace Z { // expected error export class Line { ~~~~ diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.js index ebf2a9b46a003..939884470d19c 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.js @@ -1,14 +1,14 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts] //// //// [TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts] -module A { +namespace A { export class Point { x: number; y: number; } } -module A{ +namespace A{ // expected error export class Point { origin: number; @@ -22,9 +22,9 @@ module X.Y.Z { } } -module X { - export module Y { - export module Z { +namespace X { + export namespace Y { + export namespace Z { // expected error export class Line { name: string; diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.symbols b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.symbols index a7c68ee6f9716..2068ca0ef4834 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.symbols +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts] //// === TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts === -module A { +namespace A { >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 5, 1)) export class Point { ->Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 0, 10)) +>Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 0, 13)) x: number; >x : Symbol(Point.x, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 1, 24)) @@ -15,12 +15,12 @@ module A { } } -module A{ +namespace A{ >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 5, 1)) // expected error export class Point { ->Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 7, 9)) +>Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 7, 12)) origin: number; >origin : Symbol(Point.origin, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 9, 24)) @@ -32,8 +32,8 @@ module A{ module X.Y.Z { >X : Symbol(X, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 13, 1), Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 19, 1)) ->Y : Symbol(Y, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 15, 9), Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 21, 10)) ->Z : Symbol(Z, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 15, 11), Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 22, 21)) +>Y : Symbol(Y, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 15, 9), Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 21, 13)) +>Z : Symbol(Z, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 15, 11), Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 22, 24)) export class Line { >Line : Symbol(Line, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 15, 14)) @@ -43,18 +43,18 @@ module X.Y.Z { } } -module X { +namespace X { >X : Symbol(X, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 13, 1), Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 19, 1)) - export module Y { ->Y : Symbol(Y, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 15, 9), Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 21, 10)) + export namespace Y { +>Y : Symbol(Y, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 15, 9), Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 21, 13)) - export module Z { ->Z : Symbol(Z, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 15, 11), Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 22, 21)) + export namespace Z { +>Z : Symbol(Z, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 15, 11), Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 22, 24)) // expected error export class Line { ->Line : Symbol(Line, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 23, 25)) +>Line : Symbol(Line, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 23, 28)) name: string; >name : Symbol(Line.name, Decl(TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts, 25, 31)) diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.types index c07c094c9bb52..121c623985860 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.types +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts] //// === TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -19,7 +19,7 @@ module A { } } -module A{ +namespace A{ >A : typeof A > : ^^^^^^^^ @@ -56,15 +56,15 @@ module X.Y.Z { } } -module X { +namespace X { >X : typeof X > : ^^^^^^^^ - export module Y { + export namespace Y { >Y : typeof Y > : ^^^^^^^^ - export module Z { + export namespace Z { >Z : typeof Z > : ^^^^^^^^ diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.errors.txt b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.errors.txt new file mode 100644 index 0000000000000..97b9acf4a0320 --- /dev/null +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.errors.txt @@ -0,0 +1,55 @@ +TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts(19,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts(19,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts(19,12): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts(26,12): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts(26,21): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts (5 errors) ==== + namespace A { + export interface Point { + x: number; + y: number; + toCarth(): Point; + } + } + + namespace A { + export interface Point { + fromCarth(): Point; + } + } + + // ensure merges as expected + var p: { x: number; y: number; toCarth(): A.Point; fromCarth(): A.Point; }; + var p: A.Point; + + module X.Y.Z { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export interface Line { + new (start: A.Point, end: A.Point); + } + } + + namespace X { + export module Y.Z { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export interface Line { + start: A.Point; + end: A.Point; + } + } + } + + // ensure merges as expected + var l: { start: A.Point; end: A.Point; new (s: A.Point, e: A.Point); } + var l: X.Y.Z.Line; + \ No newline at end of file diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.js index 13414c334047c..e229fd0b2beda 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts] //// //// [TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts] -module A { +namespace A { export interface Point { x: number; y: number; @@ -9,7 +9,7 @@ module A { } } -module A { +namespace A { export interface Point { fromCarth(): Point; } @@ -25,7 +25,7 @@ module X.Y.Z { } } -module X { +namespace X { export module Y.Z { export interface Line { start: A.Point; diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.symbols b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.symbols index b462115f681df..0b731fae86e41 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.symbols +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts] //// === TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts === -module A { +namespace A { >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 6, 1)) export interface Point { ->Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 10), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 10)) +>Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 13), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 13)) x: number; >x : Symbol(Point.x, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 1, 28)) @@ -15,19 +15,19 @@ module A { toCarth(): Point; >toCarth : Symbol(Point.toCarth, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 3, 18)) ->Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 10), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 10)) +>Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 13), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 13)) } } -module A { +namespace A { >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 6, 1)) export interface Point { ->Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 10), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 10)) +>Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 13), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 13)) fromCarth(): Point; >fromCarth : Symbol(Point.fromCarth, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 9, 28)) ->Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 10), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 10)) +>Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 13), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 13)) } } @@ -38,19 +38,19 @@ var p: { x: number; y: number; toCarth(): A.Point; fromCarth(): A.Point; }; >y : Symbol(y, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 15, 19)) >toCarth : Symbol(toCarth, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 15, 30)) >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 6, 1)) ->Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 10), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 10)) +>Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 13), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 13)) >fromCarth : Symbol(fromCarth, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 15, 50)) >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 6, 1)) ->Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 10), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 10)) +>Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 13), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 13)) var p: A.Point; >p : Symbol(p, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 15, 3), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 16, 3)) >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 6, 1)) ->Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 10), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 10)) +>Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 13), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 13)) module X.Y.Z { >X : Symbol(X, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 16, 15), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 22, 1)) ->Y : Symbol(Y, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 18, 9), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 24, 10)) +>Y : Symbol(Y, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 18, 9), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 24, 13)) >Z : Symbol(Z, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 18, 11), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 25, 20)) export interface Line { @@ -59,18 +59,18 @@ module X.Y.Z { new (start: A.Point, end: A.Point); >start : Symbol(start, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 20, 13)) >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 6, 1)) ->Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 10), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 10)) +>Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 13), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 13)) >end : Symbol(end, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 20, 28)) >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 6, 1)) ->Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 10), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 10)) +>Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 13), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 13)) } } -module X { +namespace X { >X : Symbol(X, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 16, 15), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 22, 1)) export module Y.Z { ->Y : Symbol(Y, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 18, 9), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 24, 10)) +>Y : Symbol(Y, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 18, 9), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 24, 13)) >Z : Symbol(Z, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 18, 11), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 25, 20)) export interface Line { @@ -79,12 +79,12 @@ module X { start: A.Point; >start : Symbol(Line.start, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 26, 31)) >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 6, 1)) ->Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 10), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 10)) +>Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 13), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 13)) end: A.Point; >end : Symbol(Line.end, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 27, 27)) >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 6, 1)) ->Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 10), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 10)) +>Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 13), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 13)) } } } @@ -94,21 +94,21 @@ var l: { start: A.Point; end: A.Point; new (s: A.Point, e: A.Point); } >l : Symbol(l, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 34, 3), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 35, 3)) >start : Symbol(start, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 34, 8)) >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 6, 1)) ->Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 10), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 10)) +>Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 13), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 13)) >end : Symbol(end, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 34, 24)) >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 6, 1)) ->Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 10), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 10)) +>Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 13), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 13)) >s : Symbol(s, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 34, 44)) >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 6, 1)) ->Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 10), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 10)) +>Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 13), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 13)) >e : Symbol(e, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 34, 55)) >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 6, 1)) ->Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 10), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 10)) +>Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 13), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 13)) var l: X.Y.Z.Line; >l : Symbol(l, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 34, 3), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 35, 3)) >X : Symbol(X, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 16, 15), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 22, 1)) ->Y : Symbol(X.Y, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 18, 9), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 24, 10)) +>Y : Symbol(X.Y, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 18, 9), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 24, 13)) >Z : Symbol(X.Y.Z, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 18, 11), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 25, 20)) >Line : Symbol(X.Y.Z.Line, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 18, 14), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 25, 23)) diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.types index 1c73ccbe6f35f..9fe90de5e36da 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.types +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts] //// === TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts === -module A { +namespace A { export interface Point { x: number; >x : number @@ -17,7 +17,7 @@ module A { } } -module A { +namespace A { export interface Point { fromCarth(): Point; >fromCarth : () => Point @@ -62,7 +62,7 @@ module X.Y.Z { } } -module X { +namespace X { export module Y.Z { export interface Line { start: A.Point; diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.errors.txt b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.errors.txt index e7d9bcf40169a..5c522dfbe989c 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.errors.txt +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.errors.txt @@ -4,13 +4,13 @@ part2.ts(7,54): error TS2304: Cannot find name 'Point'. ==== part1.ts (0 errors) ==== - export module A { + export namespace A { export interface Point { x: number; y: number; } - export module Utils { + export namespace Utils { export function mirror(p: T) { return { x: p.y, y: p.x }; } @@ -20,13 +20,13 @@ part2.ts(7,54): error TS2304: Cannot find name 'Point'. } ==== part2.ts (3 errors) ==== - export module A { + export namespace A { // collision with 'Origin' var in other part of merged module export var Origin: Point = { x: 0, y: 0 }; ~~~~~ !!! error TS2304: Cannot find name 'Point'. - export module Utils { + export namespace Utils { export class Plane { constructor(public tl: Point, public br: Point) { } ~~~~~ diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js index 4779ddb70e037..3b491e270d92d 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js @@ -1,13 +1,13 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.ts] //// //// [part1.ts] -export module A { +export namespace A { export interface Point { x: number; y: number; } - export module Utils { + export namespace Utils { export function mirror(p: T) { return { x: p.y, y: p.x }; } @@ -17,11 +17,11 @@ export module A { } //// [part2.ts] -export module A { +export namespace A { // collision with 'Origin' var in other part of merged module export var Origin: Point = { x: 0, y: 0 }; - export module Utils { + export namespace Utils { export class Plane { constructor(public tl: Point, public br: Point) { } } diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.symbols b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.symbols index a7f6454348f17..855ff249f814e 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.symbols +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.ts] //// === part1.ts === -export module A { +export namespace A { >A : Symbol(A, Decl(part1.ts, 0, 0)) export interface Point { ->Point : Symbol(Point, Decl(part1.ts, 0, 17)) +>Point : Symbol(Point, Decl(part1.ts, 0, 20)) x: number; >x : Symbol(Point.x, Decl(part1.ts, 1, 28)) @@ -14,13 +14,13 @@ export module A { >y : Symbol(Point.y, Decl(part1.ts, 2, 18)) } - export module Utils { + export namespace Utils { >Utils : Symbol(Utils, Decl(part1.ts, 4, 5)) export function mirror(p: T) { ->mirror : Symbol(mirror, Decl(part1.ts, 6, 25)) +>mirror : Symbol(mirror, Decl(part1.ts, 6, 28)) >T : Symbol(T, Decl(part1.ts, 7, 31)) ->Point : Symbol(Point, Decl(part1.ts, 0, 17)) +>Point : Symbol(Point, Decl(part1.ts, 0, 20)) >p : Symbol(p, Decl(part1.ts, 7, 48)) >T : Symbol(T, Decl(part1.ts, 7, 31)) @@ -38,13 +38,13 @@ export module A { export var Origin: Point = { x: 0, y: 0 }; >Origin : Symbol(Origin, Decl(part1.ts, 12, 14)) ->Point : Symbol(Point, Decl(part1.ts, 0, 17)) +>Point : Symbol(Point, Decl(part1.ts, 0, 20)) >x : Symbol(x, Decl(part1.ts, 12, 32)) >y : Symbol(y, Decl(part1.ts, 12, 38)) } === part2.ts === -export module A { +export namespace A { >A : Symbol(A, Decl(part2.ts, 0, 0)) // collision with 'Origin' var in other part of merged module @@ -54,11 +54,11 @@ export module A { >x : Symbol(x, Decl(part2.ts, 2, 32)) >y : Symbol(y, Decl(part2.ts, 2, 38)) - export module Utils { + export namespace Utils { >Utils : Symbol(Utils, Decl(part2.ts, 2, 46)) export class Plane { ->Plane : Symbol(Plane, Decl(part2.ts, 4, 25)) +>Plane : Symbol(Plane, Decl(part2.ts, 4, 28)) constructor(public tl: Point, public br: Point) { } >tl : Symbol(Plane.tl, Decl(part2.ts, 6, 24)) diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.types index cf8deaad9704a..0fab295319851 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.types +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.ts] //// === part1.ts === -export module A { +export namespace A { >A : typeof A > : ^^^^^^^^ @@ -15,7 +15,7 @@ export module A { > : ^^^^^^ } - export module Utils { + export namespace Utils { >Utils : typeof Utils > : ^^^^^^^^^^^^ @@ -63,7 +63,7 @@ export module A { } === part2.ts === -export module A { +export namespace A { >A : typeof A > : ^^^^^^^^ @@ -82,7 +82,7 @@ export module A { >0 : 0 > : ^ - export module Utils { + export namespace Utils { >Utils : typeof Utils > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.errors.txt b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.errors.txt new file mode 100644 index 0000000000000..6d2a3a92d269f --- /dev/null +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.errors.txt @@ -0,0 +1,52 @@ +TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts(1,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts(1,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts(15,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts(15,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts(15,12): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts (5 errors) ==== + module A.B { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export var x: number; + } + + namespace A{ + namespace B { + export var x: string; + } + } + + // ensure the right var decl is exported + var x: number; + var x = A.B.x; + + module X.Y.Z { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export class Line { + length: number; + } + } + + namespace X { + export namespace Y { + namespace Z { + export class Line { + name: string; + } + } + } + } + + // make sure merging works as expected + var l: { length: number }; + var l: X.Y.Z.Line; + \ No newline at end of file diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.js index fed33c84d7e2b..b33716b66f628 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.js @@ -5,8 +5,8 @@ module A.B { export var x: number; } -module A{ - module B { +namespace A{ + namespace B { export var x: string; } } @@ -21,9 +21,9 @@ module X.Y.Z { } } -module X { - export module Y { - module Z { +namespace X { + export namespace Y { + namespace Z { export class Line { name: string; } diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.symbols b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.symbols index ff6ce503c889d..b36fc932e3bf7 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.symbols +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.symbols @@ -9,11 +9,11 @@ module A.B { >x : Symbol(x, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 1, 14)) } -module A{ +namespace A{ >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 2, 1)) - module B { ->B : Symbol(B, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 4, 9)) + namespace B { +>B : Symbol(B, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 4, 12)) export var x: string; >x : Symbol(x, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 6, 18)) @@ -34,7 +34,7 @@ var x = A.B.x; module X.Y.Z { >X : Symbol(X, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 12, 14), Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 18, 1)) ->Y : Symbol(Y, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 14, 9), Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 20, 10)) +>Y : Symbol(Y, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 14, 9), Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 20, 13)) >Z : Symbol(Z, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 14, 11)) export class Line { @@ -45,17 +45,17 @@ module X.Y.Z { } } -module X { +namespace X { >X : Symbol(X, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 12, 14), Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 18, 1)) - export module Y { ->Y : Symbol(Y, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 14, 9), Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 20, 10)) + export namespace Y { +>Y : Symbol(Y, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 14, 9), Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 20, 13)) - module Z { ->Z : Symbol(Z, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 21, 21)) + namespace Z { +>Z : Symbol(Z, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 21, 24)) export class Line { ->Line : Symbol(Line, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 22, 18)) +>Line : Symbol(Line, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 22, 21)) name: string; >name : Symbol(Line.name, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 23, 31)) @@ -72,7 +72,7 @@ var l: { length: number }; var l: X.Y.Z.Line; >l : Symbol(l, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 31, 3), Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 32, 3)) >X : Symbol(X, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 12, 14), Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 18, 1)) ->Y : Symbol(X.Y, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 14, 9), Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 20, 10)) +>Y : Symbol(X.Y, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 14, 9), Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 20, 13)) >Z : Symbol(X.Y.Z, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 14, 11)) >Line : Symbol(X.Y.Z.Line, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 14, 14)) diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.types index 79a22fc9fd1d7..70e392f3aaa81 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.types +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.types @@ -12,11 +12,11 @@ module A.B { > : ^^^^^^ } -module A{ +namespace A{ >A : typeof A > : ^^^^^^^^ - module B { + namespace B { >B : typeof B > : ^^^^^^^^ @@ -63,15 +63,15 @@ module X.Y.Z { } } -module X { +namespace X { >X : typeof X > : ^^^^^^^^ - export module Y { + export namespace Y { >Y : typeof Y > : ^^^^^^^^ - module Z { + namespace Z { >Z : typeof Z > : ^^^^^^^^ diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.js b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.js index 4b6ee2b14e4bd..b4e3df988acde 100644 --- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.js +++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.js @@ -1,14 +1,14 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.ts] //// //// [part1.ts] -module Root { - export module A { +namespace Root { + export namespace A { export interface Point { x: number; y: number; } - export module Utils { + export namespace Utils { export function mirror(p: T) { return { x: p.y, y: p.x }; } @@ -17,12 +17,12 @@ module Root { } //// [part2.ts] -module otherRoot { - export module A { +namespace otherRoot { + export namespace A { // have to be fully qualified since in different root export var Origin: Root.A.Point = { x: 0, y: 0 }; - export module Utils { + export namespace Utils { export class Plane { constructor(public tl: Root.A.Point, public br: Root.A.Point) { } } diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.symbols b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.symbols index 9c89a4b291e2d..d293b2e19cc33 100644 --- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.symbols +++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.symbols @@ -1,14 +1,14 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.ts] //// === part1.ts === -module Root { +namespace Root { >Root : Symbol(Root, Decl(part1.ts, 0, 0)) - export module A { ->A : Symbol(A, Decl(part1.ts, 0, 13)) + export namespace A { +>A : Symbol(A, Decl(part1.ts, 0, 16)) export interface Point { ->Point : Symbol(Point, Decl(part1.ts, 1, 21)) +>Point : Symbol(Point, Decl(part1.ts, 1, 24)) x: number; >x : Symbol(Point.x, Decl(part1.ts, 2, 32)) @@ -17,13 +17,13 @@ module Root { >y : Symbol(Point.y, Decl(part1.ts, 3, 22)) } - export module Utils { + export namespace Utils { >Utils : Symbol(Utils, Decl(part1.ts, 5, 9)) export function mirror(p: T) { ->mirror : Symbol(mirror, Decl(part1.ts, 7, 29)) +>mirror : Symbol(mirror, Decl(part1.ts, 7, 32)) >T : Symbol(T, Decl(part1.ts, 8, 35)) ->Point : Symbol(Point, Decl(part1.ts, 1, 21)) +>Point : Symbol(Point, Decl(part1.ts, 1, 24)) >p : Symbol(p, Decl(part1.ts, 8, 52)) >T : Symbol(T, Decl(part1.ts, 8, 35)) @@ -42,36 +42,36 @@ module Root { } === part2.ts === -module otherRoot { +namespace otherRoot { >otherRoot : Symbol(otherRoot, Decl(part2.ts, 0, 0)) - export module A { ->A : Symbol(A, Decl(part2.ts, 0, 18)) + export namespace A { +>A : Symbol(A, Decl(part2.ts, 0, 21)) // have to be fully qualified since in different root export var Origin: Root.A.Point = { x: 0, y: 0 }; >Origin : Symbol(Origin, Decl(part2.ts, 3, 18)) >Root : Symbol(Root, Decl(part1.ts, 0, 0)) ->A : Symbol(Root.A, Decl(part1.ts, 0, 13)) ->Point : Symbol(Root.A.Point, Decl(part1.ts, 1, 21)) +>A : Symbol(Root.A, Decl(part1.ts, 0, 16)) +>Point : Symbol(Root.A.Point, Decl(part1.ts, 1, 24)) >x : Symbol(x, Decl(part2.ts, 3, 43)) >y : Symbol(y, Decl(part2.ts, 3, 49)) - export module Utils { + export namespace Utils { >Utils : Symbol(Utils, Decl(part2.ts, 3, 57)) export class Plane { ->Plane : Symbol(Plane, Decl(part2.ts, 5, 29)) +>Plane : Symbol(Plane, Decl(part2.ts, 5, 32)) constructor(public tl: Root.A.Point, public br: Root.A.Point) { } >tl : Symbol(Plane.tl, Decl(part2.ts, 7, 28)) >Root : Symbol(Root, Decl(part1.ts, 0, 0)) ->A : Symbol(Root.A, Decl(part1.ts, 0, 13)) ->Point : Symbol(Root.A.Point, Decl(part1.ts, 1, 21)) +>A : Symbol(Root.A, Decl(part1.ts, 0, 16)) +>Point : Symbol(Root.A.Point, Decl(part1.ts, 1, 24)) >br : Symbol(Plane.br, Decl(part2.ts, 7, 52)) >Root : Symbol(Root, Decl(part1.ts, 0, 0)) ->A : Symbol(Root.A, Decl(part1.ts, 0, 13)) ->Point : Symbol(Root.A.Point, Decl(part1.ts, 1, 21)) +>A : Symbol(Root.A, Decl(part1.ts, 0, 16)) +>Point : Symbol(Root.A.Point, Decl(part1.ts, 1, 24)) } } } diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types index 1e0e29ec3dd25..e5448ae5a25db 100644 --- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types +++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.ts] //// === part1.ts === -module Root { +namespace Root { >Root : typeof Root > : ^^^^^^^^^^^ - export module A { + export namespace A { >A : typeof A > : ^^^^^^^^ @@ -19,7 +19,7 @@ module Root { > : ^^^^^^ } - export module Utils { + export namespace Utils { >Utils : typeof Utils > : ^^^^^^^^^^^^ @@ -54,11 +54,11 @@ module Root { } === part2.ts === -module otherRoot { +namespace otherRoot { >otherRoot : typeof otherRoot > : ^^^^^^^^^^^^^^^^ - export module A { + export namespace A { >A : typeof A > : ^^^^^^^^ @@ -81,7 +81,7 @@ module otherRoot { >0 : 0 > : ^ - export module Utils { + export namespace Utils { >Utils : typeof Utils > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.js b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.js index d221274edd87b..0b39efa124d75 100644 --- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.js +++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.js @@ -1,13 +1,13 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndSameCommonRoot.ts] //// //// [part1.ts] -module A { +namespace A { export interface Point { x: number; y: number; } - export module Utils { + export namespace Utils { export function mirror(p: T) { return { x: p.y, y: p.x }; } @@ -15,10 +15,10 @@ module A { } //// [part2.ts] -module A { +namespace A { export var Origin: Point = { x: 0, y: 0 }; - export module Utils { + export namespace Utils { export class Plane { constructor(public tl: Point, public br: Point) { } } diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.symbols b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.symbols index ffc0ba279c01b..eb5ad44726c83 100644 --- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.symbols +++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndSameCommonRoot.ts] //// === part1.ts === -module A { +namespace A { >A : Symbol(A, Decl(part1.ts, 0, 0), Decl(part2.ts, 0, 0)) export interface Point { ->Point : Symbol(Point, Decl(part1.ts, 0, 10)) +>Point : Symbol(Point, Decl(part1.ts, 0, 13)) x: number; >x : Symbol(Point.x, Decl(part1.ts, 1, 28)) @@ -14,13 +14,13 @@ module A { >y : Symbol(Point.y, Decl(part1.ts, 2, 18)) } - export module Utils { + export namespace Utils { >Utils : Symbol(Utils, Decl(part1.ts, 4, 5), Decl(part2.ts, 1, 46)) export function mirror(p: T) { ->mirror : Symbol(mirror, Decl(part1.ts, 6, 25)) +>mirror : Symbol(mirror, Decl(part1.ts, 6, 28)) >T : Symbol(T, Decl(part1.ts, 7, 31)) ->Point : Symbol(Point, Decl(part1.ts, 0, 10)) +>Point : Symbol(Point, Decl(part1.ts, 0, 13)) >p : Symbol(p, Decl(part1.ts, 7, 48)) >T : Symbol(T, Decl(part1.ts, 7, 31)) @@ -38,26 +38,26 @@ module A { } === part2.ts === -module A { +namespace A { >A : Symbol(A, Decl(part1.ts, 0, 0), Decl(part2.ts, 0, 0)) export var Origin: Point = { x: 0, y: 0 }; >Origin : Symbol(Origin, Decl(part2.ts, 1, 14)) ->Point : Symbol(Point, Decl(part1.ts, 0, 10)) +>Point : Symbol(Point, Decl(part1.ts, 0, 13)) >x : Symbol(x, Decl(part2.ts, 1, 32)) >y : Symbol(y, Decl(part2.ts, 1, 38)) - export module Utils { + export namespace Utils { >Utils : Symbol(Utils, Decl(part1.ts, 4, 5), Decl(part2.ts, 1, 46)) export class Plane { ->Plane : Symbol(Plane, Decl(part2.ts, 3, 25)) +>Plane : Symbol(Plane, Decl(part2.ts, 3, 28)) constructor(public tl: Point, public br: Point) { } >tl : Symbol(Plane.tl, Decl(part2.ts, 5, 24)) ->Point : Symbol(Point, Decl(part1.ts, 0, 10)) +>Point : Symbol(Point, Decl(part1.ts, 0, 13)) >br : Symbol(Plane.br, Decl(part2.ts, 5, 41)) ->Point : Symbol(Point, Decl(part1.ts, 0, 10)) +>Point : Symbol(Point, Decl(part1.ts, 0, 13)) } } } @@ -73,7 +73,7 @@ var o: { x: number; y: number }; var o: A.Point; >o : Symbol(o, Decl(part3.ts, 2, 3), Decl(part3.ts, 3, 3), Decl(part3.ts, 4, 3), Decl(part3.ts, 5, 3)) >A : Symbol(A, Decl(part1.ts, 0, 0), Decl(part2.ts, 0, 0)) ->Point : Symbol(A.Point, Decl(part1.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(part1.ts, 0, 13)) var o = A.Origin; >o : Symbol(o, Decl(part3.ts, 2, 3), Decl(part3.ts, 3, 3), Decl(part3.ts, 4, 3), Decl(part3.ts, 5, 3)) @@ -83,35 +83,35 @@ var o = A.Origin; var o = A.Utils.mirror(o); >o : Symbol(o, Decl(part3.ts, 2, 3), Decl(part3.ts, 3, 3), Decl(part3.ts, 4, 3), Decl(part3.ts, 5, 3)) ->A.Utils.mirror : Symbol(A.Utils.mirror, Decl(part1.ts, 6, 25)) +>A.Utils.mirror : Symbol(A.Utils.mirror, Decl(part1.ts, 6, 28)) >A.Utils : Symbol(A.Utils, Decl(part1.ts, 4, 5), Decl(part2.ts, 1, 46)) >A : Symbol(A, Decl(part1.ts, 0, 0), Decl(part2.ts, 0, 0)) >Utils : Symbol(A.Utils, Decl(part1.ts, 4, 5), Decl(part2.ts, 1, 46)) ->mirror : Symbol(A.Utils.mirror, Decl(part1.ts, 6, 25)) +>mirror : Symbol(A.Utils.mirror, Decl(part1.ts, 6, 28)) >o : Symbol(o, Decl(part3.ts, 2, 3), Decl(part3.ts, 3, 3), Decl(part3.ts, 4, 3), Decl(part3.ts, 5, 3)) var p: { tl: A.Point; br: A.Point }; >p : Symbol(p, Decl(part3.ts, 7, 3), Decl(part3.ts, 8, 3), Decl(part3.ts, 9, 3)) >tl : Symbol(tl, Decl(part3.ts, 7, 8)) >A : Symbol(A, Decl(part1.ts, 0, 0), Decl(part2.ts, 0, 0)) ->Point : Symbol(A.Point, Decl(part1.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(part1.ts, 0, 13)) >br : Symbol(br, Decl(part3.ts, 7, 21)) >A : Symbol(A, Decl(part1.ts, 0, 0), Decl(part2.ts, 0, 0)) ->Point : Symbol(A.Point, Decl(part1.ts, 0, 10)) +>Point : Symbol(A.Point, Decl(part1.ts, 0, 13)) var p: A.Utils.Plane; >p : Symbol(p, Decl(part3.ts, 7, 3), Decl(part3.ts, 8, 3), Decl(part3.ts, 9, 3)) >A : Symbol(A, Decl(part1.ts, 0, 0), Decl(part2.ts, 0, 0)) >Utils : Symbol(A.Utils, Decl(part1.ts, 4, 5), Decl(part2.ts, 1, 46)) ->Plane : Symbol(A.Utils.Plane, Decl(part2.ts, 3, 25)) +>Plane : Symbol(A.Utils.Plane, Decl(part2.ts, 3, 28)) var p = new A.Utils.Plane(o, { x: 1, y: 1 }); >p : Symbol(p, Decl(part3.ts, 7, 3), Decl(part3.ts, 8, 3), Decl(part3.ts, 9, 3)) ->A.Utils.Plane : Symbol(A.Utils.Plane, Decl(part2.ts, 3, 25)) +>A.Utils.Plane : Symbol(A.Utils.Plane, Decl(part2.ts, 3, 28)) >A.Utils : Symbol(A.Utils, Decl(part1.ts, 4, 5), Decl(part2.ts, 1, 46)) >A : Symbol(A, Decl(part1.ts, 0, 0), Decl(part2.ts, 0, 0)) >Utils : Symbol(A.Utils, Decl(part1.ts, 4, 5), Decl(part2.ts, 1, 46)) ->Plane : Symbol(A.Utils.Plane, Decl(part2.ts, 3, 25)) +>Plane : Symbol(A.Utils.Plane, Decl(part2.ts, 3, 28)) >o : Symbol(o, Decl(part3.ts, 2, 3), Decl(part3.ts, 3, 3), Decl(part3.ts, 4, 3), Decl(part3.ts, 5, 3)) >x : Symbol(x, Decl(part3.ts, 9, 30)) >y : Symbol(y, Decl(part3.ts, 9, 36)) diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types index 2e2e43b4cc31d..65e6007b5996c 100644 --- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types +++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndSameCommonRoot.ts] //// === part1.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -15,7 +15,7 @@ module A { > : ^^^^^^ } - export module Utils { + export namespace Utils { >Utils : typeof Utils > : ^^^^^^^^^^^^ @@ -49,7 +49,7 @@ module A { } === part2.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -67,7 +67,7 @@ module A { >0 : 0 > : ^ - export module Utils { + export namespace Utils { >Utils : typeof Utils > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/acceptableAlias1.js b/tests/baselines/reference/acceptableAlias1.js index 2dfa2a7401dd8..b360c5c3bb572 100644 --- a/tests/baselines/reference/acceptableAlias1.js +++ b/tests/baselines/reference/acceptableAlias1.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/acceptableAlias1.ts] //// //// [acceptableAlias1.ts] -module M { - export module N { +namespace M { + export namespace N { } export import X = N; } diff --git a/tests/baselines/reference/acceptableAlias1.symbols b/tests/baselines/reference/acceptableAlias1.symbols index 607068de65ee2..ff03a13bc4f1b 100644 --- a/tests/baselines/reference/acceptableAlias1.symbols +++ b/tests/baselines/reference/acceptableAlias1.symbols @@ -1,15 +1,15 @@ //// [tests/cases/compiler/acceptableAlias1.ts] //// === acceptableAlias1.ts === -module M { +namespace M { >M : Symbol(M, Decl(acceptableAlias1.ts, 0, 0)) - export module N { ->N : Symbol(N, Decl(acceptableAlias1.ts, 0, 10)) + export namespace N { +>N : Symbol(N, Decl(acceptableAlias1.ts, 0, 13)) } export import X = N; >X : Symbol(X, Decl(acceptableAlias1.ts, 2, 5)) ->N : Symbol(N, Decl(acceptableAlias1.ts, 0, 10)) +>N : Symbol(N, Decl(acceptableAlias1.ts, 0, 13)) } import r = M.X; diff --git a/tests/baselines/reference/acceptableAlias1.types b/tests/baselines/reference/acceptableAlias1.types index 224ddc550dd7c..1259e6bb27829 100644 --- a/tests/baselines/reference/acceptableAlias1.types +++ b/tests/baselines/reference/acceptableAlias1.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/acceptableAlias1.ts] //// === acceptableAlias1.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ - export module N { + export namespace N { } export import X = N; >X : any diff --git a/tests/baselines/reference/accessorsInAmbientContext.errors.txt b/tests/baselines/reference/accessorsInAmbientContext.errors.txt index 89cd98a0a0c66..9a3e5a8c3690a 100644 --- a/tests/baselines/reference/accessorsInAmbientContext.errors.txt +++ b/tests/baselines/reference/accessorsInAmbientContext.errors.txt @@ -9,7 +9,7 @@ accessorsInAmbientContext.ts(16,21): error TS1183: An implementation cannot be d ==== accessorsInAmbientContext.ts (8 errors) ==== - declare module M { + declare namespace M { class C { get X() { return 1; } ~ diff --git a/tests/baselines/reference/accessorsInAmbientContext.js b/tests/baselines/reference/accessorsInAmbientContext.js index 05daedd495568..73122973c5b3c 100644 --- a/tests/baselines/reference/accessorsInAmbientContext.js +++ b/tests/baselines/reference/accessorsInAmbientContext.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/accessorsInAmbientContext.ts] //// //// [accessorsInAmbientContext.ts] -declare module M { +declare namespace M { class C { get X() { return 1; } set X(v) { } diff --git a/tests/baselines/reference/accessorsInAmbientContext.symbols b/tests/baselines/reference/accessorsInAmbientContext.symbols index ae20eb27ee613..57281be16161e 100644 --- a/tests/baselines/reference/accessorsInAmbientContext.symbols +++ b/tests/baselines/reference/accessorsInAmbientContext.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/accessorsInAmbientContext.ts] //// === accessorsInAmbientContext.ts === -declare module M { +declare namespace M { >M : Symbol(M, Decl(accessorsInAmbientContext.ts, 0, 0)) class C { ->C : Symbol(C, Decl(accessorsInAmbientContext.ts, 0, 18)) +>C : Symbol(C, Decl(accessorsInAmbientContext.ts, 0, 21)) get X() { return 1; } >X : Symbol(C.X, Decl(accessorsInAmbientContext.ts, 1, 13), Decl(accessorsInAmbientContext.ts, 2, 29)) diff --git a/tests/baselines/reference/accessorsInAmbientContext.types b/tests/baselines/reference/accessorsInAmbientContext.types index 5546de7eff07c..e7ef2644c02cd 100644 --- a/tests/baselines/reference/accessorsInAmbientContext.types +++ b/tests/baselines/reference/accessorsInAmbientContext.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/accessorsInAmbientContext.ts] //// === accessorsInAmbientContext.ts === -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.js b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.js index c9f1290b0f57e..589def5941fd3 100644 --- a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.js +++ b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.js @@ -7,7 +7,7 @@ class C { static foo() { } } enum E { a, b, c } -module M { export var a } +namespace M { export var a } var a: any; var b: boolean; diff --git a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.symbols b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.symbols index 5531a21a7da91..629d07cb01abc 100644 --- a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.symbols +++ b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.symbols @@ -19,9 +19,9 @@ enum E { a, b, c } >b : Symbol(E.b, Decl(additionOperatorWithAnyAndEveryType.ts, 5, 11)) >c : Symbol(E.c, Decl(additionOperatorWithAnyAndEveryType.ts, 5, 14)) -module M { export var a } +namespace M { export var a } >M : Symbol(M, Decl(additionOperatorWithAnyAndEveryType.ts, 5, 18)) ->a : Symbol(a, Decl(additionOperatorWithAnyAndEveryType.ts, 6, 21)) +>a : Symbol(a, Decl(additionOperatorWithAnyAndEveryType.ts, 6, 24)) var a: any; >a : Symbol(a, Decl(additionOperatorWithAnyAndEveryType.ts, 8, 3)) diff --git a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types index 5f3e5634c9166..3675331420fcd 100644 --- a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types +++ b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types @@ -27,7 +27,7 @@ enum E { a, b, c } >c : E.c > : ^^^ -module M { export var a } +namespace M { export var a } >M : typeof M > : ^^^^^^^^ >a : any diff --git a/tests/baselines/reference/additionOperatorWithInvalidOperands.errors.txt b/tests/baselines/reference/additionOperatorWithInvalidOperands.errors.txt index cb628c01a37d0..6051993f2e260 100644 --- a/tests/baselines/reference/additionOperatorWithInvalidOperands.errors.txt +++ b/tests/baselines/reference/additionOperatorWithInvalidOperands.errors.txt @@ -26,7 +26,7 @@ additionOperatorWithInvalidOperands.ts(40,11): error TS2365: Operator '+' cannot static foo() { } } enum E { a, b, c } - module M { export var a } + namespace M { export var a } var a: boolean; var b: number; diff --git a/tests/baselines/reference/additionOperatorWithInvalidOperands.js b/tests/baselines/reference/additionOperatorWithInvalidOperands.js index a5f7e3baa5d4b..1093452897cef 100644 --- a/tests/baselines/reference/additionOperatorWithInvalidOperands.js +++ b/tests/baselines/reference/additionOperatorWithInvalidOperands.js @@ -7,7 +7,7 @@ class C { static foo() { } } enum E { a, b, c } -module M { export var a } +namespace M { export var a } var a: boolean; var b: number; diff --git a/tests/baselines/reference/additionOperatorWithInvalidOperands.symbols b/tests/baselines/reference/additionOperatorWithInvalidOperands.symbols index 2fc6040b97438..697ea7cc0bbe5 100644 --- a/tests/baselines/reference/additionOperatorWithInvalidOperands.symbols +++ b/tests/baselines/reference/additionOperatorWithInvalidOperands.symbols @@ -19,9 +19,9 @@ enum E { a, b, c } >b : Symbol(E.b, Decl(additionOperatorWithInvalidOperands.ts, 5, 11)) >c : Symbol(E.c, Decl(additionOperatorWithInvalidOperands.ts, 5, 14)) -module M { export var a } +namespace M { export var a } >M : Symbol(M, Decl(additionOperatorWithInvalidOperands.ts, 5, 18)) ->a : Symbol(a, Decl(additionOperatorWithInvalidOperands.ts, 6, 21)) +>a : Symbol(a, Decl(additionOperatorWithInvalidOperands.ts, 6, 24)) var a: boolean; >a : Symbol(a, Decl(additionOperatorWithInvalidOperands.ts, 8, 3)) diff --git a/tests/baselines/reference/additionOperatorWithInvalidOperands.types b/tests/baselines/reference/additionOperatorWithInvalidOperands.types index d913ea18d1eed..f49e6f2b06b3d 100644 --- a/tests/baselines/reference/additionOperatorWithInvalidOperands.types +++ b/tests/baselines/reference/additionOperatorWithInvalidOperands.types @@ -27,7 +27,7 @@ enum E { a, b, c } >c : E.c > : ^^^ -module M { export var a } +namespace M { export var a } >M : typeof M > : ^^^^^^^^ >a : any diff --git a/tests/baselines/reference/aliasBug.errors.txt b/tests/baselines/reference/aliasBug.errors.txt index d8842b18de0fc..dbd6ea51ef503 100644 --- a/tests/baselines/reference/aliasBug.errors.txt +++ b/tests/baselines/reference/aliasBug.errors.txt @@ -2,11 +2,11 @@ aliasBug.ts(16,15): error TS2694: Namespace 'foo.bar.baz' has no exported member ==== aliasBug.ts (1 errors) ==== - module foo { + namespace foo { export class Provide { } - export module bar { export module baz {export class boo {}}} + export namespace bar { export namespace baz {export class boo {}}} } import provide = foo; diff --git a/tests/baselines/reference/aliasBug.js b/tests/baselines/reference/aliasBug.js index d811177c674ff..06141186575be 100644 --- a/tests/baselines/reference/aliasBug.js +++ b/tests/baselines/reference/aliasBug.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/aliasBug.ts] //// //// [aliasBug.ts] -module foo { +namespace foo { export class Provide { } - export module bar { export module baz {export class boo {}}} + export namespace bar { export namespace baz {export class boo {}}} } import provide = foo; diff --git a/tests/baselines/reference/aliasBug.symbols b/tests/baselines/reference/aliasBug.symbols index af29dc0302820..0676ffa8e2878 100644 --- a/tests/baselines/reference/aliasBug.symbols +++ b/tests/baselines/reference/aliasBug.symbols @@ -1,17 +1,17 @@ //// [tests/cases/compiler/aliasBug.ts] //// === aliasBug.ts === -module foo { +namespace foo { >foo : Symbol(foo, Decl(aliasBug.ts, 0, 0)) export class Provide { ->Provide : Symbol(Provide, Decl(aliasBug.ts, 0, 12)) +>Provide : Symbol(Provide, Decl(aliasBug.ts, 0, 15)) } - export module bar { export module baz {export class boo {}}} + export namespace bar { export namespace baz {export class boo {}}} >bar : Symbol(bar, Decl(aliasBug.ts, 2, 5)) ->baz : Symbol(baz, Decl(aliasBug.ts, 4, 23)) ->boo : Symbol(boo, Decl(aliasBug.ts, 4, 43)) +>baz : Symbol(baz, Decl(aliasBug.ts, 4, 26)) +>boo : Symbol(boo, Decl(aliasBug.ts, 4, 49)) } import provide = foo; @@ -22,13 +22,13 @@ import booz = foo.bar.baz; >booz : Symbol(booz, Decl(aliasBug.ts, 7, 21)) >foo : Symbol(foo, Decl(aliasBug.ts, 0, 0)) >bar : Symbol(provide.bar, Decl(aliasBug.ts, 2, 5)) ->baz : Symbol(booz, Decl(aliasBug.ts, 4, 23)) +>baz : Symbol(booz, Decl(aliasBug.ts, 4, 26)) var p = new provide.Provide(); >p : Symbol(p, Decl(aliasBug.ts, 10, 3)) ->provide.Provide : Symbol(provide.Provide, Decl(aliasBug.ts, 0, 12)) +>provide.Provide : Symbol(provide.Provide, Decl(aliasBug.ts, 0, 15)) >provide : Symbol(provide, Decl(aliasBug.ts, 5, 1)) ->Provide : Symbol(provide.Provide, Decl(aliasBug.ts, 0, 12)) +>Provide : Symbol(provide.Provide, Decl(aliasBug.ts, 0, 15)) function use() { >use : Symbol(use, Decl(aliasBug.ts, 10, 30)) @@ -36,12 +36,12 @@ function use() { var p1: provide.Provide; // error here, but should be okay >p1 : Symbol(p1, Decl(aliasBug.ts, 13, 5)) >provide : Symbol(provide, Decl(aliasBug.ts, 5, 1)) ->Provide : Symbol(provide.Provide, Decl(aliasBug.ts, 0, 12)) +>Provide : Symbol(provide.Provide, Decl(aliasBug.ts, 0, 15)) var p2: foo.Provide; >p2 : Symbol(p2, Decl(aliasBug.ts, 14, 5)) >foo : Symbol(foo, Decl(aliasBug.ts, 0, 0)) ->Provide : Symbol(provide.Provide, Decl(aliasBug.ts, 0, 12)) +>Provide : Symbol(provide.Provide, Decl(aliasBug.ts, 0, 15)) var p3:booz.bar; >p3 : Symbol(p3, Decl(aliasBug.ts, 15, 5)) @@ -50,8 +50,8 @@ function use() { var p22 = new provide.Provide(); >p22 : Symbol(p22, Decl(aliasBug.ts, 16, 5)) ->provide.Provide : Symbol(provide.Provide, Decl(aliasBug.ts, 0, 12)) +>provide.Provide : Symbol(provide.Provide, Decl(aliasBug.ts, 0, 15)) >provide : Symbol(provide, Decl(aliasBug.ts, 5, 1)) ->Provide : Symbol(provide.Provide, Decl(aliasBug.ts, 0, 12)) +>Provide : Symbol(provide.Provide, Decl(aliasBug.ts, 0, 15)) } diff --git a/tests/baselines/reference/aliasBug.types b/tests/baselines/reference/aliasBug.types index 9c1a29f6d654f..ca78068061d49 100644 --- a/tests/baselines/reference/aliasBug.types +++ b/tests/baselines/reference/aliasBug.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/aliasBug.ts] //// === aliasBug.ts === -module foo { +namespace foo { >foo : typeof foo > : ^^^^^^^^^^ @@ -10,7 +10,7 @@ module foo { > : ^^^^^^^ } - export module bar { export module baz {export class boo {}}} + export namespace bar { export namespace baz {export class boo {}}} >bar : typeof bar > : ^^^^^^^^^^ >baz : typeof baz diff --git a/tests/baselines/reference/aliasErrors.errors.txt b/tests/baselines/reference/aliasErrors.errors.txt index 5e94cd3c9a710..fb11944a2e9d1 100644 --- a/tests/baselines/reference/aliasErrors.errors.txt +++ b/tests/baselines/reference/aliasErrors.errors.txt @@ -8,10 +8,10 @@ aliasErrors.ts(26,15): error TS2694: Namespace 'foo.bar.baz' has no exported mem ==== aliasErrors.ts (7 errors) ==== - module foo { + namespace foo { export class Provide { } - export module bar { export module baz {export class boo {}}} + export namespace bar { export namespace baz {export class boo {}}} } import provide = foo; diff --git a/tests/baselines/reference/aliasErrors.js b/tests/baselines/reference/aliasErrors.js index fc3e4c06ea74c..5c30d59958a58 100644 --- a/tests/baselines/reference/aliasErrors.js +++ b/tests/baselines/reference/aliasErrors.js @@ -1,10 +1,10 @@ //// [tests/cases/compiler/aliasErrors.ts] //// //// [aliasErrors.ts] -module foo { +namespace foo { export class Provide { } - export module bar { export module baz {export class boo {}}} + export namespace bar { export namespace baz {export class boo {}}} } import provide = foo; diff --git a/tests/baselines/reference/aliasErrors.symbols b/tests/baselines/reference/aliasErrors.symbols index 88ee6f6c6c586..f01f4a3b7434c 100644 --- a/tests/baselines/reference/aliasErrors.symbols +++ b/tests/baselines/reference/aliasErrors.symbols @@ -1,16 +1,16 @@ //// [tests/cases/compiler/aliasErrors.ts] //// === aliasErrors.ts === -module foo { +namespace foo { >foo : Symbol(foo, Decl(aliasErrors.ts, 0, 0)) export class Provide { ->Provide : Symbol(Provide, Decl(aliasErrors.ts, 0, 12)) +>Provide : Symbol(Provide, Decl(aliasErrors.ts, 0, 15)) } - export module bar { export module baz {export class boo {}}} + export namespace bar { export namespace baz {export class boo {}}} >bar : Symbol(bar, Decl(aliasErrors.ts, 2, 5)) ->baz : Symbol(baz, Decl(aliasErrors.ts, 3, 23)) ->boo : Symbol(boo, Decl(aliasErrors.ts, 3, 43)) +>baz : Symbol(baz, Decl(aliasErrors.ts, 3, 26)) +>boo : Symbol(boo, Decl(aliasErrors.ts, 3, 49)) } import provide = foo; @@ -21,7 +21,7 @@ import booz = foo.bar.baz; >booz : Symbol(booz, Decl(aliasErrors.ts, 6, 21)) >foo : Symbol(foo, Decl(aliasErrors.ts, 0, 0)) >bar : Symbol(provide.bar, Decl(aliasErrors.ts, 2, 5)) ->baz : Symbol(booz, Decl(aliasErrors.ts, 3, 23)) +>baz : Symbol(booz, Decl(aliasErrors.ts, 3, 26)) import beez = foo.bar; >beez : Symbol(beez, Decl(aliasErrors.ts, 7, 26)) @@ -49,29 +49,29 @@ import r = undefined; var p = new provide.Provide(); >p : Symbol(p, Decl(aliasErrors.ts, 18, 3)) ->provide.Provide : Symbol(provide.Provide, Decl(aliasErrors.ts, 0, 12)) +>provide.Provide : Symbol(provide.Provide, Decl(aliasErrors.ts, 0, 15)) >provide : Symbol(provide, Decl(aliasErrors.ts, 4, 1)) ->Provide : Symbol(provide.Provide, Decl(aliasErrors.ts, 0, 12)) +>Provide : Symbol(provide.Provide, Decl(aliasErrors.ts, 0, 15)) function use() { >use : Symbol(use, Decl(aliasErrors.ts, 18, 30)) beez.baz.boo; ->beez.baz.boo : Symbol(booz.boo, Decl(aliasErrors.ts, 3, 43)) ->beez.baz : Symbol(booz, Decl(aliasErrors.ts, 3, 23)) +>beez.baz.boo : Symbol(booz.boo, Decl(aliasErrors.ts, 3, 49)) +>beez.baz : Symbol(booz, Decl(aliasErrors.ts, 3, 26)) >beez : Symbol(beez, Decl(aliasErrors.ts, 7, 26)) ->baz : Symbol(booz, Decl(aliasErrors.ts, 3, 23)) ->boo : Symbol(booz.boo, Decl(aliasErrors.ts, 3, 43)) +>baz : Symbol(booz, Decl(aliasErrors.ts, 3, 26)) +>boo : Symbol(booz.boo, Decl(aliasErrors.ts, 3, 49)) var p1: provide.Provide; >p1 : Symbol(p1, Decl(aliasErrors.ts, 23, 5)) >provide : Symbol(provide, Decl(aliasErrors.ts, 4, 1)) ->Provide : Symbol(provide.Provide, Decl(aliasErrors.ts, 0, 12)) +>Provide : Symbol(provide.Provide, Decl(aliasErrors.ts, 0, 15)) var p2: foo.Provide; >p2 : Symbol(p2, Decl(aliasErrors.ts, 24, 5)) >foo : Symbol(foo, Decl(aliasErrors.ts, 0, 0)) ->Provide : Symbol(provide.Provide, Decl(aliasErrors.ts, 0, 12)) +>Provide : Symbol(provide.Provide, Decl(aliasErrors.ts, 0, 15)) var p3:booz.bar; >p3 : Symbol(p3, Decl(aliasErrors.ts, 25, 5)) @@ -80,9 +80,9 @@ function use() { var p22 = new provide.Provide(); >p22 : Symbol(p22, Decl(aliasErrors.ts, 26, 5)) ->provide.Provide : Symbol(provide.Provide, Decl(aliasErrors.ts, 0, 12)) +>provide.Provide : Symbol(provide.Provide, Decl(aliasErrors.ts, 0, 15)) >provide : Symbol(provide, Decl(aliasErrors.ts, 4, 1)) ->Provide : Symbol(provide.Provide, Decl(aliasErrors.ts, 0, 12)) +>Provide : Symbol(provide.Provide, Decl(aliasErrors.ts, 0, 15)) } diff --git a/tests/baselines/reference/aliasErrors.types b/tests/baselines/reference/aliasErrors.types index 5a69911c9cbac..2eda81ac34d2d 100644 --- a/tests/baselines/reference/aliasErrors.types +++ b/tests/baselines/reference/aliasErrors.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/aliasErrors.ts] //// === aliasErrors.ts === -module foo { +namespace foo { >foo : typeof foo > : ^^^^^^^^^^ @@ -9,7 +9,7 @@ module foo { >Provide : Provide > : ^^^^^^^ } - export module bar { export module baz {export class boo {}}} + export namespace bar { export namespace baz {export class boo {}}} >bar : typeof bar > : ^^^^^^^^^^ >baz : typeof baz diff --git a/tests/baselines/reference/aliasInaccessibleModule.js b/tests/baselines/reference/aliasInaccessibleModule.js index cc599fd874b88..72460c86f5458 100644 --- a/tests/baselines/reference/aliasInaccessibleModule.js +++ b/tests/baselines/reference/aliasInaccessibleModule.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/aliasInaccessibleModule.ts] //// //// [aliasInaccessibleModule.ts] -module M { - module N { +namespace M { + namespace N { } export import X = N; } diff --git a/tests/baselines/reference/aliasInaccessibleModule.symbols b/tests/baselines/reference/aliasInaccessibleModule.symbols index 642fbd88fb8fb..8b47a71ec0525 100644 --- a/tests/baselines/reference/aliasInaccessibleModule.symbols +++ b/tests/baselines/reference/aliasInaccessibleModule.symbols @@ -1,13 +1,13 @@ //// [tests/cases/compiler/aliasInaccessibleModule.ts] //// === aliasInaccessibleModule.ts === -module M { +namespace M { >M : Symbol(M, Decl(aliasInaccessibleModule.ts, 0, 0)) - module N { ->N : Symbol(N, Decl(aliasInaccessibleModule.ts, 0, 10)) + namespace N { +>N : Symbol(N, Decl(aliasInaccessibleModule.ts, 0, 13)) } export import X = N; >X : Symbol(X, Decl(aliasInaccessibleModule.ts, 2, 5)) ->N : Symbol(N, Decl(aliasInaccessibleModule.ts, 0, 10)) +>N : Symbol(N, Decl(aliasInaccessibleModule.ts, 0, 13)) } diff --git a/tests/baselines/reference/aliasInaccessibleModule.types b/tests/baselines/reference/aliasInaccessibleModule.types index db6580de04e75..d867ea2b7b009 100644 --- a/tests/baselines/reference/aliasInaccessibleModule.types +++ b/tests/baselines/reference/aliasInaccessibleModule.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/aliasInaccessibleModule.ts] //// === aliasInaccessibleModule.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ - module N { + namespace N { } export import X = N; >X : any diff --git a/tests/baselines/reference/aliasInaccessibleModule2.js b/tests/baselines/reference/aliasInaccessibleModule2.js index 71e897b9446de..46dd42695bb16 100644 --- a/tests/baselines/reference/aliasInaccessibleModule2.js +++ b/tests/baselines/reference/aliasInaccessibleModule2.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/aliasInaccessibleModule2.ts] //// //// [aliasInaccessibleModule2.ts] -module M { - module N { +namespace M { + namespace N { class C { } diff --git a/tests/baselines/reference/aliasInaccessibleModule2.symbols b/tests/baselines/reference/aliasInaccessibleModule2.symbols index a45790dfb7474..d034fe3b9d869 100644 --- a/tests/baselines/reference/aliasInaccessibleModule2.symbols +++ b/tests/baselines/reference/aliasInaccessibleModule2.symbols @@ -1,20 +1,20 @@ //// [tests/cases/compiler/aliasInaccessibleModule2.ts] //// === aliasInaccessibleModule2.ts === -module M { +namespace M { >M : Symbol(M, Decl(aliasInaccessibleModule2.ts, 0, 0)) - module N { ->N : Symbol(N, Decl(aliasInaccessibleModule2.ts, 0, 10)) + namespace N { +>N : Symbol(N, Decl(aliasInaccessibleModule2.ts, 0, 13)) class C { ->C : Symbol(C, Decl(aliasInaccessibleModule2.ts, 1, 14)) +>C : Symbol(C, Decl(aliasInaccessibleModule2.ts, 1, 17)) } } import R = N; >R : Symbol(R, Decl(aliasInaccessibleModule2.ts, 5, 5)) ->N : Symbol(N, Decl(aliasInaccessibleModule2.ts, 0, 10)) +>N : Symbol(N, Decl(aliasInaccessibleModule2.ts, 0, 13)) export import X = R; >X : Symbol(X, Decl(aliasInaccessibleModule2.ts, 6, 17)) diff --git a/tests/baselines/reference/aliasInaccessibleModule2.types b/tests/baselines/reference/aliasInaccessibleModule2.types index 7c1b1b7181df2..7a7134a46bdc7 100644 --- a/tests/baselines/reference/aliasInaccessibleModule2.types +++ b/tests/baselines/reference/aliasInaccessibleModule2.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/aliasInaccessibleModule2.ts] //// === aliasInaccessibleModule2.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ - module N { + namespace N { >N : typeof N > : ^^^^^^^^ diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.errors.txt b/tests/baselines/reference/aliasOnMergedModuleInterface.errors.txt index 69493aecadc87..327faccff8a54 100644 --- a/tests/baselines/reference/aliasOnMergedModuleInterface.errors.txt +++ b/tests/baselines/reference/aliasOnMergedModuleInterface.errors.txt @@ -13,7 +13,7 @@ aliasOnMergedModuleInterface_1.ts(5,16): error TS2708: Cannot use namespace 'foo ==== aliasOnMergedModuleInterface_0.ts (0 errors) ==== declare module "foo" { - module B { + namespace B { export interface A { } } diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.js b/tests/baselines/reference/aliasOnMergedModuleInterface.js index f1b78e4ef5a74..e7cac961b653a 100644 --- a/tests/baselines/reference/aliasOnMergedModuleInterface.js +++ b/tests/baselines/reference/aliasOnMergedModuleInterface.js @@ -3,7 +3,7 @@ //// [aliasOnMergedModuleInterface_0.ts] declare module "foo" { - module B { + namespace B { export interface A { } } diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.symbols b/tests/baselines/reference/aliasOnMergedModuleInterface.symbols index 3cda351469db7..6544197e32e71 100644 --- a/tests/baselines/reference/aliasOnMergedModuleInterface.symbols +++ b/tests/baselines/reference/aliasOnMergedModuleInterface.symbols @@ -17,17 +17,17 @@ z.bar("hello"); // This should be ok var x: foo.A = foo.bar("hello"); // foo.A should be ok but foo.bar should be error >x : Symbol(x, Decl(aliasOnMergedModuleInterface_1.ts, 4, 3)) >foo : Symbol(foo, Decl(aliasOnMergedModuleInterface_1.ts, 0, 0)) ->A : Symbol(foo.A, Decl(aliasOnMergedModuleInterface_0.ts, 2, 14)) +>A : Symbol(foo.A, Decl(aliasOnMergedModuleInterface_0.ts, 2, 17)) === aliasOnMergedModuleInterface_0.ts === declare module "foo" >"foo" : Symbol("foo", Decl(aliasOnMergedModuleInterface_0.ts, 0, 0)) { - module B { + namespace B { >B : Symbol(B, Decl(aliasOnMergedModuleInterface_0.ts, 1, 1), Decl(aliasOnMergedModuleInterface_0.ts, 5, 5)) export interface A { ->A : Symbol(A, Decl(aliasOnMergedModuleInterface_0.ts, 2, 14)) +>A : Symbol(A, Decl(aliasOnMergedModuleInterface_0.ts, 2, 17)) } } interface B { @@ -37,7 +37,7 @@ declare module "foo" >bar : Symbol(B.bar, Decl(aliasOnMergedModuleInterface_0.ts, 6, 17)) >name : Symbol(name, Decl(aliasOnMergedModuleInterface_0.ts, 7, 12)) >B : Symbol(B, Decl(aliasOnMergedModuleInterface_0.ts, 1, 1), Decl(aliasOnMergedModuleInterface_0.ts, 5, 5)) ->A : Symbol(B.A, Decl(aliasOnMergedModuleInterface_0.ts, 2, 14)) +>A : Symbol(B.A, Decl(aliasOnMergedModuleInterface_0.ts, 2, 17)) } export = B; >B : Symbol(B, Decl(aliasOnMergedModuleInterface_0.ts, 1, 1), Decl(aliasOnMergedModuleInterface_0.ts, 5, 5)) diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.types b/tests/baselines/reference/aliasOnMergedModuleInterface.types index 66f175425ae42..756caf50f4beb 100644 --- a/tests/baselines/reference/aliasOnMergedModuleInterface.types +++ b/tests/baselines/reference/aliasOnMergedModuleInterface.types @@ -43,7 +43,7 @@ declare module "foo" >"foo" : typeof import("foo") > : ^^^^^^^^^^^^^^^^^^^^ { - module B { + namespace B { export interface A { } } diff --git a/tests/baselines/reference/aliasesInSystemModule1.errors.txt b/tests/baselines/reference/aliasesInSystemModule1.errors.txt index cbd259f770a6a..0d893092c1616 100644 --- a/tests/baselines/reference/aliasesInSystemModule1.errors.txt +++ b/tests/baselines/reference/aliasesInSystemModule1.errors.txt @@ -12,7 +12,7 @@ aliasesInSystemModule1.ts(1,24): error TS2792: Cannot find module 'foo'. Did you let y = new cls(); let z = new cls2(); - module M { + namespace M { export import cls = alias.Class; let x = new alias.Class(); let y = new cls(); diff --git a/tests/baselines/reference/aliasesInSystemModule1.js b/tests/baselines/reference/aliasesInSystemModule1.js index aadd403fdd842..d62fa78253009 100644 --- a/tests/baselines/reference/aliasesInSystemModule1.js +++ b/tests/baselines/reference/aliasesInSystemModule1.js @@ -9,7 +9,7 @@ let x = new alias.Class(); let y = new cls(); let z = new cls2(); -module M { +namespace M { export import cls = alias.Class; let x = new alias.Class(); let y = new cls(); diff --git a/tests/baselines/reference/aliasesInSystemModule1.symbols b/tests/baselines/reference/aliasesInSystemModule1.symbols index d776b86b271ad..1576553543886 100644 --- a/tests/baselines/reference/aliasesInSystemModule1.symbols +++ b/tests/baselines/reference/aliasesInSystemModule1.symbols @@ -26,11 +26,11 @@ let z = new cls2(); >z : Symbol(z, Decl(aliasesInSystemModule1.ts, 6, 3)) >cls2 : Symbol(cls2, Decl(aliasesInSystemModule1.ts, 1, 25)) -module M { +namespace M { >M : Symbol(M, Decl(aliasesInSystemModule1.ts, 6, 19)) export import cls = alias.Class; ->cls : Symbol(cls, Decl(aliasesInSystemModule1.ts, 8, 10)) +>cls : Symbol(cls, Decl(aliasesInSystemModule1.ts, 8, 13)) >alias : Symbol(alias, Decl(aliasesInSystemModule1.ts, 0, 0)) >Class : Symbol(cls) @@ -40,7 +40,7 @@ module M { let y = new cls(); >y : Symbol(y, Decl(aliasesInSystemModule1.ts, 11, 5)) ->cls : Symbol(cls, Decl(aliasesInSystemModule1.ts, 8, 10)) +>cls : Symbol(cls, Decl(aliasesInSystemModule1.ts, 8, 13)) let z = new cls2(); >z : Symbol(z, Decl(aliasesInSystemModule1.ts, 12, 5)) diff --git a/tests/baselines/reference/aliasesInSystemModule1.types b/tests/baselines/reference/aliasesInSystemModule1.types index 62578e6a5e10f..02344e3fc79be 100644 --- a/tests/baselines/reference/aliasesInSystemModule1.types +++ b/tests/baselines/reference/aliasesInSystemModule1.types @@ -49,7 +49,7 @@ let z = new cls2(); >cls2 : any > : ^^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/aliasesInSystemModule2.errors.txt b/tests/baselines/reference/aliasesInSystemModule2.errors.txt index e484e65dd8a43..9a313dacd26c9 100644 --- a/tests/baselines/reference/aliasesInSystemModule2.errors.txt +++ b/tests/baselines/reference/aliasesInSystemModule2.errors.txt @@ -12,7 +12,7 @@ aliasesInSystemModule2.ts(1,21): error TS2792: Cannot find module 'foo'. Did you let y = new cls(); let z = new cls2(); - module M { + namespace M { export import cls = alias.Class; let x = new alias.Class(); let y = new cls(); diff --git a/tests/baselines/reference/aliasesInSystemModule2.js b/tests/baselines/reference/aliasesInSystemModule2.js index 787c999e03e48..7b72650283e83 100644 --- a/tests/baselines/reference/aliasesInSystemModule2.js +++ b/tests/baselines/reference/aliasesInSystemModule2.js @@ -9,7 +9,7 @@ let x = new alias.Class(); let y = new cls(); let z = new cls2(); -module M { +namespace M { export import cls = alias.Class; let x = new alias.Class(); let y = new cls(); diff --git a/tests/baselines/reference/aliasesInSystemModule2.symbols b/tests/baselines/reference/aliasesInSystemModule2.symbols index b664cba3db0d0..52b3a73a234a9 100644 --- a/tests/baselines/reference/aliasesInSystemModule2.symbols +++ b/tests/baselines/reference/aliasesInSystemModule2.symbols @@ -26,11 +26,11 @@ let z = new cls2(); >z : Symbol(z, Decl(aliasesInSystemModule2.ts, 6, 3)) >cls2 : Symbol(cls2, Decl(aliasesInSystemModule2.ts, 1, 25)) -module M { +namespace M { >M : Symbol(M, Decl(aliasesInSystemModule2.ts, 6, 19)) export import cls = alias.Class; ->cls : Symbol(cls, Decl(aliasesInSystemModule2.ts, 8, 10)) +>cls : Symbol(cls, Decl(aliasesInSystemModule2.ts, 8, 13)) >alias : Symbol(alias, Decl(aliasesInSystemModule2.ts, 0, 8)) >Class : Symbol(cls) @@ -40,7 +40,7 @@ module M { let y = new cls(); >y : Symbol(y, Decl(aliasesInSystemModule2.ts, 11, 5)) ->cls : Symbol(cls, Decl(aliasesInSystemModule2.ts, 8, 10)) +>cls : Symbol(cls, Decl(aliasesInSystemModule2.ts, 8, 13)) let z = new cls2(); >z : Symbol(z, Decl(aliasesInSystemModule2.ts, 12, 5)) diff --git a/tests/baselines/reference/aliasesInSystemModule2.types b/tests/baselines/reference/aliasesInSystemModule2.types index 51b95258a3564..b5a0ae2491d3a 100644 --- a/tests/baselines/reference/aliasesInSystemModule2.types +++ b/tests/baselines/reference/aliasesInSystemModule2.types @@ -49,7 +49,7 @@ let z = new cls2(); >cls2 : any > : ^^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/alwaysStrictModule.errors.txt b/tests/baselines/reference/alwaysStrictModule.errors.txt index d3fa738698d47..d073999d2492c 100644 --- a/tests/baselines/reference/alwaysStrictModule.errors.txt +++ b/tests/baselines/reference/alwaysStrictModule.errors.txt @@ -2,7 +2,7 @@ alwaysStrictModule.ts(3,13): error TS1100: Invalid use of 'arguments' in strict ==== alwaysStrictModule.ts (1 errors) ==== - module M { + namespace M { export function f() { var arguments = []; ~~~~~~~~~ diff --git a/tests/baselines/reference/alwaysStrictModule.js b/tests/baselines/reference/alwaysStrictModule.js index 8d1a406d4b3cb..308e777a79c0d 100644 --- a/tests/baselines/reference/alwaysStrictModule.js +++ b/tests/baselines/reference/alwaysStrictModule.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/alwaysStrictModule.ts] //// //// [alwaysStrictModule.ts] -module M { +namespace M { export function f() { var arguments = []; } diff --git a/tests/baselines/reference/alwaysStrictModule.symbols b/tests/baselines/reference/alwaysStrictModule.symbols index 8e3f76ef47187..5dd9a1aa250b1 100644 --- a/tests/baselines/reference/alwaysStrictModule.symbols +++ b/tests/baselines/reference/alwaysStrictModule.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/alwaysStrictModule.ts] //// === alwaysStrictModule.ts === -module M { +namespace M { >M : Symbol(M, Decl(alwaysStrictModule.ts, 0, 0)) export function f() { ->f : Symbol(f, Decl(alwaysStrictModule.ts, 0, 10)) +>f : Symbol(f, Decl(alwaysStrictModule.ts, 0, 13)) var arguments = []; >arguments : Symbol(arguments, Decl(alwaysStrictModule.ts, 2, 11)) diff --git a/tests/baselines/reference/alwaysStrictModule.types b/tests/baselines/reference/alwaysStrictModule.types index 3714553a2537e..3b252aa993f23 100644 --- a/tests/baselines/reference/alwaysStrictModule.types +++ b/tests/baselines/reference/alwaysStrictModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/alwaysStrictModule.ts] //// === alwaysStrictModule.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/alwaysStrictModule2.errors.txt b/tests/baselines/reference/alwaysStrictModule2.errors.txt index 54481a89df317..d1302f9c0c5f0 100644 --- a/tests/baselines/reference/alwaysStrictModule2.errors.txt +++ b/tests/baselines/reference/alwaysStrictModule2.errors.txt @@ -3,7 +3,7 @@ b.ts(3,13): error TS1100: Invalid use of 'arguments' in strict mode. ==== a.ts (1 errors) ==== - module M { + namespace M { export function f() { var arguments = []; ~~~~~~~~~ @@ -12,7 +12,7 @@ b.ts(3,13): error TS1100: Invalid use of 'arguments' in strict mode. } ==== b.ts (1 errors) ==== - module M { + namespace M { export function f2() { var arguments = []; ~~~~~~~~~ diff --git a/tests/baselines/reference/alwaysStrictModule2.js b/tests/baselines/reference/alwaysStrictModule2.js index 157e11e760ad2..48f1b65dc3814 100644 --- a/tests/baselines/reference/alwaysStrictModule2.js +++ b/tests/baselines/reference/alwaysStrictModule2.js @@ -1,14 +1,14 @@ //// [tests/cases/compiler/alwaysStrictModule2.ts] //// //// [a.ts] -module M { +namespace M { export function f() { var arguments = []; } } //// [b.ts] -module M { +namespace M { export function f2() { var arguments = []; } diff --git a/tests/baselines/reference/alwaysStrictModule2.symbols b/tests/baselines/reference/alwaysStrictModule2.symbols index 43ad606a4085e..b56aa3f3af35b 100644 --- a/tests/baselines/reference/alwaysStrictModule2.symbols +++ b/tests/baselines/reference/alwaysStrictModule2.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/alwaysStrictModule2.ts] //// === a.ts === -module M { +namespace M { >M : Symbol(M, Decl(a.ts, 0, 0), Decl(b.ts, 0, 0)) export function f() { ->f : Symbol(f, Decl(a.ts, 0, 10)) +>f : Symbol(f, Decl(a.ts, 0, 13)) var arguments = []; >arguments : Symbol(arguments, Decl(a.ts, 2, 11)) @@ -13,11 +13,11 @@ module M { } === b.ts === -module M { +namespace M { >M : Symbol(M, Decl(a.ts, 0, 0), Decl(b.ts, 0, 0)) export function f2() { ->f2 : Symbol(f2, Decl(b.ts, 0, 10)) +>f2 : Symbol(f2, Decl(b.ts, 0, 13)) var arguments = []; >arguments : Symbol(arguments, Decl(b.ts, 2, 11)) diff --git a/tests/baselines/reference/alwaysStrictModule2.types b/tests/baselines/reference/alwaysStrictModule2.types index b9843f3b0a925..56ca19f0b36b0 100644 --- a/tests/baselines/reference/alwaysStrictModule2.types +++ b/tests/baselines/reference/alwaysStrictModule2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/alwaysStrictModule2.ts] //// === a.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -18,7 +18,7 @@ module M { } === b.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.errors.txt b/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.errors.txt index 1ad933c52218d..e8b5ec6c18318 100644 --- a/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.errors.txt +++ b/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.errors.txt @@ -4,7 +4,7 @@ alwaysStrictNoImplicitUseStrict.ts(3,13): error TS1100: Invalid use of 'argument !!! error TS5102: Option 'noImplicitUseStrict' has been removed. Please remove it from your configuration. ==== alwaysStrictNoImplicitUseStrict.ts (1 errors) ==== - module M { + namespace M { export function f() { var arguments = []; ~~~~~~~~~ diff --git a/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.js b/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.js index e2bb3b3962866..fc43aeb92fe53 100644 --- a/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.js +++ b/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/alwaysStrictNoImplicitUseStrict.ts] //// //// [alwaysStrictNoImplicitUseStrict.ts] -module M { +namespace M { export function f() { var arguments = []; } diff --git a/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.symbols b/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.symbols index d01ffc0a84c20..36c9e2aeb5c29 100644 --- a/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.symbols +++ b/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/alwaysStrictNoImplicitUseStrict.ts] //// === alwaysStrictNoImplicitUseStrict.ts === -module M { +namespace M { >M : Symbol(M, Decl(alwaysStrictNoImplicitUseStrict.ts, 0, 0)) export function f() { ->f : Symbol(f, Decl(alwaysStrictNoImplicitUseStrict.ts, 0, 10)) +>f : Symbol(f, Decl(alwaysStrictNoImplicitUseStrict.ts, 0, 13)) var arguments = []; >arguments : Symbol(arguments, Decl(alwaysStrictNoImplicitUseStrict.ts, 2, 11)) diff --git a/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.types b/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.types index bf4d591f57faf..7199bbe3c816b 100644 --- a/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.types +++ b/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/alwaysStrictNoImplicitUseStrict.ts] //// === alwaysStrictNoImplicitUseStrict.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/ambientDeclarations.js b/tests/baselines/reference/ambientDeclarations.js index 81a8c6617c7a5..51c77dcb33df3 100644 --- a/tests/baselines/reference/ambientDeclarations.js +++ b/tests/baselines/reference/ambientDeclarations.js @@ -55,13 +55,13 @@ declare enum E2 { declare enum E3 { A } -declare module E3 { +declare namespace E3 { var B; } var x = E3.B; // Ambient module -declare module M1 { +declare namespace M1 { var x; function fn(): number; } diff --git a/tests/baselines/reference/ambientDeclarations.symbols b/tests/baselines/reference/ambientDeclarations.symbols index 34ac406420228..5605fc2799bed 100644 --- a/tests/baselines/reference/ambientDeclarations.symbols +++ b/tests/baselines/reference/ambientDeclarations.symbols @@ -123,7 +123,7 @@ declare enum E3 { A >A : Symbol(E3.A, Decl(ambientDeclarations.ts, 51, 17)) } -declare module E3 { +declare namespace E3 { >E3 : Symbol(E3, Decl(ambientDeclarations.ts, 48, 1), Decl(ambientDeclarations.ts, 53, 1)) var B; @@ -136,7 +136,7 @@ var x = E3.B; >B : Symbol(E3.B, Decl(ambientDeclarations.ts, 55, 7)) // Ambient module -declare module M1 { +declare namespace M1 { >M1 : Symbol(M1, Decl(ambientDeclarations.ts, 57, 13)) var x; diff --git a/tests/baselines/reference/ambientDeclarations.types b/tests/baselines/reference/ambientDeclarations.types index c403f220e083b..c5555d62725a2 100644 --- a/tests/baselines/reference/ambientDeclarations.types +++ b/tests/baselines/reference/ambientDeclarations.types @@ -160,7 +160,7 @@ declare enum E3 { >A : E3.A > : ^^^^ } -declare module E3 { +declare namespace E3 { >E3 : typeof E3 > : ^^^^^^^^^ @@ -176,7 +176,7 @@ var x = E3.B; > : ^^^ // Ambient module -declare module M1 { +declare namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/ambientEnumElementInitializer6.js b/tests/baselines/reference/ambientEnumElementInitializer6.js index 91b05182000cb..59e6b64781a86 100644 --- a/tests/baselines/reference/ambientEnumElementInitializer6.js +++ b/tests/baselines/reference/ambientEnumElementInitializer6.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/ambientEnumElementInitializer6.ts] //// //// [ambientEnumElementInitializer6.ts] -declare module M { +declare namespace M { enum E { e = 3 } diff --git a/tests/baselines/reference/ambientEnumElementInitializer6.symbols b/tests/baselines/reference/ambientEnumElementInitializer6.symbols index 47eb70491142e..26dce152cdea9 100644 --- a/tests/baselines/reference/ambientEnumElementInitializer6.symbols +++ b/tests/baselines/reference/ambientEnumElementInitializer6.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/ambientEnumElementInitializer6.ts] //// === ambientEnumElementInitializer6.ts === -declare module M { +declare namespace M { >M : Symbol(M, Decl(ambientEnumElementInitializer6.ts, 0, 0)) enum E { ->E : Symbol(E, Decl(ambientEnumElementInitializer6.ts, 0, 18)) +>E : Symbol(E, Decl(ambientEnumElementInitializer6.ts, 0, 21)) e = 3 >e : Symbol(E.e, Decl(ambientEnumElementInitializer6.ts, 1, 12)) diff --git a/tests/baselines/reference/ambientEnumElementInitializer6.types b/tests/baselines/reference/ambientEnumElementInitializer6.types index 3d0d83dfda402..5d985fde1e4f1 100644 --- a/tests/baselines/reference/ambientEnumElementInitializer6.types +++ b/tests/baselines/reference/ambientEnumElementInitializer6.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/ambientEnumElementInitializer6.ts] //// === ambientEnumElementInitializer6.ts === -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/ambientErrors.errors.txt b/tests/baselines/reference/ambientErrors.errors.txt index ce20862cdb857..eb5dd970cc726 100644 --- a/tests/baselines/reference/ambientErrors.errors.txt +++ b/tests/baselines/reference/ambientErrors.errors.txt @@ -55,7 +55,7 @@ ambientErrors.ts(57,5): error TS2309: An export assignment cannot be used in a m } // Ambient module with initializers for values, bodies for functions / classes - declare module M1 { + declare namespace M1 { var x = 3; ~ !!! error TS1039: Initializers are not allowed in ambient contexts. @@ -82,7 +82,7 @@ ambientErrors.ts(57,5): error TS2309: An export assignment cannot be used in a m } // Ambient external module not in the global module - module M2 { + namespace M2 { declare module 'nope' { } ~~~~~~ !!! error TS2435: Ambient modules cannot be nested in other modules or namespaces. diff --git a/tests/baselines/reference/ambientErrors.js b/tests/baselines/reference/ambientErrors.js index 96925ad0096fa..3997413b62abc 100644 --- a/tests/baselines/reference/ambientErrors.js +++ b/tests/baselines/reference/ambientErrors.js @@ -33,7 +33,7 @@ declare enum E2 { } // Ambient module with initializers for values, bodies for functions / classes -declare module M1 { +declare namespace M1 { var x = 3; function fn() { } class C { @@ -46,7 +46,7 @@ declare module M1 { } // Ambient external module not in the global module -module M2 { +namespace M2 { declare module 'nope' { } } diff --git a/tests/baselines/reference/ambientErrors.symbols b/tests/baselines/reference/ambientErrors.symbols index c159b16a09885..18e4a688c19d2 100644 --- a/tests/baselines/reference/ambientErrors.symbols +++ b/tests/baselines/reference/ambientErrors.symbols @@ -60,7 +60,7 @@ declare enum E2 { } // Ambient module with initializers for values, bodies for functions / classes -declare module M1 { +declare namespace M1 { >M1 : Symbol(M1, Decl(ambientErrors.ts, 29, 1)) var x = 3; @@ -88,11 +88,11 @@ declare module M1 { } // Ambient external module not in the global module -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(ambientErrors.ts, 42, 1)) declare module 'nope' { } ->'nope' : Symbol("nope", Decl(ambientErrors.ts, 45, 11)) +>'nope' : Symbol("nope", Decl(ambientErrors.ts, 45, 14)) } // Ambient external module with a string literal name that isn't a top level external module name diff --git a/tests/baselines/reference/ambientErrors.types b/tests/baselines/reference/ambientErrors.types index a6745844e6a5b..dc5708e7cf996 100644 --- a/tests/baselines/reference/ambientErrors.types +++ b/tests/baselines/reference/ambientErrors.types @@ -90,7 +90,7 @@ declare enum E2 { } // Ambient module with initializers for values, bodies for functions / classes -declare module M1 { +declare namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ @@ -132,7 +132,7 @@ declare module M1 { } // Ambient external module not in the global module -module M2 { +namespace M2 { declare module 'nope' { } >'nope' : typeof import("nope") > : ^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.errors.txt b/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.errors.txt index ae9302d5286e6..a757a02705f6c 100644 --- a/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.errors.txt +++ b/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.errors.txt @@ -3,7 +3,7 @@ ambientExternalModuleInsideNonAmbient.ts(2,27): error TS2435: Ambient modules ca ==== ambientExternalModuleInsideNonAmbient.ts (2 errors) ==== - module M { + namespace M { export declare module "M" { } ~~~~~~ !!! error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible. diff --git a/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.js b/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.js index 90c3592344698..36293e56b69e3 100644 --- a/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.js +++ b/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts] //// //// [ambientExternalModuleInsideNonAmbient.ts] -module M { +namespace M { export declare module "M" { } } diff --git a/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.symbols b/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.symbols index b064ac0d62b2b..040935b6cbc83 100644 --- a/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.symbols +++ b/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.symbols @@ -1,9 +1,9 @@ //// [tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts] //// === ambientExternalModuleInsideNonAmbient.ts === -module M { +namespace M { >M : Symbol(M, Decl(ambientExternalModuleInsideNonAmbient.ts, 0, 0)) export declare module "M" { } ->"M" : Symbol("M", Decl(ambientExternalModuleInsideNonAmbient.ts, 0, 10)) +>"M" : Symbol("M", Decl(ambientExternalModuleInsideNonAmbient.ts, 0, 13)) } diff --git a/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.types b/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.types index 1ce1be949a373..1ebf54fdaf1ad 100644 --- a/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.types +++ b/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts] //// === ambientExternalModuleInsideNonAmbient.ts === -module M { +namespace M { export declare module "M" { } >"M" : typeof import("M") > : ^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js index 27e999b59f559..8f3739c11b49b 100644 --- a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js +++ b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js @@ -2,7 +2,7 @@ //// [ambientExternalModuleWithInternalImportDeclaration_0.ts] declare module 'M' { - module C { + namespace C { export var f: number; } class C { diff --git a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.symbols b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.symbols index b962e3e5ba7e5..fdf8cd926e457 100644 --- a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.symbols +++ b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.symbols @@ -13,7 +13,7 @@ var c = new A(); declare module 'M' { >'M' : Symbol("M", Decl(ambientExternalModuleWithInternalImportDeclaration_0.ts, 0, 0)) - module C { + namespace C { >C : Symbol(C, Decl(ambientExternalModuleWithInternalImportDeclaration_0.ts, 0, 20), Decl(ambientExternalModuleWithInternalImportDeclaration_0.ts, 3, 5)) export var f: number; diff --git a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types index ac44658983f13..733f29a69ebf9 100644 --- a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types +++ b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types @@ -19,7 +19,7 @@ declare module 'M' { >'M' : typeof import("M") > : ^^^^^^^^^^^^^^^^^^ - module C { + namespace C { >C : typeof C > : ^^^^^^^^ diff --git a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js index fba6dff144395..7f53c9b6e037e 100644 --- a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js +++ b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js @@ -2,7 +2,7 @@ //// [ambientExternalModuleWithoutInternalImportDeclaration_0.ts] declare module 'M' { - module C { + namespace C { export var f: number; } class C { diff --git a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.symbols b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.symbols index 104fed501be82..e19eb1ba36eee 100644 --- a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.symbols +++ b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.symbols @@ -13,7 +13,7 @@ var c = new A(); declare module 'M' { >'M' : Symbol("M", Decl(ambientExternalModuleWithoutInternalImportDeclaration_0.ts, 0, 0)) - module C { + namespace C { >C : Symbol(C, Decl(ambientExternalModuleWithoutInternalImportDeclaration_0.ts, 0, 20), Decl(ambientExternalModuleWithoutInternalImportDeclaration_0.ts, 3, 5)) export var f: number; diff --git a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types index 1e6b95ad77715..ec85f6a3a6e6a 100644 --- a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types +++ b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types @@ -19,7 +19,7 @@ declare module 'M' { >'M' : typeof import("M") > : ^^^^^^^^^^^^^^^^^^ - module C { + namespace C { >C : typeof C > : ^^^^^^^^ diff --git a/tests/baselines/reference/ambientFundule.js b/tests/baselines/reference/ambientFundule.js index deffb57f790b1..6ede114d99e92 100644 --- a/tests/baselines/reference/ambientFundule.js +++ b/tests/baselines/reference/ambientFundule.js @@ -2,7 +2,7 @@ //// [ambientFundule.ts] declare function f(); -declare module f { var x } +declare namespace f { var x } declare function f(x); //// [ambientFundule.js] diff --git a/tests/baselines/reference/ambientFundule.symbols b/tests/baselines/reference/ambientFundule.symbols index b8daf73847534..eacd01f572889 100644 --- a/tests/baselines/reference/ambientFundule.symbols +++ b/tests/baselines/reference/ambientFundule.symbols @@ -2,13 +2,13 @@ === ambientFundule.ts === declare function f(); ->f : Symbol(f, Decl(ambientFundule.ts, 0, 0), Decl(ambientFundule.ts, 1, 26), Decl(ambientFundule.ts, 0, 21)) +>f : Symbol(f, Decl(ambientFundule.ts, 0, 0), Decl(ambientFundule.ts, 1, 29), Decl(ambientFundule.ts, 0, 21)) -declare module f { var x } ->f : Symbol(f, Decl(ambientFundule.ts, 0, 0), Decl(ambientFundule.ts, 1, 26), Decl(ambientFundule.ts, 0, 21)) ->x : Symbol(x, Decl(ambientFundule.ts, 1, 22)) +declare namespace f { var x } +>f : Symbol(f, Decl(ambientFundule.ts, 0, 0), Decl(ambientFundule.ts, 1, 29), Decl(ambientFundule.ts, 0, 21)) +>x : Symbol(x, Decl(ambientFundule.ts, 1, 25)) declare function f(x); ->f : Symbol(f, Decl(ambientFundule.ts, 0, 0), Decl(ambientFundule.ts, 1, 26), Decl(ambientFundule.ts, 0, 21)) +>f : Symbol(f, Decl(ambientFundule.ts, 0, 0), Decl(ambientFundule.ts, 1, 29), Decl(ambientFundule.ts, 0, 21)) >x : Symbol(x, Decl(ambientFundule.ts, 2, 19)) diff --git a/tests/baselines/reference/ambientFundule.types b/tests/baselines/reference/ambientFundule.types index 884f964f2b838..37aa95e5b8522 100644 --- a/tests/baselines/reference/ambientFundule.types +++ b/tests/baselines/reference/ambientFundule.types @@ -5,7 +5,7 @@ declare function f(); >f : typeof f > : ^^^^^^^^ -declare module f { var x } +declare namespace f { var x } >f : typeof f > : ^^^^^^^^ >x : any diff --git a/tests/baselines/reference/ambientInsideNonAmbient.js b/tests/baselines/reference/ambientInsideNonAmbient.js index fbaca80663999..c6388d9939ca2 100644 --- a/tests/baselines/reference/ambientInsideNonAmbient.js +++ b/tests/baselines/reference/ambientInsideNonAmbient.js @@ -1,20 +1,20 @@ //// [tests/cases/conformance/ambient/ambientInsideNonAmbient.ts] //// //// [ambientInsideNonAmbient.ts] -module M { +namespace M { export declare var x; export declare function f(); export declare class C { } export declare enum E { } - export declare module M { } + export declare namespace M { } } -module M2 { +namespace M2 { declare var x; declare function f(); declare class C { } declare enum E { } - declare module M { } + declare namespace M { } } //// [ambientInsideNonAmbient.js] diff --git a/tests/baselines/reference/ambientInsideNonAmbient.symbols b/tests/baselines/reference/ambientInsideNonAmbient.symbols index b21f89af056a7..601aa701fd694 100644 --- a/tests/baselines/reference/ambientInsideNonAmbient.symbols +++ b/tests/baselines/reference/ambientInsideNonAmbient.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/ambient/ambientInsideNonAmbient.ts] //// === ambientInsideNonAmbient.ts === -module M { +namespace M { >M : Symbol(M, Decl(ambientInsideNonAmbient.ts, 0, 0)) export declare var x; @@ -16,11 +16,11 @@ module M { export declare enum E { } >E : Symbol(E, Decl(ambientInsideNonAmbient.ts, 3, 30)) - export declare module M { } + export declare namespace M { } >M : Symbol(M, Decl(ambientInsideNonAmbient.ts, 4, 29)) } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(ambientInsideNonAmbient.ts, 6, 1)) declare var x; @@ -35,6 +35,6 @@ module M2 { declare enum E { } >E : Symbol(E, Decl(ambientInsideNonAmbient.ts, 11, 23)) - declare module M { } + declare namespace M { } >M : Symbol(M, Decl(ambientInsideNonAmbient.ts, 12, 22)) } diff --git a/tests/baselines/reference/ambientInsideNonAmbient.types b/tests/baselines/reference/ambientInsideNonAmbient.types index f9d706286989c..7bc1f6bad08c5 100644 --- a/tests/baselines/reference/ambientInsideNonAmbient.types +++ b/tests/baselines/reference/ambientInsideNonAmbient.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/ambient/ambientInsideNonAmbient.ts] //// === ambientInsideNonAmbient.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -20,10 +20,10 @@ module M { >E : E > : ^ - export declare module M { } + export declare namespace M { } } -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ @@ -42,5 +42,5 @@ module M2 { >E : E > : ^ - declare module M { } + declare namespace M { } } diff --git a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.js b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.js index 78537cdaea9d9..a1432d38f8b6e 100644 --- a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.js +++ b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.js @@ -5,7 +5,7 @@ export declare var x; export declare function f(); export declare class C { } export declare enum E { } -export declare module M { } +export declare namespace M { } //// [ambientInsideNonAmbientExternalModule.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.symbols b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.symbols index 80f10801cace7..a524c1088f3ab 100644 --- a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.symbols +++ b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.symbols @@ -13,6 +13,6 @@ export declare class C { } export declare enum E { } >E : Symbol(E, Decl(ambientInsideNonAmbientExternalModule.ts, 2, 26)) -export declare module M { } +export declare namespace M { } >M : Symbol(M, Decl(ambientInsideNonAmbientExternalModule.ts, 3, 25)) diff --git a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.types b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.types index 337697296dbe6..1e4d937001776 100644 --- a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.types +++ b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.types @@ -16,4 +16,4 @@ export declare enum E { } >E : E > : ^ -export declare module M { } +export declare namespace M { } diff --git a/tests/baselines/reference/ambientModuleDeclarationWithReservedIdentifierInDottedPath.errors.txt b/tests/baselines/reference/ambientModuleDeclarationWithReservedIdentifierInDottedPath.errors.txt index 32d0fa85f966d..ebf78ef03c496 100644 --- a/tests/baselines/reference/ambientModuleDeclarationWithReservedIdentifierInDottedPath.errors.txt +++ b/tests/baselines/reference/ambientModuleDeclarationWithReservedIdentifierInDottedPath.errors.txt @@ -1,27 +1,39 @@ +ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts(3,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts(3,23): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts(9,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts(9,21): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts(11,1): error TS2304: Cannot find name 'declare'. -ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts(11,9): error TS2580: Cannot find name 'module'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`. -ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts(11,16): error TS2819: Namespace name cannot be 'debugger'. -ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts(11,25): error TS1005: ';' expected. +ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts(11,9): error TS2304: Cannot find name 'namespace'. +ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts(11,19): error TS2819: Namespace name cannot be 'debugger'. +ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts(11,28): error TS1005: ';' expected. -==== ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts (4 errors) ==== +==== ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts (8 errors) ==== // https://github.com/microsoft/TypeScript/issues/7840 declare module chrome.debugger { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. declare var tabId: number; } export const tabId = chrome.debugger.tabId; declare module test.class {} + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. - declare module debugger {} // still an error + declare namespace debugger {} // still an error ~~~~~~~ !!! error TS2304: Cannot find name 'declare'. - ~~~~~~ -!!! error TS2580: Cannot find name 'module'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`. - ~~~~~~~~ + ~~~~~~~~~ +!!! error TS2304: Cannot find name 'namespace'. + ~~~~~~~~ !!! error TS2819: Namespace name cannot be 'debugger'. - ~ + ~ !!! error TS1005: ';' expected. \ No newline at end of file diff --git a/tests/baselines/reference/ambientModuleDeclarationWithReservedIdentifierInDottedPath.js b/tests/baselines/reference/ambientModuleDeclarationWithReservedIdentifierInDottedPath.js index 8066fd7de6b57..8620efbcfa6c5 100644 --- a/tests/baselines/reference/ambientModuleDeclarationWithReservedIdentifierInDottedPath.js +++ b/tests/baselines/reference/ambientModuleDeclarationWithReservedIdentifierInDottedPath.js @@ -11,7 +11,7 @@ export const tabId = chrome.debugger.tabId; declare module test.class {} -declare module debugger {} // still an error +declare namespace debugger {} // still an error //// [ambientModuleDeclarationWithReservedIdentifierInDottedPath.js] @@ -21,7 +21,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.tabId = void 0; exports.tabId = chrome.debugger.tabId; declare; -module; +namespace; debugger; { } // still an error diff --git a/tests/baselines/reference/ambientModuleDeclarationWithReservedIdentifierInDottedPath.symbols b/tests/baselines/reference/ambientModuleDeclarationWithReservedIdentifierInDottedPath.symbols index 353e1d3c7e1e7..0f34fd9a43fd8 100644 --- a/tests/baselines/reference/ambientModuleDeclarationWithReservedIdentifierInDottedPath.symbols +++ b/tests/baselines/reference/ambientModuleDeclarationWithReservedIdentifierInDottedPath.symbols @@ -23,5 +23,5 @@ declare module test.class {} >test : Symbol(test, Decl(ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts, 6, 43)) >class : Symbol(class, Decl(ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts, 8, 20)) -declare module debugger {} // still an error +declare namespace debugger {} // still an error diff --git a/tests/baselines/reference/ambientModuleDeclarationWithReservedIdentifierInDottedPath.types b/tests/baselines/reference/ambientModuleDeclarationWithReservedIdentifierInDottedPath.types index 861f9d0dda44d..4f396f837de73 100644 --- a/tests/baselines/reference/ambientModuleDeclarationWithReservedIdentifierInDottedPath.types +++ b/tests/baselines/reference/ambientModuleDeclarationWithReservedIdentifierInDottedPath.types @@ -30,9 +30,9 @@ export const tabId = chrome.debugger.tabId; declare module test.class {} -declare module debugger {} // still an error +declare namespace debugger {} // still an error >declare : any > : ^^^ ->module : any -> : ^^^ +>namespace : any +> : ^^^ diff --git a/tests/baselines/reference/ambientModuleExports.js b/tests/baselines/reference/ambientModuleExports.js index 5067df2a0608b..e4ea4d04c9619 100644 --- a/tests/baselines/reference/ambientModuleExports.js +++ b/tests/baselines/reference/ambientModuleExports.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/ambientModuleExports.ts] //// //// [ambientModuleExports.ts] -declare module Foo { +declare namespace Foo { function a():void; var b:number; class C {} @@ -11,7 +11,7 @@ Foo.a(); Foo.b; var c = new Foo.C(); -declare module Foo2 { +declare namespace Foo2 { export function a(): void; export var b: number; export class C { } diff --git a/tests/baselines/reference/ambientModuleExports.symbols b/tests/baselines/reference/ambientModuleExports.symbols index 1fdab327d7a87..1f338c067f9d5 100644 --- a/tests/baselines/reference/ambientModuleExports.symbols +++ b/tests/baselines/reference/ambientModuleExports.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/ambientModuleExports.ts] //// === ambientModuleExports.ts === -declare module Foo { +declare namespace Foo { >Foo : Symbol(Foo, Decl(ambientModuleExports.ts, 0, 0)) function a():void; ->a : Symbol(a, Decl(ambientModuleExports.ts, 0, 20)) +>a : Symbol(a, Decl(ambientModuleExports.ts, 0, 23)) var b:number; >b : Symbol(b, Decl(ambientModuleExports.ts, 2, 4)) @@ -15,9 +15,9 @@ declare module Foo { } Foo.a(); ->Foo.a : Symbol(Foo.a, Decl(ambientModuleExports.ts, 0, 20)) +>Foo.a : Symbol(Foo.a, Decl(ambientModuleExports.ts, 0, 23)) >Foo : Symbol(Foo, Decl(ambientModuleExports.ts, 0, 0)) ->a : Symbol(Foo.a, Decl(ambientModuleExports.ts, 0, 20)) +>a : Symbol(Foo.a, Decl(ambientModuleExports.ts, 0, 23)) Foo.b; >Foo.b : Symbol(Foo.b, Decl(ambientModuleExports.ts, 2, 4)) @@ -30,11 +30,11 @@ var c = new Foo.C(); >Foo : Symbol(Foo, Decl(ambientModuleExports.ts, 0, 0)) >C : Symbol(Foo.C, Decl(ambientModuleExports.ts, 2, 14)) -declare module Foo2 { +declare namespace Foo2 { >Foo2 : Symbol(Foo2, Decl(ambientModuleExports.ts, 8, 20)) export function a(): void; ->a : Symbol(a, Decl(ambientModuleExports.ts, 10, 21)) +>a : Symbol(a, Decl(ambientModuleExports.ts, 10, 24)) export var b: number; >b : Symbol(b, Decl(ambientModuleExports.ts, 12, 14)) @@ -44,9 +44,9 @@ declare module Foo2 { } Foo2.a(); ->Foo2.a : Symbol(Foo2.a, Decl(ambientModuleExports.ts, 10, 21)) +>Foo2.a : Symbol(Foo2.a, Decl(ambientModuleExports.ts, 10, 24)) >Foo2 : Symbol(Foo2, Decl(ambientModuleExports.ts, 8, 20)) ->a : Symbol(Foo2.a, Decl(ambientModuleExports.ts, 10, 21)) +>a : Symbol(Foo2.a, Decl(ambientModuleExports.ts, 10, 24)) Foo2.b; >Foo2.b : Symbol(Foo2.b, Decl(ambientModuleExports.ts, 12, 14)) diff --git a/tests/baselines/reference/ambientModuleExports.types b/tests/baselines/reference/ambientModuleExports.types index 526ec67c302cd..aabe867d6f2a3 100644 --- a/tests/baselines/reference/ambientModuleExports.types +++ b/tests/baselines/reference/ambientModuleExports.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/ambientModuleExports.ts] //// === ambientModuleExports.ts === -declare module Foo { +declare namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ @@ -48,7 +48,7 @@ var c = new Foo.C(); >C : typeof Foo.C > : ^^^^^^^^^^^^ -declare module Foo2 { +declare namespace Foo2 { >Foo2 : typeof Foo2 > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/ambientModuleWithClassDeclarationWithExtends.js b/tests/baselines/reference/ambientModuleWithClassDeclarationWithExtends.js index 45a7d6e06e582..89af25fa662b2 100644 --- a/tests/baselines/reference/ambientModuleWithClassDeclarationWithExtends.js +++ b/tests/baselines/reference/ambientModuleWithClassDeclarationWithExtends.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/ambientModuleWithClassDeclarationWithExtends.ts] //// //// [ambientModuleWithClassDeclarationWithExtends.ts] -declare module foo { +declare namespace foo { class A { } class B extends A { } } diff --git a/tests/baselines/reference/ambientModuleWithClassDeclarationWithExtends.symbols b/tests/baselines/reference/ambientModuleWithClassDeclarationWithExtends.symbols index f5161339f621d..2f9fdbbd54f39 100644 --- a/tests/baselines/reference/ambientModuleWithClassDeclarationWithExtends.symbols +++ b/tests/baselines/reference/ambientModuleWithClassDeclarationWithExtends.symbols @@ -1,13 +1,13 @@ //// [tests/cases/compiler/ambientModuleWithClassDeclarationWithExtends.ts] //// === ambientModuleWithClassDeclarationWithExtends.ts === -declare module foo { +declare namespace foo { >foo : Symbol(foo, Decl(ambientModuleWithClassDeclarationWithExtends.ts, 0, 0)) class A { } ->A : Symbol(A, Decl(ambientModuleWithClassDeclarationWithExtends.ts, 0, 20)) +>A : Symbol(A, Decl(ambientModuleWithClassDeclarationWithExtends.ts, 0, 23)) class B extends A { } >B : Symbol(B, Decl(ambientModuleWithClassDeclarationWithExtends.ts, 1, 15)) ->A : Symbol(A, Decl(ambientModuleWithClassDeclarationWithExtends.ts, 0, 20)) +>A : Symbol(A, Decl(ambientModuleWithClassDeclarationWithExtends.ts, 0, 23)) } diff --git a/tests/baselines/reference/ambientModuleWithClassDeclarationWithExtends.types b/tests/baselines/reference/ambientModuleWithClassDeclarationWithExtends.types index 45dc1b43aaa91..3a954180aca6c 100644 --- a/tests/baselines/reference/ambientModuleWithClassDeclarationWithExtends.types +++ b/tests/baselines/reference/ambientModuleWithClassDeclarationWithExtends.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/ambientModuleWithClassDeclarationWithExtends.ts] //// === ambientModuleWithClassDeclarationWithExtends.ts === -declare module foo { +declare namespace foo { >foo : typeof foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/ambientModuleWithTemplateLiterals.js b/tests/baselines/reference/ambientModuleWithTemplateLiterals.js index c57ef31e0c071..e2fce1a4cd796 100644 --- a/tests/baselines/reference/ambientModuleWithTemplateLiterals.js +++ b/tests/baselines/reference/ambientModuleWithTemplateLiterals.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/ambientModuleWithTemplateLiterals.ts] //// //// [ambientModuleWithTemplateLiterals.ts] -declare module Foo { +declare namespace Foo { enum Bar { a = `1`, b = '2', diff --git a/tests/baselines/reference/ambientModuleWithTemplateLiterals.symbols b/tests/baselines/reference/ambientModuleWithTemplateLiterals.symbols index df96ad10c3734..b832ba305c8c6 100644 --- a/tests/baselines/reference/ambientModuleWithTemplateLiterals.symbols +++ b/tests/baselines/reference/ambientModuleWithTemplateLiterals.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/ambientModuleWithTemplateLiterals.ts] //// === ambientModuleWithTemplateLiterals.ts === -declare module Foo { +declare namespace Foo { >Foo : Symbol(Foo, Decl(ambientModuleWithTemplateLiterals.ts, 0, 0)) enum Bar { ->Bar : Symbol(Bar, Decl(ambientModuleWithTemplateLiterals.ts, 0, 20)) +>Bar : Symbol(Bar, Decl(ambientModuleWithTemplateLiterals.ts, 0, 23)) a = `1`, >a : Symbol(Bar.a, Decl(ambientModuleWithTemplateLiterals.ts, 1, 14)) @@ -26,17 +26,17 @@ declare module Foo { export const c = Bar.a; >c : Symbol(c, Decl(ambientModuleWithTemplateLiterals.ts, 10, 16)) >Bar.a : Symbol(Bar.a, Decl(ambientModuleWithTemplateLiterals.ts, 1, 14)) ->Bar : Symbol(Bar, Decl(ambientModuleWithTemplateLiterals.ts, 0, 20)) +>Bar : Symbol(Bar, Decl(ambientModuleWithTemplateLiterals.ts, 0, 23)) >a : Symbol(Bar.a, Decl(ambientModuleWithTemplateLiterals.ts, 1, 14)) export const d = Bar['b']; >d : Symbol(d, Decl(ambientModuleWithTemplateLiterals.ts, 11, 16)) ->Bar : Symbol(Bar, Decl(ambientModuleWithTemplateLiterals.ts, 0, 20)) +>Bar : Symbol(Bar, Decl(ambientModuleWithTemplateLiterals.ts, 0, 23)) >'b' : Symbol(Bar.b, Decl(ambientModuleWithTemplateLiterals.ts, 2, 16)) export const e = Bar[`c`]; >e : Symbol(e, Decl(ambientModuleWithTemplateLiterals.ts, 12, 16)) ->Bar : Symbol(Bar, Decl(ambientModuleWithTemplateLiterals.ts, 0, 20)) +>Bar : Symbol(Bar, Decl(ambientModuleWithTemplateLiterals.ts, 0, 23)) >`c` : Symbol(Bar.c, Decl(ambientModuleWithTemplateLiterals.ts, 3, 16)) } diff --git a/tests/baselines/reference/ambientModuleWithTemplateLiterals.types b/tests/baselines/reference/ambientModuleWithTemplateLiterals.types index 7f28029f5a5b1..5afef14c03943 100644 --- a/tests/baselines/reference/ambientModuleWithTemplateLiterals.types +++ b/tests/baselines/reference/ambientModuleWithTemplateLiterals.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/ambientModuleWithTemplateLiterals.ts] //// === ambientModuleWithTemplateLiterals.ts === -declare module Foo { +declare namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/ambientModules.errors.txt b/tests/baselines/reference/ambientModules.errors.txt new file mode 100644 index 0000000000000..13d5d78025c95 --- /dev/null +++ b/tests/baselines/reference/ambientModules.errors.txt @@ -0,0 +1,11 @@ +ambientModules.ts(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +ambientModules.ts(1,20): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== ambientModules.ts (2 errors) ==== + declare module Foo.Bar { export var foo; }; + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + Foo.Bar.foo = 5; \ No newline at end of file diff --git a/tests/baselines/reference/ambientModules.types b/tests/baselines/reference/ambientModules.types index 6ef1a845483b4..ac53317188a1b 100644 --- a/tests/baselines/reference/ambientModules.types +++ b/tests/baselines/reference/ambientModules.types @@ -7,11 +7,13 @@ declare module Foo.Bar { export var foo; }; >Bar : typeof Bar > : ^^^^^^^^^^ >foo : any +> : ^^^ Foo.Bar.foo = 5; >Foo.Bar.foo = 5 : 5 > : ^ >Foo.Bar.foo : any +> : ^^^ >Foo.Bar : typeof Foo.Bar > : ^^^^^^^^^^^^^^ >Foo : typeof Foo diff --git a/tests/baselines/reference/ambientStatement1.errors.txt b/tests/baselines/reference/ambientStatement1.errors.txt index 8ab93c1b1f56c..d7af3687d51da 100644 --- a/tests/baselines/reference/ambientStatement1.errors.txt +++ b/tests/baselines/reference/ambientStatement1.errors.txt @@ -3,7 +3,7 @@ ambientStatement1.ts(4,22): error TS1039: Initializers are not allowed in ambien ==== ambientStatement1.ts (2 errors) ==== - declare module M1 { + declare namespace M1 { while(true); ~~~~~ !!! error TS1036: Statements are not allowed in ambient contexts. diff --git a/tests/baselines/reference/ambientStatement1.js b/tests/baselines/reference/ambientStatement1.js index 60e5400465491..4143238a2b802 100644 --- a/tests/baselines/reference/ambientStatement1.js +++ b/tests/baselines/reference/ambientStatement1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/ambientStatement1.ts] //// //// [ambientStatement1.ts] - declare module M1 { + declare namespace M1 { while(true); export var v1 = () => false; diff --git a/tests/baselines/reference/ambientStatement1.symbols b/tests/baselines/reference/ambientStatement1.symbols index 408900b53697e..68bc6e86f680e 100644 --- a/tests/baselines/reference/ambientStatement1.symbols +++ b/tests/baselines/reference/ambientStatement1.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/ambientStatement1.ts] //// === ambientStatement1.ts === - declare module M1 { + declare namespace M1 { >M1 : Symbol(M1, Decl(ambientStatement1.ts, 0, 0)) while(true); diff --git a/tests/baselines/reference/ambientStatement1.types b/tests/baselines/reference/ambientStatement1.types index 8a8ffb75c2772..3668d8589fb1c 100644 --- a/tests/baselines/reference/ambientStatement1.types +++ b/tests/baselines/reference/ambientStatement1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/ambientStatement1.ts] //// === ambientStatement1.ts === - declare module M1 { + declare namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/ambientWithStatements.errors.txt b/tests/baselines/reference/ambientWithStatements.errors.txt index 5201538571011..bef1bb8c98da0 100644 --- a/tests/baselines/reference/ambientWithStatements.errors.txt +++ b/tests/baselines/reference/ambientWithStatements.errors.txt @@ -5,7 +5,7 @@ ambientWithStatements.ts(25,5): error TS2410: The 'with' statement is not suppor ==== ambientWithStatements.ts (4 errors) ==== - declare module M { + declare namespace M { break; ~~~~~ !!! error TS1036: Statements are not allowed in ambient contexts. diff --git a/tests/baselines/reference/ambientWithStatements.js b/tests/baselines/reference/ambientWithStatements.js index c2d3d23364702..d56d11b02142e 100644 --- a/tests/baselines/reference/ambientWithStatements.js +++ b/tests/baselines/reference/ambientWithStatements.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/ambientWithStatements.ts] //// //// [ambientWithStatements.ts] -declare module M { +declare namespace M { break; continue; debugger; diff --git a/tests/baselines/reference/ambientWithStatements.symbols b/tests/baselines/reference/ambientWithStatements.symbols index bf545c56ea676..9442562aa5e3e 100644 --- a/tests/baselines/reference/ambientWithStatements.symbols +++ b/tests/baselines/reference/ambientWithStatements.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/ambientWithStatements.ts] //// === ambientWithStatements.ts === -declare module M { +declare namespace M { >M : Symbol(M, Decl(ambientWithStatements.ts, 0, 0)) break; diff --git a/tests/baselines/reference/ambientWithStatements.types b/tests/baselines/reference/ambientWithStatements.types index 08a144a7a60df..b980ece7ef31d 100644 --- a/tests/baselines/reference/ambientWithStatements.types +++ b/tests/baselines/reference/ambientWithStatements.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/ambientWithStatements.ts] //// === ambientWithStatements.ts === -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js index c6f5699f6d1ae..89128a66b616a 100644 --- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js +++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js @@ -11,7 +11,7 @@ export interface I1 { age: number; } -export module M1 { +export namespace M1 { export interface I2 { foo: string; } diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.symbols b/tests/baselines/reference/amdImportNotAsPrimaryExpression.symbols index 9b11d1ba4e0b8..2e885c2f14ca8 100644 --- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.symbols +++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.symbols @@ -13,7 +13,7 @@ import f = foo.M1; var i: f.I2; >i : Symbol(i, Decl(foo_1.ts, 3, 3)) >f : Symbol(f, Decl(foo_1.ts, 0, 32)) ->I2 : Symbol(f.I2, Decl(foo_0.ts, 10, 18)) +>I2 : Symbol(f.I2, Decl(foo_0.ts, 10, 21)) var x: foo.C1 = <{m1: number}>{}; >x : Symbol(x, Decl(foo_1.ts, 4, 3)) @@ -33,7 +33,7 @@ var z: foo.M1.I2; >z : Symbol(z, Decl(foo_1.ts, 6, 3)) >foo : Symbol(foo, Decl(foo_1.ts, 0, 0)) >M1 : Symbol(foo.M1, Decl(foo_0.ts, 8, 1)) ->I2 : Symbol(f.I2, Decl(foo_0.ts, 10, 18)) +>I2 : Symbol(f.I2, Decl(foo_0.ts, 10, 21)) var e: number = 0; >e : Symbol(e, Decl(foo_1.ts, 7, 3)) @@ -61,11 +61,11 @@ export interface I1 { >age : Symbol(I1.age, Decl(foo_0.ts, 6, 14)) } -export module M1 { +export namespace M1 { >M1 : Symbol(M1, Decl(foo_0.ts, 8, 1)) export interface I2 { ->I2 : Symbol(I2, Decl(foo_0.ts, 10, 18)) +>I2 : Symbol(I2, Decl(foo_0.ts, 10, 21)) foo: string; >foo : Symbol(I2.foo, Decl(foo_0.ts, 11, 22)) diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.types b/tests/baselines/reference/amdImportNotAsPrimaryExpression.types index 1a62f69c11011..1c08de7c3b075 100644 --- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.types +++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.types @@ -94,7 +94,7 @@ export interface I1 { > : ^^^^^^ } -export module M1 { +export namespace M1 { export interface I2 { foo: string; >foo : string diff --git a/tests/baselines/reference/anonterface.js b/tests/baselines/reference/anonterface.js index 76e205aeefaa1..d3f0b19d15683 100644 --- a/tests/baselines/reference/anonterface.js +++ b/tests/baselines/reference/anonterface.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/anonterface.ts] //// //// [anonterface.ts] -module M { +namespace M { export class C { m(fn:{ (n:number):string; },n2:number):string { return fn(n2); diff --git a/tests/baselines/reference/anonterface.symbols b/tests/baselines/reference/anonterface.symbols index 5491336c74534..e7149ac3b4557 100644 --- a/tests/baselines/reference/anonterface.symbols +++ b/tests/baselines/reference/anonterface.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/anonterface.ts] //// === anonterface.ts === -module M { +namespace M { >M : Symbol(M, Decl(anonterface.ts, 0, 0)) export class C { ->C : Symbol(C, Decl(anonterface.ts, 0, 10)) +>C : Symbol(C, Decl(anonterface.ts, 0, 13)) m(fn:{ (n:number):string; },n2:number):string { >m : Symbol(C.m, Decl(anonterface.ts, 1, 20)) @@ -22,9 +22,9 @@ module M { var c=new M.C(); >c : Symbol(c, Decl(anonterface.ts, 8, 3)) ->M.C : Symbol(M.C, Decl(anonterface.ts, 0, 10)) +>M.C : Symbol(M.C, Decl(anonterface.ts, 0, 13)) >M : Symbol(M, Decl(anonterface.ts, 0, 0)) ->C : Symbol(M.C, Decl(anonterface.ts, 0, 10)) +>C : Symbol(M.C, Decl(anonterface.ts, 0, 13)) c.m(function(n) { return "hello: "+n; },18); >c.m : Symbol(M.C.m, Decl(anonterface.ts, 1, 20)) diff --git a/tests/baselines/reference/anonterface.types b/tests/baselines/reference/anonterface.types index 8ffba4e4acfac..27983c97eecee 100644 --- a/tests/baselines/reference/anonterface.types +++ b/tests/baselines/reference/anonterface.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/anonterface.ts] //// === anonterface.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/anyAssignabilityInInheritance.js b/tests/baselines/reference/anyAssignabilityInInheritance.js index 1cb580caee7e2..e875dd54df978 100644 --- a/tests/baselines/reference/anyAssignabilityInInheritance.js +++ b/tests/baselines/reference/anyAssignabilityInInheritance.js @@ -67,7 +67,7 @@ declare function foo14(x: any): any; var r3 = foo3(a); // any function f() { } -module f { +namespace f { export var bar = 1; } declare function foo15(x: typeof f): typeof f; @@ -75,7 +75,7 @@ declare function foo15(x: any): any; var r3 = foo3(a); // any class CC { baz: string } -module CC { +namespace CC { export var bar = 1; } declare function foo16(x: CC): CC; diff --git a/tests/baselines/reference/anyAssignabilityInInheritance.symbols b/tests/baselines/reference/anyAssignabilityInInheritance.symbols index 57ddd85d22898..6ab7a174cf5bb 100644 --- a/tests/baselines/reference/anyAssignabilityInInheritance.symbols +++ b/tests/baselines/reference/anyAssignabilityInInheritance.symbols @@ -230,7 +230,7 @@ var r3 = foo3(a); // any function f() { } >f : Symbol(f, Decl(anyAssignabilityInInheritance.ts, 63, 17), Decl(anyAssignabilityInInheritance.ts, 65, 16)) -module f { +namespace f { >f : Symbol(f, Decl(anyAssignabilityInInheritance.ts, 63, 17), Decl(anyAssignabilityInInheritance.ts, 65, 16)) export var bar = 1; @@ -255,7 +255,7 @@ class CC { baz: string } >CC : Symbol(CC, Decl(anyAssignabilityInInheritance.ts, 71, 17), Decl(anyAssignabilityInInheritance.ts, 73, 24)) >baz : Symbol(CC.baz, Decl(anyAssignabilityInInheritance.ts, 73, 10)) -module CC { +namespace CC { >CC : Symbol(CC, Decl(anyAssignabilityInInheritance.ts, 71, 17), Decl(anyAssignabilityInInheritance.ts, 73, 24)) export var bar = 1; diff --git a/tests/baselines/reference/anyAssignabilityInInheritance.types b/tests/baselines/reference/anyAssignabilityInInheritance.types index 9d3dfd809172f..a6f9ea2c42af5 100644 --- a/tests/baselines/reference/anyAssignabilityInInheritance.types +++ b/tests/baselines/reference/anyAssignabilityInInheritance.types @@ -285,7 +285,7 @@ function f() { } >f : typeof f > : ^^^^^^^^ -module f { +namespace f { >f : typeof f > : ^^^^^^^^ @@ -323,7 +323,7 @@ class CC { baz: string } >baz : string > : ^^^^^^ -module CC { +namespace CC { >CC : typeof CC > : ^^^^^^^^^ diff --git a/tests/baselines/reference/anyAssignableToEveryType2.js b/tests/baselines/reference/anyAssignableToEveryType2.js index 10c5d2982cd42..df6b6d02678f3 100644 --- a/tests/baselines/reference/anyAssignableToEveryType2.js +++ b/tests/baselines/reference/anyAssignableToEveryType2.js @@ -89,7 +89,7 @@ interface I14 { function f() { } -module f { +namespace f { export var bar = 1; } interface I15 { @@ -99,7 +99,7 @@ interface I15 { class c { baz: string } -module c { +namespace c { export var bar = 1; } interface I16 { diff --git a/tests/baselines/reference/anyAssignableToEveryType2.symbols b/tests/baselines/reference/anyAssignableToEveryType2.symbols index c9a7a4e8746c9..a29f7353c5c11 100644 --- a/tests/baselines/reference/anyAssignableToEveryType2.symbols +++ b/tests/baselines/reference/anyAssignableToEveryType2.symbols @@ -184,7 +184,7 @@ interface I14 { function f() { } >f : Symbol(f, Decl(anyAssignableToEveryType2.ts, 84, 1), Decl(anyAssignableToEveryType2.ts, 87, 16)) -module f { +namespace f { >f : Symbol(f, Decl(anyAssignableToEveryType2.ts, 84, 1), Decl(anyAssignableToEveryType2.ts, 87, 16)) export var bar = 1; @@ -206,7 +206,7 @@ class c { baz: string } >c : Symbol(c, Decl(anyAssignableToEveryType2.ts, 94, 1), Decl(anyAssignableToEveryType2.ts, 97, 23)) >baz : Symbol(c.baz, Decl(anyAssignableToEveryType2.ts, 97, 9)) -module c { +namespace c { >c : Symbol(c, Decl(anyAssignableToEveryType2.ts, 94, 1), Decl(anyAssignableToEveryType2.ts, 97, 23)) export var bar = 1; diff --git a/tests/baselines/reference/anyAssignableToEveryType2.types b/tests/baselines/reference/anyAssignableToEveryType2.types index 00d846e345155..85d9109ff84bd 100644 --- a/tests/baselines/reference/anyAssignableToEveryType2.types +++ b/tests/baselines/reference/anyAssignableToEveryType2.types @@ -168,7 +168,7 @@ function f() { } >f : typeof f > : ^^^^^^^^ -module f { +namespace f { >f : typeof f > : ^^^^^^^^ @@ -196,7 +196,7 @@ class c { baz: string } >baz : string > : ^^^^^^ -module c { +namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/anyDeclare.errors.txt b/tests/baselines/reference/anyDeclare.errors.txt index cfbb06ee70413..2423c2c43cef7 100644 --- a/tests/baselines/reference/anyDeclare.errors.txt +++ b/tests/baselines/reference/anyDeclare.errors.txt @@ -4,7 +4,7 @@ anyDeclare.ts(4,14): error TS2300: Duplicate identifier 'myFn'. ==== anyDeclare.ts (2 errors) ==== declare var x: any; - module myMod { + namespace myMod { var myFn; ~~~~ !!! error TS2300: Duplicate identifier 'myFn'. diff --git a/tests/baselines/reference/anyDeclare.js b/tests/baselines/reference/anyDeclare.js index 295e93e72eebc..6e16859b59892 100644 --- a/tests/baselines/reference/anyDeclare.js +++ b/tests/baselines/reference/anyDeclare.js @@ -2,7 +2,7 @@ //// [anyDeclare.ts] declare var x: any; -module myMod { +namespace myMod { var myFn; function myFn() { } } diff --git a/tests/baselines/reference/anyDeclare.symbols b/tests/baselines/reference/anyDeclare.symbols index 56d3e51027a7d..fecba41fa2b31 100644 --- a/tests/baselines/reference/anyDeclare.symbols +++ b/tests/baselines/reference/anyDeclare.symbols @@ -4,7 +4,7 @@ declare var x: any; >x : Symbol(x, Decl(anyDeclare.ts, 0, 11)) -module myMod { +namespace myMod { >myMod : Symbol(myMod, Decl(anyDeclare.ts, 0, 19)) var myFn; diff --git a/tests/baselines/reference/anyDeclare.types b/tests/baselines/reference/anyDeclare.types index fdb5ed4f5b70e..c5634cd4017d7 100644 --- a/tests/baselines/reference/anyDeclare.types +++ b/tests/baselines/reference/anyDeclare.types @@ -5,7 +5,7 @@ declare var x: any; >x : any > : ^^^ -module myMod { +namespace myMod { >myMod : typeof myMod > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/arrayAssignmentTest5.errors.txt b/tests/baselines/reference/arrayAssignmentTest5.errors.txt index a8263630deaa9..ffbb476fe8d4c 100644 --- a/tests/baselines/reference/arrayAssignmentTest5.errors.txt +++ b/tests/baselines/reference/arrayAssignmentTest5.errors.txt @@ -3,7 +3,7 @@ arrayAssignmentTest5.ts(23,17): error TS2322: Type 'IToken[]' is not assignable ==== arrayAssignmentTest5.ts (1 errors) ==== - module Test { + namespace Test { interface IState { } interface IToken { diff --git a/tests/baselines/reference/arrayAssignmentTest5.js b/tests/baselines/reference/arrayAssignmentTest5.js index 124a5be14b29c..af4f52ed5a192 100644 --- a/tests/baselines/reference/arrayAssignmentTest5.js +++ b/tests/baselines/reference/arrayAssignmentTest5.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/arrayAssignmentTest5.ts] //// //// [arrayAssignmentTest5.ts] -module Test { +namespace Test { interface IState { } interface IToken { diff --git a/tests/baselines/reference/arrayAssignmentTest5.symbols b/tests/baselines/reference/arrayAssignmentTest5.symbols index 6ec2d24f201ac..98578cb028ad2 100644 --- a/tests/baselines/reference/arrayAssignmentTest5.symbols +++ b/tests/baselines/reference/arrayAssignmentTest5.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/arrayAssignmentTest5.ts] //// === arrayAssignmentTest5.ts === -module Test { +namespace Test { >Test : Symbol(Test, Decl(arrayAssignmentTest5.ts, 0, 0)) interface IState { ->IState : Symbol(IState, Decl(arrayAssignmentTest5.ts, 0, 13)) +>IState : Symbol(IState, Decl(arrayAssignmentTest5.ts, 0, 16)) } interface IToken { >IToken : Symbol(IToken, Decl(arrayAssignmentTest5.ts, 2, 5)) @@ -19,7 +19,7 @@ module Test { state: IState; >state : Symbol(IStateToken.state, Decl(arrayAssignmentTest5.ts, 6, 42)) ->IState : Symbol(IState, Decl(arrayAssignmentTest5.ts, 0, 13)) +>IState : Symbol(IState, Decl(arrayAssignmentTest5.ts, 0, 16)) } interface ILineTokens { >ILineTokens : Symbol(ILineTokens, Decl(arrayAssignmentTest5.ts, 8, 5)) @@ -30,7 +30,7 @@ module Test { endState: IState; >endState : Symbol(ILineTokens.endState, Decl(arrayAssignmentTest5.ts, 10, 25)) ->IState : Symbol(IState, Decl(arrayAssignmentTest5.ts, 0, 13)) +>IState : Symbol(IState, Decl(arrayAssignmentTest5.ts, 0, 16)) } interface IAction { >IAction : Symbol(IAction, Decl(arrayAssignmentTest5.ts, 12, 5)) @@ -42,7 +42,7 @@ module Test { >onEnter : Symbol(IMode.onEnter, Decl(arrayAssignmentTest5.ts, 15, 21)) >line : Symbol(line, Decl(arrayAssignmentTest5.ts, 16, 16)) >state : Symbol(state, Decl(arrayAssignmentTest5.ts, 16, 28)) ->IState : Symbol(IState, Decl(arrayAssignmentTest5.ts, 0, 13)) +>IState : Symbol(IState, Decl(arrayAssignmentTest5.ts, 0, 16)) >offset : Symbol(offset, Decl(arrayAssignmentTest5.ts, 16, 42)) >IAction : Symbol(IAction, Decl(arrayAssignmentTest5.ts, 12, 5)) @@ -50,7 +50,7 @@ module Test { >tokenize : Symbol(IMode.tokenize, Decl(arrayAssignmentTest5.ts, 16, 66)) >line : Symbol(line, Decl(arrayAssignmentTest5.ts, 17, 17)) >state : Symbol(state, Decl(arrayAssignmentTest5.ts, 17, 29)) ->IState : Symbol(IState, Decl(arrayAssignmentTest5.ts, 0, 13)) +>IState : Symbol(IState, Decl(arrayAssignmentTest5.ts, 0, 16)) >includeStates : Symbol(includeStates, Decl(arrayAssignmentTest5.ts, 17, 43)) >ILineTokens : Symbol(ILineTokens, Decl(arrayAssignmentTest5.ts, 8, 5)) } @@ -62,7 +62,7 @@ module Test { >onEnter : Symbol(Bug.onEnter, Decl(arrayAssignmentTest5.ts, 19, 39)) >line : Symbol(line, Decl(arrayAssignmentTest5.ts, 20, 23)) >state : Symbol(state, Decl(arrayAssignmentTest5.ts, 20, 35)) ->IState : Symbol(IState, Decl(arrayAssignmentTest5.ts, 0, 13)) +>IState : Symbol(IState, Decl(arrayAssignmentTest5.ts, 0, 16)) >offset : Symbol(offset, Decl(arrayAssignmentTest5.ts, 20, 49)) >IAction : Symbol(IAction, Decl(arrayAssignmentTest5.ts, 12, 5)) @@ -100,7 +100,7 @@ module Test { >tokenize : Symbol(Bug.tokenize, Decl(arrayAssignmentTest5.ts, 26, 9)) >line : Symbol(line, Decl(arrayAssignmentTest5.ts, 27, 24)) >state : Symbol(state, Decl(arrayAssignmentTest5.ts, 27, 36)) ->IState : Symbol(IState, Decl(arrayAssignmentTest5.ts, 0, 13)) +>IState : Symbol(IState, Decl(arrayAssignmentTest5.ts, 0, 16)) >includeStates : Symbol(includeStates, Decl(arrayAssignmentTest5.ts, 27, 50)) >ILineTokens : Symbol(ILineTokens, Decl(arrayAssignmentTest5.ts, 8, 5)) diff --git a/tests/baselines/reference/arrayAssignmentTest5.types b/tests/baselines/reference/arrayAssignmentTest5.types index 66d7ddf30c234..5e78cb10e9e94 100644 --- a/tests/baselines/reference/arrayAssignmentTest5.types +++ b/tests/baselines/reference/arrayAssignmentTest5.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/arrayAssignmentTest5.ts] //// === arrayAssignmentTest5.ts === -module Test { +namespace Test { >Test : typeof Test > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/arrayAssignmentTest6.js b/tests/baselines/reference/arrayAssignmentTest6.js index 6e8c2ab306b73..f00581c93f8e3 100644 --- a/tests/baselines/reference/arrayAssignmentTest6.js +++ b/tests/baselines/reference/arrayAssignmentTest6.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/arrayAssignmentTest6.ts] //// //// [arrayAssignmentTest6.ts] -module Test { +namespace Test { interface IState { } interface IToken { diff --git a/tests/baselines/reference/arrayAssignmentTest6.symbols b/tests/baselines/reference/arrayAssignmentTest6.symbols index d41afbb82d57e..0bbcc562b993f 100644 --- a/tests/baselines/reference/arrayAssignmentTest6.symbols +++ b/tests/baselines/reference/arrayAssignmentTest6.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/arrayAssignmentTest6.ts] //// === arrayAssignmentTest6.ts === -module Test { +namespace Test { >Test : Symbol(Test, Decl(arrayAssignmentTest6.ts, 0, 0)) interface IState { ->IState : Symbol(IState, Decl(arrayAssignmentTest6.ts, 0, 13)) +>IState : Symbol(IState, Decl(arrayAssignmentTest6.ts, 0, 16)) } interface IToken { >IToken : Symbol(IToken, Decl(arrayAssignmentTest6.ts, 2, 5)) @@ -22,7 +22,7 @@ module Test { endState: IState; >endState : Symbol(ILineTokens.endState, Decl(arrayAssignmentTest6.ts, 7, 25)) ->IState : Symbol(IState, Decl(arrayAssignmentTest6.ts, 0, 13)) +>IState : Symbol(IState, Decl(arrayAssignmentTest6.ts, 0, 16)) } interface IMode { >IMode : Symbol(IMode, Decl(arrayAssignmentTest6.ts, 9, 5)) @@ -31,7 +31,7 @@ module Test { >tokenize : Symbol(IMode.tokenize, Decl(arrayAssignmentTest6.ts, 10, 21)) >line : Symbol(line, Decl(arrayAssignmentTest6.ts, 11, 17)) >state : Symbol(state, Decl(arrayAssignmentTest6.ts, 11, 29)) ->IState : Symbol(IState, Decl(arrayAssignmentTest6.ts, 0, 13)) +>IState : Symbol(IState, Decl(arrayAssignmentTest6.ts, 0, 16)) >includeStates : Symbol(includeStates, Decl(arrayAssignmentTest6.ts, 11, 43)) >ILineTokens : Symbol(ILineTokens, Decl(arrayAssignmentTest6.ts, 5, 5)) } diff --git a/tests/baselines/reference/arrayAssignmentTest6.types b/tests/baselines/reference/arrayAssignmentTest6.types index 688bc39cc8e51..339e8b99df93d 100644 --- a/tests/baselines/reference/arrayAssignmentTest6.types +++ b/tests/baselines/reference/arrayAssignmentTest6.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/arrayAssignmentTest6.ts] //// === arrayAssignmentTest6.ts === -module Test { +namespace Test { >Test : typeof Test > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/arrayBestCommonTypes.js b/tests/baselines/reference/arrayBestCommonTypes.js index 530ae4fcbbfcb..e54bf00b8779d 100644 --- a/tests/baselines/reference/arrayBestCommonTypes.js +++ b/tests/baselines/reference/arrayBestCommonTypes.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/arrayBestCommonTypes.ts] //// //// [arrayBestCommonTypes.ts] -module EmptyTypes { +namespace EmptyTypes { interface iface { } class base implements iface { } class base2 implements iface { } @@ -54,7 +54,7 @@ module EmptyTypes { } } -module NonEmptyTypes { +namespace NonEmptyTypes { interface iface { x: string; } class base implements iface { x: string; y: string; } class base2 implements iface { x: string; z: string; } diff --git a/tests/baselines/reference/arrayBestCommonTypes.symbols b/tests/baselines/reference/arrayBestCommonTypes.symbols index 2e4d5fbdb3f42..2ad95c4749b63 100644 --- a/tests/baselines/reference/arrayBestCommonTypes.symbols +++ b/tests/baselines/reference/arrayBestCommonTypes.symbols @@ -1,19 +1,19 @@ //// [tests/cases/compiler/arrayBestCommonTypes.ts] //// === arrayBestCommonTypes.ts === -module EmptyTypes { +namespace EmptyTypes { >EmptyTypes : Symbol(EmptyTypes, Decl(arrayBestCommonTypes.ts, 0, 0)) interface iface { } ->iface : Symbol(iface, Decl(arrayBestCommonTypes.ts, 0, 19)) +>iface : Symbol(iface, Decl(arrayBestCommonTypes.ts, 0, 22)) class base implements iface { } >base : Symbol(base, Decl(arrayBestCommonTypes.ts, 1, 23)) ->iface : Symbol(iface, Decl(arrayBestCommonTypes.ts, 0, 19)) +>iface : Symbol(iface, Decl(arrayBestCommonTypes.ts, 0, 22)) class base2 implements iface { } >base2 : Symbol(base2, Decl(arrayBestCommonTypes.ts, 2, 35)) ->iface : Symbol(iface, Decl(arrayBestCommonTypes.ts, 0, 19)) +>iface : Symbol(iface, Decl(arrayBestCommonTypes.ts, 0, 22)) class derived extends base { } >derived : Symbol(derived, Decl(arrayBestCommonTypes.ts, 3, 36)) @@ -191,7 +191,7 @@ module EmptyTypes { var ifaceObj: iface = null; >ifaceObj : Symbol(ifaceObj, Decl(arrayBestCommonTypes.ts, 41, 15)) ->iface : Symbol(iface, Decl(arrayBestCommonTypes.ts, 0, 19)) +>iface : Symbol(iface, Decl(arrayBestCommonTypes.ts, 0, 22)) var baseObj = new base(); >baseObj : Symbol(baseObj, Decl(arrayBestCommonTypes.ts, 42, 15)) @@ -228,22 +228,22 @@ module EmptyTypes { } } -module NonEmptyTypes { +namespace NonEmptyTypes { >NonEmptyTypes : Symbol(NonEmptyTypes, Decl(arrayBestCommonTypes.ts, 51, 1)) interface iface { x: string; } ->iface : Symbol(iface, Decl(arrayBestCommonTypes.ts, 53, 22)) +>iface : Symbol(iface, Decl(arrayBestCommonTypes.ts, 53, 25)) >x : Symbol(iface.x, Decl(arrayBestCommonTypes.ts, 54, 21)) class base implements iface { x: string; y: string; } >base : Symbol(base, Decl(arrayBestCommonTypes.ts, 54, 34)) ->iface : Symbol(iface, Decl(arrayBestCommonTypes.ts, 53, 22)) +>iface : Symbol(iface, Decl(arrayBestCommonTypes.ts, 53, 25)) >x : Symbol(base.x, Decl(arrayBestCommonTypes.ts, 55, 33)) >y : Symbol(base.y, Decl(arrayBestCommonTypes.ts, 55, 44)) class base2 implements iface { x: string; z: string; } >base2 : Symbol(base2, Decl(arrayBestCommonTypes.ts, 55, 57)) ->iface : Symbol(iface, Decl(arrayBestCommonTypes.ts, 53, 22)) +>iface : Symbol(iface, Decl(arrayBestCommonTypes.ts, 53, 25)) >x : Symbol(base2.x, Decl(arrayBestCommonTypes.ts, 56, 34)) >z : Symbol(base2.z, Decl(arrayBestCommonTypes.ts, 56, 45)) @@ -424,7 +424,7 @@ module NonEmptyTypes { var ifaceObj: iface = null; >ifaceObj : Symbol(ifaceObj, Decl(arrayBestCommonTypes.ts, 94, 15)) ->iface : Symbol(iface, Decl(arrayBestCommonTypes.ts, 53, 22)) +>iface : Symbol(iface, Decl(arrayBestCommonTypes.ts, 53, 25)) var baseObj = new base(); >baseObj : Symbol(baseObj, Decl(arrayBestCommonTypes.ts, 95, 15)) diff --git a/tests/baselines/reference/arrayBestCommonTypes.types b/tests/baselines/reference/arrayBestCommonTypes.types index 2ed7f2c9d8fa3..510e6e7ddd913 100644 --- a/tests/baselines/reference/arrayBestCommonTypes.types +++ b/tests/baselines/reference/arrayBestCommonTypes.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/arrayBestCommonTypes.ts] //// === arrayBestCommonTypes.ts === -module EmptyTypes { +namespace EmptyTypes { >EmptyTypes : typeof EmptyTypes > : ^^^^^^^^^^^^^^^^^ @@ -670,7 +670,7 @@ module EmptyTypes { } } -module NonEmptyTypes { +namespace NonEmptyTypes { >NonEmptyTypes : typeof NonEmptyTypes > : ^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/arraySigChecking.errors.txt b/tests/baselines/reference/arraySigChecking.errors.txt index e1b1746de5889..d39a86ec11622 100644 --- a/tests/baselines/reference/arraySigChecking.errors.txt +++ b/tests/baselines/reference/arraySigChecking.errors.txt @@ -5,7 +5,7 @@ arraySigChecking.ts(22,16): error TS2322: Type 'number' is not assignable to typ ==== arraySigChecking.ts (4 errors) ==== - declare module M { + declare namespace M { interface iBar { t: any; } interface iFoo extends iBar { s: any; diff --git a/tests/baselines/reference/arraySigChecking.js b/tests/baselines/reference/arraySigChecking.js index f83b5bb3b75fe..12b13af0ef452 100644 --- a/tests/baselines/reference/arraySigChecking.js +++ b/tests/baselines/reference/arraySigChecking.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/arraySigChecking.ts] //// //// [arraySigChecking.ts] -declare module M { +declare namespace M { interface iBar { t: any; } interface iFoo extends iBar { s: any; diff --git a/tests/baselines/reference/arraySigChecking.symbols b/tests/baselines/reference/arraySigChecking.symbols index 10c48f6e6b216..d0bccb238507a 100644 --- a/tests/baselines/reference/arraySigChecking.symbols +++ b/tests/baselines/reference/arraySigChecking.symbols @@ -1,16 +1,16 @@ //// [tests/cases/compiler/arraySigChecking.ts] //// === arraySigChecking.ts === -declare module M { +declare namespace M { >M : Symbol(M, Decl(arraySigChecking.ts, 0, 0)) interface iBar { t: any; } ->iBar : Symbol(iBar, Decl(arraySigChecking.ts, 0, 18)) +>iBar : Symbol(iBar, Decl(arraySigChecking.ts, 0, 21)) >t : Symbol(iBar.t, Decl(arraySigChecking.ts, 1, 20)) interface iFoo extends iBar { >iFoo : Symbol(iFoo, Decl(arraySigChecking.ts, 1, 30)) ->iBar : Symbol(iBar, Decl(arraySigChecking.ts, 0, 18)) +>iBar : Symbol(iBar, Decl(arraySigChecking.ts, 0, 21)) s: any; >s : Symbol(iFoo.s, Decl(arraySigChecking.ts, 2, 33)) diff --git a/tests/baselines/reference/arraySigChecking.types b/tests/baselines/reference/arraySigChecking.types index 0161cac12d147..e06a70c576933 100644 --- a/tests/baselines/reference/arraySigChecking.types +++ b/tests/baselines/reference/arraySigChecking.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/arraySigChecking.ts] //// === arraySigChecking.ts === -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.js b/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.js index cffc71656bdb0..b99e5e949b615 100644 --- a/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.js +++ b/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.js @@ -1,12 +1,12 @@ //// [tests/cases/compiler/arrayTypeInSignatureOfInterfaceAndClass.ts] //// //// [arrayTypeInSignatureOfInterfaceAndClass.ts] -declare module WinJS { +declare namespace WinJS { class Promise { then(success?: (value: T) => Promise, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; } } -declare module Data { +declare namespace Data { export interface IListItem { itemIndex: number; key: any; diff --git a/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.symbols b/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.symbols index 263bb0d26b886..0ada87f0c08b0 100644 --- a/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.symbols +++ b/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/arrayTypeInSignatureOfInterfaceAndClass.ts] //// === arrayTypeInSignatureOfInterfaceAndClass.ts === -declare module WinJS { +declare namespace WinJS { >WinJS : Symbol(WinJS, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 0, 0)) class Promise { ->Promise : Symbol(Promise, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 0, 22)) +>Promise : Symbol(Promise, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 0, 25)) >T : Symbol(T, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 1, 18)) then(success?: (value: T) => Promise, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; @@ -14,23 +14,23 @@ declare module WinJS { >success : Symbol(success, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 2, 16)) >value : Symbol(value, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 2, 27)) >T : Symbol(T, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 1, 18)) ->Promise : Symbol(Promise, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 0, 22)) +>Promise : Symbol(Promise, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 0, 25)) >U : Symbol(U, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 2, 13)) >error : Symbol(error, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 2, 51)) >error : Symbol(error, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 2, 61)) ->Promise : Symbol(Promise, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 0, 22)) +>Promise : Symbol(Promise, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 0, 25)) >U : Symbol(U, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 2, 13)) >progress : Symbol(progress, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 2, 87)) >progress : Symbol(progress, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 2, 100)) ->Promise : Symbol(Promise, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 0, 22)) +>Promise : Symbol(Promise, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 0, 25)) >U : Symbol(U, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 2, 13)) } } -declare module Data { +declare namespace Data { >Data : Symbol(Data, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 4, 1)) export interface IListItem { ->IListItem : Symbol(IListItem, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 5, 21)) +>IListItem : Symbol(IListItem, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 5, 24)) >T : Symbol(T, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 6, 31)) itemIndex: number; @@ -68,8 +68,8 @@ declare module Data { >indices : Symbol(indices, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 18, 22)) >options : Symbol(options, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 18, 40)) >WinJS : Symbol(WinJS, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 0, 0)) ->Promise : Symbol(WinJS.Promise, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 0, 22)) ->IListItem : Symbol(IListItem, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 5, 21)) +>Promise : Symbol(WinJS.Promise, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 0, 25)) +>IListItem : Symbol(IListItem, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 5, 24)) >T : Symbol(T, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 16, 34)) } export class VirtualList implements IVirtualList { @@ -84,8 +84,8 @@ declare module Data { >indices : Symbol(indices, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 22, 29)) >options : Symbol(options, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 22, 47)) >WinJS : Symbol(WinJS, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 0, 0)) ->Promise : Symbol(WinJS.Promise, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 0, 22)) ->IListItem : Symbol(IListItem, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 5, 21)) +>Promise : Symbol(WinJS.Promise, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 0, 25)) +>IListItem : Symbol(IListItem, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 5, 24)) >T : Symbol(T, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 20, 29)) } } diff --git a/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.types b/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.types index 5c62a97c0fc12..86739b383a68f 100644 --- a/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.types +++ b/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/arrayTypeInSignatureOfInterfaceAndClass.ts] //// === arrayTypeInSignatureOfInterfaceAndClass.ts === -declare module WinJS { +declare namespace WinJS { >WinJS : typeof WinJS > : ^^^^^^^^^^^^ @@ -24,7 +24,7 @@ declare module WinJS { >progress : any } } -declare module Data { +declare namespace Data { >Data : typeof Data > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/arrowFunctionContexts.errors.txt b/tests/baselines/reference/arrowFunctionContexts.errors.txt index 1e27fe363487b..5d9a5ef323759 100644 --- a/tests/baselines/reference/arrowFunctionContexts.errors.txt +++ b/tests/baselines/reference/arrowFunctionContexts.errors.txt @@ -47,13 +47,13 @@ arrowFunctionContexts.ts(72,20): error TS2332: 'this' cannot be referenced in cu } // Arrow function as module variable initializer - module M { + namespace M { export var a = (s) => ''; var b = (s) => s; } // Repeat above for module members that are functions? (necessary to redo all of them?) - module M2 { + namespace M2 { // Arrow function used in with statement with (window) { ~~~~~~~~~~~~~ @@ -94,7 +94,7 @@ arrowFunctionContexts.ts(72,20): error TS2332: 'this' cannot be referenced in cu } // Arrow function as module variable initializer - module M { + namespace M { export var a = (s) => ''; var b = (s) => s; } diff --git a/tests/baselines/reference/arrowFunctionContexts.js b/tests/baselines/reference/arrowFunctionContexts.js index 7a80cd10d9c18..60d6fbb1f3b9b 100644 --- a/tests/baselines/reference/arrowFunctionContexts.js +++ b/tests/baselines/reference/arrowFunctionContexts.js @@ -35,13 +35,13 @@ enum E { } // Arrow function as module variable initializer -module M { +namespace M { export var a = (s) => ''; var b = (s) => s; } // Repeat above for module members that are functions? (necessary to redo all of them?) -module M2 { +namespace M2 { // Arrow function used in with statement with (window) { var p = () => this; @@ -76,7 +76,7 @@ module M2 { } // Arrow function as module variable initializer - module M { + namespace M { export var a = (s) => ''; var b = (s) => s; } diff --git a/tests/baselines/reference/arrowFunctionContexts.symbols b/tests/baselines/reference/arrowFunctionContexts.symbols index f940f2d3af5f8..3f0542e16a482 100644 --- a/tests/baselines/reference/arrowFunctionContexts.symbols +++ b/tests/baselines/reference/arrowFunctionContexts.symbols @@ -65,7 +65,7 @@ enum E { } // Arrow function as module variable initializer -module M { +namespace M { >M : Symbol(M, Decl(arrowFunctionContexts.ts, 31, 1)) export var a = (s) => ''; @@ -79,7 +79,7 @@ module M { } // Repeat above for module members that are functions? (necessary to redo all of them?) -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(arrowFunctionContexts.ts, 37, 1)) // Arrow function used in with statement @@ -146,7 +146,7 @@ module M2 { } // Arrow function as module variable initializer - module M { + namespace M { >M : Symbol(M, Decl(arrowFunctionContexts.ts, 72, 5)) export var a = (s) => ''; diff --git a/tests/baselines/reference/arrowFunctionContexts.types b/tests/baselines/reference/arrowFunctionContexts.types index d9b147d2034c8..e51d001d126a5 100644 --- a/tests/baselines/reference/arrowFunctionContexts.types +++ b/tests/baselines/reference/arrowFunctionContexts.types @@ -124,7 +124,7 @@ enum E { } // Arrow function as module variable initializer -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -150,7 +150,7 @@ module M { } // Repeat above for module members that are functions? (necessary to redo all of them?) -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ @@ -277,7 +277,7 @@ module M2 { } // Arrow function as module variable initializer - module M { + namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/arrowFunctionInExpressionStatement2.js b/tests/baselines/reference/arrowFunctionInExpressionStatement2.js index 188c0e00289fc..550a88228d8ba 100644 --- a/tests/baselines/reference/arrowFunctionInExpressionStatement2.js +++ b/tests/baselines/reference/arrowFunctionInExpressionStatement2.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/arrowFunctionInExpressionStatement2.ts] //// //// [arrowFunctionInExpressionStatement2.ts] -module M { +namespace M { () => 0; } diff --git a/tests/baselines/reference/arrowFunctionInExpressionStatement2.symbols b/tests/baselines/reference/arrowFunctionInExpressionStatement2.symbols index eeb19bb75981b..ebfd509178b5f 100644 --- a/tests/baselines/reference/arrowFunctionInExpressionStatement2.symbols +++ b/tests/baselines/reference/arrowFunctionInExpressionStatement2.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/arrowFunctionInExpressionStatement2.ts] //// === arrowFunctionInExpressionStatement2.ts === -module M { +namespace M { >M : Symbol(M, Decl(arrowFunctionInExpressionStatement2.ts, 0, 0)) () => 0; diff --git a/tests/baselines/reference/arrowFunctionInExpressionStatement2.types b/tests/baselines/reference/arrowFunctionInExpressionStatement2.types index 36afb92623522..30901dc7b9daf 100644 --- a/tests/baselines/reference/arrowFunctionInExpressionStatement2.types +++ b/tests/baselines/reference/arrowFunctionInExpressionStatement2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/arrowFunctionInExpressionStatement2.ts] //// === arrowFunctionInExpressionStatement2.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/arrowFunctionsMissingTokens.errors.txt b/tests/baselines/reference/arrowFunctionsMissingTokens.errors.txt index 925b762414f79..392b446b4d105 100644 --- a/tests/baselines/reference/arrowFunctionsMissingTokens.errors.txt +++ b/tests/baselines/reference/arrowFunctionsMissingTokens.errors.txt @@ -25,7 +25,7 @@ arrowFunctionsMissingTokens.ts(52,41): error TS1005: '=>' expected. ==== arrowFunctionsMissingTokens.ts (24 errors) ==== - module missingArrowsWithCurly { + namespace missingArrowsWithCurly { var a = () { }; ~ !!! error TS1005: '=>' expected. @@ -47,8 +47,8 @@ arrowFunctionsMissingTokens.ts(52,41): error TS1005: '=>' expected. !!! error TS1005: '=>' expected. } - module missingCurliesWithArrow { - module withStatement { + namespace missingCurliesWithArrow { + namespace withStatement { var a = () => var k = 10;}; ~~~ !!! error TS1005: '{' expected. @@ -74,7 +74,7 @@ arrowFunctionsMissingTokens.ts(52,41): error TS1005: '=>' expected. !!! error TS1005: '{' expected. } - module withoutStatement { + namespace withoutStatement { var a = () => }; ~ !!! error TS1109: Expression expected. @@ -105,7 +105,7 @@ arrowFunctionsMissingTokens.ts(52,41): error TS1005: '=>' expected. ~ !!! error TS1128: Declaration or statement expected. - module ce_nEst_pas_une_arrow_function { + namespace ce_nEst_pas_une_arrow_function { var a = (); ~ !!! error TS1109: Expression expected. @@ -127,7 +127,7 @@ arrowFunctionsMissingTokens.ts(52,41): error TS1005: '=>' expected. !!! error TS1005: '=>' expected. } - module okay { + namespace okay { var a = () => { }; var b = (): void => { } diff --git a/tests/baselines/reference/arrowFunctionsMissingTokens.js b/tests/baselines/reference/arrowFunctionsMissingTokens.js index e423794058bca..7b549aaf20f3c 100644 --- a/tests/baselines/reference/arrowFunctionsMissingTokens.js +++ b/tests/baselines/reference/arrowFunctionsMissingTokens.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/arrowFunctionsMissingTokens.ts] //// //// [arrowFunctionsMissingTokens.ts] -module missingArrowsWithCurly { +namespace missingArrowsWithCurly { var a = () { }; var b = (): void { } @@ -13,8 +13,8 @@ module missingArrowsWithCurly { var e = (x: number, y: string): void { }; } -module missingCurliesWithArrow { - module withStatement { +namespace missingCurliesWithArrow { + namespace withStatement { var a = () => var k = 10;}; var b = (): void => var k = 10;} @@ -28,7 +28,7 @@ module missingCurliesWithArrow { var f = () => var k = 10;} } - module withoutStatement { + namespace withoutStatement { var a = () => }; var b = (): void => } @@ -43,7 +43,7 @@ module missingCurliesWithArrow { } } -module ce_nEst_pas_une_arrow_function { +namespace ce_nEst_pas_une_arrow_function { var a = (); var b = (): void; @@ -55,7 +55,7 @@ module ce_nEst_pas_une_arrow_function { var e = (x: number, y: string): void; } -module okay { +namespace okay { var a = () => { }; var b = (): void => { } diff --git a/tests/baselines/reference/arrowFunctionsMissingTokens.symbols b/tests/baselines/reference/arrowFunctionsMissingTokens.symbols index fb67a28d3594a..10e0034c8eff9 100644 --- a/tests/baselines/reference/arrowFunctionsMissingTokens.symbols +++ b/tests/baselines/reference/arrowFunctionsMissingTokens.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/arrowFunctionsMissingTokens.ts] //// === arrowFunctionsMissingTokens.ts === -module missingArrowsWithCurly { +namespace missingArrowsWithCurly { >missingArrowsWithCurly : Symbol(missingArrowsWithCurly, Decl(arrowFunctionsMissingTokens.ts, 0, 0)) var a = () { }; @@ -25,11 +25,11 @@ module missingArrowsWithCurly { >y : Symbol(y, Decl(arrowFunctionsMissingTokens.ts, 9, 23)) } -module missingCurliesWithArrow { +namespace missingCurliesWithArrow { >missingCurliesWithArrow : Symbol(missingCurliesWithArrow, Decl(arrowFunctionsMissingTokens.ts, 10, 1)) - module withStatement { ->withStatement : Symbol(withStatement, Decl(arrowFunctionsMissingTokens.ts, 12, 32)) + namespace withStatement { +>withStatement : Symbol(withStatement, Decl(arrowFunctionsMissingTokens.ts, 12, 35)) var a = () => var k = 10;}; >a : Symbol(a, Decl(arrowFunctionsMissingTokens.ts, 14, 11)) @@ -61,7 +61,7 @@ module missingCurliesWithArrow { >k : Symbol(k, Decl(arrowFunctionsMissingTokens.ts, 24, 25)) } - module withoutStatement { + namespace withoutStatement { >withoutStatement : Symbol(withoutStatement, Decl(arrowFunctionsMissingTokens.ts, 25, 5)) var a = () => }; @@ -89,7 +89,7 @@ module missingCurliesWithArrow { } } -module ce_nEst_pas_une_arrow_function { +namespace ce_nEst_pas_une_arrow_function { >ce_nEst_pas_une_arrow_function : Symbol(ce_nEst_pas_une_arrow_function, Decl(arrowFunctionsMissingTokens.ts, 40, 1)) var a = (); @@ -112,7 +112,7 @@ module ce_nEst_pas_une_arrow_function { >y : Symbol(y, Decl(arrowFunctionsMissingTokens.ts, 51, 23)) } -module okay { +namespace okay { >okay : Symbol(okay, Decl(arrowFunctionsMissingTokens.ts, 52, 1)) var a = () => { }; diff --git a/tests/baselines/reference/arrowFunctionsMissingTokens.types b/tests/baselines/reference/arrowFunctionsMissingTokens.types index f1ef3be38cc80..3b47971359aad 100644 --- a/tests/baselines/reference/arrowFunctionsMissingTokens.types +++ b/tests/baselines/reference/arrowFunctionsMissingTokens.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/arrowFunctionsMissingTokens.ts] //// === arrowFunctionsMissingTokens.ts === -module missingArrowsWithCurly { +namespace missingArrowsWithCurly { >missingArrowsWithCurly : typeof missingArrowsWithCurly > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -46,11 +46,11 @@ module missingArrowsWithCurly { > : ^^^^^^ } -module missingCurliesWithArrow { +namespace missingCurliesWithArrow { >missingCurliesWithArrow : typeof missingCurliesWithArrow > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - module withStatement { + namespace withStatement { >withStatement : typeof withStatement > : ^^^^^^^^^^^^^^^^^^^^ @@ -125,7 +125,7 @@ module missingCurliesWithArrow { > : ^^ } - module withoutStatement { + namespace withoutStatement { >withoutStatement : typeof withoutStatement > : ^^^^^^^^^^^^^^^^^^^^^^^ @@ -189,7 +189,7 @@ module missingCurliesWithArrow { } } -module ce_nEst_pas_une_arrow_function { +namespace ce_nEst_pas_une_arrow_function { >ce_nEst_pas_une_arrow_function : typeof ce_nEst_pas_une_arrow_function > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -242,7 +242,7 @@ module ce_nEst_pas_une_arrow_function { > : ^^^ } -module okay { +namespace okay { >okay : typeof okay > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/asiPreventsParsingAsAmbientExternalModule02.js b/tests/baselines/reference/asiPreventsParsingAsAmbientExternalModule02.js index c42db2164fb43..be867624cc3b5 100644 --- a/tests/baselines/reference/asiPreventsParsingAsAmbientExternalModule02.js +++ b/tests/baselines/reference/asiPreventsParsingAsAmbientExternalModule02.js @@ -4,7 +4,7 @@ var declare: number; var module: string; -module container { +namespace container { declare // this is the identifier 'declare' module // this is the identifier 'module' "my external module" // this is just a string diff --git a/tests/baselines/reference/asiPreventsParsingAsAmbientExternalModule02.symbols b/tests/baselines/reference/asiPreventsParsingAsAmbientExternalModule02.symbols index 2c27bd59b915b..5dc05f1b7a862 100644 --- a/tests/baselines/reference/asiPreventsParsingAsAmbientExternalModule02.symbols +++ b/tests/baselines/reference/asiPreventsParsingAsAmbientExternalModule02.symbols @@ -7,7 +7,7 @@ var declare: number; var module: string; >module : Symbol(module, Decl(asiPreventsParsingAsAmbientExternalModule02.ts, 1, 3)) -module container { +namespace container { >container : Symbol(container, Decl(asiPreventsParsingAsAmbientExternalModule02.ts, 1, 19)) declare // this is the identifier 'declare' diff --git a/tests/baselines/reference/asiPreventsParsingAsAmbientExternalModule02.types b/tests/baselines/reference/asiPreventsParsingAsAmbientExternalModule02.types index 2b828b860e6c9..ff22c911ad7a0 100644 --- a/tests/baselines/reference/asiPreventsParsingAsAmbientExternalModule02.types +++ b/tests/baselines/reference/asiPreventsParsingAsAmbientExternalModule02.types @@ -9,7 +9,7 @@ var module: string; >module : string > : ^^^^^^ -module container { +namespace container { >container : typeof container > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/asiPreventsParsingAsNamespace04.errors.txt b/tests/baselines/reference/asiPreventsParsingAsNamespace04.errors.txt new file mode 100644 index 0000000000000..f660ba308682e --- /dev/null +++ b/tests/baselines/reference/asiPreventsParsingAsNamespace04.errors.txt @@ -0,0 +1,8 @@ +asiPreventsParsingAsNamespace04.ts(2,1): error TS2304: Cannot find name 'namespace'. + + +==== asiPreventsParsingAsNamespace04.ts (1 errors) ==== + let module = 10; + namespace in {} + ~~~~~~~~~ +!!! error TS2304: Cannot find name 'namespace'. \ No newline at end of file diff --git a/tests/baselines/reference/asiPreventsParsingAsNamespace04.js b/tests/baselines/reference/asiPreventsParsingAsNamespace04.js index 027b839404df2..6b2613cd272d1 100644 --- a/tests/baselines/reference/asiPreventsParsingAsNamespace04.js +++ b/tests/baselines/reference/asiPreventsParsingAsNamespace04.js @@ -2,8 +2,8 @@ //// [asiPreventsParsingAsNamespace04.ts] let module = 10; -module in {} +namespace in {} //// [asiPreventsParsingAsNamespace04.js] var module = 10; -module in {}; +namespace in {}; diff --git a/tests/baselines/reference/asiPreventsParsingAsNamespace04.symbols b/tests/baselines/reference/asiPreventsParsingAsNamespace04.symbols index 64818185e42f0..c2ef43fea158d 100644 --- a/tests/baselines/reference/asiPreventsParsingAsNamespace04.symbols +++ b/tests/baselines/reference/asiPreventsParsingAsNamespace04.symbols @@ -4,6 +4,4 @@ let module = 10; >module : Symbol(module, Decl(asiPreventsParsingAsNamespace04.ts, 0, 3)) -module in {} ->module : Symbol(module, Decl(asiPreventsParsingAsNamespace04.ts, 0, 3)) - +namespace in {} diff --git a/tests/baselines/reference/asiPreventsParsingAsNamespace04.types b/tests/baselines/reference/asiPreventsParsingAsNamespace04.types index 93d3b6662dd80..964cef9f6b09e 100644 --- a/tests/baselines/reference/asiPreventsParsingAsNamespace04.types +++ b/tests/baselines/reference/asiPreventsParsingAsNamespace04.types @@ -7,11 +7,11 @@ let module = 10; >10 : 10 > : ^^ -module in {} ->module in {} : boolean -> : ^^^^^^^ ->module : number -> : ^^^^^^ +namespace in {} +>namespace in {} : boolean +> : ^^^^^^^ +>namespace : any +> : ^^^ >{} : {} > : ^^ diff --git a/tests/baselines/reference/assign1.js b/tests/baselines/reference/assign1.js index af4babfa4a2e3..c39e15498381b 100644 --- a/tests/baselines/reference/assign1.js +++ b/tests/baselines/reference/assign1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assign1.ts] //// //// [assign1.ts] -module M { +namespace M { interface I { salt:number; pepper:number; diff --git a/tests/baselines/reference/assign1.symbols b/tests/baselines/reference/assign1.symbols index e620d27a420ef..ca637620df23a 100644 --- a/tests/baselines/reference/assign1.symbols +++ b/tests/baselines/reference/assign1.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assign1.ts] //// === assign1.ts === -module M { +namespace M { >M : Symbol(M, Decl(assign1.ts, 0, 0)) interface I { ->I : Symbol(I, Decl(assign1.ts, 0, 10)) +>I : Symbol(I, Decl(assign1.ts, 0, 13)) salt:number; >salt : Symbol(I.salt, Decl(assign1.ts, 1, 17)) @@ -16,7 +16,7 @@ module M { var x:I={salt:2,pepper:0}; >x : Symbol(x, Decl(assign1.ts, 6, 7)) ->I : Symbol(I, Decl(assign1.ts, 0, 10)) +>I : Symbol(I, Decl(assign1.ts, 0, 13)) >salt : Symbol(salt, Decl(assign1.ts, 6, 13)) >pepper : Symbol(pepper, Decl(assign1.ts, 6, 20)) } diff --git a/tests/baselines/reference/assign1.types b/tests/baselines/reference/assign1.types index b801da8afa8a3..526ce60953438 100644 --- a/tests/baselines/reference/assign1.types +++ b/tests/baselines/reference/assign1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assign1.ts] //// === assign1.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/assignAnyToEveryType.errors.txt b/tests/baselines/reference/assignAnyToEveryType.errors.txt index d0704bab7a465..989704f233cfa 100644 --- a/tests/baselines/reference/assignAnyToEveryType.errors.txt +++ b/tests/baselines/reference/assignAnyToEveryType.errors.txt @@ -38,7 +38,7 @@ assignAnyToEveryType.ts(41,1): error TS2631: Cannot assign to 'M' because it is var j: { (): string } = x; var j2: { (x: T): string } = x; - module M { + namespace M { export var foo = 1; } diff --git a/tests/baselines/reference/assignAnyToEveryType.js b/tests/baselines/reference/assignAnyToEveryType.js index c8514736c09e3..7d68f62e3d705 100644 --- a/tests/baselines/reference/assignAnyToEveryType.js +++ b/tests/baselines/reference/assignAnyToEveryType.js @@ -37,7 +37,7 @@ var i: I = x; var j: { (): string } = x; var j2: { (x: T): string } = x; -module M { +namespace M { export var foo = 1; } diff --git a/tests/baselines/reference/assignAnyToEveryType.symbols b/tests/baselines/reference/assignAnyToEveryType.symbols index c40ae5c4d1102..c0107174be1ea 100644 --- a/tests/baselines/reference/assignAnyToEveryType.symbols +++ b/tests/baselines/reference/assignAnyToEveryType.symbols @@ -94,7 +94,7 @@ var j2: { (x: T): string } = x; >T : Symbol(T, Decl(assignAnyToEveryType.ts, 34, 11)) >x : Symbol(x, Decl(assignAnyToEveryType.ts, 2, 3)) -module M { +namespace M { >M : Symbol(M, Decl(assignAnyToEveryType.ts, 34, 34)) export var foo = 1; diff --git a/tests/baselines/reference/assignAnyToEveryType.types b/tests/baselines/reference/assignAnyToEveryType.types index ae14349981f21..4ae28f385f96b 100644 --- a/tests/baselines/reference/assignAnyToEveryType.types +++ b/tests/baselines/reference/assignAnyToEveryType.types @@ -131,7 +131,7 @@ var j2: { (x: T): string } = x; >x : any > : ^^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/assignToExistingClass.errors.txt b/tests/baselines/reference/assignToExistingClass.errors.txt index aa2cfd5c1e952..0a8b913d0f439 100644 --- a/tests/baselines/reference/assignToExistingClass.errors.txt +++ b/tests/baselines/reference/assignToExistingClass.errors.txt @@ -2,7 +2,7 @@ assignToExistingClass.ts(8,13): error TS2629: Cannot assign to 'Mocked' because ==== assignToExistingClass.ts (1 errors) ==== - module Test { + namespace Test { class Mocked { myProp: string; } diff --git a/tests/baselines/reference/assignToExistingClass.js b/tests/baselines/reference/assignToExistingClass.js index 09e82d20b2a92..69b61d3eff57c 100644 --- a/tests/baselines/reference/assignToExistingClass.js +++ b/tests/baselines/reference/assignToExistingClass.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignToExistingClass.ts] //// //// [assignToExistingClass.ts] -module Test { +namespace Test { class Mocked { myProp: string; } diff --git a/tests/baselines/reference/assignToExistingClass.symbols b/tests/baselines/reference/assignToExistingClass.symbols index e089cd5c430dd..87cc1e454ab97 100644 --- a/tests/baselines/reference/assignToExistingClass.symbols +++ b/tests/baselines/reference/assignToExistingClass.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignToExistingClass.ts] //// === assignToExistingClass.ts === -module Test { +namespace Test { >Test : Symbol(Test, Decl(assignToExistingClass.ts, 0, 0)) class Mocked { ->Mocked : Symbol(Mocked, Decl(assignToExistingClass.ts, 0, 13)) +>Mocked : Symbol(Mocked, Decl(assignToExistingClass.ts, 0, 16)) myProp: string; >myProp : Symbol(Mocked.myProp, Decl(assignToExistingClass.ts, 1, 18)) @@ -18,8 +18,8 @@ module Test { >willThrowError : Symbol(Tester.willThrowError, Decl(assignToExistingClass.ts, 5, 18)) Mocked = Mocked || function () { // => Error: Invalid left-hand side of assignment expression. ->Mocked : Symbol(Mocked, Decl(assignToExistingClass.ts, 0, 13)) ->Mocked : Symbol(Mocked, Decl(assignToExistingClass.ts, 0, 13)) +>Mocked : Symbol(Mocked, Decl(assignToExistingClass.ts, 0, 16)) +>Mocked : Symbol(Mocked, Decl(assignToExistingClass.ts, 0, 16)) return { myProp: "test" }; >myProp : Symbol(myProp, Decl(assignToExistingClass.ts, 8, 24)) diff --git a/tests/baselines/reference/assignToExistingClass.types b/tests/baselines/reference/assignToExistingClass.types index ac535ab655391..e14f164fea297 100644 --- a/tests/baselines/reference/assignToExistingClass.types +++ b/tests/baselines/reference/assignToExistingClass.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignToExistingClass.ts] //// === assignToExistingClass.ts === -module Test { +namespace Test { >Test : typeof Test > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignToFn.errors.txt b/tests/baselines/reference/assignToFn.errors.txt index cc1b83bf65913..66f8276193720 100644 --- a/tests/baselines/reference/assignToFn.errors.txt +++ b/tests/baselines/reference/assignToFn.errors.txt @@ -2,7 +2,7 @@ assignToFn.ts(8,5): error TS2322: Type 'string' is not assignable to type '(n: n ==== assignToFn.ts (1 errors) ==== - module M { + namespace M { interface I { f(n:number):boolean; } diff --git a/tests/baselines/reference/assignToFn.js b/tests/baselines/reference/assignToFn.js index 13becfdcfef92..38f70b78b4ccb 100644 --- a/tests/baselines/reference/assignToFn.js +++ b/tests/baselines/reference/assignToFn.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignToFn.ts] //// //// [assignToFn.ts] -module M { +namespace M { interface I { f(n:number):boolean; } diff --git a/tests/baselines/reference/assignToFn.symbols b/tests/baselines/reference/assignToFn.symbols index cc7cbce689f20..d61556731a73c 100644 --- a/tests/baselines/reference/assignToFn.symbols +++ b/tests/baselines/reference/assignToFn.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignToFn.ts] //// === assignToFn.ts === -module M { +namespace M { >M : Symbol(M, Decl(assignToFn.ts, 0, 0)) interface I { ->I : Symbol(I, Decl(assignToFn.ts, 0, 10)) +>I : Symbol(I, Decl(assignToFn.ts, 0, 13)) f(n:number):boolean; >f : Symbol(I.f, Decl(assignToFn.ts, 1, 17)) @@ -14,7 +14,7 @@ module M { var x:I={ f:function(n) { return true; } }; >x : Symbol(x, Decl(assignToFn.ts, 5, 7)) ->I : Symbol(I, Decl(assignToFn.ts, 0, 10)) +>I : Symbol(I, Decl(assignToFn.ts, 0, 13)) >f : Symbol(f, Decl(assignToFn.ts, 5, 13)) >n : Symbol(n, Decl(assignToFn.ts, 5, 25)) diff --git a/tests/baselines/reference/assignToFn.types b/tests/baselines/reference/assignToFn.types index 937706d252e55..6d3dbcd2f6781 100644 --- a/tests/baselines/reference/assignToFn.types +++ b/tests/baselines/reference/assignToFn.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignToFn.ts] //// === assignToFn.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/assignToModule.errors.txt b/tests/baselines/reference/assignToModule.errors.txt index 3b0a5bb65aa36..cba8fa1ae1155 100644 --- a/tests/baselines/reference/assignToModule.errors.txt +++ b/tests/baselines/reference/assignToModule.errors.txt @@ -2,7 +2,7 @@ assignToModule.ts(2,1): error TS2708: Cannot use namespace 'A' as a value. ==== assignToModule.ts (1 errors) ==== - module A {} + namespace A {} A = undefined; // invalid LHS ~ !!! error TS2708: Cannot use namespace 'A' as a value. \ No newline at end of file diff --git a/tests/baselines/reference/assignToModule.js b/tests/baselines/reference/assignToModule.js index 086dc5c44f67e..16e68d534f4b9 100644 --- a/tests/baselines/reference/assignToModule.js +++ b/tests/baselines/reference/assignToModule.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignToModule.ts] //// //// [assignToModule.ts] -module A {} +namespace A {} A = undefined; // invalid LHS //// [assignToModule.js] diff --git a/tests/baselines/reference/assignToModule.symbols b/tests/baselines/reference/assignToModule.symbols index 60b02202d4a78..978a77e1a5236 100644 --- a/tests/baselines/reference/assignToModule.symbols +++ b/tests/baselines/reference/assignToModule.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignToModule.ts] //// === assignToModule.ts === -module A {} +namespace A {} >A : Symbol(A, Decl(assignToModule.ts, 0, 0)) A = undefined; // invalid LHS diff --git a/tests/baselines/reference/assignToModule.types b/tests/baselines/reference/assignToModule.types index 2104e5f7f4aa2..f51a356ac1e52 100644 --- a/tests/baselines/reference/assignToModule.types +++ b/tests/baselines/reference/assignToModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignToModule.ts] //// === assignToModule.ts === -module A {} +namespace A {} A = undefined; // invalid LHS >A = undefined : undefined > : ^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures4.errors.txt b/tests/baselines/reference/assignmentCompatWithCallSignatures4.errors.txt index c91ddb00897e1..47b298347b0c1 100644 --- a/tests/baselines/reference/assignmentCompatWithCallSignatures4.errors.txt +++ b/tests/baselines/reference/assignmentCompatWithCallSignatures4.errors.txt @@ -66,13 +66,13 @@ assignmentCompatWithCallSignatures4.ts(96,9): error TS2322: Type '(x: T) => s ==== assignmentCompatWithCallSignatures4.ts (15 errors) ==== // These are mostly permitted with the current loose rules. All ok unless otherwise noted. - module Errors { + namespace Errors { class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Derived { baz: string; } class OtherDerived extends Base { bing: string; } - module WithNonGenericSignaturesInBaseType { + namespace WithNonGenericSignaturesInBaseType { // target type with non-generic call signatures var a2: (x: number) => string[]; var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived2; @@ -210,7 +210,7 @@ assignmentCompatWithCallSignatures4.ts(96,9): error TS2322: Type '(x: T) => s b17 = a17; } - module WithGenericSignaturesInBaseType { + namespace WithGenericSignaturesInBaseType { // target type has generic call signature var a2: (x: T) => T[]; var b2: (x: T) => string[]; diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures4.js b/tests/baselines/reference/assignmentCompatWithCallSignatures4.js index 1782ca7cb0a0e..90fd3cc7e6ae4 100644 --- a/tests/baselines/reference/assignmentCompatWithCallSignatures4.js +++ b/tests/baselines/reference/assignmentCompatWithCallSignatures4.js @@ -3,13 +3,13 @@ //// [assignmentCompatWithCallSignatures4.ts] // These are mostly permitted with the current loose rules. All ok unless otherwise noted. -module Errors { +namespace Errors { class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Derived { baz: string; } class OtherDerived extends Base { bing: string; } - module WithNonGenericSignaturesInBaseType { + namespace WithNonGenericSignaturesInBaseType { // target type with non-generic call signatures var a2: (x: number) => string[]; var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived2; @@ -85,7 +85,7 @@ module Errors { b17 = a17; } - module WithGenericSignaturesInBaseType { + namespace WithGenericSignaturesInBaseType { // target type has generic call signature var a2: (x: T) => T[]; var b2: (x: T) => string[]; diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures4.symbols b/tests/baselines/reference/assignmentCompatWithCallSignatures4.symbols index 54822b60d9e01..9f37214d457b1 100644 --- a/tests/baselines/reference/assignmentCompatWithCallSignatures4.symbols +++ b/tests/baselines/reference/assignmentCompatWithCallSignatures4.symbols @@ -3,16 +3,16 @@ === assignmentCompatWithCallSignatures4.ts === // These are mostly permitted with the current loose rules. All ok unless otherwise noted. -module Errors { +namespace Errors { >Errors : Symbol(Errors, Decl(assignmentCompatWithCallSignatures4.ts, 0, 0)) class Base { foo: string; } ->Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18)) >foo : Symbol(Base.foo, Decl(assignmentCompatWithCallSignatures4.ts, 3, 16)) class Derived extends Base { bar: string; } >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures4.ts, 3, 31)) ->Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18)) >bar : Symbol(Derived.bar, Decl(assignmentCompatWithCallSignatures4.ts, 4, 32)) class Derived2 extends Derived { baz: string; } @@ -22,10 +22,10 @@ module Errors { class OtherDerived extends Base { bing: string; } >OtherDerived : Symbol(OtherDerived, Decl(assignmentCompatWithCallSignatures4.ts, 5, 51)) ->Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18)) >bing : Symbol(OtherDerived.bing, Decl(assignmentCompatWithCallSignatures4.ts, 6, 37)) - module WithNonGenericSignaturesInBaseType { + namespace WithNonGenericSignaturesInBaseType { >WithNonGenericSignaturesInBaseType : Symbol(WithNonGenericSignaturesInBaseType, Decl(assignmentCompatWithCallSignatures4.ts, 6, 53)) // target type with non-generic call signatures @@ -37,31 +37,31 @@ module Errors { >a7 : Symbol(a7, Decl(assignmentCompatWithCallSignatures4.ts, 11, 11)) >x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 11, 17)) >arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures4.ts, 11, 21)) ->Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18)) >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures4.ts, 3, 31)) >r : Symbol(r, Decl(assignmentCompatWithCallSignatures4.ts, 11, 48)) ->Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18)) >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithCallSignatures4.ts, 4, 47)) var a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived; >a8 : Symbol(a8, Decl(assignmentCompatWithCallSignatures4.ts, 12, 11)) >x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 12, 17)) >arg : Symbol(arg, Decl(assignmentCompatWithCallSignatures4.ts, 12, 21)) ->Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18)) >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures4.ts, 3, 31)) >y : Symbol(y, Decl(assignmentCompatWithCallSignatures4.ts, 12, 43)) >arg2 : Symbol(arg2, Decl(assignmentCompatWithCallSignatures4.ts, 12, 48)) ->Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18)) >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures4.ts, 3, 31)) >r : Symbol(r, Decl(assignmentCompatWithCallSignatures4.ts, 12, 76)) ->Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18)) >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures4.ts, 3, 31)) var a10: (...x: Base[]) => Base; >a10 : Symbol(a10, Decl(assignmentCompatWithCallSignatures4.ts, 13, 11)) >x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 13, 18)) ->Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 15)) ->Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18)) +>Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18)) var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base; >a11 : Symbol(a11, Decl(assignmentCompatWithCallSignatures4.ts, 14, 11)) @@ -70,13 +70,13 @@ module Errors { >y : Symbol(y, Decl(assignmentCompatWithCallSignatures4.ts, 14, 37)) >foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures4.ts, 14, 42)) >bar : Symbol(bar, Decl(assignmentCompatWithCallSignatures4.ts, 14, 55)) ->Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18)) var a12: (x: Array, y: Array) => Array; >a12 : Symbol(a12, Decl(assignmentCompatWithCallSignatures4.ts, 15, 11)) >x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 15, 18)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18)) >y : Symbol(y, Decl(assignmentCompatWithCallSignatures4.ts, 15, 33)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithCallSignatures4.ts, 4, 47)) @@ -138,7 +138,7 @@ module Errors { (a: T): T; >T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 34, 21)) ->Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18)) >a : Symbol(a, Decl(assignmentCompatWithCallSignatures4.ts, 34, 37)) >T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 34, 21)) >T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 34, 21)) @@ -156,7 +156,7 @@ module Errors { (a: T): T; >T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 38, 21)) ->Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18)) >a : Symbol(a, Decl(assignmentCompatWithCallSignatures4.ts, 38, 37)) >T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 38, 21)) >T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 38, 21)) @@ -183,7 +183,7 @@ module Errors { var b7: (x: (arg: T) => U) => (r: T) => V; >b7 : Symbol(b7, Decl(assignmentCompatWithCallSignatures4.ts, 46, 11)) >T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 46, 17)) ->Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18)) >U : Symbol(U, Decl(assignmentCompatWithCallSignatures4.ts, 46, 32)) >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures4.ts, 3, 31)) >V : Symbol(V, Decl(assignmentCompatWithCallSignatures4.ts, 46, 51)) @@ -207,7 +207,7 @@ module Errors { var b8: (x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; >b8 : Symbol(b8, Decl(assignmentCompatWithCallSignatures4.ts, 50, 11)) >T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 50, 17)) ->Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18)) >U : Symbol(U, Decl(assignmentCompatWithCallSignatures4.ts, 50, 32)) >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures4.ts, 3, 31)) >x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 50, 52)) @@ -272,10 +272,10 @@ module Errors { >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithCallSignatures4.ts, 4, 47)) >x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 63, 45)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18)) >y : Symbol(y, Decl(assignmentCompatWithCallSignatures4.ts, 63, 60)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18)) >T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 63, 18)) a12 = b12; @@ -307,7 +307,7 @@ module Errors { var b15a: (x: { a: T; b: T }) => number; >b15a : Symbol(b15a, Decl(assignmentCompatWithCallSignatures4.ts, 71, 11)) >T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 71, 19)) ->Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures4.ts, 2, 18)) >x : Symbol(x, Decl(assignmentCompatWithCallSignatures4.ts, 71, 35)) >a : Symbol(a, Decl(assignmentCompatWithCallSignatures4.ts, 71, 39)) >T : Symbol(T, Decl(assignmentCompatWithCallSignatures4.ts, 71, 19)) @@ -356,7 +356,7 @@ module Errors { >a17 : Symbol(a17, Decl(assignmentCompatWithCallSignatures4.ts, 31, 11)) } - module WithGenericSignaturesInBaseType { + namespace WithGenericSignaturesInBaseType { >WithGenericSignaturesInBaseType : Symbol(WithGenericSignaturesInBaseType, Decl(assignmentCompatWithCallSignatures4.ts, 82, 5)) // target type has generic call signature diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures4.types b/tests/baselines/reference/assignmentCompatWithCallSignatures4.types index e351d651a975b..1e00fbdafbe72 100644 --- a/tests/baselines/reference/assignmentCompatWithCallSignatures4.types +++ b/tests/baselines/reference/assignmentCompatWithCallSignatures4.types @@ -3,7 +3,7 @@ === assignmentCompatWithCallSignatures4.ts === // These are mostly permitted with the current loose rules. All ok unless otherwise noted. -module Errors { +namespace Errors { >Errors : typeof Errors > : ^^^^^^^^^^^^^ @@ -37,7 +37,7 @@ module Errors { >bing : string > : ^^^^^^ - module WithNonGenericSignaturesInBaseType { + namespace WithNonGenericSignaturesInBaseType { >WithNonGenericSignaturesInBaseType : typeof WithNonGenericSignaturesInBaseType > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -438,7 +438,7 @@ module Errors { > : ^^^ ^^ ^^^ ^^^ ^^ ^^^ ^^^ } - module WithGenericSignaturesInBaseType { + namespace WithGenericSignaturesInBaseType { >WithGenericSignaturesInBaseType : typeof WithGenericSignaturesInBaseType > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.errors.txt b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.errors.txt index 9c654f2e09c20..92b02dd683491 100644 --- a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.errors.txt +++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.errors.txt @@ -82,13 +82,13 @@ assignmentCompatWithConstructSignatures4.ts(96,9): error TS2322: Type 'new (x ==== assignmentCompatWithConstructSignatures4.ts (19 errors) ==== // checking assignment compatibility relations for function types. - module Errors { + namespace Errors { class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Derived { baz: string; } class OtherDerived extends Base { bing: string; } - module WithNonGenericSignaturesInBaseType { + namespace WithNonGenericSignaturesInBaseType { // target type with non-generic call signatures var a2: new (x: number) => string[]; var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived2; @@ -246,7 +246,7 @@ assignmentCompatWithConstructSignatures4.ts(96,9): error TS2322: Type 'new (x !!! error TS2322: Type '(a: any) => any' provides no match for the signature 'new (a: T): T'. } - module WithGenericSignaturesInBaseType { + namespace WithGenericSignaturesInBaseType { // target type has generic call signature var a2: new (x: T) => T[]; var b2: new (x: T) => string[]; diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js index 8944c699cc898..4962d658c18ec 100644 --- a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js +++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js @@ -3,13 +3,13 @@ //// [assignmentCompatWithConstructSignatures4.ts] // checking assignment compatibility relations for function types. -module Errors { +namespace Errors { class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Derived { baz: string; } class OtherDerived extends Base { bing: string; } - module WithNonGenericSignaturesInBaseType { + namespace WithNonGenericSignaturesInBaseType { // target type with non-generic call signatures var a2: new (x: number) => string[]; var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived2; @@ -85,7 +85,7 @@ module Errors { b17 = a17; // error } - module WithGenericSignaturesInBaseType { + namespace WithGenericSignaturesInBaseType { // target type has generic call signature var a2: new (x: T) => T[]; var b2: new (x: T) => string[]; diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.symbols b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.symbols index 88df86dea784d..e2d46a1c40b12 100644 --- a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.symbols +++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.symbols @@ -3,16 +3,16 @@ === assignmentCompatWithConstructSignatures4.ts === // checking assignment compatibility relations for function types. -module Errors { +namespace Errors { >Errors : Symbol(Errors, Decl(assignmentCompatWithConstructSignatures4.ts, 0, 0)) class Base { foo: string; } ->Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18)) >foo : Symbol(Base.foo, Decl(assignmentCompatWithConstructSignatures4.ts, 3, 16)) class Derived extends Base { bar: string; } >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures4.ts, 3, 31)) ->Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18)) >bar : Symbol(Derived.bar, Decl(assignmentCompatWithConstructSignatures4.ts, 4, 32)) class Derived2 extends Derived { baz: string; } @@ -22,10 +22,10 @@ module Errors { class OtherDerived extends Base { bing: string; } >OtherDerived : Symbol(OtherDerived, Decl(assignmentCompatWithConstructSignatures4.ts, 5, 51)) ->Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18)) >bing : Symbol(OtherDerived.bing, Decl(assignmentCompatWithConstructSignatures4.ts, 6, 37)) - module WithNonGenericSignaturesInBaseType { + namespace WithNonGenericSignaturesInBaseType { >WithNonGenericSignaturesInBaseType : Symbol(WithNonGenericSignaturesInBaseType, Decl(assignmentCompatWithConstructSignatures4.ts, 6, 53)) // target type with non-generic call signatures @@ -37,31 +37,31 @@ module Errors { >a7 : Symbol(a7, Decl(assignmentCompatWithConstructSignatures4.ts, 11, 11)) >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 11, 21)) >arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures4.ts, 11, 25)) ->Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18)) >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures4.ts, 3, 31)) >r : Symbol(r, Decl(assignmentCompatWithConstructSignatures4.ts, 11, 52)) ->Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18)) >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithConstructSignatures4.ts, 4, 47)) var a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived; >a8 : Symbol(a8, Decl(assignmentCompatWithConstructSignatures4.ts, 12, 11)) >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 12, 21)) >arg : Symbol(arg, Decl(assignmentCompatWithConstructSignatures4.ts, 12, 25)) ->Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18)) >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures4.ts, 3, 31)) >y : Symbol(y, Decl(assignmentCompatWithConstructSignatures4.ts, 12, 47)) >arg2 : Symbol(arg2, Decl(assignmentCompatWithConstructSignatures4.ts, 12, 52)) ->Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18)) >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures4.ts, 3, 31)) >r : Symbol(r, Decl(assignmentCompatWithConstructSignatures4.ts, 12, 80)) ->Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18)) >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures4.ts, 3, 31)) var a10: new (...x: Base[]) => Base; >a10 : Symbol(a10, Decl(assignmentCompatWithConstructSignatures4.ts, 13, 11)) >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 13, 22)) ->Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 15)) ->Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18)) +>Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18)) var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base; >a11 : Symbol(a11, Decl(assignmentCompatWithConstructSignatures4.ts, 14, 11)) @@ -70,13 +70,13 @@ module Errors { >y : Symbol(y, Decl(assignmentCompatWithConstructSignatures4.ts, 14, 41)) >foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures4.ts, 14, 46)) >bar : Symbol(bar, Decl(assignmentCompatWithConstructSignatures4.ts, 14, 59)) ->Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18)) var a12: new (x: Array, y: Array) => Array; >a12 : Symbol(a12, Decl(assignmentCompatWithConstructSignatures4.ts, 15, 11)) >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 15, 22)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18)) >y : Symbol(y, Decl(assignmentCompatWithConstructSignatures4.ts, 15, 37)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithConstructSignatures4.ts, 4, 47)) @@ -138,7 +138,7 @@ module Errors { new (a: T): T; >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 34, 25)) ->Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18)) >a : Symbol(a, Decl(assignmentCompatWithConstructSignatures4.ts, 34, 41)) >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 34, 25)) >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 34, 25)) @@ -156,7 +156,7 @@ module Errors { new (a: T): T; >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 38, 25)) ->Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18)) >a : Symbol(a, Decl(assignmentCompatWithConstructSignatures4.ts, 38, 41)) >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 38, 25)) >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 38, 25)) @@ -183,7 +183,7 @@ module Errors { var b7: new (x: (arg: T) => U) => (r: T) => V; >b7 : Symbol(b7, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 11)) >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 21)) ->Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18)) >U : Symbol(U, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 36)) >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures4.ts, 3, 31)) >V : Symbol(V, Decl(assignmentCompatWithConstructSignatures4.ts, 46, 55)) @@ -207,7 +207,7 @@ module Errors { var b8: new (x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; >b8 : Symbol(b8, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 11)) >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 21)) ->Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18)) >U : Symbol(U, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 36)) >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures4.ts, 3, 31)) >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 50, 56)) @@ -272,10 +272,10 @@ module Errors { >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithConstructSignatures4.ts, 4, 47)) >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 63, 49)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18)) >y : Symbol(y, Decl(assignmentCompatWithConstructSignatures4.ts, 63, 64)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18)) >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 63, 22)) a12 = b12; // ok @@ -307,7 +307,7 @@ module Errors { var b15a: new (x: { a: T; b: T }) => number; >b15a : Symbol(b15a, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 11)) >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 23)) ->Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 15)) +>Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures4.ts, 2, 18)) >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 39)) >a : Symbol(a, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 43)) >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures4.ts, 71, 23)) @@ -356,7 +356,7 @@ module Errors { >a17 : Symbol(a17, Decl(assignmentCompatWithConstructSignatures4.ts, 31, 11)) } - module WithGenericSignaturesInBaseType { + namespace WithGenericSignaturesInBaseType { >WithGenericSignaturesInBaseType : Symbol(WithGenericSignaturesInBaseType, Decl(assignmentCompatWithConstructSignatures4.ts, 82, 5)) // target type has generic call signature diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.types b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.types index c6660acd5d6b5..965689ed74cab 100644 --- a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.types +++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.types @@ -3,7 +3,7 @@ === assignmentCompatWithConstructSignatures4.ts === // checking assignment compatibility relations for function types. -module Errors { +namespace Errors { >Errors : typeof Errors > : ^^^^^^^^^^^^^ @@ -37,7 +37,7 @@ module Errors { >bing : string > : ^^^^^^ - module WithNonGenericSignaturesInBaseType { + namespace WithNonGenericSignaturesInBaseType { >WithNonGenericSignaturesInBaseType : typeof WithNonGenericSignaturesInBaseType > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -438,7 +438,7 @@ module Errors { > : ^^^^^^^ ^^ ^^^ ^^^^^^^ ^^ ^^^ ^^^ } - module WithGenericSignaturesInBaseType { + namespace WithGenericSignaturesInBaseType { >WithGenericSignaturesInBaseType : typeof WithGenericSignaturesInBaseType > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.errors.txt b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.errors.txt index d92429833fb5a..33405e4f8f04b 100644 --- a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.errors.txt +++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.errors.txt @@ -100,7 +100,7 @@ assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts(116,13): erro ==== assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts (29 errors) ==== // call signatures in derived types must have the same or fewer optional parameters as the target for assignment - module ClassTypeParam { + namespace ClassTypeParam { class Base { a: () => T; a2: (x?: T) => T; @@ -142,7 +142,7 @@ assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts(116,13): erro } } - module GenericSignaturesInvalid { + namespace GenericSignaturesInvalid { class Base2 { a: () => T; @@ -335,7 +335,7 @@ assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts(116,13): erro } } - module GenericSignaturesValid { + namespace GenericSignaturesValid { class Base2 { a: () => T; diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js index 4f2180fcb57ed..8155cc5cd1029 100644 --- a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js +++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js @@ -3,7 +3,7 @@ //// [assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts] // call signatures in derived types must have the same or fewer optional parameters as the target for assignment -module ClassTypeParam { +namespace ClassTypeParam { class Base { a: () => T; a2: (x?: T) => T; @@ -39,7 +39,7 @@ module ClassTypeParam { } } -module GenericSignaturesInvalid { +namespace GenericSignaturesInvalid { class Base2 { a: () => T; @@ -95,7 +95,7 @@ module GenericSignaturesInvalid { } } -module GenericSignaturesValid { +namespace GenericSignaturesValid { class Base2 { a: () => T; diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.symbols b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.symbols index ace08f5ddd6d9..b1f7109cf3f3b 100644 --- a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.symbols +++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.symbols @@ -3,11 +3,11 @@ === assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts === // call signatures in derived types must have the same or fewer optional parameters as the target for assignment -module ClassTypeParam { +namespace ClassTypeParam { >ClassTypeParam : Symbol(ClassTypeParam, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 0, 0)) class Base { ->Base : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 3, 15)) a: () => T; @@ -47,64 +47,64 @@ module ClassTypeParam { this.a = () => null; // ok, same T of required params >this.a : Symbol(Base.a, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 3, 19)) ->this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >a : Symbol(Base.a, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 3, 19)) this.a = (x?: T) => null; // ok, same T of required params >this.a : Symbol(Base.a, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 3, 19)) ->this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >a : Symbol(Base.a, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 3, 19)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 12, 22)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 3, 15)) this.a = (x: T) => null; // error, too many required params >this.a : Symbol(Base.a, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 3, 19)) ->this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >a : Symbol(Base.a, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 3, 19)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 13, 22)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 3, 15)) this.a2 = () => null; // ok, same T of required params >this.a2 : Symbol(Base.a2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 4, 19)) ->this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >a2 : Symbol(Base.a2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 4, 19)) this.a2 = (x?: T) => null; // ok, same T of required params >this.a2 : Symbol(Base.a2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 4, 19)) ->this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >a2 : Symbol(Base.a2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 4, 19)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 16, 23)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 3, 15)) this.a2 = (x: T) => null; // ok, same number of params >this.a2 : Symbol(Base.a2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 4, 19)) ->this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >a2 : Symbol(Base.a2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 4, 19)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 17, 23)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 3, 15)) this.a3 = () => null; // ok, fewer required params >this.a3 : Symbol(Base.a3, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 5, 25)) ->this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >a3 : Symbol(Base.a3, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 5, 25)) this.a3 = (x?: T) => null; // ok, fewer required params >this.a3 : Symbol(Base.a3, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 5, 25)) ->this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >a3 : Symbol(Base.a3, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 5, 25)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 20, 23)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 3, 15)) this.a3 = (x: T) => null; // ok, same T of required params >this.a3 : Symbol(Base.a3, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 5, 25)) ->this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >a3 : Symbol(Base.a3, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 5, 25)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 21, 23)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 3, 15)) this.a3 = (x: T, y: T) => null; // error, too many required params >this.a3 : Symbol(Base.a3, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 5, 25)) ->this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >a3 : Symbol(Base.a3, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 5, 25)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 22, 23)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 3, 15)) @@ -113,12 +113,12 @@ module ClassTypeParam { this.a4 = () => null; // ok, fewer required params >this.a4 : Symbol(Base.a4, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 6, 24)) ->this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >a4 : Symbol(Base.a4, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 6, 24)) this.a4 = (x?: T, y?: T) => null; // ok, fewer required params >this.a4 : Symbol(Base.a4, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 6, 24)) ->this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >a4 : Symbol(Base.a4, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 6, 24)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 25, 23)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 3, 15)) @@ -127,14 +127,14 @@ module ClassTypeParam { this.a4 = (x: T) => null; // ok, same T of required params >this.a4 : Symbol(Base.a4, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 6, 24)) ->this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >a4 : Symbol(Base.a4, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 6, 24)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 26, 23)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 3, 15)) this.a4 = (x: T, y: T) => null; // ok, same number of params >this.a4 : Symbol(Base.a4, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 6, 24)) ->this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >a4 : Symbol(Base.a4, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 6, 24)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 27, 23)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 3, 15)) @@ -144,12 +144,12 @@ module ClassTypeParam { this.a5 = () => null; // ok, fewer required params >this.a5 : Symbol(Base.a5, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 7, 31)) ->this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >a5 : Symbol(Base.a5, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 7, 31)) this.a5 = (x?: T, y?: T) => null; // ok, fewer required params >this.a5 : Symbol(Base.a5, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 7, 31)) ->this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >a5 : Symbol(Base.a5, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 7, 31)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 31, 23)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 3, 15)) @@ -158,14 +158,14 @@ module ClassTypeParam { this.a5 = (x: T) => null; // ok, all present params match >this.a5 : Symbol(Base.a5, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 7, 31)) ->this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >a5 : Symbol(Base.a5, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 7, 31)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 32, 23)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 3, 15)) this.a5 = (x: T, y: T) => null; // ok, same number of params >this.a5 : Symbol(Base.a5, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 7, 31)) ->this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>this : Symbol(Base, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >a5 : Symbol(Base.a5, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 7, 31)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 33, 23)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 3, 15)) @@ -175,11 +175,11 @@ module ClassTypeParam { } } -module GenericSignaturesInvalid { +namespace GenericSignaturesInvalid { >GenericSignaturesInvalid : Symbol(GenericSignaturesInvalid, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 36, 1)) class Base2 { ->Base2 : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 38, 33)) +>Base2 : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 38, 36)) a: () => T; >a : Symbol(Base2.a, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 40, 17)) @@ -263,7 +263,7 @@ module GenericSignaturesInvalid { var b: Base2; >b : Symbol(b, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 58, 11)) ->Base2 : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 38, 33)) +>Base2 : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 38, 36)) var t: Target; >t : Symbol(t, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 59, 11)) @@ -473,11 +473,11 @@ module GenericSignaturesInvalid { } } -module GenericSignaturesValid { +namespace GenericSignaturesValid { >GenericSignaturesValid : Symbol(GenericSignaturesValid, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 92, 1)) class Base2 { ->Base2 : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 31)) +>Base2 : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 34)) a: () => T; >a : Symbol(Base2.a, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 96, 17)) @@ -521,13 +521,13 @@ module GenericSignaturesValid { this.a = () => null; // ok, same T of required params >this.a : Symbol(Base2.a, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 96, 17)) ->this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 31)) +>this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 34)) >a : Symbol(Base2.a, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 96, 17)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 104, 22)) this.a = (x?: T) => null; // ok, same T of required params >this.a : Symbol(Base2.a, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 96, 17)) ->this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 31)) +>this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 34)) >a : Symbol(Base2.a, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 96, 17)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 105, 22)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 105, 25)) @@ -535,7 +535,7 @@ module GenericSignaturesValid { this.a = (x: T) => null; // error, too many required params >this.a : Symbol(Base2.a, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 96, 17)) ->this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 31)) +>this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 34)) >a : Symbol(Base2.a, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 96, 17)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 106, 22)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 106, 25)) @@ -543,13 +543,13 @@ module GenericSignaturesValid { this.a2 = () => null; // ok, same T of required params >this.a2 : Symbol(Base2.a2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 97, 22)) ->this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 31)) +>this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 34)) >a2 : Symbol(Base2.a2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 97, 22)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 108, 23)) this.a2 = (x?: T) => null; // ok, same T of required params >this.a2 : Symbol(Base2.a2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 97, 22)) ->this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 31)) +>this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 34)) >a2 : Symbol(Base2.a2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 97, 22)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 109, 23)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 109, 26)) @@ -557,7 +557,7 @@ module GenericSignaturesValid { this.a2 = (x: T) => null; // ok, same number of params >this.a2 : Symbol(Base2.a2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 97, 22)) ->this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 31)) +>this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 34)) >a2 : Symbol(Base2.a2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 97, 22)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 110, 23)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 110, 26)) @@ -565,13 +565,13 @@ module GenericSignaturesValid { this.a3 = () => null; // ok, fewer required params >this.a3 : Symbol(Base2.a3, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 98, 28)) ->this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 31)) +>this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 34)) >a3 : Symbol(Base2.a3, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 98, 28)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 112, 23)) this.a3 = (x?: T) => null; // ok, fewer required params >this.a3 : Symbol(Base2.a3, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 98, 28)) ->this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 31)) +>this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 34)) >a3 : Symbol(Base2.a3, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 98, 28)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 113, 23)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 113, 26)) @@ -579,7 +579,7 @@ module GenericSignaturesValid { this.a3 = (x: T) => null; // ok, same T of required params >this.a3 : Symbol(Base2.a3, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 98, 28)) ->this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 31)) +>this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 34)) >a3 : Symbol(Base2.a3, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 98, 28)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 114, 23)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 114, 26)) @@ -587,7 +587,7 @@ module GenericSignaturesValid { this.a3 = (x: T, y: T) => null; // error, too many required params >this.a3 : Symbol(Base2.a3, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 98, 28)) ->this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 31)) +>this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 34)) >a3 : Symbol(Base2.a3, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 98, 28)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 115, 23)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 115, 26)) @@ -597,13 +597,13 @@ module GenericSignaturesValid { this.a4 = () => null; // ok, fewer required params >this.a4 : Symbol(Base2.a4, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 99, 27)) ->this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 31)) +>this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 34)) >a4 : Symbol(Base2.a4, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 99, 27)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 117, 23)) this.a4 = (x?: T, y?: T) => null; // ok, fewer required params >this.a4 : Symbol(Base2.a4, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 99, 27)) ->this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 31)) +>this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 34)) >a4 : Symbol(Base2.a4, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 99, 27)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 118, 23)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 118, 26)) @@ -613,7 +613,7 @@ module GenericSignaturesValid { this.a4 = (x: T) => null; // ok, same T of required params >this.a4 : Symbol(Base2.a4, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 99, 27)) ->this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 31)) +>this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 34)) >a4 : Symbol(Base2.a4, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 99, 27)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 119, 23)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 119, 26)) @@ -621,7 +621,7 @@ module GenericSignaturesValid { this.a4 = (x: T, y: T) => null; // ok, same number of params >this.a4 : Symbol(Base2.a4, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 99, 27)) ->this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 31)) +>this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 34)) >a4 : Symbol(Base2.a4, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 99, 27)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 120, 23)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 120, 26)) @@ -632,13 +632,13 @@ module GenericSignaturesValid { this.a5 = () => null; // ok, fewer required params >this.a5 : Symbol(Base2.a5, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 100, 34)) ->this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 31)) +>this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 34)) >a5 : Symbol(Base2.a5, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 100, 34)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 123, 23)) this.a5 = (x?: T, y?: T) => null; // ok, fewer required params >this.a5 : Symbol(Base2.a5, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 100, 34)) ->this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 31)) +>this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 34)) >a5 : Symbol(Base2.a5, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 100, 34)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 124, 23)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 124, 26)) @@ -648,7 +648,7 @@ module GenericSignaturesValid { this.a5 = (x: T) => null; // ok, all present params match >this.a5 : Symbol(Base2.a5, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 100, 34)) ->this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 31)) +>this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 34)) >a5 : Symbol(Base2.a5, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 100, 34)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 125, 23)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 125, 26)) @@ -656,7 +656,7 @@ module GenericSignaturesValid { this.a5 = (x: T, y: T) => null; // ok, same number of params >this.a5 : Symbol(Base2.a5, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 100, 34)) ->this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 31)) +>this : Symbol(Base2, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 94, 34)) >a5 : Symbol(Base2.a5, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 100, 34)) >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 126, 23)) >x : Symbol(x, Decl(assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts, 126, 26)) diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.types b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.types index b35ed5eb7d7a7..ae8eec81c34a2 100644 --- a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.types +++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.types @@ -3,7 +3,7 @@ === assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts === // call signatures in derived types must have the same or fewer optional parameters as the target for assignment -module ClassTypeParam { +namespace ClassTypeParam { >ClassTypeParam : typeof ClassTypeParam > : ^^^^^^^^^^^^^^^^^^^^^ @@ -305,7 +305,7 @@ module ClassTypeParam { } } -module GenericSignaturesInvalid { +namespace GenericSignaturesInvalid { >GenericSignaturesInvalid : typeof GenericSignaturesInvalid > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -799,7 +799,7 @@ module GenericSignaturesInvalid { } } -module GenericSignaturesValid { +namespace GenericSignaturesValid { >GenericSignaturesValid : typeof GenericSignaturesValid > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt b/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt index f990fc308dcb9..16dba66897213 100644 --- a/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt +++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer.errors.txt @@ -51,7 +51,7 @@ assignmentCompatWithNumericIndexer.ts(37,9): error TS2322: Type 'A' is not as !!! error TS2322: 'number' index signatures are incompatible. !!! error TS2322: Type 'Base' is missing the following properties from type 'Derived2': baz, bar - module Generics { + namespace Generics { class A { [x: number]: T; } diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer.js b/tests/baselines/reference/assignmentCompatWithNumericIndexer.js index ff38e3cbd0165..fbfe1a8cfa96f 100644 --- a/tests/baselines/reference/assignmentCompatWithNumericIndexer.js +++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer.js @@ -20,7 +20,7 @@ var b2: { [x: number]: Derived2; } a = b2; b2 = a; // error -module Generics { +namespace Generics { class A { [x: number]: T; } diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer.symbols b/tests/baselines/reference/assignmentCompatWithNumericIndexer.symbols index ff5fcf8cb7e60..66b8f21c07db1 100644 --- a/tests/baselines/reference/assignmentCompatWithNumericIndexer.symbols +++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer.symbols @@ -55,11 +55,11 @@ b2 = a; // error >b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer.ts, 15, 3)) >a : Symbol(a, Decl(assignmentCompatWithNumericIndexer.ts, 10, 3)) -module Generics { +namespace Generics { >Generics : Symbol(Generics, Decl(assignmentCompatWithNumericIndexer.ts, 17, 7)) class A { ->A : Symbol(A, Decl(assignmentCompatWithNumericIndexer.ts, 19, 17)) +>A : Symbol(A, Decl(assignmentCompatWithNumericIndexer.ts, 19, 20)) >T : Symbol(T, Decl(assignmentCompatWithNumericIndexer.ts, 20, 12)) >Base : Symbol(Base, Decl(assignmentCompatWithNumericIndexer.ts, 0, 0)) @@ -70,7 +70,7 @@ module Generics { class B extends A { >B : Symbol(B, Decl(assignmentCompatWithNumericIndexer.ts, 22, 5)) ->A : Symbol(A, Decl(assignmentCompatWithNumericIndexer.ts, 19, 17)) +>A : Symbol(A, Decl(assignmentCompatWithNumericIndexer.ts, 19, 20)) >Base : Symbol(Base, Decl(assignmentCompatWithNumericIndexer.ts, 0, 0)) [x: number]: Derived; // ok @@ -85,7 +85,7 @@ module Generics { var a: A; >a : Symbol(a, Decl(assignmentCompatWithNumericIndexer.ts, 29, 11)) ->A : Symbol(A, Decl(assignmentCompatWithNumericIndexer.ts, 19, 17)) +>A : Symbol(A, Decl(assignmentCompatWithNumericIndexer.ts, 19, 20)) >T : Symbol(T, Decl(assignmentCompatWithNumericIndexer.ts, 28, 17)) var b: { [x: number]: Derived; } diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer.types b/tests/baselines/reference/assignmentCompatWithNumericIndexer.types index 6f2f62ada3fae..07e1dedab83de 100644 --- a/tests/baselines/reference/assignmentCompatWithNumericIndexer.types +++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer.types @@ -72,7 +72,7 @@ b2 = a; // error >a : A > : ^ -module Generics { +namespace Generics { >Generics : typeof Generics > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt index 0afe61148c6b4..a9535962fb7d6 100644 --- a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt +++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.errors.txt @@ -51,7 +51,7 @@ assignmentCompatWithNumericIndexer2.ts(37,9): error TS2322: Type 'A' is not a !!! error TS2322: 'number' index signatures are incompatible. !!! error TS2322: Type 'Base' is missing the following properties from type 'Derived2': baz, bar - module Generics { + namespace Generics { interface A { [x: number]: T; } diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.js b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.js index 8de27703d17ee..57c748ab5bd07 100644 --- a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.js +++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.js @@ -20,7 +20,7 @@ var b2: { [x: number]: Derived2; } a = b2; b2 = a; // error -module Generics { +namespace Generics { interface A { [x: number]: T; } diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.symbols b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.symbols index 32ee179f32b21..f35591fa2d37b 100644 --- a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.symbols +++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.symbols @@ -55,11 +55,11 @@ b2 = a; // error >b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer2.ts, 15, 3)) >a : Symbol(a, Decl(assignmentCompatWithNumericIndexer2.ts, 10, 3)) -module Generics { +namespace Generics { >Generics : Symbol(Generics, Decl(assignmentCompatWithNumericIndexer2.ts, 17, 7)) interface A { ->A : Symbol(A, Decl(assignmentCompatWithNumericIndexer2.ts, 19, 17)) +>A : Symbol(A, Decl(assignmentCompatWithNumericIndexer2.ts, 19, 20)) >T : Symbol(T, Decl(assignmentCompatWithNumericIndexer2.ts, 20, 16)) >Base : Symbol(Base, Decl(assignmentCompatWithNumericIndexer2.ts, 0, 0)) @@ -70,7 +70,7 @@ module Generics { interface B extends A { >B : Symbol(B, Decl(assignmentCompatWithNumericIndexer2.ts, 22, 5)) ->A : Symbol(A, Decl(assignmentCompatWithNumericIndexer2.ts, 19, 17)) +>A : Symbol(A, Decl(assignmentCompatWithNumericIndexer2.ts, 19, 20)) >Base : Symbol(Base, Decl(assignmentCompatWithNumericIndexer2.ts, 0, 0)) [x: number]: Derived; // ok @@ -85,7 +85,7 @@ module Generics { var a: A; >a : Symbol(a, Decl(assignmentCompatWithNumericIndexer2.ts, 29, 11)) ->A : Symbol(A, Decl(assignmentCompatWithNumericIndexer2.ts, 19, 17)) +>A : Symbol(A, Decl(assignmentCompatWithNumericIndexer2.ts, 19, 20)) >T : Symbol(T, Decl(assignmentCompatWithNumericIndexer2.ts, 28, 17)) var b: { [x: number]: Derived; } diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.types b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.types index ef1cd6bad9f71..0eb45b9f0e9b3 100644 --- a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.types +++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.types @@ -69,7 +69,7 @@ b2 = a; // error >a : A > : ^ -module Generics { +namespace Generics { >Generics : typeof Generics > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt index cc002dbfafb92..d2a905297d3a2 100644 --- a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt +++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.errors.txt @@ -45,7 +45,7 @@ assignmentCompatWithNumericIndexer3.ts(33,9): error TS2322: Type '{ [x: number]: !!! error TS2322: Property 'baz' is missing in type 'Derived' but required in type 'Derived2'. !!! related TS2728 assignmentCompatWithNumericIndexer3.ts:5:38: 'baz' is declared here. - module Generics { + namespace Generics { class A { [x: number]: T; } diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js index ff92930c86302..c55ce7233eb31 100644 --- a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js +++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js @@ -25,7 +25,7 @@ var b2: { [x: number]: Derived2; }; a = b2; // ok b2 = a; // error -module Generics { +namespace Generics { class A { [x: number]: T; } diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.symbols b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.symbols index ef4b3cbaa60af..21030b89b37f5 100644 --- a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.symbols +++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.symbols @@ -64,11 +64,11 @@ b2 = a; // error >b2 : Symbol(b2, Decl(assignmentCompatWithNumericIndexer3.ts, 20, 3)) >a : Symbol(a, Decl(assignmentCompatWithNumericIndexer3.ts, 10, 3)) -module Generics { +namespace Generics { >Generics : Symbol(Generics, Decl(assignmentCompatWithNumericIndexer3.ts, 22, 7)) class A { ->A : Symbol(A, Decl(assignmentCompatWithNumericIndexer3.ts, 24, 17)) +>A : Symbol(A, Decl(assignmentCompatWithNumericIndexer3.ts, 24, 20)) >T : Symbol(T, Decl(assignmentCompatWithNumericIndexer3.ts, 25, 12)) >Derived : Symbol(Derived, Decl(assignmentCompatWithNumericIndexer3.ts, 2, 31)) @@ -84,7 +84,7 @@ module Generics { var a: A; >a : Symbol(a, Decl(assignmentCompatWithNumericIndexer3.ts, 30, 11)) ->A : Symbol(A, Decl(assignmentCompatWithNumericIndexer3.ts, 24, 17)) +>A : Symbol(A, Decl(assignmentCompatWithNumericIndexer3.ts, 24, 20)) >T : Symbol(T, Decl(assignmentCompatWithNumericIndexer3.ts, 29, 17)) var b: { [x: number]: Derived; }; diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.types b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.types index 605f80f155063..52a6ed1915bbf 100644 --- a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.types +++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.types @@ -83,7 +83,7 @@ b2 = a; // error >a : A > : ^ -module Generics { +namespace Generics { >Generics : typeof Generics > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers.js b/tests/baselines/reference/assignmentCompatWithObjectMembers.js index 67556bd0f9869..89dc75b5fe122 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembers.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembers.js @@ -4,7 +4,7 @@ // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M // no errors expected -module SimpleTypes { +namespace SimpleTypes { class S { foo: string; } class T { foo: string; } var s: S; @@ -45,7 +45,7 @@ module SimpleTypes { a2 = t; } -module ObjectTypes { +namespace ObjectTypes { class S { foo: S; } class T { foo: T; } var s: S; diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers.symbols b/tests/baselines/reference/assignmentCompatWithObjectMembers.symbols index 957f53002496b..c5a762ccef04e 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembers.symbols +++ b/tests/baselines/reference/assignmentCompatWithObjectMembers.symbols @@ -4,11 +4,11 @@ // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M // no errors expected -module SimpleTypes { +namespace SimpleTypes { >SimpleTypes : Symbol(SimpleTypes, Decl(assignmentCompatWithObjectMembers.ts, 0, 0)) class S { foo: string; } ->S : Symbol(S, Decl(assignmentCompatWithObjectMembers.ts, 3, 20)) +>S : Symbol(S, Decl(assignmentCompatWithObjectMembers.ts, 3, 23)) >foo : Symbol(S.foo, Decl(assignmentCompatWithObjectMembers.ts, 4, 13)) class T { foo: string; } @@ -17,7 +17,7 @@ module SimpleTypes { var s: S; >s : Symbol(s, Decl(assignmentCompatWithObjectMembers.ts, 6, 7)) ->S : Symbol(S, Decl(assignmentCompatWithObjectMembers.ts, 3, 20)) +>S : Symbol(S, Decl(assignmentCompatWithObjectMembers.ts, 3, 23)) var t: T; >t : Symbol(t, Decl(assignmentCompatWithObjectMembers.ts, 7, 7)) @@ -132,13 +132,13 @@ module SimpleTypes { >t : Symbol(t, Decl(assignmentCompatWithObjectMembers.ts, 7, 7)) } -module ObjectTypes { +namespace ObjectTypes { >ObjectTypes : Symbol(ObjectTypes, Decl(assignmentCompatWithObjectMembers.ts, 42, 1)) class S { foo: S; } ->S : Symbol(S, Decl(assignmentCompatWithObjectMembers.ts, 44, 20)) +>S : Symbol(S, Decl(assignmentCompatWithObjectMembers.ts, 44, 23)) >foo : Symbol(S.foo, Decl(assignmentCompatWithObjectMembers.ts, 45, 13)) ->S : Symbol(S, Decl(assignmentCompatWithObjectMembers.ts, 44, 20)) +>S : Symbol(S, Decl(assignmentCompatWithObjectMembers.ts, 44, 23)) class T { foo: T; } >T : Symbol(T, Decl(assignmentCompatWithObjectMembers.ts, 45, 23)) @@ -147,7 +147,7 @@ module ObjectTypes { var s: S; >s : Symbol(s, Decl(assignmentCompatWithObjectMembers.ts, 47, 7)) ->S : Symbol(S, Decl(assignmentCompatWithObjectMembers.ts, 44, 20)) +>S : Symbol(S, Decl(assignmentCompatWithObjectMembers.ts, 44, 23)) var t: T; >t : Symbol(t, Decl(assignmentCompatWithObjectMembers.ts, 48, 7)) diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers.types b/tests/baselines/reference/assignmentCompatWithObjectMembers.types index 415c4c29ef94f..65917a2023961 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembers.types +++ b/tests/baselines/reference/assignmentCompatWithObjectMembers.types @@ -4,7 +4,7 @@ // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M // no errors expected -module SimpleTypes { +namespace SimpleTypes { >SimpleTypes : typeof SimpleTypes > : ^^^^^^^^^^^^^^^^^^ @@ -229,7 +229,7 @@ module SimpleTypes { > : ^ } -module ObjectTypes { +namespace ObjectTypes { >ObjectTypes : typeof ObjectTypes > : ^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt index 72885e82376a8..9d879edbec032 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt +++ b/tests/baselines/reference/assignmentCompatWithObjectMembers4.errors.txt @@ -54,7 +54,7 @@ assignmentCompatWithObjectMembers4.ts(87,5): error TS2322: Type '{ foo: Base; }' ==== assignmentCompatWithObjectMembers4.ts (17 errors) ==== // members N and M of types S and T have the same name, same accessibility, same optionality, and N is not assignable M - module OnlyDerived { + namespace OnlyDerived { class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Base { baz: string; } @@ -164,7 +164,7 @@ assignmentCompatWithObjectMembers4.ts(87,5): error TS2322: Type '{ foo: Base; }' !!! related TS2728 assignmentCompatWithObjectMembers4.ts:5:34: 'bar' is declared here. } - module WithBase { + namespace WithBase { class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Base { baz: string; } diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers4.js b/tests/baselines/reference/assignmentCompatWithObjectMembers4.js index 60412c2abc90f..3bd797bfe5df8 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembers4.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembers4.js @@ -3,7 +3,7 @@ //// [assignmentCompatWithObjectMembers4.ts] // members N and M of types S and T have the same name, same accessibility, same optionality, and N is not assignable M -module OnlyDerived { +namespace OnlyDerived { class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Base { baz: string; } @@ -48,7 +48,7 @@ module OnlyDerived { a2 = t; // error } -module WithBase { +namespace WithBase { class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Base { baz: string; } diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers4.symbols b/tests/baselines/reference/assignmentCompatWithObjectMembers4.symbols index d31c02b885f5c..0a3c66222ed2a 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembers4.symbols +++ b/tests/baselines/reference/assignmentCompatWithObjectMembers4.symbols @@ -3,21 +3,21 @@ === assignmentCompatWithObjectMembers4.ts === // members N and M of types S and T have the same name, same accessibility, same optionality, and N is not assignable M -module OnlyDerived { +namespace OnlyDerived { >OnlyDerived : Symbol(OnlyDerived, Decl(assignmentCompatWithObjectMembers4.ts, 0, 0)) class Base { foo: string; } ->Base : Symbol(Base, Decl(assignmentCompatWithObjectMembers4.ts, 2, 20)) +>Base : Symbol(Base, Decl(assignmentCompatWithObjectMembers4.ts, 2, 23)) >foo : Symbol(Base.foo, Decl(assignmentCompatWithObjectMembers4.ts, 3, 16)) class Derived extends Base { bar: string; } >Derived : Symbol(Derived, Decl(assignmentCompatWithObjectMembers4.ts, 3, 31)) ->Base : Symbol(Base, Decl(assignmentCompatWithObjectMembers4.ts, 2, 20)) +>Base : Symbol(Base, Decl(assignmentCompatWithObjectMembers4.ts, 2, 23)) >bar : Symbol(Derived.bar, Decl(assignmentCompatWithObjectMembers4.ts, 4, 32)) class Derived2 extends Base { baz: string; } >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithObjectMembers4.ts, 4, 47)) ->Base : Symbol(Base, Decl(assignmentCompatWithObjectMembers4.ts, 2, 20)) +>Base : Symbol(Base, Decl(assignmentCompatWithObjectMembers4.ts, 2, 23)) >baz : Symbol(Derived2.baz, Decl(assignmentCompatWithObjectMembers4.ts, 5, 33)) class S { foo: Derived; } @@ -153,27 +153,27 @@ module OnlyDerived { >t : Symbol(t, Decl(assignmentCompatWithObjectMembers4.ts, 10, 7)) } -module WithBase { +namespace WithBase { >WithBase : Symbol(WithBase, Decl(assignmentCompatWithObjectMembers4.ts, 45, 1)) class Base { foo: string; } ->Base : Symbol(Base, Decl(assignmentCompatWithObjectMembers4.ts, 47, 17)) +>Base : Symbol(Base, Decl(assignmentCompatWithObjectMembers4.ts, 47, 20)) >foo : Symbol(Base.foo, Decl(assignmentCompatWithObjectMembers4.ts, 48, 16)) class Derived extends Base { bar: string; } >Derived : Symbol(Derived, Decl(assignmentCompatWithObjectMembers4.ts, 48, 31)) ->Base : Symbol(Base, Decl(assignmentCompatWithObjectMembers4.ts, 47, 17)) +>Base : Symbol(Base, Decl(assignmentCompatWithObjectMembers4.ts, 47, 20)) >bar : Symbol(Derived.bar, Decl(assignmentCompatWithObjectMembers4.ts, 49, 32)) class Derived2 extends Base { baz: string; } >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithObjectMembers4.ts, 49, 47)) ->Base : Symbol(Base, Decl(assignmentCompatWithObjectMembers4.ts, 47, 17)) +>Base : Symbol(Base, Decl(assignmentCompatWithObjectMembers4.ts, 47, 20)) >baz : Symbol(Derived2.baz, Decl(assignmentCompatWithObjectMembers4.ts, 50, 33)) class S { foo: Base; } >S : Symbol(S, Decl(assignmentCompatWithObjectMembers4.ts, 50, 48)) >foo : Symbol(S.foo, Decl(assignmentCompatWithObjectMembers4.ts, 52, 13)) ->Base : Symbol(Base, Decl(assignmentCompatWithObjectMembers4.ts, 47, 17)) +>Base : Symbol(Base, Decl(assignmentCompatWithObjectMembers4.ts, 47, 20)) class T { foo: Derived2; } >T : Symbol(T, Decl(assignmentCompatWithObjectMembers4.ts, 52, 26)) @@ -191,7 +191,7 @@ module WithBase { interface S2 { foo: Base; } >S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembers4.ts, 55, 13)) >foo : Symbol(S2.foo, Decl(assignmentCompatWithObjectMembers4.ts, 57, 18)) ->Base : Symbol(Base, Decl(assignmentCompatWithObjectMembers4.ts, 47, 17)) +>Base : Symbol(Base, Decl(assignmentCompatWithObjectMembers4.ts, 47, 20)) interface T2 { foo: Derived2; } >T2 : Symbol(T2, Decl(assignmentCompatWithObjectMembers4.ts, 57, 31)) @@ -209,7 +209,7 @@ module WithBase { var a: { foo: Base; } >a : Symbol(a, Decl(assignmentCompatWithObjectMembers4.ts, 62, 7)) >foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers4.ts, 62, 12)) ->Base : Symbol(Base, Decl(assignmentCompatWithObjectMembers4.ts, 47, 17)) +>Base : Symbol(Base, Decl(assignmentCompatWithObjectMembers4.ts, 47, 20)) var b: { foo: Derived2; } >b : Symbol(b, Decl(assignmentCompatWithObjectMembers4.ts, 63, 7)) @@ -219,7 +219,7 @@ module WithBase { var a2 = { foo: new Base() }; >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembers4.ts, 65, 7)) >foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers4.ts, 65, 14)) ->Base : Symbol(Base, Decl(assignmentCompatWithObjectMembers4.ts, 47, 17)) +>Base : Symbol(Base, Decl(assignmentCompatWithObjectMembers4.ts, 47, 20)) var b2 = { foo: new Derived2() }; >b2 : Symbol(b2, Decl(assignmentCompatWithObjectMembers4.ts, 66, 7)) diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers4.types b/tests/baselines/reference/assignmentCompatWithObjectMembers4.types index 6e5071a22236d..941f3034a5d0e 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembers4.types +++ b/tests/baselines/reference/assignmentCompatWithObjectMembers4.types @@ -3,7 +3,7 @@ === assignmentCompatWithObjectMembers4.ts === // members N and M of types S and T have the same name, same accessibility, same optionality, and N is not assignable M -module OnlyDerived { +namespace OnlyDerived { >OnlyDerived : typeof OnlyDerived > : ^^^^^^^^^^^^^^^^^^ @@ -254,7 +254,7 @@ module OnlyDerived { > : ^ } -module WithBase { +namespace WithBase { >WithBase : typeof WithBase > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.errors.txt index 1a1a101200420..d9603de9fe4b6 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.errors.txt +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.errors.txt @@ -51,7 +51,7 @@ assignmentCompatWithObjectMembersAccessibility.ts(106,5): error TS2322: Type 'D' ==== assignmentCompatWithObjectMembersAccessibility.ts (24 errors) ==== // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M - module TargetIsPublic { + namespace TargetIsPublic { // targets class Base { public foo: string; @@ -128,7 +128,7 @@ assignmentCompatWithObjectMembersAccessibility.ts(106,5): error TS2322: Type 'D' } - module TargetIsPublic { + namespace TargetIsPublic { // targets class Base { private foo: string; diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js index 6b6b4a979ddce..b98662a3175aa 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js @@ -3,7 +3,7 @@ //// [assignmentCompatWithObjectMembersAccessibility.ts] // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M -module TargetIsPublic { +namespace TargetIsPublic { // targets class Base { public foo: string; @@ -56,7 +56,7 @@ module TargetIsPublic { } -module TargetIsPublic { +namespace TargetIsPublic { // targets class Base { private foo: string; diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.symbols b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.symbols index 72a7dae756991..dfa2dec9c5f1c 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.symbols +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.symbols @@ -3,12 +3,12 @@ === assignmentCompatWithObjectMembersAccessibility.ts === // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M -module TargetIsPublic { +namespace TargetIsPublic { >TargetIsPublic : Symbol(TargetIsPublic, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 0, 0), Decl(assignmentCompatWithObjectMembersAccessibility.ts, 53, 1)) // targets class Base { ->Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 2, 23)) +>Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 2, 26)) public foo: string; >foo : Symbol(Base.foo, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 4, 16)) @@ -27,7 +27,7 @@ module TargetIsPublic { var b: Base; >b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 13, 7)) ->Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 2, 23)) +>Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 2, 26)) var i: I; >i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 14, 7)) @@ -141,12 +141,12 @@ module TargetIsPublic { } -module TargetIsPublic { +namespace TargetIsPublic { >TargetIsPublic : Symbol(TargetIsPublic, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 0, 0), Decl(assignmentCompatWithObjectMembersAccessibility.ts, 53, 1)) // targets class Base { ->Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 55, 23)) +>Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 55, 26)) private foo: string; >foo : Symbol(Base.foo, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 57, 16)) @@ -154,7 +154,7 @@ module TargetIsPublic { interface I extends Base { >I : Symbol(I, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 59, 5)) ->Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 55, 23)) +>Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 55, 26)) } var a: { foo: string; } @@ -163,7 +163,7 @@ module TargetIsPublic { var b: Base; >b : Symbol(b, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 65, 7)) ->Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 55, 23)) +>Base : Symbol(Base, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 55, 26)) var i: I; >i : Symbol(i, Decl(assignmentCompatWithObjectMembersAccessibility.ts, 66, 7)) diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.types b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.types index fb14f1bcb6f45..bb9d29095276c 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.types +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.types @@ -3,7 +3,7 @@ === assignmentCompatWithObjectMembersAccessibility.ts === // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M -module TargetIsPublic { +namespace TargetIsPublic { >TargetIsPublic : typeof TargetIsPublic > : ^^^^^^^^^^^^^^^^^^^^^ @@ -233,7 +233,7 @@ module TargetIsPublic { } -module TargetIsPublic { +namespace TargetIsPublic { >TargetIsPublic : typeof TargetIsPublic > : ^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.errors.txt index 6182370720517..30f75f0b2d1e8 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.errors.txt +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.errors.txt @@ -19,7 +19,7 @@ assignmentCompatWithObjectMembersOptionality.ts(84,5): error TS2322: Type 'E' is class Derived extends Base { bar: string; } class Derived2 extends Derived { baz: string; } - module TargetHasOptional { + namespace TargetHasOptional { // targets interface C { opt?: Base @@ -61,7 +61,7 @@ assignmentCompatWithObjectMembersOptionality.ts(84,5): error TS2322: Type 'E' is b = c; } - module SourceHasOptional { + namespace SourceHasOptional { // targets interface C { opt: Base diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js index 6eca91bf5c434..2c76b037ad1a6 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js @@ -7,7 +7,7 @@ class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Derived { baz: string; } -module TargetHasOptional { +namespace TargetHasOptional { // targets interface C { opt?: Base @@ -49,7 +49,7 @@ module TargetHasOptional { b = c; } -module SourceHasOptional { +namespace SourceHasOptional { // targets interface C { opt: Base diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.symbols b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.symbols index 25eb2c64e5709..5972a0e8014ef 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.symbols +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.symbols @@ -17,12 +17,12 @@ class Derived2 extends Derived { baz: string; } >Derived : Symbol(Derived, Decl(assignmentCompatWithObjectMembersOptionality.ts, 2, 27)) >baz : Symbol(Derived2.baz, Decl(assignmentCompatWithObjectMembersOptionality.ts, 4, 32)) -module TargetHasOptional { +namespace TargetHasOptional { >TargetHasOptional : Symbol(TargetHasOptional, Decl(assignmentCompatWithObjectMembersOptionality.ts, 4, 47)) // targets interface C { ->C : Symbol(C, Decl(assignmentCompatWithObjectMembersOptionality.ts, 6, 26)) +>C : Symbol(C, Decl(assignmentCompatWithObjectMembersOptionality.ts, 6, 29)) opt?: Base >opt : Symbol(C.opt, Decl(assignmentCompatWithObjectMembersOptionality.ts, 8, 17)) @@ -30,7 +30,7 @@ module TargetHasOptional { } var c: C; >c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 11, 7)) ->C : Symbol(C, Decl(assignmentCompatWithObjectMembersOptionality.ts, 6, 26)) +>C : Symbol(C, Decl(assignmentCompatWithObjectMembersOptionality.ts, 6, 29)) var a: { opt?: Base; } >a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 13, 7)) @@ -131,12 +131,12 @@ module TargetHasOptional { >c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 11, 7)) } -module SourceHasOptional { +namespace SourceHasOptional { >SourceHasOptional : Symbol(SourceHasOptional, Decl(assignmentCompatWithObjectMembersOptionality.ts, 46, 1)) // targets interface C { ->C : Symbol(C, Decl(assignmentCompatWithObjectMembersOptionality.ts, 48, 26)) +>C : Symbol(C, Decl(assignmentCompatWithObjectMembersOptionality.ts, 48, 29)) opt: Base >opt : Symbol(C.opt, Decl(assignmentCompatWithObjectMembersOptionality.ts, 50, 17)) @@ -144,7 +144,7 @@ module SourceHasOptional { } var c: C; >c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality.ts, 53, 7)) ->C : Symbol(C, Decl(assignmentCompatWithObjectMembersOptionality.ts, 48, 26)) +>C : Symbol(C, Decl(assignmentCompatWithObjectMembersOptionality.ts, 48, 29)) var a: { opt: Base; } >a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality.ts, 55, 7)) diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.types b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.types index 6526c6d55f9db..513ba72180fd2 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.types +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.types @@ -25,7 +25,7 @@ class Derived2 extends Derived { baz: string; } >baz : string > : ^^^^^^ -module TargetHasOptional { +namespace TargetHasOptional { >TargetHasOptional : typeof TargetHasOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -193,7 +193,7 @@ module TargetHasOptional { > : ^ } -module SourceHasOptional { +namespace SourceHasOptional { >SourceHasOptional : typeof SourceHasOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt index f1ba1224c455d..73efbfd5551f7 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.errors.txt @@ -26,7 +26,7 @@ assignmentCompatWithObjectMembersOptionality2.ts(86,5): error TS2741: Property ' class Derived extends Base { bar: string; } class Derived2 extends Derived { baz: string; } - module TargetHasOptional { + namespace TargetHasOptional { // targets interface C { opt?: Base @@ -86,7 +86,7 @@ assignmentCompatWithObjectMembersOptionality2.ts(86,5): error TS2741: Property ' b = c; } - module SourceHasOptional { + namespace SourceHasOptional { // targets interface C { opt: Base diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js index 21d93a227794c..27948a4b8d238 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js @@ -8,7 +8,7 @@ class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Derived { baz: string; } -module TargetHasOptional { +namespace TargetHasOptional { // targets interface C { opt?: Base @@ -50,7 +50,7 @@ module TargetHasOptional { b = c; } -module SourceHasOptional { +namespace SourceHasOptional { // targets interface C { opt: Base diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.symbols b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.symbols index 60543ae0cdf2c..6346a4031e476 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.symbols +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.symbols @@ -18,12 +18,12 @@ class Derived2 extends Derived { baz: string; } >Derived : Symbol(Derived, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 3, 27)) >baz : Symbol(Derived2.baz, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 5, 32)) -module TargetHasOptional { +namespace TargetHasOptional { >TargetHasOptional : Symbol(TargetHasOptional, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 5, 47)) // targets interface C { ->C : Symbol(C, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 7, 26)) +>C : Symbol(C, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 7, 29)) opt?: Base >opt : Symbol(C.opt, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 9, 17)) @@ -31,7 +31,7 @@ module TargetHasOptional { } var c: C; >c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 12, 7)) ->C : Symbol(C, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 7, 26)) +>C : Symbol(C, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 7, 29)) var a: { opt?: Base; } >a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 14, 7)) @@ -133,12 +133,12 @@ module TargetHasOptional { >c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 12, 7)) } -module SourceHasOptional { +namespace SourceHasOptional { >SourceHasOptional : Symbol(SourceHasOptional, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 47, 1)) // targets interface C { ->C : Symbol(C, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 49, 26)) +>C : Symbol(C, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 49, 29)) opt: Base >opt : Symbol(C.opt, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 51, 17)) @@ -146,7 +146,7 @@ module SourceHasOptional { } var c: C; >c : Symbol(c, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 54, 7)) ->C : Symbol(C, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 49, 26)) +>C : Symbol(C, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 49, 29)) var a: { opt: Base; } >a : Symbol(a, Decl(assignmentCompatWithObjectMembersOptionality2.ts, 56, 7)) diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.types b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.types index f5fee1c0730d1..c637a7641c231 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.types +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.types @@ -26,7 +26,7 @@ class Derived2 extends Derived { baz: string; } >baz : string > : ^^^^^^ -module TargetHasOptional { +namespace TargetHasOptional { >TargetHasOptional : typeof TargetHasOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -195,7 +195,7 @@ module TargetHasOptional { > : ^ } -module SourceHasOptional { +namespace SourceHasOptional { >SourceHasOptional : typeof SourceHasOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt index 6c85c052e0336..2c395ded5c6de 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.errors.txt @@ -33,7 +33,7 @@ assignmentCompatWithObjectMembersStringNumericNames.ts(84,5): error TS2741: Prop // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M // string named numeric properties work correctly, errors below unless otherwise noted - module JustStrings { + namespace JustStrings { class S { '1': string; } class T { '1.': string; } var s: S; @@ -122,7 +122,7 @@ assignmentCompatWithObjectMembersStringNumericNames.ts(84,5): error TS2741: Prop !!! related TS2728 assignmentCompatWithObjectMembersStringNumericNames.ts:18:16: ''1.0'' is declared here. } - module NumbersAndStrings { + namespace NumbersAndStrings { class S { '1': string; } class T { 1: string; } var s: S; diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js index 76129a50945c5..4d0aa624d2caa 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js @@ -4,7 +4,7 @@ // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M // string named numeric properties work correctly, errors below unless otherwise noted -module JustStrings { +namespace JustStrings { class S { '1': string; } class T { '1.': string; } var s: S; @@ -45,7 +45,7 @@ module JustStrings { a2 = t; } -module NumbersAndStrings { +namespace NumbersAndStrings { class S { '1': string; } class T { 1: string; } var s: S; diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.symbols b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.symbols index 5b82d0fa0af54..646e20437a410 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.symbols +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.symbols @@ -4,11 +4,11 @@ // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M // string named numeric properties work correctly, errors below unless otherwise noted -module JustStrings { +namespace JustStrings { >JustStrings : Symbol(JustStrings, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 0, 0)) class S { '1': string; } ->S : Symbol(S, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 3, 20)) +>S : Symbol(S, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 3, 23)) >'1' : Symbol(S['1'], Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 4, 13)) class T { '1.': string; } @@ -17,7 +17,7 @@ module JustStrings { var s: S; >s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 6, 7)) ->S : Symbol(S, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 3, 20)) +>S : Symbol(S, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 3, 23)) var t: T; >t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 7, 7)) @@ -136,11 +136,11 @@ module JustStrings { >t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 7, 7)) } -module NumbersAndStrings { +namespace NumbersAndStrings { >NumbersAndStrings : Symbol(NumbersAndStrings, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 42, 1)) class S { '1': string; } ->S : Symbol(S, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 44, 26)) +>S : Symbol(S, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 44, 29)) >'1' : Symbol(S['1'], Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 45, 13)) class T { 1: string; } @@ -149,7 +149,7 @@ module NumbersAndStrings { var s: S; >s : Symbol(s, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 47, 7)) ->S : Symbol(S, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 44, 26)) +>S : Symbol(S, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 44, 29)) var t: T; >t : Symbol(t, Decl(assignmentCompatWithObjectMembersStringNumericNames.ts, 48, 7)) diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.types b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.types index 4e15ea7e71bf3..f20ca2bebc6d2 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.types +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.types @@ -4,7 +4,7 @@ // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M // string named numeric properties work correctly, errors below unless otherwise noted -module JustStrings { +namespace JustStrings { >JustStrings : typeof JustStrings > : ^^^^^^^^^^^^^^^^^^ @@ -237,7 +237,7 @@ module JustStrings { > : ^ } -module NumbersAndStrings { +namespace NumbersAndStrings { >NumbersAndStrings : typeof NumbersAndStrings > : ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt b/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt index ea6734d5a8622..33184907db2a8 100644 --- a/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt +++ b/tests/baselines/reference/assignmentCompatWithStringIndexer.errors.txt @@ -58,7 +58,7 @@ assignmentCompatWithStringIndexer.ts(51,9): error TS2322: Type 'A' is not ass !!! error TS2322: 'string' index signatures are incompatible. !!! error TS2322: Type 'Base' is missing the following properties from type 'Derived2': baz, bar - module Generics { + namespace Generics { class A { [x: string]: T; } diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer.js b/tests/baselines/reference/assignmentCompatWithStringIndexer.js index 0a4f06be0ea6a..37045f4439b33 100644 --- a/tests/baselines/reference/assignmentCompatWithStringIndexer.js +++ b/tests/baselines/reference/assignmentCompatWithStringIndexer.js @@ -21,7 +21,7 @@ var b2: { [x: string]: Derived2; } a = b2; // ok b2 = a; // error -module Generics { +namespace Generics { class A { [x: string]: T; } diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer.symbols b/tests/baselines/reference/assignmentCompatWithStringIndexer.symbols index 29ff11c1b5365..473f4a7ae67e5 100644 --- a/tests/baselines/reference/assignmentCompatWithStringIndexer.symbols +++ b/tests/baselines/reference/assignmentCompatWithStringIndexer.symbols @@ -55,11 +55,11 @@ b2 = a; // error >b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer.ts, 16, 3)) >a : Symbol(a, Decl(assignmentCompatWithStringIndexer.ts, 10, 3)) -module Generics { +namespace Generics { >Generics : Symbol(Generics, Decl(assignmentCompatWithStringIndexer.ts, 18, 7)) class A { ->A : Symbol(A, Decl(assignmentCompatWithStringIndexer.ts, 20, 17)) +>A : Symbol(A, Decl(assignmentCompatWithStringIndexer.ts, 20, 20)) >T : Symbol(T, Decl(assignmentCompatWithStringIndexer.ts, 21, 12)) >Base : Symbol(Base, Decl(assignmentCompatWithStringIndexer.ts, 0, 0)) @@ -70,7 +70,7 @@ module Generics { class B extends A { >B : Symbol(B, Decl(assignmentCompatWithStringIndexer.ts, 23, 5)) ->A : Symbol(A, Decl(assignmentCompatWithStringIndexer.ts, 20, 17)) +>A : Symbol(A, Decl(assignmentCompatWithStringIndexer.ts, 20, 20)) >Base : Symbol(Base, Decl(assignmentCompatWithStringIndexer.ts, 0, 0)) [x: string]: Derived; // ok @@ -85,7 +85,7 @@ module Generics { var a1: A; >a1 : Symbol(a1, Decl(assignmentCompatWithStringIndexer.ts, 30, 7)) ->A : Symbol(A, Decl(assignmentCompatWithStringIndexer.ts, 20, 17)) +>A : Symbol(A, Decl(assignmentCompatWithStringIndexer.ts, 20, 20)) >Base : Symbol(Base, Decl(assignmentCompatWithStringIndexer.ts, 0, 0)) a1 = b1; // ok @@ -98,7 +98,7 @@ module Generics { class B2 extends A { >B2 : Symbol(B2, Decl(assignmentCompatWithStringIndexer.ts, 32, 12)) ->A : Symbol(A, Decl(assignmentCompatWithStringIndexer.ts, 20, 17)) +>A : Symbol(A, Decl(assignmentCompatWithStringIndexer.ts, 20, 20)) >Base : Symbol(Base, Decl(assignmentCompatWithStringIndexer.ts, 0, 0)) [x: string]: Derived2; // ok @@ -131,7 +131,7 @@ module Generics { var a3: A; >a3 : Symbol(a3, Decl(assignmentCompatWithStringIndexer.ts, 44, 11)) ->A : Symbol(A, Decl(assignmentCompatWithStringIndexer.ts, 20, 17)) +>A : Symbol(A, Decl(assignmentCompatWithStringIndexer.ts, 20, 20)) >T : Symbol(T, Decl(assignmentCompatWithStringIndexer.ts, 42, 17)) a3 = b3; // error diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer.types b/tests/baselines/reference/assignmentCompatWithStringIndexer.types index 83879185cecf4..73d9544240f0a 100644 --- a/tests/baselines/reference/assignmentCompatWithStringIndexer.types +++ b/tests/baselines/reference/assignmentCompatWithStringIndexer.types @@ -72,7 +72,7 @@ b2 = a; // error >a : A > : ^ -module Generics { +namespace Generics { >Generics : typeof Generics > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt b/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt index c330a9fa38b33..c2a99920604c6 100644 --- a/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt +++ b/tests/baselines/reference/assignmentCompatWithStringIndexer2.errors.txt @@ -58,7 +58,7 @@ assignmentCompatWithStringIndexer2.ts(51,9): error TS2322: Type 'A' is not as !!! error TS2322: 'string' index signatures are incompatible. !!! error TS2322: Type 'Base' is missing the following properties from type 'Derived2': baz, bar - module Generics { + namespace Generics { interface A { [x: string]: T; } diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer2.js b/tests/baselines/reference/assignmentCompatWithStringIndexer2.js index 17b995fa1093a..38bf435af0526 100644 --- a/tests/baselines/reference/assignmentCompatWithStringIndexer2.js +++ b/tests/baselines/reference/assignmentCompatWithStringIndexer2.js @@ -21,7 +21,7 @@ var b2: { [x: string]: Derived2; } a = b2; // ok b2 = a; // error -module Generics { +namespace Generics { interface A { [x: string]: T; } diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer2.symbols b/tests/baselines/reference/assignmentCompatWithStringIndexer2.symbols index fdca8339e6f85..6814fdcf21590 100644 --- a/tests/baselines/reference/assignmentCompatWithStringIndexer2.symbols +++ b/tests/baselines/reference/assignmentCompatWithStringIndexer2.symbols @@ -55,11 +55,11 @@ b2 = a; // error >b2 : Symbol(b2, Decl(assignmentCompatWithStringIndexer2.ts, 16, 3)) >a : Symbol(a, Decl(assignmentCompatWithStringIndexer2.ts, 10, 3)) -module Generics { +namespace Generics { >Generics : Symbol(Generics, Decl(assignmentCompatWithStringIndexer2.ts, 18, 7)) interface A { ->A : Symbol(A, Decl(assignmentCompatWithStringIndexer2.ts, 20, 17)) +>A : Symbol(A, Decl(assignmentCompatWithStringIndexer2.ts, 20, 20)) >T : Symbol(T, Decl(assignmentCompatWithStringIndexer2.ts, 21, 16)) >Base : Symbol(Base, Decl(assignmentCompatWithStringIndexer2.ts, 0, 0)) @@ -70,7 +70,7 @@ module Generics { interface B extends A { >B : Symbol(B, Decl(assignmentCompatWithStringIndexer2.ts, 23, 5)) ->A : Symbol(A, Decl(assignmentCompatWithStringIndexer2.ts, 20, 17)) +>A : Symbol(A, Decl(assignmentCompatWithStringIndexer2.ts, 20, 20)) >Base : Symbol(Base, Decl(assignmentCompatWithStringIndexer2.ts, 0, 0)) [x: string]: Derived; // ok @@ -85,7 +85,7 @@ module Generics { var a1: A; >a1 : Symbol(a1, Decl(assignmentCompatWithStringIndexer2.ts, 30, 7)) ->A : Symbol(A, Decl(assignmentCompatWithStringIndexer2.ts, 20, 17)) +>A : Symbol(A, Decl(assignmentCompatWithStringIndexer2.ts, 20, 20)) >Base : Symbol(Base, Decl(assignmentCompatWithStringIndexer2.ts, 0, 0)) a1 = b1; // ok @@ -98,7 +98,7 @@ module Generics { interface B2 extends A { >B2 : Symbol(B2, Decl(assignmentCompatWithStringIndexer2.ts, 32, 12)) ->A : Symbol(A, Decl(assignmentCompatWithStringIndexer2.ts, 20, 17)) +>A : Symbol(A, Decl(assignmentCompatWithStringIndexer2.ts, 20, 20)) >Base : Symbol(Base, Decl(assignmentCompatWithStringIndexer2.ts, 0, 0)) [x: string]: Derived2; // ok @@ -131,7 +131,7 @@ module Generics { var a3: A; >a3 : Symbol(a3, Decl(assignmentCompatWithStringIndexer2.ts, 44, 11)) ->A : Symbol(A, Decl(assignmentCompatWithStringIndexer2.ts, 20, 17)) +>A : Symbol(A, Decl(assignmentCompatWithStringIndexer2.ts, 20, 20)) >T : Symbol(T, Decl(assignmentCompatWithStringIndexer2.ts, 42, 17)) a3 = b3; // error diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer2.types b/tests/baselines/reference/assignmentCompatWithStringIndexer2.types index fa709a235afe0..1d2fd6a0c1156 100644 --- a/tests/baselines/reference/assignmentCompatWithStringIndexer2.types +++ b/tests/baselines/reference/assignmentCompatWithStringIndexer2.types @@ -69,7 +69,7 @@ b2 = a; // error >a : A > : ^ -module Generics { +namespace Generics { >Generics : typeof Generics > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer3.errors.txt b/tests/baselines/reference/assignmentCompatWithStringIndexer3.errors.txt index f7de5656d1044..205371c6c6522 100644 --- a/tests/baselines/reference/assignmentCompatWithStringIndexer3.errors.txt +++ b/tests/baselines/reference/assignmentCompatWithStringIndexer3.errors.txt @@ -23,7 +23,7 @@ assignmentCompatWithStringIndexer3.ts(21,9): error TS2322: Type 'A' is not as a = b1; // error b1 = a; // error - module Generics { + namespace Generics { class A { [x: string]: T; } diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer3.js b/tests/baselines/reference/assignmentCompatWithStringIndexer3.js index 0c121fc925b02..0b08cbfd7d066 100644 --- a/tests/baselines/reference/assignmentCompatWithStringIndexer3.js +++ b/tests/baselines/reference/assignmentCompatWithStringIndexer3.js @@ -12,7 +12,7 @@ var b1: { [x: string]: string; } a = b1; // error b1 = a; // error -module Generics { +namespace Generics { class A { [x: string]: T; } diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer3.symbols b/tests/baselines/reference/assignmentCompatWithStringIndexer3.symbols index a6dec0e485140..074ccde38fc07 100644 --- a/tests/baselines/reference/assignmentCompatWithStringIndexer3.symbols +++ b/tests/baselines/reference/assignmentCompatWithStringIndexer3.symbols @@ -33,11 +33,11 @@ b1 = a; // error >b1 : Symbol(b1, Decl(assignmentCompatWithStringIndexer3.ts, 7, 3)) >a : Symbol(a, Decl(assignmentCompatWithStringIndexer3.ts, 6, 3)) -module Generics { +namespace Generics { >Generics : Symbol(Generics, Decl(assignmentCompatWithStringIndexer3.ts, 9, 7)) class A { ->A : Symbol(A, Decl(assignmentCompatWithStringIndexer3.ts, 11, 17)) +>A : Symbol(A, Decl(assignmentCompatWithStringIndexer3.ts, 11, 20)) >T : Symbol(T, Decl(assignmentCompatWithStringIndexer3.ts, 12, 12)) >Derived : Symbol(Derived, Decl(assignmentCompatWithStringIndexer3.ts, 2, 31)) @@ -53,7 +53,7 @@ module Generics { var a: A; >a : Symbol(a, Decl(assignmentCompatWithStringIndexer3.ts, 17, 11)) ->A : Symbol(A, Decl(assignmentCompatWithStringIndexer3.ts, 11, 17)) +>A : Symbol(A, Decl(assignmentCompatWithStringIndexer3.ts, 11, 20)) >T : Symbol(T, Decl(assignmentCompatWithStringIndexer3.ts, 16, 17)) var b: { [x: string]: string; } diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer3.types b/tests/baselines/reference/assignmentCompatWithStringIndexer3.types index 0fa5a3c832f02..ae77b10806e32 100644 --- a/tests/baselines/reference/assignmentCompatWithStringIndexer3.types +++ b/tests/baselines/reference/assignmentCompatWithStringIndexer3.types @@ -41,7 +41,7 @@ b1 = a; // error >a : A > : ^ -module Generics { +namespace Generics { >Generics : typeof Generics > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability1.js b/tests/baselines/reference/assignmentCompatability1.js index ef48a5024215f..014b53e74c45f 100644 --- a/tests/baselines/reference/assignmentCompatability1.js +++ b/tests/baselines/reference/assignmentCompatability1.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability1.ts] //// //// [assignmentCompatability1.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa = {};; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability1.symbols b/tests/baselines/reference/assignmentCompatability1.symbols index 105f5f13e52b6..028d9feaf1868 100644 --- a/tests/baselines/reference/assignmentCompatability1.symbols +++ b/tests/baselines/reference/assignmentCompatability1.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability1.ts] //// === assignmentCompatability1.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability1.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability1.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability1.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability1.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability1.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability1.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability1.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability1.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability1.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability1.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability1.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability1.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability1.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability1.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability1.ts, 3, 1)) export var aa = {};; diff --git a/tests/baselines/reference/assignmentCompatability1.types b/tests/baselines/reference/assignmentCompatability1.types index f94f26c52c056..9cb467bb8201f 100644 --- a/tests/baselines/reference/assignmentCompatability1.types +++ b/tests/baselines/reference/assignmentCompatability1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability1.ts] //// === assignmentCompatability1.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability10.js b/tests/baselines/reference/assignmentCompatability10.js index a6164227e32a8..dba6b098c2d44 100644 --- a/tests/baselines/reference/assignmentCompatability10.js +++ b/tests/baselines/reference/assignmentCompatability10.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability10.ts] //// //// [assignmentCompatability10.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export class classWithPublicAndOptional { constructor(public one: T, public two?: U) {} } var x4 = new classWithPublicAndOptional(1);; export var __val__x4 = x4; } diff --git a/tests/baselines/reference/assignmentCompatability10.symbols b/tests/baselines/reference/assignmentCompatability10.symbols index 92db9a5918094..341f402a00e9d 100644 --- a/tests/baselines/reference/assignmentCompatability10.symbols +++ b/tests/baselines/reference/assignmentCompatability10.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability10.ts] //// === assignmentCompatability10.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability10.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability10.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability10.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability10.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability10.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability10.ts, 1, 58)) @@ -13,18 +13,18 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability10.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability10.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability10.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability10.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability10.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability10.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability10.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability10.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability10.ts, 3, 1)) export class classWithPublicAndOptional { constructor(public one: T, public two?: U) {} } var x4 = new classWithPublicAndOptional(1);; ->classWithPublicAndOptional : Symbol(classWithPublicAndOptional, Decl(assignmentCompatability10.ts, 4, 18)) +>classWithPublicAndOptional : Symbol(classWithPublicAndOptional, Decl(assignmentCompatability10.ts, 4, 21)) >T : Symbol(T, Decl(assignmentCompatability10.ts, 5, 44)) >U : Symbol(U, Decl(assignmentCompatability10.ts, 5, 46)) >one : Symbol(classWithPublicAndOptional.one, Decl(assignmentCompatability10.ts, 5, 63)) @@ -32,7 +32,7 @@ module __test2__ { >two : Symbol(classWithPublicAndOptional.two, Decl(assignmentCompatability10.ts, 5, 77)) >U : Symbol(U, Decl(assignmentCompatability10.ts, 5, 46)) >x4 : Symbol(x4, Decl(assignmentCompatability10.ts, 5, 104)) ->classWithPublicAndOptional : Symbol(classWithPublicAndOptional, Decl(assignmentCompatability10.ts, 4, 18)) +>classWithPublicAndOptional : Symbol(classWithPublicAndOptional, Decl(assignmentCompatability10.ts, 4, 21)) export var __val__x4 = x4; >__val__x4 : Symbol(__val__x4, Decl(assignmentCompatability10.ts, 6, 14)) diff --git a/tests/baselines/reference/assignmentCompatability10.types b/tests/baselines/reference/assignmentCompatability10.types index 6763bf7704992..4feaecef51783 100644 --- a/tests/baselines/reference/assignmentCompatability10.types +++ b/tests/baselines/reference/assignmentCompatability10.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability10.ts] //// === assignmentCompatability10.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability11.errors.txt b/tests/baselines/reference/assignmentCompatability11.errors.txt index 73418f7911fac..2b95f6692e854 100644 --- a/tests/baselines/reference/assignmentCompatability11.errors.txt +++ b/tests/baselines/reference/assignmentCompatability11.errors.txt @@ -4,11 +4,11 @@ assignmentCompatability11.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability11.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var obj = {two: 1}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability11.js b/tests/baselines/reference/assignmentCompatability11.js index 80014b6203437..82de662e634a0 100644 --- a/tests/baselines/reference/assignmentCompatability11.js +++ b/tests/baselines/reference/assignmentCompatability11.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability11.ts] //// //// [assignmentCompatability11.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {two: 1}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability11.symbols b/tests/baselines/reference/assignmentCompatability11.symbols index dfb292c4694ed..f36d1f17a5994 100644 --- a/tests/baselines/reference/assignmentCompatability11.symbols +++ b/tests/baselines/reference/assignmentCompatability11.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability11.ts] //// === assignmentCompatability11.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability11.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability11.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability11.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability11.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability11.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability11.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability11.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability11.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability11.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability11.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability11.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability11.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability11.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability11.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability11.ts, 3, 1)) export var obj = {two: 1}; diff --git a/tests/baselines/reference/assignmentCompatability11.types b/tests/baselines/reference/assignmentCompatability11.types index d42af43b41c75..c31dff580f78f 100644 --- a/tests/baselines/reference/assignmentCompatability11.types +++ b/tests/baselines/reference/assignmentCompatability11.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability11.ts] //// === assignmentCompatability11.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability12.errors.txt b/tests/baselines/reference/assignmentCompatability12.errors.txt index 4156d20c5a293..1e1f4da48e6fb 100644 --- a/tests/baselines/reference/assignmentCompatability12.errors.txt +++ b/tests/baselines/reference/assignmentCompatability12.errors.txt @@ -4,11 +4,11 @@ assignmentCompatability12.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability12.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var obj = {one: "1"}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability12.js b/tests/baselines/reference/assignmentCompatability12.js index a061c54dd5902..be8b5d994d113 100644 --- a/tests/baselines/reference/assignmentCompatability12.js +++ b/tests/baselines/reference/assignmentCompatability12.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability12.ts] //// //// [assignmentCompatability12.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {one: "1"}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability12.symbols b/tests/baselines/reference/assignmentCompatability12.symbols index 33aefaae8eff0..3e9da20487161 100644 --- a/tests/baselines/reference/assignmentCompatability12.symbols +++ b/tests/baselines/reference/assignmentCompatability12.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability12.ts] //// === assignmentCompatability12.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability12.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability12.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability12.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability12.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability12.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability12.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability12.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability12.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability12.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability12.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability12.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability12.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability12.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability12.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability12.ts, 3, 1)) export var obj = {one: "1"}; diff --git a/tests/baselines/reference/assignmentCompatability12.types b/tests/baselines/reference/assignmentCompatability12.types index 63247587df0a4..7239836bd1447 100644 --- a/tests/baselines/reference/assignmentCompatability12.types +++ b/tests/baselines/reference/assignmentCompatability12.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability12.ts] //// === assignmentCompatability12.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability13.errors.txt b/tests/baselines/reference/assignmentCompatability13.errors.txt index 99b3a3e41f35d..9d65ecfafea47 100644 --- a/tests/baselines/reference/assignmentCompatability13.errors.txt +++ b/tests/baselines/reference/assignmentCompatability13.errors.txt @@ -3,11 +3,11 @@ assignmentCompatability13.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability13.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var obj = {two: "1"}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability13.js b/tests/baselines/reference/assignmentCompatability13.js index 0c5b80716e519..248d3be39bfa3 100644 --- a/tests/baselines/reference/assignmentCompatability13.js +++ b/tests/baselines/reference/assignmentCompatability13.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability13.ts] //// //// [assignmentCompatability13.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {two: "1"}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability13.symbols b/tests/baselines/reference/assignmentCompatability13.symbols index 49f0057968a55..7d0be0ced307c 100644 --- a/tests/baselines/reference/assignmentCompatability13.symbols +++ b/tests/baselines/reference/assignmentCompatability13.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability13.ts] //// === assignmentCompatability13.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability13.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability13.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability13.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability13.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability13.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability13.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability13.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability13.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability13.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability13.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability13.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability13.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability13.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability13.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability13.ts, 3, 1)) export var obj = {two: "1"}; diff --git a/tests/baselines/reference/assignmentCompatability13.types b/tests/baselines/reference/assignmentCompatability13.types index 80565d89114be..212d104782b2c 100644 --- a/tests/baselines/reference/assignmentCompatability13.types +++ b/tests/baselines/reference/assignmentCompatability13.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability13.ts] //// === assignmentCompatability13.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability14.errors.txt b/tests/baselines/reference/assignmentCompatability14.errors.txt index f32b599604baa..a97b3c7e4ec53 100644 --- a/tests/baselines/reference/assignmentCompatability14.errors.txt +++ b/tests/baselines/reference/assignmentCompatability14.errors.txt @@ -4,11 +4,11 @@ assignmentCompatability14.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability14.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var obj = {one: true}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability14.js b/tests/baselines/reference/assignmentCompatability14.js index 2d64de2164088..fe40338fa4613 100644 --- a/tests/baselines/reference/assignmentCompatability14.js +++ b/tests/baselines/reference/assignmentCompatability14.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability14.ts] //// //// [assignmentCompatability14.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {one: true}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability14.symbols b/tests/baselines/reference/assignmentCompatability14.symbols index 1aa645e13570b..35ed2f2fa6090 100644 --- a/tests/baselines/reference/assignmentCompatability14.symbols +++ b/tests/baselines/reference/assignmentCompatability14.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability14.ts] //// === assignmentCompatability14.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability14.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability14.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability14.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability14.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability14.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability14.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability14.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability14.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability14.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability14.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability14.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability14.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability14.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability14.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability14.ts, 3, 1)) export var obj = {one: true}; diff --git a/tests/baselines/reference/assignmentCompatability14.types b/tests/baselines/reference/assignmentCompatability14.types index 8c23f7d587be3..61db491ba3c0e 100644 --- a/tests/baselines/reference/assignmentCompatability14.types +++ b/tests/baselines/reference/assignmentCompatability14.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability14.ts] //// === assignmentCompatability14.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability15.errors.txt b/tests/baselines/reference/assignmentCompatability15.errors.txt index a3726fb2e9fa8..c89069ea94e8d 100644 --- a/tests/baselines/reference/assignmentCompatability15.errors.txt +++ b/tests/baselines/reference/assignmentCompatability15.errors.txt @@ -4,11 +4,11 @@ assignmentCompatability15.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability15.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var obj = {two: true}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability15.js b/tests/baselines/reference/assignmentCompatability15.js index 7bedfc7465c3d..eaee07a0b8405 100644 --- a/tests/baselines/reference/assignmentCompatability15.js +++ b/tests/baselines/reference/assignmentCompatability15.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability15.ts] //// //// [assignmentCompatability15.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {two: true}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability15.symbols b/tests/baselines/reference/assignmentCompatability15.symbols index f52a3ab57087e..39f44949afa5b 100644 --- a/tests/baselines/reference/assignmentCompatability15.symbols +++ b/tests/baselines/reference/assignmentCompatability15.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability15.ts] //// === assignmentCompatability15.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability15.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability15.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability15.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability15.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability15.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability15.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability15.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability15.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability15.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability15.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability15.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability15.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability15.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability15.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability15.ts, 3, 1)) export var obj = {two: true}; diff --git a/tests/baselines/reference/assignmentCompatability15.types b/tests/baselines/reference/assignmentCompatability15.types index 0c5fbff2361b3..685d4aada8e78 100644 --- a/tests/baselines/reference/assignmentCompatability15.types +++ b/tests/baselines/reference/assignmentCompatability15.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability15.ts] //// === assignmentCompatability15.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability16.errors.txt b/tests/baselines/reference/assignmentCompatability16.errors.txt index 060dd9436aae3..9fa4c1d1f4f40 100644 --- a/tests/baselines/reference/assignmentCompatability16.errors.txt +++ b/tests/baselines/reference/assignmentCompatability16.errors.txt @@ -4,11 +4,11 @@ assignmentCompatability16.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability16.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var obj = {one: [1]}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability16.js b/tests/baselines/reference/assignmentCompatability16.js index 26f7d384105ec..e6f151a8c0e20 100644 --- a/tests/baselines/reference/assignmentCompatability16.js +++ b/tests/baselines/reference/assignmentCompatability16.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability16.ts] //// //// [assignmentCompatability16.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {one: [1]}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability16.symbols b/tests/baselines/reference/assignmentCompatability16.symbols index 99ca24c67cd88..e9742f5ca0c7e 100644 --- a/tests/baselines/reference/assignmentCompatability16.symbols +++ b/tests/baselines/reference/assignmentCompatability16.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability16.ts] //// === assignmentCompatability16.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability16.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability16.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability16.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability16.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability16.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability16.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability16.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability16.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability16.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability16.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability16.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability16.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability16.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability16.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability16.ts, 3, 1)) export var obj = {one: [1]}; diff --git a/tests/baselines/reference/assignmentCompatability16.types b/tests/baselines/reference/assignmentCompatability16.types index 57c13f369a287..65c791abb9525 100644 --- a/tests/baselines/reference/assignmentCompatability16.types +++ b/tests/baselines/reference/assignmentCompatability16.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability16.ts] //// === assignmentCompatability16.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability17.errors.txt b/tests/baselines/reference/assignmentCompatability17.errors.txt index 5b644b0f0142f..2813e6c21a65b 100644 --- a/tests/baselines/reference/assignmentCompatability17.errors.txt +++ b/tests/baselines/reference/assignmentCompatability17.errors.txt @@ -4,11 +4,11 @@ assignmentCompatability17.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability17.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var obj = {two: [1]}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability17.js b/tests/baselines/reference/assignmentCompatability17.js index 3c313cfb85ecb..4b91c72cb9972 100644 --- a/tests/baselines/reference/assignmentCompatability17.js +++ b/tests/baselines/reference/assignmentCompatability17.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability17.ts] //// //// [assignmentCompatability17.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {two: [1]}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability17.symbols b/tests/baselines/reference/assignmentCompatability17.symbols index 8b7055b7cd831..2c0c7c8b4646c 100644 --- a/tests/baselines/reference/assignmentCompatability17.symbols +++ b/tests/baselines/reference/assignmentCompatability17.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability17.ts] //// === assignmentCompatability17.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability17.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability17.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability17.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability17.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability17.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability17.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability17.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability17.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability17.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability17.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability17.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability17.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability17.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability17.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability17.ts, 3, 1)) export var obj = {two: [1]}; diff --git a/tests/baselines/reference/assignmentCompatability17.types b/tests/baselines/reference/assignmentCompatability17.types index 2a4887eb49cf4..c61b0a2bf47ea 100644 --- a/tests/baselines/reference/assignmentCompatability17.types +++ b/tests/baselines/reference/assignmentCompatability17.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability17.ts] //// === assignmentCompatability17.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability18.errors.txt b/tests/baselines/reference/assignmentCompatability18.errors.txt index dd7d852885890..d4e0768487493 100644 --- a/tests/baselines/reference/assignmentCompatability18.errors.txt +++ b/tests/baselines/reference/assignmentCompatability18.errors.txt @@ -4,11 +4,11 @@ assignmentCompatability18.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability18.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var obj = {one: [1]}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability18.js b/tests/baselines/reference/assignmentCompatability18.js index 0248777c90bc8..92d0d89d2101b 100644 --- a/tests/baselines/reference/assignmentCompatability18.js +++ b/tests/baselines/reference/assignmentCompatability18.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability18.ts] //// //// [assignmentCompatability18.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {one: [1]}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability18.symbols b/tests/baselines/reference/assignmentCompatability18.symbols index 03503786f3c92..c15d5a7e92dff 100644 --- a/tests/baselines/reference/assignmentCompatability18.symbols +++ b/tests/baselines/reference/assignmentCompatability18.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability18.ts] //// === assignmentCompatability18.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability18.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability18.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability18.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability18.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability18.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability18.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability18.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability18.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability18.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability18.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability18.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability18.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability18.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability18.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability18.ts, 3, 1)) export var obj = {one: [1]}; diff --git a/tests/baselines/reference/assignmentCompatability18.types b/tests/baselines/reference/assignmentCompatability18.types index 13c5ecc99a1b4..0e2f5a97f0bd7 100644 --- a/tests/baselines/reference/assignmentCompatability18.types +++ b/tests/baselines/reference/assignmentCompatability18.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability18.ts] //// === assignmentCompatability18.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability19.errors.txt b/tests/baselines/reference/assignmentCompatability19.errors.txt index 111f623baf545..bf0252f855909 100644 --- a/tests/baselines/reference/assignmentCompatability19.errors.txt +++ b/tests/baselines/reference/assignmentCompatability19.errors.txt @@ -4,11 +4,11 @@ assignmentCompatability19.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability19.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var obj = {two: [1]}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability19.js b/tests/baselines/reference/assignmentCompatability19.js index 97f80e669be78..638c2bc22b161 100644 --- a/tests/baselines/reference/assignmentCompatability19.js +++ b/tests/baselines/reference/assignmentCompatability19.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability19.ts] //// //// [assignmentCompatability19.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {two: [1]}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability19.symbols b/tests/baselines/reference/assignmentCompatability19.symbols index cd1b176dc5e04..c983c718f1008 100644 --- a/tests/baselines/reference/assignmentCompatability19.symbols +++ b/tests/baselines/reference/assignmentCompatability19.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability19.ts] //// === assignmentCompatability19.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability19.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability19.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability19.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability19.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability19.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability19.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability19.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability19.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability19.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability19.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability19.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability19.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability19.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability19.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability19.ts, 3, 1)) export var obj = {two: [1]}; diff --git a/tests/baselines/reference/assignmentCompatability19.types b/tests/baselines/reference/assignmentCompatability19.types index 99952b4b5015f..a6d54acad985e 100644 --- a/tests/baselines/reference/assignmentCompatability19.types +++ b/tests/baselines/reference/assignmentCompatability19.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability19.ts] //// === assignmentCompatability19.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability2.js b/tests/baselines/reference/assignmentCompatability2.js index e3ddf2f1d17d7..5b92dfb77d358 100644 --- a/tests/baselines/reference/assignmentCompatability2.js +++ b/tests/baselines/reference/assignmentCompatability2.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability2.ts] //// //// [assignmentCompatability2.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{};; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability2.symbols b/tests/baselines/reference/assignmentCompatability2.symbols index fc7cfa6099a2c..43437433240d3 100644 --- a/tests/baselines/reference/assignmentCompatability2.symbols +++ b/tests/baselines/reference/assignmentCompatability2.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability2.ts] //// === assignmentCompatability2.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability2.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability2.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability2.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability2.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability2.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability2.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability2.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability2.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability2.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability2.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability2.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability2.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability2.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability2.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability2.ts, 3, 1)) export var aa:{};; diff --git a/tests/baselines/reference/assignmentCompatability2.types b/tests/baselines/reference/assignmentCompatability2.types index f35cbfccb0d0e..2fd841a73d30b 100644 --- a/tests/baselines/reference/assignmentCompatability2.types +++ b/tests/baselines/reference/assignmentCompatability2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability2.ts] //// === assignmentCompatability2.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability20.errors.txt b/tests/baselines/reference/assignmentCompatability20.errors.txt index 249ded8a2dcc4..508fae8568d22 100644 --- a/tests/baselines/reference/assignmentCompatability20.errors.txt +++ b/tests/baselines/reference/assignmentCompatability20.errors.txt @@ -4,11 +4,11 @@ assignmentCompatability20.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability20.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var obj = {one: ["1"]}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability20.js b/tests/baselines/reference/assignmentCompatability20.js index 6497767bef47e..e5743ce43c336 100644 --- a/tests/baselines/reference/assignmentCompatability20.js +++ b/tests/baselines/reference/assignmentCompatability20.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability20.ts] //// //// [assignmentCompatability20.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {one: ["1"]}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability20.symbols b/tests/baselines/reference/assignmentCompatability20.symbols index d8b006cd4f5a3..452a111423cfb 100644 --- a/tests/baselines/reference/assignmentCompatability20.symbols +++ b/tests/baselines/reference/assignmentCompatability20.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability20.ts] //// === assignmentCompatability20.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability20.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability20.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability20.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability20.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability20.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability20.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability20.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability20.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability20.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability20.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability20.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability20.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability20.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability20.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability20.ts, 3, 1)) export var obj = {one: ["1"]}; diff --git a/tests/baselines/reference/assignmentCompatability20.types b/tests/baselines/reference/assignmentCompatability20.types index 1d9be3931ef3a..3228c05f7c191 100644 --- a/tests/baselines/reference/assignmentCompatability20.types +++ b/tests/baselines/reference/assignmentCompatability20.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability20.ts] //// === assignmentCompatability20.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability21.errors.txt b/tests/baselines/reference/assignmentCompatability21.errors.txt index cdee4dd3d2e06..d11e65b94c989 100644 --- a/tests/baselines/reference/assignmentCompatability21.errors.txt +++ b/tests/baselines/reference/assignmentCompatability21.errors.txt @@ -4,11 +4,11 @@ assignmentCompatability21.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability21.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var obj = {two: ["1"]}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability21.js b/tests/baselines/reference/assignmentCompatability21.js index 3d588d6e2d071..963bd13a87104 100644 --- a/tests/baselines/reference/assignmentCompatability21.js +++ b/tests/baselines/reference/assignmentCompatability21.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability21.ts] //// //// [assignmentCompatability21.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {two: ["1"]}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability21.symbols b/tests/baselines/reference/assignmentCompatability21.symbols index 4d5735d9644d9..d4825d56433f7 100644 --- a/tests/baselines/reference/assignmentCompatability21.symbols +++ b/tests/baselines/reference/assignmentCompatability21.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability21.ts] //// === assignmentCompatability21.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability21.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability21.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability21.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability21.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability21.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability21.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability21.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability21.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability21.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability21.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability21.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability21.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability21.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability21.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability21.ts, 3, 1)) export var obj = {two: ["1"]}; diff --git a/tests/baselines/reference/assignmentCompatability21.types b/tests/baselines/reference/assignmentCompatability21.types index bf75ed9509617..a39c42867d980 100644 --- a/tests/baselines/reference/assignmentCompatability21.types +++ b/tests/baselines/reference/assignmentCompatability21.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability21.ts] //// === assignmentCompatability21.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability22.errors.txt b/tests/baselines/reference/assignmentCompatability22.errors.txt index da9cd1e4c5759..1e54014d45996 100644 --- a/tests/baselines/reference/assignmentCompatability22.errors.txt +++ b/tests/baselines/reference/assignmentCompatability22.errors.txt @@ -4,11 +4,11 @@ assignmentCompatability22.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability22.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var obj = {one: [true]}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability22.js b/tests/baselines/reference/assignmentCompatability22.js index 7f21694ebbdee..9e2994c0de4b1 100644 --- a/tests/baselines/reference/assignmentCompatability22.js +++ b/tests/baselines/reference/assignmentCompatability22.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability22.ts] //// //// [assignmentCompatability22.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {one: [true]}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability22.symbols b/tests/baselines/reference/assignmentCompatability22.symbols index 7ca49b21d9242..0c785e2d552a7 100644 --- a/tests/baselines/reference/assignmentCompatability22.symbols +++ b/tests/baselines/reference/assignmentCompatability22.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability22.ts] //// === assignmentCompatability22.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability22.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability22.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability22.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability22.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability22.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability22.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability22.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability22.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability22.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability22.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability22.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability22.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability22.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability22.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability22.ts, 3, 1)) export var obj = {one: [true]}; diff --git a/tests/baselines/reference/assignmentCompatability22.types b/tests/baselines/reference/assignmentCompatability22.types index 97858c30b7cea..51a1a24302651 100644 --- a/tests/baselines/reference/assignmentCompatability22.types +++ b/tests/baselines/reference/assignmentCompatability22.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability22.ts] //// === assignmentCompatability22.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability23.errors.txt b/tests/baselines/reference/assignmentCompatability23.errors.txt index 0b3b422b60c5d..11d78b22c6de9 100644 --- a/tests/baselines/reference/assignmentCompatability23.errors.txt +++ b/tests/baselines/reference/assignmentCompatability23.errors.txt @@ -4,11 +4,11 @@ assignmentCompatability23.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability23.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var obj = {two: [true]}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability23.js b/tests/baselines/reference/assignmentCompatability23.js index 3fa5f0aaeff18..81a3b770b981e 100644 --- a/tests/baselines/reference/assignmentCompatability23.js +++ b/tests/baselines/reference/assignmentCompatability23.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability23.ts] //// //// [assignmentCompatability23.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {two: [true]}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability23.symbols b/tests/baselines/reference/assignmentCompatability23.symbols index c44349cfa649a..e1b5dac40da43 100644 --- a/tests/baselines/reference/assignmentCompatability23.symbols +++ b/tests/baselines/reference/assignmentCompatability23.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability23.ts] //// === assignmentCompatability23.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability23.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability23.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability23.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability23.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability23.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability23.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability23.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability23.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability23.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability23.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability23.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability23.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability23.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability23.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability23.ts, 3, 1)) export var obj = {two: [true]}; diff --git a/tests/baselines/reference/assignmentCompatability23.types b/tests/baselines/reference/assignmentCompatability23.types index 0bb44a107fc55..eecbc82b56f06 100644 --- a/tests/baselines/reference/assignmentCompatability23.types +++ b/tests/baselines/reference/assignmentCompatability23.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability23.ts] //// === assignmentCompatability23.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability24.errors.txt b/tests/baselines/reference/assignmentCompatability24.errors.txt index 7298208241e28..7c9d65f79beb7 100644 --- a/tests/baselines/reference/assignmentCompatability24.errors.txt +++ b/tests/baselines/reference/assignmentCompatability24.errors.txt @@ -3,11 +3,11 @@ assignmentCompatability24.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability24.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var obj = function f(a: Tstring) { return a; };; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability24.js b/tests/baselines/reference/assignmentCompatability24.js index 1e2c84b3d44bc..d2d615089087a 100644 --- a/tests/baselines/reference/assignmentCompatability24.js +++ b/tests/baselines/reference/assignmentCompatability24.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability24.ts] //// //// [assignmentCompatability24.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = function f(a: Tstring) { return a; };; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability24.symbols b/tests/baselines/reference/assignmentCompatability24.symbols index 714fe18cfb4d4..e4656b5e7af9b 100644 --- a/tests/baselines/reference/assignmentCompatability24.symbols +++ b/tests/baselines/reference/assignmentCompatability24.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability24.ts] //// === assignmentCompatability24.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability24.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability24.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability24.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability24.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability24.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability24.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability24.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability24.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability24.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability24.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability24.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability24.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability24.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability24.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability24.ts, 3, 1)) export var obj = function f(a: Tstring) { return a; };; diff --git a/tests/baselines/reference/assignmentCompatability24.types b/tests/baselines/reference/assignmentCompatability24.types index 4e964a3a6dfcb..a836668c11670 100644 --- a/tests/baselines/reference/assignmentCompatability24.types +++ b/tests/baselines/reference/assignmentCompatability24.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability24.ts] //// === assignmentCompatability24.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability25.errors.txt b/tests/baselines/reference/assignmentCompatability25.errors.txt index 8c1a2431ba6a3..1365d72dbe80b 100644 --- a/tests/baselines/reference/assignmentCompatability25.errors.txt +++ b/tests/baselines/reference/assignmentCompatability25.errors.txt @@ -4,11 +4,11 @@ assignmentCompatability25.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability25.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var aa:{two:number;};; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability25.js b/tests/baselines/reference/assignmentCompatability25.js index 9de3bd3f356f9..ddecd417f5555 100644 --- a/tests/baselines/reference/assignmentCompatability25.js +++ b/tests/baselines/reference/assignmentCompatability25.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability25.ts] //// //// [assignmentCompatability25.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{two:number;};; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability25.symbols b/tests/baselines/reference/assignmentCompatability25.symbols index 80db7327feb92..3d602bb194eae 100644 --- a/tests/baselines/reference/assignmentCompatability25.symbols +++ b/tests/baselines/reference/assignmentCompatability25.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability25.ts] //// === assignmentCompatability25.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability25.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability25.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability25.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability25.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability25.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability25.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability25.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability25.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability25.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability25.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability25.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability25.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability25.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability25.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability25.ts, 3, 1)) export var aa:{two:number;};; diff --git a/tests/baselines/reference/assignmentCompatability25.types b/tests/baselines/reference/assignmentCompatability25.types index 260d0de3586b5..1738f1953ac6b 100644 --- a/tests/baselines/reference/assignmentCompatability25.types +++ b/tests/baselines/reference/assignmentCompatability25.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability25.ts] //// === assignmentCompatability25.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability26.errors.txt b/tests/baselines/reference/assignmentCompatability26.errors.txt index 014f618d473d8..09f22ae33cfaa 100644 --- a/tests/baselines/reference/assignmentCompatability26.errors.txt +++ b/tests/baselines/reference/assignmentCompatability26.errors.txt @@ -4,11 +4,11 @@ assignmentCompatability26.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability26.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var aa:{one:string;};; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability26.js b/tests/baselines/reference/assignmentCompatability26.js index 759f6b5d5d644..c279c20af49e7 100644 --- a/tests/baselines/reference/assignmentCompatability26.js +++ b/tests/baselines/reference/assignmentCompatability26.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability26.ts] //// //// [assignmentCompatability26.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{one:string;};; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability26.symbols b/tests/baselines/reference/assignmentCompatability26.symbols index 6ae16fc87eb3f..a4f22faa888bb 100644 --- a/tests/baselines/reference/assignmentCompatability26.symbols +++ b/tests/baselines/reference/assignmentCompatability26.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability26.ts] //// === assignmentCompatability26.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability26.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability26.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability26.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability26.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability26.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability26.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability26.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability26.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability26.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability26.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability26.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability26.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability26.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability26.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability26.ts, 3, 1)) export var aa:{one:string;};; diff --git a/tests/baselines/reference/assignmentCompatability26.types b/tests/baselines/reference/assignmentCompatability26.types index a8b9af810d7c4..0c0d7f1858a24 100644 --- a/tests/baselines/reference/assignmentCompatability26.types +++ b/tests/baselines/reference/assignmentCompatability26.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability26.ts] //// === assignmentCompatability26.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability27.errors.txt b/tests/baselines/reference/assignmentCompatability27.errors.txt index 1dae5a7495c23..ec9952475f512 100644 --- a/tests/baselines/reference/assignmentCompatability27.errors.txt +++ b/tests/baselines/reference/assignmentCompatability27.errors.txt @@ -3,11 +3,11 @@ assignmentCompatability27.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability27.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var aa:{two:string;};; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability27.js b/tests/baselines/reference/assignmentCompatability27.js index 3254ed0e4383f..13e4ee3a25dc3 100644 --- a/tests/baselines/reference/assignmentCompatability27.js +++ b/tests/baselines/reference/assignmentCompatability27.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability27.ts] //// //// [assignmentCompatability27.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{two:string;};; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability27.symbols b/tests/baselines/reference/assignmentCompatability27.symbols index bdebf4cbbf2e0..3747307bc5bf4 100644 --- a/tests/baselines/reference/assignmentCompatability27.symbols +++ b/tests/baselines/reference/assignmentCompatability27.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability27.ts] //// === assignmentCompatability27.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability27.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability27.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability27.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability27.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability27.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability27.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability27.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability27.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability27.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability27.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability27.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability27.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability27.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability27.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability27.ts, 3, 1)) export var aa:{two:string;};; diff --git a/tests/baselines/reference/assignmentCompatability27.types b/tests/baselines/reference/assignmentCompatability27.types index 650081348d5a1..fdc998a5a475a 100644 --- a/tests/baselines/reference/assignmentCompatability27.types +++ b/tests/baselines/reference/assignmentCompatability27.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability27.ts] //// === assignmentCompatability27.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability28.errors.txt b/tests/baselines/reference/assignmentCompatability28.errors.txt index fda541dc3f37f..91d0fe893a0d4 100644 --- a/tests/baselines/reference/assignmentCompatability28.errors.txt +++ b/tests/baselines/reference/assignmentCompatability28.errors.txt @@ -4,11 +4,11 @@ assignmentCompatability28.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability28.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var aa:{one:boolean;};; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability28.js b/tests/baselines/reference/assignmentCompatability28.js index 38eeb3faf58a5..a01d47869093d 100644 --- a/tests/baselines/reference/assignmentCompatability28.js +++ b/tests/baselines/reference/assignmentCompatability28.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability28.ts] //// //// [assignmentCompatability28.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{one:boolean;};; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability28.symbols b/tests/baselines/reference/assignmentCompatability28.symbols index fce7e5fe94f42..0fff0f4be1e56 100644 --- a/tests/baselines/reference/assignmentCompatability28.symbols +++ b/tests/baselines/reference/assignmentCompatability28.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability28.ts] //// === assignmentCompatability28.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability28.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability28.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability28.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability28.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability28.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability28.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability28.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability28.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability28.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability28.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability28.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability28.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability28.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability28.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability28.ts, 3, 1)) export var aa:{one:boolean;};; diff --git a/tests/baselines/reference/assignmentCompatability28.types b/tests/baselines/reference/assignmentCompatability28.types index 28ffa9e19000e..796c44c03fb37 100644 --- a/tests/baselines/reference/assignmentCompatability28.types +++ b/tests/baselines/reference/assignmentCompatability28.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability28.ts] //// === assignmentCompatability28.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability29.errors.txt b/tests/baselines/reference/assignmentCompatability29.errors.txt index 3e9056460ad10..43bd27f8d4309 100644 --- a/tests/baselines/reference/assignmentCompatability29.errors.txt +++ b/tests/baselines/reference/assignmentCompatability29.errors.txt @@ -4,11 +4,11 @@ assignmentCompatability29.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability29.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var aa:{one:any[];};; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability29.js b/tests/baselines/reference/assignmentCompatability29.js index 01d7f9699e94f..c8e322becedf9 100644 --- a/tests/baselines/reference/assignmentCompatability29.js +++ b/tests/baselines/reference/assignmentCompatability29.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability29.ts] //// //// [assignmentCompatability29.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{one:any[];};; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability29.symbols b/tests/baselines/reference/assignmentCompatability29.symbols index 71d34eeeb5d77..9c17c7e4ce411 100644 --- a/tests/baselines/reference/assignmentCompatability29.symbols +++ b/tests/baselines/reference/assignmentCompatability29.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability29.ts] //// === assignmentCompatability29.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability29.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability29.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability29.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability29.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability29.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability29.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability29.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability29.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability29.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability29.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability29.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability29.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability29.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability29.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability29.ts, 3, 1)) export var aa:{one:any[];};; diff --git a/tests/baselines/reference/assignmentCompatability29.types b/tests/baselines/reference/assignmentCompatability29.types index 00b3166741639..d63d6f454d6d1 100644 --- a/tests/baselines/reference/assignmentCompatability29.types +++ b/tests/baselines/reference/assignmentCompatability29.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability29.ts] //// === assignmentCompatability29.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability3.js b/tests/baselines/reference/assignmentCompatability3.js index b2bccf4bb2301..116e44f5f020f 100644 --- a/tests/baselines/reference/assignmentCompatability3.js +++ b/tests/baselines/reference/assignmentCompatability3.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability3.ts] //// //// [assignmentCompatability3.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {one: 1}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability3.symbols b/tests/baselines/reference/assignmentCompatability3.symbols index 73a62de6a4676..8c724878b84d6 100644 --- a/tests/baselines/reference/assignmentCompatability3.symbols +++ b/tests/baselines/reference/assignmentCompatability3.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability3.ts] //// === assignmentCompatability3.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability3.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability3.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability3.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability3.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability3.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability3.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability3.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability3.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability3.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability3.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability3.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability3.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability3.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability3.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability3.ts, 3, 1)) export var obj = {one: 1}; diff --git a/tests/baselines/reference/assignmentCompatability3.types b/tests/baselines/reference/assignmentCompatability3.types index 33a797448411a..195a546f3b6a2 100644 --- a/tests/baselines/reference/assignmentCompatability3.types +++ b/tests/baselines/reference/assignmentCompatability3.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability3.ts] //// === assignmentCompatability3.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability30.errors.txt b/tests/baselines/reference/assignmentCompatability30.errors.txt index 4dfa8802383c3..f6923c3f98015 100644 --- a/tests/baselines/reference/assignmentCompatability30.errors.txt +++ b/tests/baselines/reference/assignmentCompatability30.errors.txt @@ -4,11 +4,11 @@ assignmentCompatability30.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability30.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var aa:{one:number[];};; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability30.js b/tests/baselines/reference/assignmentCompatability30.js index 75184f3eed26b..98b626d4192c5 100644 --- a/tests/baselines/reference/assignmentCompatability30.js +++ b/tests/baselines/reference/assignmentCompatability30.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability30.ts] //// //// [assignmentCompatability30.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{one:number[];};; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability30.symbols b/tests/baselines/reference/assignmentCompatability30.symbols index 484dc22fb5302..7a1bc266947b1 100644 --- a/tests/baselines/reference/assignmentCompatability30.symbols +++ b/tests/baselines/reference/assignmentCompatability30.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability30.ts] //// === assignmentCompatability30.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability30.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability30.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability30.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability30.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability30.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability30.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability30.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability30.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability30.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability30.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability30.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability30.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability30.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability30.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability30.ts, 3, 1)) export var aa:{one:number[];};; diff --git a/tests/baselines/reference/assignmentCompatability30.types b/tests/baselines/reference/assignmentCompatability30.types index bb9795b0b9b7e..764c8bf3ed1c4 100644 --- a/tests/baselines/reference/assignmentCompatability30.types +++ b/tests/baselines/reference/assignmentCompatability30.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability30.ts] //// === assignmentCompatability30.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability31.errors.txt b/tests/baselines/reference/assignmentCompatability31.errors.txt index 680c03f7e7d3d..695fbe45c99c4 100644 --- a/tests/baselines/reference/assignmentCompatability31.errors.txt +++ b/tests/baselines/reference/assignmentCompatability31.errors.txt @@ -4,11 +4,11 @@ assignmentCompatability31.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability31.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var aa:{one:string[];};; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability31.js b/tests/baselines/reference/assignmentCompatability31.js index 072415fdf3211..50670044f8957 100644 --- a/tests/baselines/reference/assignmentCompatability31.js +++ b/tests/baselines/reference/assignmentCompatability31.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability31.ts] //// //// [assignmentCompatability31.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{one:string[];};; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability31.symbols b/tests/baselines/reference/assignmentCompatability31.symbols index 751323fcaad90..8c6afa9836c2e 100644 --- a/tests/baselines/reference/assignmentCompatability31.symbols +++ b/tests/baselines/reference/assignmentCompatability31.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability31.ts] //// === assignmentCompatability31.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability31.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability31.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability31.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability31.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability31.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability31.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability31.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability31.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability31.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability31.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability31.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability31.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability31.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability31.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability31.ts, 3, 1)) export var aa:{one:string[];};; diff --git a/tests/baselines/reference/assignmentCompatability31.types b/tests/baselines/reference/assignmentCompatability31.types index a9eb60e83b522..b3930e1f337d0 100644 --- a/tests/baselines/reference/assignmentCompatability31.types +++ b/tests/baselines/reference/assignmentCompatability31.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability31.ts] //// === assignmentCompatability31.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability32.errors.txt b/tests/baselines/reference/assignmentCompatability32.errors.txt index dd1d9838a4737..3173634905e57 100644 --- a/tests/baselines/reference/assignmentCompatability32.errors.txt +++ b/tests/baselines/reference/assignmentCompatability32.errors.txt @@ -4,11 +4,11 @@ assignmentCompatability32.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability32.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var aa:{one:boolean[];};; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability32.js b/tests/baselines/reference/assignmentCompatability32.js index 20d659b1c57f8..1e83ba4954947 100644 --- a/tests/baselines/reference/assignmentCompatability32.js +++ b/tests/baselines/reference/assignmentCompatability32.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability32.ts] //// //// [assignmentCompatability32.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{one:boolean[];};; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability32.symbols b/tests/baselines/reference/assignmentCompatability32.symbols index f2d625c4ed910..7198e43ed53ca 100644 --- a/tests/baselines/reference/assignmentCompatability32.symbols +++ b/tests/baselines/reference/assignmentCompatability32.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability32.ts] //// === assignmentCompatability32.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability32.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability32.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability32.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability32.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability32.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability32.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability32.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability32.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability32.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability32.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability32.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability32.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability32.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability32.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability32.ts, 3, 1)) export var aa:{one:boolean[];};; diff --git a/tests/baselines/reference/assignmentCompatability32.types b/tests/baselines/reference/assignmentCompatability32.types index 69b6e1cab8f5c..fb0c23f3f15ed 100644 --- a/tests/baselines/reference/assignmentCompatability32.types +++ b/tests/baselines/reference/assignmentCompatability32.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability32.ts] //// === assignmentCompatability32.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability33.errors.txt b/tests/baselines/reference/assignmentCompatability33.errors.txt index ca248ffd6f4fc..ddc864025e987 100644 --- a/tests/baselines/reference/assignmentCompatability33.errors.txt +++ b/tests/baselines/reference/assignmentCompatability33.errors.txt @@ -3,11 +3,11 @@ assignmentCompatability33.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability33.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var obj: { (a: Tstring): Tstring; }; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability33.js b/tests/baselines/reference/assignmentCompatability33.js index 3861690326f00..d54efee1ce8ac 100644 --- a/tests/baselines/reference/assignmentCompatability33.js +++ b/tests/baselines/reference/assignmentCompatability33.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability33.ts] //// //// [assignmentCompatability33.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj: { (a: Tstring): Tstring; }; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability33.symbols b/tests/baselines/reference/assignmentCompatability33.symbols index 16c15c3802be7..00ebf18b0c3f8 100644 --- a/tests/baselines/reference/assignmentCompatability33.symbols +++ b/tests/baselines/reference/assignmentCompatability33.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability33.ts] //// === assignmentCompatability33.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability33.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability33.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability33.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability33.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability33.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability33.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability33.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability33.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability33.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability33.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability33.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability33.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability33.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability33.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability33.ts, 3, 1)) export var obj: { (a: Tstring): Tstring; }; diff --git a/tests/baselines/reference/assignmentCompatability33.types b/tests/baselines/reference/assignmentCompatability33.types index 216500a14bad4..9ce33b0cae3fd 100644 --- a/tests/baselines/reference/assignmentCompatability33.types +++ b/tests/baselines/reference/assignmentCompatability33.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability33.ts] //// === assignmentCompatability33.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability34.errors.txt b/tests/baselines/reference/assignmentCompatability34.errors.txt index 5519c0c36d890..f04d2df6e92fd 100644 --- a/tests/baselines/reference/assignmentCompatability34.errors.txt +++ b/tests/baselines/reference/assignmentCompatability34.errors.txt @@ -3,11 +3,11 @@ assignmentCompatability34.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability34.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var obj: { (a:Tnumber):Tnumber;}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability34.js b/tests/baselines/reference/assignmentCompatability34.js index 9196251778fb7..a754c725badb9 100644 --- a/tests/baselines/reference/assignmentCompatability34.js +++ b/tests/baselines/reference/assignmentCompatability34.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability34.ts] //// //// [assignmentCompatability34.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj: { (a:Tnumber):Tnumber;}; export var __val__obj = obj; } diff --git a/tests/baselines/reference/assignmentCompatability34.symbols b/tests/baselines/reference/assignmentCompatability34.symbols index 9a184ed4b5577..f458b6a3fec14 100644 --- a/tests/baselines/reference/assignmentCompatability34.symbols +++ b/tests/baselines/reference/assignmentCompatability34.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability34.ts] //// === assignmentCompatability34.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability34.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability34.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability34.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability34.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability34.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability34.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability34.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability34.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability34.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability34.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability34.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability34.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability34.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability34.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability34.ts, 3, 1)) export var obj: { (a:Tnumber):Tnumber;}; diff --git a/tests/baselines/reference/assignmentCompatability34.types b/tests/baselines/reference/assignmentCompatability34.types index 874597fae32b1..279673048a5f2 100644 --- a/tests/baselines/reference/assignmentCompatability34.types +++ b/tests/baselines/reference/assignmentCompatability34.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability34.ts] //// === assignmentCompatability34.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability35.errors.txt b/tests/baselines/reference/assignmentCompatability35.errors.txt index 2a1082e2ffa2c..3c6be3e35a2bf 100644 --- a/tests/baselines/reference/assignmentCompatability35.errors.txt +++ b/tests/baselines/reference/assignmentCompatability35.errors.txt @@ -3,11 +3,11 @@ assignmentCompatability35.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability35.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var aa:{[index:number]:number;};; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability35.js b/tests/baselines/reference/assignmentCompatability35.js index f85febc9d0e1c..6a6110fda9bb6 100644 --- a/tests/baselines/reference/assignmentCompatability35.js +++ b/tests/baselines/reference/assignmentCompatability35.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability35.ts] //// //// [assignmentCompatability35.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{[index:number]:number;};; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability35.symbols b/tests/baselines/reference/assignmentCompatability35.symbols index e803f9f470caa..bc35b795a17a4 100644 --- a/tests/baselines/reference/assignmentCompatability35.symbols +++ b/tests/baselines/reference/assignmentCompatability35.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability35.ts] //// === assignmentCompatability35.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability35.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability35.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability35.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability35.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability35.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability35.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability35.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability35.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability35.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability35.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability35.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability35.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability35.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability35.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability35.ts, 3, 1)) export var aa:{[index:number]:number;};; diff --git a/tests/baselines/reference/assignmentCompatability35.types b/tests/baselines/reference/assignmentCompatability35.types index ab25e79b1fcb4..5920d2bf1b369 100644 --- a/tests/baselines/reference/assignmentCompatability35.types +++ b/tests/baselines/reference/assignmentCompatability35.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability35.ts] //// === assignmentCompatability35.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability36.js b/tests/baselines/reference/assignmentCompatability36.js index 4baf0f6a5f735..7260e84353563 100644 --- a/tests/baselines/reference/assignmentCompatability36.js +++ b/tests/baselines/reference/assignmentCompatability36.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability36.ts] //// //// [assignmentCompatability36.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{[index:string]:any;};; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability36.symbols b/tests/baselines/reference/assignmentCompatability36.symbols index bafaa47fe95c0..0a8c470d9e97f 100644 --- a/tests/baselines/reference/assignmentCompatability36.symbols +++ b/tests/baselines/reference/assignmentCompatability36.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability36.ts] //// === assignmentCompatability36.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability36.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability36.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability36.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability36.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability36.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability36.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability36.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability36.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability36.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability36.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability36.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability36.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability36.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability36.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability36.ts, 3, 1)) export var aa:{[index:string]:any;};; diff --git a/tests/baselines/reference/assignmentCompatability36.types b/tests/baselines/reference/assignmentCompatability36.types index 0e27341b17cbd..e94b2dd9a9145 100644 --- a/tests/baselines/reference/assignmentCompatability36.types +++ b/tests/baselines/reference/assignmentCompatability36.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability36.ts] //// === assignmentCompatability36.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability37.errors.txt b/tests/baselines/reference/assignmentCompatability37.errors.txt index eeeaf566b53cc..2bac1c7c344bb 100644 --- a/tests/baselines/reference/assignmentCompatability37.errors.txt +++ b/tests/baselines/reference/assignmentCompatability37.errors.txt @@ -3,11 +3,11 @@ assignmentCompatability37.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability37.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var aa:{ new (param: Tnumber); };; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability37.js b/tests/baselines/reference/assignmentCompatability37.js index f9864f33dad33..533f70bda2cb2 100644 --- a/tests/baselines/reference/assignmentCompatability37.js +++ b/tests/baselines/reference/assignmentCompatability37.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability37.ts] //// //// [assignmentCompatability37.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{ new (param: Tnumber); };; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability37.symbols b/tests/baselines/reference/assignmentCompatability37.symbols index 71297d1b3bc67..b933a59cae465 100644 --- a/tests/baselines/reference/assignmentCompatability37.symbols +++ b/tests/baselines/reference/assignmentCompatability37.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability37.ts] //// === assignmentCompatability37.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability37.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability37.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability37.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability37.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability37.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability37.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability37.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability37.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability37.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability37.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability37.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability37.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability37.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability37.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability37.ts, 3, 1)) export var aa:{ new (param: Tnumber); };; diff --git a/tests/baselines/reference/assignmentCompatability37.types b/tests/baselines/reference/assignmentCompatability37.types index 7b765f2c7a564..5649e14786c46 100644 --- a/tests/baselines/reference/assignmentCompatability37.types +++ b/tests/baselines/reference/assignmentCompatability37.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability37.ts] //// === assignmentCompatability37.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability38.errors.txt b/tests/baselines/reference/assignmentCompatability38.errors.txt index d8c6d710d732f..2e6538c0e9870 100644 --- a/tests/baselines/reference/assignmentCompatability38.errors.txt +++ b/tests/baselines/reference/assignmentCompatability38.errors.txt @@ -3,11 +3,11 @@ assignmentCompatability38.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability38.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export var aa:{ new (param: Tstring); };; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability38.js b/tests/baselines/reference/assignmentCompatability38.js index 6d8b379c81280..2d1a23dfa0ffe 100644 --- a/tests/baselines/reference/assignmentCompatability38.js +++ b/tests/baselines/reference/assignmentCompatability38.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability38.ts] //// //// [assignmentCompatability38.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{ new (param: Tstring); };; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability38.symbols b/tests/baselines/reference/assignmentCompatability38.symbols index cd19f69497073..7d95a42b504e3 100644 --- a/tests/baselines/reference/assignmentCompatability38.symbols +++ b/tests/baselines/reference/assignmentCompatability38.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability38.ts] //// === assignmentCompatability38.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability38.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability38.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability38.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability38.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability38.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability38.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability38.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability38.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability38.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability38.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability38.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability38.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability38.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability38.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability38.ts, 3, 1)) export var aa:{ new (param: Tstring); };; diff --git a/tests/baselines/reference/assignmentCompatability38.types b/tests/baselines/reference/assignmentCompatability38.types index 1f31f968295f7..daf41632e8f1f 100644 --- a/tests/baselines/reference/assignmentCompatability38.types +++ b/tests/baselines/reference/assignmentCompatability38.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability38.ts] //// === assignmentCompatability38.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability39.errors.txt b/tests/baselines/reference/assignmentCompatability39.errors.txt index a3dda96f781e1..beab98b8a7523 100644 --- a/tests/baselines/reference/assignmentCompatability39.errors.txt +++ b/tests/baselines/reference/assignmentCompatability39.errors.txt @@ -3,11 +3,11 @@ assignmentCompatability39.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability39.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export class classWithTwoPublic { constructor(public one: T, public two: U) {} } var x2 = new classWithTwoPublic(1, "a");; export var __val__x2 = x2; } diff --git a/tests/baselines/reference/assignmentCompatability39.js b/tests/baselines/reference/assignmentCompatability39.js index e1f24aff429d6..cdd347ebbb9c0 100644 --- a/tests/baselines/reference/assignmentCompatability39.js +++ b/tests/baselines/reference/assignmentCompatability39.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability39.ts] //// //// [assignmentCompatability39.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export class classWithTwoPublic { constructor(public one: T, public two: U) {} } var x2 = new classWithTwoPublic(1, "a");; export var __val__x2 = x2; } diff --git a/tests/baselines/reference/assignmentCompatability39.symbols b/tests/baselines/reference/assignmentCompatability39.symbols index 13af585b6b7a9..9365d6b0a7cef 100644 --- a/tests/baselines/reference/assignmentCompatability39.symbols +++ b/tests/baselines/reference/assignmentCompatability39.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability39.ts] //// === assignmentCompatability39.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability39.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability39.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability39.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability39.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability39.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability39.ts, 1, 58)) @@ -13,18 +13,18 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability39.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability39.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability39.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability39.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability39.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability39.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability39.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability39.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability39.ts, 3, 1)) export class classWithTwoPublic { constructor(public one: T, public two: U) {} } var x2 = new classWithTwoPublic(1, "a");; ->classWithTwoPublic : Symbol(classWithTwoPublic, Decl(assignmentCompatability39.ts, 4, 18)) +>classWithTwoPublic : Symbol(classWithTwoPublic, Decl(assignmentCompatability39.ts, 4, 21)) >T : Symbol(T, Decl(assignmentCompatability39.ts, 5, 44)) >U : Symbol(U, Decl(assignmentCompatability39.ts, 5, 46)) >one : Symbol(classWithTwoPublic.one, Decl(assignmentCompatability39.ts, 5, 63)) @@ -32,7 +32,7 @@ module __test2__ { >two : Symbol(classWithTwoPublic.two, Decl(assignmentCompatability39.ts, 5, 77)) >U : Symbol(U, Decl(assignmentCompatability39.ts, 5, 46)) >x2 : Symbol(x2, Decl(assignmentCompatability39.ts, 5, 104)) ->classWithTwoPublic : Symbol(classWithTwoPublic, Decl(assignmentCompatability39.ts, 4, 18)) +>classWithTwoPublic : Symbol(classWithTwoPublic, Decl(assignmentCompatability39.ts, 4, 21)) export var __val__x2 = x2; >__val__x2 : Symbol(__val__x2, Decl(assignmentCompatability39.ts, 6, 14)) diff --git a/tests/baselines/reference/assignmentCompatability39.types b/tests/baselines/reference/assignmentCompatability39.types index c7229cb8ba052..dabd1cfd30ab3 100644 --- a/tests/baselines/reference/assignmentCompatability39.types +++ b/tests/baselines/reference/assignmentCompatability39.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability39.ts] //// === assignmentCompatability39.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability4.js b/tests/baselines/reference/assignmentCompatability4.js index 6b88073c32c7f..91f1015e667f7 100644 --- a/tests/baselines/reference/assignmentCompatability4.js +++ b/tests/baselines/reference/assignmentCompatability4.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability4.ts] //// //// [assignmentCompatability4.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{one:number;};; export var __val__aa = aa; } diff --git a/tests/baselines/reference/assignmentCompatability4.symbols b/tests/baselines/reference/assignmentCompatability4.symbols index 08e910c370e00..e3d24d03316cf 100644 --- a/tests/baselines/reference/assignmentCompatability4.symbols +++ b/tests/baselines/reference/assignmentCompatability4.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability4.ts] //// === assignmentCompatability4.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability4.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability4.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability4.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability4.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability4.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability4.ts, 1, 58)) @@ -13,14 +13,14 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability4.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability4.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability4.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability4.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability4.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability4.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability4.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability4.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability4.ts, 3, 1)) export var aa:{one:number;};; diff --git a/tests/baselines/reference/assignmentCompatability4.types b/tests/baselines/reference/assignmentCompatability4.types index 0259d4f5aaa72..bec3dfdf6a676 100644 --- a/tests/baselines/reference/assignmentCompatability4.types +++ b/tests/baselines/reference/assignmentCompatability4.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability4.ts] //// === assignmentCompatability4.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability40.errors.txt b/tests/baselines/reference/assignmentCompatability40.errors.txt index a990107339074..c48580257129e 100644 --- a/tests/baselines/reference/assignmentCompatability40.errors.txt +++ b/tests/baselines/reference/assignmentCompatability40.errors.txt @@ -3,11 +3,11 @@ assignmentCompatability40.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability40.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export class classWithPrivate { constructor(private one: T) {} } var x5 = new classWithPrivate(1);; export var __val__x5 = x5; } diff --git a/tests/baselines/reference/assignmentCompatability40.js b/tests/baselines/reference/assignmentCompatability40.js index bb2bcd6cd1959..8b43022760f76 100644 --- a/tests/baselines/reference/assignmentCompatability40.js +++ b/tests/baselines/reference/assignmentCompatability40.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability40.ts] //// //// [assignmentCompatability40.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export class classWithPrivate { constructor(private one: T) {} } var x5 = new classWithPrivate(1);; export var __val__x5 = x5; } diff --git a/tests/baselines/reference/assignmentCompatability40.symbols b/tests/baselines/reference/assignmentCompatability40.symbols index bd437b5684e72..e9fefa797e7f1 100644 --- a/tests/baselines/reference/assignmentCompatability40.symbols +++ b/tests/baselines/reference/assignmentCompatability40.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability40.ts] //// === assignmentCompatability40.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability40.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability40.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability40.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability40.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability40.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability40.ts, 1, 58)) @@ -13,23 +13,23 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability40.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability40.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability40.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability40.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability40.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability40.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability40.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability40.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability40.ts, 3, 1)) export class classWithPrivate { constructor(private one: T) {} } var x5 = new classWithPrivate(1);; ->classWithPrivate : Symbol(classWithPrivate, Decl(assignmentCompatability40.ts, 4, 18)) +>classWithPrivate : Symbol(classWithPrivate, Decl(assignmentCompatability40.ts, 4, 21)) >T : Symbol(T, Decl(assignmentCompatability40.ts, 5, 44)) >one : Symbol(classWithPrivate.one, Decl(assignmentCompatability40.ts, 5, 61)) >T : Symbol(T, Decl(assignmentCompatability40.ts, 5, 44)) >x5 : Symbol(x5, Decl(assignmentCompatability40.ts, 5, 107)) ->classWithPrivate : Symbol(classWithPrivate, Decl(assignmentCompatability40.ts, 4, 18)) +>classWithPrivate : Symbol(classWithPrivate, Decl(assignmentCompatability40.ts, 4, 21)) export var __val__x5 = x5; >__val__x5 : Symbol(__val__x5, Decl(assignmentCompatability40.ts, 6, 14)) diff --git a/tests/baselines/reference/assignmentCompatability40.types b/tests/baselines/reference/assignmentCompatability40.types index 0deb2c655681d..9a880e827354d 100644 --- a/tests/baselines/reference/assignmentCompatability40.types +++ b/tests/baselines/reference/assignmentCompatability40.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability40.ts] //// === assignmentCompatability40.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability41.errors.txt b/tests/baselines/reference/assignmentCompatability41.errors.txt index 7f5a1e60cbeff..dda4a5e7a6ef8 100644 --- a/tests/baselines/reference/assignmentCompatability41.errors.txt +++ b/tests/baselines/reference/assignmentCompatability41.errors.txt @@ -3,11 +3,11 @@ assignmentCompatability41.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability41.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export class classWithTwoPrivate { constructor(private one: T, private two: U) {} } var x6 = new classWithTwoPrivate(1, "a");; export var __val__x6 = x6; } diff --git a/tests/baselines/reference/assignmentCompatability41.js b/tests/baselines/reference/assignmentCompatability41.js index 21208bf7e7b70..70681c2953703 100644 --- a/tests/baselines/reference/assignmentCompatability41.js +++ b/tests/baselines/reference/assignmentCompatability41.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability41.ts] //// //// [assignmentCompatability41.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export class classWithTwoPrivate { constructor(private one: T, private two: U) {} } var x6 = new classWithTwoPrivate(1, "a");; export var __val__x6 = x6; } diff --git a/tests/baselines/reference/assignmentCompatability41.symbols b/tests/baselines/reference/assignmentCompatability41.symbols index cac6ca2c3c66f..6b6d9fea66867 100644 --- a/tests/baselines/reference/assignmentCompatability41.symbols +++ b/tests/baselines/reference/assignmentCompatability41.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability41.ts] //// === assignmentCompatability41.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability41.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability41.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability41.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability41.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability41.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability41.ts, 1, 58)) @@ -13,18 +13,18 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability41.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability41.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability41.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability41.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability41.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability41.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability41.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability41.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability41.ts, 3, 1)) export class classWithTwoPrivate { constructor(private one: T, private two: U) {} } var x6 = new classWithTwoPrivate(1, "a");; ->classWithTwoPrivate : Symbol(classWithTwoPrivate, Decl(assignmentCompatability41.ts, 4, 18)) +>classWithTwoPrivate : Symbol(classWithTwoPrivate, Decl(assignmentCompatability41.ts, 4, 21)) >T : Symbol(T, Decl(assignmentCompatability41.ts, 5, 44)) >U : Symbol(U, Decl(assignmentCompatability41.ts, 5, 46)) >one : Symbol(classWithTwoPrivate.one, Decl(assignmentCompatability41.ts, 5, 63)) @@ -32,7 +32,7 @@ module __test2__ { >two : Symbol(classWithTwoPrivate.two, Decl(assignmentCompatability41.ts, 5, 78)) >U : Symbol(U, Decl(assignmentCompatability41.ts, 5, 46)) >x6 : Symbol(x6, Decl(assignmentCompatability41.ts, 5, 104)) ->classWithTwoPrivate : Symbol(classWithTwoPrivate, Decl(assignmentCompatability41.ts, 4, 18)) +>classWithTwoPrivate : Symbol(classWithTwoPrivate, Decl(assignmentCompatability41.ts, 4, 21)) export var __val__x6 = x6; >__val__x6 : Symbol(__val__x6, Decl(assignmentCompatability41.ts, 6, 14)) diff --git a/tests/baselines/reference/assignmentCompatability41.types b/tests/baselines/reference/assignmentCompatability41.types index c01158ad1a3ba..a3d32c2abdb94 100644 --- a/tests/baselines/reference/assignmentCompatability41.types +++ b/tests/baselines/reference/assignmentCompatability41.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability41.ts] //// === assignmentCompatability41.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability42.errors.txt b/tests/baselines/reference/assignmentCompatability42.errors.txt index 7cd727cf1f7e5..6ff604d0752fb 100644 --- a/tests/baselines/reference/assignmentCompatability42.errors.txt +++ b/tests/baselines/reference/assignmentCompatability42.errors.txt @@ -3,11 +3,11 @@ assignmentCompatability42.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability42.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export class classWithPublicPrivate { constructor(public one: T, private two: U) {} } var x7 = new classWithPublicPrivate(1, "a");; export var __val__x7 = x7; } diff --git a/tests/baselines/reference/assignmentCompatability42.js b/tests/baselines/reference/assignmentCompatability42.js index d94ebe31d6a63..2b088f43a1dbb 100644 --- a/tests/baselines/reference/assignmentCompatability42.js +++ b/tests/baselines/reference/assignmentCompatability42.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability42.ts] //// //// [assignmentCompatability42.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export class classWithPublicPrivate { constructor(public one: T, private two: U) {} } var x7 = new classWithPublicPrivate(1, "a");; export var __val__x7 = x7; } diff --git a/tests/baselines/reference/assignmentCompatability42.symbols b/tests/baselines/reference/assignmentCompatability42.symbols index 97c6341406ebe..916283c613079 100644 --- a/tests/baselines/reference/assignmentCompatability42.symbols +++ b/tests/baselines/reference/assignmentCompatability42.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability42.ts] //// === assignmentCompatability42.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability42.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability42.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability42.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability42.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability42.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability42.ts, 1, 58)) @@ -13,18 +13,18 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability42.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability42.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability42.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability42.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability42.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability42.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability42.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability42.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability42.ts, 3, 1)) export class classWithPublicPrivate { constructor(public one: T, private two: U) {} } var x7 = new classWithPublicPrivate(1, "a");; ->classWithPublicPrivate : Symbol(classWithPublicPrivate, Decl(assignmentCompatability42.ts, 4, 18)) +>classWithPublicPrivate : Symbol(classWithPublicPrivate, Decl(assignmentCompatability42.ts, 4, 21)) >T : Symbol(T, Decl(assignmentCompatability42.ts, 5, 44)) >U : Symbol(U, Decl(assignmentCompatability42.ts, 5, 46)) >one : Symbol(classWithPublicPrivate.one, Decl(assignmentCompatability42.ts, 5, 63)) @@ -32,7 +32,7 @@ module __test2__ { >two : Symbol(classWithPublicPrivate.two, Decl(assignmentCompatability42.ts, 5, 77)) >U : Symbol(U, Decl(assignmentCompatability42.ts, 5, 46)) >x7 : Symbol(x7, Decl(assignmentCompatability42.ts, 5, 104)) ->classWithPublicPrivate : Symbol(classWithPublicPrivate, Decl(assignmentCompatability42.ts, 4, 18)) +>classWithPublicPrivate : Symbol(classWithPublicPrivate, Decl(assignmentCompatability42.ts, 4, 21)) export var __val__x7 = x7; >__val__x7 : Symbol(__val__x7, Decl(assignmentCompatability42.ts, 6, 14)) diff --git a/tests/baselines/reference/assignmentCompatability42.types b/tests/baselines/reference/assignmentCompatability42.types index bd3efc5b9680f..ca97bda799550 100644 --- a/tests/baselines/reference/assignmentCompatability42.types +++ b/tests/baselines/reference/assignmentCompatability42.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability42.ts] //// === assignmentCompatability42.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability43.errors.txt b/tests/baselines/reference/assignmentCompatability43.errors.txt index 97874671752be..e31b507cac194 100644 --- a/tests/baselines/reference/assignmentCompatability43.errors.txt +++ b/tests/baselines/reference/assignmentCompatability43.errors.txt @@ -3,11 +3,11 @@ assignmentCompatability43.ts(9,1): error TS2322: Type 'interfaceWithPublicAndOpt ==== assignmentCompatability43.ts (1 errors) ==== - module __test1__ { + namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } - module __test2__ { + namespace __test2__ { export interface interfaceTwo { one: T; two: U; }; var obj2: interfaceTwo = { one: 1, two: "a" };; export var __val__obj2 = obj2; } diff --git a/tests/baselines/reference/assignmentCompatability43.js b/tests/baselines/reference/assignmentCompatability43.js index a88f49755e21b..c9b87f6e9010a 100644 --- a/tests/baselines/reference/assignmentCompatability43.js +++ b/tests/baselines/reference/assignmentCompatability43.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability43.ts] //// //// [assignmentCompatability43.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export interface interfaceTwo { one: T; two: U; }; var obj2: interfaceTwo = { one: 1, two: "a" };; export var __val__obj2 = obj2; } diff --git a/tests/baselines/reference/assignmentCompatability43.symbols b/tests/baselines/reference/assignmentCompatability43.symbols index 3c0464f3ecc45..26ed4656e0151 100644 --- a/tests/baselines/reference/assignmentCompatability43.symbols +++ b/tests/baselines/reference/assignmentCompatability43.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability43.ts] //// === assignmentCompatability43.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability43.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability43.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability43.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability43.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability43.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability43.ts, 1, 58)) @@ -13,18 +13,18 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability43.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability43.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability43.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability43.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability43.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability43.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability43.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability43.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability43.ts, 3, 1)) export interface interfaceTwo { one: T; two: U; }; var obj2: interfaceTwo = { one: 1, two: "a" };; ->interfaceTwo : Symbol(interfaceTwo, Decl(assignmentCompatability43.ts, 4, 18)) +>interfaceTwo : Symbol(interfaceTwo, Decl(assignmentCompatability43.ts, 4, 21)) >T : Symbol(T, Decl(assignmentCompatability43.ts, 5, 52)) >U : Symbol(U, Decl(assignmentCompatability43.ts, 5, 54)) >one : Symbol(interfaceTwo.one, Decl(assignmentCompatability43.ts, 5, 58)) @@ -32,7 +32,7 @@ module __test2__ { >two : Symbol(interfaceTwo.two, Decl(assignmentCompatability43.ts, 5, 66)) >U : Symbol(U, Decl(assignmentCompatability43.ts, 5, 54)) >obj2 : Symbol(obj2, Decl(assignmentCompatability43.ts, 5, 83)) ->interfaceTwo : Symbol(interfaceTwo, Decl(assignmentCompatability43.ts, 4, 18)) +>interfaceTwo : Symbol(interfaceTwo, Decl(assignmentCompatability43.ts, 4, 21)) >one : Symbol(one, Decl(assignmentCompatability43.ts, 5, 121)) >two : Symbol(two, Decl(assignmentCompatability43.ts, 5, 129)) diff --git a/tests/baselines/reference/assignmentCompatability43.types b/tests/baselines/reference/assignmentCompatability43.types index cc449ba6aa849..bf99c73b79d57 100644 --- a/tests/baselines/reference/assignmentCompatability43.types +++ b/tests/baselines/reference/assignmentCompatability43.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability43.ts] //// === assignmentCompatability43.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability5.js b/tests/baselines/reference/assignmentCompatability5.js index 4794c2dfbcfb7..1d348afb9c500 100644 --- a/tests/baselines/reference/assignmentCompatability5.js +++ b/tests/baselines/reference/assignmentCompatability5.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability5.ts] //// //// [assignmentCompatability5.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export interface interfaceOne { one: T; }; var obj1: interfaceOne = { one: 1 };; export var __val__obj1 = obj1; } diff --git a/tests/baselines/reference/assignmentCompatability5.symbols b/tests/baselines/reference/assignmentCompatability5.symbols index 7bf47721473c6..99eead922a61b 100644 --- a/tests/baselines/reference/assignmentCompatability5.symbols +++ b/tests/baselines/reference/assignmentCompatability5.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability5.ts] //// === assignmentCompatability5.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability5.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability5.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability5.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability5.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability5.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability5.ts, 1, 58)) @@ -13,23 +13,23 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability5.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability5.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability5.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability5.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability5.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability5.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability5.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability5.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability5.ts, 3, 1)) export interface interfaceOne { one: T; }; var obj1: interfaceOne = { one: 1 };; ->interfaceOne : Symbol(interfaceOne, Decl(assignmentCompatability5.ts, 4, 18)) +>interfaceOne : Symbol(interfaceOne, Decl(assignmentCompatability5.ts, 4, 21)) >T : Symbol(T, Decl(assignmentCompatability5.ts, 5, 52)) >one : Symbol(interfaceOne.one, Decl(assignmentCompatability5.ts, 5, 56)) >T : Symbol(T, Decl(assignmentCompatability5.ts, 5, 52)) >obj1 : Symbol(obj1, Decl(assignmentCompatability5.ts, 5, 86)) ->interfaceOne : Symbol(interfaceOne, Decl(assignmentCompatability5.ts, 4, 18)) +>interfaceOne : Symbol(interfaceOne, Decl(assignmentCompatability5.ts, 4, 21)) >one : Symbol(one, Decl(assignmentCompatability5.ts, 5, 117)) export var __val__obj1 = obj1; diff --git a/tests/baselines/reference/assignmentCompatability5.types b/tests/baselines/reference/assignmentCompatability5.types index 673b41dbfd4ca..831e0a5f2e160 100644 --- a/tests/baselines/reference/assignmentCompatability5.types +++ b/tests/baselines/reference/assignmentCompatability5.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability5.ts] //// === assignmentCompatability5.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability6.js b/tests/baselines/reference/assignmentCompatability6.js index 9689109502b2a..5bf506ecf3d9a 100644 --- a/tests/baselines/reference/assignmentCompatability6.js +++ b/tests/baselines/reference/assignmentCompatability6.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability6.ts] //// //// [assignmentCompatability6.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export interface interfaceWithOptional { one?: T; }; var obj3: interfaceWithOptional = { };; export var __val__obj3 = obj3; } diff --git a/tests/baselines/reference/assignmentCompatability6.symbols b/tests/baselines/reference/assignmentCompatability6.symbols index 744b547fce15b..16d875c18d085 100644 --- a/tests/baselines/reference/assignmentCompatability6.symbols +++ b/tests/baselines/reference/assignmentCompatability6.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability6.ts] //// === assignmentCompatability6.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability6.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability6.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability6.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability6.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability6.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability6.ts, 1, 58)) @@ -13,23 +13,23 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability6.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability6.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability6.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability6.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability6.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability6.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability6.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability6.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability6.ts, 3, 1)) export interface interfaceWithOptional { one?: T; }; var obj3: interfaceWithOptional = { };; ->interfaceWithOptional : Symbol(interfaceWithOptional, Decl(assignmentCompatability6.ts, 4, 18)) +>interfaceWithOptional : Symbol(interfaceWithOptional, Decl(assignmentCompatability6.ts, 4, 21)) >T : Symbol(T, Decl(assignmentCompatability6.ts, 5, 52)) >one : Symbol(interfaceWithOptional.one, Decl(assignmentCompatability6.ts, 5, 56)) >T : Symbol(T, Decl(assignmentCompatability6.ts, 5, 52)) >obj3 : Symbol(obj3, Decl(assignmentCompatability6.ts, 5, 86)) ->interfaceWithOptional : Symbol(interfaceWithOptional, Decl(assignmentCompatability6.ts, 4, 18)) +>interfaceWithOptional : Symbol(interfaceWithOptional, Decl(assignmentCompatability6.ts, 4, 21)) export var __val__obj3 = obj3; >__val__obj3 : Symbol(__val__obj3, Decl(assignmentCompatability6.ts, 6, 14)) diff --git a/tests/baselines/reference/assignmentCompatability6.types b/tests/baselines/reference/assignmentCompatability6.types index 5b773aaec63a2..d8506be1d881a 100644 --- a/tests/baselines/reference/assignmentCompatability6.types +++ b/tests/baselines/reference/assignmentCompatability6.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability6.ts] //// === assignmentCompatability6.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability7.js b/tests/baselines/reference/assignmentCompatability7.js index 836497d977aa3..cb7e0807a077f 100644 --- a/tests/baselines/reference/assignmentCompatability7.js +++ b/tests/baselines/reference/assignmentCompatability7.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability7.ts] //// //// [assignmentCompatability7.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } diff --git a/tests/baselines/reference/assignmentCompatability7.symbols b/tests/baselines/reference/assignmentCompatability7.symbols index b1b3cd973551f..1eb2632535ad4 100644 --- a/tests/baselines/reference/assignmentCompatability7.symbols +++ b/tests/baselines/reference/assignmentCompatability7.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability7.ts] //// === assignmentCompatability7.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability7.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability7.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability7.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability7.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability7.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability7.ts, 1, 58)) @@ -13,18 +13,18 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability7.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability7.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability7.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability7.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability7.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability7.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability7.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability7.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability7.ts, 3, 1)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability7.ts, 4, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability7.ts, 4, 21)) >T : Symbol(T, Decl(assignmentCompatability7.ts, 5, 52)) >U : Symbol(U, Decl(assignmentCompatability7.ts, 5, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability7.ts, 5, 58)) @@ -32,7 +32,7 @@ module __test2__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability7.ts, 5, 66)) >U : Symbol(U, Decl(assignmentCompatability7.ts, 5, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability7.ts, 5, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability7.ts, 4, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability7.ts, 4, 21)) >one : Symbol(one, Decl(assignmentCompatability7.ts, 5, 139)) export var __val__obj4 = obj4; diff --git a/tests/baselines/reference/assignmentCompatability7.types b/tests/baselines/reference/assignmentCompatability7.types index 308d8da9bb635..d24581a95a6f2 100644 --- a/tests/baselines/reference/assignmentCompatability7.types +++ b/tests/baselines/reference/assignmentCompatability7.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability7.ts] //// === assignmentCompatability7.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability8.js b/tests/baselines/reference/assignmentCompatability8.js index 235a3f75a92e9..513d44ae3af48 100644 --- a/tests/baselines/reference/assignmentCompatability8.js +++ b/tests/baselines/reference/assignmentCompatability8.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability8.ts] //// //// [assignmentCompatability8.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export class classWithPublic { constructor(public one: T) {} } var x1 = new classWithPublic(1);; export var __val__x1 = x1; } diff --git a/tests/baselines/reference/assignmentCompatability8.symbols b/tests/baselines/reference/assignmentCompatability8.symbols index 85a4e0824d391..fb81f98d9a644 100644 --- a/tests/baselines/reference/assignmentCompatability8.symbols +++ b/tests/baselines/reference/assignmentCompatability8.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability8.ts] //// === assignmentCompatability8.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability8.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability8.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability8.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability8.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability8.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability8.ts, 1, 58)) @@ -13,23 +13,23 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability8.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability8.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability8.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability8.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability8.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability8.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability8.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability8.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability8.ts, 3, 1)) export class classWithPublic { constructor(public one: T) {} } var x1 = new classWithPublic(1);; ->classWithPublic : Symbol(classWithPublic, Decl(assignmentCompatability8.ts, 4, 18)) +>classWithPublic : Symbol(classWithPublic, Decl(assignmentCompatability8.ts, 4, 21)) >T : Symbol(T, Decl(assignmentCompatability8.ts, 5, 44)) >one : Symbol(classWithPublic.one, Decl(assignmentCompatability8.ts, 5, 61)) >T : Symbol(T, Decl(assignmentCompatability8.ts, 5, 44)) >x1 : Symbol(x1, Decl(assignmentCompatability8.ts, 5, 107)) ->classWithPublic : Symbol(classWithPublic, Decl(assignmentCompatability8.ts, 4, 18)) +>classWithPublic : Symbol(classWithPublic, Decl(assignmentCompatability8.ts, 4, 21)) export var __val__x1 = x1; >__val__x1 : Symbol(__val__x1, Decl(assignmentCompatability8.ts, 6, 14)) diff --git a/tests/baselines/reference/assignmentCompatability8.types b/tests/baselines/reference/assignmentCompatability8.types index 5995c8b4ad1e1..8ca125dcb8bc7 100644 --- a/tests/baselines/reference/assignmentCompatability8.types +++ b/tests/baselines/reference/assignmentCompatability8.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability8.ts] //// === assignmentCompatability8.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentCompatability9.js b/tests/baselines/reference/assignmentCompatability9.js index f2ea8c152e33f..0a8c0640d109c 100644 --- a/tests/baselines/reference/assignmentCompatability9.js +++ b/tests/baselines/reference/assignmentCompatability9.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability9.ts] //// //// [assignmentCompatability9.ts] -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export class classWithOptional { constructor(public one?: T) {} } var x3 = new classWithOptional();; export var __val__x3 = x3; } diff --git a/tests/baselines/reference/assignmentCompatability9.symbols b/tests/baselines/reference/assignmentCompatability9.symbols index 3a487aa29ff27..1b1af7f88abf6 100644 --- a/tests/baselines/reference/assignmentCompatability9.symbols +++ b/tests/baselines/reference/assignmentCompatability9.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/assignmentCompatability9.ts] //// === assignmentCompatability9.ts === -module __test1__ { +namespace __test1__ { >__test1__ : Symbol(__test1__, Decl(assignmentCompatability9.ts, 0, 0)) export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability9.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability9.ts, 0, 21)) >T : Symbol(T, Decl(assignmentCompatability9.ts, 1, 52)) >U : Symbol(U, Decl(assignmentCompatability9.ts, 1, 54)) >one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability9.ts, 1, 58)) @@ -13,23 +13,23 @@ module __test1__ { >two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability9.ts, 1, 66)) >U : Symbol(U, Decl(assignmentCompatability9.ts, 1, 54)) >obj4 : Symbol(obj4, Decl(assignmentCompatability9.ts, 1, 83)) ->interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability9.ts, 0, 18)) +>interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability9.ts, 0, 21)) >one : Symbol(one, Decl(assignmentCompatability9.ts, 1, 139)) export var __val__obj4 = obj4; >__val__obj4 : Symbol(__val__obj4, Decl(assignmentCompatability9.ts, 2, 14)) >obj4 : Symbol(obj4, Decl(assignmentCompatability9.ts, 1, 83)) } -module __test2__ { +namespace __test2__ { >__test2__ : Symbol(__test2__, Decl(assignmentCompatability9.ts, 3, 1)) export class classWithOptional { constructor(public one?: T) {} } var x3 = new classWithOptional();; ->classWithOptional : Symbol(classWithOptional, Decl(assignmentCompatability9.ts, 4, 18)) +>classWithOptional : Symbol(classWithOptional, Decl(assignmentCompatability9.ts, 4, 21)) >T : Symbol(T, Decl(assignmentCompatability9.ts, 5, 44)) >one : Symbol(classWithOptional.one, Decl(assignmentCompatability9.ts, 5, 61)) >T : Symbol(T, Decl(assignmentCompatability9.ts, 5, 44)) >x3 : Symbol(x3, Decl(assignmentCompatability9.ts, 5, 107)) ->classWithOptional : Symbol(classWithOptional, Decl(assignmentCompatability9.ts, 4, 18)) +>classWithOptional : Symbol(classWithOptional, Decl(assignmentCompatability9.ts, 4, 21)) export var __val__x3 = x3; >__val__x3 : Symbol(__val__x3, Decl(assignmentCompatability9.ts, 6, 14)) diff --git a/tests/baselines/reference/assignmentCompatability9.types b/tests/baselines/reference/assignmentCompatability9.types index d09d4151efc1c..0bbe1f19a18eb 100644 --- a/tests/baselines/reference/assignmentCompatability9.types +++ b/tests/baselines/reference/assignmentCompatability9.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/assignmentCompatability9.ts] //// === assignmentCompatability9.ts === -module __test1__ { +namespace __test1__ { >__test1__ : typeof __test1__ > : ^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ module __test1__ { >obj4 : interfaceWithPublicAndOptional > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module __test2__ { +namespace __test2__ { >__test2__ : typeof __test2__ > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentLHSIsValue.errors.txt b/tests/baselines/reference/assignmentLHSIsValue.errors.txt index cd5a9761cef79..a18848edd2ec1 100644 --- a/tests/baselines/reference/assignmentLHSIsValue.errors.txt +++ b/tests/baselines/reference/assignmentLHSIsValue.errors.txt @@ -65,7 +65,7 @@ assignmentLHSIsValue.ts(70,1): error TS2364: The left-hand side of an assignment !!! error TS2364: The left-hand side of an assignment expression must be a variable or a property access. // identifiers: module, class, enum, function - module M { export var a; } + namespace M { export var a; } M = value; ~ !!! error TS2631: Cannot assign to 'M' because it is a namespace. diff --git a/tests/baselines/reference/assignmentLHSIsValue.js b/tests/baselines/reference/assignmentLHSIsValue.js index 81506efa54a4f..31df7b43ba226 100644 --- a/tests/baselines/reference/assignmentLHSIsValue.js +++ b/tests/baselines/reference/assignmentLHSIsValue.js @@ -16,7 +16,7 @@ function foo() { this = value; } this = value; // identifiers: module, class, enum, function -module M { export var a; } +namespace M { export var a; } M = value; C = value; diff --git a/tests/baselines/reference/assignmentLHSIsValue.symbols b/tests/baselines/reference/assignmentLHSIsValue.symbols index bb0d57e5dddd0..c7f9c4990c607 100644 --- a/tests/baselines/reference/assignmentLHSIsValue.symbols +++ b/tests/baselines/reference/assignmentLHSIsValue.symbols @@ -33,9 +33,9 @@ this = value; >value : Symbol(value, Decl(assignmentLHSIsValue.ts, 1, 3)) // identifiers: module, class, enum, function -module M { export var a; } +namespace M { export var a; } >M : Symbol(M, Decl(assignmentLHSIsValue.ts, 12, 13)) ->a : Symbol(a, Decl(assignmentLHSIsValue.ts, 15, 21)) +>a : Symbol(a, Decl(assignmentLHSIsValue.ts, 15, 24)) M = value; >M : Symbol(M, Decl(assignmentLHSIsValue.ts, 12, 13)) diff --git a/tests/baselines/reference/assignmentLHSIsValue.types b/tests/baselines/reference/assignmentLHSIsValue.types index a5cf42ab8d16c..f220f5d95b3a8 100644 --- a/tests/baselines/reference/assignmentLHSIsValue.types +++ b/tests/baselines/reference/assignmentLHSIsValue.types @@ -59,7 +59,7 @@ this = value; > : ^^^ // identifiers: module, class, enum, function -module M { export var a; } +namespace M { export var a; } >M : typeof M > : ^^^^^^^^ >a : any diff --git a/tests/baselines/reference/assignmentToFunction.errors.txt b/tests/baselines/reference/assignmentToFunction.errors.txt index fe15bb4dcd190..42f3afd4e6c5d 100644 --- a/tests/baselines/reference/assignmentToFunction.errors.txt +++ b/tests/baselines/reference/assignmentToFunction.errors.txt @@ -8,7 +8,7 @@ assignmentToFunction.ts(8,9): error TS2630: Cannot assign to 'bar' because it is ~~ !!! error TS2630: Cannot assign to 'fn' because it is a function. - module foo { + namespace foo { function xyz() { function bar() { } diff --git a/tests/baselines/reference/assignmentToFunction.js b/tests/baselines/reference/assignmentToFunction.js index ea3af0be6b9c6..e6d01acac961e 100644 --- a/tests/baselines/reference/assignmentToFunction.js +++ b/tests/baselines/reference/assignmentToFunction.js @@ -4,7 +4,7 @@ function fn() { } fn = () => 3; -module foo { +namespace foo { function xyz() { function bar() { } diff --git a/tests/baselines/reference/assignmentToFunction.symbols b/tests/baselines/reference/assignmentToFunction.symbols index 7b73b6ba2ccf1..413331521fb29 100644 --- a/tests/baselines/reference/assignmentToFunction.symbols +++ b/tests/baselines/reference/assignmentToFunction.symbols @@ -7,11 +7,11 @@ function fn() { } fn = () => 3; >fn : Symbol(fn, Decl(assignmentToFunction.ts, 0, 0)) -module foo { +namespace foo { >foo : Symbol(foo, Decl(assignmentToFunction.ts, 1, 13)) function xyz() { ->xyz : Symbol(xyz, Decl(assignmentToFunction.ts, 3, 12)) +>xyz : Symbol(xyz, Decl(assignmentToFunction.ts, 3, 15)) function bar() { >bar : Symbol(bar, Decl(assignmentToFunction.ts, 4, 20)) diff --git a/tests/baselines/reference/assignmentToFunction.types b/tests/baselines/reference/assignmentToFunction.types index 730f591bb0502..07769dad96b1b 100644 --- a/tests/baselines/reference/assignmentToFunction.types +++ b/tests/baselines/reference/assignmentToFunction.types @@ -15,7 +15,7 @@ fn = () => 3; >3 : 3 > : ^ -module foo { +namespace foo { >foo : typeof foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentToObjectAndFunction.errors.txt b/tests/baselines/reference/assignmentToObjectAndFunction.errors.txt index 733139013e432..33048e81aafb8 100644 --- a/tests/baselines/reference/assignmentToObjectAndFunction.errors.txt +++ b/tests/baselines/reference/assignmentToObjectAndFunction.errors.txt @@ -20,21 +20,21 @@ assignmentToObjectAndFunction.ts(29,5): error TS2322: Type 'typeof bad' is not a !!! error TS2740: Type '{}' is missing the following properties from type 'Function': apply, call, bind, prototype, and 3 more. function foo() { } - module foo { + namespace foo { export var boom = 0; } var goodFundule: Function = foo; // ok function bar() { } - module bar { + namespace bar { export function apply(thisArg: string, argArray?: string) { } } var goodFundule2: Function = bar; // ok function bad() { } - module bad { + namespace bad { export var apply = 0; } diff --git a/tests/baselines/reference/assignmentToObjectAndFunction.js b/tests/baselines/reference/assignmentToObjectAndFunction.js index 369fb082f381b..216e38ebd05bb 100644 --- a/tests/baselines/reference/assignmentToObjectAndFunction.js +++ b/tests/baselines/reference/assignmentToObjectAndFunction.js @@ -11,21 +11,21 @@ var goodObj: Object = { var errFun: Function = {}; // Error for no call signature function foo() { } -module foo { +namespace foo { export var boom = 0; } var goodFundule: Function = foo; // ok function bar() { } -module bar { +namespace bar { export function apply(thisArg: string, argArray?: string) { } } var goodFundule2: Function = bar; // ok function bad() { } -module bad { +namespace bad { export var apply = 0; } diff --git a/tests/baselines/reference/assignmentToObjectAndFunction.symbols b/tests/baselines/reference/assignmentToObjectAndFunction.symbols index cd5cbab6dccf9..a0d8793c56c33 100644 --- a/tests/baselines/reference/assignmentToObjectAndFunction.symbols +++ b/tests/baselines/reference/assignmentToObjectAndFunction.symbols @@ -25,7 +25,7 @@ var errFun: Function = {}; // Error for no call signature function foo() { } >foo : Symbol(foo, Decl(assignmentToObjectAndFunction.ts, 7, 26), Decl(assignmentToObjectAndFunction.ts, 9, 18)) -module foo { +namespace foo { >foo : Symbol(foo, Decl(assignmentToObjectAndFunction.ts, 7, 26), Decl(assignmentToObjectAndFunction.ts, 9, 18)) export var boom = 0; @@ -40,11 +40,11 @@ var goodFundule: Function = foo; // ok function bar() { } >bar : Symbol(bar, Decl(assignmentToObjectAndFunction.ts, 14, 32), Decl(assignmentToObjectAndFunction.ts, 16, 18)) -module bar { +namespace bar { >bar : Symbol(bar, Decl(assignmentToObjectAndFunction.ts, 14, 32), Decl(assignmentToObjectAndFunction.ts, 16, 18)) export function apply(thisArg: string, argArray?: string) { } ->apply : Symbol(apply, Decl(assignmentToObjectAndFunction.ts, 17, 12)) +>apply : Symbol(apply, Decl(assignmentToObjectAndFunction.ts, 17, 15)) >thisArg : Symbol(thisArg, Decl(assignmentToObjectAndFunction.ts, 18, 26)) >argArray : Symbol(argArray, Decl(assignmentToObjectAndFunction.ts, 18, 42)) } @@ -57,7 +57,7 @@ var goodFundule2: Function = bar; // ok function bad() { } >bad : Symbol(bad, Decl(assignmentToObjectAndFunction.ts, 21, 33), Decl(assignmentToObjectAndFunction.ts, 23, 18)) -module bad { +namespace bad { >bad : Symbol(bad, Decl(assignmentToObjectAndFunction.ts, 21, 33), Decl(assignmentToObjectAndFunction.ts, 23, 18)) export var apply = 0; diff --git a/tests/baselines/reference/assignmentToObjectAndFunction.types b/tests/baselines/reference/assignmentToObjectAndFunction.types index 9cf7639218e1f..077780c3c5b5c 100644 --- a/tests/baselines/reference/assignmentToObjectAndFunction.types +++ b/tests/baselines/reference/assignmentToObjectAndFunction.types @@ -39,7 +39,7 @@ function foo() { } >foo : typeof foo > : ^^^^^^^^^^ -module foo { +namespace foo { >foo : typeof foo > : ^^^^^^^^^^ @@ -60,7 +60,7 @@ function bar() { } >bar : typeof bar > : ^^^^^^^^^^ -module bar { +namespace bar { >bar : typeof bar > : ^^^^^^^^^^ @@ -83,7 +83,7 @@ function bad() { } >bad : typeof bad > : ^^^^^^^^^^ -module bad { +namespace bad { >bad : typeof bad > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentToParenthesizedIdentifiers.errors.txt b/tests/baselines/reference/assignmentToParenthesizedIdentifiers.errors.txt index 168cb6b653be7..d3cbb0ca5704a 100644 --- a/tests/baselines/reference/assignmentToParenthesizedIdentifiers.errors.txt +++ b/tests/baselines/reference/assignmentToParenthesizedIdentifiers.errors.txt @@ -35,7 +35,7 @@ assignmentToParenthesizedIdentifiers.ts(70,2): error TS2629: Cannot assign to 'C ~~~ !!! error TS2322: Type 'string' is not assignable to type 'number'. - module M { + namespace M { export var y: number; } M.y = 3; // OK @@ -58,8 +58,8 @@ assignmentToParenthesizedIdentifiers.ts(70,2): error TS2629: Cannot assign to 'C ~ !!! error TS2631: Cannot assign to 'M' because it is a namespace. - module M2 { - export module M3 { + namespace M2 { + export namespace M3 { export var x: number; } diff --git a/tests/baselines/reference/assignmentToParenthesizedIdentifiers.js b/tests/baselines/reference/assignmentToParenthesizedIdentifiers.js index 23f7e7ccf2d6c..f7ed48ef43762 100644 --- a/tests/baselines/reference/assignmentToParenthesizedIdentifiers.js +++ b/tests/baselines/reference/assignmentToParenthesizedIdentifiers.js @@ -7,7 +7,7 @@ x = 3; // OK x = ''; // Error (x) = ''; // Error -module M { +namespace M { export var y: number; } M.y = 3; // OK @@ -20,8 +20,8 @@ M.y = ''; // Error M = { y: 3 }; // Error (M) = { y: 3 }; // Error -module M2 { - export module M3 { +namespace M2 { + export namespace M3 { export var x: number; } diff --git a/tests/baselines/reference/assignmentToParenthesizedIdentifiers.symbols b/tests/baselines/reference/assignmentToParenthesizedIdentifiers.symbols index 1d03e9f2944bd..173e0e35f1d4e 100644 --- a/tests/baselines/reference/assignmentToParenthesizedIdentifiers.symbols +++ b/tests/baselines/reference/assignmentToParenthesizedIdentifiers.symbols @@ -16,7 +16,7 @@ x = ''; // Error (x) = ''; // Error >x : Symbol(x, Decl(assignmentToParenthesizedIdentifiers.ts, 0, 3)) -module M { +namespace M { >M : Symbol(M, Decl(assignmentToParenthesizedIdentifiers.ts, 4, 9)) export var y: number; @@ -60,54 +60,54 @@ M = { y: 3 }; // Error >M : Symbol(M, Decl(assignmentToParenthesizedIdentifiers.ts, 4, 9)) >y : Symbol(y, Decl(assignmentToParenthesizedIdentifiers.ts, 17, 7)) -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(assignmentToParenthesizedIdentifiers.ts, 17, 15)) - export module M3 { ->M3 : Symbol(M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 11)) + export namespace M3 { +>M3 : Symbol(M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 14)) export var x: number; >x : Symbol(x, Decl(assignmentToParenthesizedIdentifiers.ts, 21, 18)) } M3 = { x: 3 }; // Error ->M3 : Symbol(M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 11)) +>M3 : Symbol(M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 14)) >x : Symbol(x, Decl(assignmentToParenthesizedIdentifiers.ts, 24, 10)) } M2.M3 = { x: 3 }; // OK ->M2.M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 11)) +>M2.M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 14)) >M2 : Symbol(M2, Decl(assignmentToParenthesizedIdentifiers.ts, 17, 15)) ->M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 11)) +>M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 14)) >x : Symbol(x, Decl(assignmentToParenthesizedIdentifiers.ts, 26, 9)) (M2).M3 = { x: 3 }; // OK ->(M2).M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 11)) +>(M2).M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 14)) >M2 : Symbol(M2, Decl(assignmentToParenthesizedIdentifiers.ts, 17, 15)) ->M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 11)) +>M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 14)) >x : Symbol(x, Decl(assignmentToParenthesizedIdentifiers.ts, 27, 11)) (M2.M3) = { x: 3 }; // OK ->M2.M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 11)) +>M2.M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 14)) >M2 : Symbol(M2, Decl(assignmentToParenthesizedIdentifiers.ts, 17, 15)) ->M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 11)) +>M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 14)) >x : Symbol(x, Decl(assignmentToParenthesizedIdentifiers.ts, 28, 11)) M2.M3 = { x: '' }; // Error ->M2.M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 11)) +>M2.M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 14)) >M2 : Symbol(M2, Decl(assignmentToParenthesizedIdentifiers.ts, 17, 15)) ->M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 11)) +>M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 14)) >x : Symbol(x, Decl(assignmentToParenthesizedIdentifiers.ts, 30, 9)) (M2).M3 = { x: '' }; // Error ->(M2).M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 11)) +>(M2).M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 14)) >M2 : Symbol(M2, Decl(assignmentToParenthesizedIdentifiers.ts, 17, 15)) ->M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 11)) +>M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 14)) >x : Symbol(x, Decl(assignmentToParenthesizedIdentifiers.ts, 31, 11)) (M2.M3) = { x: '' }; // Error ->M2.M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 11)) +>M2.M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 14)) >M2 : Symbol(M2, Decl(assignmentToParenthesizedIdentifiers.ts, 17, 15)) ->M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 11)) +>M3 : Symbol(M2.M3, Decl(assignmentToParenthesizedIdentifiers.ts, 19, 14)) >x : Symbol(x, Decl(assignmentToParenthesizedIdentifiers.ts, 32, 11)) diff --git a/tests/baselines/reference/assignmentToParenthesizedIdentifiers.types b/tests/baselines/reference/assignmentToParenthesizedIdentifiers.types index b40c45bd442cb..f1957d3d993bc 100644 --- a/tests/baselines/reference/assignmentToParenthesizedIdentifiers.types +++ b/tests/baselines/reference/assignmentToParenthesizedIdentifiers.types @@ -41,7 +41,7 @@ x = ''; // Error >'' : "" > : ^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -155,11 +155,11 @@ M = { y: 3 }; // Error >3 : 3 > : ^ -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ - export module M3 { + export namespace M3 { >M3 : typeof M3 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/assignmentToReferenceTypes.errors.txt b/tests/baselines/reference/assignmentToReferenceTypes.errors.txt index a0e6c842d91fa..31fed54e9747a 100644 --- a/tests/baselines/reference/assignmentToReferenceTypes.errors.txt +++ b/tests/baselines/reference/assignmentToReferenceTypes.errors.txt @@ -7,7 +7,7 @@ assignmentToReferenceTypes.ts(16,1): error TS2630: Cannot assign to 'f' because ==== assignmentToReferenceTypes.ts (4 errors) ==== // Should all be allowed - module M { + namespace M { } M = null; ~ diff --git a/tests/baselines/reference/assignmentToReferenceTypes.js b/tests/baselines/reference/assignmentToReferenceTypes.js index 4179585c5e74c..b42dcf53f0b08 100644 --- a/tests/baselines/reference/assignmentToReferenceTypes.js +++ b/tests/baselines/reference/assignmentToReferenceTypes.js @@ -3,7 +3,7 @@ //// [assignmentToReferenceTypes.ts] // Should all be allowed -module M { +namespace M { } M = null; diff --git a/tests/baselines/reference/assignmentToReferenceTypes.symbols b/tests/baselines/reference/assignmentToReferenceTypes.symbols index 67caa4e9c081a..2c7f5027db69a 100644 --- a/tests/baselines/reference/assignmentToReferenceTypes.symbols +++ b/tests/baselines/reference/assignmentToReferenceTypes.symbols @@ -3,7 +3,7 @@ === assignmentToReferenceTypes.ts === // Should all be allowed -module M { +namespace M { >M : Symbol(M, Decl(assignmentToReferenceTypes.ts, 0, 0)) } M = null; diff --git a/tests/baselines/reference/assignmentToReferenceTypes.types b/tests/baselines/reference/assignmentToReferenceTypes.types index 6844cf0f2449a..02677adabc5ed 100644 --- a/tests/baselines/reference/assignmentToReferenceTypes.types +++ b/tests/baselines/reference/assignmentToReferenceTypes.types @@ -3,7 +3,7 @@ === assignmentToReferenceTypes.ts === // Should all be allowed -module M { +namespace M { } M = null; >M = null : null diff --git a/tests/baselines/reference/assignments.errors.txt b/tests/baselines/reference/assignments.errors.txt index d55a66a9b642e..a907c483599fb 100644 --- a/tests/baselines/reference/assignments.errors.txt +++ b/tests/baselines/reference/assignments.errors.txt @@ -16,7 +16,7 @@ assignments.ts(31,1): error TS2693: 'I' only refers to a type, but is being used // Assign to a parameter // Assign to an interface - module M { } + namespace M { } M = null; // Error ~ !!! error TS2708: Cannot use namespace 'M' as a value. diff --git a/tests/baselines/reference/assignments.js b/tests/baselines/reference/assignments.js index 0351bb7d702c1..1e7ff2bcce510 100644 --- a/tests/baselines/reference/assignments.js +++ b/tests/baselines/reference/assignments.js @@ -10,7 +10,7 @@ // Assign to a parameter // Assign to an interface -module M { } +namespace M { } M = null; // Error class C { } diff --git a/tests/baselines/reference/assignments.symbols b/tests/baselines/reference/assignments.symbols index 5518dc9f75b8c..9311ae61f4741 100644 --- a/tests/baselines/reference/assignments.symbols +++ b/tests/baselines/reference/assignments.symbols @@ -10,7 +10,7 @@ // Assign to a parameter // Assign to an interface -module M { } +namespace M { } >M : Symbol(M, Decl(assignments.ts, 0, 0)) M = null; // Error diff --git a/tests/baselines/reference/assignments.types b/tests/baselines/reference/assignments.types index 5ea6404029205..396306308efa7 100644 --- a/tests/baselines/reference/assignments.types +++ b/tests/baselines/reference/assignments.types @@ -10,7 +10,7 @@ // Assign to a parameter // Assign to an interface -module M { } +namespace M { } M = null; // Error >M = null : null > : ^^^^ diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.errors.txt b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.errors.txt index d31f2dc0c77fc..93968de52c1af 100644 --- a/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.errors.txt +++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.errors.txt @@ -40,6 +40,6 @@ asyncAwaitIsolatedModules_es2017.ts(1,27): error TS2792: Cannot find module 'mis static async m6(): MyPromise { } } - module M { + namespace M { export async function f1() { } } \ No newline at end of file diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.js index 15dd3b1fc5c73..a2123d293b161 100644 --- a/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.js +++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.js @@ -37,7 +37,7 @@ class C { static async m6(): MyPromise { } } -module M { +namespace M { export async function f1() { } } diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.symbols b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.symbols index d3aa3f8d8f5fa..eeaea3f2330bc 100644 --- a/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.symbols +++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.symbols @@ -105,9 +105,9 @@ class C { >MyPromise : Symbol(MyPromise, Decl(asyncAwaitIsolatedModules_es2017.ts, 0, 8)) } -module M { +namespace M { >M : Symbol(M, Decl(asyncAwaitIsolatedModules_es2017.ts, 34, 1)) export async function f1() { } ->f1 : Symbol(f1, Decl(asyncAwaitIsolatedModules_es2017.ts, 36, 10)) +>f1 : Symbol(f1, Decl(asyncAwaitIsolatedModules_es2017.ts, 36, 13)) } diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types index 2059b6a1d0af5..e227372f6d19d 100644 --- a/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types +++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types @@ -142,7 +142,7 @@ class C { > : ^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.errors.txt b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.errors.txt index db8a11aa8690b..673f63cce76f6 100644 --- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.errors.txt +++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.errors.txt @@ -40,6 +40,6 @@ asyncAwaitIsolatedModules_es5.ts(1,27): error TS2307: Cannot find module 'missin static async m6(): MyPromise { } } - module M { + namespace M { export async function f1() { } } \ No newline at end of file diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js index c5e0e7aaa34f5..cdf1f60ab1ed3 100644 --- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js +++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js @@ -37,7 +37,7 @@ class C { static async m6(): MyPromise { } } -module M { +namespace M { export async function f1() { } } diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.symbols b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.symbols index 1d3dbd4f99ac5..236e5e62924af 100644 --- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.symbols +++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.symbols @@ -105,9 +105,9 @@ class C { >MyPromise : Symbol(MyPromise, Decl(asyncAwaitIsolatedModules_es5.ts, 0, 8)) } -module M { +namespace M { >M : Symbol(M, Decl(asyncAwaitIsolatedModules_es5.ts, 34, 1)) export async function f1() { } ->f1 : Symbol(f1, Decl(asyncAwaitIsolatedModules_es5.ts, 36, 10)) +>f1 : Symbol(f1, Decl(asyncAwaitIsolatedModules_es5.ts, 36, 13)) } diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types index c67538371823d..e0596ee3c8099 100644 --- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types +++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types @@ -142,7 +142,7 @@ class C { > : ^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.errors.txt b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.errors.txt index 9ee15a6cc8b1b..9393895d1ae64 100644 --- a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.errors.txt +++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.errors.txt @@ -40,6 +40,6 @@ asyncAwaitIsolatedModules_es6.ts(1,27): error TS2792: Cannot find module 'missin static async m6(): MyPromise { } } - module M { + namespace M { export async function f1() { } } \ No newline at end of file diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js index 2e43b649fad6c..21fdfbfe91779 100644 --- a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js +++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js @@ -37,7 +37,7 @@ class C { static async m6(): MyPromise { } } -module M { +namespace M { export async function f1() { } } diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.symbols b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.symbols index 88fd33ca0d127..cef09b1354c2f 100644 --- a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.symbols +++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.symbols @@ -105,9 +105,9 @@ class C { >MyPromise : Symbol(MyPromise, Decl(asyncAwaitIsolatedModules_es6.ts, 0, 8)) } -module M { +namespace M { >M : Symbol(M, Decl(asyncAwaitIsolatedModules_es6.ts, 34, 1)) export async function f1() { } ->f1 : Symbol(f1, Decl(asyncAwaitIsolatedModules_es6.ts, 36, 10)) +>f1 : Symbol(f1, Decl(asyncAwaitIsolatedModules_es6.ts, 36, 13)) } diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types index b69055519df93..9e8b5b808695b 100644 --- a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types +++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types @@ -142,7 +142,7 @@ class C { > : ^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/asyncAwait_es2017.js b/tests/baselines/reference/asyncAwait_es2017.js index 1bf1893e0a922..bd019a8dba892 100644 --- a/tests/baselines/reference/asyncAwait_es2017.js +++ b/tests/baselines/reference/asyncAwait_es2017.js @@ -37,7 +37,7 @@ class C { static async m6(): MyPromise { } } -module M { +namespace M { export async function f1() { } } diff --git a/tests/baselines/reference/asyncAwait_es2017.symbols b/tests/baselines/reference/asyncAwait_es2017.symbols index 6e9ce1fc21468..b7c68031b32ee 100644 --- a/tests/baselines/reference/asyncAwait_es2017.symbols +++ b/tests/baselines/reference/asyncAwait_es2017.symbols @@ -112,11 +112,11 @@ class C { >MyPromise : Symbol(MyPromise, Decl(asyncAwait_es2017.ts, 0, 0), Decl(asyncAwait_es2017.ts, 1, 11)) } -module M { +namespace M { >M : Symbol(M, Decl(asyncAwait_es2017.ts, 34, 1)) export async function f1() { } ->f1 : Symbol(f1, Decl(asyncAwait_es2017.ts, 36, 10)) +>f1 : Symbol(f1, Decl(asyncAwait_es2017.ts, 36, 13)) } async function f14() { diff --git a/tests/baselines/reference/asyncAwait_es2017.types b/tests/baselines/reference/asyncAwait_es2017.types index 6f53c6679172c..9ddde0d0fd0dc 100644 --- a/tests/baselines/reference/asyncAwait_es2017.types +++ b/tests/baselines/reference/asyncAwait_es2017.types @@ -148,7 +148,7 @@ class C { > : ^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/asyncAwait_es5.js b/tests/baselines/reference/asyncAwait_es5.js index 8bc581f48de17..1da4aa3c60ee7 100644 --- a/tests/baselines/reference/asyncAwait_es5.js +++ b/tests/baselines/reference/asyncAwait_es5.js @@ -37,7 +37,7 @@ class C { static async m6(): MyPromise { } } -module M { +namespace M { export async function f1() { } } diff --git a/tests/baselines/reference/asyncAwait_es5.symbols b/tests/baselines/reference/asyncAwait_es5.symbols index 997e0b0bc096b..7a19ce8a26fa4 100644 --- a/tests/baselines/reference/asyncAwait_es5.symbols +++ b/tests/baselines/reference/asyncAwait_es5.symbols @@ -112,11 +112,11 @@ class C { >MyPromise : Symbol(MyPromise, Decl(asyncAwait_es5.ts, 0, 0), Decl(asyncAwait_es5.ts, 1, 11)) } -module M { +namespace M { >M : Symbol(M, Decl(asyncAwait_es5.ts, 34, 1)) export async function f1() { } ->f1 : Symbol(f1, Decl(asyncAwait_es5.ts, 36, 10)) +>f1 : Symbol(f1, Decl(asyncAwait_es5.ts, 36, 13)) } async function f14() { diff --git a/tests/baselines/reference/asyncAwait_es5.types b/tests/baselines/reference/asyncAwait_es5.types index e85d7da56fb48..36850c32fdda2 100644 --- a/tests/baselines/reference/asyncAwait_es5.types +++ b/tests/baselines/reference/asyncAwait_es5.types @@ -148,7 +148,7 @@ class C { > : ^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/asyncAwait_es6.js b/tests/baselines/reference/asyncAwait_es6.js index 5b18e3224a7d3..26e2ddc1c5e79 100644 --- a/tests/baselines/reference/asyncAwait_es6.js +++ b/tests/baselines/reference/asyncAwait_es6.js @@ -37,7 +37,7 @@ class C { static async m6(): MyPromise { } } -module M { +namespace M { export async function f1() { } } diff --git a/tests/baselines/reference/asyncAwait_es6.symbols b/tests/baselines/reference/asyncAwait_es6.symbols index 18f303a2da679..b3e96604624be 100644 --- a/tests/baselines/reference/asyncAwait_es6.symbols +++ b/tests/baselines/reference/asyncAwait_es6.symbols @@ -112,11 +112,11 @@ class C { >MyPromise : Symbol(MyPromise, Decl(asyncAwait_es6.ts, 0, 0), Decl(asyncAwait_es6.ts, 1, 11)) } -module M { +namespace M { >M : Symbol(M, Decl(asyncAwait_es6.ts, 34, 1)) export async function f1() { } ->f1 : Symbol(f1, Decl(asyncAwait_es6.ts, 36, 10)) +>f1 : Symbol(f1, Decl(asyncAwait_es6.ts, 36, 13)) } async function f14() { diff --git a/tests/baselines/reference/asyncAwait_es6.types b/tests/baselines/reference/asyncAwait_es6.types index 5e35ef87d2ad9..94eade090cc7d 100644 --- a/tests/baselines/reference/asyncAwait_es6.types +++ b/tests/baselines/reference/asyncAwait_es6.types @@ -148,7 +148,7 @@ class C { > : ^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/asyncModule_es5.errors.txt b/tests/baselines/reference/asyncModule_es5.errors.txt index a9b7e9e3c542a..1cc0bc923ce77 100644 --- a/tests/baselines/reference/asyncModule_es5.errors.txt +++ b/tests/baselines/reference/asyncModule_es5.errors.txt @@ -1,8 +1,11 @@ asyncModule_es5.ts(1,1): error TS1042: 'async' modifier cannot be used here. +asyncModule_es5.ts(1,7): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. -==== asyncModule_es5.ts (1 errors) ==== +==== asyncModule_es5.ts (2 errors) ==== async module M { ~~~~~ !!! error TS1042: 'async' modifier cannot be used here. + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. } \ No newline at end of file diff --git a/tests/baselines/reference/asyncModule_es6.errors.txt b/tests/baselines/reference/asyncModule_es6.errors.txt index 3b50471f3004c..6d19f02e7766d 100644 --- a/tests/baselines/reference/asyncModule_es6.errors.txt +++ b/tests/baselines/reference/asyncModule_es6.errors.txt @@ -1,8 +1,11 @@ asyncModule_es6.ts(1,1): error TS1042: 'async' modifier cannot be used here. +asyncModule_es6.ts(1,7): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. -==== asyncModule_es6.ts (1 errors) ==== +==== asyncModule_es6.ts (2 errors) ==== async module M { ~~~~~ !!! error TS1042: 'async' modifier cannot be used here. + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. } \ No newline at end of file diff --git a/tests/baselines/reference/augmentExportEquals5.js b/tests/baselines/reference/augmentExportEquals5.js index 7dcea50441d56..03ef32a071954 100644 --- a/tests/baselines/reference/augmentExportEquals5.js +++ b/tests/baselines/reference/augmentExportEquals5.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/augmentExportEquals5.ts] //// //// [express.d.ts] -declare module Express { +declare namespace Express { export interface Request { } export interface Response { } export interface Application { } diff --git a/tests/baselines/reference/augmentExportEquals5.symbols b/tests/baselines/reference/augmentExportEquals5.symbols index b2bcb83b6f978..357f23c5096ce 100644 --- a/tests/baselines/reference/augmentExportEquals5.symbols +++ b/tests/baselines/reference/augmentExportEquals5.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/augmentExportEquals5.ts] //// === express.d.ts === -declare module Express { +declare namespace Express { >Express : Symbol(Express, Decl(express.d.ts, 0, 0)) export interface Request { } ->Request : Symbol(Request, Decl(express.d.ts, 0, 24)) +>Request : Symbol(Request, Decl(express.d.ts, 0, 27)) export interface Response { } >Response : Symbol(Response, Decl(express.d.ts, 1, 32)) @@ -75,9 +75,9 @@ declare module "express" { interface Request extends Express.Request { >Request : Symbol(Request, Decl(express.d.ts, 25, 49), Decl(augmentation.ts, 2, 26)) ->Express.Request : Symbol(Express.Request, Decl(express.d.ts, 0, 24)) +>Express.Request : Symbol(Express.Request, Decl(express.d.ts, 0, 27)) >Express : Symbol(Express, Decl(express.d.ts, 0, 0)) ->Request : Symbol(Express.Request, Decl(express.d.ts, 0, 24)) +>Request : Symbol(Express.Request, Decl(express.d.ts, 0, 27)) get (name: string): string; >get : Symbol(Request.get, Decl(express.d.ts, 27, 51)) diff --git a/tests/baselines/reference/augmentExportEquals5.types b/tests/baselines/reference/augmentExportEquals5.types index 7c512800e3d27..c03444303beef 100644 --- a/tests/baselines/reference/augmentExportEquals5.types +++ b/tests/baselines/reference/augmentExportEquals5.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/augmentExportEquals5.ts] //// === express.d.ts === -declare module Express { +declare namespace Express { export interface Request { } export interface Response { } export interface Application { } diff --git a/tests/baselines/reference/augmentedClassWithPrototypePropertyOnModule.errors.txt b/tests/baselines/reference/augmentedClassWithPrototypePropertyOnModule.errors.txt index 5dc80d0a39df4..aa0e7459cf518 100644 --- a/tests/baselines/reference/augmentedClassWithPrototypePropertyOnModule.errors.txt +++ b/tests/baselines/reference/augmentedClassWithPrototypePropertyOnModule.errors.txt @@ -2,7 +2,7 @@ augmentedClassWithPrototypePropertyOnModule.ts(3,9): error TS2300: Duplicate ide ==== augmentedClassWithPrototypePropertyOnModule.ts (1 errors) ==== - declare module m { + declare namespace m { var f; var prototype; // This should be error since prototype would be static property on class m ~~~~~~~~~ diff --git a/tests/baselines/reference/augmentedClassWithPrototypePropertyOnModule.js b/tests/baselines/reference/augmentedClassWithPrototypePropertyOnModule.js index 83d359a309eec..b9db7b5030505 100644 --- a/tests/baselines/reference/augmentedClassWithPrototypePropertyOnModule.js +++ b/tests/baselines/reference/augmentedClassWithPrototypePropertyOnModule.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/augmentedClassWithPrototypePropertyOnModule.ts] //// //// [augmentedClassWithPrototypePropertyOnModule.ts] -declare module m { +declare namespace m { var f; var prototype; // This should be error since prototype would be static property on class m } diff --git a/tests/baselines/reference/augmentedClassWithPrototypePropertyOnModule.symbols b/tests/baselines/reference/augmentedClassWithPrototypePropertyOnModule.symbols index 1bf180daf067b..0a19cdac84aed 100644 --- a/tests/baselines/reference/augmentedClassWithPrototypePropertyOnModule.symbols +++ b/tests/baselines/reference/augmentedClassWithPrototypePropertyOnModule.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/augmentedClassWithPrototypePropertyOnModule.ts] //// === augmentedClassWithPrototypePropertyOnModule.ts === -declare module m { +declare namespace m { >m : Symbol(m, Decl(augmentedClassWithPrototypePropertyOnModule.ts, 0, 0), Decl(augmentedClassWithPrototypePropertyOnModule.ts, 3, 1)) var f; diff --git a/tests/baselines/reference/augmentedClassWithPrototypePropertyOnModule.types b/tests/baselines/reference/augmentedClassWithPrototypePropertyOnModule.types index 4a773614976e2..6d3089a51a0af 100644 --- a/tests/baselines/reference/augmentedClassWithPrototypePropertyOnModule.types +++ b/tests/baselines/reference/augmentedClassWithPrototypePropertyOnModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/augmentedClassWithPrototypePropertyOnModule.ts] //// === augmentedClassWithPrototypePropertyOnModule.ts === -declare module m { +declare namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/augmentedTypesClass3.js b/tests/baselines/reference/augmentedTypesClass3.js index 9d97315d6bd0e..169181343a59d 100644 --- a/tests/baselines/reference/augmentedTypesClass3.js +++ b/tests/baselines/reference/augmentedTypesClass3.js @@ -3,13 +3,13 @@ //// [augmentedTypesClass3.ts] // class then module class c5 { public foo() { } } -module c5 { } // should be ok +namespace c5 { } // should be ok class c5a { public foo() { } } -module c5a { var y = 2; } // should be ok +namespace c5a { var y = 2; } // should be ok class c5b { public foo() { } } -module c5b { export var y = 2; } // should be ok +namespace c5b { export var y = 2; } // should be ok //// class then import class c5c { public foo() { } } diff --git a/tests/baselines/reference/augmentedTypesClass3.symbols b/tests/baselines/reference/augmentedTypesClass3.symbols index 92feb7012c188..a323206f0c2a1 100644 --- a/tests/baselines/reference/augmentedTypesClass3.symbols +++ b/tests/baselines/reference/augmentedTypesClass3.symbols @@ -6,28 +6,28 @@ class c5 { public foo() { } } >c5 : Symbol(c5, Decl(augmentedTypesClass3.ts, 0, 0), Decl(augmentedTypesClass3.ts, 1, 29)) >foo : Symbol(c5.foo, Decl(augmentedTypesClass3.ts, 1, 10)) -module c5 { } // should be ok +namespace c5 { } // should be ok >c5 : Symbol(c5, Decl(augmentedTypesClass3.ts, 0, 0), Decl(augmentedTypesClass3.ts, 1, 29)) class c5a { public foo() { } } ->c5a : Symbol(c5a, Decl(augmentedTypesClass3.ts, 2, 13), Decl(augmentedTypesClass3.ts, 4, 30)) +>c5a : Symbol(c5a, Decl(augmentedTypesClass3.ts, 2, 16), Decl(augmentedTypesClass3.ts, 4, 30)) >foo : Symbol(c5a.foo, Decl(augmentedTypesClass3.ts, 4, 11)) -module c5a { var y = 2; } // should be ok ->c5a : Symbol(c5a, Decl(augmentedTypesClass3.ts, 2, 13), Decl(augmentedTypesClass3.ts, 4, 30)) ->y : Symbol(y, Decl(augmentedTypesClass3.ts, 5, 16)) +namespace c5a { var y = 2; } // should be ok +>c5a : Symbol(c5a, Decl(augmentedTypesClass3.ts, 2, 16), Decl(augmentedTypesClass3.ts, 4, 30)) +>y : Symbol(y, Decl(augmentedTypesClass3.ts, 5, 19)) class c5b { public foo() { } } ->c5b : Symbol(c5b, Decl(augmentedTypesClass3.ts, 5, 25), Decl(augmentedTypesClass3.ts, 7, 30)) +>c5b : Symbol(c5b, Decl(augmentedTypesClass3.ts, 5, 28), Decl(augmentedTypesClass3.ts, 7, 30)) >foo : Symbol(c5b.foo, Decl(augmentedTypesClass3.ts, 7, 11)) -module c5b { export var y = 2; } // should be ok ->c5b : Symbol(c5b, Decl(augmentedTypesClass3.ts, 5, 25), Decl(augmentedTypesClass3.ts, 7, 30)) ->y : Symbol(y, Decl(augmentedTypesClass3.ts, 8, 23)) +namespace c5b { export var y = 2; } // should be ok +>c5b : Symbol(c5b, Decl(augmentedTypesClass3.ts, 5, 28), Decl(augmentedTypesClass3.ts, 7, 30)) +>y : Symbol(y, Decl(augmentedTypesClass3.ts, 8, 26)) //// class then import class c5c { public foo() { } } ->c5c : Symbol(c5c, Decl(augmentedTypesClass3.ts, 8, 32)) +>c5c : Symbol(c5c, Decl(augmentedTypesClass3.ts, 8, 35)) >foo : Symbol(c5c.foo, Decl(augmentedTypesClass3.ts, 11, 11)) //import c5c = require(''); diff --git a/tests/baselines/reference/augmentedTypesClass3.types b/tests/baselines/reference/augmentedTypesClass3.types index 9b9871ca3b299..cd19235c0b507 100644 --- a/tests/baselines/reference/augmentedTypesClass3.types +++ b/tests/baselines/reference/augmentedTypesClass3.types @@ -8,7 +8,7 @@ class c5 { public foo() { } } >foo : () => void > : ^^^^^^^^^^ -module c5 { } // should be ok +namespace c5 { } // should be ok class c5a { public foo() { } } >c5a : c5a @@ -16,7 +16,7 @@ class c5a { public foo() { } } >foo : () => void > : ^^^^^^^^^^ -module c5a { var y = 2; } // should be ok +namespace c5a { var y = 2; } // should be ok >c5a : typeof c5a > : ^^^^^^^^^^ >y : number @@ -30,7 +30,7 @@ class c5b { public foo() { } } >foo : () => void > : ^^^^^^^^^^ -module c5b { export var y = 2; } // should be ok +namespace c5b { export var y = 2; } // should be ok >c5b : typeof c5b > : ^^^^^^^^^^ >y : number diff --git a/tests/baselines/reference/augmentedTypesEnum.errors.txt b/tests/baselines/reference/augmentedTypesEnum.errors.txt index a8e9752429881..9f38532548a59 100644 --- a/tests/baselines/reference/augmentedTypesEnum.errors.txt +++ b/tests/baselines/reference/augmentedTypesEnum.errors.txt @@ -61,13 +61,13 @@ augmentedTypesEnum.ts(21,12): error TS2432: In an enum with multiple declaration // enum then internal module enum e6 { One } - module e6 { } // ok + namespace e6 { } // ok enum e6a { One } - module e6a { var y = 2; } // should be error + namespace e6a { var y = 2; } // should be error enum e6b { One } - module e6b { export var y = 2; } // should be error + namespace e6b { export var y = 2; } // should be error // enum then import, messes with error reporting //enum e7 { One } diff --git a/tests/baselines/reference/augmentedTypesEnum.js b/tests/baselines/reference/augmentedTypesEnum.js index e1f93a8703659..e3113ae4be800 100644 --- a/tests/baselines/reference/augmentedTypesEnum.js +++ b/tests/baselines/reference/augmentedTypesEnum.js @@ -25,13 +25,13 @@ enum e5a { One } // error // enum then internal module enum e6 { One } -module e6 { } // ok +namespace e6 { } // ok enum e6a { One } -module e6a { var y = 2; } // should be error +namespace e6a { var y = 2; } // should be error enum e6b { One } -module e6b { export var y = 2; } // should be error +namespace e6b { export var y = 2; } // should be error // enum then import, messes with error reporting //enum e7 { One } diff --git a/tests/baselines/reference/augmentedTypesEnum.symbols b/tests/baselines/reference/augmentedTypesEnum.symbols index 1dd7fe3f24ff5..8ab3996f17870 100644 --- a/tests/baselines/reference/augmentedTypesEnum.symbols +++ b/tests/baselines/reference/augmentedTypesEnum.symbols @@ -55,24 +55,24 @@ enum e6 { One } >e6 : Symbol(e6, Decl(augmentedTypesEnum.ts, 20, 16), Decl(augmentedTypesEnum.ts, 23, 15)) >One : Symbol(e6.One, Decl(augmentedTypesEnum.ts, 23, 9)) -module e6 { } // ok +namespace e6 { } // ok >e6 : Symbol(e6, Decl(augmentedTypesEnum.ts, 20, 16), Decl(augmentedTypesEnum.ts, 23, 15)) enum e6a { One } ->e6a : Symbol(e6a, Decl(augmentedTypesEnum.ts, 24, 13), Decl(augmentedTypesEnum.ts, 26, 16)) +>e6a : Symbol(e6a, Decl(augmentedTypesEnum.ts, 24, 16), Decl(augmentedTypesEnum.ts, 26, 16)) >One : Symbol(e6a.One, Decl(augmentedTypesEnum.ts, 26, 10)) -module e6a { var y = 2; } // should be error ->e6a : Symbol(e6a, Decl(augmentedTypesEnum.ts, 24, 13), Decl(augmentedTypesEnum.ts, 26, 16)) ->y : Symbol(y, Decl(augmentedTypesEnum.ts, 27, 16)) +namespace e6a { var y = 2; } // should be error +>e6a : Symbol(e6a, Decl(augmentedTypesEnum.ts, 24, 16), Decl(augmentedTypesEnum.ts, 26, 16)) +>y : Symbol(y, Decl(augmentedTypesEnum.ts, 27, 19)) enum e6b { One } ->e6b : Symbol(e6b, Decl(augmentedTypesEnum.ts, 27, 25), Decl(augmentedTypesEnum.ts, 29, 16)) +>e6b : Symbol(e6b, Decl(augmentedTypesEnum.ts, 27, 28), Decl(augmentedTypesEnum.ts, 29, 16)) >One : Symbol(e6b.One, Decl(augmentedTypesEnum.ts, 29, 10)) -module e6b { export var y = 2; } // should be error ->e6b : Symbol(e6b, Decl(augmentedTypesEnum.ts, 27, 25), Decl(augmentedTypesEnum.ts, 29, 16)) ->y : Symbol(y, Decl(augmentedTypesEnum.ts, 30, 23)) +namespace e6b { export var y = 2; } // should be error +>e6b : Symbol(e6b, Decl(augmentedTypesEnum.ts, 27, 28), Decl(augmentedTypesEnum.ts, 29, 16)) +>y : Symbol(y, Decl(augmentedTypesEnum.ts, 30, 26)) // enum then import, messes with error reporting //enum e7 { One } diff --git a/tests/baselines/reference/augmentedTypesEnum.types b/tests/baselines/reference/augmentedTypesEnum.types index 733022e95d24d..bf9eac1b309ba 100644 --- a/tests/baselines/reference/augmentedTypesEnum.types +++ b/tests/baselines/reference/augmentedTypesEnum.types @@ -82,7 +82,7 @@ enum e6 { One } >One : e6.One > : ^^^^^^ -module e6 { } // ok +namespace e6 { } // ok enum e6a { One } >e6a : e6a @@ -90,7 +90,7 @@ enum e6a { One } >One : e6a.One > : ^^^^^^^ -module e6a { var y = 2; } // should be error +namespace e6a { var y = 2; } // should be error >e6a : typeof e6a > : ^^^^^^^^^^ >y : number @@ -104,7 +104,7 @@ enum e6b { One } >One : e6b.One > : ^^^^^^^ -module e6b { export var y = 2; } // should be error +namespace e6b { export var y = 2; } // should be error >e6b : typeof e6b > : ^^^^^^^^^^ >y : number diff --git a/tests/baselines/reference/augmentedTypesEnum3.errors.txt b/tests/baselines/reference/augmentedTypesEnum3.errors.txt index a50b45318012d..4c075d9de5d12 100644 --- a/tests/baselines/reference/augmentedTypesEnum3.errors.txt +++ b/tests/baselines/reference/augmentedTypesEnum3.errors.txt @@ -2,15 +2,15 @@ augmentedTypesEnum3.ts(16,5): error TS2432: In an enum with multiple declaration ==== augmentedTypesEnum3.ts (1 errors) ==== - module E { + namespace E { var t; } enum E { } enum F { } - module F { var t; } + namespace F { var t; } - module A { + namespace A { var o; } enum A { @@ -21,6 +21,6 @@ augmentedTypesEnum3.ts(16,5): error TS2432: In an enum with multiple declaration ~ !!! error TS2432: In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element. } - module A { + namespace A { var p; } \ No newline at end of file diff --git a/tests/baselines/reference/augmentedTypesEnum3.js b/tests/baselines/reference/augmentedTypesEnum3.js index fbb2b81c09ccd..8973e765299d1 100644 --- a/tests/baselines/reference/augmentedTypesEnum3.js +++ b/tests/baselines/reference/augmentedTypesEnum3.js @@ -1,15 +1,15 @@ //// [tests/cases/compiler/augmentedTypesEnum3.ts] //// //// [augmentedTypesEnum3.ts] -module E { +namespace E { var t; } enum E { } enum F { } -module F { var t; } +namespace F { var t; } -module A { +namespace A { var o; } enum A { @@ -18,7 +18,7 @@ enum A { enum A { c } -module A { +namespace A { var p; } diff --git a/tests/baselines/reference/augmentedTypesEnum3.symbols b/tests/baselines/reference/augmentedTypesEnum3.symbols index 5b852406f2222..33adc33610894 100644 --- a/tests/baselines/reference/augmentedTypesEnum3.symbols +++ b/tests/baselines/reference/augmentedTypesEnum3.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/augmentedTypesEnum3.ts] //// === augmentedTypesEnum3.ts === -module E { +namespace E { >E : Symbol(E, Decl(augmentedTypesEnum3.ts, 0, 0), Decl(augmentedTypesEnum3.ts, 2, 1)) var t; @@ -13,30 +13,30 @@ enum E { } enum F { } >F : Symbol(F, Decl(augmentedTypesEnum3.ts, 3, 10), Decl(augmentedTypesEnum3.ts, 5, 10)) -module F { var t; } +namespace F { var t; } >F : Symbol(F, Decl(augmentedTypesEnum3.ts, 3, 10), Decl(augmentedTypesEnum3.ts, 5, 10)) ->t : Symbol(t, Decl(augmentedTypesEnum3.ts, 6, 14)) +>t : Symbol(t, Decl(augmentedTypesEnum3.ts, 6, 17)) -module A { ->A : Symbol(A, Decl(augmentedTypesEnum3.ts, 6, 19), Decl(augmentedTypesEnum3.ts, 10, 1), Decl(augmentedTypesEnum3.ts, 13, 1), Decl(augmentedTypesEnum3.ts, 16, 1)) +namespace A { +>A : Symbol(A, Decl(augmentedTypesEnum3.ts, 6, 22), Decl(augmentedTypesEnum3.ts, 10, 1), Decl(augmentedTypesEnum3.ts, 13, 1), Decl(augmentedTypesEnum3.ts, 16, 1)) var o; >o : Symbol(o, Decl(augmentedTypesEnum3.ts, 9, 7)) } enum A { ->A : Symbol(A, Decl(augmentedTypesEnum3.ts, 6, 19), Decl(augmentedTypesEnum3.ts, 10, 1), Decl(augmentedTypesEnum3.ts, 13, 1), Decl(augmentedTypesEnum3.ts, 16, 1)) +>A : Symbol(A, Decl(augmentedTypesEnum3.ts, 6, 22), Decl(augmentedTypesEnum3.ts, 10, 1), Decl(augmentedTypesEnum3.ts, 13, 1), Decl(augmentedTypesEnum3.ts, 16, 1)) b >b : Symbol(A.b, Decl(augmentedTypesEnum3.ts, 11, 8)) } enum A { ->A : Symbol(A, Decl(augmentedTypesEnum3.ts, 6, 19), Decl(augmentedTypesEnum3.ts, 10, 1), Decl(augmentedTypesEnum3.ts, 13, 1), Decl(augmentedTypesEnum3.ts, 16, 1)) +>A : Symbol(A, Decl(augmentedTypesEnum3.ts, 6, 22), Decl(augmentedTypesEnum3.ts, 10, 1), Decl(augmentedTypesEnum3.ts, 13, 1), Decl(augmentedTypesEnum3.ts, 16, 1)) c >c : Symbol(A.c, Decl(augmentedTypesEnum3.ts, 14, 8)) } -module A { ->A : Symbol(A, Decl(augmentedTypesEnum3.ts, 6, 19), Decl(augmentedTypesEnum3.ts, 10, 1), Decl(augmentedTypesEnum3.ts, 13, 1), Decl(augmentedTypesEnum3.ts, 16, 1)) +namespace A { +>A : Symbol(A, Decl(augmentedTypesEnum3.ts, 6, 22), Decl(augmentedTypesEnum3.ts, 10, 1), Decl(augmentedTypesEnum3.ts, 13, 1), Decl(augmentedTypesEnum3.ts, 16, 1)) var p; >p : Symbol(p, Decl(augmentedTypesEnum3.ts, 18, 7)) diff --git a/tests/baselines/reference/augmentedTypesEnum3.types b/tests/baselines/reference/augmentedTypesEnum3.types index f8336837df8b8..a9e24058da449 100644 --- a/tests/baselines/reference/augmentedTypesEnum3.types +++ b/tests/baselines/reference/augmentedTypesEnum3.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/augmentedTypesEnum3.ts] //// === augmentedTypesEnum3.ts === -module E { +namespace E { >E : typeof E > : ^^^^^^^^ @@ -17,13 +17,13 @@ enum F { } >F : F > : ^ -module F { var t; } +namespace F { var t; } >F : typeof F > : ^^^^^^^^ >t : any > : ^^^ -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -47,7 +47,7 @@ enum A { >c : A.b > : ^^^ } -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.js b/tests/baselines/reference/augmentedTypesExternalModule1.js index 2b7ad12f5c71b..cb2493cdd5fa5 100644 --- a/tests/baselines/reference/augmentedTypesExternalModule1.js +++ b/tests/baselines/reference/augmentedTypesExternalModule1.js @@ -3,7 +3,7 @@ //// [augmentedTypesExternalModule1.ts] export var a = 1; class c5 { public foo() { } } -module c5 { } // should be ok everywhere +namespace c5 { } // should be ok everywhere //// [augmentedTypesExternalModule1.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.symbols b/tests/baselines/reference/augmentedTypesExternalModule1.symbols index d97988d71b473..9734c040ca6da 100644 --- a/tests/baselines/reference/augmentedTypesExternalModule1.symbols +++ b/tests/baselines/reference/augmentedTypesExternalModule1.symbols @@ -8,6 +8,6 @@ class c5 { public foo() { } } >c5 : Symbol(c5, Decl(augmentedTypesExternalModule1.ts, 0, 17), Decl(augmentedTypesExternalModule1.ts, 1, 29)) >foo : Symbol(c5.foo, Decl(augmentedTypesExternalModule1.ts, 1, 10)) -module c5 { } // should be ok everywhere +namespace c5 { } // should be ok everywhere >c5 : Symbol(c5, Decl(augmentedTypesExternalModule1.ts, 0, 17), Decl(augmentedTypesExternalModule1.ts, 1, 29)) diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.types b/tests/baselines/reference/augmentedTypesExternalModule1.types index 4e24a866526c3..4d20b5b02a698 100644 --- a/tests/baselines/reference/augmentedTypesExternalModule1.types +++ b/tests/baselines/reference/augmentedTypesExternalModule1.types @@ -13,4 +13,4 @@ class c5 { public foo() { } } >foo : () => void > : ^^^^^^^^^^ -module c5 { } // should be ok everywhere +namespace c5 { } // should be ok everywhere diff --git a/tests/baselines/reference/augmentedTypesFunction.errors.txt b/tests/baselines/reference/augmentedTypesFunction.errors.txt index 241e746460938..031960a175ee1 100644 --- a/tests/baselines/reference/augmentedTypesFunction.errors.txt +++ b/tests/baselines/reference/augmentedTypesFunction.errors.txt @@ -65,16 +65,16 @@ augmentedTypesFunction.ts(21,6): error TS2567: Enum declarations can only merge // function then internal module function y5() { } - module y5 { } // ok since module is not instantiated + namespace y5 { } // ok since module is not instantiated function y5a() { } - module y5a { var y = 2; } // should be an error + namespace y5a { var y = 2; } // should be an error function y5b() { } - module y5b { export var y = 3; } // should be an error + namespace y5b { export var y = 3; } // should be an error function y5c() { } - module y5c { export interface I { foo(): void } } // should be an error + namespace y5c { export interface I { foo(): void } } // should be an error // function then import, messes with other errors //function y6() { } diff --git a/tests/baselines/reference/augmentedTypesFunction.js b/tests/baselines/reference/augmentedTypesFunction.js index 72009bde1219b..504a24e955813 100644 --- a/tests/baselines/reference/augmentedTypesFunction.js +++ b/tests/baselines/reference/augmentedTypesFunction.js @@ -25,16 +25,16 @@ enum y4 { One } // error // function then internal module function y5() { } -module y5 { } // ok since module is not instantiated +namespace y5 { } // ok since module is not instantiated function y5a() { } -module y5a { var y = 2; } // should be an error +namespace y5a { var y = 2; } // should be an error function y5b() { } -module y5b { export var y = 3; } // should be an error +namespace y5b { export var y = 3; } // should be an error function y5c() { } -module y5c { export interface I { foo(): void } } // should be an error +namespace y5c { export interface I { foo(): void } } // should be an error // function then import, messes with other errors //function y6() { } diff --git a/tests/baselines/reference/augmentedTypesFunction.symbols b/tests/baselines/reference/augmentedTypesFunction.symbols index 14814c2cf96ee..8e34acdea8c90 100644 --- a/tests/baselines/reference/augmentedTypesFunction.symbols +++ b/tests/baselines/reference/augmentedTypesFunction.symbols @@ -47,30 +47,30 @@ enum y4 { One } // error function y5() { } >y5 : Symbol(y5, Decl(augmentedTypesFunction.ts, 20, 15), Decl(augmentedTypesFunction.ts, 23, 17)) -module y5 { } // ok since module is not instantiated +namespace y5 { } // ok since module is not instantiated >y5 : Symbol(y5, Decl(augmentedTypesFunction.ts, 20, 15), Decl(augmentedTypesFunction.ts, 23, 17)) function y5a() { } ->y5a : Symbol(y5a, Decl(augmentedTypesFunction.ts, 24, 13), Decl(augmentedTypesFunction.ts, 26, 18)) +>y5a : Symbol(y5a, Decl(augmentedTypesFunction.ts, 24, 16), Decl(augmentedTypesFunction.ts, 26, 18)) -module y5a { var y = 2; } // should be an error ->y5a : Symbol(y5a, Decl(augmentedTypesFunction.ts, 24, 13), Decl(augmentedTypesFunction.ts, 26, 18)) ->y : Symbol(y, Decl(augmentedTypesFunction.ts, 27, 16)) +namespace y5a { var y = 2; } // should be an error +>y5a : Symbol(y5a, Decl(augmentedTypesFunction.ts, 24, 16), Decl(augmentedTypesFunction.ts, 26, 18)) +>y : Symbol(y, Decl(augmentedTypesFunction.ts, 27, 19)) function y5b() { } ->y5b : Symbol(y5b, Decl(augmentedTypesFunction.ts, 27, 25), Decl(augmentedTypesFunction.ts, 29, 18)) +>y5b : Symbol(y5b, Decl(augmentedTypesFunction.ts, 27, 28), Decl(augmentedTypesFunction.ts, 29, 18)) -module y5b { export var y = 3; } // should be an error ->y5b : Symbol(y5b, Decl(augmentedTypesFunction.ts, 27, 25), Decl(augmentedTypesFunction.ts, 29, 18)) ->y : Symbol(y, Decl(augmentedTypesFunction.ts, 30, 23)) +namespace y5b { export var y = 3; } // should be an error +>y5b : Symbol(y5b, Decl(augmentedTypesFunction.ts, 27, 28), Decl(augmentedTypesFunction.ts, 29, 18)) +>y : Symbol(y, Decl(augmentedTypesFunction.ts, 30, 26)) function y5c() { } ->y5c : Symbol(y5c, Decl(augmentedTypesFunction.ts, 30, 32), Decl(augmentedTypesFunction.ts, 32, 18)) +>y5c : Symbol(y5c, Decl(augmentedTypesFunction.ts, 30, 35), Decl(augmentedTypesFunction.ts, 32, 18)) -module y5c { export interface I { foo(): void } } // should be an error ->y5c : Symbol(y5c, Decl(augmentedTypesFunction.ts, 30, 32), Decl(augmentedTypesFunction.ts, 32, 18)) ->I : Symbol(I, Decl(augmentedTypesFunction.ts, 33, 12)) ->foo : Symbol(I.foo, Decl(augmentedTypesFunction.ts, 33, 33)) +namespace y5c { export interface I { foo(): void } } // should be an error +>y5c : Symbol(y5c, Decl(augmentedTypesFunction.ts, 30, 35), Decl(augmentedTypesFunction.ts, 32, 18)) +>I : Symbol(I, Decl(augmentedTypesFunction.ts, 33, 15)) +>foo : Symbol(I.foo, Decl(augmentedTypesFunction.ts, 33, 36)) // function then import, messes with other errors //function y6() { } diff --git a/tests/baselines/reference/augmentedTypesFunction.types b/tests/baselines/reference/augmentedTypesFunction.types index 0b1bb129c1237..8a3474d500c59 100644 --- a/tests/baselines/reference/augmentedTypesFunction.types +++ b/tests/baselines/reference/augmentedTypesFunction.types @@ -66,13 +66,13 @@ function y5() { } >y5 : () => void > : ^^^^^^^^^^ -module y5 { } // ok since module is not instantiated +namespace y5 { } // ok since module is not instantiated function y5a() { } >y5a : typeof y5a > : ^^^^^^^^^^ -module y5a { var y = 2; } // should be an error +namespace y5a { var y = 2; } // should be an error >y5a : typeof y5a > : ^^^^^^^^^^ >y : number @@ -84,7 +84,7 @@ function y5b() { } >y5b : typeof y5b > : ^^^^^^^^^^ -module y5b { export var y = 3; } // should be an error +namespace y5b { export var y = 3; } // should be an error >y5b : typeof y5b > : ^^^^^^^^^^ >y : number @@ -96,7 +96,7 @@ function y5c() { } >y5c : () => void > : ^^^^^^^^^^ -module y5c { export interface I { foo(): void } } // should be an error +namespace y5c { export interface I { foo(): void } } // should be an error >foo : () => void > : ^^^^^^ diff --git a/tests/baselines/reference/augmentedTypesModules.errors.txt b/tests/baselines/reference/augmentedTypesModules.errors.txt index c5e17402e5b7e..94ce669b684c7 100644 --- a/tests/baselines/reference/augmentedTypesModules.errors.txt +++ b/tests/baselines/reference/augmentedTypesModules.errors.txt @@ -1,40 +1,40 @@ -augmentedTypesModules.ts(5,8): error TS2300: Duplicate identifier 'm1a'. +augmentedTypesModules.ts(5,11): error TS2300: Duplicate identifier 'm1a'. augmentedTypesModules.ts(6,5): error TS2300: Duplicate identifier 'm1a'. -augmentedTypesModules.ts(8,8): error TS2300: Duplicate identifier 'm1b'. +augmentedTypesModules.ts(8,11): error TS2300: Duplicate identifier 'm1b'. augmentedTypesModules.ts(9,5): error TS2300: Duplicate identifier 'm1b'. -augmentedTypesModules.ts(16,8): error TS2300: Duplicate identifier 'm1d'. +augmentedTypesModules.ts(16,11): error TS2300: Duplicate identifier 'm1d'. augmentedTypesModules.ts(19,5): error TS2300: Duplicate identifier 'm1d'. -augmentedTypesModules.ts(25,8): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. -augmentedTypesModules.ts(28,8): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. -augmentedTypesModules.ts(51,8): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. +augmentedTypesModules.ts(25,11): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. +augmentedTypesModules.ts(28,11): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. +augmentedTypesModules.ts(51,11): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. ==== augmentedTypesModules.ts (9 errors) ==== // module then var - module m1 { } + namespace m1 { } var m1 = 1; // Should be allowed - module m1a { var y = 2; } // error - ~~~ + namespace m1a { var y = 2; } // error + ~~~ !!! error TS2300: Duplicate identifier 'm1a'. var m1a = 1; // error ~~~ !!! error TS2300: Duplicate identifier 'm1a'. - module m1b { export var y = 2; } // error - ~~~ + namespace m1b { export var y = 2; } // error + ~~~ !!! error TS2300: Duplicate identifier 'm1b'. var m1b = 1; // error ~~~ !!! error TS2300: Duplicate identifier 'm1b'. - module m1c { + namespace m1c { export interface I { foo(): void; } } var m1c = 1; // Should be allowed - module m1d { // error - ~~~ + namespace m1d { // error + ~~~ !!! error TS2300: Duplicate identifier 'm1d'. export class I { foo() { } } } @@ -43,85 +43,85 @@ augmentedTypesModules.ts(51,8): error TS2434: A namespace declaration cannot be !!! error TS2300: Duplicate identifier 'm1d'. // module then function - module m2 { } + namespace m2 { } function m2() { }; // ok since the module is not instantiated - module m2a { var y = 2; } - ~~~ + namespace m2a { var y = 2; } + ~~~ !!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. function m2a() { }; // error since the module is instantiated - module m2b { export var y = 2; } - ~~~ + namespace m2b { export var y = 2; } + ~~~ !!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. function m2b() { }; // error since the module is instantiated // should be errors to have function first function m2c() { }; - module m2c { export var y = 2; } + namespace m2c { export var y = 2; } - module m2d { } + namespace m2d { } declare function m2d(): void; declare function m2e(): void; - module m2e { } + namespace m2e { } function m2f() { }; - module m2f { export interface I { foo(): void } } + namespace m2f { export interface I { foo(): void } } function m2g() { }; - module m2g { export class C { foo() { } } } + namespace m2g { export class C { foo() { } } } // module then class - module m3 { } + namespace m3 { } class m3 { } // ok since the module is not instantiated - module m3a { var y = 2; } - ~~~ + namespace m3a { var y = 2; } + ~~~ !!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. class m3a { foo() { } } // error, class isn't ambient or declared before the module class m3b { foo() { } } - module m3b { var y = 2; } + namespace m3b { var y = 2; } class m3c { foo() { } } - module m3c { export var y = 2; } + namespace m3c { export var y = 2; } declare class m3d { foo(): void } - module m3d { export var y = 2; } + namespace m3d { export var y = 2; } - module m3e { export var y = 2; } + namespace m3e { export var y = 2; } declare class m3e { foo(): void } declare class m3f { foo(): void } - module m3f { export interface I { foo(): void } } + namespace m3f { export interface I { foo(): void } } declare class m3g { foo(): void } - module m3g { export class C { foo() { } } } + namespace m3g { export class C { foo() { } } } // module then enum // should be errors - module m4 { } + namespace m4 { } enum m4 { } - module m4a { var y = 2; } + namespace m4a { var y = 2; } enum m4a { One } - module m4b { export var y = 2; } + namespace m4b { export var y = 2; } enum m4b { One } - module m4c { interface I { foo(): void } } + namespace m4c { interface I { foo(): void } } enum m4c { One } - module m4d { class C { foo() { } } } + namespace m4d { class C { foo() { } } } enum m4d { One } //// module then module - module m5 { export var y = 2; } - module m5 { export interface I { foo(): void } } // should already be reasonably well covered + namespace m5 { export var y = 2; } + namespace m5 { export interface I { foo(): void } } // should already be reasonably well covered // module then import - module m6 { export var y = 2; } + namespace m6 { export var y = 2; } //import m6 = require(''); \ No newline at end of file diff --git a/tests/baselines/reference/augmentedTypesModules.js b/tests/baselines/reference/augmentedTypesModules.js index 01c8a0548269f..ebcd8b49b9c69 100644 --- a/tests/baselines/reference/augmentedTypesModules.js +++ b/tests/baselines/reference/augmentedTypesModules.js @@ -2,100 +2,100 @@ //// [augmentedTypesModules.ts] // module then var -module m1 { } +namespace m1 { } var m1 = 1; // Should be allowed -module m1a { var y = 2; } // error +namespace m1a { var y = 2; } // error var m1a = 1; // error -module m1b { export var y = 2; } // error +namespace m1b { export var y = 2; } // error var m1b = 1; // error -module m1c { +namespace m1c { export interface I { foo(): void; } } var m1c = 1; // Should be allowed -module m1d { // error +namespace m1d { // error export class I { foo() { } } } var m1d = 1; // error // module then function -module m2 { } +namespace m2 { } function m2() { }; // ok since the module is not instantiated -module m2a { var y = 2; } +namespace m2a { var y = 2; } function m2a() { }; // error since the module is instantiated -module m2b { export var y = 2; } +namespace m2b { export var y = 2; } function m2b() { }; // error since the module is instantiated // should be errors to have function first function m2c() { }; -module m2c { export var y = 2; } +namespace m2c { export var y = 2; } -module m2d { } +namespace m2d { } declare function m2d(): void; declare function m2e(): void; -module m2e { } +namespace m2e { } function m2f() { }; -module m2f { export interface I { foo(): void } } +namespace m2f { export interface I { foo(): void } } function m2g() { }; -module m2g { export class C { foo() { } } } +namespace m2g { export class C { foo() { } } } // module then class -module m3 { } +namespace m3 { } class m3 { } // ok since the module is not instantiated -module m3a { var y = 2; } +namespace m3a { var y = 2; } class m3a { foo() { } } // error, class isn't ambient or declared before the module class m3b { foo() { } } -module m3b { var y = 2; } +namespace m3b { var y = 2; } class m3c { foo() { } } -module m3c { export var y = 2; } +namespace m3c { export var y = 2; } declare class m3d { foo(): void } -module m3d { export var y = 2; } +namespace m3d { export var y = 2; } -module m3e { export var y = 2; } +namespace m3e { export var y = 2; } declare class m3e { foo(): void } declare class m3f { foo(): void } -module m3f { export interface I { foo(): void } } +namespace m3f { export interface I { foo(): void } } declare class m3g { foo(): void } -module m3g { export class C { foo() { } } } +namespace m3g { export class C { foo() { } } } // module then enum // should be errors -module m4 { } +namespace m4 { } enum m4 { } -module m4a { var y = 2; } +namespace m4a { var y = 2; } enum m4a { One } -module m4b { export var y = 2; } +namespace m4b { export var y = 2; } enum m4b { One } -module m4c { interface I { foo(): void } } +namespace m4c { interface I { foo(): void } } enum m4c { One } -module m4d { class C { foo() { } } } +namespace m4d { class C { foo() { } } } enum m4d { One } //// module then module -module m5 { export var y = 2; } -module m5 { export interface I { foo(): void } } // should already be reasonably well covered +namespace m5 { export var y = 2; } +namespace m5 { export interface I { foo(): void } } // should already be reasonably well covered // module then import -module m6 { export var y = 2; } +namespace m6 { export var y = 2; } //import m6 = require(''); diff --git a/tests/baselines/reference/augmentedTypesModules.symbols b/tests/baselines/reference/augmentedTypesModules.symbols index 4358e5cc595f5..2a4802125af97 100644 --- a/tests/baselines/reference/augmentedTypesModules.symbols +++ b/tests/baselines/reference/augmentedTypesModules.symbols @@ -2,225 +2,225 @@ === augmentedTypesModules.ts === // module then var -module m1 { } +namespace m1 { } >m1 : Symbol(m1, Decl(augmentedTypesModules.ts, 0, 0), Decl(augmentedTypesModules.ts, 2, 3)) var m1 = 1; // Should be allowed >m1 : Symbol(m1, Decl(augmentedTypesModules.ts, 0, 0), Decl(augmentedTypesModules.ts, 2, 3)) -module m1a { var y = 2; } // error +namespace m1a { var y = 2; } // error >m1a : Symbol(m1a, Decl(augmentedTypesModules.ts, 2, 11)) ->y : Symbol(y, Decl(augmentedTypesModules.ts, 4, 16)) +>y : Symbol(y, Decl(augmentedTypesModules.ts, 4, 19)) var m1a = 1; // error >m1a : Symbol(m1a, Decl(augmentedTypesModules.ts, 5, 3)) -module m1b { export var y = 2; } // error +namespace m1b { export var y = 2; } // error >m1b : Symbol(m1b, Decl(augmentedTypesModules.ts, 5, 12)) ->y : Symbol(y, Decl(augmentedTypesModules.ts, 7, 23)) +>y : Symbol(y, Decl(augmentedTypesModules.ts, 7, 26)) var m1b = 1; // error >m1b : Symbol(m1b, Decl(augmentedTypesModules.ts, 8, 3)) -module m1c { +namespace m1c { >m1c : Symbol(m1c, Decl(augmentedTypesModules.ts, 8, 12), Decl(augmentedTypesModules.ts, 13, 3)) export interface I { foo(): void; } ->I : Symbol(I, Decl(augmentedTypesModules.ts, 10, 12)) +>I : Symbol(I, Decl(augmentedTypesModules.ts, 10, 15)) >foo : Symbol(I.foo, Decl(augmentedTypesModules.ts, 11, 24)) } var m1c = 1; // Should be allowed >m1c : Symbol(m1c, Decl(augmentedTypesModules.ts, 8, 12), Decl(augmentedTypesModules.ts, 13, 3)) -module m1d { // error +namespace m1d { // error >m1d : Symbol(m1d, Decl(augmentedTypesModules.ts, 13, 12)) export class I { foo() { } } ->I : Symbol(I, Decl(augmentedTypesModules.ts, 15, 12)) +>I : Symbol(I, Decl(augmentedTypesModules.ts, 15, 15)) >foo : Symbol(I.foo, Decl(augmentedTypesModules.ts, 16, 20)) } var m1d = 1; // error >m1d : Symbol(m1d, Decl(augmentedTypesModules.ts, 18, 3)) // module then function -module m2 { } ->m2 : Symbol(m2, Decl(augmentedTypesModules.ts, 21, 13), Decl(augmentedTypesModules.ts, 18, 12)) +namespace m2 { } +>m2 : Symbol(m2, Decl(augmentedTypesModules.ts, 21, 16), Decl(augmentedTypesModules.ts, 18, 12)) function m2() { }; // ok since the module is not instantiated ->m2 : Symbol(m2, Decl(augmentedTypesModules.ts, 21, 13), Decl(augmentedTypesModules.ts, 18, 12)) +>m2 : Symbol(m2, Decl(augmentedTypesModules.ts, 21, 16), Decl(augmentedTypesModules.ts, 18, 12)) -module m2a { var y = 2; } ->m2a : Symbol(m2a, Decl(augmentedTypesModules.ts, 24, 25), Decl(augmentedTypesModules.ts, 22, 18)) ->y : Symbol(y, Decl(augmentedTypesModules.ts, 24, 16)) +namespace m2a { var y = 2; } +>m2a : Symbol(m2a, Decl(augmentedTypesModules.ts, 24, 28), Decl(augmentedTypesModules.ts, 22, 18)) +>y : Symbol(y, Decl(augmentedTypesModules.ts, 24, 19)) function m2a() { }; // error since the module is instantiated ->m2a : Symbol(m2a, Decl(augmentedTypesModules.ts, 24, 25), Decl(augmentedTypesModules.ts, 22, 18)) +>m2a : Symbol(m2a, Decl(augmentedTypesModules.ts, 24, 28), Decl(augmentedTypesModules.ts, 22, 18)) -module m2b { export var y = 2; } ->m2b : Symbol(m2b, Decl(augmentedTypesModules.ts, 27, 32), Decl(augmentedTypesModules.ts, 25, 19)) ->y : Symbol(y, Decl(augmentedTypesModules.ts, 27, 23)) +namespace m2b { export var y = 2; } +>m2b : Symbol(m2b, Decl(augmentedTypesModules.ts, 27, 35), Decl(augmentedTypesModules.ts, 25, 19)) +>y : Symbol(y, Decl(augmentedTypesModules.ts, 27, 26)) function m2b() { }; // error since the module is instantiated ->m2b : Symbol(m2b, Decl(augmentedTypesModules.ts, 27, 32), Decl(augmentedTypesModules.ts, 25, 19)) +>m2b : Symbol(m2b, Decl(augmentedTypesModules.ts, 27, 35), Decl(augmentedTypesModules.ts, 25, 19)) // should be errors to have function first function m2c() { }; >m2c : Symbol(m2c, Decl(augmentedTypesModules.ts, 28, 19), Decl(augmentedTypesModules.ts, 31, 19)) -module m2c { export var y = 2; } +namespace m2c { export var y = 2; } >m2c : Symbol(m2c, Decl(augmentedTypesModules.ts, 28, 19), Decl(augmentedTypesModules.ts, 31, 19)) ->y : Symbol(y, Decl(augmentedTypesModules.ts, 32, 23)) +>y : Symbol(y, Decl(augmentedTypesModules.ts, 32, 26)) -module m2d { } ->m2d : Symbol(m2d, Decl(augmentedTypesModules.ts, 34, 14), Decl(augmentedTypesModules.ts, 32, 32)) +namespace m2d { } +>m2d : Symbol(m2d, Decl(augmentedTypesModules.ts, 34, 17), Decl(augmentedTypesModules.ts, 32, 35)) declare function m2d(): void; ->m2d : Symbol(m2d, Decl(augmentedTypesModules.ts, 34, 14), Decl(augmentedTypesModules.ts, 32, 32)) +>m2d : Symbol(m2d, Decl(augmentedTypesModules.ts, 34, 17), Decl(augmentedTypesModules.ts, 32, 35)) declare function m2e(): void; >m2e : Symbol(m2e, Decl(augmentedTypesModules.ts, 35, 29), Decl(augmentedTypesModules.ts, 37, 29)) -module m2e { } +namespace m2e { } >m2e : Symbol(m2e, Decl(augmentedTypesModules.ts, 35, 29), Decl(augmentedTypesModules.ts, 37, 29)) function m2f() { }; ->m2f : Symbol(m2f, Decl(augmentedTypesModules.ts, 38, 14), Decl(augmentedTypesModules.ts, 40, 19)) +>m2f : Symbol(m2f, Decl(augmentedTypesModules.ts, 38, 17), Decl(augmentedTypesModules.ts, 40, 19)) -module m2f { export interface I { foo(): void } } ->m2f : Symbol(m2f, Decl(augmentedTypesModules.ts, 38, 14), Decl(augmentedTypesModules.ts, 40, 19)) ->I : Symbol(I, Decl(augmentedTypesModules.ts, 41, 12)) ->foo : Symbol(I.foo, Decl(augmentedTypesModules.ts, 41, 33)) +namespace m2f { export interface I { foo(): void } } +>m2f : Symbol(m2f, Decl(augmentedTypesModules.ts, 38, 17), Decl(augmentedTypesModules.ts, 40, 19)) +>I : Symbol(I, Decl(augmentedTypesModules.ts, 41, 15)) +>foo : Symbol(I.foo, Decl(augmentedTypesModules.ts, 41, 36)) function m2g() { }; ->m2g : Symbol(m2g, Decl(augmentedTypesModules.ts, 41, 49), Decl(augmentedTypesModules.ts, 43, 19)) +>m2g : Symbol(m2g, Decl(augmentedTypesModules.ts, 41, 52), Decl(augmentedTypesModules.ts, 43, 19)) -module m2g { export class C { foo() { } } } ->m2g : Symbol(m2g, Decl(augmentedTypesModules.ts, 41, 49), Decl(augmentedTypesModules.ts, 43, 19)) ->C : Symbol(C, Decl(augmentedTypesModules.ts, 44, 12)) ->foo : Symbol(C.foo, Decl(augmentedTypesModules.ts, 44, 29)) +namespace m2g { export class C { foo() { } } } +>m2g : Symbol(m2g, Decl(augmentedTypesModules.ts, 41, 52), Decl(augmentedTypesModules.ts, 43, 19)) +>C : Symbol(C, Decl(augmentedTypesModules.ts, 44, 15)) +>foo : Symbol(C.foo, Decl(augmentedTypesModules.ts, 44, 32)) // module then class -module m3 { } ->m3 : Symbol(m3, Decl(augmentedTypesModules.ts, 44, 43), Decl(augmentedTypesModules.ts, 47, 13)) +namespace m3 { } +>m3 : Symbol(m3, Decl(augmentedTypesModules.ts, 44, 46), Decl(augmentedTypesModules.ts, 47, 16)) class m3 { } // ok since the module is not instantiated ->m3 : Symbol(m3, Decl(augmentedTypesModules.ts, 44, 43), Decl(augmentedTypesModules.ts, 47, 13)) +>m3 : Symbol(m3, Decl(augmentedTypesModules.ts, 44, 46), Decl(augmentedTypesModules.ts, 47, 16)) -module m3a { var y = 2; } ->m3a : Symbol(m3a, Decl(augmentedTypesModules.ts, 48, 12), Decl(augmentedTypesModules.ts, 50, 25)) ->y : Symbol(y, Decl(augmentedTypesModules.ts, 50, 16)) +namespace m3a { var y = 2; } +>m3a : Symbol(m3a, Decl(augmentedTypesModules.ts, 48, 12), Decl(augmentedTypesModules.ts, 50, 28)) +>y : Symbol(y, Decl(augmentedTypesModules.ts, 50, 19)) class m3a { foo() { } } // error, class isn't ambient or declared before the module ->m3a : Symbol(m3a, Decl(augmentedTypesModules.ts, 48, 12), Decl(augmentedTypesModules.ts, 50, 25)) +>m3a : Symbol(m3a, Decl(augmentedTypesModules.ts, 48, 12), Decl(augmentedTypesModules.ts, 50, 28)) >foo : Symbol(m3a.foo, Decl(augmentedTypesModules.ts, 51, 11)) class m3b { foo() { } } >m3b : Symbol(m3b, Decl(augmentedTypesModules.ts, 51, 23), Decl(augmentedTypesModules.ts, 53, 23)) >foo : Symbol(m3b.foo, Decl(augmentedTypesModules.ts, 53, 11)) -module m3b { var y = 2; } +namespace m3b { var y = 2; } >m3b : Symbol(m3b, Decl(augmentedTypesModules.ts, 51, 23), Decl(augmentedTypesModules.ts, 53, 23)) ->y : Symbol(y, Decl(augmentedTypesModules.ts, 54, 16)) +>y : Symbol(y, Decl(augmentedTypesModules.ts, 54, 19)) class m3c { foo() { } } ->m3c : Symbol(m3c, Decl(augmentedTypesModules.ts, 54, 25), Decl(augmentedTypesModules.ts, 56, 23)) +>m3c : Symbol(m3c, Decl(augmentedTypesModules.ts, 54, 28), Decl(augmentedTypesModules.ts, 56, 23)) >foo : Symbol(m3c.foo, Decl(augmentedTypesModules.ts, 56, 11)) -module m3c { export var y = 2; } ->m3c : Symbol(m3c, Decl(augmentedTypesModules.ts, 54, 25), Decl(augmentedTypesModules.ts, 56, 23)) ->y : Symbol(y, Decl(augmentedTypesModules.ts, 57, 23)) +namespace m3c { export var y = 2; } +>m3c : Symbol(m3c, Decl(augmentedTypesModules.ts, 54, 28), Decl(augmentedTypesModules.ts, 56, 23)) +>y : Symbol(y, Decl(augmentedTypesModules.ts, 57, 26)) declare class m3d { foo(): void } ->m3d : Symbol(m3d, Decl(augmentedTypesModules.ts, 57, 32), Decl(augmentedTypesModules.ts, 59, 33)) +>m3d : Symbol(m3d, Decl(augmentedTypesModules.ts, 57, 35), Decl(augmentedTypesModules.ts, 59, 33)) >foo : Symbol(m3d.foo, Decl(augmentedTypesModules.ts, 59, 19)) -module m3d { export var y = 2; } ->m3d : Symbol(m3d, Decl(augmentedTypesModules.ts, 57, 32), Decl(augmentedTypesModules.ts, 59, 33)) ->y : Symbol(y, Decl(augmentedTypesModules.ts, 60, 23)) +namespace m3d { export var y = 2; } +>m3d : Symbol(m3d, Decl(augmentedTypesModules.ts, 57, 35), Decl(augmentedTypesModules.ts, 59, 33)) +>y : Symbol(y, Decl(augmentedTypesModules.ts, 60, 26)) -module m3e { export var y = 2; } ->m3e : Symbol(m3e, Decl(augmentedTypesModules.ts, 60, 32), Decl(augmentedTypesModules.ts, 62, 32)) ->y : Symbol(y, Decl(augmentedTypesModules.ts, 62, 23)) +namespace m3e { export var y = 2; } +>m3e : Symbol(m3e, Decl(augmentedTypesModules.ts, 60, 35), Decl(augmentedTypesModules.ts, 62, 35)) +>y : Symbol(y, Decl(augmentedTypesModules.ts, 62, 26)) declare class m3e { foo(): void } ->m3e : Symbol(m3e, Decl(augmentedTypesModules.ts, 60, 32), Decl(augmentedTypesModules.ts, 62, 32)) +>m3e : Symbol(m3e, Decl(augmentedTypesModules.ts, 60, 35), Decl(augmentedTypesModules.ts, 62, 35)) >foo : Symbol(m3e.foo, Decl(augmentedTypesModules.ts, 63, 19)) declare class m3f { foo(): void } >m3f : Symbol(m3f, Decl(augmentedTypesModules.ts, 63, 33), Decl(augmentedTypesModules.ts, 65, 33)) >foo : Symbol(m3f.foo, Decl(augmentedTypesModules.ts, 65, 19)) -module m3f { export interface I { foo(): void } } +namespace m3f { export interface I { foo(): void } } >m3f : Symbol(m3f, Decl(augmentedTypesModules.ts, 63, 33), Decl(augmentedTypesModules.ts, 65, 33)) ->I : Symbol(I, Decl(augmentedTypesModules.ts, 66, 12)) ->foo : Symbol(I.foo, Decl(augmentedTypesModules.ts, 66, 33)) +>I : Symbol(I, Decl(augmentedTypesModules.ts, 66, 15)) +>foo : Symbol(I.foo, Decl(augmentedTypesModules.ts, 66, 36)) declare class m3g { foo(): void } ->m3g : Symbol(m3g, Decl(augmentedTypesModules.ts, 66, 49), Decl(augmentedTypesModules.ts, 68, 33)) +>m3g : Symbol(m3g, Decl(augmentedTypesModules.ts, 66, 52), Decl(augmentedTypesModules.ts, 68, 33)) >foo : Symbol(m3g.foo, Decl(augmentedTypesModules.ts, 68, 19)) -module m3g { export class C { foo() { } } } ->m3g : Symbol(m3g, Decl(augmentedTypesModules.ts, 66, 49), Decl(augmentedTypesModules.ts, 68, 33)) ->C : Symbol(C, Decl(augmentedTypesModules.ts, 69, 12)) ->foo : Symbol(C.foo, Decl(augmentedTypesModules.ts, 69, 29)) +namespace m3g { export class C { foo() { } } } +>m3g : Symbol(m3g, Decl(augmentedTypesModules.ts, 66, 52), Decl(augmentedTypesModules.ts, 68, 33)) +>C : Symbol(C, Decl(augmentedTypesModules.ts, 69, 15)) +>foo : Symbol(C.foo, Decl(augmentedTypesModules.ts, 69, 32)) // module then enum // should be errors -module m4 { } ->m4 : Symbol(m4, Decl(augmentedTypesModules.ts, 69, 43), Decl(augmentedTypesModules.ts, 73, 13)) +namespace m4 { } +>m4 : Symbol(m4, Decl(augmentedTypesModules.ts, 69, 46), Decl(augmentedTypesModules.ts, 73, 16)) enum m4 { } ->m4 : Symbol(m4, Decl(augmentedTypesModules.ts, 69, 43), Decl(augmentedTypesModules.ts, 73, 13)) +>m4 : Symbol(m4, Decl(augmentedTypesModules.ts, 69, 46), Decl(augmentedTypesModules.ts, 73, 16)) -module m4a { var y = 2; } ->m4a : Symbol(m4a, Decl(augmentedTypesModules.ts, 74, 11), Decl(augmentedTypesModules.ts, 76, 25)) ->y : Symbol(y, Decl(augmentedTypesModules.ts, 76, 16)) +namespace m4a { var y = 2; } +>m4a : Symbol(m4a, Decl(augmentedTypesModules.ts, 74, 11), Decl(augmentedTypesModules.ts, 76, 28)) +>y : Symbol(y, Decl(augmentedTypesModules.ts, 76, 19)) enum m4a { One } ->m4a : Symbol(m4a, Decl(augmentedTypesModules.ts, 74, 11), Decl(augmentedTypesModules.ts, 76, 25)) +>m4a : Symbol(m4a, Decl(augmentedTypesModules.ts, 74, 11), Decl(augmentedTypesModules.ts, 76, 28)) >One : Symbol(m4a.One, Decl(augmentedTypesModules.ts, 77, 10)) -module m4b { export var y = 2; } ->m4b : Symbol(m4b, Decl(augmentedTypesModules.ts, 77, 16), Decl(augmentedTypesModules.ts, 79, 32)) ->y : Symbol(y, Decl(augmentedTypesModules.ts, 79, 23)) +namespace m4b { export var y = 2; } +>m4b : Symbol(m4b, Decl(augmentedTypesModules.ts, 77, 16), Decl(augmentedTypesModules.ts, 79, 35)) +>y : Symbol(y, Decl(augmentedTypesModules.ts, 79, 26)) enum m4b { One } ->m4b : Symbol(m4b, Decl(augmentedTypesModules.ts, 77, 16), Decl(augmentedTypesModules.ts, 79, 32)) +>m4b : Symbol(m4b, Decl(augmentedTypesModules.ts, 77, 16), Decl(augmentedTypesModules.ts, 79, 35)) >One : Symbol(m4b.One, Decl(augmentedTypesModules.ts, 80, 10)) -module m4c { interface I { foo(): void } } ->m4c : Symbol(m4c, Decl(augmentedTypesModules.ts, 80, 16), Decl(augmentedTypesModules.ts, 82, 42)) ->I : Symbol(I, Decl(augmentedTypesModules.ts, 82, 12)) ->foo : Symbol(I.foo, Decl(augmentedTypesModules.ts, 82, 26)) +namespace m4c { interface I { foo(): void } } +>m4c : Symbol(m4c, Decl(augmentedTypesModules.ts, 80, 16), Decl(augmentedTypesModules.ts, 82, 45)) +>I : Symbol(I, Decl(augmentedTypesModules.ts, 82, 15)) +>foo : Symbol(I.foo, Decl(augmentedTypesModules.ts, 82, 29)) enum m4c { One } ->m4c : Symbol(m4c, Decl(augmentedTypesModules.ts, 80, 16), Decl(augmentedTypesModules.ts, 82, 42)) +>m4c : Symbol(m4c, Decl(augmentedTypesModules.ts, 80, 16), Decl(augmentedTypesModules.ts, 82, 45)) >One : Symbol(m4c.One, Decl(augmentedTypesModules.ts, 83, 10)) -module m4d { class C { foo() { } } } ->m4d : Symbol(m4d, Decl(augmentedTypesModules.ts, 83, 16), Decl(augmentedTypesModules.ts, 85, 36)) ->C : Symbol(C, Decl(augmentedTypesModules.ts, 85, 12)) ->foo : Symbol(C.foo, Decl(augmentedTypesModules.ts, 85, 22)) +namespace m4d { class C { foo() { } } } +>m4d : Symbol(m4d, Decl(augmentedTypesModules.ts, 83, 16), Decl(augmentedTypesModules.ts, 85, 39)) +>C : Symbol(C, Decl(augmentedTypesModules.ts, 85, 15)) +>foo : Symbol(C.foo, Decl(augmentedTypesModules.ts, 85, 25)) enum m4d { One } ->m4d : Symbol(m4d, Decl(augmentedTypesModules.ts, 83, 16), Decl(augmentedTypesModules.ts, 85, 36)) +>m4d : Symbol(m4d, Decl(augmentedTypesModules.ts, 83, 16), Decl(augmentedTypesModules.ts, 85, 39)) >One : Symbol(m4d.One, Decl(augmentedTypesModules.ts, 86, 10)) //// module then module -module m5 { export var y = 2; } ->m5 : Symbol(m5, Decl(augmentedTypesModules.ts, 86, 16), Decl(augmentedTypesModules.ts, 90, 31)) ->y : Symbol(y, Decl(augmentedTypesModules.ts, 90, 22)) +namespace m5 { export var y = 2; } +>m5 : Symbol(m5, Decl(augmentedTypesModules.ts, 86, 16), Decl(augmentedTypesModules.ts, 90, 34)) +>y : Symbol(y, Decl(augmentedTypesModules.ts, 90, 25)) -module m5 { export interface I { foo(): void } } // should already be reasonably well covered ->m5 : Symbol(m5, Decl(augmentedTypesModules.ts, 86, 16), Decl(augmentedTypesModules.ts, 90, 31)) ->I : Symbol(I, Decl(augmentedTypesModules.ts, 91, 11)) ->foo : Symbol(I.foo, Decl(augmentedTypesModules.ts, 91, 32)) +namespace m5 { export interface I { foo(): void } } // should already be reasonably well covered +>m5 : Symbol(m5, Decl(augmentedTypesModules.ts, 86, 16), Decl(augmentedTypesModules.ts, 90, 34)) +>I : Symbol(I, Decl(augmentedTypesModules.ts, 91, 14)) +>foo : Symbol(I.foo, Decl(augmentedTypesModules.ts, 91, 35)) // module then import -module m6 { export var y = 2; } ->m6 : Symbol(m6, Decl(augmentedTypesModules.ts, 91, 48)) ->y : Symbol(y, Decl(augmentedTypesModules.ts, 94, 22)) +namespace m6 { export var y = 2; } +>m6 : Symbol(m6, Decl(augmentedTypesModules.ts, 91, 51)) +>y : Symbol(y, Decl(augmentedTypesModules.ts, 94, 25)) //import m6 = require(''); diff --git a/tests/baselines/reference/augmentedTypesModules.types b/tests/baselines/reference/augmentedTypesModules.types index 6697b1fd281d9..1d1160d52118b 100644 --- a/tests/baselines/reference/augmentedTypesModules.types +++ b/tests/baselines/reference/augmentedTypesModules.types @@ -2,14 +2,14 @@ === augmentedTypesModules.ts === // module then var -module m1 { } +namespace m1 { } var m1 = 1; // Should be allowed >m1 : number > : ^^^^^^ >1 : 1 > : ^ -module m1a { var y = 2; } // error +namespace m1a { var y = 2; } // error >m1a : typeof m1a > : ^^^^^^^^^^ >y : number @@ -23,7 +23,7 @@ var m1a = 1; // error >1 : 1 > : ^ -module m1b { export var y = 2; } // error +namespace m1b { export var y = 2; } // error >m1b : typeof m1b > : ^^^^^^^^^^ >y : number @@ -37,7 +37,7 @@ var m1b = 1; // error >1 : 1 > : ^ -module m1c { +namespace m1c { export interface I { foo(): void; } >foo : () => void > : ^^^^^^ @@ -48,7 +48,7 @@ var m1c = 1; // Should be allowed >1 : 1 > : ^ -module m1d { // error +namespace m1d { // error >m1d : typeof m1d > : ^^^^^^^^^^ @@ -65,12 +65,12 @@ var m1d = 1; // error > : ^ // module then function -module m2 { } +namespace m2 { } function m2() { }; // ok since the module is not instantiated >m2 : () => void > : ^^^^^^^^^^ -module m2a { var y = 2; } +namespace m2a { var y = 2; } >m2a : typeof m2a > : ^^^^^^^^^^ >y : number @@ -82,7 +82,7 @@ function m2a() { }; // error since the module is instantiated >m2a : typeof m2a > : ^^^^^^^^^^ -module m2b { export var y = 2; } +namespace m2b { export var y = 2; } >m2b : typeof m2b > : ^^^^^^^^^^ >y : number @@ -99,7 +99,7 @@ function m2c() { }; >m2c : typeof m2c > : ^^^^^^^^^^ -module m2c { export var y = 2; } +namespace m2c { export var y = 2; } >m2c : typeof m2c > : ^^^^^^^^^^ >y : number @@ -107,7 +107,7 @@ module m2c { export var y = 2; } >2 : 2 > : ^ -module m2d { } +namespace m2d { } declare function m2d(): void; >m2d : () => void > : ^^^^^^ @@ -116,13 +116,13 @@ declare function m2e(): void; >m2e : () => void > : ^^^^^^ -module m2e { } +namespace m2e { } function m2f() { }; >m2f : () => void > : ^^^^^^^^^^ -module m2f { export interface I { foo(): void } } +namespace m2f { export interface I { foo(): void } } >foo : () => void > : ^^^^^^ @@ -130,7 +130,7 @@ function m2g() { }; >m2g : typeof m2g > : ^^^^^^^^^^ -module m2g { export class C { foo() { } } } +namespace m2g { export class C { foo() { } } } >m2g : typeof m2g > : ^^^^^^^^^^ >C : C @@ -139,12 +139,12 @@ module m2g { export class C { foo() { } } } > : ^^^^^^^^^^ // module then class -module m3 { } +namespace m3 { } class m3 { } // ok since the module is not instantiated >m3 : m3 > : ^^ -module m3a { var y = 2; } +namespace m3a { var y = 2; } >m3a : typeof m3a > : ^^^^^^^^^^ >y : number @@ -164,7 +164,7 @@ class m3b { foo() { } } >foo : () => void > : ^^^^^^^^^^ -module m3b { var y = 2; } +namespace m3b { var y = 2; } >m3b : typeof m3b > : ^^^^^^^^^^ >y : number @@ -178,7 +178,7 @@ class m3c { foo() { } } >foo : () => void > : ^^^^^^^^^^ -module m3c { export var y = 2; } +namespace m3c { export var y = 2; } >m3c : typeof m3c > : ^^^^^^^^^^ >y : number @@ -192,7 +192,7 @@ declare class m3d { foo(): void } >foo : () => void > : ^^^^^^ -module m3d { export var y = 2; } +namespace m3d { export var y = 2; } >m3d : typeof m3d > : ^^^^^^^^^^ >y : number @@ -200,7 +200,7 @@ module m3d { export var y = 2; } >2 : 2 > : ^ -module m3e { export var y = 2; } +namespace m3e { export var y = 2; } >m3e : typeof m3e > : ^^^^^^^^^^ >y : number @@ -220,7 +220,7 @@ declare class m3f { foo(): void } >foo : () => void > : ^^^^^^ -module m3f { export interface I { foo(): void } } +namespace m3f { export interface I { foo(): void } } >foo : () => void > : ^^^^^^ @@ -230,7 +230,7 @@ declare class m3g { foo(): void } >foo : () => void > : ^^^^^^ -module m3g { export class C { foo() { } } } +namespace m3g { export class C { foo() { } } } >m3g : typeof m3g > : ^^^^^^^^^^ >C : C @@ -240,12 +240,12 @@ module m3g { export class C { foo() { } } } // module then enum // should be errors -module m4 { } +namespace m4 { } enum m4 { } >m4 : m4 > : ^^ -module m4a { var y = 2; } +namespace m4a { var y = 2; } >m4a : typeof m4a > : ^^^^^^^^^^ >y : number @@ -259,7 +259,7 @@ enum m4a { One } >One : m4a.One > : ^^^^^^^ -module m4b { export var y = 2; } +namespace m4b { export var y = 2; } >m4b : typeof m4b > : ^^^^^^^^^^ >y : number @@ -273,7 +273,7 @@ enum m4b { One } >One : m4b.One > : ^^^^^^^ -module m4c { interface I { foo(): void } } +namespace m4c { interface I { foo(): void } } >foo : () => void > : ^^^^^^ @@ -283,7 +283,7 @@ enum m4c { One } >One : m4c.One > : ^^^^^^^ -module m4d { class C { foo() { } } } +namespace m4d { class C { foo() { } } } >m4d : typeof m4d > : ^^^^^^^^^^ >C : C @@ -299,7 +299,7 @@ enum m4d { One } //// module then module -module m5 { export var y = 2; } +namespace m5 { export var y = 2; } >m5 : typeof m5 > : ^^^^^^^^^ >y : number @@ -307,12 +307,12 @@ module m5 { export var y = 2; } >2 : 2 > : ^ -module m5 { export interface I { foo(): void } } // should already be reasonably well covered +namespace m5 { export interface I { foo(): void } } // should already be reasonably well covered >foo : () => void > : ^^^^^^ // module then import -module m6 { export var y = 2; } +namespace m6 { export var y = 2; } >m6 : typeof m6 > : ^^^^^^^^^ >y : number diff --git a/tests/baselines/reference/augmentedTypesModules2.errors.txt b/tests/baselines/reference/augmentedTypesModules2.errors.txt index 2407ac456e8ff..25e85b4d96589 100644 --- a/tests/baselines/reference/augmentedTypesModules2.errors.txt +++ b/tests/baselines/reference/augmentedTypesModules2.errors.txt @@ -1,40 +1,40 @@ -augmentedTypesModules2.ts(5,8): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. -augmentedTypesModules2.ts(8,8): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. -augmentedTypesModules2.ts(14,8): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. +augmentedTypesModules2.ts(5,11): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. +augmentedTypesModules2.ts(8,11): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. +augmentedTypesModules2.ts(14,11): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. ==== augmentedTypesModules2.ts (3 errors) ==== // module then function - module m2 { } + namespace m2 { } function m2() { }; // ok since the module is not instantiated - module m2a { var y = 2; } - ~~~ + namespace m2a { var y = 2; } + ~~~ !!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. function m2a() { }; // error since the module is instantiated - module m2b { export var y = 2; } - ~~~ + namespace m2b { export var y = 2; } + ~~~ !!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. function m2b() { }; // error since the module is instantiated function m2c() { }; - module m2c { export var y = 2; } + namespace m2c { export var y = 2; } - module m2cc { export var y = 2; } - ~~~~ + namespace m2cc { export var y = 2; } + ~~~~ !!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. function m2cc() { }; // error to have module first - module m2d { } + namespace m2d { } declare function m2d(): void; declare function m2e(): void; - module m2e { } + namespace m2e { } function m2f() { }; - module m2f { export interface I { foo(): void } } + namespace m2f { export interface I { foo(): void } } function m2g() { }; - module m2g { export class C { foo() { } } } + namespace m2g { export class C { foo() { } } } \ No newline at end of file diff --git a/tests/baselines/reference/augmentedTypesModules2.js b/tests/baselines/reference/augmentedTypesModules2.js index c162d085674a5..033af2984ef9e 100644 --- a/tests/baselines/reference/augmentedTypesModules2.js +++ b/tests/baselines/reference/augmentedTypesModules2.js @@ -2,32 +2,32 @@ //// [augmentedTypesModules2.ts] // module then function -module m2 { } +namespace m2 { } function m2() { }; // ok since the module is not instantiated -module m2a { var y = 2; } +namespace m2a { var y = 2; } function m2a() { }; // error since the module is instantiated -module m2b { export var y = 2; } +namespace m2b { export var y = 2; } function m2b() { }; // error since the module is instantiated function m2c() { }; -module m2c { export var y = 2; } +namespace m2c { export var y = 2; } -module m2cc { export var y = 2; } +namespace m2cc { export var y = 2; } function m2cc() { }; // error to have module first -module m2d { } +namespace m2d { } declare function m2d(): void; declare function m2e(): void; -module m2e { } +namespace m2e { } function m2f() { }; -module m2f { export interface I { foo(): void } } +namespace m2f { export interface I { foo(): void } } function m2g() { }; -module m2g { export class C { foo() { } } } +namespace m2g { export class C { foo() { } } } //// [augmentedTypesModules2.js] diff --git a/tests/baselines/reference/augmentedTypesModules2.symbols b/tests/baselines/reference/augmentedTypesModules2.symbols index 431cb3bc38370..b0245a08a8e94 100644 --- a/tests/baselines/reference/augmentedTypesModules2.symbols +++ b/tests/baselines/reference/augmentedTypesModules2.symbols @@ -2,65 +2,65 @@ === augmentedTypesModules2.ts === // module then function -module m2 { } ->m2 : Symbol(m2, Decl(augmentedTypesModules2.ts, 1, 13), Decl(augmentedTypesModules2.ts, 0, 0)) +namespace m2 { } +>m2 : Symbol(m2, Decl(augmentedTypesModules2.ts, 1, 16), Decl(augmentedTypesModules2.ts, 0, 0)) function m2() { }; // ok since the module is not instantiated ->m2 : Symbol(m2, Decl(augmentedTypesModules2.ts, 1, 13), Decl(augmentedTypesModules2.ts, 0, 0)) +>m2 : Symbol(m2, Decl(augmentedTypesModules2.ts, 1, 16), Decl(augmentedTypesModules2.ts, 0, 0)) -module m2a { var y = 2; } ->m2a : Symbol(m2a, Decl(augmentedTypesModules2.ts, 4, 25), Decl(augmentedTypesModules2.ts, 2, 18)) ->y : Symbol(y, Decl(augmentedTypesModules2.ts, 4, 16)) +namespace m2a { var y = 2; } +>m2a : Symbol(m2a, Decl(augmentedTypesModules2.ts, 4, 28), Decl(augmentedTypesModules2.ts, 2, 18)) +>y : Symbol(y, Decl(augmentedTypesModules2.ts, 4, 19)) function m2a() { }; // error since the module is instantiated ->m2a : Symbol(m2a, Decl(augmentedTypesModules2.ts, 4, 25), Decl(augmentedTypesModules2.ts, 2, 18)) +>m2a : Symbol(m2a, Decl(augmentedTypesModules2.ts, 4, 28), Decl(augmentedTypesModules2.ts, 2, 18)) -module m2b { export var y = 2; } ->m2b : Symbol(m2b, Decl(augmentedTypesModules2.ts, 7, 32), Decl(augmentedTypesModules2.ts, 5, 19)) ->y : Symbol(y, Decl(augmentedTypesModules2.ts, 7, 23)) +namespace m2b { export var y = 2; } +>m2b : Symbol(m2b, Decl(augmentedTypesModules2.ts, 7, 35), Decl(augmentedTypesModules2.ts, 5, 19)) +>y : Symbol(y, Decl(augmentedTypesModules2.ts, 7, 26)) function m2b() { }; // error since the module is instantiated ->m2b : Symbol(m2b, Decl(augmentedTypesModules2.ts, 7, 32), Decl(augmentedTypesModules2.ts, 5, 19)) +>m2b : Symbol(m2b, Decl(augmentedTypesModules2.ts, 7, 35), Decl(augmentedTypesModules2.ts, 5, 19)) function m2c() { }; >m2c : Symbol(m2c, Decl(augmentedTypesModules2.ts, 8, 19), Decl(augmentedTypesModules2.ts, 10, 19)) -module m2c { export var y = 2; } +namespace m2c { export var y = 2; } >m2c : Symbol(m2c, Decl(augmentedTypesModules2.ts, 8, 19), Decl(augmentedTypesModules2.ts, 10, 19)) ->y : Symbol(y, Decl(augmentedTypesModules2.ts, 11, 23)) +>y : Symbol(y, Decl(augmentedTypesModules2.ts, 11, 26)) -module m2cc { export var y = 2; } ->m2cc : Symbol(m2cc, Decl(augmentedTypesModules2.ts, 13, 33), Decl(augmentedTypesModules2.ts, 11, 32)) ->y : Symbol(y, Decl(augmentedTypesModules2.ts, 13, 24)) +namespace m2cc { export var y = 2; } +>m2cc : Symbol(m2cc, Decl(augmentedTypesModules2.ts, 13, 36), Decl(augmentedTypesModules2.ts, 11, 35)) +>y : Symbol(y, Decl(augmentedTypesModules2.ts, 13, 27)) function m2cc() { }; // error to have module first ->m2cc : Symbol(m2cc, Decl(augmentedTypesModules2.ts, 13, 33), Decl(augmentedTypesModules2.ts, 11, 32)) +>m2cc : Symbol(m2cc, Decl(augmentedTypesModules2.ts, 13, 36), Decl(augmentedTypesModules2.ts, 11, 35)) -module m2d { } ->m2d : Symbol(m2d, Decl(augmentedTypesModules2.ts, 16, 14), Decl(augmentedTypesModules2.ts, 14, 20)) +namespace m2d { } +>m2d : Symbol(m2d, Decl(augmentedTypesModules2.ts, 16, 17), Decl(augmentedTypesModules2.ts, 14, 20)) declare function m2d(): void; ->m2d : Symbol(m2d, Decl(augmentedTypesModules2.ts, 16, 14), Decl(augmentedTypesModules2.ts, 14, 20)) +>m2d : Symbol(m2d, Decl(augmentedTypesModules2.ts, 16, 17), Decl(augmentedTypesModules2.ts, 14, 20)) declare function m2e(): void; >m2e : Symbol(m2e, Decl(augmentedTypesModules2.ts, 17, 29), Decl(augmentedTypesModules2.ts, 19, 29)) -module m2e { } +namespace m2e { } >m2e : Symbol(m2e, Decl(augmentedTypesModules2.ts, 17, 29), Decl(augmentedTypesModules2.ts, 19, 29)) function m2f() { }; ->m2f : Symbol(m2f, Decl(augmentedTypesModules2.ts, 20, 14), Decl(augmentedTypesModules2.ts, 22, 19)) +>m2f : Symbol(m2f, Decl(augmentedTypesModules2.ts, 20, 17), Decl(augmentedTypesModules2.ts, 22, 19)) -module m2f { export interface I { foo(): void } } ->m2f : Symbol(m2f, Decl(augmentedTypesModules2.ts, 20, 14), Decl(augmentedTypesModules2.ts, 22, 19)) ->I : Symbol(I, Decl(augmentedTypesModules2.ts, 23, 12)) ->foo : Symbol(I.foo, Decl(augmentedTypesModules2.ts, 23, 33)) +namespace m2f { export interface I { foo(): void } } +>m2f : Symbol(m2f, Decl(augmentedTypesModules2.ts, 20, 17), Decl(augmentedTypesModules2.ts, 22, 19)) +>I : Symbol(I, Decl(augmentedTypesModules2.ts, 23, 15)) +>foo : Symbol(I.foo, Decl(augmentedTypesModules2.ts, 23, 36)) function m2g() { }; ->m2g : Symbol(m2g, Decl(augmentedTypesModules2.ts, 23, 49), Decl(augmentedTypesModules2.ts, 25, 19)) +>m2g : Symbol(m2g, Decl(augmentedTypesModules2.ts, 23, 52), Decl(augmentedTypesModules2.ts, 25, 19)) -module m2g { export class C { foo() { } } } ->m2g : Symbol(m2g, Decl(augmentedTypesModules2.ts, 23, 49), Decl(augmentedTypesModules2.ts, 25, 19)) ->C : Symbol(C, Decl(augmentedTypesModules2.ts, 26, 12)) ->foo : Symbol(C.foo, Decl(augmentedTypesModules2.ts, 26, 29)) +namespace m2g { export class C { foo() { } } } +>m2g : Symbol(m2g, Decl(augmentedTypesModules2.ts, 23, 52), Decl(augmentedTypesModules2.ts, 25, 19)) +>C : Symbol(C, Decl(augmentedTypesModules2.ts, 26, 15)) +>foo : Symbol(C.foo, Decl(augmentedTypesModules2.ts, 26, 32)) diff --git a/tests/baselines/reference/augmentedTypesModules2.types b/tests/baselines/reference/augmentedTypesModules2.types index 6fabdc598202b..fac6a7478e0d4 100644 --- a/tests/baselines/reference/augmentedTypesModules2.types +++ b/tests/baselines/reference/augmentedTypesModules2.types @@ -2,12 +2,12 @@ === augmentedTypesModules2.ts === // module then function -module m2 { } +namespace m2 { } function m2() { }; // ok since the module is not instantiated >m2 : () => void > : ^^^^^^^^^^ -module m2a { var y = 2; } +namespace m2a { var y = 2; } >m2a : typeof m2a > : ^^^^^^^^^^ >y : number @@ -19,7 +19,7 @@ function m2a() { }; // error since the module is instantiated >m2a : typeof m2a > : ^^^^^^^^^^ -module m2b { export var y = 2; } +namespace m2b { export var y = 2; } >m2b : typeof m2b > : ^^^^^^^^^^ >y : number @@ -35,7 +35,7 @@ function m2c() { }; >m2c : typeof m2c > : ^^^^^^^^^^ -module m2c { export var y = 2; } +namespace m2c { export var y = 2; } >m2c : typeof m2c > : ^^^^^^^^^^ >y : number @@ -43,7 +43,7 @@ module m2c { export var y = 2; } >2 : 2 > : ^ -module m2cc { export var y = 2; } +namespace m2cc { export var y = 2; } >m2cc : typeof m2cc > : ^^^^^^^^^^^ >y : number @@ -55,7 +55,7 @@ function m2cc() { }; // error to have module first >m2cc : typeof m2cc > : ^^^^^^^^^^^ -module m2d { } +namespace m2d { } declare function m2d(): void; >m2d : () => void > : ^^^^^^ @@ -64,13 +64,13 @@ declare function m2e(): void; >m2e : () => void > : ^^^^^^ -module m2e { } +namespace m2e { } function m2f() { }; >m2f : () => void > : ^^^^^^^^^^ -module m2f { export interface I { foo(): void } } +namespace m2f { export interface I { foo(): void } } >foo : () => void > : ^^^^^^ @@ -78,7 +78,7 @@ function m2g() { }; >m2g : typeof m2g > : ^^^^^^^^^^ -module m2g { export class C { foo() { } } } +namespace m2g { export class C { foo() { } } } >m2g : typeof m2g > : ^^^^^^^^^^ >C : C diff --git a/tests/baselines/reference/augmentedTypesModules3.errors.txt b/tests/baselines/reference/augmentedTypesModules3.errors.txt index c93b9b5b3f2de..dc6265ffbe20f 100644 --- a/tests/baselines/reference/augmentedTypesModules3.errors.txt +++ b/tests/baselines/reference/augmentedTypesModules3.errors.txt @@ -1,12 +1,12 @@ -augmentedTypesModules3.ts(5,8): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. +augmentedTypesModules3.ts(5,11): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. ==== augmentedTypesModules3.ts (1 errors) ==== //// module then class - module m3 { } + namespace m3 { } class m3 { } // ok since the module is not instantiated - module m3a { var y = 2; } - ~~~ + namespace m3a { var y = 2; } + ~~~ !!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. class m3a { foo() { } } // error, class isn't ambient or declared before the module \ No newline at end of file diff --git a/tests/baselines/reference/augmentedTypesModules3.js b/tests/baselines/reference/augmentedTypesModules3.js index 89f06aea9c533..68f37176f7562 100644 --- a/tests/baselines/reference/augmentedTypesModules3.js +++ b/tests/baselines/reference/augmentedTypesModules3.js @@ -2,10 +2,10 @@ //// [augmentedTypesModules3.ts] //// module then class -module m3 { } +namespace m3 { } class m3 { } // ok since the module is not instantiated -module m3a { var y = 2; } +namespace m3a { var y = 2; } class m3a { foo() { } } // error, class isn't ambient or declared before the module //// [augmentedTypesModules3.js] diff --git a/tests/baselines/reference/augmentedTypesModules3.symbols b/tests/baselines/reference/augmentedTypesModules3.symbols index 53527859d14c4..b820f4345d56c 100644 --- a/tests/baselines/reference/augmentedTypesModules3.symbols +++ b/tests/baselines/reference/augmentedTypesModules3.symbols @@ -2,17 +2,17 @@ === augmentedTypesModules3.ts === //// module then class -module m3 { } ->m3 : Symbol(m3, Decl(augmentedTypesModules3.ts, 0, 0), Decl(augmentedTypesModules3.ts, 1, 13)) +namespace m3 { } +>m3 : Symbol(m3, Decl(augmentedTypesModules3.ts, 0, 0), Decl(augmentedTypesModules3.ts, 1, 16)) class m3 { } // ok since the module is not instantiated ->m3 : Symbol(m3, Decl(augmentedTypesModules3.ts, 0, 0), Decl(augmentedTypesModules3.ts, 1, 13)) +>m3 : Symbol(m3, Decl(augmentedTypesModules3.ts, 0, 0), Decl(augmentedTypesModules3.ts, 1, 16)) -module m3a { var y = 2; } ->m3a : Symbol(m3a, Decl(augmentedTypesModules3.ts, 2, 12), Decl(augmentedTypesModules3.ts, 4, 25)) ->y : Symbol(y, Decl(augmentedTypesModules3.ts, 4, 16)) +namespace m3a { var y = 2; } +>m3a : Symbol(m3a, Decl(augmentedTypesModules3.ts, 2, 12), Decl(augmentedTypesModules3.ts, 4, 28)) +>y : Symbol(y, Decl(augmentedTypesModules3.ts, 4, 19)) class m3a { foo() { } } // error, class isn't ambient or declared before the module ->m3a : Symbol(m3a, Decl(augmentedTypesModules3.ts, 2, 12), Decl(augmentedTypesModules3.ts, 4, 25)) +>m3a : Symbol(m3a, Decl(augmentedTypesModules3.ts, 2, 12), Decl(augmentedTypesModules3.ts, 4, 28)) >foo : Symbol(m3a.foo, Decl(augmentedTypesModules3.ts, 5, 11)) diff --git a/tests/baselines/reference/augmentedTypesModules3.types b/tests/baselines/reference/augmentedTypesModules3.types index 6136639a65c6b..3faaf1ce0dcc7 100644 --- a/tests/baselines/reference/augmentedTypesModules3.types +++ b/tests/baselines/reference/augmentedTypesModules3.types @@ -2,12 +2,12 @@ === augmentedTypesModules3.ts === //// module then class -module m3 { } +namespace m3 { } class m3 { } // ok since the module is not instantiated >m3 : m3 > : ^^ -module m3a { var y = 2; } +namespace m3a { var y = 2; } >m3a : typeof m3a > : ^^^^^^^^^^ >y : number diff --git a/tests/baselines/reference/augmentedTypesModules3b.js b/tests/baselines/reference/augmentedTypesModules3b.js index 1af48a30b378f..5ead3326ecc74 100644 --- a/tests/baselines/reference/augmentedTypesModules3b.js +++ b/tests/baselines/reference/augmentedTypesModules3b.js @@ -2,22 +2,22 @@ //// [augmentedTypesModules3b.ts] class m3b { foo() { } } -module m3b { var y = 2; } +namespace m3b { var y = 2; } class m3c { foo() { } } -module m3c { export var y = 2; } +namespace m3c { export var y = 2; } declare class m3d { foo(): void } -module m3d { export var y = 2; } +namespace m3d { export var y = 2; } -module m3e { export var y = 2; } +namespace m3e { export var y = 2; } declare class m3e { foo(): void } declare class m3f { foo(): void } -module m3f { export interface I { foo(): void } } +namespace m3f { export interface I { foo(): void } } declare class m3g { foo(): void } -module m3g { export class C { foo() { } } } +namespace m3g { export class C { foo() { } } } //// [augmentedTypesModules3b.js] diff --git a/tests/baselines/reference/augmentedTypesModules3b.symbols b/tests/baselines/reference/augmentedTypesModules3b.symbols index 50faf044a6cb1..6e23da421acb7 100644 --- a/tests/baselines/reference/augmentedTypesModules3b.symbols +++ b/tests/baselines/reference/augmentedTypesModules3b.symbols @@ -5,49 +5,49 @@ class m3b { foo() { } } >m3b : Symbol(m3b, Decl(augmentedTypesModules3b.ts, 0, 0), Decl(augmentedTypesModules3b.ts, 0, 23)) >foo : Symbol(m3b.foo, Decl(augmentedTypesModules3b.ts, 0, 11)) -module m3b { var y = 2; } +namespace m3b { var y = 2; } >m3b : Symbol(m3b, Decl(augmentedTypesModules3b.ts, 0, 0), Decl(augmentedTypesModules3b.ts, 0, 23)) ->y : Symbol(y, Decl(augmentedTypesModules3b.ts, 1, 16)) +>y : Symbol(y, Decl(augmentedTypesModules3b.ts, 1, 19)) class m3c { foo() { } } ->m3c : Symbol(m3c, Decl(augmentedTypesModules3b.ts, 1, 25), Decl(augmentedTypesModules3b.ts, 3, 23)) +>m3c : Symbol(m3c, Decl(augmentedTypesModules3b.ts, 1, 28), Decl(augmentedTypesModules3b.ts, 3, 23)) >foo : Symbol(m3c.foo, Decl(augmentedTypesModules3b.ts, 3, 11)) -module m3c { export var y = 2; } ->m3c : Symbol(m3c, Decl(augmentedTypesModules3b.ts, 1, 25), Decl(augmentedTypesModules3b.ts, 3, 23)) ->y : Symbol(y, Decl(augmentedTypesModules3b.ts, 4, 23)) +namespace m3c { export var y = 2; } +>m3c : Symbol(m3c, Decl(augmentedTypesModules3b.ts, 1, 28), Decl(augmentedTypesModules3b.ts, 3, 23)) +>y : Symbol(y, Decl(augmentedTypesModules3b.ts, 4, 26)) declare class m3d { foo(): void } ->m3d : Symbol(m3d, Decl(augmentedTypesModules3b.ts, 4, 32), Decl(augmentedTypesModules3b.ts, 6, 33)) +>m3d : Symbol(m3d, Decl(augmentedTypesModules3b.ts, 4, 35), Decl(augmentedTypesModules3b.ts, 6, 33)) >foo : Symbol(m3d.foo, Decl(augmentedTypesModules3b.ts, 6, 19)) -module m3d { export var y = 2; } ->m3d : Symbol(m3d, Decl(augmentedTypesModules3b.ts, 4, 32), Decl(augmentedTypesModules3b.ts, 6, 33)) ->y : Symbol(y, Decl(augmentedTypesModules3b.ts, 7, 23)) +namespace m3d { export var y = 2; } +>m3d : Symbol(m3d, Decl(augmentedTypesModules3b.ts, 4, 35), Decl(augmentedTypesModules3b.ts, 6, 33)) +>y : Symbol(y, Decl(augmentedTypesModules3b.ts, 7, 26)) -module m3e { export var y = 2; } ->m3e : Symbol(m3e, Decl(augmentedTypesModules3b.ts, 7, 32), Decl(augmentedTypesModules3b.ts, 9, 32)) ->y : Symbol(y, Decl(augmentedTypesModules3b.ts, 9, 23)) +namespace m3e { export var y = 2; } +>m3e : Symbol(m3e, Decl(augmentedTypesModules3b.ts, 7, 35), Decl(augmentedTypesModules3b.ts, 9, 35)) +>y : Symbol(y, Decl(augmentedTypesModules3b.ts, 9, 26)) declare class m3e { foo(): void } ->m3e : Symbol(m3e, Decl(augmentedTypesModules3b.ts, 7, 32), Decl(augmentedTypesModules3b.ts, 9, 32)) +>m3e : Symbol(m3e, Decl(augmentedTypesModules3b.ts, 7, 35), Decl(augmentedTypesModules3b.ts, 9, 35)) >foo : Symbol(m3e.foo, Decl(augmentedTypesModules3b.ts, 10, 19)) declare class m3f { foo(): void } >m3f : Symbol(m3f, Decl(augmentedTypesModules3b.ts, 10, 33), Decl(augmentedTypesModules3b.ts, 12, 33)) >foo : Symbol(m3f.foo, Decl(augmentedTypesModules3b.ts, 12, 19)) -module m3f { export interface I { foo(): void } } +namespace m3f { export interface I { foo(): void } } >m3f : Symbol(m3f, Decl(augmentedTypesModules3b.ts, 10, 33), Decl(augmentedTypesModules3b.ts, 12, 33)) ->I : Symbol(I, Decl(augmentedTypesModules3b.ts, 13, 12)) ->foo : Symbol(I.foo, Decl(augmentedTypesModules3b.ts, 13, 33)) +>I : Symbol(I, Decl(augmentedTypesModules3b.ts, 13, 15)) +>foo : Symbol(I.foo, Decl(augmentedTypesModules3b.ts, 13, 36)) declare class m3g { foo(): void } ->m3g : Symbol(m3g, Decl(augmentedTypesModules3b.ts, 13, 49), Decl(augmentedTypesModules3b.ts, 15, 33)) +>m3g : Symbol(m3g, Decl(augmentedTypesModules3b.ts, 13, 52), Decl(augmentedTypesModules3b.ts, 15, 33)) >foo : Symbol(m3g.foo, Decl(augmentedTypesModules3b.ts, 15, 19)) -module m3g { export class C { foo() { } } } ->m3g : Symbol(m3g, Decl(augmentedTypesModules3b.ts, 13, 49), Decl(augmentedTypesModules3b.ts, 15, 33)) ->C : Symbol(C, Decl(augmentedTypesModules3b.ts, 16, 12)) ->foo : Symbol(C.foo, Decl(augmentedTypesModules3b.ts, 16, 29)) +namespace m3g { export class C { foo() { } } } +>m3g : Symbol(m3g, Decl(augmentedTypesModules3b.ts, 13, 52), Decl(augmentedTypesModules3b.ts, 15, 33)) +>C : Symbol(C, Decl(augmentedTypesModules3b.ts, 16, 15)) +>foo : Symbol(C.foo, Decl(augmentedTypesModules3b.ts, 16, 32)) diff --git a/tests/baselines/reference/augmentedTypesModules3b.types b/tests/baselines/reference/augmentedTypesModules3b.types index a8f45d03e7f78..bc3e977f8690d 100644 --- a/tests/baselines/reference/augmentedTypesModules3b.types +++ b/tests/baselines/reference/augmentedTypesModules3b.types @@ -7,7 +7,7 @@ class m3b { foo() { } } >foo : () => void > : ^^^^^^^^^^ -module m3b { var y = 2; } +namespace m3b { var y = 2; } >m3b : typeof m3b > : ^^^^^^^^^^ >y : number @@ -21,7 +21,7 @@ class m3c { foo() { } } >foo : () => void > : ^^^^^^^^^^ -module m3c { export var y = 2; } +namespace m3c { export var y = 2; } >m3c : typeof m3c > : ^^^^^^^^^^ >y : number @@ -35,7 +35,7 @@ declare class m3d { foo(): void } >foo : () => void > : ^^^^^^ -module m3d { export var y = 2; } +namespace m3d { export var y = 2; } >m3d : typeof m3d > : ^^^^^^^^^^ >y : number @@ -43,7 +43,7 @@ module m3d { export var y = 2; } >2 : 2 > : ^ -module m3e { export var y = 2; } +namespace m3e { export var y = 2; } >m3e : typeof m3e > : ^^^^^^^^^^ >y : number @@ -63,7 +63,7 @@ declare class m3f { foo(): void } >foo : () => void > : ^^^^^^ -module m3f { export interface I { foo(): void } } +namespace m3f { export interface I { foo(): void } } >foo : () => void > : ^^^^^^ @@ -73,7 +73,7 @@ declare class m3g { foo(): void } >foo : () => void > : ^^^^^^ -module m3g { export class C { foo() { } } } +namespace m3g { export class C { foo() { } } } >m3g : typeof m3g > : ^^^^^^^^^^ >C : C diff --git a/tests/baselines/reference/augmentedTypesModules4.js b/tests/baselines/reference/augmentedTypesModules4.js index 1af224b33b8d7..461db76d6d809 100644 --- a/tests/baselines/reference/augmentedTypesModules4.js +++ b/tests/baselines/reference/augmentedTypesModules4.js @@ -3,25 +3,25 @@ //// [augmentedTypesModules4.ts] // module then enum // should be errors -module m4 { } +namespace m4 { } enum m4 { } -module m4a { var y = 2; } +namespace m4a { var y = 2; } enum m4a { One } -module m4b { export var y = 2; } +namespace m4b { export var y = 2; } enum m4b { One } -module m4c { interface I { foo(): void } } +namespace m4c { interface I { foo(): void } } enum m4c { One } -module m4d { class C { foo() { } } } +namespace m4d { class C { foo() { } } } enum m4d { One } //// module then module -module m5 { export var y = 2; } -module m5 { export interface I { foo(): void } } // should already be reasonably well covered +namespace m5 { export var y = 2; } +namespace m5 { export interface I { foo(): void } } // should already be reasonably well covered //// [augmentedTypesModules4.js] diff --git a/tests/baselines/reference/augmentedTypesModules4.symbols b/tests/baselines/reference/augmentedTypesModules4.symbols index 0da1a5be9b2d4..046e734c013cc 100644 --- a/tests/baselines/reference/augmentedTypesModules4.symbols +++ b/tests/baselines/reference/augmentedTypesModules4.symbols @@ -3,54 +3,54 @@ === augmentedTypesModules4.ts === // module then enum // should be errors -module m4 { } ->m4 : Symbol(m4, Decl(augmentedTypesModules4.ts, 0, 0), Decl(augmentedTypesModules4.ts, 2, 13)) +namespace m4 { } +>m4 : Symbol(m4, Decl(augmentedTypesModules4.ts, 0, 0), Decl(augmentedTypesModules4.ts, 2, 16)) enum m4 { } ->m4 : Symbol(m4, Decl(augmentedTypesModules4.ts, 0, 0), Decl(augmentedTypesModules4.ts, 2, 13)) +>m4 : Symbol(m4, Decl(augmentedTypesModules4.ts, 0, 0), Decl(augmentedTypesModules4.ts, 2, 16)) -module m4a { var y = 2; } ->m4a : Symbol(m4a, Decl(augmentedTypesModules4.ts, 3, 11), Decl(augmentedTypesModules4.ts, 5, 25)) ->y : Symbol(y, Decl(augmentedTypesModules4.ts, 5, 16)) +namespace m4a { var y = 2; } +>m4a : Symbol(m4a, Decl(augmentedTypesModules4.ts, 3, 11), Decl(augmentedTypesModules4.ts, 5, 28)) +>y : Symbol(y, Decl(augmentedTypesModules4.ts, 5, 19)) enum m4a { One } ->m4a : Symbol(m4a, Decl(augmentedTypesModules4.ts, 3, 11), Decl(augmentedTypesModules4.ts, 5, 25)) +>m4a : Symbol(m4a, Decl(augmentedTypesModules4.ts, 3, 11), Decl(augmentedTypesModules4.ts, 5, 28)) >One : Symbol(m4a.One, Decl(augmentedTypesModules4.ts, 6, 10)) -module m4b { export var y = 2; } ->m4b : Symbol(m4b, Decl(augmentedTypesModules4.ts, 6, 16), Decl(augmentedTypesModules4.ts, 8, 32)) ->y : Symbol(y, Decl(augmentedTypesModules4.ts, 8, 23)) +namespace m4b { export var y = 2; } +>m4b : Symbol(m4b, Decl(augmentedTypesModules4.ts, 6, 16), Decl(augmentedTypesModules4.ts, 8, 35)) +>y : Symbol(y, Decl(augmentedTypesModules4.ts, 8, 26)) enum m4b { One } ->m4b : Symbol(m4b, Decl(augmentedTypesModules4.ts, 6, 16), Decl(augmentedTypesModules4.ts, 8, 32)) +>m4b : Symbol(m4b, Decl(augmentedTypesModules4.ts, 6, 16), Decl(augmentedTypesModules4.ts, 8, 35)) >One : Symbol(m4b.One, Decl(augmentedTypesModules4.ts, 9, 10)) -module m4c { interface I { foo(): void } } ->m4c : Symbol(m4c, Decl(augmentedTypesModules4.ts, 9, 16), Decl(augmentedTypesModules4.ts, 11, 42)) ->I : Symbol(I, Decl(augmentedTypesModules4.ts, 11, 12)) ->foo : Symbol(I.foo, Decl(augmentedTypesModules4.ts, 11, 26)) +namespace m4c { interface I { foo(): void } } +>m4c : Symbol(m4c, Decl(augmentedTypesModules4.ts, 9, 16), Decl(augmentedTypesModules4.ts, 11, 45)) +>I : Symbol(I, Decl(augmentedTypesModules4.ts, 11, 15)) +>foo : Symbol(I.foo, Decl(augmentedTypesModules4.ts, 11, 29)) enum m4c { One } ->m4c : Symbol(m4c, Decl(augmentedTypesModules4.ts, 9, 16), Decl(augmentedTypesModules4.ts, 11, 42)) +>m4c : Symbol(m4c, Decl(augmentedTypesModules4.ts, 9, 16), Decl(augmentedTypesModules4.ts, 11, 45)) >One : Symbol(m4c.One, Decl(augmentedTypesModules4.ts, 12, 10)) -module m4d { class C { foo() { } } } ->m4d : Symbol(m4d, Decl(augmentedTypesModules4.ts, 12, 16), Decl(augmentedTypesModules4.ts, 14, 36)) ->C : Symbol(C, Decl(augmentedTypesModules4.ts, 14, 12)) ->foo : Symbol(C.foo, Decl(augmentedTypesModules4.ts, 14, 22)) +namespace m4d { class C { foo() { } } } +>m4d : Symbol(m4d, Decl(augmentedTypesModules4.ts, 12, 16), Decl(augmentedTypesModules4.ts, 14, 39)) +>C : Symbol(C, Decl(augmentedTypesModules4.ts, 14, 15)) +>foo : Symbol(C.foo, Decl(augmentedTypesModules4.ts, 14, 25)) enum m4d { One } ->m4d : Symbol(m4d, Decl(augmentedTypesModules4.ts, 12, 16), Decl(augmentedTypesModules4.ts, 14, 36)) +>m4d : Symbol(m4d, Decl(augmentedTypesModules4.ts, 12, 16), Decl(augmentedTypesModules4.ts, 14, 39)) >One : Symbol(m4d.One, Decl(augmentedTypesModules4.ts, 15, 10)) //// module then module -module m5 { export var y = 2; } ->m5 : Symbol(m5, Decl(augmentedTypesModules4.ts, 15, 16), Decl(augmentedTypesModules4.ts, 19, 31)) ->y : Symbol(y, Decl(augmentedTypesModules4.ts, 19, 22)) +namespace m5 { export var y = 2; } +>m5 : Symbol(m5, Decl(augmentedTypesModules4.ts, 15, 16), Decl(augmentedTypesModules4.ts, 19, 34)) +>y : Symbol(y, Decl(augmentedTypesModules4.ts, 19, 25)) -module m5 { export interface I { foo(): void } } // should already be reasonably well covered ->m5 : Symbol(m5, Decl(augmentedTypesModules4.ts, 15, 16), Decl(augmentedTypesModules4.ts, 19, 31)) ->I : Symbol(I, Decl(augmentedTypesModules4.ts, 20, 11)) ->foo : Symbol(I.foo, Decl(augmentedTypesModules4.ts, 20, 32)) +namespace m5 { export interface I { foo(): void } } // should already be reasonably well covered +>m5 : Symbol(m5, Decl(augmentedTypesModules4.ts, 15, 16), Decl(augmentedTypesModules4.ts, 19, 34)) +>I : Symbol(I, Decl(augmentedTypesModules4.ts, 20, 14)) +>foo : Symbol(I.foo, Decl(augmentedTypesModules4.ts, 20, 35)) diff --git a/tests/baselines/reference/augmentedTypesModules4.types b/tests/baselines/reference/augmentedTypesModules4.types index 651103515f2b5..0ba3d28de63e0 100644 --- a/tests/baselines/reference/augmentedTypesModules4.types +++ b/tests/baselines/reference/augmentedTypesModules4.types @@ -3,12 +3,12 @@ === augmentedTypesModules4.ts === // module then enum // should be errors -module m4 { } +namespace m4 { } enum m4 { } >m4 : m4 > : ^^ -module m4a { var y = 2; } +namespace m4a { var y = 2; } >m4a : typeof m4a > : ^^^^^^^^^^ >y : number @@ -22,7 +22,7 @@ enum m4a { One } >One : m4a.One > : ^^^^^^^ -module m4b { export var y = 2; } +namespace m4b { export var y = 2; } >m4b : typeof m4b > : ^^^^^^^^^^ >y : number @@ -36,7 +36,7 @@ enum m4b { One } >One : m4b.One > : ^^^^^^^ -module m4c { interface I { foo(): void } } +namespace m4c { interface I { foo(): void } } >foo : () => void > : ^^^^^^ @@ -46,7 +46,7 @@ enum m4c { One } >One : m4c.One > : ^^^^^^^ -module m4d { class C { foo() { } } } +namespace m4d { class C { foo() { } } } >m4d : typeof m4d > : ^^^^^^^^^^ >C : C @@ -62,7 +62,7 @@ enum m4d { One } //// module then module -module m5 { export var y = 2; } +namespace m5 { export var y = 2; } >m5 : typeof m5 > : ^^^^^^^^^ >y : number @@ -70,7 +70,7 @@ module m5 { export var y = 2; } >2 : 2 > : ^ -module m5 { export interface I { foo(): void } } // should already be reasonably well covered +namespace m5 { export interface I { foo(): void } } // should already be reasonably well covered >foo : () => void > : ^^^^^^ diff --git a/tests/baselines/reference/augmentedTypesVar.errors.txt b/tests/baselines/reference/augmentedTypesVar.errors.txt index 724b5660fd68f..8b555c46c291d 100644 --- a/tests/baselines/reference/augmentedTypesVar.errors.txt +++ b/tests/baselines/reference/augmentedTypesVar.errors.txt @@ -8,9 +8,9 @@ augmentedTypesVar.ts(17,7): error TS2300: Duplicate identifier 'x4a'. augmentedTypesVar.ts(20,5): error TS2567: Enum declarations can only merge with namespace or other enum declarations. augmentedTypesVar.ts(21,6): error TS2567: Enum declarations can only merge with namespace or other enum declarations. augmentedTypesVar.ts(27,5): error TS2300: Duplicate identifier 'x6a'. -augmentedTypesVar.ts(28,8): error TS2300: Duplicate identifier 'x6a'. +augmentedTypesVar.ts(28,11): error TS2300: Duplicate identifier 'x6a'. augmentedTypesVar.ts(30,5): error TS2300: Duplicate identifier 'x6b'. -augmentedTypesVar.ts(31,8): error TS2300: Duplicate identifier 'x6b'. +augmentedTypesVar.ts(31,11): error TS2300: Duplicate identifier 'x6b'. ==== augmentedTypesVar.ts (13 errors) ==== @@ -57,20 +57,20 @@ augmentedTypesVar.ts(31,8): error TS2300: Duplicate identifier 'x6b'. // var then module var x6 = 1; - module x6 { } // ok since non-instantiated + namespace x6 { } // ok since non-instantiated var x6a = 1; // error ~~~ !!! error TS2300: Duplicate identifier 'x6a'. - module x6a { var y = 2; } // error since instantiated - ~~~ + namespace x6a { var y = 2; } // error since instantiated + ~~~ !!! error TS2300: Duplicate identifier 'x6a'. var x6b = 1; // error ~~~ !!! error TS2300: Duplicate identifier 'x6b'. - module x6b { export var y = 2; } // error - ~~~ + namespace x6b { export var y = 2; } // error + ~~~ !!! error TS2300: Duplicate identifier 'x6b'. // var then import, messes with other error reporting diff --git a/tests/baselines/reference/augmentedTypesVar.js b/tests/baselines/reference/augmentedTypesVar.js index d7850624dc5c9..1b315124bf37e 100644 --- a/tests/baselines/reference/augmentedTypesVar.js +++ b/tests/baselines/reference/augmentedTypesVar.js @@ -25,13 +25,13 @@ enum x5 { One } // error // var then module var x6 = 1; -module x6 { } // ok since non-instantiated +namespace x6 { } // ok since non-instantiated var x6a = 1; // error -module x6a { var y = 2; } // error since instantiated +namespace x6a { var y = 2; } // error since instantiated var x6b = 1; // error -module x6b { export var y = 2; } // error +namespace x6b { export var y = 2; } // error // var then import, messes with other error reporting //var x7 = 1; diff --git a/tests/baselines/reference/augmentedTypesVar.symbols b/tests/baselines/reference/augmentedTypesVar.symbols index c98dabfd200c3..0ee1d7776c1fe 100644 --- a/tests/baselines/reference/augmentedTypesVar.symbols +++ b/tests/baselines/reference/augmentedTypesVar.symbols @@ -47,22 +47,22 @@ enum x5 { One } // error var x6 = 1; >x6 : Symbol(x6, Decl(augmentedTypesVar.ts, 23, 3), Decl(augmentedTypesVar.ts, 23, 11)) -module x6 { } // ok since non-instantiated +namespace x6 { } // ok since non-instantiated >x6 : Symbol(x6, Decl(augmentedTypesVar.ts, 23, 3), Decl(augmentedTypesVar.ts, 23, 11)) var x6a = 1; // error >x6a : Symbol(x6a, Decl(augmentedTypesVar.ts, 26, 3)) -module x6a { var y = 2; } // error since instantiated +namespace x6a { var y = 2; } // error since instantiated >x6a : Symbol(x6a, Decl(augmentedTypesVar.ts, 26, 12)) ->y : Symbol(y, Decl(augmentedTypesVar.ts, 27, 16)) +>y : Symbol(y, Decl(augmentedTypesVar.ts, 27, 19)) var x6b = 1; // error >x6b : Symbol(x6b, Decl(augmentedTypesVar.ts, 29, 3)) -module x6b { export var y = 2; } // error +namespace x6b { export var y = 2; } // error >x6b : Symbol(x6b, Decl(augmentedTypesVar.ts, 29, 12)) ->y : Symbol(y, Decl(augmentedTypesVar.ts, 30, 23)) +>y : Symbol(y, Decl(augmentedTypesVar.ts, 30, 26)) // var then import, messes with other error reporting //var x7 = 1; diff --git a/tests/baselines/reference/augmentedTypesVar.types b/tests/baselines/reference/augmentedTypesVar.types index 725a0119161dd..2ade1a64e3174 100644 --- a/tests/baselines/reference/augmentedTypesVar.types +++ b/tests/baselines/reference/augmentedTypesVar.types @@ -80,7 +80,7 @@ var x6 = 1; >1 : 1 > : ^ -module x6 { } // ok since non-instantiated +namespace x6 { } // ok since non-instantiated var x6a = 1; // error >x6a : number @@ -88,7 +88,7 @@ var x6a = 1; // error >1 : 1 > : ^ -module x6a { var y = 2; } // error since instantiated +namespace x6a { var y = 2; } // error since instantiated >x6a : typeof x6a > : ^^^^^^^^^^ >y : number @@ -102,7 +102,7 @@ var x6b = 1; // error >1 : 1 > : ^ -module x6b { export var y = 2; } // error +namespace x6b { export var y = 2; } // error >x6b : typeof x6b > : ^^^^^^^^^^ >y : number diff --git a/tests/baselines/reference/bind1.errors.txt b/tests/baselines/reference/bind1.errors.txt index a324676ec837d..d708932bcd46a 100644 --- a/tests/baselines/reference/bind1.errors.txt +++ b/tests/baselines/reference/bind1.errors.txt @@ -2,7 +2,7 @@ bind1.ts(2,31): error TS2304: Cannot find name 'I'. ==== bind1.ts (1 errors) ==== - module M { + namespace M { export class C implements I {} // this should be an unresolved symbol I error ~ !!! error TS2304: Cannot find name 'I'. diff --git a/tests/baselines/reference/bind1.js b/tests/baselines/reference/bind1.js index 94f30ed8b7547..0bbd6f903283b 100644 --- a/tests/baselines/reference/bind1.js +++ b/tests/baselines/reference/bind1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/bind1.ts] //// //// [bind1.ts] -module M { +namespace M { export class C implements I {} // this should be an unresolved symbol I error } diff --git a/tests/baselines/reference/bind1.symbols b/tests/baselines/reference/bind1.symbols index 7d039976d2fcc..9c9441f690346 100644 --- a/tests/baselines/reference/bind1.symbols +++ b/tests/baselines/reference/bind1.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/bind1.ts] //// === bind1.ts === -module M { +namespace M { >M : Symbol(M, Decl(bind1.ts, 0, 0)) export class C implements I {} // this should be an unresolved symbol I error ->C : Symbol(C, Decl(bind1.ts, 0, 10)) +>C : Symbol(C, Decl(bind1.ts, 0, 13)) } diff --git a/tests/baselines/reference/bind1.types b/tests/baselines/reference/bind1.types index 624f7bd6cb6ae..178a2592ad738 100644 --- a/tests/baselines/reference/bind1.types +++ b/tests/baselines/reference/bind1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/bind1.ts] //// === bind1.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/binopAssignmentShouldHaveType.js b/tests/baselines/reference/binopAssignmentShouldHaveType.js index f13aec821a786..73224a81cc64e 100644 --- a/tests/baselines/reference/binopAssignmentShouldHaveType.js +++ b/tests/baselines/reference/binopAssignmentShouldHaveType.js @@ -3,7 +3,7 @@ //// [binopAssignmentShouldHaveType.ts] declare var console; "use strict"; -module Test { +namespace Test { export class Bug { getName():string { return "name"; diff --git a/tests/baselines/reference/binopAssignmentShouldHaveType.symbols b/tests/baselines/reference/binopAssignmentShouldHaveType.symbols index 805b0530b4577..3590bcb5968c5 100644 --- a/tests/baselines/reference/binopAssignmentShouldHaveType.symbols +++ b/tests/baselines/reference/binopAssignmentShouldHaveType.symbols @@ -5,11 +5,11 @@ declare var console; >console : Symbol(console, Decl(binopAssignmentShouldHaveType.ts, 0, 11)) "use strict"; -module Test { +namespace Test { >Test : Symbol(Test, Decl(binopAssignmentShouldHaveType.ts, 1, 13)) export class Bug { ->Bug : Symbol(Bug, Decl(binopAssignmentShouldHaveType.ts, 2, 13)) +>Bug : Symbol(Bug, Decl(binopAssignmentShouldHaveType.ts, 2, 16)) getName():string { >getName : Symbol(Bug.getName, Decl(binopAssignmentShouldHaveType.ts, 3, 19)) @@ -26,7 +26,7 @@ module Test { >(name= this.getName()).length : Symbol(String.length, Decl(lib.es5.d.ts, --, --)) >name : Symbol(name, Decl(binopAssignmentShouldHaveType.ts, 8, 6)) >this.getName : Symbol(Bug.getName, Decl(binopAssignmentShouldHaveType.ts, 3, 19)) ->this : Symbol(Bug, Decl(binopAssignmentShouldHaveType.ts, 2, 13)) +>this : Symbol(Bug, Decl(binopAssignmentShouldHaveType.ts, 2, 16)) >getName : Symbol(Bug.getName, Decl(binopAssignmentShouldHaveType.ts, 3, 19)) >length : Symbol(String.length, Decl(lib.es5.d.ts, --, --)) diff --git a/tests/baselines/reference/binopAssignmentShouldHaveType.types b/tests/baselines/reference/binopAssignmentShouldHaveType.types index b070ae3a4c2e0..1f074c72b0845 100644 --- a/tests/baselines/reference/binopAssignmentShouldHaveType.types +++ b/tests/baselines/reference/binopAssignmentShouldHaveType.types @@ -8,7 +8,7 @@ declare var console; >"use strict" : "use strict" > : ^^^^^^^^^^^^ -module Test { +namespace Test { >Test : typeof Test > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.errors.txt b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.errors.txt index 3f827e0f4e93e..ce16af3eaec6e 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.errors.txt +++ b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.errors.txt @@ -25,7 +25,7 @@ bitwiseNotOperatorWithAnyOtherType.ts(48,26): error TS2365: Operator '+' cannot return a; } } - module M { + namespace M { export var n: any; } var objA = new A(); diff --git a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js index e9366ce705d47..fa1dbad9899b4 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js @@ -20,7 +20,7 @@ class A { return a; } } -module M { +namespace M { export var n: any; } var objA = new A(); diff --git a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.symbols b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.symbols index 9f7a2cf4369ce..1f4aae51acce2 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.symbols +++ b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.symbols @@ -45,7 +45,7 @@ class A { >a : Symbol(a, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 15, 11)) } } -module M { +namespace M { >M : Symbol(M, Decl(bitwiseNotOperatorWithAnyOtherType.ts, 18, 1)) export var n: any; diff --git a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.types b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.types index 85cacd548cd5c..969a31311a5cd 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.types +++ b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.types @@ -72,7 +72,7 @@ class A { > : ^^^ } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.js b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.js index e8ee07455d579..cdf0804256f5f 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.js +++ b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.js @@ -10,7 +10,7 @@ class A { public a: boolean; static foo() { return false; } } -module M { +namespace M { export var n: boolean; } diff --git a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.symbols b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.symbols index 7ac632e66a12a..f2116e151b53b 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.symbols +++ b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.symbols @@ -17,7 +17,7 @@ class A { static foo() { return false; } >foo : Symbol(A.foo, Decl(bitwiseNotOperatorWithBooleanType.ts, 6, 22)) } -module M { +namespace M { >M : Symbol(M, Decl(bitwiseNotOperatorWithBooleanType.ts, 8, 1)) export var n: boolean; diff --git a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.types b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.types index 3d98fac57f6b1..6387e22fcc119 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.types +++ b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.types @@ -26,7 +26,7 @@ class A { >false : false > : ^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.js b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.js index 2373b8140dc62..9a2e3c4944ab9 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.js +++ b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.js @@ -11,7 +11,7 @@ class A { public a: number; static foo() { return 1; } } -module M { +namespace M { export var n: number; } diff --git a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.symbols b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.symbols index 760c6d64b875e..38bf4d0f72f17 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.symbols +++ b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.symbols @@ -20,7 +20,7 @@ class A { static foo() { return 1; } >foo : Symbol(A.foo, Decl(bitwiseNotOperatorWithNumberType.ts, 7, 21)) } -module M { +namespace M { >M : Symbol(M, Decl(bitwiseNotOperatorWithNumberType.ts, 9, 1)) export var n: number; diff --git a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types index 3af2e3780531b..e4a404f98bebf 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types +++ b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types @@ -36,7 +36,7 @@ class A { >1 : 1 > : ^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/bitwiseNotOperatorWithStringType.js b/tests/baselines/reference/bitwiseNotOperatorWithStringType.js index 9e39e5a83b024..2beff97a1527d 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithStringType.js +++ b/tests/baselines/reference/bitwiseNotOperatorWithStringType.js @@ -11,7 +11,7 @@ class A { public a: string; static foo() { return ""; } } -module M { +namespace M { export var n: string; } diff --git a/tests/baselines/reference/bitwiseNotOperatorWithStringType.symbols b/tests/baselines/reference/bitwiseNotOperatorWithStringType.symbols index f96b907d3fedb..1adbff2776d4c 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithStringType.symbols +++ b/tests/baselines/reference/bitwiseNotOperatorWithStringType.symbols @@ -20,7 +20,7 @@ class A { static foo() { return ""; } >foo : Symbol(A.foo, Decl(bitwiseNotOperatorWithStringType.ts, 7, 21)) } -module M { +namespace M { >M : Symbol(M, Decl(bitwiseNotOperatorWithStringType.ts, 9, 1)) export var n: string; diff --git a/tests/baselines/reference/bitwiseNotOperatorWithStringType.types b/tests/baselines/reference/bitwiseNotOperatorWithStringType.types index 28ea9682b861e..087698b68ccbd 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithStringType.types +++ b/tests/baselines/reference/bitwiseNotOperatorWithStringType.types @@ -36,7 +36,7 @@ class A { >"" : "" > : ^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/bluebirdStaticThis.errors.txt b/tests/baselines/reference/bluebirdStaticThis.errors.txt index 0c1f2baf595e5..e63c4c3e3deba 100644 --- a/tests/baselines/reference/bluebirdStaticThis.errors.txt +++ b/tests/baselines/reference/bluebirdStaticThis.errors.txt @@ -132,7 +132,7 @@ bluebirdStaticThis.ts(60,73): error TS2694: Namespace '"bluebirdStaticThis".Prom static filter(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise; } - export declare module Promise { + export declare namespace Promise { export interface Thenable { then(onFulfilled: (value: R) => Thenable, onRejected: (error: any) => Thenable): Thenable; then(onFulfilled: (value: R) => Thenable, onRejected?: (error: any) => U): Thenable; diff --git a/tests/baselines/reference/bluebirdStaticThis.js b/tests/baselines/reference/bluebirdStaticThis.js index 3f6c6d0d40e72..56abde4064fac 100644 --- a/tests/baselines/reference/bluebirdStaticThis.js +++ b/tests/baselines/reference/bluebirdStaticThis.js @@ -111,7 +111,7 @@ export declare class Promise implements Promise.Thenable { static filter(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise; } -export declare module Promise { +export declare namespace Promise { export interface Thenable { then(onFulfilled: (value: R) => Thenable, onRejected: (error: any) => Thenable): Thenable; then(onFulfilled: (value: R) => Thenable, onRejected?: (error: any) => U): Thenable; diff --git a/tests/baselines/reference/bluebirdStaticThis.symbols b/tests/baselines/reference/bluebirdStaticThis.symbols index c4acc5445d134..2d0beb5843790 100644 --- a/tests/baselines/reference/bluebirdStaticThis.symbols +++ b/tests/baselines/reference/bluebirdStaticThis.symbols @@ -8,9 +8,9 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 4, 29)) ->Promise.Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Promise.Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 4, 29)) constructor(callback: (resolve: (thenableOrResult: R | Promise.Thenable) => void, reject: (error: any) => void) => void); @@ -19,7 +19,7 @@ export declare class Promise implements Promise.Thenable { >thenableOrResult : Symbol(thenableOrResult, Decl(bluebirdStaticThis.ts, 5, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 4, 29)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 4, 29)) >reject : Symbol(reject, Decl(bluebirdStaticThis.ts, 5, 85)) >error : Symbol(error, Decl(bluebirdStaticThis.ts, 5, 95)) @@ -31,7 +31,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >fn : Symbol(fn, Decl(bluebirdStaticThis.ts, 6, 38)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 6, 15)) >args : Symbol(args, Decl(bluebirdStaticThis.ts, 6, 69)) >ctx : Symbol(ctx, Decl(bluebirdStaticThis.ts, 6, 83)) @@ -57,7 +57,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >fn : Symbol(fn, Decl(bluebirdStaticThis.ts, 9, 42)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 9, 19)) >args : Symbol(args, Decl(bluebirdStaticThis.ts, 9, 73)) >ctx : Symbol(ctx, Decl(bluebirdStaticThis.ts, 9, 87)) @@ -97,7 +97,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >value : Symbol(value, Decl(bluebirdStaticThis.ts, 15, 42)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 15, 19)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 15, 19)) @@ -144,7 +144,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >value : Symbol(value, Decl(bluebirdStaticThis.ts, 23, 39)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 23, 16)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 23, 16)) @@ -184,7 +184,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >value : Symbol(value, Decl(bluebirdStaticThis.ts, 32, 40)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 32, 17)) >ms : Symbol(ms, Decl(bluebirdStaticThis.ts, 32, 68)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) @@ -264,9 +264,9 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 48, 38)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 48, 15)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 48, 15)) @@ -278,7 +278,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 49, 38)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 49, 15)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 49, 15)) @@ -290,7 +290,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 50, 38)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 50, 15)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 50, 15)) @@ -331,9 +331,9 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 56, 41)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 56, 18)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) @@ -347,7 +347,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 57, 41)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 57, 18)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) @@ -361,7 +361,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 58, 41)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 58, 18)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) @@ -387,9 +387,9 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 61, 38)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 61, 15)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 61, 15)) @@ -401,7 +401,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 62, 38)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 62, 15)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 62, 15)) @@ -413,7 +413,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 63, 38)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 63, 15)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 63, 15)) @@ -435,9 +435,9 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 66, 39)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 66, 16)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 66, 16)) @@ -449,7 +449,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 67, 39)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 67, 16)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 67, 16)) @@ -461,7 +461,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 68, 39)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 68, 16)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 68, 16)) @@ -483,9 +483,9 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 71, 39)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 71, 16)) >count : Symbol(count, Decl(bluebirdStaticThis.ts, 71, 88)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) @@ -498,7 +498,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 72, 39)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 72, 16)) >count : Symbol(count, Decl(bluebirdStaticThis.ts, 72, 70)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) @@ -511,7 +511,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 73, 39)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 73, 16)) >count : Symbol(count, Decl(bluebirdStaticThis.ts, 73, 70)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) @@ -535,7 +535,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 76, 39)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 76, 16)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 76, 16)) @@ -558,9 +558,9 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 79, 41)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 79, 15)) >mapper : Symbol(mapper, Decl(bluebirdStaticThis.ts, 79, 90)) >item : Symbol(item, Decl(bluebirdStaticThis.ts, 79, 100)) @@ -568,7 +568,7 @@ export declare class Promise implements Promise.Thenable { >index : Symbol(index, Decl(bluebirdStaticThis.ts, 79, 108)) >arrayLength : Symbol(arrayLength, Decl(bluebirdStaticThis.ts, 79, 123)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 79, 17)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 79, 17)) @@ -581,9 +581,9 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 80, 41)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 80, 15)) >mapper : Symbol(mapper, Decl(bluebirdStaticThis.ts, 80, 90)) >item : Symbol(item, Decl(bluebirdStaticThis.ts, 80, 100)) @@ -602,7 +602,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 81, 41)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 81, 15)) >mapper : Symbol(mapper, Decl(bluebirdStaticThis.ts, 81, 72)) >item : Symbol(item, Decl(bluebirdStaticThis.ts, 81, 82)) @@ -610,7 +610,7 @@ export declare class Promise implements Promise.Thenable { >index : Symbol(index, Decl(bluebirdStaticThis.ts, 81, 90)) >arrayLength : Symbol(arrayLength, Decl(bluebirdStaticThis.ts, 81, 105)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 81, 17)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 81, 17)) @@ -623,7 +623,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 82, 41)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 82, 15)) >mapper : Symbol(mapper, Decl(bluebirdStaticThis.ts, 82, 72)) >item : Symbol(item, Decl(bluebirdStaticThis.ts, 82, 82)) @@ -642,7 +642,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 83, 41)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 83, 15)) >mapper : Symbol(mapper, Decl(bluebirdStaticThis.ts, 83, 72)) >item : Symbol(item, Decl(bluebirdStaticThis.ts, 83, 82)) @@ -650,7 +650,7 @@ export declare class Promise implements Promise.Thenable { >index : Symbol(index, Decl(bluebirdStaticThis.ts, 83, 90)) >arrayLength : Symbol(arrayLength, Decl(bluebirdStaticThis.ts, 83, 105)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 83, 17)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 83, 17)) @@ -663,7 +663,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 84, 41)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 84, 15)) >mapper : Symbol(mapper, Decl(bluebirdStaticThis.ts, 84, 72)) >item : Symbol(item, Decl(bluebirdStaticThis.ts, 84, 82)) @@ -688,7 +688,7 @@ export declare class Promise implements Promise.Thenable { >index : Symbol(index, Decl(bluebirdStaticThis.ts, 85, 72)) >arrayLength : Symbol(arrayLength, Decl(bluebirdStaticThis.ts, 85, 87)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 85, 17)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 85, 17)) @@ -718,9 +718,9 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 88, 44)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 88, 18)) >reducer : Symbol(reducer, Decl(bluebirdStaticThis.ts, 88, 93)) >total : Symbol(total, Decl(bluebirdStaticThis.ts, 88, 104)) @@ -730,7 +730,7 @@ export declare class Promise implements Promise.Thenable { >index : Symbol(index, Decl(bluebirdStaticThis.ts, 88, 125)) >arrayLength : Symbol(arrayLength, Decl(bluebirdStaticThis.ts, 88, 140)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 88, 20)) >initialValue : Symbol(initialValue, Decl(bluebirdStaticThis.ts, 88, 185)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 88, 20)) @@ -745,9 +745,9 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 89, 44)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 89, 18)) >reducer : Symbol(reducer, Decl(bluebirdStaticThis.ts, 89, 93)) >total : Symbol(total, Decl(bluebirdStaticThis.ts, 89, 104)) @@ -770,7 +770,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 91, 44)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 91, 18)) >reducer : Symbol(reducer, Decl(bluebirdStaticThis.ts, 91, 75)) >total : Symbol(total, Decl(bluebirdStaticThis.ts, 91, 86)) @@ -780,7 +780,7 @@ export declare class Promise implements Promise.Thenable { >index : Symbol(index, Decl(bluebirdStaticThis.ts, 91, 107)) >arrayLength : Symbol(arrayLength, Decl(bluebirdStaticThis.ts, 91, 122)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 91, 20)) >initialValue : Symbol(initialValue, Decl(bluebirdStaticThis.ts, 91, 167)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 91, 20)) @@ -795,7 +795,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 92, 44)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 92, 18)) >reducer : Symbol(reducer, Decl(bluebirdStaticThis.ts, 92, 75)) >total : Symbol(total, Decl(bluebirdStaticThis.ts, 92, 86)) @@ -818,7 +818,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 94, 44)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 94, 18)) >reducer : Symbol(reducer, Decl(bluebirdStaticThis.ts, 94, 75)) >total : Symbol(total, Decl(bluebirdStaticThis.ts, 94, 86)) @@ -828,7 +828,7 @@ export declare class Promise implements Promise.Thenable { >index : Symbol(index, Decl(bluebirdStaticThis.ts, 94, 107)) >arrayLength : Symbol(arrayLength, Decl(bluebirdStaticThis.ts, 94, 122)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 94, 20)) >initialValue : Symbol(initialValue, Decl(bluebirdStaticThis.ts, 94, 167)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 94, 20)) @@ -843,7 +843,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 95, 44)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 95, 18)) >reducer : Symbol(reducer, Decl(bluebirdStaticThis.ts, 95, 75)) >total : Symbol(total, Decl(bluebirdStaticThis.ts, 95, 86)) @@ -874,7 +874,7 @@ export declare class Promise implements Promise.Thenable { >index : Symbol(index, Decl(bluebirdStaticThis.ts, 97, 89)) >arrayLength : Symbol(arrayLength, Decl(bluebirdStaticThis.ts, 97, 104)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 97, 20)) >initialValue : Symbol(initialValue, Decl(bluebirdStaticThis.ts, 97, 149)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 97, 20)) @@ -909,9 +909,9 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 100, 41)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 100, 18)) >filterer : Symbol(filterer, Decl(bluebirdStaticThis.ts, 100, 90)) >item : Symbol(item, Decl(bluebirdStaticThis.ts, 100, 102)) @@ -919,7 +919,7 @@ export declare class Promise implements Promise.Thenable { >index : Symbol(index, Decl(bluebirdStaticThis.ts, 100, 110)) >arrayLength : Symbol(arrayLength, Decl(bluebirdStaticThis.ts, 100, 125)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 100, 18)) @@ -930,9 +930,9 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 101, 41)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 101, 18)) >filterer : Symbol(filterer, Decl(bluebirdStaticThis.ts, 101, 90)) >item : Symbol(item, Decl(bluebirdStaticThis.ts, 101, 102)) @@ -949,7 +949,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 102, 41)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 102, 18)) >filterer : Symbol(filterer, Decl(bluebirdStaticThis.ts, 102, 72)) >item : Symbol(item, Decl(bluebirdStaticThis.ts, 102, 84)) @@ -957,7 +957,7 @@ export declare class Promise implements Promise.Thenable { >index : Symbol(index, Decl(bluebirdStaticThis.ts, 102, 92)) >arrayLength : Symbol(arrayLength, Decl(bluebirdStaticThis.ts, 102, 107)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 102, 18)) @@ -968,7 +968,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 103, 41)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 103, 18)) >filterer : Symbol(filterer, Decl(bluebirdStaticThis.ts, 103, 72)) >item : Symbol(item, Decl(bluebirdStaticThis.ts, 103, 84)) @@ -985,7 +985,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 104, 41)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 104, 18)) >filterer : Symbol(filterer, Decl(bluebirdStaticThis.ts, 104, 72)) >item : Symbol(item, Decl(bluebirdStaticThis.ts, 104, 84)) @@ -993,7 +993,7 @@ export declare class Promise implements Promise.Thenable { >index : Symbol(index, Decl(bluebirdStaticThis.ts, 104, 92)) >arrayLength : Symbol(arrayLength, Decl(bluebirdStaticThis.ts, 104, 107)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 104, 18)) @@ -1004,7 +1004,7 @@ export declare class Promise implements Promise.Thenable { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >values : Symbol(values, Decl(bluebirdStaticThis.ts, 105, 41)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 105, 18)) >filterer : Symbol(filterer, Decl(bluebirdStaticThis.ts, 105, 72)) >item : Symbol(item, Decl(bluebirdStaticThis.ts, 105, 84)) @@ -1027,7 +1027,7 @@ export declare class Promise implements Promise.Thenable { >index : Symbol(index, Decl(bluebirdStaticThis.ts, 106, 74)) >arrayLength : Symbol(arrayLength, Decl(bluebirdStaticThis.ts, 106, 89)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) ->Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Promise.Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 106, 18)) @@ -1047,11 +1047,11 @@ export declare class Promise implements Promise.Thenable { >R : Symbol(R, Decl(bluebirdStaticThis.ts, 107, 18)) } -export declare module Promise { +export declare namespace Promise { >Promise : Symbol(Promise, Decl(bluebirdStaticThis.ts, 0, 0), Decl(bluebirdStaticThis.ts, 108, 1)) export interface Thenable { ->Thenable : Symbol(Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 111, 27)) then(onFulfilled: (value: R) => Thenable, onRejected: (error: any) => Thenable): Thenable; @@ -1060,13 +1060,13 @@ export declare module Promise { >onFulfilled : Symbol(onFulfilled, Decl(bluebirdStaticThis.ts, 112, 10)) >value : Symbol(value, Decl(bluebirdStaticThis.ts, 112, 24)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 111, 27)) ->Thenable : Symbol(Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 112, 7)) >onRejected : Symbol(onRejected, Decl(bluebirdStaticThis.ts, 112, 49)) >error : Symbol(error, Decl(bluebirdStaticThis.ts, 112, 63)) ->Thenable : Symbol(Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 112, 7)) ->Thenable : Symbol(Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 112, 7)) then(onFulfilled: (value: R) => Thenable, onRejected?: (error: any) => U): Thenable; @@ -1075,12 +1075,12 @@ export declare module Promise { >onFulfilled : Symbol(onFulfilled, Decl(bluebirdStaticThis.ts, 113, 10)) >value : Symbol(value, Decl(bluebirdStaticThis.ts, 113, 24)) >R : Symbol(R, Decl(bluebirdStaticThis.ts, 111, 27)) ->Thenable : Symbol(Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 113, 7)) >onRejected : Symbol(onRejected, Decl(bluebirdStaticThis.ts, 113, 49)) >error : Symbol(error, Decl(bluebirdStaticThis.ts, 113, 64)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 113, 7)) ->Thenable : Symbol(Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 113, 7)) then(onFulfilled: (value: R) => U, onRejected: (error: any) => Thenable): Thenable; @@ -1092,9 +1092,9 @@ export declare module Promise { >U : Symbol(U, Decl(bluebirdStaticThis.ts, 114, 7)) >onRejected : Symbol(onRejected, Decl(bluebirdStaticThis.ts, 114, 39)) >error : Symbol(error, Decl(bluebirdStaticThis.ts, 114, 53)) ->Thenable : Symbol(Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 114, 7)) ->Thenable : Symbol(Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 114, 7)) then(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): Thenable; @@ -1107,7 +1107,7 @@ export declare module Promise { >onRejected : Symbol(onRejected, Decl(bluebirdStaticThis.ts, 115, 40)) >error : Symbol(error, Decl(bluebirdStaticThis.ts, 115, 55)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 115, 7)) ->Thenable : Symbol(Thenable, Decl(bluebirdStaticThis.ts, 110, 31)) +>Thenable : Symbol(Thenable, Decl(bluebirdStaticThis.ts, 110, 34)) >U : Symbol(U, Decl(bluebirdStaticThis.ts, 115, 7)) } diff --git a/tests/baselines/reference/bluebirdStaticThis.types b/tests/baselines/reference/bluebirdStaticThis.types index e090eac053745..d544d41396a90 100644 --- a/tests/baselines/reference/bluebirdStaticThis.types +++ b/tests/baselines/reference/bluebirdStaticThis.types @@ -1140,7 +1140,7 @@ export declare class Promise implements Promise.Thenable { > : ^^^^^^ } -export declare module Promise { +export declare namespace Promise { export interface Thenable { then(onFulfilled: (value: R) => Thenable, onRejected: (error: any) => Thenable): Thenable; >then : { (onFulfilled: (value: R) => Thenable, onRejected: (error: any) => Thenable): Thenable; (onFulfilled: (value: R) => Thenable, onRejected?: (error: any) => U_1): Thenable; (onFulfilled: (value: R) => U_1, onRejected: (error: any) => Thenable): Thenable; (onFulfilled?: (value: R) => U_1, onRejected?: (error: any) => U_1): Thenable; } diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance.errors.txt b/tests/baselines/reference/callSignatureAssignabilityInInheritance.errors.txt index 70c88dd904350..dd8cbba8ad500 100644 --- a/tests/baselines/reference/callSignatureAssignabilityInInheritance.errors.txt +++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance.errors.txt @@ -8,7 +8,7 @@ callSignatureAssignabilityInInheritance.ts(63,15): error TS2430: Interface 'I3' ==== callSignatureAssignabilityInInheritance.ts (2 errors) ==== - module CallSignature { + namespace CallSignature { interface Base { // T // M's (x: number): void; @@ -41,7 +41,7 @@ callSignatureAssignabilityInInheritance.ts(63,15): error TS2430: Interface 'I3' } } - module MemberWithCallSignature { + namespace MemberWithCallSignature { interface Base { // T // M's a: (x: number) => void; diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance.js b/tests/baselines/reference/callSignatureAssignabilityInInheritance.js index a47659955d25b..5ef702d2a022e 100644 --- a/tests/baselines/reference/callSignatureAssignabilityInInheritance.js +++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance.ts] //// //// [callSignatureAssignabilityInInheritance.ts] -module CallSignature { +namespace CallSignature { interface Base { // T // M's (x: number): void; @@ -34,7 +34,7 @@ module CallSignature { } } -module MemberWithCallSignature { +namespace MemberWithCallSignature { interface Base { // T // M's a: (x: number) => void; diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance.symbols b/tests/baselines/reference/callSignatureAssignabilityInInheritance.symbols index 2bb87ef7e9b5b..7be1efc7ee112 100644 --- a/tests/baselines/reference/callSignatureAssignabilityInInheritance.symbols +++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance.ts] //// === callSignatureAssignabilityInInheritance.ts === -module CallSignature { +namespace CallSignature { >CallSignature : Symbol(CallSignature, Decl(callSignatureAssignabilityInInheritance.ts, 0, 0)) interface Base { // T ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance.ts, 0, 22)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance.ts, 0, 25)) // M's (x: number): void; @@ -19,7 +19,7 @@ module CallSignature { // S's interface I extends Base { >I : Symbol(I, Decl(callSignatureAssignabilityInInheritance.ts, 5, 5)) ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance.ts, 0, 22)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance.ts, 0, 25)) // N's (x: number): number; // ok because base returns void @@ -66,11 +66,11 @@ module CallSignature { } } -module MemberWithCallSignature { +namespace MemberWithCallSignature { >MemberWithCallSignature : Symbol(MemberWithCallSignature, Decl(callSignatureAssignabilityInInheritance.ts, 31, 1)) interface Base { // T ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance.ts, 33, 32)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance.ts, 33, 35)) // M's a: (x: number) => void; @@ -92,7 +92,7 @@ module MemberWithCallSignature { // S's interface I extends Base { >I : Symbol(I, Decl(callSignatureAssignabilityInInheritance.ts, 39, 5)) ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance.ts, 33, 32)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance.ts, 33, 35)) // N's a: (x: number) => number; // ok because base returns void diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance.types b/tests/baselines/reference/callSignatureAssignabilityInInheritance.types index d394718d766e3..99435e970b015 100644 --- a/tests/baselines/reference/callSignatureAssignabilityInInheritance.types +++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance.ts] //// === callSignatureAssignabilityInInheritance.ts === -module CallSignature { +namespace CallSignature { interface Base { // T // M's (x: number): void; @@ -57,7 +57,7 @@ module CallSignature { } } -module MemberWithCallSignature { +namespace MemberWithCallSignature { interface Base { // T // M's a: (x: number) => void; diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.errors.txt b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.errors.txt index 9f6a5043893e0..291b641998b8b 100644 --- a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.errors.txt +++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.errors.txt @@ -41,13 +41,13 @@ callSignatureAssignabilityInInheritance3.ts(109,19): error TS2430: Interface 'I7 // checking subtype relations for function types as it relates to contextual signature instantiation // error cases - module Errors { + namespace Errors { class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Derived { baz: string; } class OtherDerived extends Base { bing: string; } - module WithNonGenericSignaturesInBaseType { + namespace WithNonGenericSignaturesInBaseType { // base type with non-generic call signatures interface A { a2: (x: number) => string[]; @@ -163,7 +163,7 @@ callSignatureAssignabilityInInheritance3.ts(109,19): error TS2430: Interface 'I7 } } - module WithGenericSignaturesInBaseType { + namespace WithGenericSignaturesInBaseType { // base type has generic call signature interface B { a2: (x: T) => T[]; diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js index 9fb5afc4a6b22..c7dc8466274e6 100644 --- a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js +++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js @@ -4,13 +4,13 @@ // checking subtype relations for function types as it relates to contextual signature instantiation // error cases -module Errors { +namespace Errors { class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Derived { baz: string; } class OtherDerived extends Base { bing: string; } - module WithNonGenericSignaturesInBaseType { + namespace WithNonGenericSignaturesInBaseType { // base type with non-generic call signatures interface A { a2: (x: number) => string[]; @@ -94,7 +94,7 @@ module Errors { } } - module WithGenericSignaturesInBaseType { + namespace WithGenericSignaturesInBaseType { // base type has generic call signature interface B { a2: (x: T) => T[]; diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.symbols b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.symbols index 4cb5172b40988..7a4ee834e98b7 100644 --- a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.symbols +++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.symbols @@ -4,16 +4,16 @@ // checking subtype relations for function types as it relates to contextual signature instantiation // error cases -module Errors { +namespace Errors { >Errors : Symbol(Errors, Decl(callSignatureAssignabilityInInheritance3.ts, 0, 0)) class Base { foo: string; } ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 18)) >foo : Symbol(Base.foo, Decl(callSignatureAssignabilityInInheritance3.ts, 4, 16)) class Derived extends Base { bar: string; } >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance3.ts, 4, 31)) ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 18)) >bar : Symbol(Derived.bar, Decl(callSignatureAssignabilityInInheritance3.ts, 5, 32)) class Derived2 extends Derived { baz: string; } @@ -23,15 +23,15 @@ module Errors { class OtherDerived extends Base { bing: string; } >OtherDerived : Symbol(OtherDerived, Decl(callSignatureAssignabilityInInheritance3.ts, 6, 51)) ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 18)) >bing : Symbol(OtherDerived.bing, Decl(callSignatureAssignabilityInInheritance3.ts, 7, 37)) - module WithNonGenericSignaturesInBaseType { + namespace WithNonGenericSignaturesInBaseType { >WithNonGenericSignaturesInBaseType : Symbol(WithNonGenericSignaturesInBaseType, Decl(callSignatureAssignabilityInInheritance3.ts, 7, 53)) // base type with non-generic call signatures interface A { ->A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 50)) a2: (x: number) => string[]; >a2 : Symbol(A.a2, Decl(callSignatureAssignabilityInInheritance3.ts, 11, 21)) @@ -41,31 +41,31 @@ module Errors { >a7 : Symbol(A.a7, Decl(callSignatureAssignabilityInInheritance3.ts, 12, 40)) >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance3.ts, 13, 17)) >arg : Symbol(arg, Decl(callSignatureAssignabilityInInheritance3.ts, 13, 21)) ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance3.ts, 4, 31)) >r : Symbol(r, Decl(callSignatureAssignabilityInInheritance3.ts, 13, 48)) ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 18)) >Derived2 : Symbol(Derived2, Decl(callSignatureAssignabilityInInheritance3.ts, 5, 47)) a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived; >a8 : Symbol(A.a8, Decl(callSignatureAssignabilityInInheritance3.ts, 13, 69)) >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance3.ts, 14, 17)) >arg : Symbol(arg, Decl(callSignatureAssignabilityInInheritance3.ts, 14, 21)) ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance3.ts, 4, 31)) >y : Symbol(y, Decl(callSignatureAssignabilityInInheritance3.ts, 14, 43)) >arg2 : Symbol(arg2, Decl(callSignatureAssignabilityInInheritance3.ts, 14, 48)) ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance3.ts, 4, 31)) >r : Symbol(r, Decl(callSignatureAssignabilityInInheritance3.ts, 14, 76)) ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance3.ts, 4, 31)) a10: (...x: Base[]) => Base; >a10 : Symbol(A.a10, Decl(callSignatureAssignabilityInInheritance3.ts, 14, 96)) >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance3.ts, 15, 18)) ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 15)) ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 18)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 18)) a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base; >a11 : Symbol(A.a11, Decl(callSignatureAssignabilityInInheritance3.ts, 15, 40)) @@ -74,13 +74,13 @@ module Errors { >y : Symbol(y, Decl(callSignatureAssignabilityInInheritance3.ts, 16, 37)) >foo : Symbol(foo, Decl(callSignatureAssignabilityInInheritance3.ts, 16, 42)) >bar : Symbol(bar, Decl(callSignatureAssignabilityInInheritance3.ts, 16, 55)) ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 18)) a12: (x: Array, y: Array) => Array; >a12 : Symbol(A.a12, Decl(callSignatureAssignabilityInInheritance3.ts, 16, 79)) >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance3.ts, 17, 18)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 18)) >y : Symbol(y, Decl(callSignatureAssignabilityInInheritance3.ts, 17, 33)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Derived2 : Symbol(Derived2, Decl(callSignatureAssignabilityInInheritance3.ts, 5, 47)) @@ -143,7 +143,7 @@ module Errors { (a: T): T; >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance3.ts, 37, 21)) ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 18)) >a : Symbol(a, Decl(callSignatureAssignabilityInInheritance3.ts, 37, 37)) >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance3.ts, 37, 21)) >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance3.ts, 37, 21)) @@ -161,7 +161,7 @@ module Errors { (a: T): T; >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance3.ts, 41, 21)) ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 18)) >a : Symbol(a, Decl(callSignatureAssignabilityInInheritance3.ts, 41, 37)) >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance3.ts, 41, 21)) >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance3.ts, 41, 21)) @@ -172,7 +172,7 @@ module Errors { interface I extends A { >I : Symbol(I, Decl(callSignatureAssignabilityInInheritance3.ts, 44, 9)) ->A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 50)) a2: (x: T) => U[]; // error, contextual signature instantiation doesn't relate return types so U is {}, not a subtype of string[] >a2 : Symbol(I.a2, Decl(callSignatureAssignabilityInInheritance3.ts, 46, 31)) @@ -187,7 +187,7 @@ module Errors { >I2 : Symbol(I2, Decl(callSignatureAssignabilityInInheritance3.ts, 48, 9)) >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance3.ts, 50, 21)) >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance3.ts, 50, 23)) ->A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 50)) a2: (x: T) => U[]; // error, no contextual signature instantiation since I2.a2 is not generic >a2 : Symbol(I2.a2, Decl(callSignatureAssignabilityInInheritance3.ts, 50, 38)) @@ -198,13 +198,13 @@ module Errors { interface I3 extends A { >I3 : Symbol(I3, Decl(callSignatureAssignabilityInInheritance3.ts, 52, 9)) ->A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 50)) // valid, no inferences for V so it defaults to Derived2 a7: (x: (arg: T) => U) => (r: T) => V; >a7 : Symbol(I3.a7, Decl(callSignatureAssignabilityInInheritance3.ts, 54, 32)) >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance3.ts, 56, 17)) ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 18)) >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance3.ts, 56, 32)) >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance3.ts, 4, 31)) >V : Symbol(V, Decl(callSignatureAssignabilityInInheritance3.ts, 56, 51)) @@ -220,12 +220,12 @@ module Errors { interface I4 extends A { >I4 : Symbol(I4, Decl(callSignatureAssignabilityInInheritance3.ts, 57, 9)) ->A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 50)) a8: (x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; // error, type mismatch >a8 : Symbol(I4.a8, Decl(callSignatureAssignabilityInInheritance3.ts, 59, 32)) >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance3.ts, 60, 17)) ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 18)) >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance3.ts, 60, 32)) >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance3.ts, 4, 31)) >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance3.ts, 60, 52)) @@ -243,7 +243,7 @@ module Errors { interface I4B extends A { >I4B : Symbol(I4B, Decl(callSignatureAssignabilityInInheritance3.ts, 61, 9)) ->A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 50)) a10: (...x: T[]) => T; // valid, parameter covariance works even after contextual signature instantiation >a10 : Symbol(I4B.a10, Decl(callSignatureAssignabilityInInheritance3.ts, 63, 33)) @@ -256,7 +256,7 @@ module Errors { interface I4C extends A { >I4C : Symbol(I4C, Decl(callSignatureAssignabilityInInheritance3.ts, 65, 9)) ->A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 50)) a11: (x: T, y: T) => T; // valid, even though x is a Base, parameter covariance works even after contextual signature instantiation >a11 : Symbol(I4C.a11, Decl(callSignatureAssignabilityInInheritance3.ts, 67, 33)) @@ -271,7 +271,7 @@ module Errors { interface I4E extends A { >I4E : Symbol(I4E, Decl(callSignatureAssignabilityInInheritance3.ts, 69, 9)) ->A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 50)) a12: >(x: Array, y: Array) => T; // valid, no inferences for T, defaults to Array >a12 : Symbol(I4E.a12, Decl(callSignatureAssignabilityInInheritance3.ts, 71, 33)) @@ -280,16 +280,16 @@ module Errors { >Derived2 : Symbol(Derived2, Decl(callSignatureAssignabilityInInheritance3.ts, 5, 47)) >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance3.ts, 72, 45)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 18)) >y : Symbol(y, Decl(callSignatureAssignabilityInInheritance3.ts, 72, 60)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 18)) >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance3.ts, 72, 18)) } interface I6 extends A { >I6 : Symbol(I6, Decl(callSignatureAssignabilityInInheritance3.ts, 73, 9)) ->A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 50)) a15: (x: { a: T; b: T }) => T; // error, T is {} which isn't an acceptable return type >a15 : Symbol(I6.a15, Decl(callSignatureAssignabilityInInheritance3.ts, 75, 32)) @@ -304,12 +304,12 @@ module Errors { interface I7 extends A { >I7 : Symbol(I7, Decl(callSignatureAssignabilityInInheritance3.ts, 77, 9)) ->A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 50)) a15: (x: { a: T; b: T }) => number; // error, T defaults to Base, which is not compatible with number or string >a15 : Symbol(I7.a15, Decl(callSignatureAssignabilityInInheritance3.ts, 79, 32)) >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance3.ts, 80, 18)) ->Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance3.ts, 3, 18)) >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance3.ts, 80, 34)) >a : Symbol(a, Decl(callSignatureAssignabilityInInheritance3.ts, 80, 38)) >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance3.ts, 80, 18)) @@ -319,7 +319,7 @@ module Errors { interface I8 extends A { >I8 : Symbol(I8, Decl(callSignatureAssignabilityInInheritance3.ts, 81, 9)) ->A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 50)) // ok, we relate each signature of a16 to b16, and within that, we make inferences from two different signatures in the respective A.a16 signature a16: (x: (a: T) => T) => T[]; @@ -334,7 +334,7 @@ module Errors { interface I9 extends A { >I9 : Symbol(I9, Decl(callSignatureAssignabilityInInheritance3.ts, 86, 9)) ->A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(callSignatureAssignabilityInInheritance3.ts, 9, 50)) a17: (x: (a: T) => T) => any[]; // valid, target is more constrained than source, so it is safe in the traditional constraint-contravariant fashion >a17 : Symbol(I9.a17, Decl(callSignatureAssignabilityInInheritance3.ts, 88, 32)) @@ -346,12 +346,12 @@ module Errors { } } - module WithGenericSignaturesInBaseType { + namespace WithGenericSignaturesInBaseType { >WithGenericSignaturesInBaseType : Symbol(WithGenericSignaturesInBaseType, Decl(callSignatureAssignabilityInInheritance3.ts, 91, 5)) // base type has generic call signature interface B { ->B : Symbol(B, Decl(callSignatureAssignabilityInInheritance3.ts, 93, 44)) +>B : Symbol(B, Decl(callSignatureAssignabilityInInheritance3.ts, 93, 47)) a2: (x: T) => T[]; >a2 : Symbol(B.a2, Decl(callSignatureAssignabilityInInheritance3.ts, 95, 21)) @@ -363,7 +363,7 @@ module Errors { interface I6 extends B { >I6 : Symbol(I6, Decl(callSignatureAssignabilityInInheritance3.ts, 97, 9)) ->B : Symbol(B, Decl(callSignatureAssignabilityInInheritance3.ts, 93, 44)) +>B : Symbol(B, Decl(callSignatureAssignabilityInInheritance3.ts, 93, 47)) a2: (x: T) => string[]; // error >a2 : Symbol(I6.a2, Decl(callSignatureAssignabilityInInheritance3.ts, 99, 32)) diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.types b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.types index d9e5f51e0da9d..70d90ea1425cb 100644 --- a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.types +++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.types @@ -4,7 +4,7 @@ // checking subtype relations for function types as it relates to contextual signature instantiation // error cases -module Errors { +namespace Errors { >Errors : typeof Errors > : ^^^^^^^^^^^^^ @@ -38,7 +38,7 @@ module Errors { >bing : string > : ^^^^^^ - module WithNonGenericSignaturesInBaseType { + namespace WithNonGenericSignaturesInBaseType { // base type with non-generic call signatures interface A { a2: (x: number) => string[]; @@ -308,7 +308,7 @@ module Errors { } } - module WithGenericSignaturesInBaseType { + namespace WithGenericSignaturesInBaseType { // base type has generic call signature interface B { a2: (x: T) => T[]; diff --git a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js index fb1eba4569b12..07f6382f2a82a 100644 --- a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js +++ b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js @@ -74,7 +74,7 @@ function foo10(x: number) { } var r10 = foo10(1); -module M { +namespace M { export var x = 1; export class C { foo: string } } @@ -97,7 +97,7 @@ function foo12() { var r12 = foo12(); function m1() { return 1; } -module m1 { export var y = 2; } +namespace m1 { export var y = 2; } function foo13() { return m1; } @@ -107,7 +107,7 @@ class c1 { foo: string; constructor(x) { } } -module c1 { +namespace c1 { export var x = 1; } function foo14() { @@ -116,7 +116,7 @@ function foo14() { var r14 = foo14(); enum e1 { A } -module e1 { export var y = 1; } +namespace e1 { export var y = 1; } function foo15() { return e1; } diff --git a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.symbols b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.symbols index 5ffc189de5f12..65bc3611f6b47 100644 --- a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.symbols +++ b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.symbols @@ -148,7 +148,7 @@ var r10 = foo10(1); >r10 : Symbol(r10, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 71, 3)) >foo10 : Symbol(foo10, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 66, 1)) -module M { +namespace M { >M : Symbol(M, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 71, 19)) export var x = 1; @@ -198,19 +198,19 @@ var r12 = foo12(); function m1() { return 1; } >m1 : Symbol(m1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 93, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 95, 27)) -module m1 { export var y = 2; } +namespace m1 { export var y = 2; } >m1 : Symbol(m1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 93, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 95, 27)) ->y : Symbol(y, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 96, 22)) +>y : Symbol(y, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 96, 25)) function foo13() { ->foo13 : Symbol(foo13, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 96, 31)) +>foo13 : Symbol(foo13, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 96, 34)) return m1; >m1 : Symbol(m1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 93, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 95, 27)) } var r13 = foo13(); >r13 : Symbol(r13, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 100, 3)) ->foo13 : Symbol(foo13, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 96, 31)) +>foo13 : Symbol(foo13, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 96, 34)) class c1 { >c1 : Symbol(c1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 100, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 105, 1)) @@ -221,7 +221,7 @@ class c1 { constructor(x) { } >x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 104, 16)) } -module c1 { +namespace c1 { >c1 : Symbol(c1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 100, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 105, 1)) export var x = 1; @@ -241,17 +241,17 @@ enum e1 { A } >e1 : Symbol(e1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 112, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 114, 13)) >A : Symbol(e1.A, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 114, 9)) -module e1 { export var y = 1; } +namespace e1 { export var y = 1; } >e1 : Symbol(e1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 112, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 114, 13)) ->y : Symbol(y, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 115, 22)) +>y : Symbol(y, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 115, 25)) function foo15() { ->foo15 : Symbol(foo15, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 115, 31)) +>foo15 : Symbol(foo15, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 115, 34)) return e1; >e1 : Symbol(e1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 112, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 114, 13)) } var r15 = foo15(); >r15 : Symbol(r15, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 119, 3)) ->foo15 : Symbol(foo15, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 115, 31)) +>foo15 : Symbol(foo15, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 115, 34)) diff --git a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types index 724f995738871..5c81cf536b3b4 100644 --- a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types +++ b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types @@ -248,7 +248,7 @@ var r10 = foo10(1); >1 : 1 > : ^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -317,7 +317,7 @@ function m1() { return 1; } >1 : 1 > : ^ -module m1 { export var y = 2; } +namespace m1 { export var y = 2; } >m1 : typeof m1 > : ^^^^^^^^^ >y : number @@ -352,7 +352,7 @@ class c1 { constructor(x) { } >x : any } -module c1 { +namespace c1 { >c1 : typeof c1 > : ^^^^^^^^^ @@ -384,7 +384,7 @@ enum e1 { A } >A : e1.A > : ^^^^ -module e1 { export var y = 1; } +namespace e1 { export var y = 1; } >e1 : typeof e1 > : ^^^^^^^^^ >y : number diff --git a/tests/baselines/reference/cannotInvokeNewOnErrorExpression.errors.txt b/tests/baselines/reference/cannotInvokeNewOnErrorExpression.errors.txt index 11b3093de6a53..c31195f2ad4d1 100644 --- a/tests/baselines/reference/cannotInvokeNewOnErrorExpression.errors.txt +++ b/tests/baselines/reference/cannotInvokeNewOnErrorExpression.errors.txt @@ -3,7 +3,7 @@ cannotInvokeNewOnErrorExpression.ts(5,22): error TS1011: An element access expre ==== cannotInvokeNewOnErrorExpression.ts (2 errors) ==== - module M + namespace M { class ClassA {} } diff --git a/tests/baselines/reference/cannotInvokeNewOnErrorExpression.js b/tests/baselines/reference/cannotInvokeNewOnErrorExpression.js index 548c413fa674c..4b5346fbfad02 100644 --- a/tests/baselines/reference/cannotInvokeNewOnErrorExpression.js +++ b/tests/baselines/reference/cannotInvokeNewOnErrorExpression.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/cannotInvokeNewOnErrorExpression.ts] //// //// [cannotInvokeNewOnErrorExpression.ts] -module M +namespace M { class ClassA {} } diff --git a/tests/baselines/reference/cannotInvokeNewOnErrorExpression.symbols b/tests/baselines/reference/cannotInvokeNewOnErrorExpression.symbols index 995b68c4cda61..ece816d502e3f 100644 --- a/tests/baselines/reference/cannotInvokeNewOnErrorExpression.symbols +++ b/tests/baselines/reference/cannotInvokeNewOnErrorExpression.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/cannotInvokeNewOnErrorExpression.ts] //// === cannotInvokeNewOnErrorExpression.ts === -module M +namespace M >M : Symbol(M, Decl(cannotInvokeNewOnErrorExpression.ts, 0, 0)) { class ClassA {} diff --git a/tests/baselines/reference/cannotInvokeNewOnErrorExpression.types b/tests/baselines/reference/cannotInvokeNewOnErrorExpression.types index 1cfc2883866f0..3609269d95ff6 100644 --- a/tests/baselines/reference/cannotInvokeNewOnErrorExpression.types +++ b/tests/baselines/reference/cannotInvokeNewOnErrorExpression.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/cannotInvokeNewOnErrorExpression.ts] //// === cannotInvokeNewOnErrorExpression.ts === -module M +namespace M >M : typeof M > : ^^^^^^^^ { diff --git a/tests/baselines/reference/chainedImportAlias.js b/tests/baselines/reference/chainedImportAlias.js index 08b116b9fb0b0..2183285e8d8e3 100644 --- a/tests/baselines/reference/chainedImportAlias.js +++ b/tests/baselines/reference/chainedImportAlias.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/chainedImportAlias.ts] //// //// [chainedImportAlias_file0.ts] -export module m { +export namespace m { export function foo() { } } diff --git a/tests/baselines/reference/chainedImportAlias.symbols b/tests/baselines/reference/chainedImportAlias.symbols index e0fb8fe612fa8..665a15129b5bb 100644 --- a/tests/baselines/reference/chainedImportAlias.symbols +++ b/tests/baselines/reference/chainedImportAlias.symbols @@ -9,17 +9,17 @@ import y = x; >x : Symbol(x, Decl(chainedImportAlias_file1.ts, 0, 0)) y.m.foo(); ->y.m.foo : Symbol(x.m.foo, Decl(chainedImportAlias_file0.ts, 0, 17)) +>y.m.foo : Symbol(x.m.foo, Decl(chainedImportAlias_file0.ts, 0, 20)) >y.m : Symbol(x.m, Decl(chainedImportAlias_file0.ts, 0, 0)) >y : Symbol(y, Decl(chainedImportAlias_file1.ts, 0, 49)) >m : Symbol(x.m, Decl(chainedImportAlias_file0.ts, 0, 0)) ->foo : Symbol(x.m.foo, Decl(chainedImportAlias_file0.ts, 0, 17)) +>foo : Symbol(x.m.foo, Decl(chainedImportAlias_file0.ts, 0, 20)) === chainedImportAlias_file0.ts === -export module m { +export namespace m { >m : Symbol(m, Decl(chainedImportAlias_file0.ts, 0, 0)) export function foo() { } ->foo : Symbol(foo, Decl(chainedImportAlias_file0.ts, 0, 17)) +>foo : Symbol(foo, Decl(chainedImportAlias_file0.ts, 0, 20)) } diff --git a/tests/baselines/reference/chainedImportAlias.types b/tests/baselines/reference/chainedImportAlias.types index ccaf65f1e6793..8c652dd6c6f71 100644 --- a/tests/baselines/reference/chainedImportAlias.types +++ b/tests/baselines/reference/chainedImportAlias.types @@ -26,7 +26,7 @@ y.m.foo(); > : ^^^^^^^^^^ === chainedImportAlias_file0.ts === -export module m { +export namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/checkForObjectTooStrict.errors.txt b/tests/baselines/reference/checkForObjectTooStrict.errors.txt index a4ab6e628c111..f917241422777 100644 --- a/tests/baselines/reference/checkForObjectTooStrict.errors.txt +++ b/tests/baselines/reference/checkForObjectTooStrict.errors.txt @@ -2,7 +2,7 @@ checkForObjectTooStrict.ts(3,18): error TS2725: Class name cannot be 'Object' wh ==== checkForObjectTooStrict.ts (1 errors) ==== - module Foo { + namespace Foo { export class Object { ~~~~~~ diff --git a/tests/baselines/reference/checkForObjectTooStrict.js b/tests/baselines/reference/checkForObjectTooStrict.js index b25da57defacb..bf3ec1631135b 100644 --- a/tests/baselines/reference/checkForObjectTooStrict.js +++ b/tests/baselines/reference/checkForObjectTooStrict.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/checkForObjectTooStrict.ts] //// //// [checkForObjectTooStrict.ts] -module Foo { +namespace Foo { export class Object { diff --git a/tests/baselines/reference/checkForObjectTooStrict.symbols b/tests/baselines/reference/checkForObjectTooStrict.symbols index 78bd373afe7ac..48b0050ef991d 100644 --- a/tests/baselines/reference/checkForObjectTooStrict.symbols +++ b/tests/baselines/reference/checkForObjectTooStrict.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/checkForObjectTooStrict.ts] //// === checkForObjectTooStrict.ts === -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(checkForObjectTooStrict.ts, 0, 0)) export class Object { ->Object : Symbol(Object, Decl(checkForObjectTooStrict.ts, 0, 12)) +>Object : Symbol(Object, Decl(checkForObjectTooStrict.ts, 0, 15)) } @@ -15,14 +15,14 @@ module Foo { class Bar extends Foo.Object { // should work >Bar : Symbol(Bar, Decl(checkForObjectTooStrict.ts, 6, 1)) ->Foo.Object : Symbol(Foo.Object, Decl(checkForObjectTooStrict.ts, 0, 12)) +>Foo.Object : Symbol(Foo.Object, Decl(checkForObjectTooStrict.ts, 0, 15)) >Foo : Symbol(Foo, Decl(checkForObjectTooStrict.ts, 0, 0)) ->Object : Symbol(Foo.Object, Decl(checkForObjectTooStrict.ts, 0, 12)) +>Object : Symbol(Foo.Object, Decl(checkForObjectTooStrict.ts, 0, 15)) constructor () { super(); ->super : Symbol(Foo.Object, Decl(checkForObjectTooStrict.ts, 0, 12)) +>super : Symbol(Foo.Object, Decl(checkForObjectTooStrict.ts, 0, 15)) } diff --git a/tests/baselines/reference/checkForObjectTooStrict.types b/tests/baselines/reference/checkForObjectTooStrict.types index d095c1f76326c..e1d103697bb39 100644 --- a/tests/baselines/reference/checkForObjectTooStrict.types +++ b/tests/baselines/reference/checkForObjectTooStrict.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/checkForObjectTooStrict.ts] //// === checkForObjectTooStrict.ts === -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/checkJsxChildrenProperty10.errors.txt b/tests/baselines/reference/checkJsxChildrenProperty10.errors.txt new file mode 100644 index 0000000000000..0c6e7383af5fc --- /dev/null +++ b/tests/baselines/reference/checkJsxChildrenProperty10.errors.txt @@ -0,0 +1,28 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== file.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + interface ElementAttributesProperty { props: {} } + interface IntrinsicElements { + div: any; + h2: any; + h1: any; + } + } + + class Button { + props: {} + render() { + return (
My Button
) + } + } + + // OK + let k1 =

Hello

world

; + let k2 =

Hello

{(user: any) =>

{user.name}

}
; + let k3 =
{1} {"That is a number"}
; + let k4 = ; \ No newline at end of file diff --git a/tests/baselines/reference/checkJsxChildrenProperty10.types b/tests/baselines/reference/checkJsxChildrenProperty10.types index 71724417c4c92..7496782de13b3 100644 --- a/tests/baselines/reference/checkJsxChildrenProperty10.types +++ b/tests/baselines/reference/checkJsxChildrenProperty10.types @@ -10,12 +10,15 @@ declare module JSX { interface IntrinsicElements { div: any; >div : any +> : ^^^ h2: any; >h2 : any +> : ^^^ h1: any; >h1 : any +> : ^^^ } } @@ -82,11 +85,13 @@ let k2 =

Hello

{(user: any) =>

{user.name}

}
; >(user: any) =>

{user.name}

: (user: any) => JSX.Element > : ^ ^^ ^^^^^^^^^^^^^^^^ >user : any +> : ^^^ >

{user.name}

: JSX.Element > : ^^^^^^^^^^^ >h2 : any > : ^^^ >user.name : any +> : ^^^ >user : any > : ^^^ >name : any diff --git a/tests/baselines/reference/checkJsxChildrenProperty11.errors.txt b/tests/baselines/reference/checkJsxChildrenProperty11.errors.txt new file mode 100644 index 0000000000000..0c6e7383af5fc --- /dev/null +++ b/tests/baselines/reference/checkJsxChildrenProperty11.errors.txt @@ -0,0 +1,28 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== file.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + interface ElementAttributesProperty { props: {} } + interface IntrinsicElements { + div: any; + h2: any; + h1: any; + } + } + + class Button { + props: {} + render() { + return (
My Button
) + } + } + + // OK + let k1 =

Hello

world

; + let k2 =

Hello

{(user: any) =>

{user.name}

}
; + let k3 =
{1} {"That is a number"}
; + let k4 = ; \ No newline at end of file diff --git a/tests/baselines/reference/checkJsxChildrenProperty11.types b/tests/baselines/reference/checkJsxChildrenProperty11.types index 3bb0b09acc47e..3bc4d6c4b39b2 100644 --- a/tests/baselines/reference/checkJsxChildrenProperty11.types +++ b/tests/baselines/reference/checkJsxChildrenProperty11.types @@ -10,12 +10,15 @@ declare module JSX { interface IntrinsicElements { div: any; >div : any +> : ^^^ h2: any; >h2 : any +> : ^^^ h1: any; >h1 : any +> : ^^^ } } @@ -82,11 +85,13 @@ let k2 =

Hello

{(user: any) =>

{user.name}

}
; >(user: any) =>

{user.name}

: (user: any) => JSX.Element > : ^ ^^ ^^^^^^^^^^^^^^^^ >user : any +> : ^^^ >

{user.name}

: JSX.Element > : ^^^^^^^^^^^ >h2 : any > : ^^^ >user.name : any +> : ^^^ >user : any > : ^^^ >name : any diff --git a/tests/baselines/reference/circularImportAlias.errors.txt b/tests/baselines/reference/circularImportAlias.errors.txt index 3b3fa010f7e1c..efd6164599aaa 100644 --- a/tests/baselines/reference/circularImportAlias.errors.txt +++ b/tests/baselines/reference/circularImportAlias.errors.txt @@ -4,7 +4,7 @@ circularImportAlias.ts(5,30): error TS2449: Class 'C' used before its declaratio ==== circularImportAlias.ts (1 errors) ==== // expected no error - module B { + namespace B { export import a = A; export class D extends a.C { ~ @@ -14,7 +14,7 @@ circularImportAlias.ts(5,30): error TS2449: Class 'C' used before its declaratio } } - module A { + namespace A { export class C { name: string } export import b = B; } diff --git a/tests/baselines/reference/circularImportAlias.js b/tests/baselines/reference/circularImportAlias.js index fd4cae9193163..b25bdf9d1a19e 100644 --- a/tests/baselines/reference/circularImportAlias.js +++ b/tests/baselines/reference/circularImportAlias.js @@ -3,14 +3,14 @@ //// [circularImportAlias.ts] // expected no error -module B { +namespace B { export import a = A; export class D extends a.C { id: number; } } -module A { +namespace A { export class C { name: string } export import b = B; } diff --git a/tests/baselines/reference/circularImportAlias.symbols b/tests/baselines/reference/circularImportAlias.symbols index dc256d139011c..89c3643c13e1a 100644 --- a/tests/baselines/reference/circularImportAlias.symbols +++ b/tests/baselines/reference/circularImportAlias.symbols @@ -3,29 +3,29 @@ === circularImportAlias.ts === // expected no error -module B { +namespace B { >B : Symbol(a.b, Decl(circularImportAlias.ts, 0, 0)) export import a = A; ->a : Symbol(a, Decl(circularImportAlias.ts, 2, 10)) +>a : Symbol(a, Decl(circularImportAlias.ts, 2, 13)) >A : Symbol(a, Decl(circularImportAlias.ts, 7, 1)) export class D extends a.C { >D : Symbol(D, Decl(circularImportAlias.ts, 3, 24)) ->a.C : Symbol(a.C, Decl(circularImportAlias.ts, 9, 10)) ->a : Symbol(a, Decl(circularImportAlias.ts, 2, 10)) ->C : Symbol(a.C, Decl(circularImportAlias.ts, 9, 10)) +>a.C : Symbol(a.C, Decl(circularImportAlias.ts, 9, 13)) +>a : Symbol(a, Decl(circularImportAlias.ts, 2, 13)) +>C : Symbol(a.C, Decl(circularImportAlias.ts, 9, 13)) id: number; >id : Symbol(D.id, Decl(circularImportAlias.ts, 4, 32)) } } -module A { +namespace A { >A : Symbol(b.a, Decl(circularImportAlias.ts, 7, 1)) export class C { name: string } ->C : Symbol(C, Decl(circularImportAlias.ts, 9, 10)) +>C : Symbol(C, Decl(circularImportAlias.ts, 9, 13)) >name : Symbol(C.name, Decl(circularImportAlias.ts, 10, 20)) export import b = B; @@ -39,11 +39,11 @@ var c: { name: string }; var c = new B.a.C(); >c : Symbol(c, Decl(circularImportAlias.ts, 14, 3), Decl(circularImportAlias.ts, 15, 3)) ->B.a.C : Symbol(A.C, Decl(circularImportAlias.ts, 9, 10)) ->B.a : Symbol(B.a, Decl(circularImportAlias.ts, 2, 10)) +>B.a.C : Symbol(A.C, Decl(circularImportAlias.ts, 9, 13)) +>B.a : Symbol(B.a, Decl(circularImportAlias.ts, 2, 13)) >B : Symbol(B, Decl(circularImportAlias.ts, 0, 0)) ->a : Symbol(B.a, Decl(circularImportAlias.ts, 2, 10)) ->C : Symbol(A.C, Decl(circularImportAlias.ts, 9, 10)) +>a : Symbol(B.a, Decl(circularImportAlias.ts, 2, 13)) +>C : Symbol(A.C, Decl(circularImportAlias.ts, 9, 13)) diff --git a/tests/baselines/reference/circularImportAlias.types b/tests/baselines/reference/circularImportAlias.types index 81d5962c85856..fe446b22b443d 100644 --- a/tests/baselines/reference/circularImportAlias.types +++ b/tests/baselines/reference/circularImportAlias.types @@ -3,7 +3,7 @@ === circularImportAlias.ts === // expected no error -module B { +namespace B { >B : typeof a.b > : ^^^^^^^^^^ @@ -29,7 +29,7 @@ module B { } } -module A { +namespace A { >A : typeof b.a > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/circularModuleImports.errors.txt b/tests/baselines/reference/circularModuleImports.errors.txt index d7fdcefcfdf47..55124d0dccf26 100644 --- a/tests/baselines/reference/circularModuleImports.errors.txt +++ b/tests/baselines/reference/circularModuleImports.errors.txt @@ -2,7 +2,7 @@ circularModuleImports.ts(5,5): error TS2303: Circular definition of import alias ==== circularModuleImports.ts (1 errors) ==== - module M + namespace M { diff --git a/tests/baselines/reference/circularModuleImports.js b/tests/baselines/reference/circularModuleImports.js index 7457998dafa96..129feb9cbd247 100644 --- a/tests/baselines/reference/circularModuleImports.js +++ b/tests/baselines/reference/circularModuleImports.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/circularModuleImports.ts] //// //// [circularModuleImports.ts] -module M +namespace M { diff --git a/tests/baselines/reference/circularModuleImports.symbols b/tests/baselines/reference/circularModuleImports.symbols index c731f998229a4..7eb4444d06caf 100644 --- a/tests/baselines/reference/circularModuleImports.symbols +++ b/tests/baselines/reference/circularModuleImports.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/circularModuleImports.ts] //// === circularModuleImports.ts === -module M +namespace M >M : Symbol(M, Decl(circularModuleImports.ts, 0, 0)) { diff --git a/tests/baselines/reference/circularModuleImports.types b/tests/baselines/reference/circularModuleImports.types index a304a9e6d77fa..f50795d85d625 100644 --- a/tests/baselines/reference/circularModuleImports.types +++ b/tests/baselines/reference/circularModuleImports.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/circularModuleImports.ts] //// === circularModuleImports.ts === -module M +namespace M { diff --git a/tests/baselines/reference/circularReference.errors.txt b/tests/baselines/reference/circularReference.errors.txt index 19fbe15d07025..47db18323aa25 100644 --- a/tests/baselines/reference/circularReference.errors.txt +++ b/tests/baselines/reference/circularReference.errors.txt @@ -5,7 +5,7 @@ foo2.ts(13,8): error TS2339: Property 'x' does not exist on type 'C1'. ==== foo2.ts (2 errors) ==== import foo1 = require('./foo1'); - export module M1 { + export namespace M1 { export class C1 { m1: foo1.M1.C1; y: number @@ -27,7 +27,7 @@ foo2.ts(13,8): error TS2339: Property 'x' does not exist on type 'C1'. ==== foo1.ts (1 errors) ==== import foo2 = require('./foo2'); - export module M1 { + export namespace M1 { export class C1 { m1: foo2.M1.C1; x: number; diff --git a/tests/baselines/reference/circularReference.js b/tests/baselines/reference/circularReference.js index 3a37040671ee1..e6bbd528583f5 100644 --- a/tests/baselines/reference/circularReference.js +++ b/tests/baselines/reference/circularReference.js @@ -2,7 +2,7 @@ //// [foo1.ts] import foo2 = require('./foo2'); -export module M1 { +export namespace M1 { export class C1 { m1: foo2.M1.C1; x: number; @@ -16,7 +16,7 @@ export module M1 { //// [foo2.ts] import foo1 = require('./foo1'); -export module M1 { +export namespace M1 { export class C1 { m1: foo1.M1.C1; y: number diff --git a/tests/baselines/reference/circularReference.symbols b/tests/baselines/reference/circularReference.symbols index 6903a01125ced..f262ac2fcd6af 100644 --- a/tests/baselines/reference/circularReference.symbols +++ b/tests/baselines/reference/circularReference.symbols @@ -4,17 +4,17 @@ import foo1 = require('./foo1'); >foo1 : Symbol(foo1, Decl(foo2.ts, 0, 0)) -export module M1 { +export namespace M1 { >M1 : Symbol(M1, Decl(foo2.ts, 0, 32)) export class C1 { ->C1 : Symbol(C1, Decl(foo2.ts, 1, 18)) +>C1 : Symbol(C1, Decl(foo2.ts, 1, 21)) m1: foo1.M1.C1; >m1 : Symbol(C1.m1, Decl(foo2.ts, 2, 18)) >foo1 : Symbol(foo1, Decl(foo2.ts, 0, 0)) >M1 : Symbol(foo1.M1, Decl(foo1.ts, 0, 32)) ->C1 : Symbol(foo1.M1.C1, Decl(foo1.ts, 1, 18)) +>C1 : Symbol(foo1.M1.C1, Decl(foo1.ts, 1, 21)) y: number >y : Symbol(C1.y, Decl(foo2.ts, 3, 17)) @@ -22,31 +22,31 @@ export module M1 { constructor(){ this.m1 = new foo1.M1.C1(); >this.m1 : Symbol(C1.m1, Decl(foo2.ts, 2, 18)) ->this : Symbol(C1, Decl(foo2.ts, 1, 18)) +>this : Symbol(C1, Decl(foo2.ts, 1, 21)) >m1 : Symbol(C1.m1, Decl(foo2.ts, 2, 18)) ->foo1.M1.C1 : Symbol(foo1.M1.C1, Decl(foo1.ts, 1, 18)) +>foo1.M1.C1 : Symbol(foo1.M1.C1, Decl(foo1.ts, 1, 21)) >foo1.M1 : Symbol(foo1.M1, Decl(foo1.ts, 0, 32)) >foo1 : Symbol(foo1, Decl(foo2.ts, 0, 0)) >M1 : Symbol(foo1.M1, Decl(foo1.ts, 0, 32)) ->C1 : Symbol(foo1.M1.C1, Decl(foo1.ts, 1, 18)) +>C1 : Symbol(foo1.M1.C1, Decl(foo1.ts, 1, 21)) this.m1.y = 10; // Error >this.m1 : Symbol(C1.m1, Decl(foo2.ts, 2, 18)) ->this : Symbol(C1, Decl(foo2.ts, 1, 18)) +>this : Symbol(C1, Decl(foo2.ts, 1, 21)) >m1 : Symbol(C1.m1, Decl(foo2.ts, 2, 18)) this.m1.x = 20; // OK >this.m1.x : Symbol(foo1.M1.C1.x, Decl(foo1.ts, 3, 17)) >this.m1 : Symbol(C1.m1, Decl(foo2.ts, 2, 18)) ->this : Symbol(C1, Decl(foo2.ts, 1, 18)) +>this : Symbol(C1, Decl(foo2.ts, 1, 21)) >m1 : Symbol(C1.m1, Decl(foo2.ts, 2, 18)) >x : Symbol(foo1.M1.C1.x, Decl(foo1.ts, 3, 17)) var tmp = new M1.C1(); >tmp : Symbol(tmp, Decl(foo2.ts, 10, 6)) ->M1.C1 : Symbol(C1, Decl(foo2.ts, 1, 18)) +>M1.C1 : Symbol(C1, Decl(foo2.ts, 1, 21)) >M1 : Symbol(M1, Decl(foo2.ts, 0, 32)) ->C1 : Symbol(C1, Decl(foo2.ts, 1, 18)) +>C1 : Symbol(C1, Decl(foo2.ts, 1, 21)) tmp.y = 10; // OK >tmp.y : Symbol(C1.y, Decl(foo2.ts, 3, 17)) @@ -63,17 +63,17 @@ export module M1 { import foo2 = require('./foo2'); >foo2 : Symbol(foo2, Decl(foo1.ts, 0, 0)) -export module M1 { +export namespace M1 { >M1 : Symbol(M1, Decl(foo1.ts, 0, 32)) export class C1 { ->C1 : Symbol(C1, Decl(foo1.ts, 1, 18)) +>C1 : Symbol(C1, Decl(foo1.ts, 1, 21)) m1: foo2.M1.C1; >m1 : Symbol(C1.m1, Decl(foo1.ts, 2, 18)) >foo2 : Symbol(foo2, Decl(foo1.ts, 0, 0)) >M1 : Symbol(foo2.M1, Decl(foo2.ts, 0, 32)) ->C1 : Symbol(foo2.M1.C1, Decl(foo2.ts, 1, 18)) +>C1 : Symbol(foo2.M1.C1, Decl(foo2.ts, 1, 21)) x: number; >x : Symbol(C1.x, Decl(foo1.ts, 3, 17)) @@ -81,24 +81,24 @@ export module M1 { constructor(){ this.m1 = new foo2.M1.C1(); >this.m1 : Symbol(C1.m1, Decl(foo1.ts, 2, 18)) ->this : Symbol(C1, Decl(foo1.ts, 1, 18)) +>this : Symbol(C1, Decl(foo1.ts, 1, 21)) >m1 : Symbol(C1.m1, Decl(foo1.ts, 2, 18)) ->foo2.M1.C1 : Symbol(foo2.M1.C1, Decl(foo2.ts, 1, 18)) +>foo2.M1.C1 : Symbol(foo2.M1.C1, Decl(foo2.ts, 1, 21)) >foo2.M1 : Symbol(foo2.M1, Decl(foo2.ts, 0, 32)) >foo2 : Symbol(foo2, Decl(foo1.ts, 0, 0)) >M1 : Symbol(foo2.M1, Decl(foo2.ts, 0, 32)) ->C1 : Symbol(foo2.M1.C1, Decl(foo2.ts, 1, 18)) +>C1 : Symbol(foo2.M1.C1, Decl(foo2.ts, 1, 21)) this.m1.y = 10; // OK >this.m1.y : Symbol(foo2.M1.C1.y, Decl(foo2.ts, 3, 17)) >this.m1 : Symbol(C1.m1, Decl(foo1.ts, 2, 18)) ->this : Symbol(C1, Decl(foo1.ts, 1, 18)) +>this : Symbol(C1, Decl(foo1.ts, 1, 21)) >m1 : Symbol(C1.m1, Decl(foo1.ts, 2, 18)) >y : Symbol(foo2.M1.C1.y, Decl(foo2.ts, 3, 17)) this.m1.x = 20; // Error >this.m1 : Symbol(C1.m1, Decl(foo1.ts, 2, 18)) ->this : Symbol(C1, Decl(foo1.ts, 1, 18)) +>this : Symbol(C1, Decl(foo1.ts, 1, 21)) >m1 : Symbol(C1.m1, Decl(foo1.ts, 2, 18)) } } diff --git a/tests/baselines/reference/circularReference.types b/tests/baselines/reference/circularReference.types index 4b662336201fb..b5122d19b606a 100644 --- a/tests/baselines/reference/circularReference.types +++ b/tests/baselines/reference/circularReference.types @@ -5,7 +5,7 @@ import foo1 = require('./foo1'); >foo1 : typeof foo1 > : ^^^^^^^^^^^ -export module M1 { +export namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ @@ -124,7 +124,7 @@ import foo2 = require('./foo2'); >foo2 : typeof foo2 > : ^^^^^^^^^^^ -export module M1 { +export namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/classAbstractImportInstantiation.errors.txt b/tests/baselines/reference/classAbstractImportInstantiation.errors.txt index accf2fcf80e60..e101d1bd8f36d 100644 --- a/tests/baselines/reference/classAbstractImportInstantiation.errors.txt +++ b/tests/baselines/reference/classAbstractImportInstantiation.errors.txt @@ -3,7 +3,7 @@ classAbstractImportInstantiation.ts(9,1): error TS2511: Cannot create an instanc ==== classAbstractImportInstantiation.ts (2 errors) ==== - module M { + namespace M { export abstract class A {} new A; diff --git a/tests/baselines/reference/classAbstractImportInstantiation.js b/tests/baselines/reference/classAbstractImportInstantiation.js index 7992b3da3faed..f0bf58089693b 100644 --- a/tests/baselines/reference/classAbstractImportInstantiation.js +++ b/tests/baselines/reference/classAbstractImportInstantiation.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractImportInstantiation.ts] //// //// [classAbstractImportInstantiation.ts] -module M { +namespace M { export abstract class A {} new A; diff --git a/tests/baselines/reference/classAbstractImportInstantiation.symbols b/tests/baselines/reference/classAbstractImportInstantiation.symbols index 4586b2c7250ff..cebe70ca86378 100644 --- a/tests/baselines/reference/classAbstractImportInstantiation.symbols +++ b/tests/baselines/reference/classAbstractImportInstantiation.symbols @@ -1,20 +1,20 @@ //// [tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractImportInstantiation.ts] //// === classAbstractImportInstantiation.ts === -module M { +namespace M { >M : Symbol(M, Decl(classAbstractImportInstantiation.ts, 0, 0)) export abstract class A {} ->A : Symbol(A, Decl(classAbstractImportInstantiation.ts, 0, 10)) +>A : Symbol(A, Decl(classAbstractImportInstantiation.ts, 0, 13)) new A; ->A : Symbol(A, Decl(classAbstractImportInstantiation.ts, 0, 10)) +>A : Symbol(A, Decl(classAbstractImportInstantiation.ts, 0, 13)) } import myA = M.A; >myA : Symbol(myA, Decl(classAbstractImportInstantiation.ts, 4, 1)) >M : Symbol(M, Decl(classAbstractImportInstantiation.ts, 0, 0)) ->A : Symbol(myA, Decl(classAbstractImportInstantiation.ts, 0, 10)) +>A : Symbol(myA, Decl(classAbstractImportInstantiation.ts, 0, 13)) new myA; >myA : Symbol(myA, Decl(classAbstractImportInstantiation.ts, 4, 1)) diff --git a/tests/baselines/reference/classAbstractImportInstantiation.types b/tests/baselines/reference/classAbstractImportInstantiation.types index 5ad61bab11343..52b3a09baaa49 100644 --- a/tests/baselines/reference/classAbstractImportInstantiation.types +++ b/tests/baselines/reference/classAbstractImportInstantiation.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractImportInstantiation.ts] //// === classAbstractImportInstantiation.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/classAbstractInAModule.errors.txt b/tests/baselines/reference/classAbstractInAModule.errors.txt index e1967995f6634..8d64481273e75 100644 --- a/tests/baselines/reference/classAbstractInAModule.errors.txt +++ b/tests/baselines/reference/classAbstractInAModule.errors.txt @@ -2,7 +2,7 @@ classAbstractInAModule.ts(6,1): error TS2511: Cannot create an instance of an ab ==== classAbstractInAModule.ts (1 errors) ==== - module M { + namespace M { export abstract class A {} export class B extends A {} } diff --git a/tests/baselines/reference/classAbstractInAModule.js b/tests/baselines/reference/classAbstractInAModule.js index d92e43d770eda..02951e0c03310 100644 --- a/tests/baselines/reference/classAbstractInAModule.js +++ b/tests/baselines/reference/classAbstractInAModule.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInAModule.ts] //// //// [classAbstractInAModule.ts] -module M { +namespace M { export abstract class A {} export class B extends A {} } diff --git a/tests/baselines/reference/classAbstractInAModule.symbols b/tests/baselines/reference/classAbstractInAModule.symbols index 8f205654f95a8..99d2ca37eb339 100644 --- a/tests/baselines/reference/classAbstractInAModule.symbols +++ b/tests/baselines/reference/classAbstractInAModule.symbols @@ -1,21 +1,21 @@ //// [tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInAModule.ts] //// === classAbstractInAModule.ts === -module M { +namespace M { >M : Symbol(M, Decl(classAbstractInAModule.ts, 0, 0)) export abstract class A {} ->A : Symbol(A, Decl(classAbstractInAModule.ts, 0, 10)) +>A : Symbol(A, Decl(classAbstractInAModule.ts, 0, 13)) export class B extends A {} >B : Symbol(B, Decl(classAbstractInAModule.ts, 1, 30)) ->A : Symbol(A, Decl(classAbstractInAModule.ts, 0, 10)) +>A : Symbol(A, Decl(classAbstractInAModule.ts, 0, 13)) } new M.A; ->M.A : Symbol(M.A, Decl(classAbstractInAModule.ts, 0, 10)) +>M.A : Symbol(M.A, Decl(classAbstractInAModule.ts, 0, 13)) >M : Symbol(M, Decl(classAbstractInAModule.ts, 0, 0)) ->A : Symbol(M.A, Decl(classAbstractInAModule.ts, 0, 10)) +>A : Symbol(M.A, Decl(classAbstractInAModule.ts, 0, 13)) new M.B; >M.B : Symbol(M.B, Decl(classAbstractInAModule.ts, 1, 30)) diff --git a/tests/baselines/reference/classAbstractInAModule.types b/tests/baselines/reference/classAbstractInAModule.types index 4878ecc3bb02c..c845ea3e7d5fc 100644 --- a/tests/baselines/reference/classAbstractInAModule.types +++ b/tests/baselines/reference/classAbstractInAModule.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInAModule.ts] //// === classAbstractInAModule.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/classAbstractMergedDeclaration.errors.txt b/tests/baselines/reference/classAbstractMergedDeclaration.errors.txt index aed55c5cd23a2..e71a7d02ab450 100644 --- a/tests/baselines/reference/classAbstractMergedDeclaration.errors.txt +++ b/tests/baselines/reference/classAbstractMergedDeclaration.errors.txt @@ -18,9 +18,9 @@ classAbstractMergedDeclaration.ts(39,1): error TS2511: Cannot create an instance ==== classAbstractMergedDeclaration.ts (16 errors) ==== abstract class CM {} - module CM {} + namespace CM {} - module MC {} + namespace MC {} abstract class MC {} abstract class CI {} diff --git a/tests/baselines/reference/classAbstractMergedDeclaration.js b/tests/baselines/reference/classAbstractMergedDeclaration.js index e00bb0edbc41c..8ea172bcd5f11 100644 --- a/tests/baselines/reference/classAbstractMergedDeclaration.js +++ b/tests/baselines/reference/classAbstractMergedDeclaration.js @@ -2,9 +2,9 @@ //// [classAbstractMergedDeclaration.ts] abstract class CM {} -module CM {} +namespace CM {} -module MC {} +namespace MC {} abstract class MC {} abstract class CI {} diff --git a/tests/baselines/reference/classAbstractMergedDeclaration.symbols b/tests/baselines/reference/classAbstractMergedDeclaration.symbols index 5f094b07dc40a..89858cbe224a4 100644 --- a/tests/baselines/reference/classAbstractMergedDeclaration.symbols +++ b/tests/baselines/reference/classAbstractMergedDeclaration.symbols @@ -4,14 +4,14 @@ abstract class CM {} >CM : Symbol(CM, Decl(classAbstractMergedDeclaration.ts, 0, 0), Decl(classAbstractMergedDeclaration.ts, 0, 20)) -module CM {} +namespace CM {} >CM : Symbol(CM, Decl(classAbstractMergedDeclaration.ts, 0, 0), Decl(classAbstractMergedDeclaration.ts, 0, 20)) -module MC {} ->MC : Symbol(MC, Decl(classAbstractMergedDeclaration.ts, 1, 12), Decl(classAbstractMergedDeclaration.ts, 3, 12)) +namespace MC {} +>MC : Symbol(MC, Decl(classAbstractMergedDeclaration.ts, 1, 15), Decl(classAbstractMergedDeclaration.ts, 3, 15)) abstract class MC {} ->MC : Symbol(MC, Decl(classAbstractMergedDeclaration.ts, 1, 12), Decl(classAbstractMergedDeclaration.ts, 3, 12)) +>MC : Symbol(MC, Decl(classAbstractMergedDeclaration.ts, 1, 15), Decl(classAbstractMergedDeclaration.ts, 3, 15)) abstract class CI {} >CI : Symbol(CI, Decl(classAbstractMergedDeclaration.ts, 4, 20), Decl(classAbstractMergedDeclaration.ts, 6, 20)) @@ -65,7 +65,7 @@ new CM; >CM : Symbol(CM, Decl(classAbstractMergedDeclaration.ts, 0, 0), Decl(classAbstractMergedDeclaration.ts, 0, 20)) new MC; ->MC : Symbol(MC, Decl(classAbstractMergedDeclaration.ts, 1, 12), Decl(classAbstractMergedDeclaration.ts, 3, 12)) +>MC : Symbol(MC, Decl(classAbstractMergedDeclaration.ts, 1, 15), Decl(classAbstractMergedDeclaration.ts, 3, 15)) new CI; >CI : Symbol(CI, Decl(classAbstractMergedDeclaration.ts, 4, 20), Decl(classAbstractMergedDeclaration.ts, 6, 20)) diff --git a/tests/baselines/reference/classAbstractMergedDeclaration.types b/tests/baselines/reference/classAbstractMergedDeclaration.types index ecf451b9e21b7..f19c07b9734b1 100644 --- a/tests/baselines/reference/classAbstractMergedDeclaration.types +++ b/tests/baselines/reference/classAbstractMergedDeclaration.types @@ -5,9 +5,9 @@ abstract class CM {} >CM : CM > : ^^ -module CM {} +namespace CM {} -module MC {} +namespace MC {} abstract class MC {} >MC : MC > : ^^ diff --git a/tests/baselines/reference/classAndInterfaceMerge.d.symbols b/tests/baselines/reference/classAndInterfaceMerge.d.symbols index 7c89850b0a0e8..5228e97091882 100644 --- a/tests/baselines/reference/classAndInterfaceMerge.d.symbols +++ b/tests/baselines/reference/classAndInterfaceMerge.d.symbols @@ -13,28 +13,28 @@ interface C { } interface C { } >C : Symbol(C, Decl(classAndInterfaceMerge.d.ts, 0, 0), Decl(classAndInterfaceMerge.d.ts, 0, 15), Decl(classAndInterfaceMerge.d.ts, 2, 19), Decl(classAndInterfaceMerge.d.ts, 4, 15)) -declare module M { +declare namespace M { >M : Symbol(M, Decl(classAndInterfaceMerge.d.ts, 6, 15), Decl(classAndInterfaceMerge.d.ts, 19, 1)) interface C1 { } ->C1 : Symbol(C1, Decl(classAndInterfaceMerge.d.ts, 8, 18), Decl(classAndInterfaceMerge.d.ts, 10, 20), Decl(classAndInterfaceMerge.d.ts, 12, 16), Decl(classAndInterfaceMerge.d.ts, 14, 20)) +>C1 : Symbol(C1, Decl(classAndInterfaceMerge.d.ts, 8, 21), Decl(classAndInterfaceMerge.d.ts, 10, 20), Decl(classAndInterfaceMerge.d.ts, 12, 16), Decl(classAndInterfaceMerge.d.ts, 14, 20)) class C1 { } ->C1 : Symbol(C1, Decl(classAndInterfaceMerge.d.ts, 8, 18), Decl(classAndInterfaceMerge.d.ts, 10, 20), Decl(classAndInterfaceMerge.d.ts, 12, 16), Decl(classAndInterfaceMerge.d.ts, 14, 20)) +>C1 : Symbol(C1, Decl(classAndInterfaceMerge.d.ts, 8, 21), Decl(classAndInterfaceMerge.d.ts, 10, 20), Decl(classAndInterfaceMerge.d.ts, 12, 16), Decl(classAndInterfaceMerge.d.ts, 14, 20)) interface C1 { } ->C1 : Symbol(C1, Decl(classAndInterfaceMerge.d.ts, 8, 18), Decl(classAndInterfaceMerge.d.ts, 10, 20), Decl(classAndInterfaceMerge.d.ts, 12, 16), Decl(classAndInterfaceMerge.d.ts, 14, 20)) +>C1 : Symbol(C1, Decl(classAndInterfaceMerge.d.ts, 8, 21), Decl(classAndInterfaceMerge.d.ts, 10, 20), Decl(classAndInterfaceMerge.d.ts, 12, 16), Decl(classAndInterfaceMerge.d.ts, 14, 20)) interface C1 { } ->C1 : Symbol(C1, Decl(classAndInterfaceMerge.d.ts, 8, 18), Decl(classAndInterfaceMerge.d.ts, 10, 20), Decl(classAndInterfaceMerge.d.ts, 12, 16), Decl(classAndInterfaceMerge.d.ts, 14, 20)) +>C1 : Symbol(C1, Decl(classAndInterfaceMerge.d.ts, 8, 21), Decl(classAndInterfaceMerge.d.ts, 10, 20), Decl(classAndInterfaceMerge.d.ts, 12, 16), Decl(classAndInterfaceMerge.d.ts, 14, 20)) export class C2 { } ->C2 : Symbol(C2, Decl(classAndInterfaceMerge.d.ts, 16, 20), Decl(classAndInterfaceMerge.d.ts, 21, 18)) +>C2 : Symbol(C2, Decl(classAndInterfaceMerge.d.ts, 16, 20), Decl(classAndInterfaceMerge.d.ts, 21, 21)) } -declare module M { +declare namespace M { >M : Symbol(M, Decl(classAndInterfaceMerge.d.ts, 6, 15), Decl(classAndInterfaceMerge.d.ts, 19, 1)) export interface C2 { } ->C2 : Symbol(C2, Decl(classAndInterfaceMerge.d.ts, 16, 20), Decl(classAndInterfaceMerge.d.ts, 21, 18)) +>C2 : Symbol(C2, Decl(classAndInterfaceMerge.d.ts, 16, 20), Decl(classAndInterfaceMerge.d.ts, 21, 21)) } diff --git a/tests/baselines/reference/classAndInterfaceMerge.d.types b/tests/baselines/reference/classAndInterfaceMerge.d.types index f675fdfcd0e4f..1865b70a02eab 100644 --- a/tests/baselines/reference/classAndInterfaceMerge.d.types +++ b/tests/baselines/reference/classAndInterfaceMerge.d.types @@ -11,7 +11,7 @@ interface C { } interface C { } -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ @@ -30,6 +30,6 @@ declare module M { > : ^^ } -declare module M { +declare namespace M { export interface C2 { } } diff --git a/tests/baselines/reference/classAndInterfaceWithSameName.js b/tests/baselines/reference/classAndInterfaceWithSameName.js index 53807b751ab2a..5dc95ea041b48 100644 --- a/tests/baselines/reference/classAndInterfaceWithSameName.js +++ b/tests/baselines/reference/classAndInterfaceWithSameName.js @@ -4,7 +4,7 @@ class C { foo: string; } interface C { foo: string; } -module M { +namespace M { class D { bar: string; } diff --git a/tests/baselines/reference/classAndInterfaceWithSameName.symbols b/tests/baselines/reference/classAndInterfaceWithSameName.symbols index 4720f8198085e..a86a9244d218e 100644 --- a/tests/baselines/reference/classAndInterfaceWithSameName.symbols +++ b/tests/baselines/reference/classAndInterfaceWithSameName.symbols @@ -9,18 +9,18 @@ interface C { foo: string; } >C : Symbol(C, Decl(classAndInterfaceWithSameName.ts, 0, 0), Decl(classAndInterfaceWithSameName.ts, 0, 24)) >foo : Symbol(C.foo, Decl(classAndInterfaceWithSameName.ts, 0, 9), Decl(classAndInterfaceWithSameName.ts, 1, 13)) -module M { +namespace M { >M : Symbol(M, Decl(classAndInterfaceWithSameName.ts, 1, 28)) class D { ->D : Symbol(D, Decl(classAndInterfaceWithSameName.ts, 3, 10), Decl(classAndInterfaceWithSameName.ts, 6, 5)) +>D : Symbol(D, Decl(classAndInterfaceWithSameName.ts, 3, 13), Decl(classAndInterfaceWithSameName.ts, 6, 5)) bar: string; >bar : Symbol(D.bar, Decl(classAndInterfaceWithSameName.ts, 4, 13), Decl(classAndInterfaceWithSameName.ts, 8, 17)) } interface D { ->D : Symbol(D, Decl(classAndInterfaceWithSameName.ts, 3, 10), Decl(classAndInterfaceWithSameName.ts, 6, 5)) +>D : Symbol(D, Decl(classAndInterfaceWithSameName.ts, 3, 13), Decl(classAndInterfaceWithSameName.ts, 6, 5)) bar: string; >bar : Symbol(D.bar, Decl(classAndInterfaceWithSameName.ts, 4, 13), Decl(classAndInterfaceWithSameName.ts, 8, 17)) diff --git a/tests/baselines/reference/classAndInterfaceWithSameName.types b/tests/baselines/reference/classAndInterfaceWithSameName.types index 3258b0946ac25..ec0676bb0c588 100644 --- a/tests/baselines/reference/classAndInterfaceWithSameName.types +++ b/tests/baselines/reference/classAndInterfaceWithSameName.types @@ -11,7 +11,7 @@ interface C { foo: string; } >foo : string > : ^^^^^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/classAndVariableWithSameName.errors.txt b/tests/baselines/reference/classAndVariableWithSameName.errors.txt index 4c35b2e29361a..0ff07f40811fb 100644 --- a/tests/baselines/reference/classAndVariableWithSameName.errors.txt +++ b/tests/baselines/reference/classAndVariableWithSameName.errors.txt @@ -12,7 +12,7 @@ classAndVariableWithSameName.ts(9,9): error TS2300: Duplicate identifier 'D'. ~ !!! error TS2300: Duplicate identifier 'C'. - module M { + namespace M { class D { // error ~ !!! error TS2300: Duplicate identifier 'D'. diff --git a/tests/baselines/reference/classAndVariableWithSameName.js b/tests/baselines/reference/classAndVariableWithSameName.js index dad757c92a4a5..c3ddb1fab3c8c 100644 --- a/tests/baselines/reference/classAndVariableWithSameName.js +++ b/tests/baselines/reference/classAndVariableWithSameName.js @@ -4,7 +4,7 @@ class C { foo: string; } // error var C = ''; // error -module M { +namespace M { class D { // error bar: string; } diff --git a/tests/baselines/reference/classAndVariableWithSameName.symbols b/tests/baselines/reference/classAndVariableWithSameName.symbols index 00ad0d0da3413..04d2e0208a9ea 100644 --- a/tests/baselines/reference/classAndVariableWithSameName.symbols +++ b/tests/baselines/reference/classAndVariableWithSameName.symbols @@ -8,11 +8,11 @@ class C { foo: string; } // error var C = ''; // error >C : Symbol(C, Decl(classAndVariableWithSameName.ts, 1, 3)) -module M { +namespace M { >M : Symbol(M, Decl(classAndVariableWithSameName.ts, 1, 11)) class D { // error ->D : Symbol(D, Decl(classAndVariableWithSameName.ts, 3, 10)) +>D : Symbol(D, Decl(classAndVariableWithSameName.ts, 3, 13)) bar: string; >bar : Symbol(D.bar, Decl(classAndVariableWithSameName.ts, 4, 13)) diff --git a/tests/baselines/reference/classAndVariableWithSameName.types b/tests/baselines/reference/classAndVariableWithSameName.types index 7fc44d5403ccb..993d2f49c83fe 100644 --- a/tests/baselines/reference/classAndVariableWithSameName.types +++ b/tests/baselines/reference/classAndVariableWithSameName.types @@ -13,7 +13,7 @@ var C = ''; // error >'' : "" > : ^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/classConstructorAccessibility.errors.txt b/tests/baselines/reference/classConstructorAccessibility.errors.txt index 8ff647bda3dbe..d3e2ba69434a1 100644 --- a/tests/baselines/reference/classConstructorAccessibility.errors.txt +++ b/tests/baselines/reference/classConstructorAccessibility.errors.txt @@ -25,7 +25,7 @@ classConstructorAccessibility.ts(32,13): error TS2674: Constructor of class 'E { public constructor(public x: T) { } } diff --git a/tests/baselines/reference/classConstructorAccessibility.js b/tests/baselines/reference/classConstructorAccessibility.js index 4675b2e7c5ad9..6661e4e99664d 100644 --- a/tests/baselines/reference/classConstructorAccessibility.js +++ b/tests/baselines/reference/classConstructorAccessibility.js @@ -17,7 +17,7 @@ var c = new C(1); var d = new D(1); // error var e = new E(1); // error -module Generic { +namespace Generic { class C { public constructor(public x: T) { } } diff --git a/tests/baselines/reference/classConstructorAccessibility.symbols b/tests/baselines/reference/classConstructorAccessibility.symbols index e4623dfd7667f..2285b5cb31163 100644 --- a/tests/baselines/reference/classConstructorAccessibility.symbols +++ b/tests/baselines/reference/classConstructorAccessibility.symbols @@ -34,11 +34,11 @@ var e = new E(1); // error >e : Symbol(e, Decl(classConstructorAccessibility.ts, 14, 3)) >E : Symbol(E, Decl(classConstructorAccessibility.ts, 6, 1)) -module Generic { +namespace Generic { >Generic : Symbol(Generic, Decl(classConstructorAccessibility.ts, 14, 17)) class C { ->C : Symbol(C, Decl(classConstructorAccessibility.ts, 16, 16)) +>C : Symbol(C, Decl(classConstructorAccessibility.ts, 16, 19)) >T : Symbol(T, Decl(classConstructorAccessibility.ts, 17, 12)) public constructor(public x: T) { } @@ -66,7 +66,7 @@ module Generic { var c = new C(1); >c : Symbol(c, Decl(classConstructorAccessibility.ts, 29, 7)) ->C : Symbol(C, Decl(classConstructorAccessibility.ts, 16, 16)) +>C : Symbol(C, Decl(classConstructorAccessibility.ts, 16, 19)) var d = new D(1); // error >d : Symbol(d, Decl(classConstructorAccessibility.ts, 30, 7)) diff --git a/tests/baselines/reference/classConstructorAccessibility.types b/tests/baselines/reference/classConstructorAccessibility.types index d948d53f77020..00d4472ce04a9 100644 --- a/tests/baselines/reference/classConstructorAccessibility.types +++ b/tests/baselines/reference/classConstructorAccessibility.types @@ -58,7 +58,7 @@ var e = new E(1); // error >1 : 1 > : ^ -module Generic { +namespace Generic { >Generic : typeof Generic > : ^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js index 55edc20a79c6e..3d03656d05f51 100644 --- a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js +++ b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js @@ -1,14 +1,14 @@ //// [tests/cases/compiler/classDeclarationMergedInModuleWithContinuation.ts] //// //// [classDeclarationMergedInModuleWithContinuation.ts] -module M { +namespace M { export class N { } - export module N { + export namespace N { export var v = 0; } } -module M { +namespace M { export class O extends M.N { } } diff --git a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.symbols b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.symbols index 4e879b54a2af5..2799dab72c9f0 100644 --- a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.symbols +++ b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.symbols @@ -1,27 +1,27 @@ //// [tests/cases/compiler/classDeclarationMergedInModuleWithContinuation.ts] //// === classDeclarationMergedInModuleWithContinuation.ts === -module M { +namespace M { >M : Symbol(M, Decl(classDeclarationMergedInModuleWithContinuation.ts, 0, 0), Decl(classDeclarationMergedInModuleWithContinuation.ts, 5, 1)) export class N { } ->N : Symbol(N, Decl(classDeclarationMergedInModuleWithContinuation.ts, 0, 10), Decl(classDeclarationMergedInModuleWithContinuation.ts, 1, 22)) +>N : Symbol(N, Decl(classDeclarationMergedInModuleWithContinuation.ts, 0, 13), Decl(classDeclarationMergedInModuleWithContinuation.ts, 1, 22)) - export module N { ->N : Symbol(N, Decl(classDeclarationMergedInModuleWithContinuation.ts, 0, 10), Decl(classDeclarationMergedInModuleWithContinuation.ts, 1, 22)) + export namespace N { +>N : Symbol(N, Decl(classDeclarationMergedInModuleWithContinuation.ts, 0, 13), Decl(classDeclarationMergedInModuleWithContinuation.ts, 1, 22)) export var v = 0; >v : Symbol(v, Decl(classDeclarationMergedInModuleWithContinuation.ts, 3, 18)) } } -module M { +namespace M { >M : Symbol(M, Decl(classDeclarationMergedInModuleWithContinuation.ts, 0, 0), Decl(classDeclarationMergedInModuleWithContinuation.ts, 5, 1)) export class O extends M.N { ->O : Symbol(O, Decl(classDeclarationMergedInModuleWithContinuation.ts, 7, 10)) ->M.N : Symbol(N, Decl(classDeclarationMergedInModuleWithContinuation.ts, 0, 10), Decl(classDeclarationMergedInModuleWithContinuation.ts, 1, 22)) +>O : Symbol(O, Decl(classDeclarationMergedInModuleWithContinuation.ts, 7, 13)) +>M.N : Symbol(N, Decl(classDeclarationMergedInModuleWithContinuation.ts, 0, 13), Decl(classDeclarationMergedInModuleWithContinuation.ts, 1, 22)) >M : Symbol(M, Decl(classDeclarationMergedInModuleWithContinuation.ts, 0, 0), Decl(classDeclarationMergedInModuleWithContinuation.ts, 5, 1)) ->N : Symbol(N, Decl(classDeclarationMergedInModuleWithContinuation.ts, 0, 10), Decl(classDeclarationMergedInModuleWithContinuation.ts, 1, 22)) +>N : Symbol(N, Decl(classDeclarationMergedInModuleWithContinuation.ts, 0, 13), Decl(classDeclarationMergedInModuleWithContinuation.ts, 1, 22)) } } diff --git a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.types b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.types index 195be095bd7aa..4b375d91494d9 100644 --- a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.types +++ b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/classDeclarationMergedInModuleWithContinuation.ts] //// === classDeclarationMergedInModuleWithContinuation.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -9,7 +9,7 @@ module M { >N : N > : ^ - export module N { + export namespace N { >N : typeof N > : ^^^^^^^^ @@ -21,7 +21,7 @@ module M { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/classDoesNotDependOnPrivateMember.js b/tests/baselines/reference/classDoesNotDependOnPrivateMember.js index 65a137349a580..21aa37d60927b 100644 --- a/tests/baselines/reference/classDoesNotDependOnPrivateMember.js +++ b/tests/baselines/reference/classDoesNotDependOnPrivateMember.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/declarationEmit/classDoesNotDependOnPrivateMember.ts] //// //// [classDoesNotDependOnPrivateMember.ts] -module M { +namespace M { interface I { } export class C { private x: I; diff --git a/tests/baselines/reference/classDoesNotDependOnPrivateMember.symbols b/tests/baselines/reference/classDoesNotDependOnPrivateMember.symbols index f6278934848e7..ba91a4ac3d0bb 100644 --- a/tests/baselines/reference/classDoesNotDependOnPrivateMember.symbols +++ b/tests/baselines/reference/classDoesNotDependOnPrivateMember.symbols @@ -1,17 +1,17 @@ //// [tests/cases/conformance/declarationEmit/classDoesNotDependOnPrivateMember.ts] //// === classDoesNotDependOnPrivateMember.ts === -module M { +namespace M { >M : Symbol(M, Decl(classDoesNotDependOnPrivateMember.ts, 0, 0)) interface I { } ->I : Symbol(I, Decl(classDoesNotDependOnPrivateMember.ts, 0, 10)) +>I : Symbol(I, Decl(classDoesNotDependOnPrivateMember.ts, 0, 13)) export class C { >C : Symbol(C, Decl(classDoesNotDependOnPrivateMember.ts, 1, 19)) private x: I; >x : Symbol(C.x, Decl(classDoesNotDependOnPrivateMember.ts, 2, 20)) ->I : Symbol(I, Decl(classDoesNotDependOnPrivateMember.ts, 0, 10)) +>I : Symbol(I, Decl(classDoesNotDependOnPrivateMember.ts, 0, 13)) } } diff --git a/tests/baselines/reference/classDoesNotDependOnPrivateMember.types b/tests/baselines/reference/classDoesNotDependOnPrivateMember.types index d380a1b86ba21..91dae8e98378d 100644 --- a/tests/baselines/reference/classDoesNotDependOnPrivateMember.types +++ b/tests/baselines/reference/classDoesNotDependOnPrivateMember.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/declarationEmit/classDoesNotDependOnPrivateMember.ts] //// === classDoesNotDependOnPrivateMember.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/classExpression.js b/tests/baselines/reference/classExpression.js index e467285eef939..1bf60c67dbff6 100644 --- a/tests/baselines/reference/classExpression.js +++ b/tests/baselines/reference/classExpression.js @@ -9,7 +9,7 @@ var y = { } } -module M { +namespace M { var z = class C4 { } } diff --git a/tests/baselines/reference/classExpression.symbols b/tests/baselines/reference/classExpression.symbols index db35165fe87e0..7ed5f7a31066e 100644 --- a/tests/baselines/reference/classExpression.symbols +++ b/tests/baselines/reference/classExpression.symbols @@ -15,7 +15,7 @@ var y = { } } -module M { +namespace M { >M : Symbol(M, Decl(classExpression.ts, 6, 1)) var z = class C4 { diff --git a/tests/baselines/reference/classExpression.types b/tests/baselines/reference/classExpression.types index 1d5b9b6d11a9a..3a7a6c1a5d4c1 100644 --- a/tests/baselines/reference/classExpression.types +++ b/tests/baselines/reference/classExpression.types @@ -26,7 +26,7 @@ var y = { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/classExtendingQualifiedName.errors.txt b/tests/baselines/reference/classExtendingQualifiedName.errors.txt index ab35af17620e3..8eff155a28613 100644 --- a/tests/baselines/reference/classExtendingQualifiedName.errors.txt +++ b/tests/baselines/reference/classExtendingQualifiedName.errors.txt @@ -2,7 +2,7 @@ classExtendingQualifiedName.ts(5,23): error TS2339: Property 'C' does not exist ==== classExtendingQualifiedName.ts (1 errors) ==== - module M { + namespace M { class C { } diff --git a/tests/baselines/reference/classExtendingQualifiedName.js b/tests/baselines/reference/classExtendingQualifiedName.js index 191ce656a107a..47c5428b9e08f 100644 --- a/tests/baselines/reference/classExtendingQualifiedName.js +++ b/tests/baselines/reference/classExtendingQualifiedName.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/classExtendingQualifiedName.ts] //// //// [classExtendingQualifiedName.ts] -module M { +namespace M { class C { } diff --git a/tests/baselines/reference/classExtendingQualifiedName.symbols b/tests/baselines/reference/classExtendingQualifiedName.symbols index e244697d6e513..b945442b3a3aa 100644 --- a/tests/baselines/reference/classExtendingQualifiedName.symbols +++ b/tests/baselines/reference/classExtendingQualifiedName.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/classExtendingQualifiedName.ts] //// === classExtendingQualifiedName.ts === -module M { +namespace M { >M : Symbol(M, Decl(classExtendingQualifiedName.ts, 0, 0)) class C { ->C : Symbol(C, Decl(classExtendingQualifiedName.ts, 0, 10)) +>C : Symbol(C, Decl(classExtendingQualifiedName.ts, 0, 13)) } class D extends M.C { diff --git a/tests/baselines/reference/classExtendingQualifiedName.types b/tests/baselines/reference/classExtendingQualifiedName.types index 3dd46eac3a628..432d7d92988c5 100644 --- a/tests/baselines/reference/classExtendingQualifiedName.types +++ b/tests/baselines/reference/classExtendingQualifiedName.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/classExtendingQualifiedName.ts] //// === classExtendingQualifiedName.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/classExtendingQualifiedName2.js b/tests/baselines/reference/classExtendingQualifiedName2.js index 66d4ba8c7d580..5bce593dfc8a4 100644 --- a/tests/baselines/reference/classExtendingQualifiedName2.js +++ b/tests/baselines/reference/classExtendingQualifiedName2.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/classExtendingQualifiedName2.ts] //// //// [classExtendingQualifiedName2.ts] -module M { +namespace M { export class C { } diff --git a/tests/baselines/reference/classExtendingQualifiedName2.symbols b/tests/baselines/reference/classExtendingQualifiedName2.symbols index f2bc769a6098c..123db9d67065c 100644 --- a/tests/baselines/reference/classExtendingQualifiedName2.symbols +++ b/tests/baselines/reference/classExtendingQualifiedName2.symbols @@ -1,17 +1,17 @@ //// [tests/cases/compiler/classExtendingQualifiedName2.ts] //// === classExtendingQualifiedName2.ts === -module M { +namespace M { >M : Symbol(M, Decl(classExtendingQualifiedName2.ts, 0, 0)) export class C { ->C : Symbol(C, Decl(classExtendingQualifiedName2.ts, 0, 10)) +>C : Symbol(C, Decl(classExtendingQualifiedName2.ts, 0, 13)) } class D extends M.C { >D : Symbol(D, Decl(classExtendingQualifiedName2.ts, 2, 5)) ->M.C : Symbol(C, Decl(classExtendingQualifiedName2.ts, 0, 10)) +>M.C : Symbol(C, Decl(classExtendingQualifiedName2.ts, 0, 13)) >M : Symbol(M, Decl(classExtendingQualifiedName2.ts, 0, 0)) ->C : Symbol(C, Decl(classExtendingQualifiedName2.ts, 0, 10)) +>C : Symbol(C, Decl(classExtendingQualifiedName2.ts, 0, 13)) } } diff --git a/tests/baselines/reference/classExtendingQualifiedName2.types b/tests/baselines/reference/classExtendingQualifiedName2.types index 1b2477c9a296b..e213bfceb6291 100644 --- a/tests/baselines/reference/classExtendingQualifiedName2.types +++ b/tests/baselines/reference/classExtendingQualifiedName2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/classExtendingQualifiedName2.ts] //// === classExtendingQualifiedName2.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.errors.txt b/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.errors.txt index bf070e138561c..05e2d691c8c43 100644 --- a/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.errors.txt +++ b/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.errors.txt @@ -5,11 +5,11 @@ classExtendsClauseClassMergedWithModuleNotReferingConstructor.ts(10,21): error T class A { a: number; } - module A { + namespace A { export var v: string; } - module Foo { + namespace Foo { var A = 1; class B extends A { ~ diff --git a/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js b/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js index 50003502a1f6c..8fd04c11da2fd 100644 --- a/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js +++ b/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js @@ -4,11 +4,11 @@ class A { a: number; } -module A { +namespace A { export var v: string; } -module Foo { +namespace Foo { var A = 1; class B extends A { b: string; diff --git a/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.symbols b/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.symbols index 4adae999f7332..8c5125f55fe77 100644 --- a/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.symbols +++ b/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.symbols @@ -7,14 +7,14 @@ class A { a: number; >a : Symbol(A.a, Decl(classExtendsClauseClassMergedWithModuleNotReferingConstructor.ts, 0, 9)) } -module A { +namespace A { >A : Symbol(A, Decl(classExtendsClauseClassMergedWithModuleNotReferingConstructor.ts, 0, 0), Decl(classExtendsClauseClassMergedWithModuleNotReferingConstructor.ts, 2, 1)) export var v: string; >v : Symbol(v, Decl(classExtendsClauseClassMergedWithModuleNotReferingConstructor.ts, 4, 14)) } -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(classExtendsClauseClassMergedWithModuleNotReferingConstructor.ts, 5, 1)) var A = 1; diff --git a/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.types b/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.types index c0ae031e7c832..743185e64d68a 100644 --- a/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.types +++ b/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.types @@ -9,7 +9,7 @@ class A { >a : number > : ^^^^^^ } -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -18,7 +18,7 @@ module A { > : ^^^^^^ } -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.errors.txt b/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.errors.txt index 1803ad2ae4372..88be78ebff37f 100644 --- a/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.errors.txt +++ b/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.errors.txt @@ -3,7 +3,7 @@ classExtendsClauseClassNotReferringConstructor.ts(4,21): error TS2507: Type 'num ==== classExtendsClauseClassNotReferringConstructor.ts (1 errors) ==== class A { a: number; } - module Foo { + namespace Foo { var A = 1; class B extends A { b: string; } ~ diff --git a/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js b/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js index 379e59a095b46..91503183c306b 100644 --- a/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js +++ b/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js @@ -2,7 +2,7 @@ //// [classExtendsClauseClassNotReferringConstructor.ts] class A { a: number; } -module Foo { +namespace Foo { var A = 1; class B extends A { b: string; } } diff --git a/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.symbols b/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.symbols index 6734fbf5283ed..a8a3a90fc2e64 100644 --- a/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.symbols +++ b/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.symbols @@ -5,7 +5,7 @@ class A { a: number; } >A : Symbol(A, Decl(classExtendsClauseClassNotReferringConstructor.ts, 0, 0)) >a : Symbol(A.a, Decl(classExtendsClauseClassNotReferringConstructor.ts, 0, 9)) -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(classExtendsClauseClassNotReferringConstructor.ts, 0, 22)) var A = 1; diff --git a/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.types b/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.types index 8ac15a88b5903..d1d97e343fcd5 100644 --- a/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.types +++ b/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.types @@ -7,7 +7,7 @@ class A { a: number; } >a : number > : ^^^^^^ -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/classExtendsEveryObjectType.errors.txt b/tests/baselines/reference/classExtendsEveryObjectType.errors.txt index 9c3cbd75f77c8..060ad3b74a36c 100644 --- a/tests/baselines/reference/classExtendsEveryObjectType.errors.txt +++ b/tests/baselines/reference/classExtendsEveryObjectType.errors.txt @@ -28,7 +28,7 @@ classExtendsEveryObjectType.ts(16,18): error TS2507: Type 'undefined[]' is not a ~ !!! error TS2507: Type '{ foo: string; }' is not a constructor function type. - module M { export var x = 1; } + namespace M { export var x = 1; } class C4 extends M { } // error ~ !!! error TS2507: Type 'typeof M' is not a constructor function type. diff --git a/tests/baselines/reference/classExtendsEveryObjectType.js b/tests/baselines/reference/classExtendsEveryObjectType.js index 0eabaa21468e6..7f76b3afc4f39 100644 --- a/tests/baselines/reference/classExtendsEveryObjectType.js +++ b/tests/baselines/reference/classExtendsEveryObjectType.js @@ -10,7 +10,7 @@ class C2 extends { foo: string; } { } // error var x: { foo: string; } class C3 extends x { } // error -module M { export var x = 1; } +namespace M { export var x = 1; } class C4 extends M { } // error function foo() { } diff --git a/tests/baselines/reference/classExtendsEveryObjectType.symbols b/tests/baselines/reference/classExtendsEveryObjectType.symbols index f31aef4a0a5d4..09ee8629e16e3 100644 --- a/tests/baselines/reference/classExtendsEveryObjectType.symbols +++ b/tests/baselines/reference/classExtendsEveryObjectType.symbols @@ -22,12 +22,12 @@ class C3 extends x { } // error >C3 : Symbol(C3, Decl(classExtendsEveryObjectType.ts, 6, 23)) >x : Symbol(x, Decl(classExtendsEveryObjectType.ts, 6, 3)) -module M { export var x = 1; } +namespace M { export var x = 1; } >M : Symbol(M, Decl(classExtendsEveryObjectType.ts, 7, 22)) ->x : Symbol(x, Decl(classExtendsEveryObjectType.ts, 9, 21)) +>x : Symbol(x, Decl(classExtendsEveryObjectType.ts, 9, 24)) class C4 extends M { } // error ->C4 : Symbol(C4, Decl(classExtendsEveryObjectType.ts, 9, 30)) +>C4 : Symbol(C4, Decl(classExtendsEveryObjectType.ts, 9, 33)) >M : Symbol(M, Decl(classExtendsEveryObjectType.ts, 7, 22)) function foo() { } diff --git a/tests/baselines/reference/classExtendsEveryObjectType.types b/tests/baselines/reference/classExtendsEveryObjectType.types index b8ec0869a9135..8c85bcab25a01 100644 --- a/tests/baselines/reference/classExtendsEveryObjectType.types +++ b/tests/baselines/reference/classExtendsEveryObjectType.types @@ -34,7 +34,7 @@ class C3 extends x { } // error >x : { foo: string; } > : ^^^^^^^ ^^^ -module M { export var x = 1; } +namespace M { export var x = 1; } >M : typeof M > : ^^^^^^^^ >x : number diff --git a/tests/baselines/reference/classExtendsInterfaceInModule.errors.txt b/tests/baselines/reference/classExtendsInterfaceInModule.errors.txt index d3c88f909442a..870985a25dc61 100644 --- a/tests/baselines/reference/classExtendsInterfaceInModule.errors.txt +++ b/tests/baselines/reference/classExtendsInterfaceInModule.errors.txt @@ -4,7 +4,7 @@ classExtendsInterfaceInModule.ts(14,17): error TS2689: Cannot extend an interfac ==== classExtendsInterfaceInModule.ts (3 errors) ==== - module M { + namespace M { export interface I1 {} export interface I2 {} } @@ -15,7 +15,7 @@ classExtendsInterfaceInModule.ts(14,17): error TS2689: Cannot extend an interfac ~ !!! error TS2689: Cannot extend an interface 'M.I2'. Did you mean 'implements'? - module Mod { + namespace Mod { export namespace Nested { export interface I {} } diff --git a/tests/baselines/reference/classExtendsInterfaceInModule.js b/tests/baselines/reference/classExtendsInterfaceInModule.js index 35ce765bc5eaf..b61dcb045f046 100644 --- a/tests/baselines/reference/classExtendsInterfaceInModule.js +++ b/tests/baselines/reference/classExtendsInterfaceInModule.js @@ -1,14 +1,14 @@ //// [tests/cases/compiler/classExtendsInterfaceInModule.ts] //// //// [classExtendsInterfaceInModule.ts] -module M { +namespace M { export interface I1 {} export interface I2 {} } class C1 extends M.I1 {} class C2 extends M.I2 {} -module Mod { +namespace Mod { export namespace Nested { export interface I {} } diff --git a/tests/baselines/reference/classExtendsInterfaceInModule.symbols b/tests/baselines/reference/classExtendsInterfaceInModule.symbols index ce11895ebf5d6..897cffcadffc8 100644 --- a/tests/baselines/reference/classExtendsInterfaceInModule.symbols +++ b/tests/baselines/reference/classExtendsInterfaceInModule.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/classExtendsInterfaceInModule.ts] //// === classExtendsInterfaceInModule.ts === -module M { +namespace M { >M : Symbol(M, Decl(classExtendsInterfaceInModule.ts, 0, 0)) export interface I1 {} ->I1 : Symbol(I1, Decl(classExtendsInterfaceInModule.ts, 0, 10)) +>I1 : Symbol(I1, Decl(classExtendsInterfaceInModule.ts, 0, 13)) export interface I2 {} >I2 : Symbol(I2, Decl(classExtendsInterfaceInModule.ts, 1, 24)) @@ -21,11 +21,11 @@ class C2 extends M.I2 {} >M : Symbol(M, Decl(classExtendsInterfaceInModule.ts, 0, 0)) >T : Symbol(T, Decl(classExtendsInterfaceInModule.ts, 5, 9)) -module Mod { +namespace Mod { >Mod : Symbol(Mod, Decl(classExtendsInterfaceInModule.ts, 5, 30)) export namespace Nested { ->Nested : Symbol(Nested, Decl(classExtendsInterfaceInModule.ts, 7, 12)) +>Nested : Symbol(Nested, Decl(classExtendsInterfaceInModule.ts, 7, 15)) export interface I {} >I : Symbol(I, Decl(classExtendsInterfaceInModule.ts, 8, 26)) @@ -34,7 +34,7 @@ module Mod { class D extends Mod.Nested.I {} >D : Symbol(D, Decl(classExtendsInterfaceInModule.ts, 11, 1)) ->Mod.Nested : Symbol(Mod.Nested, Decl(classExtendsInterfaceInModule.ts, 7, 12)) +>Mod.Nested : Symbol(Mod.Nested, Decl(classExtendsInterfaceInModule.ts, 7, 15)) >Mod : Symbol(Mod, Decl(classExtendsInterfaceInModule.ts, 5, 30)) ->Nested : Symbol(Mod.Nested, Decl(classExtendsInterfaceInModule.ts, 7, 12)) +>Nested : Symbol(Mod.Nested, Decl(classExtendsInterfaceInModule.ts, 7, 15)) diff --git a/tests/baselines/reference/classExtendsInterfaceInModule.types b/tests/baselines/reference/classExtendsInterfaceInModule.types index a48aad99f7c29..579afeb090ac1 100644 --- a/tests/baselines/reference/classExtendsInterfaceInModule.types +++ b/tests/baselines/reference/classExtendsInterfaceInModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/classExtendsInterfaceInModule.ts] //// === classExtendsInterfaceInModule.ts === -module M { +namespace M { export interface I1 {} export interface I2 {} } @@ -25,7 +25,7 @@ class C2 extends M.I2 {} >I2 : any > : ^^^ -module Mod { +namespace Mod { export namespace Nested { export interface I {} } diff --git a/tests/baselines/reference/classExtendsItselfIndirectly2.errors.txt b/tests/baselines/reference/classExtendsItselfIndirectly2.errors.txt index 40eb73ba51648..dce63be85fe17 100644 --- a/tests/baselines/reference/classExtendsItselfIndirectly2.errors.txt +++ b/tests/baselines/reference/classExtendsItselfIndirectly2.errors.txt @@ -16,20 +16,20 @@ classExtendsItselfIndirectly2.ts(20,22): error TS2506: 'E2' is referenced direct !!! error TS2449: Class 'E' used before its declaration. !!! related TS2728 classExtendsItselfIndirectly2.ts:9:18: 'E' is declared here. - module M { + namespace M { export class D extends C { bar: string; } ~ !!! error TS2506: 'D' is referenced directly or indirectly in its own base expression. } - module N { + namespace N { export class E extends M.D { baz: number; } ~ !!! error TS2506: 'E' is referenced directly or indirectly in its own base expression. } - module O { + namespace O { class C2 extends Q.E2 { foo: T; } // error ~~ !!! error TS2506: 'C2' is referenced directly or indirectly in its own base expression. @@ -37,13 +37,13 @@ classExtendsItselfIndirectly2.ts(20,22): error TS2506: 'E2' is referenced direct !!! error TS2449: Class 'E2' used before its declaration. !!! related TS2728 classExtendsItselfIndirectly2.ts:20:22: 'E2' is declared here. - module P { + namespace P { export class D2 extends C2 { bar: T; } ~~ !!! error TS2506: 'D2' is referenced directly or indirectly in its own base expression. } - module Q { + namespace Q { export class E2 extends P.D2 { baz: T; } ~~ !!! error TS2506: 'E2' is referenced directly or indirectly in its own base expression. diff --git a/tests/baselines/reference/classExtendsItselfIndirectly2.js b/tests/baselines/reference/classExtendsItselfIndirectly2.js index 61d05586baf82..7b4e3653f95f8 100644 --- a/tests/baselines/reference/classExtendsItselfIndirectly2.js +++ b/tests/baselines/reference/classExtendsItselfIndirectly2.js @@ -3,23 +3,23 @@ //// [classExtendsItselfIndirectly2.ts] class C extends N.E { foo: string; } // error -module M { +namespace M { export class D extends C { bar: string; } } -module N { +namespace N { export class E extends M.D { baz: number; } } -module O { +namespace O { class C2 extends Q.E2 { foo: T; } // error - module P { + namespace P { export class D2 extends C2 { bar: T; } } - module Q { + namespace Q { export class E2 extends P.D2 { baz: T; } } } diff --git a/tests/baselines/reference/classExtendsItselfIndirectly2.symbols b/tests/baselines/reference/classExtendsItselfIndirectly2.symbols index 8466428a04ef2..d1875c64dda6c 100644 --- a/tests/baselines/reference/classExtendsItselfIndirectly2.symbols +++ b/tests/baselines/reference/classExtendsItselfIndirectly2.symbols @@ -3,66 +3,66 @@ === classExtendsItselfIndirectly2.ts === class C extends N.E { foo: string; } // error >C : Symbol(C, Decl(classExtendsItselfIndirectly2.ts, 0, 0)) ->N.E : Symbol(N.E, Decl(classExtendsItselfIndirectly2.ts, 7, 10)) +>N.E : Symbol(N.E, Decl(classExtendsItselfIndirectly2.ts, 7, 13)) >N : Symbol(N, Decl(classExtendsItselfIndirectly2.ts, 5, 1)) ->E : Symbol(N.E, Decl(classExtendsItselfIndirectly2.ts, 7, 10)) +>E : Symbol(N.E, Decl(classExtendsItselfIndirectly2.ts, 7, 13)) >foo : Symbol(C.foo, Decl(classExtendsItselfIndirectly2.ts, 0, 21)) -module M { +namespace M { >M : Symbol(M, Decl(classExtendsItselfIndirectly2.ts, 0, 36)) export class D extends C { bar: string; } ->D : Symbol(D, Decl(classExtendsItselfIndirectly2.ts, 2, 10)) +>D : Symbol(D, Decl(classExtendsItselfIndirectly2.ts, 2, 13)) >C : Symbol(C, Decl(classExtendsItselfIndirectly2.ts, 0, 0)) >bar : Symbol(D.bar, Decl(classExtendsItselfIndirectly2.ts, 3, 30)) } -module N { +namespace N { >N : Symbol(N, Decl(classExtendsItselfIndirectly2.ts, 5, 1)) export class E extends M.D { baz: number; } ->E : Symbol(E, Decl(classExtendsItselfIndirectly2.ts, 7, 10)) ->M.D : Symbol(M.D, Decl(classExtendsItselfIndirectly2.ts, 2, 10)) +>E : Symbol(E, Decl(classExtendsItselfIndirectly2.ts, 7, 13)) +>M.D : Symbol(M.D, Decl(classExtendsItselfIndirectly2.ts, 2, 13)) >M : Symbol(M, Decl(classExtendsItselfIndirectly2.ts, 0, 36)) ->D : Symbol(M.D, Decl(classExtendsItselfIndirectly2.ts, 2, 10)) +>D : Symbol(M.D, Decl(classExtendsItselfIndirectly2.ts, 2, 13)) >baz : Symbol(E.baz, Decl(classExtendsItselfIndirectly2.ts, 8, 32)) } -module O { +namespace O { >O : Symbol(O, Decl(classExtendsItselfIndirectly2.ts, 9, 1)) class C2 extends Q.E2 { foo: T; } // error ->C2 : Symbol(C2, Decl(classExtendsItselfIndirectly2.ts, 11, 10)) +>C2 : Symbol(C2, Decl(classExtendsItselfIndirectly2.ts, 11, 13)) >T : Symbol(T, Decl(classExtendsItselfIndirectly2.ts, 12, 13)) ->Q.E2 : Symbol(Q.E2, Decl(classExtendsItselfIndirectly2.ts, 18, 14)) +>Q.E2 : Symbol(Q.E2, Decl(classExtendsItselfIndirectly2.ts, 18, 17)) >Q : Symbol(Q, Decl(classExtendsItselfIndirectly2.ts, 16, 5)) ->E2 : Symbol(Q.E2, Decl(classExtendsItselfIndirectly2.ts, 18, 14)) +>E2 : Symbol(Q.E2, Decl(classExtendsItselfIndirectly2.ts, 18, 17)) >T : Symbol(T, Decl(classExtendsItselfIndirectly2.ts, 12, 13)) >foo : Symbol(C2.foo, Decl(classExtendsItselfIndirectly2.ts, 12, 33)) >T : Symbol(T, Decl(classExtendsItselfIndirectly2.ts, 12, 13)) - module P { + namespace P { >P : Symbol(P, Decl(classExtendsItselfIndirectly2.ts, 12, 43)) export class D2 extends C2 { bar: T; } ->D2 : Symbol(D2, Decl(classExtendsItselfIndirectly2.ts, 14, 14)) +>D2 : Symbol(D2, Decl(classExtendsItselfIndirectly2.ts, 14, 17)) >T : Symbol(T, Decl(classExtendsItselfIndirectly2.ts, 15, 24)) ->C2 : Symbol(C2, Decl(classExtendsItselfIndirectly2.ts, 11, 10)) +>C2 : Symbol(C2, Decl(classExtendsItselfIndirectly2.ts, 11, 13)) >T : Symbol(T, Decl(classExtendsItselfIndirectly2.ts, 15, 24)) >bar : Symbol(D2.bar, Decl(classExtendsItselfIndirectly2.ts, 15, 42)) >T : Symbol(T, Decl(classExtendsItselfIndirectly2.ts, 15, 24)) } - module Q { + namespace Q { >Q : Symbol(Q, Decl(classExtendsItselfIndirectly2.ts, 16, 5)) export class E2 extends P.D2 { baz: T; } ->E2 : Symbol(E2, Decl(classExtendsItselfIndirectly2.ts, 18, 14)) +>E2 : Symbol(E2, Decl(classExtendsItselfIndirectly2.ts, 18, 17)) >T : Symbol(T, Decl(classExtendsItselfIndirectly2.ts, 19, 24)) ->P.D2 : Symbol(P.D2, Decl(classExtendsItselfIndirectly2.ts, 14, 14)) +>P.D2 : Symbol(P.D2, Decl(classExtendsItselfIndirectly2.ts, 14, 17)) >P : Symbol(P, Decl(classExtendsItselfIndirectly2.ts, 12, 43)) ->D2 : Symbol(P.D2, Decl(classExtendsItselfIndirectly2.ts, 14, 14)) +>D2 : Symbol(P.D2, Decl(classExtendsItselfIndirectly2.ts, 14, 17)) >T : Symbol(T, Decl(classExtendsItselfIndirectly2.ts, 19, 24)) >baz : Symbol(E2.baz, Decl(classExtendsItselfIndirectly2.ts, 19, 44)) >T : Symbol(T, Decl(classExtendsItselfIndirectly2.ts, 19, 24)) diff --git a/tests/baselines/reference/classExtendsItselfIndirectly2.types b/tests/baselines/reference/classExtendsItselfIndirectly2.types index 0463e71938f1d..2ed82281b4135 100644 --- a/tests/baselines/reference/classExtendsItselfIndirectly2.types +++ b/tests/baselines/reference/classExtendsItselfIndirectly2.types @@ -13,7 +13,7 @@ class C extends N.E { foo: string; } // error >foo : string > : ^^^^^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -27,7 +27,7 @@ module M { } -module N { +namespace N { >N : typeof N > : ^^^^^^^^ @@ -44,7 +44,7 @@ module N { > : ^^^^^^ } -module O { +namespace O { >O : typeof O > : ^^^^^^^^ @@ -60,7 +60,7 @@ module O { >foo : T > : ^ - module P { + namespace P { >P : typeof P > : ^^^^^^^^ @@ -73,7 +73,7 @@ module O { > : ^ } - module Q { + namespace Q { >Q : typeof Q > : ^^^^^^^^ diff --git a/tests/baselines/reference/classExtendsShadowedConstructorFunction.errors.txt b/tests/baselines/reference/classExtendsShadowedConstructorFunction.errors.txt index d08aa06400651..06acb6aa99e50 100644 --- a/tests/baselines/reference/classExtendsShadowedConstructorFunction.errors.txt +++ b/tests/baselines/reference/classExtendsShadowedConstructorFunction.errors.txt @@ -4,7 +4,7 @@ classExtendsShadowedConstructorFunction.ts(5,21): error TS2507: Type 'number' is ==== classExtendsShadowedConstructorFunction.ts (1 errors) ==== class C { foo: string; } - module M { + namespace M { var C = 1; class D extends C { // error, C must evaluate to constructor function ~ diff --git a/tests/baselines/reference/classExtendsShadowedConstructorFunction.js b/tests/baselines/reference/classExtendsShadowedConstructorFunction.js index a032e7d1b100f..62383ff8c5692 100644 --- a/tests/baselines/reference/classExtendsShadowedConstructorFunction.js +++ b/tests/baselines/reference/classExtendsShadowedConstructorFunction.js @@ -3,7 +3,7 @@ //// [classExtendsShadowedConstructorFunction.ts] class C { foo: string; } -module M { +namespace M { var C = 1; class D extends C { // error, C must evaluate to constructor function bar: string; diff --git a/tests/baselines/reference/classExtendsShadowedConstructorFunction.symbols b/tests/baselines/reference/classExtendsShadowedConstructorFunction.symbols index 51d4161e24589..0bff97e15195b 100644 --- a/tests/baselines/reference/classExtendsShadowedConstructorFunction.symbols +++ b/tests/baselines/reference/classExtendsShadowedConstructorFunction.symbols @@ -5,7 +5,7 @@ class C { foo: string; } >C : Symbol(C, Decl(classExtendsShadowedConstructorFunction.ts, 0, 0)) >foo : Symbol(C.foo, Decl(classExtendsShadowedConstructorFunction.ts, 0, 9)) -module M { +namespace M { >M : Symbol(M, Decl(classExtendsShadowedConstructorFunction.ts, 0, 24)) var C = 1; diff --git a/tests/baselines/reference/classExtendsShadowedConstructorFunction.types b/tests/baselines/reference/classExtendsShadowedConstructorFunction.types index b9a916a011f0d..de9da7e07c14f 100644 --- a/tests/baselines/reference/classExtendsShadowedConstructorFunction.types +++ b/tests/baselines/reference/classExtendsShadowedConstructorFunction.types @@ -7,7 +7,7 @@ class C { foo: string; } >foo : string > : ^^^^^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/classImplementsImportedInterface.js b/tests/baselines/reference/classImplementsImportedInterface.js index 197ea3c28877b..5f42331c71232 100644 --- a/tests/baselines/reference/classImplementsImportedInterface.js +++ b/tests/baselines/reference/classImplementsImportedInterface.js @@ -1,13 +1,13 @@ //// [tests/cases/compiler/classImplementsImportedInterface.ts] //// //// [classImplementsImportedInterface.ts] -module M1 { +namespace M1 { export interface I { foo(); } } -module M2 { +namespace M2 { import T = M1.I; class C implements T { foo() {} diff --git a/tests/baselines/reference/classImplementsImportedInterface.symbols b/tests/baselines/reference/classImplementsImportedInterface.symbols index fdffc595db677..435b40c1254b6 100644 --- a/tests/baselines/reference/classImplementsImportedInterface.symbols +++ b/tests/baselines/reference/classImplementsImportedInterface.symbols @@ -1,28 +1,28 @@ //// [tests/cases/compiler/classImplementsImportedInterface.ts] //// === classImplementsImportedInterface.ts === -module M1 { +namespace M1 { >M1 : Symbol(M1, Decl(classImplementsImportedInterface.ts, 0, 0)) export interface I { ->I : Symbol(I, Decl(classImplementsImportedInterface.ts, 0, 11)) +>I : Symbol(I, Decl(classImplementsImportedInterface.ts, 0, 14)) foo(); >foo : Symbol(I.foo, Decl(classImplementsImportedInterface.ts, 1, 24)) } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(classImplementsImportedInterface.ts, 4, 1)) import T = M1.I; ->T : Symbol(T, Decl(classImplementsImportedInterface.ts, 6, 11)) +>T : Symbol(T, Decl(classImplementsImportedInterface.ts, 6, 14)) >M1 : Symbol(M1, Decl(classImplementsImportedInterface.ts, 0, 0)) ->I : Symbol(T, Decl(classImplementsImportedInterface.ts, 0, 11)) +>I : Symbol(T, Decl(classImplementsImportedInterface.ts, 0, 14)) class C implements T { >C : Symbol(C, Decl(classImplementsImportedInterface.ts, 7, 20)) ->T : Symbol(T, Decl(classImplementsImportedInterface.ts, 6, 11)) +>T : Symbol(T, Decl(classImplementsImportedInterface.ts, 6, 14)) foo() {} >foo : Symbol(C.foo, Decl(classImplementsImportedInterface.ts, 8, 26)) diff --git a/tests/baselines/reference/classImplementsImportedInterface.types b/tests/baselines/reference/classImplementsImportedInterface.types index f2fe12348a45a..ea34858c7ae69 100644 --- a/tests/baselines/reference/classImplementsImportedInterface.types +++ b/tests/baselines/reference/classImplementsImportedInterface.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/classImplementsImportedInterface.ts] //// === classImplementsImportedInterface.ts === -module M1 { +namespace M1 { export interface I { foo(); >foo : () => any @@ -9,7 +9,7 @@ module M1 { } } -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/classTypeParametersInStatics.errors.txt b/tests/baselines/reference/classTypeParametersInStatics.errors.txt index 1f86d11c6cdee..e8c3238fbc531 100644 --- a/tests/baselines/reference/classTypeParametersInStatics.errors.txt +++ b/tests/baselines/reference/classTypeParametersInStatics.errors.txt @@ -4,7 +4,7 @@ classTypeParametersInStatics.ts(13,43): error TS2302: Static members cannot refe ==== classTypeParametersInStatics.ts (3 errors) ==== - module Editor { + namespace Editor { export class List { diff --git a/tests/baselines/reference/classTypeParametersInStatics.js b/tests/baselines/reference/classTypeParametersInStatics.js index ae14b8af60b7c..59100350263a4 100644 --- a/tests/baselines/reference/classTypeParametersInStatics.js +++ b/tests/baselines/reference/classTypeParametersInStatics.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/classTypeParametersInStatics.ts] //// //// [classTypeParametersInStatics.ts] -module Editor { +namespace Editor { export class List { diff --git a/tests/baselines/reference/classTypeParametersInStatics.symbols b/tests/baselines/reference/classTypeParametersInStatics.symbols index 67595373aee45..cb9af37b76bb5 100644 --- a/tests/baselines/reference/classTypeParametersInStatics.symbols +++ b/tests/baselines/reference/classTypeParametersInStatics.symbols @@ -1,22 +1,22 @@ //// [tests/cases/compiler/classTypeParametersInStatics.ts] //// === classTypeParametersInStatics.ts === -module Editor { +namespace Editor { >Editor : Symbol(Editor, Decl(classTypeParametersInStatics.ts, 0, 0)) export class List { ->List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 15)) +>List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 18)) >T : Symbol(T, Decl(classTypeParametersInStatics.ts, 3, 22)) public next: List; >next : Symbol(List.next, Decl(classTypeParametersInStatics.ts, 3, 26)) ->List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 15)) +>List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 18)) >T : Symbol(T, Decl(classTypeParametersInStatics.ts, 3, 22)) public prev: List; >prev : Symbol(List.prev, Decl(classTypeParametersInStatics.ts, 4, 29)) ->List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 15)) +>List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 18)) >T : Symbol(T, Decl(classTypeParametersInStatics.ts, 3, 22)) constructor(public isHead: boolean, public data: T) { @@ -28,14 +28,14 @@ module Editor { public static MakeHead(): List { // should error >MakeHead : Symbol(List.MakeHead, Decl(classTypeParametersInStatics.ts, 9, 9)) ->List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 15)) +>List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 18)) >T : Symbol(T) var entry: List = new List(true, null); >entry : Symbol(entry, Decl(classTypeParametersInStatics.ts, 12, 15)) ->List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 15)) +>List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 18)) >T : Symbol(T) ->List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 15)) +>List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 18)) >T : Symbol(T) entry.prev = entry; @@ -57,14 +57,14 @@ module Editor { public static MakeHead2(): List { // should not error >MakeHead2 : Symbol(List.MakeHead2, Decl(classTypeParametersInStatics.ts, 16, 9)) >T : Symbol(T, Decl(classTypeParametersInStatics.ts, 18, 32)) ->List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 15)) +>List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 18)) >T : Symbol(T, Decl(classTypeParametersInStatics.ts, 18, 32)) var entry: List = new List(true, null); >entry : Symbol(entry, Decl(classTypeParametersInStatics.ts, 19, 15)) ->List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 15)) +>List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 18)) >T : Symbol(T, Decl(classTypeParametersInStatics.ts, 18, 32)) ->List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 15)) +>List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 18)) >T : Symbol(T, Decl(classTypeParametersInStatics.ts, 18, 32)) entry.prev = entry; @@ -86,14 +86,14 @@ module Editor { public static MakeHead3(): List { // should not error >MakeHead3 : Symbol(List.MakeHead3, Decl(classTypeParametersInStatics.ts, 23, 9)) >U : Symbol(U, Decl(classTypeParametersInStatics.ts, 25, 32)) ->List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 15)) +>List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 18)) >U : Symbol(U, Decl(classTypeParametersInStatics.ts, 25, 32)) var entry: List = new List(true, null); >entry : Symbol(entry, Decl(classTypeParametersInStatics.ts, 26, 15)) ->List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 15)) +>List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 18)) >U : Symbol(U, Decl(classTypeParametersInStatics.ts, 25, 32)) ->List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 15)) +>List : Symbol(List, Decl(classTypeParametersInStatics.ts, 0, 18)) >U : Symbol(U, Decl(classTypeParametersInStatics.ts, 25, 32)) entry.prev = entry; diff --git a/tests/baselines/reference/classTypeParametersInStatics.types b/tests/baselines/reference/classTypeParametersInStatics.types index 13326528e2621..ecf4820b604e8 100644 --- a/tests/baselines/reference/classTypeParametersInStatics.types +++ b/tests/baselines/reference/classTypeParametersInStatics.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/classTypeParametersInStatics.ts] //// === classTypeParametersInStatics.ts === -module Editor { +namespace Editor { >Editor : typeof Editor > : ^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/classWithConstructors.errors.txt b/tests/baselines/reference/classWithConstructors.errors.txt index 9feade7191b69..97eec3bd59992 100644 --- a/tests/baselines/reference/classWithConstructors.errors.txt +++ b/tests/baselines/reference/classWithConstructors.errors.txt @@ -7,7 +7,7 @@ classWithConstructors.ts(46,13): error TS2554: Expected 1-2 arguments, but got 0 ==== classWithConstructors.ts (6 errors) ==== - module NonGeneric { + namespace NonGeneric { class C { constructor(x: string) { } } @@ -41,7 +41,7 @@ classWithConstructors.ts(46,13): error TS2554: Expected 1-2 arguments, but got 0 var d3 = new D(''); // ok } - module Generics { + namespace Generics { class C { constructor(x: T) { } } diff --git a/tests/baselines/reference/classWithConstructors.js b/tests/baselines/reference/classWithConstructors.js index e90df26fd0b2a..ac28ca2eb770b 100644 --- a/tests/baselines/reference/classWithConstructors.js +++ b/tests/baselines/reference/classWithConstructors.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/classes/members/constructorFunctionTypes/classWithConstructors.ts] //// //// [classWithConstructors.ts] -module NonGeneric { +namespace NonGeneric { class C { constructor(x: string) { } } @@ -26,7 +26,7 @@ module NonGeneric { var d3 = new D(''); // ok } -module Generics { +namespace Generics { class C { constructor(x: T) { } } diff --git a/tests/baselines/reference/classWithConstructors.symbols b/tests/baselines/reference/classWithConstructors.symbols index 9447ab4659409..e98874bf43f40 100644 --- a/tests/baselines/reference/classWithConstructors.symbols +++ b/tests/baselines/reference/classWithConstructors.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/classes/members/constructorFunctionTypes/classWithConstructors.ts] //// === classWithConstructors.ts === -module NonGeneric { +namespace NonGeneric { >NonGeneric : Symbol(NonGeneric, Decl(classWithConstructors.ts, 0, 0)) class C { ->C : Symbol(C, Decl(classWithConstructors.ts, 0, 19)) +>C : Symbol(C, Decl(classWithConstructors.ts, 0, 22)) constructor(x: string) { } >x : Symbol(x, Decl(classWithConstructors.ts, 2, 20)) @@ -13,11 +13,11 @@ module NonGeneric { var c = new C(); // error >c : Symbol(c, Decl(classWithConstructors.ts, 5, 7)) ->C : Symbol(C, Decl(classWithConstructors.ts, 0, 19)) +>C : Symbol(C, Decl(classWithConstructors.ts, 0, 22)) var c2 = new C(''); // ok >c2 : Symbol(c2, Decl(classWithConstructors.ts, 6, 7)) ->C : Symbol(C, Decl(classWithConstructors.ts, 0, 19)) +>C : Symbol(C, Decl(classWithConstructors.ts, 0, 22)) class C2 { >C2 : Symbol(C2, Decl(classWithConstructors.ts, 6, 23)) @@ -61,11 +61,11 @@ module NonGeneric { >D : Symbol(D, Decl(classWithConstructors.ts, 16, 23)) } -module Generics { +namespace Generics { >Generics : Symbol(Generics, Decl(classWithConstructors.ts, 23, 1)) class C { ->C : Symbol(C, Decl(classWithConstructors.ts, 25, 17)) +>C : Symbol(C, Decl(classWithConstructors.ts, 25, 20)) >T : Symbol(T, Decl(classWithConstructors.ts, 26, 12)) constructor(x: T) { } @@ -75,11 +75,11 @@ module Generics { var c = new C(); // error >c : Symbol(c, Decl(classWithConstructors.ts, 30, 7)) ->C : Symbol(C, Decl(classWithConstructors.ts, 25, 17)) +>C : Symbol(C, Decl(classWithConstructors.ts, 25, 20)) var c2 = new C(''); // ok >c2 : Symbol(c2, Decl(classWithConstructors.ts, 31, 7)) ->C : Symbol(C, Decl(classWithConstructors.ts, 25, 17)) +>C : Symbol(C, Decl(classWithConstructors.ts, 25, 20)) class C2 { >C2 : Symbol(C2, Decl(classWithConstructors.ts, 31, 23)) diff --git a/tests/baselines/reference/classWithConstructors.types b/tests/baselines/reference/classWithConstructors.types index 5e40bd54ee517..01d54de477803 100644 --- a/tests/baselines/reference/classWithConstructors.types +++ b/tests/baselines/reference/classWithConstructors.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/classes/members/constructorFunctionTypes/classWithConstructors.ts] //// === classWithConstructors.ts === -module NonGeneric { +namespace NonGeneric { >NonGeneric : typeof NonGeneric > : ^^^^^^^^^^^^^^^^^ @@ -112,7 +112,7 @@ module NonGeneric { > : ^^ } -module Generics { +namespace Generics { >Generics : typeof Generics > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/classdecl.js b/tests/baselines/reference/classdecl.js index 9eea1a33f304e..9afd83763b15f 100644 --- a/tests/baselines/reference/classdecl.js +++ b/tests/baselines/reference/classdecl.js @@ -39,7 +39,7 @@ class a { class b extends a { } -module m1 { +namespace m1 { export class b { } class d { @@ -50,9 +50,9 @@ module m1 { } } -module m2 { +namespace m2 { - export module m3 { + export namespace m3 { export class c extends b { } export class ib2 implements m1.ib { diff --git a/tests/baselines/reference/classdecl.symbols b/tests/baselines/reference/classdecl.symbols index 24144721886f4..3610cc51bda66 100644 --- a/tests/baselines/reference/classdecl.symbols +++ b/tests/baselines/reference/classdecl.symbols @@ -73,11 +73,11 @@ class b extends a { >a : Symbol(a, Decl(classdecl.ts, 0, 0)) } -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(classdecl.ts, 36, 1)) export class b { ->b : Symbol(b, Decl(classdecl.ts, 38, 11)) +>b : Symbol(b, Decl(classdecl.ts, 38, 14)) } class d { >d : Symbol(d, Decl(classdecl.ts, 40, 5)) @@ -89,14 +89,14 @@ module m1 { } } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(classdecl.ts, 47, 1)) - export module m3 { ->m3 : Symbol(m3, Decl(classdecl.ts, 49, 11)) + export namespace m3 { +>m3 : Symbol(m3, Decl(classdecl.ts, 49, 14)) export class c extends b { ->c : Symbol(c, Decl(classdecl.ts, 51, 22)) +>c : Symbol(c, Decl(classdecl.ts, 51, 25)) >b : Symbol(b, Decl(classdecl.ts, 33, 1)) } export class ib2 implements m1.ib { @@ -110,9 +110,9 @@ module m2 { class c extends m1.b { >c : Symbol(c, Decl(classdecl.ts, 57, 1)) ->m1.b : Symbol(m1.b, Decl(classdecl.ts, 38, 11)) +>m1.b : Symbol(m1.b, Decl(classdecl.ts, 38, 14)) >m1 : Symbol(m1, Decl(classdecl.ts, 36, 1)) ->b : Symbol(m1.b, Decl(classdecl.ts, 38, 11)) +>b : Symbol(m1.b, Decl(classdecl.ts, 38, 14)) } class ib2 implements m1.ib { diff --git a/tests/baselines/reference/classdecl.types b/tests/baselines/reference/classdecl.types index 51fb325e33099..bb98c4bdc433c 100644 --- a/tests/baselines/reference/classdecl.types +++ b/tests/baselines/reference/classdecl.types @@ -107,7 +107,7 @@ class b extends a { > : ^ } -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -125,11 +125,11 @@ module m1 { } } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ - export module m3 { + export namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/clinterfaces.js b/tests/baselines/reference/clinterfaces.js index 721c2f06e4637..c14d793c68a1c 100644 --- a/tests/baselines/reference/clinterfaces.js +++ b/tests/baselines/reference/clinterfaces.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/clinterfaces.ts] //// //// [clinterfaces.ts] -module M { +namespace M { class C { } interface C { } interface D { } diff --git a/tests/baselines/reference/clinterfaces.symbols b/tests/baselines/reference/clinterfaces.symbols index 78482f2a8bef0..e581bf6d403ef 100644 --- a/tests/baselines/reference/clinterfaces.symbols +++ b/tests/baselines/reference/clinterfaces.symbols @@ -1,14 +1,14 @@ //// [tests/cases/compiler/clinterfaces.ts] //// === clinterfaces.ts === -module M { +namespace M { >M : Symbol(M, Decl(clinterfaces.ts, 0, 0)) class C { } ->C : Symbol(C, Decl(clinterfaces.ts, 0, 10), Decl(clinterfaces.ts, 1, 15)) +>C : Symbol(C, Decl(clinterfaces.ts, 0, 13), Decl(clinterfaces.ts, 1, 15)) interface C { } ->C : Symbol(C, Decl(clinterfaces.ts, 0, 10), Decl(clinterfaces.ts, 1, 15)) +>C : Symbol(C, Decl(clinterfaces.ts, 0, 13), Decl(clinterfaces.ts, 1, 15)) interface D { } >D : Symbol(D, Decl(clinterfaces.ts, 2, 19), Decl(clinterfaces.ts, 3, 19)) diff --git a/tests/baselines/reference/clinterfaces.types b/tests/baselines/reference/clinterfaces.types index bbfa442dfb462..d0d5917abd2dc 100644 --- a/tests/baselines/reference/clinterfaces.types +++ b/tests/baselines/reference/clinterfaces.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/clinterfaces.ts] //// === clinterfaces.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/cloduleAcrossModuleDefinitions.js b/tests/baselines/reference/cloduleAcrossModuleDefinitions.js index 00fe4fd836657..86007861f25c5 100644 --- a/tests/baselines/reference/cloduleAcrossModuleDefinitions.js +++ b/tests/baselines/reference/cloduleAcrossModuleDefinitions.js @@ -1,15 +1,15 @@ //// [tests/cases/compiler/cloduleAcrossModuleDefinitions.ts] //// //// [cloduleAcrossModuleDefinitions.ts] -module A { +namespace A { export class B { foo() { } static bar() { } } } -module A { - export module B { +namespace A { + export namespace B { export var x = 1; } } diff --git a/tests/baselines/reference/cloduleAcrossModuleDefinitions.symbols b/tests/baselines/reference/cloduleAcrossModuleDefinitions.symbols index 6ef39e5461975..6bcbb501a6f22 100644 --- a/tests/baselines/reference/cloduleAcrossModuleDefinitions.symbols +++ b/tests/baselines/reference/cloduleAcrossModuleDefinitions.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/cloduleAcrossModuleDefinitions.ts] //// === cloduleAcrossModuleDefinitions.ts === -module A { +namespace A { >A : Symbol(A, Decl(cloduleAcrossModuleDefinitions.ts, 0, 0), Decl(cloduleAcrossModuleDefinitions.ts, 5, 1)) export class B { ->B : Symbol(B, Decl(cloduleAcrossModuleDefinitions.ts, 0, 10), Decl(cloduleAcrossModuleDefinitions.ts, 7, 10)) +>B : Symbol(B, Decl(cloduleAcrossModuleDefinitions.ts, 0, 13), Decl(cloduleAcrossModuleDefinitions.ts, 7, 13)) foo() { } >foo : Symbol(B.foo, Decl(cloduleAcrossModuleDefinitions.ts, 1, 20)) @@ -15,11 +15,11 @@ module A { } } -module A { +namespace A { >A : Symbol(A, Decl(cloduleAcrossModuleDefinitions.ts, 0, 0), Decl(cloduleAcrossModuleDefinitions.ts, 5, 1)) - export module B { ->B : Symbol(B, Decl(cloduleAcrossModuleDefinitions.ts, 0, 10), Decl(cloduleAcrossModuleDefinitions.ts, 7, 10)) + export namespace B { +>B : Symbol(B, Decl(cloduleAcrossModuleDefinitions.ts, 0, 13), Decl(cloduleAcrossModuleDefinitions.ts, 7, 13)) export var x = 1; >x : Symbol(x, Decl(cloduleAcrossModuleDefinitions.ts, 9, 18)) @@ -29,5 +29,5 @@ module A { var b: A.B; // ok >b : Symbol(b, Decl(cloduleAcrossModuleDefinitions.ts, 13, 3)) >A : Symbol(A, Decl(cloduleAcrossModuleDefinitions.ts, 0, 0), Decl(cloduleAcrossModuleDefinitions.ts, 5, 1)) ->B : Symbol(A.B, Decl(cloduleAcrossModuleDefinitions.ts, 0, 10), Decl(cloduleAcrossModuleDefinitions.ts, 7, 10)) +>B : Symbol(A.B, Decl(cloduleAcrossModuleDefinitions.ts, 0, 13), Decl(cloduleAcrossModuleDefinitions.ts, 7, 13)) diff --git a/tests/baselines/reference/cloduleAcrossModuleDefinitions.types b/tests/baselines/reference/cloduleAcrossModuleDefinitions.types index 48ad9ed88147b..e8511258dd4a4 100644 --- a/tests/baselines/reference/cloduleAcrossModuleDefinitions.types +++ b/tests/baselines/reference/cloduleAcrossModuleDefinitions.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/cloduleAcrossModuleDefinitions.ts] //// === cloduleAcrossModuleDefinitions.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -19,11 +19,11 @@ module A { } } -module A { +namespace A { >A : typeof A > : ^^^^^^^^ - export module B { + export namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/cloduleAndTypeParameters.js b/tests/baselines/reference/cloduleAndTypeParameters.js index 05ed0449be515..aa32816aba82b 100644 --- a/tests/baselines/reference/cloduleAndTypeParameters.js +++ b/tests/baselines/reference/cloduleAndTypeParameters.js @@ -6,7 +6,7 @@ class Foo { } } -module Foo { +namespace Foo { export interface Bar { bar(): void; } diff --git a/tests/baselines/reference/cloduleAndTypeParameters.symbols b/tests/baselines/reference/cloduleAndTypeParameters.symbols index e71a69d6e398b..547c7e164eb52 100644 --- a/tests/baselines/reference/cloduleAndTypeParameters.symbols +++ b/tests/baselines/reference/cloduleAndTypeParameters.symbols @@ -5,17 +5,17 @@ class Foo { >Foo : Symbol(Foo, Decl(cloduleAndTypeParameters.ts, 0, 0), Decl(cloduleAndTypeParameters.ts, 3, 1)) >T : Symbol(T, Decl(cloduleAndTypeParameters.ts, 0, 10)) >Foo : Symbol(Foo, Decl(cloduleAndTypeParameters.ts, 0, 0), Decl(cloduleAndTypeParameters.ts, 3, 1)) ->Bar : Symbol(Foo.Bar, Decl(cloduleAndTypeParameters.ts, 5, 12)) +>Bar : Symbol(Foo.Bar, Decl(cloduleAndTypeParameters.ts, 5, 15)) constructor() { } } -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(cloduleAndTypeParameters.ts, 0, 0), Decl(cloduleAndTypeParameters.ts, 3, 1)) export interface Bar { ->Bar : Symbol(Bar, Decl(cloduleAndTypeParameters.ts, 5, 12)) +>Bar : Symbol(Bar, Decl(cloduleAndTypeParameters.ts, 5, 15)) bar(): void; >bar : Symbol(Bar.bar, Decl(cloduleAndTypeParameters.ts, 6, 24)) diff --git a/tests/baselines/reference/cloduleAndTypeParameters.types b/tests/baselines/reference/cloduleAndTypeParameters.types index 16357d8b60fed..36c79ebcc2961 100644 --- a/tests/baselines/reference/cloduleAndTypeParameters.types +++ b/tests/baselines/reference/cloduleAndTypeParameters.types @@ -11,7 +11,7 @@ class Foo { } } -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/cloduleSplitAcrossFiles.errors.txt b/tests/baselines/reference/cloduleSplitAcrossFiles.errors.txt index 0f8a911696aa3..860c231e7260d 100644 --- a/tests/baselines/reference/cloduleSplitAcrossFiles.errors.txt +++ b/tests/baselines/reference/cloduleSplitAcrossFiles.errors.txt @@ -1,12 +1,12 @@ -cloduleSplitAcrossFiles_module.ts(1,8): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged. +cloduleSplitAcrossFiles_module.ts(1,11): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged. ==== cloduleSplitAcrossFiles_class.ts (0 errors) ==== class D { } ==== cloduleSplitAcrossFiles_module.ts (1 errors) ==== - module D { - ~ + namespace D { + ~ !!! error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged. export var y = "hi"; } diff --git a/tests/baselines/reference/cloduleSplitAcrossFiles.js b/tests/baselines/reference/cloduleSplitAcrossFiles.js index b6394b13015af..511bfaa25dbe8 100644 --- a/tests/baselines/reference/cloduleSplitAcrossFiles.js +++ b/tests/baselines/reference/cloduleSplitAcrossFiles.js @@ -4,7 +4,7 @@ class D { } //// [cloduleSplitAcrossFiles_module.ts] -module D { +namespace D { export var y = "hi"; } D.y; diff --git a/tests/baselines/reference/cloduleSplitAcrossFiles.symbols b/tests/baselines/reference/cloduleSplitAcrossFiles.symbols index 27bb4fcfad34b..9676220c86ff6 100644 --- a/tests/baselines/reference/cloduleSplitAcrossFiles.symbols +++ b/tests/baselines/reference/cloduleSplitAcrossFiles.symbols @@ -5,7 +5,7 @@ class D { } >D : Symbol(D, Decl(cloduleSplitAcrossFiles_class.ts, 0, 0), Decl(cloduleSplitAcrossFiles_module.ts, 0, 0)) === cloduleSplitAcrossFiles_module.ts === -module D { +namespace D { >D : Symbol(D, Decl(cloduleSplitAcrossFiles_class.ts, 0, 0), Decl(cloduleSplitAcrossFiles_module.ts, 0, 0)) export var y = "hi"; diff --git a/tests/baselines/reference/cloduleSplitAcrossFiles.types b/tests/baselines/reference/cloduleSplitAcrossFiles.types index 52d783ade4466..81ba0ae78a556 100644 --- a/tests/baselines/reference/cloduleSplitAcrossFiles.types +++ b/tests/baselines/reference/cloduleSplitAcrossFiles.types @@ -6,7 +6,7 @@ class D { } > : ^ === cloduleSplitAcrossFiles_module.ts === -module D { +namespace D { >D : typeof D > : ^^^^^^^^ diff --git a/tests/baselines/reference/cloduleStaticMembers.errors.txt b/tests/baselines/reference/cloduleStaticMembers.errors.txt index 1be933c421ac2..2b2df09ea2619 100644 --- a/tests/baselines/reference/cloduleStaticMembers.errors.txt +++ b/tests/baselines/reference/cloduleStaticMembers.errors.txt @@ -8,7 +8,7 @@ cloduleStaticMembers.ts(10,13): error TS2304: Cannot find name 'y'. private static x = 10; public static y = 10; } - module Clod { + namespace Clod { var p = Clod.x; ~ !!! error TS2341: Property 'x' is private and only accessible within class 'Clod'. diff --git a/tests/baselines/reference/cloduleStaticMembers.js b/tests/baselines/reference/cloduleStaticMembers.js index 1369d17ee3cf2..7bb6bb421b744 100644 --- a/tests/baselines/reference/cloduleStaticMembers.js +++ b/tests/baselines/reference/cloduleStaticMembers.js @@ -5,7 +5,7 @@ class Clod { private static x = 10; public static y = 10; } -module Clod { +namespace Clod { var p = Clod.x; var q = x; diff --git a/tests/baselines/reference/cloduleStaticMembers.symbols b/tests/baselines/reference/cloduleStaticMembers.symbols index 02e02cc957332..5a67799010c2e 100644 --- a/tests/baselines/reference/cloduleStaticMembers.symbols +++ b/tests/baselines/reference/cloduleStaticMembers.symbols @@ -10,7 +10,7 @@ class Clod { public static y = 10; >y : Symbol(Clod.y, Decl(cloduleStaticMembers.ts, 1, 26)) } -module Clod { +namespace Clod { >Clod : Symbol(Clod, Decl(cloduleStaticMembers.ts, 0, 0), Decl(cloduleStaticMembers.ts, 3, 1)) var p = Clod.x; diff --git a/tests/baselines/reference/cloduleStaticMembers.types b/tests/baselines/reference/cloduleStaticMembers.types index fa7ec3af601df..0b0865f01ba91 100644 --- a/tests/baselines/reference/cloduleStaticMembers.types +++ b/tests/baselines/reference/cloduleStaticMembers.types @@ -17,7 +17,7 @@ class Clod { >10 : 10 > : ^^ } -module Clod { +namespace Clod { >Clod : typeof Clod > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/cloduleTest1.js b/tests/baselines/reference/cloduleTest1.js index a368d0f8b8ba4..5871181863b9a 100644 --- a/tests/baselines/reference/cloduleTest1.js +++ b/tests/baselines/reference/cloduleTest1.js @@ -5,7 +5,7 @@ interface $ { addClass(className: string): $; } - module $ { + namespace $ { export interface AjaxSettings { } export function ajax(options: AjaxSettings) { } diff --git a/tests/baselines/reference/cloduleTest1.symbols b/tests/baselines/reference/cloduleTest1.symbols index 10744b33a50b7..0ada382a6a5c4 100644 --- a/tests/baselines/reference/cloduleTest1.symbols +++ b/tests/baselines/reference/cloduleTest1.symbols @@ -14,16 +14,16 @@ >className : Symbol(className, Decl(cloduleTest1.ts, 2, 15)) >$ : Symbol($, Decl(cloduleTest1.ts, 0, 0), Decl(cloduleTest1.ts, 0, 42), Decl(cloduleTest1.ts, 3, 3)) } - module $ { + namespace $ { >$ : Symbol($, Decl(cloduleTest1.ts, 0, 0), Decl(cloduleTest1.ts, 0, 42), Decl(cloduleTest1.ts, 3, 3)) export interface AjaxSettings { ->AjaxSettings : Symbol(AjaxSettings, Decl(cloduleTest1.ts, 4, 12)) +>AjaxSettings : Symbol(AjaxSettings, Decl(cloduleTest1.ts, 4, 15)) } export function ajax(options: AjaxSettings) { } >ajax : Symbol(ajax, Decl(cloduleTest1.ts, 6, 5)) >options : Symbol(options, Decl(cloduleTest1.ts, 7, 25)) ->AjaxSettings : Symbol(AjaxSettings, Decl(cloduleTest1.ts, 4, 12)) +>AjaxSettings : Symbol(AjaxSettings, Decl(cloduleTest1.ts, 4, 15)) } var it: $ = $('.foo').addClass('bar'); >it : Symbol(it, Decl(cloduleTest1.ts, 9, 5)) diff --git a/tests/baselines/reference/cloduleTest1.types b/tests/baselines/reference/cloduleTest1.types index 30d56ceaeb475..c9976b2dfac3f 100644 --- a/tests/baselines/reference/cloduleTest1.types +++ b/tests/baselines/reference/cloduleTest1.types @@ -14,7 +14,7 @@ >className : string > : ^^^^^^ } - module $ { + namespace $ { >$ : typeof $ > : ^^^^^^^^ diff --git a/tests/baselines/reference/cloduleTest2.errors.txt b/tests/baselines/reference/cloduleTest2.errors.txt index 674f2c0ea65ab..b4ef3af55f961 100644 --- a/tests/baselines/reference/cloduleTest2.errors.txt +++ b/tests/baselines/reference/cloduleTest2.errors.txt @@ -9,8 +9,8 @@ cloduleTest2.ts(36,10): error TS2554: Expected 1 arguments, but got 0. ==== cloduleTest2.ts (8 errors) ==== - module T1 { - module m3d { export var y = 2; } + namespace T1 { + namespace m3d { export var y = 2; } declare class m3d { constructor(foo); foo(): void ; static bar(); } var r = new m3d(); // error ~~~~~~~~~ @@ -18,17 +18,17 @@ cloduleTest2.ts(36,10): error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 cloduleTest2.ts:3:37: An argument for 'foo' was not provided. } - module T2 { + namespace T2 { declare class m3d { constructor(foo); foo(): void; static bar(); } - module m3d { export var y = 2; } + namespace m3d { export var y = 2; } var r = new m3d(); // error ~~~~~~~~~ !!! error TS2554: Expected 1 arguments, but got 0. !!! related TS6210 cloduleTest2.ts:8:37: An argument for 'foo' was not provided. } - module T3 { - module m3d { export var y = 2; } + namespace T3 { + namespace m3d { export var y = 2; } declare class m3d { foo(): void; static bar(); } var r = new m3d(); r.foo(); @@ -40,9 +40,9 @@ cloduleTest2.ts(36,10): error TS2554: Expected 1 arguments, but got 0. !!! error TS2339: Property 'y' does not exist on type 'm3d'. } - module T4 { + namespace T4 { declare class m3d { foo(): void; static bar(); } - module m3d { export var y = 2; } + namespace m3d { export var y = 2; } var r = new m3d(); r.foo(); r.bar(); // error @@ -53,7 +53,7 @@ cloduleTest2.ts(36,10): error TS2554: Expected 1 arguments, but got 0. !!! error TS2339: Property 'y' does not exist on type 'm3d'. } - module m3d { export var y = 2; } + namespace m3d { export var y = 2; } declare class m3d { constructor(foo); foo(): void; static bar(); } var r = new m3d(); // error ~~~~~~~~~ diff --git a/tests/baselines/reference/cloduleTest2.js b/tests/baselines/reference/cloduleTest2.js index 744787300efae..e0db44788bed9 100644 --- a/tests/baselines/reference/cloduleTest2.js +++ b/tests/baselines/reference/cloduleTest2.js @@ -1,20 +1,20 @@ //// [tests/cases/compiler/cloduleTest2.ts] //// //// [cloduleTest2.ts] -module T1 { - module m3d { export var y = 2; } +namespace T1 { + namespace m3d { export var y = 2; } declare class m3d { constructor(foo); foo(): void ; static bar(); } var r = new m3d(); // error } -module T2 { +namespace T2 { declare class m3d { constructor(foo); foo(): void; static bar(); } - module m3d { export var y = 2; } + namespace m3d { export var y = 2; } var r = new m3d(); // error } -module T3 { - module m3d { export var y = 2; } +namespace T3 { + namespace m3d { export var y = 2; } declare class m3d { foo(): void; static bar(); } var r = new m3d(); r.foo(); @@ -22,16 +22,16 @@ module T3 { r.y; // error } -module T4 { +namespace T4 { declare class m3d { foo(): void; static bar(); } - module m3d { export var y = 2; } + namespace m3d { export var y = 2; } var r = new m3d(); r.foo(); r.bar(); // error r.y; // error } -module m3d { export var y = 2; } +namespace m3d { export var y = 2; } declare class m3d { constructor(foo); foo(): void; static bar(); } var r = new m3d(); // error diff --git a/tests/baselines/reference/cloduleTest2.symbols b/tests/baselines/reference/cloduleTest2.symbols index 309044a19b694..42051518f1673 100644 --- a/tests/baselines/reference/cloduleTest2.symbols +++ b/tests/baselines/reference/cloduleTest2.symbols @@ -1,57 +1,57 @@ //// [tests/cases/compiler/cloduleTest2.ts] //// === cloduleTest2.ts === -module T1 { +namespace T1 { >T1 : Symbol(T1, Decl(cloduleTest2.ts, 0, 0)) - module m3d { export var y = 2; } ->m3d : Symbol(m3d, Decl(cloduleTest2.ts, 0, 11), Decl(cloduleTest2.ts, 1, 36)) ->y : Symbol(y, Decl(cloduleTest2.ts, 1, 27)) + namespace m3d { export var y = 2; } +>m3d : Symbol(m3d, Decl(cloduleTest2.ts, 0, 14), Decl(cloduleTest2.ts, 1, 39)) +>y : Symbol(y, Decl(cloduleTest2.ts, 1, 30)) declare class m3d { constructor(foo); foo(): void ; static bar(); } ->m3d : Symbol(m3d, Decl(cloduleTest2.ts, 0, 11), Decl(cloduleTest2.ts, 1, 36)) +>m3d : Symbol(m3d, Decl(cloduleTest2.ts, 0, 14), Decl(cloduleTest2.ts, 1, 39)) >foo : Symbol(foo, Decl(cloduleTest2.ts, 2, 36)) >foo : Symbol(m3d.foo, Decl(cloduleTest2.ts, 2, 41)) >bar : Symbol(m3d.bar, Decl(cloduleTest2.ts, 2, 55)) var r = new m3d(); // error >r : Symbol(r, Decl(cloduleTest2.ts, 3, 7)) ->m3d : Symbol(m3d, Decl(cloduleTest2.ts, 0, 11), Decl(cloduleTest2.ts, 1, 36)) +>m3d : Symbol(m3d, Decl(cloduleTest2.ts, 0, 14), Decl(cloduleTest2.ts, 1, 39)) } -module T2 { +namespace T2 { >T2 : Symbol(T2, Decl(cloduleTest2.ts, 4, 1)) declare class m3d { constructor(foo); foo(): void; static bar(); } ->m3d : Symbol(m3d, Decl(cloduleTest2.ts, 6, 11), Decl(cloduleTest2.ts, 7, 70)) +>m3d : Symbol(m3d, Decl(cloduleTest2.ts, 6, 14), Decl(cloduleTest2.ts, 7, 70)) >foo : Symbol(foo, Decl(cloduleTest2.ts, 7, 36)) >foo : Symbol(m3d.foo, Decl(cloduleTest2.ts, 7, 41)) >bar : Symbol(m3d.bar, Decl(cloduleTest2.ts, 7, 54)) - module m3d { export var y = 2; } ->m3d : Symbol(m3d, Decl(cloduleTest2.ts, 6, 11), Decl(cloduleTest2.ts, 7, 70)) ->y : Symbol(y, Decl(cloduleTest2.ts, 8, 27)) + namespace m3d { export var y = 2; } +>m3d : Symbol(m3d, Decl(cloduleTest2.ts, 6, 14), Decl(cloduleTest2.ts, 7, 70)) +>y : Symbol(y, Decl(cloduleTest2.ts, 8, 30)) var r = new m3d(); // error >r : Symbol(r, Decl(cloduleTest2.ts, 9, 7)) ->m3d : Symbol(m3d, Decl(cloduleTest2.ts, 6, 11), Decl(cloduleTest2.ts, 7, 70)) +>m3d : Symbol(m3d, Decl(cloduleTest2.ts, 6, 14), Decl(cloduleTest2.ts, 7, 70)) } -module T3 { +namespace T3 { >T3 : Symbol(T3, Decl(cloduleTest2.ts, 10, 1)) - module m3d { export var y = 2; } ->m3d : Symbol(m3d, Decl(cloduleTest2.ts, 12, 11), Decl(cloduleTest2.ts, 13, 36)) ->y : Symbol(y, Decl(cloduleTest2.ts, 13, 27)) + namespace m3d { export var y = 2; } +>m3d : Symbol(m3d, Decl(cloduleTest2.ts, 12, 14), Decl(cloduleTest2.ts, 13, 39)) +>y : Symbol(y, Decl(cloduleTest2.ts, 13, 30)) declare class m3d { foo(): void; static bar(); } ->m3d : Symbol(m3d, Decl(cloduleTest2.ts, 12, 11), Decl(cloduleTest2.ts, 13, 36)) +>m3d : Symbol(m3d, Decl(cloduleTest2.ts, 12, 14), Decl(cloduleTest2.ts, 13, 39)) >foo : Symbol(m3d.foo, Decl(cloduleTest2.ts, 14, 23)) >bar : Symbol(m3d.bar, Decl(cloduleTest2.ts, 14, 36)) var r = new m3d(); >r : Symbol(r, Decl(cloduleTest2.ts, 15, 7)) ->m3d : Symbol(m3d, Decl(cloduleTest2.ts, 12, 11), Decl(cloduleTest2.ts, 13, 36)) +>m3d : Symbol(m3d, Decl(cloduleTest2.ts, 12, 14), Decl(cloduleTest2.ts, 13, 39)) r.foo(); >r.foo : Symbol(m3d.foo, Decl(cloduleTest2.ts, 14, 23)) @@ -65,21 +65,21 @@ module T3 { >r : Symbol(r, Decl(cloduleTest2.ts, 15, 7)) } -module T4 { +namespace T4 { >T4 : Symbol(T4, Decl(cloduleTest2.ts, 19, 1)) declare class m3d { foo(): void; static bar(); } ->m3d : Symbol(m3d, Decl(cloduleTest2.ts, 21, 11), Decl(cloduleTest2.ts, 22, 52)) +>m3d : Symbol(m3d, Decl(cloduleTest2.ts, 21, 14), Decl(cloduleTest2.ts, 22, 52)) >foo : Symbol(m3d.foo, Decl(cloduleTest2.ts, 22, 23)) >bar : Symbol(m3d.bar, Decl(cloduleTest2.ts, 22, 36)) - module m3d { export var y = 2; } ->m3d : Symbol(m3d, Decl(cloduleTest2.ts, 21, 11), Decl(cloduleTest2.ts, 22, 52)) ->y : Symbol(y, Decl(cloduleTest2.ts, 23, 27)) + namespace m3d { export var y = 2; } +>m3d : Symbol(m3d, Decl(cloduleTest2.ts, 21, 14), Decl(cloduleTest2.ts, 22, 52)) +>y : Symbol(y, Decl(cloduleTest2.ts, 23, 30)) var r = new m3d(); >r : Symbol(r, Decl(cloduleTest2.ts, 24, 7)) ->m3d : Symbol(m3d, Decl(cloduleTest2.ts, 21, 11), Decl(cloduleTest2.ts, 22, 52)) +>m3d : Symbol(m3d, Decl(cloduleTest2.ts, 21, 14), Decl(cloduleTest2.ts, 22, 52)) r.foo(); >r.foo : Symbol(m3d.foo, Decl(cloduleTest2.ts, 22, 23)) @@ -93,23 +93,23 @@ module T4 { >r : Symbol(r, Decl(cloduleTest2.ts, 24, 7)) } -module m3d { export var y = 2; } ->m3d : Symbol(m3d, Decl(cloduleTest2.ts, 28, 1), Decl(cloduleTest2.ts, 30, 32)) ->y : Symbol(y, Decl(cloduleTest2.ts, 30, 23)) +namespace m3d { export var y = 2; } +>m3d : Symbol(m3d, Decl(cloduleTest2.ts, 28, 1), Decl(cloduleTest2.ts, 30, 35)) +>y : Symbol(y, Decl(cloduleTest2.ts, 30, 26)) declare class m3d { constructor(foo); foo(): void; static bar(); } ->m3d : Symbol(m3d, Decl(cloduleTest2.ts, 28, 1), Decl(cloduleTest2.ts, 30, 32)) +>m3d : Symbol(m3d, Decl(cloduleTest2.ts, 28, 1), Decl(cloduleTest2.ts, 30, 35)) >foo : Symbol(foo, Decl(cloduleTest2.ts, 31, 32)) >foo : Symbol(m3d.foo, Decl(cloduleTest2.ts, 31, 37)) >bar : Symbol(m3d.bar, Decl(cloduleTest2.ts, 31, 50)) var r = new m3d(); // error >r : Symbol(r, Decl(cloduleTest2.ts, 32, 3)) ->m3d : Symbol(m3d, Decl(cloduleTest2.ts, 28, 1), Decl(cloduleTest2.ts, 30, 32)) +>m3d : Symbol(m3d, Decl(cloduleTest2.ts, 28, 1), Decl(cloduleTest2.ts, 30, 35)) declare class m4d extends m3d { } >m4d : Symbol(m4d, Decl(cloduleTest2.ts, 32, 18)) ->m3d : Symbol(m3d, Decl(cloduleTest2.ts, 28, 1), Decl(cloduleTest2.ts, 30, 32)) +>m3d : Symbol(m3d, Decl(cloduleTest2.ts, 28, 1), Decl(cloduleTest2.ts, 30, 35)) var r2 = new m4d(); // error >r2 : Symbol(r2, Decl(cloduleTest2.ts, 35, 3)) diff --git a/tests/baselines/reference/cloduleTest2.types b/tests/baselines/reference/cloduleTest2.types index 64d322466145c..bdfad52352ee6 100644 --- a/tests/baselines/reference/cloduleTest2.types +++ b/tests/baselines/reference/cloduleTest2.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/cloduleTest2.ts] //// === cloduleTest2.ts === -module T1 { +namespace T1 { >T1 : typeof T1 > : ^^^^^^^^^ - module m3d { export var y = 2; } + namespace m3d { export var y = 2; } >m3d : typeof m3d > : ^^^^^^^^^^ >y : number @@ -32,7 +32,7 @@ module T1 { > : ^^^^^^^^^^ } -module T2 { +namespace T2 { >T2 : typeof T2 > : ^^^^^^^^^ @@ -46,7 +46,7 @@ module T2 { >bar : () => any > : ^^^^^^^^^ - module m3d { export var y = 2; } + namespace m3d { export var y = 2; } >m3d : typeof m3d > : ^^^^^^^^^^ >y : number @@ -63,11 +63,11 @@ module T2 { > : ^^^^^^^^^^ } -module T3 { +namespace T3 { >T3 : typeof T3 > : ^^^^^^^^^ - module m3d { export var y = 2; } + namespace m3d { export var y = 2; } >m3d : typeof m3d > : ^^^^^^^^^^ >y : number @@ -120,7 +120,7 @@ module T3 { > : ^^^ } -module T4 { +namespace T4 { >T4 : typeof T4 > : ^^^^^^^^^ @@ -132,7 +132,7 @@ module T4 { >bar : () => any > : ^^^^^^^^^ - module m3d { export var y = 2; } + namespace m3d { export var y = 2; } >m3d : typeof m3d > : ^^^^^^^^^^ >y : number @@ -177,7 +177,7 @@ module T4 { > : ^^^ } -module m3d { export var y = 2; } +namespace m3d { export var y = 2; } >m3d : typeof m3d > : ^^^^^^^^^^ >y : number diff --git a/tests/baselines/reference/cloduleWithDuplicateMember1.errors.txt b/tests/baselines/reference/cloduleWithDuplicateMember1.errors.txt index acbf37b3e83e3..5f1565d62b435 100644 --- a/tests/baselines/reference/cloduleWithDuplicateMember1.errors.txt +++ b/tests/baselines/reference/cloduleWithDuplicateMember1.errors.txt @@ -18,12 +18,12 @@ cloduleWithDuplicateMember1.ts(14,21): error TS2300: Duplicate identifier 'x'. !!! error TS2300: Duplicate identifier 'foo'. } - module C { + namespace C { export var x = 1; ~ !!! error TS2300: Duplicate identifier 'x'. } - module C { + namespace C { export function foo() { } ~~~ !!! error TS2300: Duplicate identifier 'foo'. diff --git a/tests/baselines/reference/cloduleWithDuplicateMember1.js b/tests/baselines/reference/cloduleWithDuplicateMember1.js index b6527dccfafa7..bffab90d12ba4 100644 --- a/tests/baselines/reference/cloduleWithDuplicateMember1.js +++ b/tests/baselines/reference/cloduleWithDuplicateMember1.js @@ -9,10 +9,10 @@ class C { static foo() { } } -module C { +namespace C { export var x = 1; } -module C { +namespace C { export function foo() { } export function x() { } } diff --git a/tests/baselines/reference/cloduleWithDuplicateMember1.symbols b/tests/baselines/reference/cloduleWithDuplicateMember1.symbols index eb65443f324da..633d93c5890b9 100644 --- a/tests/baselines/reference/cloduleWithDuplicateMember1.symbols +++ b/tests/baselines/reference/cloduleWithDuplicateMember1.symbols @@ -16,17 +16,17 @@ class C { >foo : Symbol(C.foo, Decl(cloduleWithDuplicateMember1.ts, 4, 5)) } -module C { +namespace C { >C : Symbol(C, Decl(cloduleWithDuplicateMember1.ts, 0, 0), Decl(cloduleWithDuplicateMember1.ts, 6, 1), Decl(cloduleWithDuplicateMember1.ts, 10, 1)) export var x = 1; >x : Symbol(x, Decl(cloduleWithDuplicateMember1.ts, 9, 14)) } -module C { +namespace C { >C : Symbol(C, Decl(cloduleWithDuplicateMember1.ts, 0, 0), Decl(cloduleWithDuplicateMember1.ts, 6, 1), Decl(cloduleWithDuplicateMember1.ts, 10, 1)) export function foo() { } ->foo : Symbol(foo, Decl(cloduleWithDuplicateMember1.ts, 11, 10)) +>foo : Symbol(foo, Decl(cloduleWithDuplicateMember1.ts, 11, 13)) export function x() { } >x : Symbol(x, Decl(cloduleWithDuplicateMember1.ts, 12, 29)) diff --git a/tests/baselines/reference/cloduleWithDuplicateMember1.types b/tests/baselines/reference/cloduleWithDuplicateMember1.types index af346996d3f7c..9cba70a078251 100644 --- a/tests/baselines/reference/cloduleWithDuplicateMember1.types +++ b/tests/baselines/reference/cloduleWithDuplicateMember1.types @@ -24,7 +24,7 @@ class C { > : ^^^^^^^^^^ } -module C { +namespace C { >C : typeof C > : ^^^^^^^^ @@ -34,7 +34,7 @@ module C { >1 : 1 > : ^ } -module C { +namespace C { >C : typeof C > : ^^^^^^^^ diff --git a/tests/baselines/reference/cloduleWithDuplicateMember2.errors.txt b/tests/baselines/reference/cloduleWithDuplicateMember2.errors.txt index 1c14d0ce1f4aa..94efc9765e19b 100644 --- a/tests/baselines/reference/cloduleWithDuplicateMember2.errors.txt +++ b/tests/baselines/reference/cloduleWithDuplicateMember2.errors.txt @@ -8,12 +8,12 @@ cloduleWithDuplicateMember2.ts(10,21): error TS2300: Duplicate identifier 'x'. static set y(z) { } } - module C { + namespace C { export var x = 1; ~ !!! error TS2300: Duplicate identifier 'x'. } - module C { + namespace C { export function x() { } ~ !!! error TS2300: Duplicate identifier 'x'. diff --git a/tests/baselines/reference/cloduleWithDuplicateMember2.js b/tests/baselines/reference/cloduleWithDuplicateMember2.js index 72d14ee191f8e..acef3c11588c9 100644 --- a/tests/baselines/reference/cloduleWithDuplicateMember2.js +++ b/tests/baselines/reference/cloduleWithDuplicateMember2.js @@ -6,10 +6,10 @@ class C { static set y(z) { } } -module C { +namespace C { export var x = 1; } -module C { +namespace C { export function x() { } } diff --git a/tests/baselines/reference/cloduleWithDuplicateMember2.symbols b/tests/baselines/reference/cloduleWithDuplicateMember2.symbols index f44defb8206ea..b711a0ff418ea 100644 --- a/tests/baselines/reference/cloduleWithDuplicateMember2.symbols +++ b/tests/baselines/reference/cloduleWithDuplicateMember2.symbols @@ -13,15 +13,15 @@ class C { >z : Symbol(z, Decl(cloduleWithDuplicateMember2.ts, 2, 17)) } -module C { +namespace C { >C : Symbol(C, Decl(cloduleWithDuplicateMember2.ts, 0, 0), Decl(cloduleWithDuplicateMember2.ts, 3, 1), Decl(cloduleWithDuplicateMember2.ts, 7, 1)) export var x = 1; >x : Symbol(x, Decl(cloduleWithDuplicateMember2.ts, 6, 14)) } -module C { +namespace C { >C : Symbol(C, Decl(cloduleWithDuplicateMember2.ts, 0, 0), Decl(cloduleWithDuplicateMember2.ts, 3, 1), Decl(cloduleWithDuplicateMember2.ts, 7, 1)) export function x() { } ->x : Symbol(x, Decl(cloduleWithDuplicateMember2.ts, 8, 10)) +>x : Symbol(x, Decl(cloduleWithDuplicateMember2.ts, 8, 13)) } diff --git a/tests/baselines/reference/cloduleWithDuplicateMember2.types b/tests/baselines/reference/cloduleWithDuplicateMember2.types index 1857182352310..b77c35353274b 100644 --- a/tests/baselines/reference/cloduleWithDuplicateMember2.types +++ b/tests/baselines/reference/cloduleWithDuplicateMember2.types @@ -18,7 +18,7 @@ class C { > : ^^^ } -module C { +namespace C { >C : typeof C > : ^^^^^^^^ @@ -28,7 +28,7 @@ module C { >1 : 1 > : ^ } -module C { +namespace C { >C : typeof C > : ^^^^^^^^ diff --git a/tests/baselines/reference/cloduleWithPriorInstantiatedModule.errors.txt b/tests/baselines/reference/cloduleWithPriorInstantiatedModule.errors.txt index 22851740d13f9..5214553694af7 100644 --- a/tests/baselines/reference/cloduleWithPriorInstantiatedModule.errors.txt +++ b/tests/baselines/reference/cloduleWithPriorInstantiatedModule.errors.txt @@ -1,10 +1,10 @@ -cloduleWithPriorInstantiatedModule.ts(2,8): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. +cloduleWithPriorInstantiatedModule.ts(2,11): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. ==== cloduleWithPriorInstantiatedModule.ts (1 errors) ==== // Non-ambient & instantiated module. - module Moclodule { - ~~~~~~~~~ + namespace Moclodule { + ~~~~~~~~~ !!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. export interface Someinterface { foo(): void; @@ -16,7 +16,7 @@ cloduleWithPriorInstantiatedModule.ts(2,8): error TS2434: A namespace declaratio } // Instantiated module. - module Moclodule { + namespace Moclodule { export class Manager { } } \ No newline at end of file diff --git a/tests/baselines/reference/cloduleWithPriorInstantiatedModule.js b/tests/baselines/reference/cloduleWithPriorInstantiatedModule.js index 693d3f0dcf26d..eda6dfba65985 100644 --- a/tests/baselines/reference/cloduleWithPriorInstantiatedModule.js +++ b/tests/baselines/reference/cloduleWithPriorInstantiatedModule.js @@ -2,7 +2,7 @@ //// [cloduleWithPriorInstantiatedModule.ts] // Non-ambient & instantiated module. -module Moclodule { +namespace Moclodule { export interface Someinterface { foo(): void; } @@ -13,7 +13,7 @@ class Moclodule { } // Instantiated module. -module Moclodule { +namespace Moclodule { export class Manager { } } diff --git a/tests/baselines/reference/cloduleWithPriorInstantiatedModule.symbols b/tests/baselines/reference/cloduleWithPriorInstantiatedModule.symbols index df057830e003b..a6a487bd636ac 100644 --- a/tests/baselines/reference/cloduleWithPriorInstantiatedModule.symbols +++ b/tests/baselines/reference/cloduleWithPriorInstantiatedModule.symbols @@ -2,11 +2,11 @@ === cloduleWithPriorInstantiatedModule.ts === // Non-ambient & instantiated module. -module Moclodule { +namespace Moclodule { >Moclodule : Symbol(Moclodule, Decl(cloduleWithPriorInstantiatedModule.ts, 0, 0), Decl(cloduleWithPriorInstantiatedModule.ts, 6, 1), Decl(cloduleWithPriorInstantiatedModule.ts, 9, 1)) export interface Someinterface { ->Someinterface : Symbol(Someinterface, Decl(cloduleWithPriorInstantiatedModule.ts, 1, 18)) +>Someinterface : Symbol(Someinterface, Decl(cloduleWithPriorInstantiatedModule.ts, 1, 21)) foo(): void; >foo : Symbol(Someinterface.foo, Decl(cloduleWithPriorInstantiatedModule.ts, 2, 36)) @@ -20,10 +20,10 @@ class Moclodule { } // Instantiated module. -module Moclodule { +namespace Moclodule { >Moclodule : Symbol(Moclodule, Decl(cloduleWithPriorInstantiatedModule.ts, 0, 0), Decl(cloduleWithPriorInstantiatedModule.ts, 6, 1), Decl(cloduleWithPriorInstantiatedModule.ts, 9, 1)) export class Manager { ->Manager : Symbol(Manager, Decl(cloduleWithPriorInstantiatedModule.ts, 12, 18)) +>Manager : Symbol(Manager, Decl(cloduleWithPriorInstantiatedModule.ts, 12, 21)) } } diff --git a/tests/baselines/reference/cloduleWithPriorInstantiatedModule.types b/tests/baselines/reference/cloduleWithPriorInstantiatedModule.types index c5afb7998d7d9..98affc0e3b05f 100644 --- a/tests/baselines/reference/cloduleWithPriorInstantiatedModule.types +++ b/tests/baselines/reference/cloduleWithPriorInstantiatedModule.types @@ -2,7 +2,7 @@ === cloduleWithPriorInstantiatedModule.ts === // Non-ambient & instantiated module. -module Moclodule { +namespace Moclodule { >Moclodule : typeof Moclodule > : ^^^^^^^^^^^^^^^^ @@ -24,7 +24,7 @@ class Moclodule { } // Instantiated module. -module Moclodule { +namespace Moclodule { >Moclodule : typeof Moclodule > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.js b/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.js index b3fec9d6cb100..189d029c69b51 100644 --- a/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.js +++ b/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.js @@ -2,7 +2,7 @@ //// [cloduleWithPriorUninstantiatedModule.ts] // Non-ambient & uninstantiated module. -module Moclodule { +namespace Moclodule { export interface Someinterface { foo(): void; } @@ -12,7 +12,7 @@ class Moclodule { } // Instantiated module. -module Moclodule { +namespace Moclodule { export class Manager { } } diff --git a/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.symbols b/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.symbols index c87b6b7ee256a..fb7486917f9f5 100644 --- a/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.symbols +++ b/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.symbols @@ -2,11 +2,11 @@ === cloduleWithPriorUninstantiatedModule.ts === // Non-ambient & uninstantiated module. -module Moclodule { +namespace Moclodule { >Moclodule : Symbol(Moclodule, Decl(cloduleWithPriorUninstantiatedModule.ts, 0, 0), Decl(cloduleWithPriorUninstantiatedModule.ts, 5, 1), Decl(cloduleWithPriorUninstantiatedModule.ts, 8, 1)) export interface Someinterface { ->Someinterface : Symbol(Someinterface, Decl(cloduleWithPriorUninstantiatedModule.ts, 1, 18)) +>Someinterface : Symbol(Someinterface, Decl(cloduleWithPriorUninstantiatedModule.ts, 1, 21)) foo(): void; >foo : Symbol(Someinterface.foo, Decl(cloduleWithPriorUninstantiatedModule.ts, 2, 36)) @@ -18,10 +18,10 @@ class Moclodule { } // Instantiated module. -module Moclodule { +namespace Moclodule { >Moclodule : Symbol(Moclodule, Decl(cloduleWithPriorUninstantiatedModule.ts, 0, 0), Decl(cloduleWithPriorUninstantiatedModule.ts, 5, 1), Decl(cloduleWithPriorUninstantiatedModule.ts, 8, 1)) export class Manager { ->Manager : Symbol(Manager, Decl(cloduleWithPriorUninstantiatedModule.ts, 11, 18)) +>Manager : Symbol(Manager, Decl(cloduleWithPriorUninstantiatedModule.ts, 11, 21)) } } diff --git a/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.types b/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.types index 6c6d1afd1c9ef..30d8e199a31d2 100644 --- a/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.types +++ b/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.types @@ -2,7 +2,7 @@ === cloduleWithPriorUninstantiatedModule.ts === // Non-ambient & uninstantiated module. -module Moclodule { +namespace Moclodule { export interface Someinterface { foo(): void; >foo : () => void @@ -16,7 +16,7 @@ class Moclodule { } // Instantiated module. -module Moclodule { +namespace Moclodule { >Moclodule : typeof Moclodule > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/cloduleWithRecursiveReference.js b/tests/baselines/reference/cloduleWithRecursiveReference.js index 155347b1971a4..6a5e57b64b76f 100644 --- a/tests/baselines/reference/cloduleWithRecursiveReference.js +++ b/tests/baselines/reference/cloduleWithRecursiveReference.js @@ -1,10 +1,10 @@ //// [tests/cases/compiler/cloduleWithRecursiveReference.ts] //// //// [cloduleWithRecursiveReference.ts] -module M +namespace M { export class C { } - export module C { + export namespace C { export var C = M.C } } diff --git a/tests/baselines/reference/cloduleWithRecursiveReference.symbols b/tests/baselines/reference/cloduleWithRecursiveReference.symbols index ae19a034a1fac..08d99dc3d7224 100644 --- a/tests/baselines/reference/cloduleWithRecursiveReference.symbols +++ b/tests/baselines/reference/cloduleWithRecursiveReference.symbols @@ -1,13 +1,13 @@ //// [tests/cases/compiler/cloduleWithRecursiveReference.ts] //// === cloduleWithRecursiveReference.ts === -module M +namespace M >M : Symbol(M, Decl(cloduleWithRecursiveReference.ts, 0, 0)) { export class C { } >C : Symbol(C, Decl(cloduleWithRecursiveReference.ts, 1, 1), Decl(cloduleWithRecursiveReference.ts, 2, 21)) - export module C { + export namespace C { >C : Symbol(C, Decl(cloduleWithRecursiveReference.ts, 1, 1), Decl(cloduleWithRecursiveReference.ts, 2, 21)) export var C = M.C diff --git a/tests/baselines/reference/cloduleWithRecursiveReference.types b/tests/baselines/reference/cloduleWithRecursiveReference.types index bfd432a1478ff..0f1a6b0b2343e 100644 --- a/tests/baselines/reference/cloduleWithRecursiveReference.types +++ b/tests/baselines/reference/cloduleWithRecursiveReference.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/cloduleWithRecursiveReference.ts] //// === cloduleWithRecursiveReference.ts === -module M +namespace M >M : typeof M > : ^^^^^^^^ { @@ -9,7 +9,7 @@ module M >C : C > : ^ - export module C { + export namespace C { >C : typeof M.C > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/clodulesDerivedClasses.errors.txt b/tests/baselines/reference/clodulesDerivedClasses.errors.txt index 416a7bba14857..72893772429cf 100644 --- a/tests/baselines/reference/clodulesDerivedClasses.errors.txt +++ b/tests/baselines/reference/clodulesDerivedClasses.errors.txt @@ -8,7 +8,7 @@ clodulesDerivedClasses.ts(9,7): error TS2417: Class static side 'typeof Path' in id: number; } - module Shape.Utils { + namespace Shape.Utils { export function convert(): Shape { return null;} } @@ -22,7 +22,7 @@ clodulesDerivedClasses.ts(9,7): error TS2417: Class static side 'typeof Path' in } - module Path.Utils { + namespace Path.Utils { export function convert2(): Path { return null; } diff --git a/tests/baselines/reference/clodulesDerivedClasses.js b/tests/baselines/reference/clodulesDerivedClasses.js index 19e0bf79d4a86..688ecf7e23c4e 100644 --- a/tests/baselines/reference/clodulesDerivedClasses.js +++ b/tests/baselines/reference/clodulesDerivedClasses.js @@ -5,7 +5,7 @@ class Shape { id: number; } -module Shape.Utils { +namespace Shape.Utils { export function convert(): Shape { return null;} } @@ -14,7 +14,7 @@ class Path extends Shape { } -module Path.Utils { +namespace Path.Utils { export function convert2(): Path { return null; } diff --git a/tests/baselines/reference/clodulesDerivedClasses.symbols b/tests/baselines/reference/clodulesDerivedClasses.symbols index 33de2537ff0b9..1953ac9435a92 100644 --- a/tests/baselines/reference/clodulesDerivedClasses.symbols +++ b/tests/baselines/reference/clodulesDerivedClasses.symbols @@ -8,12 +8,12 @@ class Shape { >id : Symbol(Shape.id, Decl(clodulesDerivedClasses.ts, 0, 13)) } -module Shape.Utils { +namespace Shape.Utils { >Shape : Symbol(Shape, Decl(clodulesDerivedClasses.ts, 0, 0), Decl(clodulesDerivedClasses.ts, 2, 1)) ->Utils : Symbol(Utils, Decl(clodulesDerivedClasses.ts, 4, 13)) +>Utils : Symbol(Utils, Decl(clodulesDerivedClasses.ts, 4, 16)) export function convert(): Shape { return null;} ->convert : Symbol(convert, Decl(clodulesDerivedClasses.ts, 4, 20)) +>convert : Symbol(convert, Decl(clodulesDerivedClasses.ts, 4, 23)) >Shape : Symbol(Shape, Decl(clodulesDerivedClasses.ts, 0, 0), Decl(clodulesDerivedClasses.ts, 2, 1)) } @@ -26,12 +26,12 @@ class Path extends Shape { } -module Path.Utils { +namespace Path.Utils { >Path : Symbol(Path, Decl(clodulesDerivedClasses.ts, 6, 1), Decl(clodulesDerivedClasses.ts, 11, 1)) ->Utils : Symbol(Utils, Decl(clodulesDerivedClasses.ts, 13, 12)) +>Utils : Symbol(Utils, Decl(clodulesDerivedClasses.ts, 13, 15)) export function convert2(): Path { ->convert2 : Symbol(convert2, Decl(clodulesDerivedClasses.ts, 13, 19)) +>convert2 : Symbol(convert2, Decl(clodulesDerivedClasses.ts, 13, 22)) >Path : Symbol(Path, Decl(clodulesDerivedClasses.ts, 6, 1), Decl(clodulesDerivedClasses.ts, 11, 1)) return null; diff --git a/tests/baselines/reference/clodulesDerivedClasses.types b/tests/baselines/reference/clodulesDerivedClasses.types index de41e31c27053..344e7740eb2d8 100644 --- a/tests/baselines/reference/clodulesDerivedClasses.types +++ b/tests/baselines/reference/clodulesDerivedClasses.types @@ -10,7 +10,7 @@ class Shape { > : ^^^^^^ } -module Shape.Utils { +namespace Shape.Utils { >Shape : typeof Shape > : ^^^^^^^^^^^^ >Utils : typeof Utils @@ -33,7 +33,7 @@ class Path extends Shape { } -module Path.Utils { +namespace Path.Utils { >Path : typeof Path > : ^^^^^^^^^^^ >Utils : typeof Utils diff --git a/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js index 609b17cab5772..228436dbbb980 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithAccessorChildren.ts] //// //// [collisionCodeGenModuleWithAccessorChildren.ts] -module M { +namespace M { export var x = 3; class c { private y; @@ -11,7 +11,7 @@ module M { } } -module M { +namespace M { class d { private y; set Z(p) { @@ -21,7 +21,7 @@ module M { } } -module M { // Shouldnt be _M +namespace M { // Shouldnt be _M class e { private y; set M(p) { @@ -30,7 +30,7 @@ module M { // Shouldnt be _M } } -module M { +namespace M { class f { get Z() { var M = 10; @@ -39,7 +39,7 @@ module M { } } -module M { // Shouldnt be _M +namespace M { // Shouldnt be _M class e { get M() { return x; diff --git a/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.symbols b/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.symbols index 2e72d1fc22469..73d8960703be7 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.symbols +++ b/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithAccessorChildren.ts] //// === collisionCodeGenModuleWithAccessorChildren.ts === -module M { +namespace M { >M : Symbol(M, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 8, 1), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 18, 1), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 27, 1), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 36, 1)) export var x = 3; @@ -26,11 +26,11 @@ module M { } } -module M { +namespace M { >M : Symbol(M, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 8, 1), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 18, 1), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 27, 1), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 36, 1)) class d { ->d : Symbol(d, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 10, 10)) +>d : Symbol(d, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 10, 13)) private y; >y : Symbol(d.y, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 11, 13)) @@ -44,18 +44,18 @@ module M { this.y = x; >this.y : Symbol(d.y, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 11, 13)) ->this : Symbol(d, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 10, 10)) +>this : Symbol(d, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 10, 13)) >y : Symbol(d.y, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 11, 13)) >x : Symbol(x, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 1, 14)) } } } -module M { // Shouldnt be _M +namespace M { // Shouldnt be _M >M : Symbol(M, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 8, 1), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 18, 1), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 27, 1), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 36, 1)) class e { ->e : Symbol(e, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 20, 10)) +>e : Symbol(e, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 20, 13)) private y; >y : Symbol(e.y, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 21, 13)) @@ -66,18 +66,18 @@ module M { // Shouldnt be _M this.y = x; >this.y : Symbol(e.y, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 21, 13)) ->this : Symbol(e, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 20, 10)) +>this : Symbol(e, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 20, 13)) >y : Symbol(e.y, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 21, 13)) >x : Symbol(x, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 1, 14)) } } } -module M { +namespace M { >M : Symbol(M, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 8, 1), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 18, 1), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 27, 1), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 36, 1)) class f { ->f : Symbol(f, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 29, 10)) +>f : Symbol(f, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 29, 13)) get Z() { >Z : Symbol(f.Z, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 30, 13)) @@ -91,11 +91,11 @@ module M { } } -module M { // Shouldnt be _M +namespace M { // Shouldnt be _M >M : Symbol(M, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 8, 1), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 18, 1), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 27, 1), Decl(collisionCodeGenModuleWithAccessorChildren.ts, 36, 1)) class e { ->e : Symbol(e, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 38, 10)) +>e : Symbol(e, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 38, 13)) get M() { >M : Symbol(e.M, Decl(collisionCodeGenModuleWithAccessorChildren.ts, 39, 13)) diff --git a/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.types b/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.types index fb0a20a435458..f73f96da8daa4 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.types +++ b/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithAccessorChildren.ts] //// === collisionCodeGenModuleWithAccessorChildren.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -36,7 +36,7 @@ module M { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -71,7 +71,7 @@ module M { } } -module M { // Shouldnt be _M +namespace M { // Shouldnt be _M >M : typeof M > : ^^^^^^^^ @@ -100,7 +100,7 @@ module M { // Shouldnt be _M } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -125,7 +125,7 @@ module M { } } -module M { // Shouldnt be _M +namespace M { // Shouldnt be _M >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.js index c1cb19c169cd3..c050b651d36f5 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithConstructorChildren.ts] //// //// [collisionCodeGenModuleWithConstructorChildren.ts] -module M { +namespace M { export var x = 3; class c { constructor(M, p = x) { @@ -9,14 +9,14 @@ module M { } } -module M { +namespace M { class d { constructor(private M, p = x) { } } } -module M { +namespace M { class d2 { constructor() { var M = 10; diff --git a/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.symbols b/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.symbols index e50bf89e81146..b1e0eaef957de 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.symbols +++ b/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithConstructorChildren.ts] //// === collisionCodeGenModuleWithConstructorChildren.ts === -module M { +namespace M { >M : Symbol(M, Decl(collisionCodeGenModuleWithConstructorChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithConstructorChildren.ts, 6, 1), Decl(collisionCodeGenModuleWithConstructorChildren.ts, 13, 1)) export var x = 3; @@ -18,11 +18,11 @@ module M { } } -module M { +namespace M { >M : Symbol(M, Decl(collisionCodeGenModuleWithConstructorChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithConstructorChildren.ts, 6, 1), Decl(collisionCodeGenModuleWithConstructorChildren.ts, 13, 1)) class d { ->d : Symbol(d, Decl(collisionCodeGenModuleWithConstructorChildren.ts, 8, 10)) +>d : Symbol(d, Decl(collisionCodeGenModuleWithConstructorChildren.ts, 8, 13)) constructor(private M, p = x) { >M : Symbol(d.M, Decl(collisionCodeGenModuleWithConstructorChildren.ts, 10, 20)) @@ -32,11 +32,11 @@ module M { } } -module M { +namespace M { >M : Symbol(M, Decl(collisionCodeGenModuleWithConstructorChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithConstructorChildren.ts, 6, 1), Decl(collisionCodeGenModuleWithConstructorChildren.ts, 13, 1)) class d2 { ->d2 : Symbol(d2, Decl(collisionCodeGenModuleWithConstructorChildren.ts, 15, 10)) +>d2 : Symbol(d2, Decl(collisionCodeGenModuleWithConstructorChildren.ts, 15, 13)) constructor() { var M = 10; diff --git a/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.types b/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.types index 1f34f6bd21a24..16f5784011a70 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.types +++ b/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithConstructorChildren.ts] //// === collisionCodeGenModuleWithConstructorChildren.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -25,7 +25,7 @@ module M { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -43,7 +43,7 @@ module M { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.js b/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.js index 2a6f2a5faeece..e616141b83fd4 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithEnumMemberConflict.ts] //// //// [collisionCodeGenModuleWithEnumMemberConflict.ts] -module m1 { +namespace m1 { enum e { m1, m2 = m1 diff --git a/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.symbols b/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.symbols index 6fb96e1a14cd9..c47cac82aaa89 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.symbols +++ b/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithEnumMemberConflict.ts] //// === collisionCodeGenModuleWithEnumMemberConflict.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(collisionCodeGenModuleWithEnumMemberConflict.ts, 0, 0)) enum e { ->e : Symbol(e, Decl(collisionCodeGenModuleWithEnumMemberConflict.ts, 0, 11)) +>e : Symbol(e, Decl(collisionCodeGenModuleWithEnumMemberConflict.ts, 0, 14)) m1, >m1 : Symbol(e.m1, Decl(collisionCodeGenModuleWithEnumMemberConflict.ts, 1, 12)) diff --git a/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.types b/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.types index d83b4b2f7b14a..5e6d7f6de5b8e 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.types +++ b/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithEnumMemberConflict.ts] //// === collisionCodeGenModuleWithEnumMemberConflict.ts === -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.js index 9298a47fba476..1e7b5df0076d9 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.js @@ -1,19 +1,19 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithFunctionChildren.ts] //// //// [collisionCodeGenModuleWithFunctionChildren.ts] -module M { +namespace M { export var x = 3; function fn(M, p = x) { } } -module M { +namespace M { function fn2() { var M; var p = x; } } -module M { +namespace M { function fn3() { function M() { var p = x; diff --git a/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.symbols b/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.symbols index 899f1e8f0f609..a3f435f6bb045 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.symbols +++ b/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithFunctionChildren.ts] //// === collisionCodeGenModuleWithFunctionChildren.ts === -module M { +namespace M { >M : Symbol(M, Decl(collisionCodeGenModuleWithFunctionChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithFunctionChildren.ts, 3, 1), Decl(collisionCodeGenModuleWithFunctionChildren.ts, 10, 1)) export var x = 3; @@ -14,11 +14,11 @@ module M { >x : Symbol(x, Decl(collisionCodeGenModuleWithFunctionChildren.ts, 1, 14)) } -module M { +namespace M { >M : Symbol(M, Decl(collisionCodeGenModuleWithFunctionChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithFunctionChildren.ts, 3, 1), Decl(collisionCodeGenModuleWithFunctionChildren.ts, 10, 1)) function fn2() { ->fn2 : Symbol(fn2, Decl(collisionCodeGenModuleWithFunctionChildren.ts, 5, 10)) +>fn2 : Symbol(fn2, Decl(collisionCodeGenModuleWithFunctionChildren.ts, 5, 13)) var M; >M : Symbol(M, Decl(collisionCodeGenModuleWithFunctionChildren.ts, 7, 11)) @@ -29,11 +29,11 @@ module M { } } -module M { +namespace M { >M : Symbol(M, Decl(collisionCodeGenModuleWithFunctionChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithFunctionChildren.ts, 3, 1), Decl(collisionCodeGenModuleWithFunctionChildren.ts, 10, 1)) function fn3() { ->fn3 : Symbol(fn3, Decl(collisionCodeGenModuleWithFunctionChildren.ts, 12, 10)) +>fn3 : Symbol(fn3, Decl(collisionCodeGenModuleWithFunctionChildren.ts, 12, 13)) function M() { >M : Symbol(M, Decl(collisionCodeGenModuleWithFunctionChildren.ts, 13, 20)) diff --git a/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.types b/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.types index 9e0e58bacddad..64b1b1d881317 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.types +++ b/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithFunctionChildren.ts] //// === collisionCodeGenModuleWithFunctionChildren.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -21,7 +21,7 @@ module M { > : ^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -40,7 +40,7 @@ module M { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.js b/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.js index 6df119128b5bd..94258a854ee74 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.js @@ -1,13 +1,13 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithMemberClassConflict.ts] //// //// [collisionCodeGenModuleWithMemberClassConflict.ts] -module m1 { +namespace m1 { export class m1 { } } var foo = new m1.m1(); -module m2 { +namespace m2 { export class m2 { } diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.symbols b/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.symbols index 6fecd43c48aec..96adf898273c1 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.symbols +++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.symbols @@ -1,24 +1,24 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithMemberClassConflict.ts] //// === collisionCodeGenModuleWithMemberClassConflict.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 0, 0)) export class m1 { ->m1 : Symbol(m1, Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 0, 11)) +>m1 : Symbol(m1, Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 0, 14)) } } var foo = new m1.m1(); >foo : Symbol(foo, Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 4, 3), Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 13, 3), Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 14, 3)) ->m1.m1 : Symbol(m1.m1, Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 0, 11)) +>m1.m1 : Symbol(m1.m1, Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 0, 14)) >m1 : Symbol(m1, Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 0, 0)) ->m1 : Symbol(m1.m1, Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 0, 11)) +>m1 : Symbol(m1.m1, Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 0, 14)) -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 4, 22)) export class m2 { ->m2 : Symbol(m2, Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 6, 11)) +>m2 : Symbol(m2, Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 6, 14)) } export class _m2 { @@ -27,9 +27,9 @@ module m2 { } var foo = new m2.m2(); >foo : Symbol(foo, Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 4, 3), Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 13, 3), Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 14, 3)) ->m2.m2 : Symbol(m2.m2, Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 6, 11)) +>m2.m2 : Symbol(m2.m2, Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 6, 14)) >m2 : Symbol(m2, Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 4, 22)) ->m2 : Symbol(m2.m2, Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 6, 11)) +>m2 : Symbol(m2.m2, Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 6, 14)) var foo = new m2._m2(); >foo : Symbol(foo, Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 4, 3), Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 13, 3), Decl(collisionCodeGenModuleWithMemberClassConflict.ts, 14, 3)) diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.types b/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.types index f583ef509a837..90372351dfcb5 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.types +++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithMemberClassConflict.ts] //// === collisionCodeGenModuleWithMemberClassConflict.ts === -module m1 { +namespace m1 { >m1 : typeof globalThis.m1 > : ^^^^^^^^^^^^^^^^^^^^ @@ -22,7 +22,7 @@ var foo = new m1.m1(); >m1 : typeof m1.m1 > : ^^^^^^^^^^^^ -module m2 { +namespace m2 { >m2 : typeof globalThis.m2 > : ^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.js b/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.js index ff7f2506a9a10..07d6ca44db86c 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithMemberInterfaceConflict.ts] //// //// [collisionCodeGenModuleWithMemberInterfaceConflict.ts] -module m1 { +namespace m1 { export interface m1 { } export class m2 implements m1 { diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.symbols b/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.symbols index 1c759378a6a5d..86eae7a913151 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.symbols +++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.symbols @@ -1,15 +1,15 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithMemberInterfaceConflict.ts] //// === collisionCodeGenModuleWithMemberInterfaceConflict.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(collisionCodeGenModuleWithMemberInterfaceConflict.ts, 0, 0)) export interface m1 { ->m1 : Symbol(m1, Decl(collisionCodeGenModuleWithMemberInterfaceConflict.ts, 0, 11)) +>m1 : Symbol(m1, Decl(collisionCodeGenModuleWithMemberInterfaceConflict.ts, 0, 14)) } export class m2 implements m1 { >m2 : Symbol(m2, Decl(collisionCodeGenModuleWithMemberInterfaceConflict.ts, 2, 5)) ->m1 : Symbol(m1, Decl(collisionCodeGenModuleWithMemberInterfaceConflict.ts, 0, 11)) +>m1 : Symbol(m1, Decl(collisionCodeGenModuleWithMemberInterfaceConflict.ts, 0, 14)) } } var foo = new m1.m2(); diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.types b/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.types index 86f1b2f76bc5c..c154dda304174 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.types +++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithMemberInterfaceConflict.ts] //// === collisionCodeGenModuleWithMemberInterfaceConflict.ts === -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.js b/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.js index 8ded88caf937b..023bf3a8d2abb 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithMemberVariable.ts] //// //// [collisionCodeGenModuleWithMemberVariable.ts] -module m1 { +namespace m1 { export var m1 = 10; var b = m1; } diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.symbols b/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.symbols index 8fa936d906d03..0f6fceb597ce9 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.symbols +++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithMemberVariable.ts] //// === collisionCodeGenModuleWithMemberVariable.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(collisionCodeGenModuleWithMemberVariable.ts, 0, 0)) export var m1 = 10; diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.types b/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.types index 60e632483a1bc..c826569dfc967 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.types +++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithMemberVariable.ts] //// === collisionCodeGenModuleWithMemberVariable.ts === -module m1 { +namespace m1 { >m1 : typeof globalThis.m1 > : ^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js index 552b9a48ef6e8..ec2782168063c 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js @@ -1,14 +1,14 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithMethodChildren.ts] //// //// [collisionCodeGenModuleWithMethodChildren.ts] -module M { +namespace M { export var x = 3; class c { fn(M, p = x) { } } } -module M { +namespace M { class d { fn2() { var M; @@ -17,7 +17,7 @@ module M { } } -module M { +namespace M { class e { fn3() { function M() { @@ -27,7 +27,7 @@ module M { } } -module M { // Shouldnt bn _M +namespace M { // Shouldnt bn _M class f { M() { } diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.symbols b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.symbols index 8535a62da24e5..68104b86f3dc0 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.symbols +++ b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithMethodChildren.ts] //// === collisionCodeGenModuleWithMethodChildren.ts === -module M { +namespace M { >M : Symbol(M, Decl(collisionCodeGenModuleWithMethodChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithMethodChildren.ts, 5, 1), Decl(collisionCodeGenModuleWithMethodChildren.ts, 14, 1), Decl(collisionCodeGenModuleWithMethodChildren.ts, 24, 1)) export var x = 3; @@ -18,11 +18,11 @@ module M { } } -module M { +namespace M { >M : Symbol(M, Decl(collisionCodeGenModuleWithMethodChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithMethodChildren.ts, 5, 1), Decl(collisionCodeGenModuleWithMethodChildren.ts, 14, 1), Decl(collisionCodeGenModuleWithMethodChildren.ts, 24, 1)) class d { ->d : Symbol(d, Decl(collisionCodeGenModuleWithMethodChildren.ts, 7, 10)) +>d : Symbol(d, Decl(collisionCodeGenModuleWithMethodChildren.ts, 7, 13)) fn2() { >fn2 : Symbol(d.fn2, Decl(collisionCodeGenModuleWithMethodChildren.ts, 8, 13)) @@ -37,11 +37,11 @@ module M { } } -module M { +namespace M { >M : Symbol(M, Decl(collisionCodeGenModuleWithMethodChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithMethodChildren.ts, 5, 1), Decl(collisionCodeGenModuleWithMethodChildren.ts, 14, 1), Decl(collisionCodeGenModuleWithMethodChildren.ts, 24, 1)) class e { ->e : Symbol(e, Decl(collisionCodeGenModuleWithMethodChildren.ts, 16, 10)) +>e : Symbol(e, Decl(collisionCodeGenModuleWithMethodChildren.ts, 16, 13)) fn3() { >fn3 : Symbol(e.fn3, Decl(collisionCodeGenModuleWithMethodChildren.ts, 17, 13)) @@ -57,11 +57,11 @@ module M { } } -module M { // Shouldnt bn _M +namespace M { // Shouldnt bn _M >M : Symbol(M, Decl(collisionCodeGenModuleWithMethodChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithMethodChildren.ts, 5, 1), Decl(collisionCodeGenModuleWithMethodChildren.ts, 14, 1), Decl(collisionCodeGenModuleWithMethodChildren.ts, 24, 1)) class f { ->f : Symbol(f, Decl(collisionCodeGenModuleWithMethodChildren.ts, 26, 10)) +>f : Symbol(f, Decl(collisionCodeGenModuleWithMethodChildren.ts, 26, 13)) M() { >M : Symbol(f.M, Decl(collisionCodeGenModuleWithMethodChildren.ts, 27, 13)) diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.types b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.types index 5f32484a85c11..38f6d135c1045 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.types +++ b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithMethodChildren.ts] //// === collisionCodeGenModuleWithMethodChildren.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -26,7 +26,7 @@ module M { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -50,7 +50,7 @@ module M { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -76,7 +76,7 @@ module M { } } -module M { // Shouldnt bn _M +namespace M { // Shouldnt bn _M >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js index e5050c27862af..8839a600aab30 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js @@ -1,16 +1,16 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithModuleChildren.ts] //// //// [collisionCodeGenModuleWithModuleChildren.ts] -module M { +namespace M { export var x = 3; - module m1 { + namespace m1 { var M = 10; var p = x; } } -module M { - module m2 { +namespace M { + namespace m2 { class M { } var p = x; @@ -18,8 +18,8 @@ module M { } } -module M { - module m3 { +namespace M { + namespace m3 { function M() { } var p = x; @@ -27,8 +27,8 @@ module M { } } -module M { // shouldnt be _M - module m3 { +namespace M { // shouldnt be _M + namespace m3 { interface M { } var p = x; @@ -36,9 +36,9 @@ module M { // shouldnt be _M } } -module M { - module m4 { - module M { +namespace M { + namespace m4 { + namespace M { var p = x; } } diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.symbols b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.symbols index 17e68931af9b0..541fd8bc76698 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.symbols +++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.symbols @@ -1,13 +1,13 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithModuleChildren.ts] //// === collisionCodeGenModuleWithModuleChildren.ts === -module M { +namespace M { >M : Symbol(M, Decl(collisionCodeGenModuleWithModuleChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithModuleChildren.ts, 6, 1), Decl(collisionCodeGenModuleWithModuleChildren.ts, 15, 1), Decl(collisionCodeGenModuleWithModuleChildren.ts, 24, 1), Decl(collisionCodeGenModuleWithModuleChildren.ts, 33, 1)) export var x = 3; >x : Symbol(x, Decl(collisionCodeGenModuleWithModuleChildren.ts, 1, 14)) - module m1 { + namespace m1 { >m1 : Symbol(m1, Decl(collisionCodeGenModuleWithModuleChildren.ts, 1, 21)) var M = 10; @@ -19,14 +19,14 @@ module M { } } -module M { +namespace M { >M : Symbol(M, Decl(collisionCodeGenModuleWithModuleChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithModuleChildren.ts, 6, 1), Decl(collisionCodeGenModuleWithModuleChildren.ts, 15, 1), Decl(collisionCodeGenModuleWithModuleChildren.ts, 24, 1), Decl(collisionCodeGenModuleWithModuleChildren.ts, 33, 1)) - module m2 { ->m2 : Symbol(m2, Decl(collisionCodeGenModuleWithModuleChildren.ts, 8, 10)) + namespace m2 { +>m2 : Symbol(m2, Decl(collisionCodeGenModuleWithModuleChildren.ts, 8, 13)) class M { ->M : Symbol(M, Decl(collisionCodeGenModuleWithModuleChildren.ts, 9, 15)) +>M : Symbol(M, Decl(collisionCodeGenModuleWithModuleChildren.ts, 9, 18)) } var p = x; >p : Symbol(p, Decl(collisionCodeGenModuleWithModuleChildren.ts, 12, 11)) @@ -34,18 +34,18 @@ module M { var p2 = new M(); >p2 : Symbol(p2, Decl(collisionCodeGenModuleWithModuleChildren.ts, 13, 11)) ->M : Symbol(M, Decl(collisionCodeGenModuleWithModuleChildren.ts, 9, 15)) +>M : Symbol(M, Decl(collisionCodeGenModuleWithModuleChildren.ts, 9, 18)) } } -module M { +namespace M { >M : Symbol(M, Decl(collisionCodeGenModuleWithModuleChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithModuleChildren.ts, 6, 1), Decl(collisionCodeGenModuleWithModuleChildren.ts, 15, 1), Decl(collisionCodeGenModuleWithModuleChildren.ts, 24, 1), Decl(collisionCodeGenModuleWithModuleChildren.ts, 33, 1)) - module m3 { ->m3 : Symbol(m3, Decl(collisionCodeGenModuleWithModuleChildren.ts, 17, 10)) + namespace m3 { +>m3 : Symbol(m3, Decl(collisionCodeGenModuleWithModuleChildren.ts, 17, 13)) function M() { ->M : Symbol(M, Decl(collisionCodeGenModuleWithModuleChildren.ts, 18, 15)) +>M : Symbol(M, Decl(collisionCodeGenModuleWithModuleChildren.ts, 18, 18)) } var p = x; >p : Symbol(p, Decl(collisionCodeGenModuleWithModuleChildren.ts, 21, 11)) @@ -53,18 +53,18 @@ module M { var p2 = M(); >p2 : Symbol(p2, Decl(collisionCodeGenModuleWithModuleChildren.ts, 22, 11)) ->M : Symbol(M, Decl(collisionCodeGenModuleWithModuleChildren.ts, 18, 15)) +>M : Symbol(M, Decl(collisionCodeGenModuleWithModuleChildren.ts, 18, 18)) } } -module M { // shouldnt be _M +namespace M { // shouldnt be _M >M : Symbol(M, Decl(collisionCodeGenModuleWithModuleChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithModuleChildren.ts, 6, 1), Decl(collisionCodeGenModuleWithModuleChildren.ts, 15, 1), Decl(collisionCodeGenModuleWithModuleChildren.ts, 24, 1), Decl(collisionCodeGenModuleWithModuleChildren.ts, 33, 1)) - module m3 { ->m3 : Symbol(m3, Decl(collisionCodeGenModuleWithModuleChildren.ts, 26, 10)) + namespace m3 { +>m3 : Symbol(m3, Decl(collisionCodeGenModuleWithModuleChildren.ts, 26, 13)) interface M { ->M : Symbol(M, Decl(collisionCodeGenModuleWithModuleChildren.ts, 27, 15)) +>M : Symbol(M, Decl(collisionCodeGenModuleWithModuleChildren.ts, 27, 18)) } var p = x; >p : Symbol(p, Decl(collisionCodeGenModuleWithModuleChildren.ts, 30, 11)) @@ -72,18 +72,18 @@ module M { // shouldnt be _M var p2: M; >p2 : Symbol(p2, Decl(collisionCodeGenModuleWithModuleChildren.ts, 31, 11)) ->M : Symbol(M, Decl(collisionCodeGenModuleWithModuleChildren.ts, 27, 15)) +>M : Symbol(M, Decl(collisionCodeGenModuleWithModuleChildren.ts, 27, 18)) } } -module M { +namespace M { >M : Symbol(M, Decl(collisionCodeGenModuleWithModuleChildren.ts, 0, 0), Decl(collisionCodeGenModuleWithModuleChildren.ts, 6, 1), Decl(collisionCodeGenModuleWithModuleChildren.ts, 15, 1), Decl(collisionCodeGenModuleWithModuleChildren.ts, 24, 1), Decl(collisionCodeGenModuleWithModuleChildren.ts, 33, 1)) - module m4 { ->m4 : Symbol(m4, Decl(collisionCodeGenModuleWithModuleChildren.ts, 35, 10)) + namespace m4 { +>m4 : Symbol(m4, Decl(collisionCodeGenModuleWithModuleChildren.ts, 35, 13)) - module M { ->M : Symbol(M, Decl(collisionCodeGenModuleWithModuleChildren.ts, 36, 15)) + namespace M { +>M : Symbol(M, Decl(collisionCodeGenModuleWithModuleChildren.ts, 36, 18)) var p = x; >p : Symbol(p, Decl(collisionCodeGenModuleWithModuleChildren.ts, 38, 15)) diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types index cf5a0af282d45..2b2b111e2c016 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types +++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithModuleChildren.ts] //// === collisionCodeGenModuleWithModuleChildren.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -11,7 +11,7 @@ module M { >3 : 3 > : ^ - module m1 { + namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -29,11 +29,11 @@ module M { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ - module m2 { + namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -57,11 +57,11 @@ module M { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ - module m3 { + namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ @@ -85,11 +85,11 @@ module M { } } -module M { // shouldnt be _M +namespace M { // shouldnt be _M >M : typeof M > : ^^^^^^^^ - module m3 { + namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ @@ -107,15 +107,15 @@ module M { // shouldnt be _M } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ - module m4 { + namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ - module M { + namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.js b/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.js index 3cbe65bad9bdb..7fe7a64039bf0 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.js @@ -1,12 +1,12 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithModuleReopening.ts] //// //// [collisionCodeGenModuleWithModuleReopening.ts] -module m1 { +namespace m1 { export class m1 { } } var foo = new m1.m1(); -module m1 { +namespace m1 { export class c1 { } var b = new c1(); @@ -14,14 +14,14 @@ module m1 { } var foo2 = new m1.c1(); -module m2 { +namespace m2 { export class c1 { } export var b10 = 10; var x = new c1(); } var foo3 = new m2.c1(); -module m2 { +namespace m2 { export class m2 { } var b = new m2(); diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.symbols b/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.symbols index c899a0ad846ed..9858390f89c04 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.symbols +++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.symbols @@ -1,67 +1,67 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithModuleReopening.ts] //// === collisionCodeGenModuleWithModuleReopening.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 0, 0), Decl(collisionCodeGenModuleWithModuleReopening.ts, 4, 22)) export class m1 { ->m1 : Symbol(m1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 0, 11)) +>m1 : Symbol(m1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 0, 14)) } } var foo = new m1.m1(); >foo : Symbol(foo, Decl(collisionCodeGenModuleWithModuleReopening.ts, 4, 3)) ->m1.m1 : Symbol(m1.m1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 0, 11)) +>m1.m1 : Symbol(m1.m1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 0, 14)) >m1 : Symbol(m1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 0, 0), Decl(collisionCodeGenModuleWithModuleReopening.ts, 4, 22)) ->m1 : Symbol(m1.m1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 0, 11)) +>m1 : Symbol(m1.m1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 0, 14)) -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 0, 0), Decl(collisionCodeGenModuleWithModuleReopening.ts, 4, 22)) export class c1 { ->c1 : Symbol(c1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 5, 11)) +>c1 : Symbol(c1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 5, 14)) } var b = new c1(); >b : Symbol(b, Decl(collisionCodeGenModuleWithModuleReopening.ts, 8, 7)) ->c1 : Symbol(c1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 5, 11)) +>c1 : Symbol(c1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 5, 14)) var c = new m1(); >c : Symbol(c, Decl(collisionCodeGenModuleWithModuleReopening.ts, 9, 7)) ->m1 : Symbol(m1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 0, 11)) +>m1 : Symbol(m1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 0, 14)) } var foo2 = new m1.c1(); >foo2 : Symbol(foo2, Decl(collisionCodeGenModuleWithModuleReopening.ts, 11, 3), Decl(collisionCodeGenModuleWithModuleReopening.ts, 28, 3)) ->m1.c1 : Symbol(m1.c1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 5, 11)) +>m1.c1 : Symbol(m1.c1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 5, 14)) >m1 : Symbol(m1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 0, 0), Decl(collisionCodeGenModuleWithModuleReopening.ts, 4, 22)) ->c1 : Symbol(m1.c1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 5, 11)) +>c1 : Symbol(m1.c1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 5, 14)) -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(collisionCodeGenModuleWithModuleReopening.ts, 11, 23), Decl(collisionCodeGenModuleWithModuleReopening.ts, 19, 23)) export class c1 { ->c1 : Symbol(c1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 13, 11)) +>c1 : Symbol(c1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 13, 14)) } export var b10 = 10; >b10 : Symbol(b10, Decl(collisionCodeGenModuleWithModuleReopening.ts, 16, 14)) var x = new c1(); >x : Symbol(x, Decl(collisionCodeGenModuleWithModuleReopening.ts, 17, 7)) ->c1 : Symbol(c1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 13, 11)) +>c1 : Symbol(c1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 13, 14)) } var foo3 = new m2.c1(); >foo3 : Symbol(foo3, Decl(collisionCodeGenModuleWithModuleReopening.ts, 19, 3), Decl(collisionCodeGenModuleWithModuleReopening.ts, 27, 3)) ->m2.c1 : Symbol(m2.c1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 13, 11)) +>m2.c1 : Symbol(m2.c1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 13, 14)) >m2 : Symbol(m2, Decl(collisionCodeGenModuleWithModuleReopening.ts, 11, 23), Decl(collisionCodeGenModuleWithModuleReopening.ts, 19, 23)) ->c1 : Symbol(m2.c1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 13, 11)) +>c1 : Symbol(m2.c1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 13, 14)) -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(collisionCodeGenModuleWithModuleReopening.ts, 11, 23), Decl(collisionCodeGenModuleWithModuleReopening.ts, 19, 23)) export class m2 { ->m2 : Symbol(m2, Decl(collisionCodeGenModuleWithModuleReopening.ts, 20, 11)) +>m2 : Symbol(m2, Decl(collisionCodeGenModuleWithModuleReopening.ts, 20, 14)) } var b = new m2(); >b : Symbol(b, Decl(collisionCodeGenModuleWithModuleReopening.ts, 23, 7)) ->m2 : Symbol(m2, Decl(collisionCodeGenModuleWithModuleReopening.ts, 20, 11)) +>m2 : Symbol(m2, Decl(collisionCodeGenModuleWithModuleReopening.ts, 20, 14)) var d = b10; >d : Symbol(d, Decl(collisionCodeGenModuleWithModuleReopening.ts, 24, 7)) @@ -69,17 +69,17 @@ module m2 { var c = new c1(); >c : Symbol(c, Decl(collisionCodeGenModuleWithModuleReopening.ts, 25, 7)) ->c1 : Symbol(c1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 13, 11)) +>c1 : Symbol(c1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 13, 14)) } var foo3 = new m2.c1(); >foo3 : Symbol(foo3, Decl(collisionCodeGenModuleWithModuleReopening.ts, 19, 3), Decl(collisionCodeGenModuleWithModuleReopening.ts, 27, 3)) ->m2.c1 : Symbol(m2.c1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 13, 11)) +>m2.c1 : Symbol(m2.c1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 13, 14)) >m2 : Symbol(m2, Decl(collisionCodeGenModuleWithModuleReopening.ts, 11, 23), Decl(collisionCodeGenModuleWithModuleReopening.ts, 19, 23)) ->c1 : Symbol(m2.c1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 13, 11)) +>c1 : Symbol(m2.c1, Decl(collisionCodeGenModuleWithModuleReopening.ts, 13, 14)) var foo2 = new m2.m2(); >foo2 : Symbol(foo2, Decl(collisionCodeGenModuleWithModuleReopening.ts, 11, 3), Decl(collisionCodeGenModuleWithModuleReopening.ts, 28, 3)) ->m2.m2 : Symbol(m2.m2, Decl(collisionCodeGenModuleWithModuleReopening.ts, 20, 11)) +>m2.m2 : Symbol(m2.m2, Decl(collisionCodeGenModuleWithModuleReopening.ts, 20, 14)) >m2 : Symbol(m2, Decl(collisionCodeGenModuleWithModuleReopening.ts, 11, 23), Decl(collisionCodeGenModuleWithModuleReopening.ts, 19, 23)) ->m2 : Symbol(m2.m2, Decl(collisionCodeGenModuleWithModuleReopening.ts, 20, 11)) +>m2 : Symbol(m2.m2, Decl(collisionCodeGenModuleWithModuleReopening.ts, 20, 14)) diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.types b/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.types index c386eecc59e27..0890390a5ed29 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.types +++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithModuleReopening.ts] //// === collisionCodeGenModuleWithModuleReopening.ts === -module m1 { +namespace m1 { >m1 : typeof globalThis.m1 > : ^^^^^^^^^^^^^^^^^^^^ @@ -22,7 +22,7 @@ var foo = new m1.m1(); >m1 : typeof m1.m1 > : ^^^^^^^^^^^^ -module m1 { +namespace m1 { >m1 : typeof globalThis.m1 > : ^^^^^^^^^^^^^^^^^^^^ @@ -58,7 +58,7 @@ var foo2 = new m1.c1(); >c1 : typeof m1.c1 > : ^^^^^^^^^^^^ -module m2 { +namespace m2 { >m2 : typeof globalThis.m2 > : ^^^^^^^^^^^^^^^^^^^^ @@ -92,7 +92,7 @@ var foo3 = new m2.c1(); >c1 : typeof m2.c1 > : ^^^^^^^^^^^^ -module m2 { +namespace m2 { >m2 : typeof globalThis.m2 > : ^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.js b/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.js index 68f54f68da212..9e5c28d5f131c 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithPrivateMember.ts] //// //// [collisionCodeGenModuleWithPrivateMember.ts] -module m1 { +namespace m1 { class m1 { } var x = new m1(); diff --git a/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.symbols b/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.symbols index 683fc3f65fdd7..d35b58dc19563 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.symbols +++ b/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.symbols @@ -1,15 +1,15 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithPrivateMember.ts] //// === collisionCodeGenModuleWithPrivateMember.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(collisionCodeGenModuleWithPrivateMember.ts, 0, 0)) class m1 { ->m1 : Symbol(m1, Decl(collisionCodeGenModuleWithPrivateMember.ts, 0, 11)) +>m1 : Symbol(m1, Decl(collisionCodeGenModuleWithPrivateMember.ts, 0, 14)) } var x = new m1(); >x : Symbol(x, Decl(collisionCodeGenModuleWithPrivateMember.ts, 3, 7)) ->m1 : Symbol(m1, Decl(collisionCodeGenModuleWithPrivateMember.ts, 0, 11)) +>m1 : Symbol(m1, Decl(collisionCodeGenModuleWithPrivateMember.ts, 0, 14)) export class c1 { >c1 : Symbol(c1, Decl(collisionCodeGenModuleWithPrivateMember.ts, 3, 21)) diff --git a/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.types b/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.types index a24eac891d81a..cff633b7b9015 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.types +++ b/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionCodeGenModuleWithPrivateMember.ts] //// === collisionCodeGenModuleWithPrivateMember.ts === -module m1 { +namespace m1 { >m1 : typeof globalThis.m1 > : ^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.errors.txt b/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.errors.txt new file mode 100644 index 0000000000000..deb52108dc237 --- /dev/null +++ b/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.errors.txt @@ -0,0 +1,15 @@ +collisionCodeGenModuleWithUnicodeNames.ts(1,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== collisionCodeGenModuleWithUnicodeNames.ts (1 errors) ==== + module 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export class 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 { + } + } + + var x = new 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123.才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123(); + + + \ No newline at end of file diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js index 19e18fec62ed9..2a83fcf37857e 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js @@ -5,13 +5,13 @@ export declare class require { } export declare class exports { } -declare module m1 { +declare namespace m1 { class require { } class exports { } } -module m2 { +namespace m2 { export declare class require { } export declare class exports { @@ -23,13 +23,13 @@ declare class require { } declare class exports { } -declare module m3 { +declare namespace m3 { class require { } class exports { } } -module m4 { +namespace m4 { export declare class require { } export declare class exports { diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.symbols b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.symbols index 8a6569dfdca23..4e16f8b2d16e3 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.symbols +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.symbols @@ -7,21 +7,21 @@ export declare class require { export declare class exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientClass_externalmodule.ts, 1, 1)) } -declare module m1 { +declare namespace m1 { >m1 : Symbol(m1, Decl(collisionExportsRequireAndAmbientClass_externalmodule.ts, 3, 1)) class require { ->require : Symbol(require, Decl(collisionExportsRequireAndAmbientClass_externalmodule.ts, 4, 19)) +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientClass_externalmodule.ts, 4, 22)) } class exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientClass_externalmodule.ts, 6, 5)) } } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(collisionExportsRequireAndAmbientClass_externalmodule.ts, 9, 1)) export declare class require { ->require : Symbol(require, Decl(collisionExportsRequireAndAmbientClass_externalmodule.ts, 10, 11)) +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientClass_externalmodule.ts, 10, 14)) } export declare class exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientClass_externalmodule.ts, 12, 5)) @@ -35,21 +35,21 @@ declare class require { declare class exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientClass_globalFile.ts, 1, 1)) } -declare module m3 { +declare namespace m3 { >m3 : Symbol(m3, Decl(collisionExportsRequireAndAmbientClass_globalFile.ts, 3, 1)) class require { ->require : Symbol(require, Decl(collisionExportsRequireAndAmbientClass_globalFile.ts, 4, 19)) +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientClass_globalFile.ts, 4, 22)) } class exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientClass_globalFile.ts, 6, 5)) } } -module m4 { +namespace m4 { >m4 : Symbol(m4, Decl(collisionExportsRequireAndAmbientClass_globalFile.ts, 9, 1)) export declare class require { ->require : Symbol(require, Decl(collisionExportsRequireAndAmbientClass_globalFile.ts, 10, 11)) +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientClass_globalFile.ts, 10, 14)) } export declare class exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientClass_globalFile.ts, 12, 5)) diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.types b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.types index 35159da14df47..731458ccc3092 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.types +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.types @@ -9,7 +9,7 @@ export declare class exports { >exports : exports > : ^^^^^^^ } -declare module m1 { +declare namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -22,7 +22,7 @@ declare module m1 { > : ^^^^^^^ } } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -45,7 +45,7 @@ declare class exports { >exports : exports > : ^^^^^^^ } -declare module m3 { +declare namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ @@ -58,7 +58,7 @@ declare module m3 { > : ^^^^^^^ } } -module m4 { +namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js index d34102f1bbd2a..8a28a23366296 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js @@ -9,7 +9,7 @@ export declare enum exports { _thisVal1, _thisVal2, } -declare module m1 { +declare namespace m1 { enum require { _thisVal1, _thisVal2, @@ -19,7 +19,7 @@ declare module m1 { _thisVal2, } } -module m2 { +namespace m2 { export declare enum require { _thisVal1, _thisVal2, @@ -39,7 +39,7 @@ declare enum exports { _thisVal1, _thisVal2, } -declare module m3 { +declare namespace m3 { enum require { _thisVal1, _thisVal2, @@ -49,7 +49,7 @@ declare module m3 { _thisVal2, } } -module m4 { +namespace m4 { export declare enum require { _thisVal1, _thisVal2, diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.symbols b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.symbols index 2e615c974d8c6..ae20b7ce799e5 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.symbols +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.symbols @@ -19,11 +19,11 @@ export declare enum exports { _thisVal2, >_thisVal2 : Symbol(exports._thisVal2, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 5, 14)) } -declare module m1 { +declare namespace m1 { >m1 : Symbol(m1, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 7, 1)) enum require { ->require : Symbol(require, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 8, 19)) +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 8, 22)) _thisVal1, >_thisVal1 : Symbol(require._thisVal1, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 9, 18)) @@ -41,11 +41,11 @@ declare module m1 { >_thisVal2 : Symbol(exports._thisVal2, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 14, 18)) } } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 17, 1)) export declare enum require { ->require : Symbol(require, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 18, 11)) +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 18, 14)) _thisVal1, >_thisVal1 : Symbol(require._thisVal1, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 19, 33)) @@ -83,11 +83,11 @@ declare enum exports { _thisVal2, >_thisVal2 : Symbol(exports._thisVal2, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 5, 14)) } -declare module m3 { +declare namespace m3 { >m3 : Symbol(m3, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 7, 1)) enum require { ->require : Symbol(require, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 8, 19)) +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 8, 22)) _thisVal1, >_thisVal1 : Symbol(require._thisVal1, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 9, 18)) @@ -105,11 +105,11 @@ declare module m3 { >_thisVal2 : Symbol(exports._thisVal2, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 14, 18)) } } -module m4 { +namespace m4 { >m4 : Symbol(m4, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 17, 1)) export declare enum require { ->require : Symbol(require, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 18, 11)) +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 18, 14)) _thisVal1, >_thisVal1 : Symbol(require._thisVal1, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 19, 33)) diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.types b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.types index 77dd43440ad01..f490e1073dd99 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.types +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.types @@ -25,7 +25,7 @@ export declare enum exports { >_thisVal2 : exports._thisVal2 > : ^^^^^^^^^^^^^^^^^ } -declare module m1 { +declare namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -54,7 +54,7 @@ declare module m1 { > : ^^^^^^^^^^^^^^^^^ } } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -109,7 +109,7 @@ declare enum exports { >_thisVal2 : exports._thisVal2 > : ^^^^^^^^^^^^^^^^^ } -declare module m3 { +declare namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ @@ -138,7 +138,7 @@ declare module m3 { > : ^^^^^^^^^^^^^^^^^ } } -module m4 { +namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js index 37360d82dc51f..b8e48cae79845 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js @@ -5,11 +5,11 @@ export declare function exports(): number; export declare function require(): string[]; -declare module m1 { +declare namespace m1 { function exports(): string; function require(): number; } -module m2 { +namespace m2 { export declare function exports(): string; export declare function require(): string[]; var a = 10; diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.symbols b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.symbols index a97d0b1a311fc..5807f8309ca68 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.symbols +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.symbols @@ -7,20 +7,20 @@ export declare function exports(): number; export declare function require(): string[]; >require : Symbol(require, Decl(collisionExportsRequireAndAmbientFunction.ts, 0, 42)) -declare module m1 { +declare namespace m1 { >m1 : Symbol(m1, Decl(collisionExportsRequireAndAmbientFunction.ts, 2, 44)) function exports(): string; ->exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientFunction.ts, 4, 19)) +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientFunction.ts, 4, 22)) function require(): number; >require : Symbol(require, Decl(collisionExportsRequireAndAmbientFunction.ts, 5, 31)) } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(collisionExportsRequireAndAmbientFunction.ts, 7, 1)) export declare function exports(): string; ->exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientFunction.ts, 8, 11)) +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientFunction.ts, 8, 14)) export declare function require(): string[]; >require : Symbol(require, Decl(collisionExportsRequireAndAmbientFunction.ts, 9, 46)) diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.types b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.types index 2ce319c111440..f07cb18d5c3d4 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.types +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.types @@ -9,7 +9,7 @@ export declare function require(): string[]; >require : () => string[] > : ^^^^^^ -declare module m1 { +declare namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -21,7 +21,7 @@ declare module m1 { >require : () => number > : ^^^^^^ } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientFunctionInGlobalFile.js b/tests/baselines/reference/collisionExportsRequireAndAmbientFunctionInGlobalFile.js index ba0e341896ba6..4cc03dfa7b4c0 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientFunctionInGlobalFile.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientFunctionInGlobalFile.js @@ -3,11 +3,11 @@ //// [collisionExportsRequireAndAmbientFunctionInGlobalFile.ts] declare function exports(): number; declare function require(): string; -declare module m3 { +declare namespace m3 { function exports(): string[]; function require(): number[]; } -module m4 { +namespace m4 { export declare function exports(): string; export declare function require(): string; var a = 10; diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientFunctionInGlobalFile.symbols b/tests/baselines/reference/collisionExportsRequireAndAmbientFunctionInGlobalFile.symbols index 5b636ae787c23..401c07e7ce853 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientFunctionInGlobalFile.symbols +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientFunctionInGlobalFile.symbols @@ -7,20 +7,20 @@ declare function exports(): number; declare function require(): string; >require : Symbol(require, Decl(collisionExportsRequireAndAmbientFunctionInGlobalFile.ts, 0, 35)) -declare module m3 { +declare namespace m3 { >m3 : Symbol(m3, Decl(collisionExportsRequireAndAmbientFunctionInGlobalFile.ts, 1, 35)) function exports(): string[]; ->exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientFunctionInGlobalFile.ts, 2, 19)) +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientFunctionInGlobalFile.ts, 2, 22)) function require(): number[]; >require : Symbol(require, Decl(collisionExportsRequireAndAmbientFunctionInGlobalFile.ts, 3, 33)) } -module m4 { +namespace m4 { >m4 : Symbol(m4, Decl(collisionExportsRequireAndAmbientFunctionInGlobalFile.ts, 5, 1)) export declare function exports(): string; ->exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientFunctionInGlobalFile.ts, 6, 11)) +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientFunctionInGlobalFile.ts, 6, 14)) export declare function require(): string; >require : Symbol(require, Decl(collisionExportsRequireAndAmbientFunctionInGlobalFile.ts, 7, 46)) diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientFunctionInGlobalFile.types b/tests/baselines/reference/collisionExportsRequireAndAmbientFunctionInGlobalFile.types index 8bed74b8f5f80..2aba5412e5c34 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientFunctionInGlobalFile.types +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientFunctionInGlobalFile.types @@ -9,7 +9,7 @@ declare function require(): string; >require : () => string > : ^^^^^^ -declare module m3 { +declare namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ @@ -21,7 +21,7 @@ declare module m3 { >require : () => number[] > : ^^^^^^ } -module m4 { +namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js index 39a1451e2f747..3680fe8caf028 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionExportsRequireAndAmbientModule.ts] //// //// [collisionExportsRequireAndAmbientModule_externalmodule.ts] -export declare module require { +export declare namespace require { export interface I { } export class C { @@ -10,7 +10,7 @@ export declare module require { export function foo(): require.I { return null; } -export declare module exports { +export declare namespace exports { export interface I { } export class C { @@ -19,28 +19,28 @@ export declare module exports { export function foo2(): exports.I { return null; } -declare module m1 { - module require { +declare namespace m1 { + namespace require { export interface I { } export class C { } } - module exports { + namespace exports { export interface I { } export class C { } } } -module m2 { - export declare module require { +namespace m2 { + export declare namespace require { export interface I { } export class C { } } - export declare module exports { + export declare namespace exports { export interface I { } export class C { @@ -50,40 +50,40 @@ module m2 { } //// [collisionExportsRequireAndAmbientModule_globalFile.ts] -declare module require { +declare namespace require { export interface I { } export class C { } } -declare module exports { +declare namespace exports { export interface I { } export class C { } } -declare module m3 { - module require { +declare namespace m3 { + namespace require { export interface I { } export class C { } } - module exports { + namespace exports { export interface I { } export class C { } } } -module m4 { - export declare module require { +namespace m4 { + export declare namespace require { export interface I { } export class C { } } - export declare module exports { + export declare namespace exports { export interface I { } export class C { diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.symbols b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.symbols index 063b12f4d8f35..69d5adc5efb4b 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.symbols +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/collisionExportsRequireAndAmbientModule.ts] //// === collisionExportsRequireAndAmbientModule_externalmodule.ts === -export declare module require { +export declare namespace require { >require : Symbol(require, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 0, 0)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 0, 31)) +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 0, 34)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 2, 5)) @@ -14,15 +14,15 @@ export declare module require { export function foo(): require.I { >foo : Symbol(foo, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 5, 1)) >require : Symbol(require, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 0, 0)) ->I : Symbol(require.I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 0, 31)) +>I : Symbol(require.I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 0, 34)) return null; } -export declare module exports { +export declare namespace exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 8, 1)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 9, 31)) +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 9, 34)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 11, 5)) @@ -31,52 +31,52 @@ export declare module exports { export function foo2(): exports.I { >foo2 : Symbol(foo2, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 14, 1)) >exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 8, 1)) ->I : Symbol(exports.I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 9, 31)) +>I : Symbol(exports.I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 9, 34)) return null; } -declare module m1 { +declare namespace m1 { >m1 : Symbol(m1, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 17, 1)) - module require { ->require : Symbol(require, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 18, 19)) + namespace require { +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 18, 22)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 19, 20)) +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 19, 23)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 21, 9)) } } - module exports { + namespace exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 24, 5)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 25, 20)) +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 25, 23)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 27, 9)) } } } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 31, 1)) - export declare module require { ->require : Symbol(require, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 32, 11)) + export declare namespace require { +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 32, 14)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 33, 35)) +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 33, 38)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 35, 9)) } } - export declare module exports { + export declare namespace exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 38, 5)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 39, 35)) +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 39, 38)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 41, 9)) @@ -87,68 +87,68 @@ module m2 { } === collisionExportsRequireAndAmbientModule_globalFile.ts === -declare module require { +declare namespace require { >require : Symbol(require, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 0, 0)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 0, 24)) +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 0, 27)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 2, 5)) } } -declare module exports { +declare namespace exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 5, 1)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 6, 24)) +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 6, 27)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 8, 5)) } } -declare module m3 { +declare namespace m3 { >m3 : Symbol(m3, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 11, 1)) - module require { ->require : Symbol(require, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 12, 19)) + namespace require { +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 12, 22)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 13, 20)) +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 13, 23)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 15, 9)) } } - module exports { + namespace exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 18, 5)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 19, 20)) +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 19, 23)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 21, 9)) } } } -module m4 { +namespace m4 { >m4 : Symbol(m4, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 25, 1)) - export declare module require { ->require : Symbol(require, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 26, 11)) + export declare namespace require { +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 26, 14)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 27, 35)) +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 27, 38)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 29, 9)) } } - export declare module exports { + export declare namespace exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 32, 5)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 33, 35)) +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 33, 38)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 35, 9)) diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.types b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.types index 7319dce38fc7a..29e54debaa29c 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.types +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionExportsRequireAndAmbientModule.ts] //// === collisionExportsRequireAndAmbientModule_externalmodule.ts === -export declare module require { +export declare namespace require { >require : typeof require > : ^^^^^^^^^^^^^^ @@ -20,7 +20,7 @@ export function foo(): require.I { return null; } -export declare module exports { +export declare namespace exports { >exports : typeof exports > : ^^^^^^^^^^^^^^ @@ -39,11 +39,11 @@ export function foo2(): exports.I { return null; } -declare module m1 { +declare namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ - module require { + namespace require { >require : typeof require > : ^^^^^^^^^^^^^^ @@ -54,7 +54,7 @@ declare module m1 { > : ^ } } - module exports { + namespace exports { >exports : typeof exports > : ^^^^^^^^^^^^^^ @@ -66,11 +66,11 @@ declare module m1 { } } } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ - export declare module require { + export declare namespace require { >require : typeof require > : ^^^^^^^^^^^^^^ @@ -81,7 +81,7 @@ module m2 { > : ^ } } - export declare module exports { + export declare namespace exports { >exports : typeof exports > : ^^^^^^^^^^^^^^ @@ -100,7 +100,7 @@ module m2 { } === collisionExportsRequireAndAmbientModule_globalFile.ts === -declare module require { +declare namespace require { >require : typeof require > : ^^^^^^^^^^^^^^ @@ -111,7 +111,7 @@ declare module require { > : ^ } } -declare module exports { +declare namespace exports { >exports : typeof exports > : ^^^^^^^^^^^^^^ @@ -122,11 +122,11 @@ declare module exports { > : ^ } } -declare module m3 { +declare namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ - module require { + namespace require { >require : typeof require > : ^^^^^^^^^^^^^^ @@ -137,7 +137,7 @@ declare module m3 { > : ^ } } - module exports { + namespace exports { >exports : typeof exports > : ^^^^^^^^^^^^^^ @@ -149,11 +149,11 @@ declare module m3 { } } } -module m4 { +namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ - export declare module require { + export declare namespace require { >require : typeof require > : ^^^^^^^^^^^^^^ @@ -164,7 +164,7 @@ module m4 { > : ^ } } - export declare module exports { + export declare namespace exports { >exports : typeof exports > : ^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js index 3599b9f4133ad..cd31c9d2a3547 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js @@ -3,11 +3,11 @@ //// [collisionExportsRequireAndAmbientVar_externalmodule.ts] export declare var exports: number; export declare var require: string; -declare module m1 { +declare namespace m1 { var exports: string; var require: number; } -module m2 { +namespace m2 { export declare var exports: number; export declare var require: string; var a = 10; @@ -16,11 +16,11 @@ module m2 { //// [collisionExportsRequireAndAmbientVar_globalFile.ts] declare var exports: number; declare var require: string; -declare module m3 { +declare namespace m3 { var exports: string; var require: number; } -module m4 { +namespace m4 { export declare var exports: string; export declare var require: number; var a = 10; diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.symbols b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.symbols index 2519959c579b4..cc01a557a2b02 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.symbols +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.symbols @@ -7,7 +7,7 @@ export declare var exports: number; export declare var require: string; >require : Symbol(require, Decl(collisionExportsRequireAndAmbientVar_externalmodule.ts, 1, 18)) -declare module m1 { +declare namespace m1 { >m1 : Symbol(m1, Decl(collisionExportsRequireAndAmbientVar_externalmodule.ts, 1, 35)) var exports: string; @@ -16,7 +16,7 @@ declare module m1 { var require: number; >require : Symbol(require, Decl(collisionExportsRequireAndAmbientVar_externalmodule.ts, 4, 7)) } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(collisionExportsRequireAndAmbientVar_externalmodule.ts, 5, 1)) export declare var exports: number; @@ -36,7 +36,7 @@ declare var exports: number; declare var require: string; >require : Symbol(require, Decl(collisionExportsRequireAndAmbientVar_globalFile.ts, 1, 11)) -declare module m3 { +declare namespace m3 { >m3 : Symbol(m3, Decl(collisionExportsRequireAndAmbientVar_globalFile.ts, 1, 28)) var exports: string; @@ -45,7 +45,7 @@ declare module m3 { var require: number; >require : Symbol(require, Decl(collisionExportsRequireAndAmbientVar_globalFile.ts, 4, 7)) } -module m4 { +namespace m4 { >m4 : Symbol(m4, Decl(collisionExportsRequireAndAmbientVar_globalFile.ts, 5, 1)) export declare var exports: string; diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.types b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.types index c0a8e1fdb97d6..42b738730a99e 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.types +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.types @@ -9,7 +9,7 @@ export declare var require: string; >require : string > : ^^^^^^ -declare module m1 { +declare namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -21,7 +21,7 @@ declare module m1 { >require : number > : ^^^^^^ } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -49,7 +49,7 @@ declare var require: string; >require : string > : ^^^^^^ -declare module m3 { +declare namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ @@ -61,7 +61,7 @@ declare module m3 { >require : number > : ^^^^^^ } -module m4 { +namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/collisionExportsRequireAndClass.errors.txt b/tests/baselines/reference/collisionExportsRequireAndClass.errors.txt index dbe33f7bb0310..a2635142096ff 100644 --- a/tests/baselines/reference/collisionExportsRequireAndClass.errors.txt +++ b/tests/baselines/reference/collisionExportsRequireAndClass.errors.txt @@ -11,13 +11,13 @@ collisionExportsRequireAndClass_externalmodule.ts(3,14): error TS2441: Duplicate ~~~~~~~ !!! error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module. } - module m1 { + namespace m1 { class require { } class exports { } } - module m2 { + namespace m2 { export class require { } export class exports { @@ -29,13 +29,13 @@ collisionExportsRequireAndClass_externalmodule.ts(3,14): error TS2441: Duplicate } class exports { } - module m3 { + namespace m3 { class require { } class exports { } } - module m4 { + namespace m4 { export class require { } export class exports { diff --git a/tests/baselines/reference/collisionExportsRequireAndClass.js b/tests/baselines/reference/collisionExportsRequireAndClass.js index ab119ce519a2e..0476fd8b9361f 100644 --- a/tests/baselines/reference/collisionExportsRequireAndClass.js +++ b/tests/baselines/reference/collisionExportsRequireAndClass.js @@ -5,13 +5,13 @@ export class require { } export class exports { } -module m1 { +namespace m1 { class require { } class exports { } } -module m2 { +namespace m2 { export class require { } export class exports { @@ -23,13 +23,13 @@ class require { } class exports { } -module m3 { +namespace m3 { class require { } class exports { } } -module m4 { +namespace m4 { export class require { } export class exports { diff --git a/tests/baselines/reference/collisionExportsRequireAndClass.symbols b/tests/baselines/reference/collisionExportsRequireAndClass.symbols index a03f1509ef715..d6446f9ea733b 100644 --- a/tests/baselines/reference/collisionExportsRequireAndClass.symbols +++ b/tests/baselines/reference/collisionExportsRequireAndClass.symbols @@ -7,21 +7,21 @@ export class require { export class exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndClass_externalmodule.ts, 1, 1)) } -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(collisionExportsRequireAndClass_externalmodule.ts, 3, 1)) class require { ->require : Symbol(require, Decl(collisionExportsRequireAndClass_externalmodule.ts, 4, 11)) +>require : Symbol(require, Decl(collisionExportsRequireAndClass_externalmodule.ts, 4, 14)) } class exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndClass_externalmodule.ts, 6, 5)) } } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(collisionExportsRequireAndClass_externalmodule.ts, 9, 1)) export class require { ->require : Symbol(require, Decl(collisionExportsRequireAndClass_externalmodule.ts, 10, 11)) +>require : Symbol(require, Decl(collisionExportsRequireAndClass_externalmodule.ts, 10, 14)) } export class exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndClass_externalmodule.ts, 12, 5)) @@ -35,21 +35,21 @@ class require { class exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndClass_globalFile.ts, 1, 1)) } -module m3 { +namespace m3 { >m3 : Symbol(m3, Decl(collisionExportsRequireAndClass_globalFile.ts, 3, 1)) class require { ->require : Symbol(require, Decl(collisionExportsRequireAndClass_globalFile.ts, 4, 11)) +>require : Symbol(require, Decl(collisionExportsRequireAndClass_globalFile.ts, 4, 14)) } class exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndClass_globalFile.ts, 6, 5)) } } -module m4 { +namespace m4 { >m4 : Symbol(m4, Decl(collisionExportsRequireAndClass_globalFile.ts, 9, 1)) export class require { ->require : Symbol(require, Decl(collisionExportsRequireAndClass_globalFile.ts, 10, 11)) +>require : Symbol(require, Decl(collisionExportsRequireAndClass_globalFile.ts, 10, 14)) } export class exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndClass_globalFile.ts, 12, 5)) diff --git a/tests/baselines/reference/collisionExportsRequireAndClass.types b/tests/baselines/reference/collisionExportsRequireAndClass.types index 3987b28d80ffc..07c9734c27632 100644 --- a/tests/baselines/reference/collisionExportsRequireAndClass.types +++ b/tests/baselines/reference/collisionExportsRequireAndClass.types @@ -9,7 +9,7 @@ export class exports { >exports : exports > : ^^^^^^^ } -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -22,7 +22,7 @@ module m1 { > : ^^^^^^^ } } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -45,7 +45,7 @@ class exports { >exports : exports > : ^^^^^^^ } -module m3 { +namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ @@ -58,7 +58,7 @@ module m3 { > : ^^^^^^^ } } -module m4 { +namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/collisionExportsRequireAndEnum.errors.txt b/tests/baselines/reference/collisionExportsRequireAndEnum.errors.txt index 37da5848b8d6c..c929a282c8d49 100644 --- a/tests/baselines/reference/collisionExportsRequireAndEnum.errors.txt +++ b/tests/baselines/reference/collisionExportsRequireAndEnum.errors.txt @@ -15,7 +15,7 @@ collisionExportsRequireAndEnum_externalmodule.ts(5,13): error TS2441: Duplicate _thisVal1, _thisVal2, } - module m1 { + namespace m1 { enum require { _thisVal1, _thisVal2, @@ -25,7 +25,7 @@ collisionExportsRequireAndEnum_externalmodule.ts(5,13): error TS2441: Duplicate _thisVal2, } } - module m2 { + namespace m2 { export enum require { _thisVal1, _thisVal2, @@ -45,7 +45,7 @@ collisionExportsRequireAndEnum_externalmodule.ts(5,13): error TS2441: Duplicate _thisVal1, _thisVal2, } - module m3 { + namespace m3 { enum require { _thisVal1, _thisVal2, @@ -55,7 +55,7 @@ collisionExportsRequireAndEnum_externalmodule.ts(5,13): error TS2441: Duplicate _thisVal2, } } - module m4 { + namespace m4 { export enum require { _thisVal1, _thisVal2, diff --git a/tests/baselines/reference/collisionExportsRequireAndEnum.js b/tests/baselines/reference/collisionExportsRequireAndEnum.js index 6ff2ab68521d7..2824652a8b661 100644 --- a/tests/baselines/reference/collisionExportsRequireAndEnum.js +++ b/tests/baselines/reference/collisionExportsRequireAndEnum.js @@ -9,7 +9,7 @@ export enum exports { // Error _thisVal1, _thisVal2, } -module m1 { +namespace m1 { enum require { _thisVal1, _thisVal2, @@ -19,7 +19,7 @@ module m1 { _thisVal2, } } -module m2 { +namespace m2 { export enum require { _thisVal1, _thisVal2, @@ -39,7 +39,7 @@ enum exports { _thisVal1, _thisVal2, } -module m3 { +namespace m3 { enum require { _thisVal1, _thisVal2, @@ -49,7 +49,7 @@ module m3 { _thisVal2, } } -module m4 { +namespace m4 { export enum require { _thisVal1, _thisVal2, diff --git a/tests/baselines/reference/collisionExportsRequireAndEnum.symbols b/tests/baselines/reference/collisionExportsRequireAndEnum.symbols index 22d6160822cc5..4ea0e744f4398 100644 --- a/tests/baselines/reference/collisionExportsRequireAndEnum.symbols +++ b/tests/baselines/reference/collisionExportsRequireAndEnum.symbols @@ -19,11 +19,11 @@ export enum exports { // Error _thisVal2, >_thisVal2 : Symbol(exports._thisVal2, Decl(collisionExportsRequireAndEnum_externalmodule.ts, 5, 14)) } -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(collisionExportsRequireAndEnum_externalmodule.ts, 7, 1)) enum require { ->require : Symbol(require, Decl(collisionExportsRequireAndEnum_externalmodule.ts, 8, 11)) +>require : Symbol(require, Decl(collisionExportsRequireAndEnum_externalmodule.ts, 8, 14)) _thisVal1, >_thisVal1 : Symbol(require._thisVal1, Decl(collisionExportsRequireAndEnum_externalmodule.ts, 9, 18)) @@ -41,11 +41,11 @@ module m1 { >_thisVal2 : Symbol(exports._thisVal2, Decl(collisionExportsRequireAndEnum_externalmodule.ts, 14, 18)) } } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(collisionExportsRequireAndEnum_externalmodule.ts, 17, 1)) export enum require { ->require : Symbol(require, Decl(collisionExportsRequireAndEnum_externalmodule.ts, 18, 11)) +>require : Symbol(require, Decl(collisionExportsRequireAndEnum_externalmodule.ts, 18, 14)) _thisVal1, >_thisVal1 : Symbol(require._thisVal1, Decl(collisionExportsRequireAndEnum_externalmodule.ts, 19, 25)) @@ -83,11 +83,11 @@ enum exports { _thisVal2, >_thisVal2 : Symbol(exports._thisVal2, Decl(collisionExportsRequireAndEnum_globalFile.ts, 5, 14)) } -module m3 { +namespace m3 { >m3 : Symbol(m3, Decl(collisionExportsRequireAndEnum_globalFile.ts, 7, 1)) enum require { ->require : Symbol(require, Decl(collisionExportsRequireAndEnum_globalFile.ts, 8, 11)) +>require : Symbol(require, Decl(collisionExportsRequireAndEnum_globalFile.ts, 8, 14)) _thisVal1, >_thisVal1 : Symbol(require._thisVal1, Decl(collisionExportsRequireAndEnum_globalFile.ts, 9, 18)) @@ -105,11 +105,11 @@ module m3 { >_thisVal2 : Symbol(exports._thisVal2, Decl(collisionExportsRequireAndEnum_globalFile.ts, 14, 18)) } } -module m4 { +namespace m4 { >m4 : Symbol(m4, Decl(collisionExportsRequireAndEnum_globalFile.ts, 17, 1)) export enum require { ->require : Symbol(require, Decl(collisionExportsRequireAndEnum_globalFile.ts, 18, 11)) +>require : Symbol(require, Decl(collisionExportsRequireAndEnum_globalFile.ts, 18, 14)) _thisVal1, >_thisVal1 : Symbol(require._thisVal1, Decl(collisionExportsRequireAndEnum_globalFile.ts, 19, 25)) diff --git a/tests/baselines/reference/collisionExportsRequireAndEnum.types b/tests/baselines/reference/collisionExportsRequireAndEnum.types index 5e490b71671c7..1adfb7ae181d4 100644 --- a/tests/baselines/reference/collisionExportsRequireAndEnum.types +++ b/tests/baselines/reference/collisionExportsRequireAndEnum.types @@ -25,7 +25,7 @@ export enum exports { // Error >_thisVal2 : exports._thisVal2 > : ^^^^^^^^^^^^^^^^^ } -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -54,7 +54,7 @@ module m1 { > : ^^^^^^^^^^^^^^^^^ } } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -109,7 +109,7 @@ enum exports { >_thisVal2 : exports._thisVal2 > : ^^^^^^^^^^^^^^^^^ } -module m3 { +namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ @@ -138,7 +138,7 @@ module m3 { > : ^^^^^^^^^^^^^^^^^ } } -module m4 { +namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/collisionExportsRequireAndFunction.errors.txt b/tests/baselines/reference/collisionExportsRequireAndFunction.errors.txt index a5cf85435ca77..414dfe834f90f 100644 --- a/tests/baselines/reference/collisionExportsRequireAndFunction.errors.txt +++ b/tests/baselines/reference/collisionExportsRequireAndFunction.errors.txt @@ -13,7 +13,7 @@ collisionExportsRequireAndFunction.ts(4,17): error TS2441: Duplicate identifier !!! error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module. return "require"; } - module m1 { + namespace m1 { function exports() { return 1; } @@ -21,7 +21,7 @@ collisionExportsRequireAndFunction.ts(4,17): error TS2441: Duplicate identifier return "require"; } } - module m2 { + namespace m2 { export function exports() { return 1; } diff --git a/tests/baselines/reference/collisionExportsRequireAndFunction.js b/tests/baselines/reference/collisionExportsRequireAndFunction.js index 0281aa2e03ac2..aab04d3b8f4b3 100644 --- a/tests/baselines/reference/collisionExportsRequireAndFunction.js +++ b/tests/baselines/reference/collisionExportsRequireAndFunction.js @@ -7,7 +7,7 @@ export function exports() { export function require() { return "require"; } -module m1 { +namespace m1 { function exports() { return 1; } @@ -15,7 +15,7 @@ module m1 { return "require"; } } -module m2 { +namespace m2 { export function exports() { return 1; } diff --git a/tests/baselines/reference/collisionExportsRequireAndFunction.symbols b/tests/baselines/reference/collisionExportsRequireAndFunction.symbols index e4950beb37053..ec4800881fcc0 100644 --- a/tests/baselines/reference/collisionExportsRequireAndFunction.symbols +++ b/tests/baselines/reference/collisionExportsRequireAndFunction.symbols @@ -11,11 +11,11 @@ export function require() { return "require"; } -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(collisionExportsRequireAndFunction.ts, 5, 1)) function exports() { ->exports : Symbol(exports, Decl(collisionExportsRequireAndFunction.ts, 6, 11)) +>exports : Symbol(exports, Decl(collisionExportsRequireAndFunction.ts, 6, 14)) return 1; } @@ -25,11 +25,11 @@ module m1 { return "require"; } } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(collisionExportsRequireAndFunction.ts, 13, 1)) export function exports() { ->exports : Symbol(exports, Decl(collisionExportsRequireAndFunction.ts, 14, 11)) +>exports : Symbol(exports, Decl(collisionExportsRequireAndFunction.ts, 14, 14)) return 1; } diff --git a/tests/baselines/reference/collisionExportsRequireAndFunction.types b/tests/baselines/reference/collisionExportsRequireAndFunction.types index 91f95f9e4a3c9..c3c9c8ae7cfc0 100644 --- a/tests/baselines/reference/collisionExportsRequireAndFunction.types +++ b/tests/baselines/reference/collisionExportsRequireAndFunction.types @@ -17,7 +17,7 @@ export function require() { >"require" : "require" > : ^^^^^^^^^ } -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -38,7 +38,7 @@ module m1 { > : ^^^^^^^^^ } } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/collisionExportsRequireAndFunctionInGlobalFile.js b/tests/baselines/reference/collisionExportsRequireAndFunctionInGlobalFile.js index e6c2e2502901b..b0b37f66d4add 100644 --- a/tests/baselines/reference/collisionExportsRequireAndFunctionInGlobalFile.js +++ b/tests/baselines/reference/collisionExportsRequireAndFunctionInGlobalFile.js @@ -7,7 +7,7 @@ function exports() { function require() { return "require"; } -module m3 { +namespace m3 { function exports() { return 1; } @@ -15,7 +15,7 @@ module m3 { return "require"; } } -module m4 { +namespace m4 { export function exports() { return 1; } diff --git a/tests/baselines/reference/collisionExportsRequireAndFunctionInGlobalFile.symbols b/tests/baselines/reference/collisionExportsRequireAndFunctionInGlobalFile.symbols index 3ec9ac573ce61..b4bb2001c6e15 100644 --- a/tests/baselines/reference/collisionExportsRequireAndFunctionInGlobalFile.symbols +++ b/tests/baselines/reference/collisionExportsRequireAndFunctionInGlobalFile.symbols @@ -11,11 +11,11 @@ function require() { return "require"; } -module m3 { +namespace m3 { >m3 : Symbol(m3, Decl(collisionExportsRequireAndFunctionInGlobalFile.ts, 5, 1)) function exports() { ->exports : Symbol(exports, Decl(collisionExportsRequireAndFunctionInGlobalFile.ts, 6, 11)) +>exports : Symbol(exports, Decl(collisionExportsRequireAndFunctionInGlobalFile.ts, 6, 14)) return 1; } @@ -25,11 +25,11 @@ module m3 { return "require"; } } -module m4 { +namespace m4 { >m4 : Symbol(m4, Decl(collisionExportsRequireAndFunctionInGlobalFile.ts, 13, 1)) export function exports() { ->exports : Symbol(exports, Decl(collisionExportsRequireAndFunctionInGlobalFile.ts, 14, 11)) +>exports : Symbol(exports, Decl(collisionExportsRequireAndFunctionInGlobalFile.ts, 14, 14)) return 1; } diff --git a/tests/baselines/reference/collisionExportsRequireAndFunctionInGlobalFile.types b/tests/baselines/reference/collisionExportsRequireAndFunctionInGlobalFile.types index 50370bc646c42..75e8615a64ba2 100644 --- a/tests/baselines/reference/collisionExportsRequireAndFunctionInGlobalFile.types +++ b/tests/baselines/reference/collisionExportsRequireAndFunctionInGlobalFile.types @@ -17,7 +17,7 @@ function require() { >"require" : "require" > : ^^^^^^^^^ } -module m3 { +namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ @@ -38,7 +38,7 @@ module m3 { > : ^^^^^^^^^ } } -module m4 { +namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.errors.txt b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.errors.txt index 25e9a3c14a18b..6eb1079637611 100644 --- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.errors.txt +++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.errors.txt @@ -3,7 +3,7 @@ collisionExportsRequireAndInternalModuleAlias.ts(6,8): error TS2441: Duplicate i ==== collisionExportsRequireAndInternalModuleAlias.ts (2 errors) ==== - export module m { + export namespace m { export class c { } } @@ -16,14 +16,14 @@ collisionExportsRequireAndInternalModuleAlias.ts(6,8): error TS2441: Duplicate i new exports(); new require(); - module m1 { + namespace m1 { import exports = m.c; import require = m.c; new exports(); new require(); } - module m2 { + namespace m2 { export import exports = m.c; export import require = m.c; new exports(); diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js index a1d9034b97608..380c31e617c74 100644 --- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js +++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionExportsRequireAndInternalModuleAlias.ts] //// //// [collisionExportsRequireAndInternalModuleAlias.ts] -export module m { +export namespace m { export class c { } } @@ -10,14 +10,14 @@ import require = m.c; new exports(); new require(); -module m1 { +namespace m1 { import exports = m.c; import require = m.c; new exports(); new require(); } -module m2 { +namespace m2 { export import exports = m.c; export import require = m.c; new exports(); diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.symbols b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.symbols index 4eafdefab8c2b..af2fc2c8a3197 100644 --- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.symbols +++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.symbols @@ -1,22 +1,22 @@ //// [tests/cases/compiler/collisionExportsRequireAndInternalModuleAlias.ts] //// === collisionExportsRequireAndInternalModuleAlias.ts === -export module m { +export namespace m { >m : Symbol(m, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 0, 0)) export class c { ->c : Symbol(c, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 0, 17)) +>c : Symbol(c, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 0, 20)) } } import exports = m.c; >exports : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 3, 1)) >m : Symbol(m, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 0, 0)) ->c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 0, 17)) +>c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 0, 20)) import require = m.c; >require : Symbol(require, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 4, 21)) >m : Symbol(m, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 0, 0)) ->c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 0, 17)) +>c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 0, 20)) new exports(); >exports : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 3, 1)) @@ -24,41 +24,41 @@ new exports(); new require(); >require : Symbol(require, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 4, 21)) -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 7, 14)) import exports = m.c; ->exports : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 9, 11)) +>exports : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 9, 14)) >m : Symbol(m, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 0, 0)) ->c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 0, 17)) +>c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 0, 20)) import require = m.c; >require : Symbol(require, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 10, 25)) >m : Symbol(m, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 0, 0)) ->c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 0, 17)) +>c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 0, 20)) new exports(); ->exports : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 9, 11)) +>exports : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 9, 14)) new require(); >require : Symbol(require, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 10, 25)) } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 14, 1)) export import exports = m.c; ->exports : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 16, 11)) +>exports : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 16, 14)) >m : Symbol(m, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 0, 0)) ->c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 0, 17)) +>c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 0, 20)) export import require = m.c; >require : Symbol(require, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 17, 32)) >m : Symbol(m, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 0, 0)) ->c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 0, 17)) +>c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 0, 20)) new exports(); ->exports : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 16, 11)) +>exports : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 16, 14)) new require(); >require : Symbol(require, Decl(collisionExportsRequireAndInternalModuleAlias.ts, 17, 32)) diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.types b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.types index 6ce6c3f81ee7e..f7c416726c3d5 100644 --- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.types +++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionExportsRequireAndInternalModuleAlias.ts] //// === collisionExportsRequireAndInternalModuleAlias.ts === -export module m { +export namespace m { >m : typeof m > : ^^^^^^^^ @@ -38,7 +38,7 @@ new require(); >require : typeof exports > : ^^^^^^^^^^^^^^ -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -71,7 +71,7 @@ module m1 { > : ^^^^^^^^^^^^^^ } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.js b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.js index 2b07475e5cd3d..a8d2366d0e1f1 100644 --- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.js +++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts] //// //// [collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts] -module mOfGloalFile { +namespace mOfGloalFile { export class c { } } @@ -10,14 +10,14 @@ import require = mOfGloalFile.c; new exports(); new require(); -module m1 { +namespace m1 { import exports = mOfGloalFile.c; import require = mOfGloalFile.c; new exports(); new require(); } -module m2 { +namespace m2 { export import exports = mOfGloalFile.c; export import require = mOfGloalFile.c; new exports(); diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.symbols b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.symbols index ae9c5b97226f6..c6b77cd7e6965 100644 --- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.symbols +++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.symbols @@ -1,22 +1,22 @@ //// [tests/cases/compiler/collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts] //// === collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts === -module mOfGloalFile { +namespace mOfGloalFile { >mOfGloalFile : Symbol(mOfGloalFile, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 0, 0)) export class c { ->c : Symbol(c, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 0, 21)) +>c : Symbol(c, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 0, 24)) } } import exports = mOfGloalFile.c; >exports : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 3, 1)) >mOfGloalFile : Symbol(mOfGloalFile, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 0, 0)) ->c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 0, 21)) +>c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 0, 24)) import require = mOfGloalFile.c; >require : Symbol(require, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 4, 32)) >mOfGloalFile : Symbol(mOfGloalFile, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 0, 0)) ->c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 0, 21)) +>c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 0, 24)) new exports(); >exports : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 3, 1)) @@ -24,41 +24,41 @@ new exports(); new require(); >require : Symbol(require, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 4, 32)) -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 7, 14)) import exports = mOfGloalFile.c; ->exports : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 9, 11)) +>exports : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 9, 14)) >mOfGloalFile : Symbol(mOfGloalFile, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 0, 0)) ->c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 0, 21)) +>c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 0, 24)) import require = mOfGloalFile.c; >require : Symbol(require, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 10, 36)) >mOfGloalFile : Symbol(mOfGloalFile, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 0, 0)) ->c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 0, 21)) +>c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 0, 24)) new exports(); ->exports : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 9, 11)) +>exports : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 9, 14)) new require(); >require : Symbol(require, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 10, 36)) } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 14, 1)) export import exports = mOfGloalFile.c; ->exports : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 16, 11)) +>exports : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 16, 14)) >mOfGloalFile : Symbol(mOfGloalFile, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 0, 0)) ->c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 0, 21)) +>c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 0, 24)) export import require = mOfGloalFile.c; >require : Symbol(require, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 17, 43)) >mOfGloalFile : Symbol(mOfGloalFile, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 0, 0)) ->c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 0, 21)) +>c : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 0, 24)) new exports(); ->exports : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 16, 11)) +>exports : Symbol(exports, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 16, 14)) new require(); >require : Symbol(require, Decl(collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts, 17, 43)) diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.types b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.types index 9aebf254d0e28..557683f147578 100644 --- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.types +++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts] //// === collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts === -module mOfGloalFile { +namespace mOfGloalFile { >mOfGloalFile : typeof mOfGloalFile > : ^^^^^^^^^^^^^^^^^^^ @@ -38,7 +38,7 @@ new require(); >require : typeof exports > : ^^^^^^^^^^^^^^ -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -71,7 +71,7 @@ module m1 { > : ^^^^^^^^^^^^^^ } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.errors.txt b/tests/baselines/reference/collisionExportsRequireAndModule.errors.txt index be62e07875db8..8f0bad198b7f1 100644 --- a/tests/baselines/reference/collisionExportsRequireAndModule.errors.txt +++ b/tests/baselines/reference/collisionExportsRequireAndModule.errors.txt @@ -1,10 +1,10 @@ -collisionExportsRequireAndModule_externalmodule.ts(1,15): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module. -collisionExportsRequireAndModule_externalmodule.ts(10,15): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module. +collisionExportsRequireAndModule_externalmodule.ts(1,18): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module. +collisionExportsRequireAndModule_externalmodule.ts(10,18): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module. ==== collisionExportsRequireAndModule_externalmodule.ts (2 errors) ==== - export module require { - ~~~~~~~ + export namespace require { + ~~~~~~~ !!! error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module. export interface I { } @@ -14,8 +14,8 @@ collisionExportsRequireAndModule_externalmodule.ts(10,15): error TS2441: Duplica export function foo(): require.I { return null; } - export module exports { - ~~~~~~~ + export namespace exports { + ~~~~~~~ !!! error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module. export interface I { } @@ -25,28 +25,28 @@ collisionExportsRequireAndModule_externalmodule.ts(10,15): error TS2441: Duplica export function foo2(): exports.I { return null; } - module m1 { - module require { + namespace m1 { + namespace require { export interface I { } export class C { } } - module exports { + namespace exports { export interface I { } export class C { } } } - module m2 { - export module require { + namespace m2 { + export namespace require { export interface I { } export class C { } } - export module exports { + export namespace exports { export interface I { } export class C { @@ -55,40 +55,40 @@ collisionExportsRequireAndModule_externalmodule.ts(10,15): error TS2441: Duplica } ==== collisionExportsRequireAndModule_globalFile.ts (0 errors) ==== - module require { + namespace require { export interface I { } export class C { } } - module exports { + namespace exports { export interface I { } export class C { } } - module m3 { - module require { + namespace m3 { + namespace require { export interface I { } export class C { } } - module exports { + namespace exports { export interface I { } export class C { } } } - module m4 { - export module require { + namespace m4 { + export namespace require { export interface I { } export class C { } } - export module exports { + export namespace exports { export interface I { } export class C { diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.js b/tests/baselines/reference/collisionExportsRequireAndModule.js index 2db6711d8b7ad..00fec6da4dd36 100644 --- a/tests/baselines/reference/collisionExportsRequireAndModule.js +++ b/tests/baselines/reference/collisionExportsRequireAndModule.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionExportsRequireAndModule.ts] //// //// [collisionExportsRequireAndModule_externalmodule.ts] -export module require { +export namespace require { export interface I { } export class C { @@ -10,7 +10,7 @@ export module require { export function foo(): require.I { return null; } -export module exports { +export namespace exports { export interface I { } export class C { @@ -19,28 +19,28 @@ export module exports { export function foo2(): exports.I { return null; } -module m1 { - module require { +namespace m1 { + namespace require { export interface I { } export class C { } } - module exports { + namespace exports { export interface I { } export class C { } } } -module m2 { - export module require { +namespace m2 { + export namespace require { export interface I { } export class C { } } - export module exports { + export namespace exports { export interface I { } export class C { @@ -49,40 +49,40 @@ module m2 { } //// [collisionExportsRequireAndModule_globalFile.ts] -module require { +namespace require { export interface I { } export class C { } } -module exports { +namespace exports { export interface I { } export class C { } } -module m3 { - module require { +namespace m3 { + namespace require { export interface I { } export class C { } } - module exports { + namespace exports { export interface I { } export class C { } } } -module m4 { - export module require { +namespace m4 { + export namespace require { export interface I { } export class C { } } - export module exports { + export namespace exports { export interface I { } export class C { diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.symbols b/tests/baselines/reference/collisionExportsRequireAndModule.symbols index aca30b08c4125..77e441d951e31 100644 --- a/tests/baselines/reference/collisionExportsRequireAndModule.symbols +++ b/tests/baselines/reference/collisionExportsRequireAndModule.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/collisionExportsRequireAndModule.ts] //// === collisionExportsRequireAndModule_externalmodule.ts === -export module require { +export namespace require { >require : Symbol(require, Decl(collisionExportsRequireAndModule_externalmodule.ts, 0, 0)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndModule_externalmodule.ts, 0, 23)) +>I : Symbol(I, Decl(collisionExportsRequireAndModule_externalmodule.ts, 0, 26)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndModule_externalmodule.ts, 2, 5)) @@ -14,15 +14,15 @@ export module require { export function foo(): require.I { >foo : Symbol(foo, Decl(collisionExportsRequireAndModule_externalmodule.ts, 5, 1)) >require : Symbol(require, Decl(collisionExportsRequireAndModule_externalmodule.ts, 0, 0)) ->I : Symbol(require.I, Decl(collisionExportsRequireAndModule_externalmodule.ts, 0, 23)) +>I : Symbol(require.I, Decl(collisionExportsRequireAndModule_externalmodule.ts, 0, 26)) return null; } -export module exports { +export namespace exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndModule_externalmodule.ts, 8, 1)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndModule_externalmodule.ts, 9, 23)) +>I : Symbol(I, Decl(collisionExportsRequireAndModule_externalmodule.ts, 9, 26)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndModule_externalmodule.ts, 11, 5)) @@ -31,52 +31,52 @@ export module exports { export function foo2(): exports.I { >foo2 : Symbol(foo2, Decl(collisionExportsRequireAndModule_externalmodule.ts, 14, 1)) >exports : Symbol(exports, Decl(collisionExportsRequireAndModule_externalmodule.ts, 8, 1)) ->I : Symbol(exports.I, Decl(collisionExportsRequireAndModule_externalmodule.ts, 9, 23)) +>I : Symbol(exports.I, Decl(collisionExportsRequireAndModule_externalmodule.ts, 9, 26)) return null; } -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(collisionExportsRequireAndModule_externalmodule.ts, 17, 1)) - module require { ->require : Symbol(require, Decl(collisionExportsRequireAndModule_externalmodule.ts, 18, 11)) + namespace require { +>require : Symbol(require, Decl(collisionExportsRequireAndModule_externalmodule.ts, 18, 14)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndModule_externalmodule.ts, 19, 20)) +>I : Symbol(I, Decl(collisionExportsRequireAndModule_externalmodule.ts, 19, 23)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndModule_externalmodule.ts, 21, 9)) } } - module exports { + namespace exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndModule_externalmodule.ts, 24, 5)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndModule_externalmodule.ts, 25, 20)) +>I : Symbol(I, Decl(collisionExportsRequireAndModule_externalmodule.ts, 25, 23)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndModule_externalmodule.ts, 27, 9)) } } } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(collisionExportsRequireAndModule_externalmodule.ts, 31, 1)) - export module require { ->require : Symbol(require, Decl(collisionExportsRequireAndModule_externalmodule.ts, 32, 11)) + export namespace require { +>require : Symbol(require, Decl(collisionExportsRequireAndModule_externalmodule.ts, 32, 14)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndModule_externalmodule.ts, 33, 27)) +>I : Symbol(I, Decl(collisionExportsRequireAndModule_externalmodule.ts, 33, 30)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndModule_externalmodule.ts, 35, 9)) } } - export module exports { + export namespace exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndModule_externalmodule.ts, 38, 5)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndModule_externalmodule.ts, 39, 27)) +>I : Symbol(I, Decl(collisionExportsRequireAndModule_externalmodule.ts, 39, 30)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndModule_externalmodule.ts, 41, 9)) @@ -85,68 +85,68 @@ module m2 { } === collisionExportsRequireAndModule_globalFile.ts === -module require { +namespace require { >require : Symbol(require, Decl(collisionExportsRequireAndModule_globalFile.ts, 0, 0)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndModule_globalFile.ts, 0, 16)) +>I : Symbol(I, Decl(collisionExportsRequireAndModule_globalFile.ts, 0, 19)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndModule_globalFile.ts, 2, 5)) } } -module exports { +namespace exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndModule_globalFile.ts, 5, 1)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndModule_globalFile.ts, 6, 16)) +>I : Symbol(I, Decl(collisionExportsRequireAndModule_globalFile.ts, 6, 19)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndModule_globalFile.ts, 8, 5)) } } -module m3 { +namespace m3 { >m3 : Symbol(m3, Decl(collisionExportsRequireAndModule_globalFile.ts, 11, 1)) - module require { ->require : Symbol(require, Decl(collisionExportsRequireAndModule_globalFile.ts, 12, 11)) + namespace require { +>require : Symbol(require, Decl(collisionExportsRequireAndModule_globalFile.ts, 12, 14)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndModule_globalFile.ts, 13, 20)) +>I : Symbol(I, Decl(collisionExportsRequireAndModule_globalFile.ts, 13, 23)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndModule_globalFile.ts, 15, 9)) } } - module exports { + namespace exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndModule_globalFile.ts, 18, 5)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndModule_globalFile.ts, 19, 20)) +>I : Symbol(I, Decl(collisionExportsRequireAndModule_globalFile.ts, 19, 23)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndModule_globalFile.ts, 21, 9)) } } } -module m4 { +namespace m4 { >m4 : Symbol(m4, Decl(collisionExportsRequireAndModule_globalFile.ts, 25, 1)) - export module require { ->require : Symbol(require, Decl(collisionExportsRequireAndModule_globalFile.ts, 26, 11)) + export namespace require { +>require : Symbol(require, Decl(collisionExportsRequireAndModule_globalFile.ts, 26, 14)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndModule_globalFile.ts, 27, 27)) +>I : Symbol(I, Decl(collisionExportsRequireAndModule_globalFile.ts, 27, 30)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndModule_globalFile.ts, 29, 9)) } } - export module exports { + export namespace exports { >exports : Symbol(exports, Decl(collisionExportsRequireAndModule_globalFile.ts, 32, 5)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndModule_globalFile.ts, 33, 27)) +>I : Symbol(I, Decl(collisionExportsRequireAndModule_globalFile.ts, 33, 30)) } export class C { >C : Symbol(C, Decl(collisionExportsRequireAndModule_globalFile.ts, 35, 9)) diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.types b/tests/baselines/reference/collisionExportsRequireAndModule.types index 67595e3042b6f..c464bf8756f82 100644 --- a/tests/baselines/reference/collisionExportsRequireAndModule.types +++ b/tests/baselines/reference/collisionExportsRequireAndModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionExportsRequireAndModule.ts] //// === collisionExportsRequireAndModule_externalmodule.ts === -export module require { +export namespace require { >require : typeof require > : ^^^^^^^^^^^^^^ @@ -20,7 +20,7 @@ export function foo(): require.I { return null; } -export module exports { +export namespace exports { >exports : typeof exports > : ^^^^^^^^^^^^^^ @@ -39,11 +39,11 @@ export function foo2(): exports.I { return null; } -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ - module require { + namespace require { >require : typeof require > : ^^^^^^^^^^^^^^ @@ -54,7 +54,7 @@ module m1 { > : ^ } } - module exports { + namespace exports { >exports : typeof exports > : ^^^^^^^^^^^^^^ @@ -66,11 +66,11 @@ module m1 { } } } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ - export module require { + export namespace require { >require : typeof require > : ^^^^^^^^^^^^^^ @@ -81,7 +81,7 @@ module m2 { > : ^ } } - export module exports { + export namespace exports { >exports : typeof exports > : ^^^^^^^^^^^^^^ @@ -95,7 +95,7 @@ module m2 { } === collisionExportsRequireAndModule_globalFile.ts === -module require { +namespace require { >require : typeof require > : ^^^^^^^^^^^^^^ @@ -106,7 +106,7 @@ module require { > : ^ } } -module exports { +namespace exports { >exports : typeof exports > : ^^^^^^^^^^^^^^ @@ -117,11 +117,11 @@ module exports { > : ^ } } -module m3 { +namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ - module require { + namespace require { >require : typeof require > : ^^^^^^^^^^^^^^ @@ -132,7 +132,7 @@ module m3 { > : ^ } } - module exports { + namespace exports { >exports : typeof exports > : ^^^^^^^^^^^^^^ @@ -144,11 +144,11 @@ module m3 { } } } -module m4 { +namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ - export module require { + export namespace require { >require : typeof require > : ^^^^^^^^^^^^^^ @@ -159,7 +159,7 @@ module m4 { > : ^ } } - export module exports { + export namespace exports { >exports : typeof exports > : ^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js index 9d6a43341f1d4..619b21ffcad47 100644 --- a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js +++ b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js @@ -1,14 +1,14 @@ //// [tests/cases/compiler/collisionExportsRequireAndUninstantiatedModule.ts] //// //// [collisionExportsRequireAndUninstantiatedModule.ts] -export module require { // no error +export namespace require { // no error export interface I { } } export function foo(): require.I { return null; } -export module exports { // no error +export namespace exports { // no error export interface I { } } diff --git a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.symbols b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.symbols index 7c65f34d7fe3f..cc04d6ddaee28 100644 --- a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.symbols +++ b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.symbols @@ -1,31 +1,31 @@ //// [tests/cases/compiler/collisionExportsRequireAndUninstantiatedModule.ts] //// === collisionExportsRequireAndUninstantiatedModule.ts === -export module require { // no error +export namespace require { // no error >require : Symbol(require, Decl(collisionExportsRequireAndUninstantiatedModule.ts, 0, 0)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndUninstantiatedModule.ts, 0, 23)) +>I : Symbol(I, Decl(collisionExportsRequireAndUninstantiatedModule.ts, 0, 26)) } } export function foo(): require.I { >foo : Symbol(foo, Decl(collisionExportsRequireAndUninstantiatedModule.ts, 3, 1)) >require : Symbol(require, Decl(collisionExportsRequireAndUninstantiatedModule.ts, 0, 0)) ->I : Symbol(require.I, Decl(collisionExportsRequireAndUninstantiatedModule.ts, 0, 23)) +>I : Symbol(require.I, Decl(collisionExportsRequireAndUninstantiatedModule.ts, 0, 26)) return null; } -export module exports { // no error +export namespace exports { // no error >exports : Symbol(exports, Decl(collisionExportsRequireAndUninstantiatedModule.ts, 6, 1)) export interface I { ->I : Symbol(I, Decl(collisionExportsRequireAndUninstantiatedModule.ts, 7, 23)) +>I : Symbol(I, Decl(collisionExportsRequireAndUninstantiatedModule.ts, 7, 26)) } } export function foo2(): exports.I { >foo2 : Symbol(foo2, Decl(collisionExportsRequireAndUninstantiatedModule.ts, 10, 1)) >exports : Symbol(exports, Decl(collisionExportsRequireAndUninstantiatedModule.ts, 6, 1)) ->I : Symbol(exports.I, Decl(collisionExportsRequireAndUninstantiatedModule.ts, 7, 23)) +>I : Symbol(exports.I, Decl(collisionExportsRequireAndUninstantiatedModule.ts, 7, 26)) return null; } diff --git a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types index e3622d9177c59..9371117849f28 100644 --- a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types +++ b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionExportsRequireAndUninstantiatedModule.ts] //// === collisionExportsRequireAndUninstantiatedModule.ts === -export module require { // no error +export namespace require { // no error export interface I { } } @@ -13,7 +13,7 @@ export function foo(): require.I { return null; } -export module exports { // no error +export namespace exports { // no error export interface I { } } diff --git a/tests/baselines/reference/collisionExportsRequireAndVar.errors.txt b/tests/baselines/reference/collisionExportsRequireAndVar.errors.txt index 36c86cb380df8..5d6c84e914cdd 100644 --- a/tests/baselines/reference/collisionExportsRequireAndVar.errors.txt +++ b/tests/baselines/reference/collisionExportsRequireAndVar.errors.txt @@ -11,11 +11,11 @@ collisionExportsRequireAndVar_externalmodule.ts(4,5): error TS2441: Duplicate id var require = "require"; ~~~~~~~ !!! error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module. - module m1 { + namespace m1 { var exports = 0; var require = "require"; } - module m2 { + namespace m2 { export var exports = 0; export var require = "require"; } @@ -23,11 +23,11 @@ collisionExportsRequireAndVar_externalmodule.ts(4,5): error TS2441: Duplicate id ==== collisionExportsRequireAndVar_globalFile.ts (0 errors) ==== var exports = 0; var require = "require"; - module m3 { + namespace m3 { var exports = 0; var require = "require"; } - module m4 { + namespace m4 { export var exports = 0; export var require = "require"; } \ No newline at end of file diff --git a/tests/baselines/reference/collisionExportsRequireAndVar.js b/tests/baselines/reference/collisionExportsRequireAndVar.js index d8d30f2641897..4539468400565 100644 --- a/tests/baselines/reference/collisionExportsRequireAndVar.js +++ b/tests/baselines/reference/collisionExportsRequireAndVar.js @@ -5,11 +5,11 @@ export function foo() { } var exports = 1; var require = "require"; -module m1 { +namespace m1 { var exports = 0; var require = "require"; } -module m2 { +namespace m2 { export var exports = 0; export var require = "require"; } @@ -17,11 +17,11 @@ module m2 { //// [collisionExportsRequireAndVar_globalFile.ts] var exports = 0; var require = "require"; -module m3 { +namespace m3 { var exports = 0; var require = "require"; } -module m4 { +namespace m4 { export var exports = 0; export var require = "require"; } diff --git a/tests/baselines/reference/collisionExportsRequireAndVar.symbols b/tests/baselines/reference/collisionExportsRequireAndVar.symbols index 74690ac506dfa..70ac97df745c6 100644 --- a/tests/baselines/reference/collisionExportsRequireAndVar.symbols +++ b/tests/baselines/reference/collisionExportsRequireAndVar.symbols @@ -10,7 +10,7 @@ var exports = 1; var require = "require"; >require : Symbol(require, Decl(collisionExportsRequireAndVar_externalmodule.ts, 3, 3)) -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(collisionExportsRequireAndVar_externalmodule.ts, 3, 24)) var exports = 0; @@ -19,7 +19,7 @@ module m1 { var require = "require"; >require : Symbol(require, Decl(collisionExportsRequireAndVar_externalmodule.ts, 6, 7)) } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(collisionExportsRequireAndVar_externalmodule.ts, 7, 1)) export var exports = 0; @@ -36,7 +36,7 @@ var exports = 0; var require = "require"; >require : Symbol(require, Decl(collisionExportsRequireAndVar_globalFile.ts, 1, 3)) -module m3 { +namespace m3 { >m3 : Symbol(m3, Decl(collisionExportsRequireAndVar_globalFile.ts, 1, 24)) var exports = 0; @@ -45,7 +45,7 @@ module m3 { var require = "require"; >require : Symbol(require, Decl(collisionExportsRequireAndVar_globalFile.ts, 4, 7)) } -module m4 { +namespace m4 { >m4 : Symbol(m4, Decl(collisionExportsRequireAndVar_globalFile.ts, 5, 1)) export var exports = 0; diff --git a/tests/baselines/reference/collisionExportsRequireAndVar.types b/tests/baselines/reference/collisionExportsRequireAndVar.types index d243cbf7e0a0b..764e05d7187df 100644 --- a/tests/baselines/reference/collisionExportsRequireAndVar.types +++ b/tests/baselines/reference/collisionExportsRequireAndVar.types @@ -17,7 +17,7 @@ var require = "require"; >"require" : "require" > : ^^^^^^^^^ -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -33,7 +33,7 @@ module m1 { >"require" : "require" > : ^^^^^^^^^ } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -63,7 +63,7 @@ var require = "require"; >"require" : "require" > : ^^^^^^^^^ -module m3 { +namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ @@ -79,7 +79,7 @@ module m3 { >"require" : "require" > : ^^^^^^^^^ } -module m4 { +namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.js b/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.js index 9b7d4133f1f3f..a2a6546c8b9e4 100644 --- a/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.js +++ b/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionThisExpressionAndAliasInGlobal.ts] //// //// [collisionThisExpressionAndAliasInGlobal.ts] -module a { +namespace a { export var b = 10; } var f = () => this; diff --git a/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.symbols b/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.symbols index 1bfe7f1fcd222..37c5c4e0924c3 100644 --- a/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.symbols +++ b/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionThisExpressionAndAliasInGlobal.ts] //// === collisionThisExpressionAndAliasInGlobal.ts === -module a { +namespace a { >a : Symbol(a, Decl(collisionThisExpressionAndAliasInGlobal.ts, 0, 0)) export var b = 10; diff --git a/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.types b/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.types index 12d9cf2300ea6..4db7a9dadec98 100644 --- a/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.types +++ b/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionThisExpressionAndAliasInGlobal.ts] //// === collisionThisExpressionAndAliasInGlobal.ts === -module a { +namespace a { >a : typeof a > : ^^^^^^^^ diff --git a/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.js b/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.js index f94c6c768d875..03aa98be24411 100644 --- a/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.js +++ b/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionThisExpressionAndModuleInGlobal.ts] //// //// [collisionThisExpressionAndModuleInGlobal.ts] -module _this { //Error +namespace _this { //Error class c { } } diff --git a/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.symbols b/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.symbols index 0a4f32717851f..5c7eacb27477e 100644 --- a/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.symbols +++ b/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/collisionThisExpressionAndModuleInGlobal.ts] //// === collisionThisExpressionAndModuleInGlobal.ts === -module _this { //Error +namespace _this { //Error >_this : Symbol(_this, Decl(collisionThisExpressionAndModuleInGlobal.ts, 0, 0)) class c { ->c : Symbol(c, Decl(collisionThisExpressionAndModuleInGlobal.ts, 0, 14)) +>c : Symbol(c, Decl(collisionThisExpressionAndModuleInGlobal.ts, 0, 17)) } } var f = () => this; diff --git a/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.types b/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.types index dcb9a21bcdf54..725dbd8a05599 100644 --- a/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.types +++ b/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/collisionThisExpressionAndModuleInGlobal.ts] //// === collisionThisExpressionAndModuleInGlobal.ts === -module _this { //Error +namespace _this { //Error >_this : typeof _this > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/commentEmitAtEndOfFile1.js b/tests/baselines/reference/commentEmitAtEndOfFile1.js index 4dc51aac2b067..b5886883da81f 100644 --- a/tests/baselines/reference/commentEmitAtEndOfFile1.js +++ b/tests/baselines/reference/commentEmitAtEndOfFile1.js @@ -4,11 +4,11 @@ // test var f = '' // test #2 -module foo { +namespace foo { function bar() { } } // test #3 -module empty { +namespace empty { } // test #4 diff --git a/tests/baselines/reference/commentEmitAtEndOfFile1.symbols b/tests/baselines/reference/commentEmitAtEndOfFile1.symbols index 39f497c42fc5d..e5e7cb337066e 100644 --- a/tests/baselines/reference/commentEmitAtEndOfFile1.symbols +++ b/tests/baselines/reference/commentEmitAtEndOfFile1.symbols @@ -6,14 +6,14 @@ var f = '' >f : Symbol(f, Decl(commentEmitAtEndOfFile1.ts, 1, 3)) // test #2 -module foo { +namespace foo { >foo : Symbol(foo, Decl(commentEmitAtEndOfFile1.ts, 1, 10)) function bar() { } ->bar : Symbol(bar, Decl(commentEmitAtEndOfFile1.ts, 3, 12)) +>bar : Symbol(bar, Decl(commentEmitAtEndOfFile1.ts, 3, 15)) } // test #3 -module empty { +namespace empty { >empty : Symbol(empty, Decl(commentEmitAtEndOfFile1.ts, 5, 1)) } // test #4 diff --git a/tests/baselines/reference/commentEmitAtEndOfFile1.types b/tests/baselines/reference/commentEmitAtEndOfFile1.types index 8c8daa19594e1..baffb18fd0ceb 100644 --- a/tests/baselines/reference/commentEmitAtEndOfFile1.types +++ b/tests/baselines/reference/commentEmitAtEndOfFile1.types @@ -9,7 +9,7 @@ var f = '' > : ^^ // test #2 -module foo { +namespace foo { >foo : typeof foo > : ^^^^^^^^^^ @@ -18,6 +18,6 @@ module foo { > : ^^^^^^^^^^ } // test #3 -module empty { +namespace empty { } // test #4 diff --git a/tests/baselines/reference/commentOnAmbientModule.js b/tests/baselines/reference/commentOnAmbientModule.js index 2d43b502f29ff..34196ac4b84c5 100644 --- a/tests/baselines/reference/commentOnAmbientModule.js +++ b/tests/baselines/reference/commentOnAmbientModule.js @@ -7,18 +7,18 @@ */ /*! Don't keep this pinned comment */ -declare module C { +declare namespace C { function foo(); } // Don't keep this comment. -declare module D { +declare namespace D { class bar { } } //// [b.ts] /// -declare module E { +declare namespace E { class foobar extends D.bar { foo(); } diff --git a/tests/baselines/reference/commentOnAmbientModule.symbols b/tests/baselines/reference/commentOnAmbientModule.symbols index acfb8d43bc42f..ede5f6cb08817 100644 --- a/tests/baselines/reference/commentOnAmbientModule.symbols +++ b/tests/baselines/reference/commentOnAmbientModule.symbols @@ -2,14 +2,14 @@ === b.ts === /// -declare module E { +declare namespace E { >E : Symbol(E, Decl(b.ts, 0, 0)) class foobar extends D.bar { ->foobar : Symbol(foobar, Decl(b.ts, 1, 18)) ->D.bar : Symbol(D.bar, Decl(a.ts, 11, 18)) +>foobar : Symbol(foobar, Decl(b.ts, 1, 21)) +>D.bar : Symbol(D.bar, Decl(a.ts, 11, 21)) >D : Symbol(D, Decl(a.ts, 8, 1)) ->bar : Symbol(D.bar, Decl(a.ts, 11, 18)) +>bar : Symbol(D.bar, Decl(a.ts, 11, 21)) foo(); >foo : Symbol(foobar.foo, Decl(b.ts, 2, 32)) @@ -22,18 +22,18 @@ declare module E { */ /*! Don't keep this pinned comment */ -declare module C { +declare namespace C { >C : Symbol(C, Decl(a.ts, 0, 0)) function foo(); ->foo : Symbol(foo, Decl(a.ts, 6, 18)) +>foo : Symbol(foo, Decl(a.ts, 6, 21)) } // Don't keep this comment. -declare module D { +declare namespace D { >D : Symbol(D, Decl(a.ts, 8, 1)) class bar { } ->bar : Symbol(bar, Decl(a.ts, 11, 18)) +>bar : Symbol(bar, Decl(a.ts, 11, 21)) } diff --git a/tests/baselines/reference/commentOnAmbientModule.types b/tests/baselines/reference/commentOnAmbientModule.types index 82c857c16c3ed..3493624d25fe6 100644 --- a/tests/baselines/reference/commentOnAmbientModule.types +++ b/tests/baselines/reference/commentOnAmbientModule.types @@ -2,7 +2,7 @@ === b.ts === /// -declare module E { +declare namespace E { >E : typeof E > : ^^^^^^^^ @@ -28,7 +28,7 @@ declare module E { */ /*! Don't keep this pinned comment */ -declare module C { +declare namespace C { >C : typeof C > : ^^^^^^^^ @@ -38,7 +38,7 @@ declare module C { } // Don't keep this comment. -declare module D { +declare namespace D { >D : typeof D > : ^^^^^^^^ diff --git a/tests/baselines/reference/commentOnElidedModule1.js b/tests/baselines/reference/commentOnElidedModule1.js index 72585e6a9e86a..d75796cb1e2ae 100644 --- a/tests/baselines/reference/commentOnElidedModule1.js +++ b/tests/baselines/reference/commentOnElidedModule1.js @@ -7,16 +7,16 @@ */ /*! Don't keep this pinned comment */ -module ElidedModule { +namespace ElidedModule { } // Don't keep this comment. -module ElidedModule2 { +namespace ElidedModule2 { } //// [b.ts] /// -module ElidedModule3 { +namespace ElidedModule3 { } //// [a.js] diff --git a/tests/baselines/reference/commentOnElidedModule1.symbols b/tests/baselines/reference/commentOnElidedModule1.symbols index 0328efa37c74d..70cb05f4f47b0 100644 --- a/tests/baselines/reference/commentOnElidedModule1.symbols +++ b/tests/baselines/reference/commentOnElidedModule1.symbols @@ -2,7 +2,7 @@ === b.ts === /// -module ElidedModule3 { +namespace ElidedModule3 { >ElidedModule3 : Symbol(ElidedModule3, Decl(b.ts, 0, 0)) } === a.ts === @@ -12,12 +12,12 @@ module ElidedModule3 { */ /*! Don't keep this pinned comment */ -module ElidedModule { +namespace ElidedModule { >ElidedModule : Symbol(ElidedModule, Decl(a.ts, 0, 0)) } // Don't keep this comment. -module ElidedModule2 { +namespace ElidedModule2 { >ElidedModule2 : Symbol(ElidedModule2, Decl(a.ts, 7, 1)) } diff --git a/tests/baselines/reference/commentOnElidedModule1.types b/tests/baselines/reference/commentOnElidedModule1.types index 302fe43ecaf73..9af4fcafa2062 100644 --- a/tests/baselines/reference/commentOnElidedModule1.types +++ b/tests/baselines/reference/commentOnElidedModule1.types @@ -3,7 +3,7 @@ === b.ts === /// -module ElidedModule3 { +namespace ElidedModule3 { } === a.ts === @@ -13,10 +13,10 @@ module ElidedModule3 { */ /*! Don't keep this pinned comment */ -module ElidedModule { +namespace ElidedModule { } // Don't keep this comment. -module ElidedModule2 { +namespace ElidedModule2 { } diff --git a/tests/baselines/reference/commentsDottedModuleName.errors.txt b/tests/baselines/reference/commentsDottedModuleName.errors.txt new file mode 100644 index 0000000000000..9860c648e4f45 --- /dev/null +++ b/tests/baselines/reference/commentsDottedModuleName.errors.txt @@ -0,0 +1,15 @@ +commentsDottedModuleName.ts(2,8): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +commentsDottedModuleName.ts(2,27): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== commentsDottedModuleName.ts (2 errors) ==== + /** this is multi declare module*/ + export module outerModule.InnerModule { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~~~~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + /// class b comment + export class b { + } + } \ No newline at end of file diff --git a/tests/baselines/reference/commentsExternalModules.js b/tests/baselines/reference/commentsExternalModules.js index 6af61d8ba78c1..1811b452d3d6f 100644 --- a/tests/baselines/reference/commentsExternalModules.js +++ b/tests/baselines/reference/commentsExternalModules.js @@ -2,7 +2,7 @@ //// [commentsExternalModules_0.ts] /** Module comment*/ -export module m1 { +export namespace m1 { /** b's comment*/ export var b: number; /** foo's comment*/ @@ -10,7 +10,7 @@ export module m1 { return b; } /** m2 comments*/ - export module m2 { + export namespace m2 { /** class comment;*/ export class c { }; @@ -26,7 +26,7 @@ m1.fooExport(); var myvar = new m1.m2.c(); /** Module comment */ -export module m4 { +export namespace m4 { /** b's comment */ export var b: number; /** foo's comment @@ -36,7 +36,7 @@ export module m4 { } /** m2 comments */ - export module m2 { + export namespace m2 { /** class comment; */ export class c { }; diff --git a/tests/baselines/reference/commentsExternalModules.symbols b/tests/baselines/reference/commentsExternalModules.symbols index 909ba253edb90..9d713399bc5f2 100644 --- a/tests/baselines/reference/commentsExternalModules.symbols +++ b/tests/baselines/reference/commentsExternalModules.symbols @@ -14,13 +14,13 @@ extMod.m1.fooExport(); var newVar = new extMod.m1.m2.c(); >newVar : Symbol(newVar, Decl(commentsExternalModules_1.ts, 3, 3)) ->extMod.m1.m2.c : Symbol(extMod.m1.m2.c, Decl(commentsExternalModules_0.ts, 9, 22)) +>extMod.m1.m2.c : Symbol(extMod.m1.m2.c, Decl(commentsExternalModules_0.ts, 9, 25)) >extMod.m1.m2 : Symbol(extMod.m1.m2, Decl(commentsExternalModules_0.ts, 7, 5)) >extMod.m1 : Symbol(extMod.m1, Decl(commentsExternalModules_0.ts, 0, 0)) >extMod : Symbol(extMod, Decl(commentsExternalModules_1.ts, 0, 0)) >m1 : Symbol(extMod.m1, Decl(commentsExternalModules_0.ts, 0, 0)) >m2 : Symbol(extMod.m1.m2, Decl(commentsExternalModules_0.ts, 7, 5)) ->c : Symbol(extMod.m1.m2.c, Decl(commentsExternalModules_0.ts, 9, 22)) +>c : Symbol(extMod.m1.m2.c, Decl(commentsExternalModules_0.ts, 9, 25)) extMod.m4.fooExport(); >extMod.m4.fooExport : Symbol(extMod.m4.fooExport, Decl(commentsExternalModules_0.ts, 41, 5)) @@ -31,17 +31,17 @@ extMod.m4.fooExport(); var newVar2 = new extMod.m4.m2.c(); >newVar2 : Symbol(newVar2, Decl(commentsExternalModules_1.ts, 5, 3)) ->extMod.m4.m2.c : Symbol(extMod.m4.m2.c, Decl(commentsExternalModules_0.ts, 35, 22)) +>extMod.m4.m2.c : Symbol(extMod.m4.m2.c, Decl(commentsExternalModules_0.ts, 35, 25)) >extMod.m4.m2 : Symbol(extMod.m4.m2, Decl(commentsExternalModules_0.ts, 32, 5)) >extMod.m4 : Symbol(extMod.m4, Decl(commentsExternalModules_0.ts, 22, 26)) >extMod : Symbol(extMod, Decl(commentsExternalModules_1.ts, 0, 0)) >m4 : Symbol(extMod.m4, Decl(commentsExternalModules_0.ts, 22, 26)) >m2 : Symbol(extMod.m4.m2, Decl(commentsExternalModules_0.ts, 32, 5)) ->c : Symbol(extMod.m4.m2.c, Decl(commentsExternalModules_0.ts, 35, 22)) +>c : Symbol(extMod.m4.m2.c, Decl(commentsExternalModules_0.ts, 35, 25)) === commentsExternalModules_0.ts === /** Module comment*/ -export module m1 { +export namespace m1 { >m1 : Symbol(m1, Decl(commentsExternalModules_0.ts, 0, 0)) /** b's comment*/ @@ -56,18 +56,18 @@ export module m1 { >b : Symbol(b, Decl(commentsExternalModules_0.ts, 3, 14)) } /** m2 comments*/ - export module m2 { + export namespace m2 { >m2 : Symbol(m2, Decl(commentsExternalModules_0.ts, 7, 5)) /** class comment;*/ export class c { ->c : Symbol(c, Decl(commentsExternalModules_0.ts, 9, 22)) +>c : Symbol(c, Decl(commentsExternalModules_0.ts, 9, 25)) }; /** i*/ export var i = new c(); >i : Symbol(i, Decl(commentsExternalModules_0.ts, 14, 18)) ->c : Symbol(c, Decl(commentsExternalModules_0.ts, 9, 22)) +>c : Symbol(c, Decl(commentsExternalModules_0.ts, 9, 25)) } /** exported function*/ export function fooExport() { @@ -84,14 +84,14 @@ m1.fooExport(); var myvar = new m1.m2.c(); >myvar : Symbol(myvar, Decl(commentsExternalModules_0.ts, 22, 3)) ->m1.m2.c : Symbol(m1.m2.c, Decl(commentsExternalModules_0.ts, 9, 22)) +>m1.m2.c : Symbol(m1.m2.c, Decl(commentsExternalModules_0.ts, 9, 25)) >m1.m2 : Symbol(m1.m2, Decl(commentsExternalModules_0.ts, 7, 5)) >m1 : Symbol(m1, Decl(commentsExternalModules_0.ts, 0, 0)) >m2 : Symbol(m1.m2, Decl(commentsExternalModules_0.ts, 7, 5)) ->c : Symbol(m1.m2.c, Decl(commentsExternalModules_0.ts, 9, 22)) +>c : Symbol(m1.m2.c, Decl(commentsExternalModules_0.ts, 9, 25)) /** Module comment */ -export module m4 { +export namespace m4 { >m4 : Symbol(m4, Decl(commentsExternalModules_0.ts, 22, 26)) /** b's comment */ @@ -108,18 +108,18 @@ export module m4 { } /** m2 comments */ - export module m2 { + export namespace m2 { >m2 : Symbol(m2, Decl(commentsExternalModules_0.ts, 32, 5)) /** class comment; */ export class c { ->c : Symbol(c, Decl(commentsExternalModules_0.ts, 35, 22)) +>c : Symbol(c, Decl(commentsExternalModules_0.ts, 35, 25)) }; /** i */ export var i = new c(); >i : Symbol(i, Decl(commentsExternalModules_0.ts, 40, 18)) ->c : Symbol(c, Decl(commentsExternalModules_0.ts, 35, 22)) +>c : Symbol(c, Decl(commentsExternalModules_0.ts, 35, 25)) } /** exported function */ export function fooExport() { @@ -136,9 +136,9 @@ m4.fooExport(); var myvar2 = new m4.m2.c(); >myvar2 : Symbol(myvar2, Decl(commentsExternalModules_0.ts, 48, 3)) ->m4.m2.c : Symbol(m4.m2.c, Decl(commentsExternalModules_0.ts, 35, 22)) +>m4.m2.c : Symbol(m4.m2.c, Decl(commentsExternalModules_0.ts, 35, 25)) >m4.m2 : Symbol(m4.m2, Decl(commentsExternalModules_0.ts, 32, 5)) >m4 : Symbol(m4, Decl(commentsExternalModules_0.ts, 22, 26)) >m2 : Symbol(m4.m2, Decl(commentsExternalModules_0.ts, 32, 5)) ->c : Symbol(m4.m2.c, Decl(commentsExternalModules_0.ts, 35, 22)) +>c : Symbol(m4.m2.c, Decl(commentsExternalModules_0.ts, 35, 25)) diff --git a/tests/baselines/reference/commentsExternalModules.types b/tests/baselines/reference/commentsExternalModules.types index beb6ae4c44e9b..d2d8d707d1180 100644 --- a/tests/baselines/reference/commentsExternalModules.types +++ b/tests/baselines/reference/commentsExternalModules.types @@ -76,7 +76,7 @@ var newVar2 = new extMod.m4.m2.c(); === commentsExternalModules_0.ts === /** Module comment*/ -export module m1 { +export namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -95,7 +95,7 @@ export module m1 { > : ^^^^^^ } /** m2 comments*/ - export module m2 { + export namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -153,7 +153,7 @@ var myvar = new m1.m2.c(); > : ^^^^^^^^^^^^^^ /** Module comment */ -export module m4 { +export namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ @@ -174,7 +174,7 @@ export module m4 { } /** m2 comments */ - export module m2 { + export namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/commentsExternalModules2.js b/tests/baselines/reference/commentsExternalModules2.js index 2a400b10b34b0..2086436351f55 100644 --- a/tests/baselines/reference/commentsExternalModules2.js +++ b/tests/baselines/reference/commentsExternalModules2.js @@ -2,7 +2,7 @@ //// [commentsExternalModules2_0.ts] /** Module comment*/ -export module m1 { +export namespace m1 { /** b's comment*/ export var b: number; /** foo's comment*/ @@ -10,7 +10,7 @@ export module m1 { return b; } /** m2 comments*/ - export module m2 { + export namespace m2 { /** class comment;*/ export class c { }; @@ -26,7 +26,7 @@ m1.fooExport(); var myvar = new m1.m2.c(); /** Module comment */ -export module m4 { +export namespace m4 { /** b's comment */ export var b: number; /** foo's comment @@ -36,7 +36,7 @@ export module m4 { } /** m2 comments */ - export module m2 { + export namespace m2 { /** class comment; */ export class c { }; diff --git a/tests/baselines/reference/commentsExternalModules2.symbols b/tests/baselines/reference/commentsExternalModules2.symbols index 6844f9e29529b..dd309d54ffcfd 100644 --- a/tests/baselines/reference/commentsExternalModules2.symbols +++ b/tests/baselines/reference/commentsExternalModules2.symbols @@ -14,13 +14,13 @@ extMod.m1.fooExport(); export var newVar = new extMod.m1.m2.c(); >newVar : Symbol(newVar, Decl(commentsExternalModules_1.ts, 3, 10)) ->extMod.m1.m2.c : Symbol(extMod.m1.m2.c, Decl(commentsExternalModules2_0.ts, 9, 22)) +>extMod.m1.m2.c : Symbol(extMod.m1.m2.c, Decl(commentsExternalModules2_0.ts, 9, 25)) >extMod.m1.m2 : Symbol(extMod.m1.m2, Decl(commentsExternalModules2_0.ts, 7, 5)) >extMod.m1 : Symbol(extMod.m1, Decl(commentsExternalModules2_0.ts, 0, 0)) >extMod : Symbol(extMod, Decl(commentsExternalModules_1.ts, 0, 0)) >m1 : Symbol(extMod.m1, Decl(commentsExternalModules2_0.ts, 0, 0)) >m2 : Symbol(extMod.m1.m2, Decl(commentsExternalModules2_0.ts, 7, 5)) ->c : Symbol(extMod.m1.m2.c, Decl(commentsExternalModules2_0.ts, 9, 22)) +>c : Symbol(extMod.m1.m2.c, Decl(commentsExternalModules2_0.ts, 9, 25)) extMod.m4.fooExport(); >extMod.m4.fooExport : Symbol(extMod.m4.fooExport, Decl(commentsExternalModules2_0.ts, 41, 5)) @@ -31,17 +31,17 @@ extMod.m4.fooExport(); export var newVar2 = new extMod.m4.m2.c(); >newVar2 : Symbol(newVar2, Decl(commentsExternalModules_1.ts, 5, 10)) ->extMod.m4.m2.c : Symbol(extMod.m4.m2.c, Decl(commentsExternalModules2_0.ts, 35, 22)) +>extMod.m4.m2.c : Symbol(extMod.m4.m2.c, Decl(commentsExternalModules2_0.ts, 35, 25)) >extMod.m4.m2 : Symbol(extMod.m4.m2, Decl(commentsExternalModules2_0.ts, 32, 5)) >extMod.m4 : Symbol(extMod.m4, Decl(commentsExternalModules2_0.ts, 22, 26)) >extMod : Symbol(extMod, Decl(commentsExternalModules_1.ts, 0, 0)) >m4 : Symbol(extMod.m4, Decl(commentsExternalModules2_0.ts, 22, 26)) >m2 : Symbol(extMod.m4.m2, Decl(commentsExternalModules2_0.ts, 32, 5)) ->c : Symbol(extMod.m4.m2.c, Decl(commentsExternalModules2_0.ts, 35, 22)) +>c : Symbol(extMod.m4.m2.c, Decl(commentsExternalModules2_0.ts, 35, 25)) === commentsExternalModules2_0.ts === /** Module comment*/ -export module m1 { +export namespace m1 { >m1 : Symbol(m1, Decl(commentsExternalModules2_0.ts, 0, 0)) /** b's comment*/ @@ -56,18 +56,18 @@ export module m1 { >b : Symbol(b, Decl(commentsExternalModules2_0.ts, 3, 14)) } /** m2 comments*/ - export module m2 { + export namespace m2 { >m2 : Symbol(m2, Decl(commentsExternalModules2_0.ts, 7, 5)) /** class comment;*/ export class c { ->c : Symbol(c, Decl(commentsExternalModules2_0.ts, 9, 22)) +>c : Symbol(c, Decl(commentsExternalModules2_0.ts, 9, 25)) }; /** i*/ export var i = new c(); >i : Symbol(i, Decl(commentsExternalModules2_0.ts, 14, 18)) ->c : Symbol(c, Decl(commentsExternalModules2_0.ts, 9, 22)) +>c : Symbol(c, Decl(commentsExternalModules2_0.ts, 9, 25)) } /** exported function*/ export function fooExport() { @@ -84,14 +84,14 @@ m1.fooExport(); var myvar = new m1.m2.c(); >myvar : Symbol(myvar, Decl(commentsExternalModules2_0.ts, 22, 3)) ->m1.m2.c : Symbol(m1.m2.c, Decl(commentsExternalModules2_0.ts, 9, 22)) +>m1.m2.c : Symbol(m1.m2.c, Decl(commentsExternalModules2_0.ts, 9, 25)) >m1.m2 : Symbol(m1.m2, Decl(commentsExternalModules2_0.ts, 7, 5)) >m1 : Symbol(m1, Decl(commentsExternalModules2_0.ts, 0, 0)) >m2 : Symbol(m1.m2, Decl(commentsExternalModules2_0.ts, 7, 5)) ->c : Symbol(m1.m2.c, Decl(commentsExternalModules2_0.ts, 9, 22)) +>c : Symbol(m1.m2.c, Decl(commentsExternalModules2_0.ts, 9, 25)) /** Module comment */ -export module m4 { +export namespace m4 { >m4 : Symbol(m4, Decl(commentsExternalModules2_0.ts, 22, 26)) /** b's comment */ @@ -108,18 +108,18 @@ export module m4 { } /** m2 comments */ - export module m2 { + export namespace m2 { >m2 : Symbol(m2, Decl(commentsExternalModules2_0.ts, 32, 5)) /** class comment; */ export class c { ->c : Symbol(c, Decl(commentsExternalModules2_0.ts, 35, 22)) +>c : Symbol(c, Decl(commentsExternalModules2_0.ts, 35, 25)) }; /** i */ export var i = new c(); >i : Symbol(i, Decl(commentsExternalModules2_0.ts, 40, 18)) ->c : Symbol(c, Decl(commentsExternalModules2_0.ts, 35, 22)) +>c : Symbol(c, Decl(commentsExternalModules2_0.ts, 35, 25)) } /** exported function */ export function fooExport() { @@ -136,9 +136,9 @@ m4.fooExport(); var myvar2 = new m4.m2.c(); >myvar2 : Symbol(myvar2, Decl(commentsExternalModules2_0.ts, 48, 3)) ->m4.m2.c : Symbol(m4.m2.c, Decl(commentsExternalModules2_0.ts, 35, 22)) +>m4.m2.c : Symbol(m4.m2.c, Decl(commentsExternalModules2_0.ts, 35, 25)) >m4.m2 : Symbol(m4.m2, Decl(commentsExternalModules2_0.ts, 32, 5)) >m4 : Symbol(m4, Decl(commentsExternalModules2_0.ts, 22, 26)) >m2 : Symbol(m4.m2, Decl(commentsExternalModules2_0.ts, 32, 5)) ->c : Symbol(m4.m2.c, Decl(commentsExternalModules2_0.ts, 35, 22)) +>c : Symbol(m4.m2.c, Decl(commentsExternalModules2_0.ts, 35, 25)) diff --git a/tests/baselines/reference/commentsExternalModules2.types b/tests/baselines/reference/commentsExternalModules2.types index d74fbaf729081..d3882edd12f56 100644 --- a/tests/baselines/reference/commentsExternalModules2.types +++ b/tests/baselines/reference/commentsExternalModules2.types @@ -76,7 +76,7 @@ export var newVar2 = new extMod.m4.m2.c(); === commentsExternalModules2_0.ts === /** Module comment*/ -export module m1 { +export namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -95,7 +95,7 @@ export module m1 { > : ^^^^^^ } /** m2 comments*/ - export module m2 { + export namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -153,7 +153,7 @@ var myvar = new m1.m2.c(); > : ^^^^^^^^^^^^^^ /** Module comment */ -export module m4 { +export namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ @@ -174,7 +174,7 @@ export module m4 { } /** m2 comments */ - export module m2 { + export namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/commentsExternalModules3.js b/tests/baselines/reference/commentsExternalModules3.js index 761263f815e24..4f0f31188c6fb 100644 --- a/tests/baselines/reference/commentsExternalModules3.js +++ b/tests/baselines/reference/commentsExternalModules3.js @@ -2,7 +2,7 @@ //// [commentsExternalModules2_0.ts] /** Module comment*/ -export module m1 { +export namespace m1 { /** b's comment*/ export var b: number; /** foo's comment*/ @@ -10,7 +10,7 @@ export module m1 { return b; } /** m2 comments*/ - export module m2 { + export namespace m2 { /** class comment;*/ export class c { }; @@ -26,7 +26,7 @@ m1.fooExport(); var myvar = new m1.m2.c(); /** Module comment */ -export module m4 { +export namespace m4 { /** b's comment */ export var b: number; /** foo's comment @@ -36,7 +36,7 @@ export module m4 { } /** m2 comments */ - export module m2 { + export namespace m2 { /** class comment; */ export class c { }; diff --git a/tests/baselines/reference/commentsExternalModules3.symbols b/tests/baselines/reference/commentsExternalModules3.symbols index 9f44a52b66925..61eecfffdc80d 100644 --- a/tests/baselines/reference/commentsExternalModules3.symbols +++ b/tests/baselines/reference/commentsExternalModules3.symbols @@ -14,13 +14,13 @@ extMod.m1.fooExport(); export var newVar = new extMod.m1.m2.c(); >newVar : Symbol(newVar, Decl(commentsExternalModules_1.ts, 3, 10)) ->extMod.m1.m2.c : Symbol(extMod.m1.m2.c, Decl(commentsExternalModules2_0.ts, 9, 22)) +>extMod.m1.m2.c : Symbol(extMod.m1.m2.c, Decl(commentsExternalModules2_0.ts, 9, 25)) >extMod.m1.m2 : Symbol(extMod.m1.m2, Decl(commentsExternalModules2_0.ts, 7, 5)) >extMod.m1 : Symbol(extMod.m1, Decl(commentsExternalModules2_0.ts, 0, 0)) >extMod : Symbol(extMod, Decl(commentsExternalModules_1.ts, 0, 0)) >m1 : Symbol(extMod.m1, Decl(commentsExternalModules2_0.ts, 0, 0)) >m2 : Symbol(extMod.m1.m2, Decl(commentsExternalModules2_0.ts, 7, 5)) ->c : Symbol(extMod.m1.m2.c, Decl(commentsExternalModules2_0.ts, 9, 22)) +>c : Symbol(extMod.m1.m2.c, Decl(commentsExternalModules2_0.ts, 9, 25)) extMod.m4.fooExport(); >extMod.m4.fooExport : Symbol(extMod.m4.fooExport, Decl(commentsExternalModules2_0.ts, 41, 5)) @@ -31,17 +31,17 @@ extMod.m4.fooExport(); export var newVar2 = new extMod.m4.m2.c(); >newVar2 : Symbol(newVar2, Decl(commentsExternalModules_1.ts, 5, 10)) ->extMod.m4.m2.c : Symbol(extMod.m4.m2.c, Decl(commentsExternalModules2_0.ts, 35, 22)) +>extMod.m4.m2.c : Symbol(extMod.m4.m2.c, Decl(commentsExternalModules2_0.ts, 35, 25)) >extMod.m4.m2 : Symbol(extMod.m4.m2, Decl(commentsExternalModules2_0.ts, 32, 5)) >extMod.m4 : Symbol(extMod.m4, Decl(commentsExternalModules2_0.ts, 22, 26)) >extMod : Symbol(extMod, Decl(commentsExternalModules_1.ts, 0, 0)) >m4 : Symbol(extMod.m4, Decl(commentsExternalModules2_0.ts, 22, 26)) >m2 : Symbol(extMod.m4.m2, Decl(commentsExternalModules2_0.ts, 32, 5)) ->c : Symbol(extMod.m4.m2.c, Decl(commentsExternalModules2_0.ts, 35, 22)) +>c : Symbol(extMod.m4.m2.c, Decl(commentsExternalModules2_0.ts, 35, 25)) === commentsExternalModules2_0.ts === /** Module comment*/ -export module m1 { +export namespace m1 { >m1 : Symbol(m1, Decl(commentsExternalModules2_0.ts, 0, 0)) /** b's comment*/ @@ -56,18 +56,18 @@ export module m1 { >b : Symbol(b, Decl(commentsExternalModules2_0.ts, 3, 14)) } /** m2 comments*/ - export module m2 { + export namespace m2 { >m2 : Symbol(m2, Decl(commentsExternalModules2_0.ts, 7, 5)) /** class comment;*/ export class c { ->c : Symbol(c, Decl(commentsExternalModules2_0.ts, 9, 22)) +>c : Symbol(c, Decl(commentsExternalModules2_0.ts, 9, 25)) }; /** i*/ export var i = new c(); >i : Symbol(i, Decl(commentsExternalModules2_0.ts, 14, 18)) ->c : Symbol(c, Decl(commentsExternalModules2_0.ts, 9, 22)) +>c : Symbol(c, Decl(commentsExternalModules2_0.ts, 9, 25)) } /** exported function*/ export function fooExport() { @@ -84,14 +84,14 @@ m1.fooExport(); var myvar = new m1.m2.c(); >myvar : Symbol(myvar, Decl(commentsExternalModules2_0.ts, 22, 3)) ->m1.m2.c : Symbol(m1.m2.c, Decl(commentsExternalModules2_0.ts, 9, 22)) +>m1.m2.c : Symbol(m1.m2.c, Decl(commentsExternalModules2_0.ts, 9, 25)) >m1.m2 : Symbol(m1.m2, Decl(commentsExternalModules2_0.ts, 7, 5)) >m1 : Symbol(m1, Decl(commentsExternalModules2_0.ts, 0, 0)) >m2 : Symbol(m1.m2, Decl(commentsExternalModules2_0.ts, 7, 5)) ->c : Symbol(m1.m2.c, Decl(commentsExternalModules2_0.ts, 9, 22)) +>c : Symbol(m1.m2.c, Decl(commentsExternalModules2_0.ts, 9, 25)) /** Module comment */ -export module m4 { +export namespace m4 { >m4 : Symbol(m4, Decl(commentsExternalModules2_0.ts, 22, 26)) /** b's comment */ @@ -108,18 +108,18 @@ export module m4 { } /** m2 comments */ - export module m2 { + export namespace m2 { >m2 : Symbol(m2, Decl(commentsExternalModules2_0.ts, 32, 5)) /** class comment; */ export class c { ->c : Symbol(c, Decl(commentsExternalModules2_0.ts, 35, 22)) +>c : Symbol(c, Decl(commentsExternalModules2_0.ts, 35, 25)) }; /** i */ export var i = new c(); >i : Symbol(i, Decl(commentsExternalModules2_0.ts, 40, 18)) ->c : Symbol(c, Decl(commentsExternalModules2_0.ts, 35, 22)) +>c : Symbol(c, Decl(commentsExternalModules2_0.ts, 35, 25)) } /** exported function */ export function fooExport() { @@ -136,9 +136,9 @@ m4.fooExport(); var myvar2 = new m4.m2.c(); >myvar2 : Symbol(myvar2, Decl(commentsExternalModules2_0.ts, 48, 3)) ->m4.m2.c : Symbol(m4.m2.c, Decl(commentsExternalModules2_0.ts, 35, 22)) +>m4.m2.c : Symbol(m4.m2.c, Decl(commentsExternalModules2_0.ts, 35, 25)) >m4.m2 : Symbol(m4.m2, Decl(commentsExternalModules2_0.ts, 32, 5)) >m4 : Symbol(m4, Decl(commentsExternalModules2_0.ts, 22, 26)) >m2 : Symbol(m4.m2, Decl(commentsExternalModules2_0.ts, 32, 5)) ->c : Symbol(m4.m2.c, Decl(commentsExternalModules2_0.ts, 35, 22)) +>c : Symbol(m4.m2.c, Decl(commentsExternalModules2_0.ts, 35, 25)) diff --git a/tests/baselines/reference/commentsExternalModules3.types b/tests/baselines/reference/commentsExternalModules3.types index 3ffd4155f1381..d11f534302f00 100644 --- a/tests/baselines/reference/commentsExternalModules3.types +++ b/tests/baselines/reference/commentsExternalModules3.types @@ -76,7 +76,7 @@ export var newVar2 = new extMod.m4.m2.c(); === commentsExternalModules2_0.ts === /** Module comment*/ -export module m1 { +export namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -95,7 +95,7 @@ export module m1 { > : ^^^^^^ } /** m2 comments*/ - export module m2 { + export namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -153,7 +153,7 @@ var myvar = new m1.m2.c(); > : ^^^^^^^^^^^^^^ /** Module comment */ -export module m4 { +export namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ @@ -174,7 +174,7 @@ export module m4 { } /** m2 comments */ - export module m2 { + export namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/commentsFormatting.js b/tests/baselines/reference/commentsFormatting.js index 8f523e142698d..1674dc2ab43c0 100644 --- a/tests/baselines/reference/commentsFormatting.js +++ b/tests/baselines/reference/commentsFormatting.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/commentsFormatting.ts] //// //// [commentsFormatting.ts] -module m { +namespace m { /** this is first line - aligned to class declaration * this is 4 spaces left aligned * this is 3 spaces left aligned diff --git a/tests/baselines/reference/commentsFormatting.symbols b/tests/baselines/reference/commentsFormatting.symbols index 787e3bfb67236..adde19a1cb65e 100644 --- a/tests/baselines/reference/commentsFormatting.symbols +++ b/tests/baselines/reference/commentsFormatting.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/commentsFormatting.ts] //// === commentsFormatting.ts === -module m { +namespace m { >m : Symbol(m, Decl(commentsFormatting.ts, 0, 0)) /** this is first line - aligned to class declaration @@ -19,7 +19,7 @@ module m { * this is 7 spaces right aligned * this is 8 spaces right aligned */ export class c { ->c : Symbol(c, Decl(commentsFormatting.ts, 0, 10)) +>c : Symbol(c, Decl(commentsFormatting.ts, 0, 13)) } /** this is first line - 4 spaces right aligned to class but in js file should be aligned to class declaration diff --git a/tests/baselines/reference/commentsFormatting.types b/tests/baselines/reference/commentsFormatting.types index d2f76c9d6a6bf..c39463304320a 100644 --- a/tests/baselines/reference/commentsFormatting.types +++ b/tests/baselines/reference/commentsFormatting.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/commentsFormatting.ts] //// === commentsFormatting.ts === -module m { +namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/commentsModules.js b/tests/baselines/reference/commentsModules.js index 8e07a595c93c2..760d86d6c8c27 100644 --- a/tests/baselines/reference/commentsModules.js +++ b/tests/baselines/reference/commentsModules.js @@ -2,7 +2,7 @@ //// [commentsModules.ts] /** Module comment*/ -module m1 { +namespace m1 { /** b's comment*/ export var b: number; /** foo's comment*/ @@ -10,7 +10,7 @@ module m1 { return b; } /** m2 comments*/ - export module m2 { + export namespace m2 { /** class comment;*/ export class c { }; @@ -41,22 +41,22 @@ module m1 { m1.fooExport(); var myvar = new m1.m2.c(); /** module comment of m2.m3*/ -module m2.m3 { +namespace m2.m3 { /** Exported class comment*/ export class c { } } /* trailing dotted module comment*/ new m2.m3.c(); /** module comment of m3.m4.m5*/ -module m3.m4.m5 { +namespace m3.m4.m5 { /** Exported class comment*/ export class c { } } // trailing dotted module 2 new m3.m4.m5.c(); /** module comment of m4.m5.m6*/ -module m4.m5.m6 { - export module m7 { +namespace m4.m5.m6 { + export namespace m7 { /** Exported class comment*/ export class c { } @@ -64,26 +64,26 @@ module m4.m5.m6 { } new m4.m5.m6.m7.c(); /** module comment of m5.m6.m7*/ -module m5.m6.m7 { +namespace m5.m6.m7 { /** module m8 comment*/ - export module m8 { + export namespace m8 { /** Exported class comment*/ export class c { } } } new m5.m6.m7.m8.c(); -module m6.m7 { - export module m8 { +namespace m6.m7 { + export namespace m8 { /** Exported class comment*/ export class c { } } } new m6.m7.m8.c(); -module m7.m8 { +namespace m7.m8 { /** module m9 comment*/ - export module m9 { + export namespace m9 { /** Exported class comment*/ export class c { } diff --git a/tests/baselines/reference/commentsModules.symbols b/tests/baselines/reference/commentsModules.symbols index ef00aa17467b4..1fd0523c7a174 100644 --- a/tests/baselines/reference/commentsModules.symbols +++ b/tests/baselines/reference/commentsModules.symbols @@ -2,7 +2,7 @@ === commentsModules.ts === /** Module comment*/ -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(commentsModules.ts, 0, 0)) /** b's comment*/ @@ -17,18 +17,18 @@ module m1 { >b : Symbol(b, Decl(commentsModules.ts, 3, 14)) } /** m2 comments*/ - export module m2 { + export namespace m2 { >m2 : Symbol(m2, Decl(commentsModules.ts, 7, 5)) /** class comment;*/ export class c { ->c : Symbol(c, Decl(commentsModules.ts, 9, 22)) +>c : Symbol(c, Decl(commentsModules.ts, 9, 25)) }; /** i*/ export var i = new c(); >i : Symbol(i, Decl(commentsModules.ts, 14, 18)) ->c : Symbol(c, Decl(commentsModules.ts, 9, 22)) +>c : Symbol(c, Decl(commentsModules.ts, 9, 25)) } /** exported function*/ export function fooExport() { @@ -65,135 +65,135 @@ m1.fooExport(); var myvar = new m1.m2.c(); >myvar : Symbol(myvar, Decl(commentsModules.ts, 38, 3)) ->m1.m2.c : Symbol(m1.m2.c, Decl(commentsModules.ts, 9, 22)) +>m1.m2.c : Symbol(m1.m2.c, Decl(commentsModules.ts, 9, 25)) >m1.m2 : Symbol(m1.m2, Decl(commentsModules.ts, 7, 5)) >m1 : Symbol(m1, Decl(commentsModules.ts, 0, 0)) >m2 : Symbol(m1.m2, Decl(commentsModules.ts, 7, 5)) ->c : Symbol(m1.m2.c, Decl(commentsModules.ts, 9, 22)) +>c : Symbol(m1.m2.c, Decl(commentsModules.ts, 9, 25)) /** module comment of m2.m3*/ -module m2.m3 { +namespace m2.m3 { >m2 : Symbol(m2, Decl(commentsModules.ts, 38, 26)) ->m3 : Symbol(m3, Decl(commentsModules.ts, 40, 10)) +>m3 : Symbol(m3, Decl(commentsModules.ts, 40, 13)) /** Exported class comment*/ export class c { ->c : Symbol(c, Decl(commentsModules.ts, 40, 14)) +>c : Symbol(c, Decl(commentsModules.ts, 40, 17)) } } /* trailing dotted module comment*/ new m2.m3.c(); ->m2.m3.c : Symbol(m2.m3.c, Decl(commentsModules.ts, 40, 14)) ->m2.m3 : Symbol(m2.m3, Decl(commentsModules.ts, 40, 10)) +>m2.m3.c : Symbol(m2.m3.c, Decl(commentsModules.ts, 40, 17)) +>m2.m3 : Symbol(m2.m3, Decl(commentsModules.ts, 40, 13)) >m2 : Symbol(m2, Decl(commentsModules.ts, 38, 26)) ->m3 : Symbol(m2.m3, Decl(commentsModules.ts, 40, 10)) ->c : Symbol(m2.m3.c, Decl(commentsModules.ts, 40, 14)) +>m3 : Symbol(m2.m3, Decl(commentsModules.ts, 40, 13)) +>c : Symbol(m2.m3.c, Decl(commentsModules.ts, 40, 17)) /** module comment of m3.m4.m5*/ -module m3.m4.m5 { +namespace m3.m4.m5 { >m3 : Symbol(m3, Decl(commentsModules.ts, 45, 14)) ->m4 : Symbol(m4, Decl(commentsModules.ts, 47, 10)) ->m5 : Symbol(m5, Decl(commentsModules.ts, 47, 13)) +>m4 : Symbol(m4, Decl(commentsModules.ts, 47, 13)) +>m5 : Symbol(m5, Decl(commentsModules.ts, 47, 16)) /** Exported class comment*/ export class c { ->c : Symbol(c, Decl(commentsModules.ts, 47, 17)) +>c : Symbol(c, Decl(commentsModules.ts, 47, 20)) } } // trailing dotted module 2 new m3.m4.m5.c(); ->m3.m4.m5.c : Symbol(m3.m4.m5.c, Decl(commentsModules.ts, 47, 17)) ->m3.m4.m5 : Symbol(m3.m4.m5, Decl(commentsModules.ts, 47, 13)) ->m3.m4 : Symbol(m3.m4, Decl(commentsModules.ts, 47, 10)) +>m3.m4.m5.c : Symbol(m3.m4.m5.c, Decl(commentsModules.ts, 47, 20)) +>m3.m4.m5 : Symbol(m3.m4.m5, Decl(commentsModules.ts, 47, 16)) +>m3.m4 : Symbol(m3.m4, Decl(commentsModules.ts, 47, 13)) >m3 : Symbol(m3, Decl(commentsModules.ts, 45, 14)) ->m4 : Symbol(m3.m4, Decl(commentsModules.ts, 47, 10)) ->m5 : Symbol(m3.m4.m5, Decl(commentsModules.ts, 47, 13)) ->c : Symbol(m3.m4.m5.c, Decl(commentsModules.ts, 47, 17)) +>m4 : Symbol(m3.m4, Decl(commentsModules.ts, 47, 13)) +>m5 : Symbol(m3.m4.m5, Decl(commentsModules.ts, 47, 16)) +>c : Symbol(m3.m4.m5.c, Decl(commentsModules.ts, 47, 20)) /** module comment of m4.m5.m6*/ -module m4.m5.m6 { +namespace m4.m5.m6 { >m4 : Symbol(m4, Decl(commentsModules.ts, 52, 17)) ->m5 : Symbol(m5, Decl(commentsModules.ts, 54, 10)) ->m6 : Symbol(m6, Decl(commentsModules.ts, 54, 13)) +>m5 : Symbol(m5, Decl(commentsModules.ts, 54, 13)) +>m6 : Symbol(m6, Decl(commentsModules.ts, 54, 16)) - export module m7 { ->m7 : Symbol(m7, Decl(commentsModules.ts, 54, 17)) + export namespace m7 { +>m7 : Symbol(m7, Decl(commentsModules.ts, 54, 20)) /** Exported class comment*/ export class c { ->c : Symbol(c, Decl(commentsModules.ts, 55, 22)) +>c : Symbol(c, Decl(commentsModules.ts, 55, 25)) } } /* trailing inner module */ /* multiple comments*/ } new m4.m5.m6.m7.c(); ->m4.m5.m6.m7.c : Symbol(m4.m5.m6.m7.c, Decl(commentsModules.ts, 55, 22)) ->m4.m5.m6.m7 : Symbol(m4.m5.m6.m7, Decl(commentsModules.ts, 54, 17)) ->m4.m5.m6 : Symbol(m4.m5.m6, Decl(commentsModules.ts, 54, 13)) ->m4.m5 : Symbol(m4.m5, Decl(commentsModules.ts, 54, 10)) +>m4.m5.m6.m7.c : Symbol(m4.m5.m6.m7.c, Decl(commentsModules.ts, 55, 25)) +>m4.m5.m6.m7 : Symbol(m4.m5.m6.m7, Decl(commentsModules.ts, 54, 20)) +>m4.m5.m6 : Symbol(m4.m5.m6, Decl(commentsModules.ts, 54, 16)) +>m4.m5 : Symbol(m4.m5, Decl(commentsModules.ts, 54, 13)) >m4 : Symbol(m4, Decl(commentsModules.ts, 52, 17)) ->m5 : Symbol(m4.m5, Decl(commentsModules.ts, 54, 10)) ->m6 : Symbol(m4.m5.m6, Decl(commentsModules.ts, 54, 13)) ->m7 : Symbol(m4.m5.m6.m7, Decl(commentsModules.ts, 54, 17)) ->c : Symbol(m4.m5.m6.m7.c, Decl(commentsModules.ts, 55, 22)) +>m5 : Symbol(m4.m5, Decl(commentsModules.ts, 54, 13)) +>m6 : Symbol(m4.m5.m6, Decl(commentsModules.ts, 54, 16)) +>m7 : Symbol(m4.m5.m6.m7, Decl(commentsModules.ts, 54, 20)) +>c : Symbol(m4.m5.m6.m7.c, Decl(commentsModules.ts, 55, 25)) /** module comment of m5.m6.m7*/ -module m5.m6.m7 { +namespace m5.m6.m7 { >m5 : Symbol(m5, Decl(commentsModules.ts, 61, 20)) ->m6 : Symbol(m6, Decl(commentsModules.ts, 63, 10)) ->m7 : Symbol(m7, Decl(commentsModules.ts, 63, 13)) +>m6 : Symbol(m6, Decl(commentsModules.ts, 63, 13)) +>m7 : Symbol(m7, Decl(commentsModules.ts, 63, 16)) /** module m8 comment*/ - export module m8 { ->m8 : Symbol(m8, Decl(commentsModules.ts, 63, 17)) + export namespace m8 { +>m8 : Symbol(m8, Decl(commentsModules.ts, 63, 20)) /** Exported class comment*/ export class c { ->c : Symbol(c, Decl(commentsModules.ts, 65, 22)) +>c : Symbol(c, Decl(commentsModules.ts, 65, 25)) } } } new m5.m6.m7.m8.c(); ->m5.m6.m7.m8.c : Symbol(m5.m6.m7.m8.c, Decl(commentsModules.ts, 65, 22)) ->m5.m6.m7.m8 : Symbol(m5.m6.m7.m8, Decl(commentsModules.ts, 63, 17)) ->m5.m6.m7 : Symbol(m5.m6.m7, Decl(commentsModules.ts, 63, 13)) ->m5.m6 : Symbol(m5.m6, Decl(commentsModules.ts, 63, 10)) +>m5.m6.m7.m8.c : Symbol(m5.m6.m7.m8.c, Decl(commentsModules.ts, 65, 25)) +>m5.m6.m7.m8 : Symbol(m5.m6.m7.m8, Decl(commentsModules.ts, 63, 20)) +>m5.m6.m7 : Symbol(m5.m6.m7, Decl(commentsModules.ts, 63, 16)) +>m5.m6 : Symbol(m5.m6, Decl(commentsModules.ts, 63, 13)) >m5 : Symbol(m5, Decl(commentsModules.ts, 61, 20)) ->m6 : Symbol(m5.m6, Decl(commentsModules.ts, 63, 10)) ->m7 : Symbol(m5.m6.m7, Decl(commentsModules.ts, 63, 13)) ->m8 : Symbol(m5.m6.m7.m8, Decl(commentsModules.ts, 63, 17)) ->c : Symbol(m5.m6.m7.m8.c, Decl(commentsModules.ts, 65, 22)) +>m6 : Symbol(m5.m6, Decl(commentsModules.ts, 63, 13)) +>m7 : Symbol(m5.m6.m7, Decl(commentsModules.ts, 63, 16)) +>m8 : Symbol(m5.m6.m7.m8, Decl(commentsModules.ts, 63, 20)) +>c : Symbol(m5.m6.m7.m8.c, Decl(commentsModules.ts, 65, 25)) -module m6.m7 { +namespace m6.m7 { >m6 : Symbol(m6, Decl(commentsModules.ts, 71, 20)) ->m7 : Symbol(m7, Decl(commentsModules.ts, 72, 10)) +>m7 : Symbol(m7, Decl(commentsModules.ts, 72, 13)) - export module m8 { ->m8 : Symbol(m8, Decl(commentsModules.ts, 72, 14)) + export namespace m8 { +>m8 : Symbol(m8, Decl(commentsModules.ts, 72, 17)) /** Exported class comment*/ export class c { ->c : Symbol(c, Decl(commentsModules.ts, 73, 22)) +>c : Symbol(c, Decl(commentsModules.ts, 73, 25)) } } } new m6.m7.m8.c(); ->m6.m7.m8.c : Symbol(m6.m7.m8.c, Decl(commentsModules.ts, 73, 22)) ->m6.m7.m8 : Symbol(m6.m7.m8, Decl(commentsModules.ts, 72, 14)) ->m6.m7 : Symbol(m6.m7, Decl(commentsModules.ts, 72, 10)) +>m6.m7.m8.c : Symbol(m6.m7.m8.c, Decl(commentsModules.ts, 73, 25)) +>m6.m7.m8 : Symbol(m6.m7.m8, Decl(commentsModules.ts, 72, 17)) +>m6.m7 : Symbol(m6.m7, Decl(commentsModules.ts, 72, 13)) >m6 : Symbol(m6, Decl(commentsModules.ts, 71, 20)) ->m7 : Symbol(m6.m7, Decl(commentsModules.ts, 72, 10)) ->m8 : Symbol(m6.m7.m8, Decl(commentsModules.ts, 72, 14)) ->c : Symbol(m6.m7.m8.c, Decl(commentsModules.ts, 73, 22)) +>m7 : Symbol(m6.m7, Decl(commentsModules.ts, 72, 13)) +>m8 : Symbol(m6.m7.m8, Decl(commentsModules.ts, 72, 17)) +>c : Symbol(m6.m7.m8.c, Decl(commentsModules.ts, 73, 25)) -module m7.m8 { +namespace m7.m8 { >m7 : Symbol(m7, Decl(commentsModules.ts, 79, 17)) ->m8 : Symbol(m8, Decl(commentsModules.ts, 80, 10)) +>m8 : Symbol(m8, Decl(commentsModules.ts, 80, 13)) /** module m9 comment*/ - export module m9 { ->m9 : Symbol(m9, Decl(commentsModules.ts, 80, 14)) + export namespace m9 { +>m9 : Symbol(m9, Decl(commentsModules.ts, 80, 17)) /** Exported class comment*/ export class c { ->c : Symbol(c, Decl(commentsModules.ts, 82, 22)) +>c : Symbol(c, Decl(commentsModules.ts, 82, 25)) } /** class d */ @@ -208,11 +208,11 @@ module m7.m8 { } } new m7.m8.m9.c(); ->m7.m8.m9.c : Symbol(m7.m8.m9.c, Decl(commentsModules.ts, 82, 22)) ->m7.m8.m9 : Symbol(m7.m8.m9, Decl(commentsModules.ts, 80, 14)) ->m7.m8 : Symbol(m7.m8, Decl(commentsModules.ts, 80, 10)) +>m7.m8.m9.c : Symbol(m7.m8.m9.c, Decl(commentsModules.ts, 82, 25)) +>m7.m8.m9 : Symbol(m7.m8.m9, Decl(commentsModules.ts, 80, 17)) +>m7.m8 : Symbol(m7.m8, Decl(commentsModules.ts, 80, 13)) >m7 : Symbol(m7, Decl(commentsModules.ts, 79, 17)) ->m8 : Symbol(m7.m8, Decl(commentsModules.ts, 80, 10)) ->m9 : Symbol(m7.m8.m9, Decl(commentsModules.ts, 80, 14)) ->c : Symbol(m7.m8.m9.c, Decl(commentsModules.ts, 82, 22)) +>m8 : Symbol(m7.m8, Decl(commentsModules.ts, 80, 13)) +>m9 : Symbol(m7.m8.m9, Decl(commentsModules.ts, 80, 17)) +>c : Symbol(m7.m8.m9.c, Decl(commentsModules.ts, 82, 25)) diff --git a/tests/baselines/reference/commentsModules.types b/tests/baselines/reference/commentsModules.types index 06e20d246809e..9d220875c78fe 100644 --- a/tests/baselines/reference/commentsModules.types +++ b/tests/baselines/reference/commentsModules.types @@ -2,7 +2,7 @@ === commentsModules.ts === /** Module comment*/ -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -21,7 +21,7 @@ module m1 { > : ^^^^^^ } /** m2 comments*/ - export module m2 { + export namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -103,7 +103,7 @@ var myvar = new m1.m2.c(); > : ^^^^^^^^^^^^^^ /** module comment of m2.m3*/ -module m2.m3 { +namespace m2.m3 { >m2 : typeof m2 > : ^^^^^^^^^ >m3 : typeof m3 @@ -130,7 +130,7 @@ new m2.m3.c(); > : ^^^^^^^^^^^^^^ /** module comment of m3.m4.m5*/ -module m3.m4.m5 { +namespace m3.m4.m5 { >m3 : typeof m3 > : ^^^^^^^^^ >m4 : typeof m4 @@ -163,7 +163,7 @@ new m3.m4.m5.c(); > : ^^^^^^^^^^^^^^^^^ /** module comment of m4.m5.m6*/ -module m4.m5.m6 { +namespace m4.m5.m6 { >m4 : typeof m4 > : ^^^^^^^^^ >m5 : typeof m5 @@ -171,7 +171,7 @@ module m4.m5.m6 { >m6 : typeof m6 > : ^^^^^^^^^ - export module m7 { + export namespace m7 { >m7 : typeof m7 > : ^^^^^^^^^ @@ -205,7 +205,7 @@ new m4.m5.m6.m7.c(); > : ^^^^^^^^^^^^^^^^^^^^ /** module comment of m5.m6.m7*/ -module m5.m6.m7 { +namespace m5.m6.m7 { >m5 : typeof m5 > : ^^^^^^^^^ >m6 : typeof m6 @@ -214,7 +214,7 @@ module m5.m6.m7 { > : ^^^^^^^^^ /** module m8 comment*/ - export module m8 { + export namespace m8 { >m8 : typeof m8 > : ^^^^^^^^^ @@ -247,13 +247,13 @@ new m5.m6.m7.m8.c(); >c : typeof m5.m6.m7.m8.c > : ^^^^^^^^^^^^^^^^^^^^ -module m6.m7 { +namespace m6.m7 { >m6 : typeof m6 > : ^^^^^^^^^ >m7 : typeof m7 > : ^^^^^^^^^ - export module m8 { + export namespace m8 { >m8 : typeof m8 > : ^^^^^^^^^ @@ -282,14 +282,14 @@ new m6.m7.m8.c(); >c : typeof m6.m7.m8.c > : ^^^^^^^^^^^^^^^^^ -module m7.m8 { +namespace m7.m8 { >m7 : typeof m7 > : ^^^^^^^^^ >m8 : typeof m8 > : ^^^^^^^^^ /** module m9 comment*/ - export module m9 { + export namespace m9 { >m9 : typeof m9 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.js b/tests/baselines/reference/commentsMultiModuleMultiFile.js index 2eff094fb9ad6..9b536b04c9e77 100644 --- a/tests/baselines/reference/commentsMultiModuleMultiFile.js +++ b/tests/baselines/reference/commentsMultiModuleMultiFile.js @@ -2,13 +2,13 @@ //// [commentsMultiModuleMultiFile_0.ts] /** this is multi declare module*/ -export module multiM { +export namespace multiM { /// class b comment export class b { } } /** thi is multi module 2*/ -export module multiM { +export namespace multiM { /** class c comment*/ export class c { } @@ -24,7 +24,7 @@ new multiM.c(); //// [commentsMultiModuleMultiFile_1.ts] import m = require('commentsMultiModuleMultiFile_0'); /** this is multi module 3 comment*/ -export module multiM { +export namespace multiM { /** class d comment*/ export class d { } diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.symbols b/tests/baselines/reference/commentsMultiModuleMultiFile.symbols index c7465ea202b20..02d8eec527ff8 100644 --- a/tests/baselines/reference/commentsMultiModuleMultiFile.symbols +++ b/tests/baselines/reference/commentsMultiModuleMultiFile.symbols @@ -5,12 +5,12 @@ import m = require('commentsMultiModuleMultiFile_0'); >m : Symbol(m, Decl(commentsMultiModuleMultiFile_1.ts, 0, 0)) /** this is multi module 3 comment*/ -export module multiM { +export namespace multiM { >multiM : Symbol(multiM, Decl(commentsMultiModuleMultiFile_1.ts, 0, 53)) /** class d comment*/ export class d { ->d : Symbol(d, Decl(commentsMultiModuleMultiFile_1.ts, 2, 22)) +>d : Symbol(d, Decl(commentsMultiModuleMultiFile_1.ts, 2, 25)) } /// class f comment @@ -19,27 +19,27 @@ export module multiM { } } new multiM.d(); ->multiM.d : Symbol(multiM.d, Decl(commentsMultiModuleMultiFile_1.ts, 2, 22)) +>multiM.d : Symbol(multiM.d, Decl(commentsMultiModuleMultiFile_1.ts, 2, 25)) >multiM : Symbol(multiM, Decl(commentsMultiModuleMultiFile_1.ts, 0, 53)) ->d : Symbol(multiM.d, Decl(commentsMultiModuleMultiFile_1.ts, 2, 22)) +>d : Symbol(multiM.d, Decl(commentsMultiModuleMultiFile_1.ts, 2, 25)) === commentsMultiModuleMultiFile_0.ts === /** this is multi declare module*/ -export module multiM { +export namespace multiM { >multiM : Symbol(multiM, Decl(commentsMultiModuleMultiFile_0.ts, 0, 0), Decl(commentsMultiModuleMultiFile_0.ts, 5, 1)) /// class b comment export class b { ->b : Symbol(b, Decl(commentsMultiModuleMultiFile_0.ts, 1, 22)) +>b : Symbol(b, Decl(commentsMultiModuleMultiFile_0.ts, 1, 25)) } } /** thi is multi module 2*/ -export module multiM { +export namespace multiM { >multiM : Symbol(multiM, Decl(commentsMultiModuleMultiFile_0.ts, 0, 0), Decl(commentsMultiModuleMultiFile_0.ts, 5, 1)) /** class c comment*/ export class c { ->c : Symbol(c, Decl(commentsMultiModuleMultiFile_0.ts, 7, 22)) +>c : Symbol(c, Decl(commentsMultiModuleMultiFile_0.ts, 7, 25)) } // class e comment @@ -49,12 +49,12 @@ export module multiM { } new multiM.b(); ->multiM.b : Symbol(multiM.b, Decl(commentsMultiModuleMultiFile_0.ts, 1, 22)) +>multiM.b : Symbol(multiM.b, Decl(commentsMultiModuleMultiFile_0.ts, 1, 25)) >multiM : Symbol(multiM, Decl(commentsMultiModuleMultiFile_0.ts, 0, 0), Decl(commentsMultiModuleMultiFile_0.ts, 5, 1)) ->b : Symbol(multiM.b, Decl(commentsMultiModuleMultiFile_0.ts, 1, 22)) +>b : Symbol(multiM.b, Decl(commentsMultiModuleMultiFile_0.ts, 1, 25)) new multiM.c(); ->multiM.c : Symbol(multiM.c, Decl(commentsMultiModuleMultiFile_0.ts, 7, 22)) +>multiM.c : Symbol(multiM.c, Decl(commentsMultiModuleMultiFile_0.ts, 7, 25)) >multiM : Symbol(multiM, Decl(commentsMultiModuleMultiFile_0.ts, 0, 0), Decl(commentsMultiModuleMultiFile_0.ts, 5, 1)) ->c : Symbol(multiM.c, Decl(commentsMultiModuleMultiFile_0.ts, 7, 22)) +>c : Symbol(multiM.c, Decl(commentsMultiModuleMultiFile_0.ts, 7, 25)) diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.types b/tests/baselines/reference/commentsMultiModuleMultiFile.types index 311bb51c935ae..fb0322a53c25c 100644 --- a/tests/baselines/reference/commentsMultiModuleMultiFile.types +++ b/tests/baselines/reference/commentsMultiModuleMultiFile.types @@ -6,7 +6,7 @@ import m = require('commentsMultiModuleMultiFile_0'); > : ^^^^^^^^ /** this is multi module 3 comment*/ -export module multiM { +export namespace multiM { >multiM : typeof multiM > : ^^^^^^^^^^^^^ @@ -34,7 +34,7 @@ new multiM.d(); === commentsMultiModuleMultiFile_0.ts === /** this is multi declare module*/ -export module multiM { +export namespace multiM { >multiM : typeof multiM > : ^^^^^^^^^^^^^ @@ -45,7 +45,7 @@ export module multiM { } } /** thi is multi module 2*/ -export module multiM { +export namespace multiM { >multiM : typeof multiM > : ^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/commentsMultiModuleSingleFile.js b/tests/baselines/reference/commentsMultiModuleSingleFile.js index 0b9044ef8c9eb..1466e96154cd4 100644 --- a/tests/baselines/reference/commentsMultiModuleSingleFile.js +++ b/tests/baselines/reference/commentsMultiModuleSingleFile.js @@ -2,7 +2,7 @@ //// [commentsMultiModuleSingleFile.ts] /** this is multi declare module*/ -module multiM { +namespace multiM { /** class b*/ export class b { } @@ -13,7 +13,7 @@ module multiM { } /// this is multi module 2 -module multiM { +namespace multiM { /** class c comment*/ export class c { } diff --git a/tests/baselines/reference/commentsMultiModuleSingleFile.symbols b/tests/baselines/reference/commentsMultiModuleSingleFile.symbols index 166faf37d3123..d0e9685815f6e 100644 --- a/tests/baselines/reference/commentsMultiModuleSingleFile.symbols +++ b/tests/baselines/reference/commentsMultiModuleSingleFile.symbols @@ -2,12 +2,12 @@ === commentsMultiModuleSingleFile.ts === /** this is multi declare module*/ -module multiM { +namespace multiM { >multiM : Symbol(multiM, Decl(commentsMultiModuleSingleFile.ts, 0, 0), Decl(commentsMultiModuleSingleFile.ts, 9, 1)) /** class b*/ export class b { ->b : Symbol(b, Decl(commentsMultiModuleSingleFile.ts, 1, 15)) +>b : Symbol(b, Decl(commentsMultiModuleSingleFile.ts, 1, 18)) } // class d @@ -17,12 +17,12 @@ module multiM { } /// this is multi module 2 -module multiM { +namespace multiM { >multiM : Symbol(multiM, Decl(commentsMultiModuleSingleFile.ts, 0, 0), Decl(commentsMultiModuleSingleFile.ts, 9, 1)) /** class c comment*/ export class c { ->c : Symbol(c, Decl(commentsMultiModuleSingleFile.ts, 12, 15)) +>c : Symbol(c, Decl(commentsMultiModuleSingleFile.ts, 12, 18)) } /// class e @@ -31,12 +31,12 @@ module multiM { } } new multiM.b(); ->multiM.b : Symbol(multiM.b, Decl(commentsMultiModuleSingleFile.ts, 1, 15)) +>multiM.b : Symbol(multiM.b, Decl(commentsMultiModuleSingleFile.ts, 1, 18)) >multiM : Symbol(multiM, Decl(commentsMultiModuleSingleFile.ts, 0, 0), Decl(commentsMultiModuleSingleFile.ts, 9, 1)) ->b : Symbol(multiM.b, Decl(commentsMultiModuleSingleFile.ts, 1, 15)) +>b : Symbol(multiM.b, Decl(commentsMultiModuleSingleFile.ts, 1, 18)) new multiM.c(); ->multiM.c : Symbol(multiM.c, Decl(commentsMultiModuleSingleFile.ts, 12, 15)) +>multiM.c : Symbol(multiM.c, Decl(commentsMultiModuleSingleFile.ts, 12, 18)) >multiM : Symbol(multiM, Decl(commentsMultiModuleSingleFile.ts, 0, 0), Decl(commentsMultiModuleSingleFile.ts, 9, 1)) ->c : Symbol(multiM.c, Decl(commentsMultiModuleSingleFile.ts, 12, 15)) +>c : Symbol(multiM.c, Decl(commentsMultiModuleSingleFile.ts, 12, 18)) diff --git a/tests/baselines/reference/commentsMultiModuleSingleFile.types b/tests/baselines/reference/commentsMultiModuleSingleFile.types index dc78094309d26..49400e9ea2316 100644 --- a/tests/baselines/reference/commentsMultiModuleSingleFile.types +++ b/tests/baselines/reference/commentsMultiModuleSingleFile.types @@ -2,7 +2,7 @@ === commentsMultiModuleSingleFile.ts === /** this is multi declare module*/ -module multiM { +namespace multiM { >multiM : typeof multiM > : ^^^^^^^^^^^^^ @@ -20,7 +20,7 @@ module multiM { } /// this is multi module 2 -module multiM { +namespace multiM { >multiM : typeof multiM > : ^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/commentsdoNotEmitComments.js b/tests/baselines/reference/commentsdoNotEmitComments.js index 6e03e388aeb37..8eb367586d069 100644 --- a/tests/baselines/reference/commentsdoNotEmitComments.js +++ b/tests/baselines/reference/commentsdoNotEmitComments.js @@ -72,7 +72,7 @@ interface i1 { var i1_i: i1; /** this is module comment*/ -module m1 { +namespace m1 { /** class b */ export class b { constructor(public x: number) { @@ -81,7 +81,7 @@ module m1 { } /// module m2 - export module m2 { + export namespace m2 { } } diff --git a/tests/baselines/reference/commentsdoNotEmitComments.symbols b/tests/baselines/reference/commentsdoNotEmitComments.symbols index c480061915c2d..5e9e2def2c29e 100644 --- a/tests/baselines/reference/commentsdoNotEmitComments.symbols +++ b/tests/baselines/reference/commentsdoNotEmitComments.symbols @@ -122,12 +122,12 @@ var i1_i: i1; >i1 : Symbol(i1, Decl(commentsdoNotEmitComments.ts, 47, 16)) /** this is module comment*/ -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(commentsdoNotEmitComments.ts, 68, 13)) /** class b */ export class b { ->b : Symbol(b, Decl(commentsdoNotEmitComments.ts, 71, 11)) +>b : Symbol(b, Decl(commentsdoNotEmitComments.ts, 71, 14)) constructor(public x: number) { >x : Symbol(b.x, Decl(commentsdoNotEmitComments.ts, 74, 20)) @@ -136,7 +136,7 @@ module m1 { } /// module m2 - export module m2 { + export namespace m2 { >m2 : Symbol(m2, Decl(commentsdoNotEmitComments.ts, 77, 5)) } } diff --git a/tests/baselines/reference/commentsdoNotEmitComments.types b/tests/baselines/reference/commentsdoNotEmitComments.types index 2a976739e0d62..1a306143d6e38 100644 --- a/tests/baselines/reference/commentsdoNotEmitComments.types +++ b/tests/baselines/reference/commentsdoNotEmitComments.types @@ -174,7 +174,7 @@ var i1_i: i1; > : ^^ /** this is module comment*/ -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -191,7 +191,7 @@ module m1 { } /// module m2 - export module m2 { + export namespace m2 { } } diff --git a/tests/baselines/reference/commentsemitComments.js b/tests/baselines/reference/commentsemitComments.js index 0710d01862448..678d8ff9dafb8 100644 --- a/tests/baselines/reference/commentsemitComments.js +++ b/tests/baselines/reference/commentsemitComments.js @@ -72,7 +72,7 @@ interface i1 { var i1_i: i1; /** this is module comment*/ -module m1 { +namespace m1 { /** class b */ export class b { constructor(public x: number) { @@ -81,7 +81,7 @@ module m1 { } /// module m2 - export module m2 { + export namespace m2 { } } diff --git a/tests/baselines/reference/commentsemitComments.symbols b/tests/baselines/reference/commentsemitComments.symbols index f30841e558d38..a3f0dddce5275 100644 --- a/tests/baselines/reference/commentsemitComments.symbols +++ b/tests/baselines/reference/commentsemitComments.symbols @@ -122,12 +122,12 @@ var i1_i: i1; >i1 : Symbol(i1, Decl(commentsemitComments.ts, 47, 16)) /** this is module comment*/ -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(commentsemitComments.ts, 68, 13)) /** class b */ export class b { ->b : Symbol(b, Decl(commentsemitComments.ts, 71, 11)) +>b : Symbol(b, Decl(commentsemitComments.ts, 71, 14)) constructor(public x: number) { >x : Symbol(b.x, Decl(commentsemitComments.ts, 74, 20)) @@ -136,7 +136,7 @@ module m1 { } /// module m2 - export module m2 { + export namespace m2 { >m2 : Symbol(m2, Decl(commentsemitComments.ts, 77, 5)) } } diff --git a/tests/baselines/reference/commentsemitComments.types b/tests/baselines/reference/commentsemitComments.types index e9736dd5447bd..caa9f3b50153e 100644 --- a/tests/baselines/reference/commentsemitComments.types +++ b/tests/baselines/reference/commentsemitComments.types @@ -174,7 +174,7 @@ var i1_i: i1; > : ^^ /** this is module comment*/ -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -191,7 +191,7 @@ module m1 { } /// module m2 - export module m2 { + export namespace m2 { } } diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js index 8ce80ce2db472..912747456b526 100644 --- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js +++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js @@ -11,7 +11,7 @@ export interface I1 { age: number; } -export module M1 { +export namespace M1 { export interface I2 { foo: string; } diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.symbols b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.symbols index 52403dc753d76..75a47aeacf11b 100644 --- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.symbols +++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.symbols @@ -13,7 +13,7 @@ import f = foo.M1; var i: f.I2; >i : Symbol(i, Decl(foo_1.ts, 3, 3)) >f : Symbol(f, Decl(foo_1.ts, 0, 32)) ->I2 : Symbol(f.I2, Decl(foo_0.ts, 10, 18)) +>I2 : Symbol(f.I2, Decl(foo_0.ts, 10, 21)) var x: foo.C1 = <{m1: number}>{}; >x : Symbol(x, Decl(foo_1.ts, 4, 3)) @@ -33,7 +33,7 @@ var z: foo.M1.I2; >z : Symbol(z, Decl(foo_1.ts, 6, 3)) >foo : Symbol(foo, Decl(foo_1.ts, 0, 0)) >M1 : Symbol(foo.M1, Decl(foo_0.ts, 8, 1)) ->I2 : Symbol(f.I2, Decl(foo_0.ts, 10, 18)) +>I2 : Symbol(f.I2, Decl(foo_0.ts, 10, 21)) var e: number = 0; >e : Symbol(e, Decl(foo_1.ts, 7, 3)) @@ -61,11 +61,11 @@ export interface I1 { >age : Symbol(I1.age, Decl(foo_0.ts, 6, 14)) } -export module M1 { +export namespace M1 { >M1 : Symbol(M1, Decl(foo_0.ts, 8, 1)) export interface I2 { ->I2 : Symbol(I2, Decl(foo_0.ts, 10, 18)) +>I2 : Symbol(I2, Decl(foo_0.ts, 10, 21)) foo: string; >foo : Symbol(I2.foo, Decl(foo_0.ts, 11, 22)) diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.types b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.types index 80667ff4b8605..4445e32e5e351 100644 --- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.types +++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.types @@ -94,7 +94,7 @@ export interface I1 { > : ^^^^^^ } -export module M1 { +export namespace M1 { export interface I2 { foo: string; >foo : string diff --git a/tests/baselines/reference/complexRecursiveCollections.errors.txt b/tests/baselines/reference/complexRecursiveCollections.errors.txt index 3f51359243a8f..e99afc9dae3bf 100644 --- a/tests/baselines/reference/complexRecursiveCollections.errors.txt +++ b/tests/baselines/reference/complexRecursiveCollections.errors.txt @@ -37,7 +37,7 @@ immutable.ts(391,22): error TS2430: Interface 'Set' incorrectly extends inter // Test that complex recursive collections can pass the `extends` assignability check without // running out of memory. This bug was exposed in Typescript 2.4 when more generic signatures // started being checked. - declare module Immutable { + declare namespace Immutable { export function fromJS(jsValue: any, reviver?: (key: string | number, sequence: Collection.Keyed | Collection.Indexed, path?: Array) => any): any; export function is(first: any, second: any): boolean; export function hash(value: any): number; @@ -52,7 +52,7 @@ immutable.ts(391,22): error TS2430: Interface 'Set' incorrectly extends inter equals(other: any): boolean; hashCode(): number; } - export module List { + export namespace List { function isList(maybeList: any): maybeList is List; function of(...values: Array): List; } @@ -97,7 +97,7 @@ immutable.ts(391,22): error TS2430: Interface 'Set' incorrectly extends inter filter(predicate: (value: T, index: number, iter: this) => value is F, context?: any): List; filter(predicate: (value: T, index: number, iter: this) => any, context?: any): this; } - export module Map { + export namespace Map { function isMap(maybeMap: any): maybeMap is Map; function of(...keyValues: Array): Map; } @@ -143,7 +143,7 @@ immutable.ts(391,22): error TS2430: Interface 'Set' incorrectly extends inter filter(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Map; filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this; } - export module OrderedMap { + export namespace OrderedMap { function isOrderedMap(maybeOrderedMap: any): maybeOrderedMap is OrderedMap; } export function OrderedMap(collection: Iterable<[K, V]>): OrderedMap; @@ -162,7 +162,7 @@ immutable.ts(391,22): error TS2430: Interface 'Set' incorrectly extends inter filter(predicate: (value: V, key: K, iter: this) => value is F, context?: any): OrderedMap; filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this; } - export module Set { + export namespace Set { function isSet(maybeSet: any): maybeSet is Set; function of(...values: Array): Set; function fromKeys(iter: Collection): Set; @@ -194,7 +194,7 @@ immutable.ts(391,22): error TS2430: Interface 'Set' incorrectly extends inter filter(predicate: (value: T, key: never, iter: this) => value is F, context?: any): Set; filter(predicate: (value: T, key: never, iter: this) => any, context?: any): this; } - export module OrderedSet { + export namespace OrderedSet { function isOrderedSet(maybeOrderedSet: any): boolean; function of(...values: Array): OrderedSet; function fromKeys(iter: Collection): OrderedSet; @@ -215,7 +215,7 @@ immutable.ts(391,22): error TS2430: Interface 'Set' incorrectly extends inter zipWith(zipper: (value: T, otherValue: U, thirdValue: V) => Z, otherCollection: Collection, thirdCollection: Collection): OrderedSet; zipWith(zipper: (...any: Array) => Z, ...collections: Array>): OrderedSet; } - export module Stack { + export namespace Stack { function isStack(maybeStack: any): maybeStack is Stack; function of(...values: Array): Stack; } @@ -246,7 +246,7 @@ immutable.ts(391,22): error TS2430: Interface 'Set' incorrectly extends inter } export function Range(start?: number, end?: number, step?: number): Seq.Indexed; export function Repeat(value: T, times?: number): Seq.Indexed; - export module Record { + export namespace Record { export function isRecord(maybeRecord: any): maybeRecord is Record.Instance; export function getDescriptiveName(record: Instance): string; export interface Class { @@ -295,10 +295,10 @@ immutable.ts(391,22): error TS2430: Interface 'Set' incorrectly extends inter } } export function Record(defaultValues: T, name?: string): Record.Class; - export module Seq { + export namespace Seq { function isSeq(maybeSeq: any): maybeSeq is Seq.Indexed | Seq.Keyed; function of(...values: Array): Seq.Indexed; - export module Keyed {} + export namespace Keyed {} export function Keyed(collection: Iterable<[K, V]>): Seq.Keyed; export function Keyed(obj: {[key: string]: V}): Seq.Keyed; export function Keyed(): Seq.Keyed; @@ -316,7 +316,7 @@ immutable.ts(391,22): error TS2430: Interface 'Set' incorrectly extends inter filter(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Seq.Keyed; filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this; } - module Indexed { + namespace Indexed { function of(...values: Array): Seq.Indexed; } export function Indexed(): Seq.Indexed; @@ -332,7 +332,7 @@ immutable.ts(391,22): error TS2430: Interface 'Set' incorrectly extends inter filter(predicate: (value: T, index: number, iter: this) => value is F, context?: any): Seq.Indexed; filter(predicate: (value: T, index: number, iter: this) => any, context?: any): this; } - export module Set { + export namespace Set { function of(...values: Array): Seq.Set; } export function Set(): Seq.Set; @@ -366,12 +366,12 @@ immutable.ts(391,22): error TS2430: Interface 'Set' incorrectly extends inter filter(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Seq; filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this; } - export module Collection { + export namespace Collection { function isKeyed(maybeKeyed: any): maybeKeyed is Collection.Keyed; function isIndexed(maybeIndexed: any): maybeIndexed is Collection.Indexed; function isAssociative(maybeAssociative: any): maybeAssociative is Collection.Keyed | Collection.Indexed; function isOrdered(maybeOrdered: any): boolean; - export module Keyed {} + export namespace Keyed {} export function Keyed(collection: Iterable<[K, V]>): Collection.Keyed; export function Keyed(obj: {[key: string]: V}): Collection.Keyed; export interface Keyed extends Collection { @@ -395,7 +395,7 @@ immutable.ts(391,22): error TS2430: Interface 'Set' incorrectly extends inter filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this; [Symbol.iterator](): IterableIterator<[K, V]>; } - export module Indexed {} + export namespace Indexed {} export function Indexed(collection: Iterable): Collection.Indexed; export interface Indexed extends Collection { ~~~~~~~ @@ -432,7 +432,7 @@ immutable.ts(391,22): error TS2430: Interface 'Set' incorrectly extends inter filter(predicate: (value: T, index: number, iter: this) => any, context?: any): this; [Symbol.iterator](): IterableIterator; } - export module Set {} + export namespace Set {} export function Set(collection: Iterable): Collection.Set; export interface Set extends Collection { ~~~ diff --git a/tests/baselines/reference/complexRecursiveCollections.js b/tests/baselines/reference/complexRecursiveCollections.js index 21b371b7d3b64..267212e6b99bb 100644 --- a/tests/baselines/reference/complexRecursiveCollections.js +++ b/tests/baselines/reference/complexRecursiveCollections.js @@ -25,7 +25,7 @@ interface N2 extends N1 { // Test that complex recursive collections can pass the `extends` assignability check without // running out of memory. This bug was exposed in Typescript 2.4 when more generic signatures // started being checked. -declare module Immutable { +declare namespace Immutable { export function fromJS(jsValue: any, reviver?: (key: string | number, sequence: Collection.Keyed | Collection.Indexed, path?: Array) => any): any; export function is(first: any, second: any): boolean; export function hash(value: any): number; @@ -40,7 +40,7 @@ declare module Immutable { equals(other: any): boolean; hashCode(): number; } - export module List { + export namespace List { function isList(maybeList: any): maybeList is List; function of(...values: Array): List; } @@ -85,7 +85,7 @@ declare module Immutable { filter(predicate: (value: T, index: number, iter: this) => value is F, context?: any): List; filter(predicate: (value: T, index: number, iter: this) => any, context?: any): this; } - export module Map { + export namespace Map { function isMap(maybeMap: any): maybeMap is Map; function of(...keyValues: Array): Map; } @@ -131,7 +131,7 @@ declare module Immutable { filter(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Map; filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this; } - export module OrderedMap { + export namespace OrderedMap { function isOrderedMap(maybeOrderedMap: any): maybeOrderedMap is OrderedMap; } export function OrderedMap(collection: Iterable<[K, V]>): OrderedMap; @@ -150,7 +150,7 @@ declare module Immutable { filter(predicate: (value: V, key: K, iter: this) => value is F, context?: any): OrderedMap; filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this; } - export module Set { + export namespace Set { function isSet(maybeSet: any): maybeSet is Set; function of(...values: Array): Set; function fromKeys(iter: Collection): Set; @@ -182,7 +182,7 @@ declare module Immutable { filter(predicate: (value: T, key: never, iter: this) => value is F, context?: any): Set; filter(predicate: (value: T, key: never, iter: this) => any, context?: any): this; } - export module OrderedSet { + export namespace OrderedSet { function isOrderedSet(maybeOrderedSet: any): boolean; function of(...values: Array): OrderedSet; function fromKeys(iter: Collection): OrderedSet; @@ -203,7 +203,7 @@ declare module Immutable { zipWith(zipper: (value: T, otherValue: U, thirdValue: V) => Z, otherCollection: Collection, thirdCollection: Collection): OrderedSet; zipWith(zipper: (...any: Array) => Z, ...collections: Array>): OrderedSet; } - export module Stack { + export namespace Stack { function isStack(maybeStack: any): maybeStack is Stack; function of(...values: Array): Stack; } @@ -234,7 +234,7 @@ declare module Immutable { } export function Range(start?: number, end?: number, step?: number): Seq.Indexed; export function Repeat(value: T, times?: number): Seq.Indexed; - export module Record { + export namespace Record { export function isRecord(maybeRecord: any): maybeRecord is Record.Instance; export function getDescriptiveName(record: Instance): string; export interface Class { @@ -283,10 +283,10 @@ declare module Immutable { } } export function Record(defaultValues: T, name?: string): Record.Class; - export module Seq { + export namespace Seq { function isSeq(maybeSeq: any): maybeSeq is Seq.Indexed | Seq.Keyed; function of(...values: Array): Seq.Indexed; - export module Keyed {} + export namespace Keyed {} export function Keyed(collection: Iterable<[K, V]>): Seq.Keyed; export function Keyed(obj: {[key: string]: V}): Seq.Keyed; export function Keyed(): Seq.Keyed; @@ -304,7 +304,7 @@ declare module Immutable { filter(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Seq.Keyed; filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this; } - module Indexed { + namespace Indexed { function of(...values: Array): Seq.Indexed; } export function Indexed(): Seq.Indexed; @@ -320,7 +320,7 @@ declare module Immutable { filter(predicate: (value: T, index: number, iter: this) => value is F, context?: any): Seq.Indexed; filter(predicate: (value: T, index: number, iter: this) => any, context?: any): this; } - export module Set { + export namespace Set { function of(...values: Array): Seq.Set; } export function Set(): Seq.Set; @@ -354,12 +354,12 @@ declare module Immutable { filter(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Seq; filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this; } - export module Collection { + export namespace Collection { function isKeyed(maybeKeyed: any): maybeKeyed is Collection.Keyed; function isIndexed(maybeIndexed: any): maybeIndexed is Collection.Indexed; function isAssociative(maybeAssociative: any): maybeAssociative is Collection.Keyed | Collection.Indexed; function isOrdered(maybeOrdered: any): boolean; - export module Keyed {} + export namespace Keyed {} export function Keyed(collection: Iterable<[K, V]>): Collection.Keyed; export function Keyed(obj: {[key: string]: V}): Collection.Keyed; export interface Keyed extends Collection { @@ -378,7 +378,7 @@ declare module Immutable { filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this; [Symbol.iterator](): IterableIterator<[K, V]>; } - export module Indexed {} + export namespace Indexed {} export function Indexed(collection: Iterable): Collection.Indexed; export interface Indexed extends Collection { toJS(): Array; @@ -410,7 +410,7 @@ declare module Immutable { filter(predicate: (value: T, index: number, iter: this) => any, context?: any): this; [Symbol.iterator](): IterableIterator; } - export module Set {} + export namespace Set {} export function Set(collection: Iterable): Collection.Set; export interface Set extends Collection { toJS(): Array; diff --git a/tests/baselines/reference/complexRecursiveCollections.symbols b/tests/baselines/reference/complexRecursiveCollections.symbols index a3d9d68d9469c..fbd2034de7b65 100644 --- a/tests/baselines/reference/complexRecursiveCollections.symbols +++ b/tests/baselines/reference/complexRecursiveCollections.symbols @@ -162,19 +162,19 @@ interface N2 extends N1 { // Test that complex recursive collections can pass the `extends` assignability check without // running out of memory. This bug was exposed in Typescript 2.4 when more generic signatures // started being checked. -declare module Immutable { +declare namespace Immutable { >Immutable : Symbol(Immutable, Decl(immutable.ts, 0, 0)) export function fromJS(jsValue: any, reviver?: (key: string | number, sequence: Collection.Keyed | Collection.Indexed, path?: Array) => any): any; ->fromJS : Symbol(fromJS, Decl(immutable.ts, 3, 26)) +>fromJS : Symbol(fromJS, Decl(immutable.ts, 3, 29)) >jsValue : Symbol(jsValue, Decl(immutable.ts, 4, 25)) >reviver : Symbol(reviver, Decl(immutable.ts, 4, 38)) >key : Symbol(key, Decl(immutable.ts, 4, 50)) >sequence : Symbol(sequence, Decl(immutable.ts, 4, 71)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >path : Symbol(path, Decl(immutable.ts, 4, 138)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) @@ -204,23 +204,23 @@ declare module Immutable { >maybeKeyed : Symbol(maybeKeyed, Decl(immutable.ts, 9, 26)) >maybeKeyed : Symbol(maybeKeyed, Decl(immutable.ts, 9, 26)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) export function isIndexed(maybeIndexed: any): maybeIndexed is Collection.Indexed; >isIndexed : Symbol(isIndexed, Decl(immutable.ts, 9, 85)) >maybeIndexed : Symbol(maybeIndexed, Decl(immutable.ts, 10, 28)) >maybeIndexed : Symbol(maybeIndexed, Decl(immutable.ts, 10, 28)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) export function isAssociative(maybeAssociative: any): maybeAssociative is Collection.Keyed | Collection.Indexed; >isAssociative : Symbol(isAssociative, Decl(immutable.ts, 10, 88)) >maybeAssociative : Symbol(maybeAssociative, Decl(immutable.ts, 11, 32)) >maybeAssociative : Symbol(maybeAssociative, Decl(immutable.ts, 11, 32)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) export function isOrdered(maybeOrdered: any): boolean; >isOrdered : Symbol(isOrdered, Decl(immutable.ts, 11, 129)) @@ -242,11 +242,11 @@ declare module Immutable { hashCode(): number; >hashCode : Symbol(ValueObject.hashCode, Decl(immutable.ts, 15, 32)) } - export module List { + export namespace List { >List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60)) function isList(maybeList: any): maybeList is List; ->isList : Symbol(isList, Decl(immutable.ts, 18, 22)) +>isList : Symbol(isList, Decl(immutable.ts, 18, 25)) >maybeList : Symbol(maybeList, Decl(immutable.ts, 19, 20)) >maybeList : Symbol(maybeList, Decl(immutable.ts, 19, 20)) >List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60)) @@ -282,9 +282,9 @@ declare module Immutable { export interface List extends Collection.Indexed { >List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60)) >T : Symbol(T, Decl(immutable.ts, 25, 24)) ->Collection.Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Collection.Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >T : Symbol(T, Decl(immutable.ts, 25, 24)) // Persistent changes @@ -378,7 +378,7 @@ declare module Immutable { >collections : Symbol(collections, Decl(immutable.ts, 39, 10)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >T : Symbol(T, Decl(immutable.ts, 25, 24)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) >T : Symbol(T, Decl(immutable.ts, 25, 24)) @@ -395,7 +395,7 @@ declare module Immutable { >collections : Symbol(collections, Decl(immutable.ts, 40, 63)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >T : Symbol(T, Decl(immutable.ts, 25, 24)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) >T : Symbol(T, Decl(immutable.ts, 25, 24)) @@ -405,7 +405,7 @@ declare module Immutable { >collections : Symbol(collections, Decl(immutable.ts, 41, 14)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >T : Symbol(T, Decl(immutable.ts, 25, 24)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) >T : Symbol(T, Decl(immutable.ts, 25, 24)) @@ -422,7 +422,7 @@ declare module Immutable { >collections : Symbol(collections, Decl(immutable.ts, 42, 67)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >T : Symbol(T, Decl(immutable.ts, 25, 24)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) >T : Symbol(T, Decl(immutable.ts, 25, 24)) @@ -555,11 +555,11 @@ declare module Immutable { >iter : Symbol(iter, Decl(immutable.ts, 61, 47)) >context : Symbol(context, Decl(immutable.ts, 61, 67)) } - export module Map { + export namespace Map { >Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more) function isMap(maybeMap: any): maybeMap is Map; ->isMap : Symbol(isMap, Decl(immutable.ts, 63, 21)) +>isMap : Symbol(isMap, Decl(immutable.ts, 63, 24)) >maybeMap : Symbol(maybeMap, Decl(immutable.ts, 64, 19)) >maybeMap : Symbol(maybeMap, Decl(immutable.ts, 64, 19)) >Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more) @@ -618,9 +618,9 @@ declare module Immutable { >Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more) >K : Symbol(K, Decl(immutable.ts, 72, 23)) >V : Symbol(V, Decl(immutable.ts, 72, 25)) ->Collection.Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Collection.Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) >K : Symbol(K, Decl(immutable.ts, 72, 23)) >V : Symbol(V, Decl(immutable.ts, 72, 25)) @@ -915,11 +915,11 @@ declare module Immutable { >iter : Symbol(iter, Decl(immutable.ts, 107, 40)) >context : Symbol(context, Decl(immutable.ts, 107, 60)) } - export module OrderedMap { + export namespace OrderedMap { >OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more) function isOrderedMap(maybeOrderedMap: any): maybeOrderedMap is OrderedMap; ->isOrderedMap : Symbol(isOrderedMap, Decl(immutable.ts, 109, 28)) +>isOrderedMap : Symbol(isOrderedMap, Decl(immutable.ts, 109, 31)) >maybeOrderedMap : Symbol(maybeOrderedMap, Decl(immutable.ts, 110, 26)) >maybeOrderedMap : Symbol(maybeOrderedMap, Decl(immutable.ts, 110, 26)) >OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more) @@ -1092,11 +1092,11 @@ declare module Immutable { >iter : Symbol(iter, Decl(immutable.ts, 126, 40)) >context : Symbol(context, Decl(immutable.ts, 126, 60)) } - export module Set { + export namespace Set { >Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58)) function isSet(maybeSet: any): maybeSet is Set; ->isSet : Symbol(isSet, Decl(immutable.ts, 128, 21)) +>isSet : Symbol(isSet, Decl(immutable.ts, 128, 24)) >maybeSet : Symbol(maybeSet, Decl(immutable.ts, 129, 19)) >maybeSet : Symbol(maybeSet, Decl(immutable.ts, 129, 19)) >Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58)) @@ -1167,9 +1167,9 @@ declare module Immutable { export interface Set extends Collection.Set { >Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58)) >T : Symbol(T, Decl(immutable.ts, 139, 23)) ->Collection.Set : Symbol(Collection.Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) +>Collection.Set : Symbol(Collection.Set, Decl(immutable.ts, 388, 27), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Set : Symbol(Collection.Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) +>Set : Symbol(Collection.Set, Decl(immutable.ts, 388, 27), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) >T : Symbol(T, Decl(immutable.ts, 139, 23)) // Persistent changes @@ -1303,11 +1303,11 @@ declare module Immutable { >iter : Symbol(iter, Decl(immutable.ts, 158, 44)) >context : Symbol(context, Decl(immutable.ts, 158, 64)) } - export module OrderedSet { + export namespace OrderedSet { >OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 159, 3), Decl(immutable.ts, 168, 72)) function isOrderedSet(maybeOrderedSet: any): boolean; ->isOrderedSet : Symbol(isOrderedSet, Decl(immutable.ts, 160, 28)) +>isOrderedSet : Symbol(isOrderedSet, Decl(immutable.ts, 160, 31)) >maybeOrderedSet : Symbol(maybeOrderedSet, Decl(immutable.ts, 161, 26)) function of(...values: Array): OrderedSet; @@ -1481,11 +1481,11 @@ declare module Immutable { >OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 159, 3), Decl(immutable.ts, 168, 72)) >Z : Symbol(Z, Decl(immutable.ts, 179, 12)) } - export module Stack { + export namespace Stack { >Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62)) function isStack(maybeStack: any): maybeStack is Stack; ->isStack : Symbol(isStack, Decl(immutable.ts, 181, 23)) +>isStack : Symbol(isStack, Decl(immutable.ts, 181, 26)) >maybeStack : Symbol(maybeStack, Decl(immutable.ts, 182, 21)) >maybeStack : Symbol(maybeStack, Decl(immutable.ts, 182, 21)) >Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62)) @@ -1521,9 +1521,9 @@ declare module Immutable { export interface Stack extends Collection.Indexed { >Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62)) >T : Symbol(T, Decl(immutable.ts, 188, 25)) ->Collection.Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Collection.Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >T : Symbol(T, Decl(immutable.ts, 188, 25)) // Reading values @@ -1673,11 +1673,11 @@ declare module Immutable { >Indexed : Symbol(Seq.Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72)) >T : Symbol(T, Decl(immutable.ts, 211, 25)) - export module Record { + export namespace Record { >Record : Symbol(Record, Decl(immutable.ts, 259, 3), Decl(immutable.ts, 211, 70)) export function isRecord(maybeRecord: any): maybeRecord is Record.Instance; ->isRecord : Symbol(isRecord, Decl(immutable.ts, 212, 24)) +>isRecord : Symbol(isRecord, Decl(immutable.ts, 212, 27)) >maybeRecord : Symbol(maybeRecord, Decl(immutable.ts, 213, 29)) >maybeRecord : Symbol(maybeRecord, Decl(immutable.ts, 213, 29)) >Record : Symbol(Record, Decl(immutable.ts, 259, 3), Decl(immutable.ts, 211, 70)) @@ -1904,7 +1904,7 @@ declare module Immutable { toSeq(): Seq.Keyed; >toSeq : Symbol(Instance.toSeq, Decl(immutable.ts, 254, 26)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) ->Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) >T : Symbol(T, Decl(immutable.ts, 219, 30)) >T : Symbol(T, Decl(immutable.ts, 219, 30)) >T : Symbol(T, Decl(immutable.ts, 219, 30)) @@ -1930,17 +1930,17 @@ declare module Immutable { >Class : Symbol(Record.Class, Decl(immutable.ts, 214, 70)) >T : Symbol(T, Decl(immutable.ts, 260, 25)) - export module Seq { + export namespace Seq { >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) function isSeq(maybeSeq: any): maybeSeq is Seq.Indexed | Seq.Keyed; ->isSeq : Symbol(isSeq, Decl(immutable.ts, 261, 21)) +>isSeq : Symbol(isSeq, Decl(immutable.ts, 261, 24)) >maybeSeq : Symbol(maybeSeq, Decl(immutable.ts, 262, 19)) >maybeSeq : Symbol(maybeSeq, Decl(immutable.ts, 262, 19)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) >Indexed : Symbol(Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) function of(...values: Array): Seq.Indexed; >of : Symbol(of, Decl(immutable.ts, 262, 86)) @@ -1952,11 +1952,11 @@ declare module Immutable { >Indexed : Symbol(Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72)) >T : Symbol(T, Decl(immutable.ts, 263, 16)) - export module Keyed {} ->Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) + export namespace Keyed {} +>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) export function Keyed(collection: Iterable<[K, V]>): Seq.Keyed; ->Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) >K : Symbol(K, Decl(immutable.ts, 265, 26)) >V : Symbol(V, Decl(immutable.ts, 265, 28)) >collection : Symbol(collection, Decl(immutable.ts, 265, 32)) @@ -1964,44 +1964,44 @@ declare module Immutable { >K : Symbol(K, Decl(immutable.ts, 265, 26)) >V : Symbol(V, Decl(immutable.ts, 265, 28)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) >K : Symbol(K, Decl(immutable.ts, 265, 26)) >V : Symbol(V, Decl(immutable.ts, 265, 28)) export function Keyed(obj: {[key: string]: V}): Seq.Keyed; ->Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) >V : Symbol(V, Decl(immutable.ts, 266, 26)) >obj : Symbol(obj, Decl(immutable.ts, 266, 29)) >key : Symbol(key, Decl(immutable.ts, 266, 36)) >V : Symbol(V, Decl(immutable.ts, 266, 26)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) >V : Symbol(V, Decl(immutable.ts, 266, 26)) export function Keyed(): Seq.Keyed; ->Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) >K : Symbol(K, Decl(immutable.ts, 267, 26)) >V : Symbol(V, Decl(immutable.ts, 267, 28)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) >K : Symbol(K, Decl(immutable.ts, 267, 26)) >V : Symbol(V, Decl(immutable.ts, 267, 28)) export function Keyed(): Seq.Keyed; ->Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) export interface Keyed extends Seq, Collection.Keyed { ->Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) >K : Symbol(K, Decl(immutable.ts, 269, 27)) >V : Symbol(V, Decl(immutable.ts, 269, 29)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) >K : Symbol(K, Decl(immutable.ts, 269, 27)) >V : Symbol(V, Decl(immutable.ts, 269, 29)) ->Collection.Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Collection.Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) >K : Symbol(K, Decl(immutable.ts, 269, 27)) >V : Symbol(V, Decl(immutable.ts, 269, 29)) @@ -2027,7 +2027,7 @@ declare module Immutable { >KC : Symbol(KC, Decl(immutable.ts, 273, 13)) >VC : Symbol(VC, Decl(immutable.ts, 273, 16)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) >K : Symbol(K, Decl(immutable.ts, 269, 27)) >KC : Symbol(KC, Decl(immutable.ts, 273, 13)) >V : Symbol(V, Decl(immutable.ts, 269, 29)) @@ -2041,7 +2041,7 @@ declare module Immutable { >key : Symbol(key, Decl(immutable.ts, 274, 40)) >C : Symbol(C, Decl(immutable.ts, 274, 13)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) >K : Symbol(K, Decl(immutable.ts, 269, 27)) >V : Symbol(V, Decl(immutable.ts, 269, 29)) >C : Symbol(C, Decl(immutable.ts, 274, 13)) @@ -2058,7 +2058,7 @@ declare module Immutable { >M : Symbol(M, Decl(immutable.ts, 275, 10)) >context : Symbol(context, Decl(immutable.ts, 275, 57)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) >K : Symbol(K, Decl(immutable.ts, 269, 27)) >M : Symbol(M, Decl(immutable.ts, 275, 10)) @@ -2074,7 +2074,7 @@ declare module Immutable { >M : Symbol(M, Decl(immutable.ts, 276, 14)) >context : Symbol(context, Decl(immutable.ts, 276, 61)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) >M : Symbol(M, Decl(immutable.ts, 276, 14)) >V : Symbol(V, Decl(immutable.ts, 269, 29)) @@ -2092,7 +2092,7 @@ declare module Immutable { >VM : Symbol(VM, Decl(immutable.ts, 277, 20)) >context : Symbol(context, Decl(immutable.ts, 277, 88)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) >KM : Symbol(KM, Decl(immutable.ts, 277, 17)) >VM : Symbol(VM, Decl(immutable.ts, 277, 20)) @@ -2109,7 +2109,7 @@ declare module Immutable { >M : Symbol(M, Decl(immutable.ts, 278, 14)) >context : Symbol(context, Decl(immutable.ts, 278, 71)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) filter(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Seq.Keyed; >filter : Symbol(Keyed.filter, Decl(immutable.ts, 278, 108), Decl(immutable.ts, 279, 115)) @@ -2125,7 +2125,7 @@ declare module Immutable { >F : Symbol(F, Decl(immutable.ts, 279, 13)) >context : Symbol(context, Decl(immutable.ts, 279, 82)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) >K : Symbol(K, Decl(immutable.ts, 269, 27)) >F : Symbol(F, Decl(immutable.ts, 279, 13)) @@ -2139,11 +2139,11 @@ declare module Immutable { >iter : Symbol(iter, Decl(immutable.ts, 280, 42)) >context : Symbol(context, Decl(immutable.ts, 280, 62)) } - module Indexed { + namespace Indexed { >Indexed : Symbol(Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72)) function of(...values: Array): Seq.Indexed; ->of : Symbol(of, Decl(immutable.ts, 282, 20)) +>of : Symbol(of, Decl(immutable.ts, 282, 23)) >T : Symbol(T, Decl(immutable.ts, 283, 18)) >values : Symbol(values, Decl(immutable.ts, 283, 21)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) @@ -2179,9 +2179,9 @@ declare module Immutable { >T : Symbol(T, Decl(immutable.ts, 288, 29)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) >T : Symbol(T, Decl(immutable.ts, 288, 29)) ->Collection.Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Collection.Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >T : Symbol(T, Decl(immutable.ts, 288, 29)) toJS(): Array; @@ -2263,11 +2263,11 @@ declare module Immutable { >iter : Symbol(iter, Decl(immutable.ts, 296, 49)) >context : Symbol(context, Decl(immutable.ts, 296, 69)) } - export module Set { + export namespace Set { >Set : Symbol(Set, Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 297, 5), Decl(immutable.ts, 303, 64)) function of(...values: Array): Seq.Set; ->of : Symbol(of, Decl(immutable.ts, 298, 23)) +>of : Symbol(of, Decl(immutable.ts, 298, 26)) >T : Symbol(T, Decl(immutable.ts, 299, 18)) >values : Symbol(values, Decl(immutable.ts, 299, 21)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) @@ -2303,9 +2303,9 @@ declare module Immutable { >T : Symbol(T, Decl(immutable.ts, 304, 25)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) >T : Symbol(T, Decl(immutable.ts, 304, 25)) ->Collection.Set : Symbol(Collection.Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) +>Collection.Set : Symbol(Collection.Set, Decl(immutable.ts, 388, 27), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Set : Symbol(Collection.Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) +>Set : Symbol(Collection.Set, Decl(immutable.ts, 388, 27), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) >T : Symbol(T, Decl(immutable.ts, 304, 25)) toJS(): Array; @@ -2402,11 +2402,11 @@ declare module Immutable { >V : Symbol(V, Decl(immutable.ts, 316, 24)) >collection : Symbol(collection, Decl(immutable.ts, 316, 28)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) >K : Symbol(K, Decl(immutable.ts, 316, 22)) >V : Symbol(V, Decl(immutable.ts, 316, 24)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) ->Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) >K : Symbol(K, Decl(immutable.ts, 316, 22)) >V : Symbol(V, Decl(immutable.ts, 316, 24)) @@ -2415,7 +2415,7 @@ declare module Immutable { >T : Symbol(T, Decl(immutable.ts, 317, 22)) >collection : Symbol(collection, Decl(immutable.ts, 317, 25)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >T : Symbol(T, Decl(immutable.ts, 317, 22)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) >Indexed : Symbol(Seq.Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72)) @@ -2426,7 +2426,7 @@ declare module Immutable { >T : Symbol(T, Decl(immutable.ts, 318, 22)) >collection : Symbol(collection, Decl(immutable.ts, 318, 25)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Set : Symbol(Collection.Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) +>Set : Symbol(Collection.Set, Decl(immutable.ts, 388, 27), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) >T : Symbol(T, Decl(immutable.ts, 318, 22)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) >Set : Symbol(Seq.Set, Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 297, 5), Decl(immutable.ts, 303, 64)) @@ -2449,7 +2449,7 @@ declare module Immutable { >key : Symbol(key, Decl(immutable.ts, 320, 32)) >V : Symbol(V, Decl(immutable.ts, 320, 22)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) ->Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) >V : Symbol(V, Decl(immutable.ts, 320, 22)) export function Seq(): Seq; @@ -2530,41 +2530,41 @@ declare module Immutable { >iter : Symbol(iter, Decl(immutable.ts, 330, 40)) >context : Symbol(context, Decl(immutable.ts, 330, 60)) } - export module Collection { + export namespace Collection { >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) function isKeyed(maybeKeyed: any): maybeKeyed is Collection.Keyed; ->isKeyed : Symbol(isKeyed, Decl(immutable.ts, 332, 28)) +>isKeyed : Symbol(isKeyed, Decl(immutable.ts, 332, 31)) >maybeKeyed : Symbol(maybeKeyed, Decl(immutable.ts, 333, 21)) >maybeKeyed : Symbol(maybeKeyed, Decl(immutable.ts, 333, 21)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) function isIndexed(maybeIndexed: any): maybeIndexed is Collection.Indexed; >isIndexed : Symbol(isIndexed, Decl(immutable.ts, 333, 80)) >maybeIndexed : Symbol(maybeIndexed, Decl(immutable.ts, 334, 23)) >maybeIndexed : Symbol(maybeIndexed, Decl(immutable.ts, 334, 23)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) function isAssociative(maybeAssociative: any): maybeAssociative is Collection.Keyed | Collection.Indexed; >isAssociative : Symbol(isAssociative, Decl(immutable.ts, 334, 83)) >maybeAssociative : Symbol(maybeAssociative, Decl(immutable.ts, 335, 27)) >maybeAssociative : Symbol(maybeAssociative, Decl(immutable.ts, 335, 27)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) function isOrdered(maybeOrdered: any): boolean; >isOrdered : Symbol(isOrdered, Decl(immutable.ts, 335, 124)) >maybeOrdered : Symbol(maybeOrdered, Decl(immutable.ts, 336, 23)) - export module Keyed {} ->Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) + export namespace Keyed {} +>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) export function Keyed(collection: Iterable<[K, V]>): Collection.Keyed; ->Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) >K : Symbol(K, Decl(immutable.ts, 338, 26)) >V : Symbol(V, Decl(immutable.ts, 338, 28)) >collection : Symbol(collection, Decl(immutable.ts, 338, 32)) @@ -2572,22 +2572,22 @@ declare module Immutable { >K : Symbol(K, Decl(immutable.ts, 338, 26)) >V : Symbol(V, Decl(immutable.ts, 338, 28)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) >K : Symbol(K, Decl(immutable.ts, 338, 26)) >V : Symbol(V, Decl(immutable.ts, 338, 28)) export function Keyed(obj: {[key: string]: V}): Collection.Keyed; ->Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) >V : Symbol(V, Decl(immutable.ts, 339, 26)) >obj : Symbol(obj, Decl(immutable.ts, 339, 29)) >key : Symbol(key, Decl(immutable.ts, 339, 36)) >V : Symbol(V, Decl(immutable.ts, 339, 26)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) >V : Symbol(V, Decl(immutable.ts, 339, 26)) export interface Keyed extends Collection { ->Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) >K : Symbol(K, Decl(immutable.ts, 340, 27)) >V : Symbol(V, Decl(immutable.ts, 340, 29)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) @@ -2606,7 +2606,7 @@ declare module Immutable { toSeq(): Seq.Keyed; >toSeq : Symbol(Keyed.toSeq, Decl(immutable.ts, 342, 37)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) ->Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) >K : Symbol(K, Decl(immutable.ts, 340, 27)) >V : Symbol(V, Decl(immutable.ts, 340, 29)) @@ -2624,7 +2624,7 @@ declare module Immutable { >KC : Symbol(KC, Decl(immutable.ts, 346, 13)) >VC : Symbol(VC, Decl(immutable.ts, 346, 16)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) >K : Symbol(K, Decl(immutable.ts, 340, 27)) >KC : Symbol(KC, Decl(immutable.ts, 346, 13)) >V : Symbol(V, Decl(immutable.ts, 340, 29)) @@ -2638,7 +2638,7 @@ declare module Immutable { >key : Symbol(key, Decl(immutable.ts, 347, 40)) >C : Symbol(C, Decl(immutable.ts, 347, 13)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) >K : Symbol(K, Decl(immutable.ts, 340, 27)) >V : Symbol(V, Decl(immutable.ts, 340, 29)) >C : Symbol(C, Decl(immutable.ts, 347, 13)) @@ -2655,7 +2655,7 @@ declare module Immutable { >M : Symbol(M, Decl(immutable.ts, 348, 10)) >context : Symbol(context, Decl(immutable.ts, 348, 57)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) >K : Symbol(K, Decl(immutable.ts, 340, 27)) >M : Symbol(M, Decl(immutable.ts, 348, 10)) @@ -2671,7 +2671,7 @@ declare module Immutable { >M : Symbol(M, Decl(immutable.ts, 349, 14)) >context : Symbol(context, Decl(immutable.ts, 349, 61)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) >M : Symbol(M, Decl(immutable.ts, 349, 14)) >V : Symbol(V, Decl(immutable.ts, 340, 29)) @@ -2689,7 +2689,7 @@ declare module Immutable { >VM : Symbol(VM, Decl(immutable.ts, 350, 20)) >context : Symbol(context, Decl(immutable.ts, 350, 88)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) >KM : Symbol(KM, Decl(immutable.ts, 350, 17)) >VM : Symbol(VM, Decl(immutable.ts, 350, 20)) @@ -2706,7 +2706,7 @@ declare module Immutable { >M : Symbol(M, Decl(immutable.ts, 351, 14)) >context : Symbol(context, Decl(immutable.ts, 351, 71)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) filter(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Collection.Keyed; >filter : Symbol(Keyed.filter, Decl(immutable.ts, 351, 115), Decl(immutable.ts, 352, 122)) @@ -2722,7 +2722,7 @@ declare module Immutable { >F : Symbol(F, Decl(immutable.ts, 352, 13)) >context : Symbol(context, Decl(immutable.ts, 352, 82)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) >K : Symbol(K, Decl(immutable.ts, 340, 27)) >F : Symbol(F, Decl(immutable.ts, 352, 13)) @@ -2745,21 +2745,21 @@ declare module Immutable { >K : Symbol(K, Decl(immutable.ts, 340, 27)) >V : Symbol(V, Decl(immutable.ts, 340, 29)) } - export module Indexed {} ->Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) + export namespace Indexed {} +>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) export function Indexed(collection: Iterable): Collection.Indexed; ->Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >T : Symbol(T, Decl(immutable.ts, 357, 28)) >collection : Symbol(collection, Decl(immutable.ts, 357, 31)) >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --)) >T : Symbol(T, Decl(immutable.ts, 357, 28)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >T : Symbol(T, Decl(immutable.ts, 357, 28)) export interface Indexed extends Collection { ->Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >T : Symbol(T, Decl(immutable.ts, 358, 29)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) >T : Symbol(T, Decl(immutable.ts, 358, 29)) @@ -2798,7 +2798,7 @@ declare module Immutable { fromEntrySeq(): Seq.Keyed; >fromEntrySeq : Symbol(Indexed.fromEntrySeq, Decl(immutable.ts, 365, 30)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) ->Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) // Combination interpose(separator: T): this; @@ -2827,7 +2827,7 @@ declare module Immutable { >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) zipWith(zipper: (value: T, otherValue: U) => Z, otherCollection: Collection): Collection.Indexed; >zipWith : Symbol(Indexed.zipWith, Decl(immutable.ts, 371, 80), Decl(immutable.ts, 372, 120), Decl(immutable.ts, 373, 175)) @@ -2843,7 +2843,7 @@ declare module Immutable { >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) >U : Symbol(U, Decl(immutable.ts, 372, 14)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >Z : Symbol(Z, Decl(immutable.ts, 372, 16)) zipWith(zipper: (value: T, otherValue: U, thirdValue: V) => Z, otherCollection: Collection, thirdCollection: Collection): Collection.Indexed; @@ -2866,7 +2866,7 @@ declare module Immutable { >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) >V : Symbol(V, Decl(immutable.ts, 373, 16)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >Z : Symbol(Z, Decl(immutable.ts, 373, 19)) zipWith(zipper: (...any: Array) => Z, ...collections: Array>): Collection.Indexed; @@ -2880,7 +2880,7 @@ declare module Immutable { >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >Z : Symbol(Z, Decl(immutable.ts, 374, 14)) // Search for value @@ -2922,7 +2922,7 @@ declare module Immutable { >C : Symbol(C, Decl(immutable.ts, 381, 13)) >C : Symbol(C, Decl(immutable.ts, 381, 13)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >T : Symbol(T, Decl(immutable.ts, 358, 29)) >C : Symbol(C, Decl(immutable.ts, 381, 13)) @@ -2937,7 +2937,7 @@ declare module Immutable { >M : Symbol(M, Decl(immutable.ts, 382, 10)) >context : Symbol(context, Decl(immutable.ts, 382, 62)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >M : Symbol(M, Decl(immutable.ts, 382, 10)) flatMap(mapper: (value: T, key: number, iter: this) => Iterable, context?: any): Collection.Indexed; @@ -2952,7 +2952,7 @@ declare module Immutable { >M : Symbol(M, Decl(immutable.ts, 383, 14)) >context : Symbol(context, Decl(immutable.ts, 383, 76)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >M : Symbol(M, Decl(immutable.ts, 383, 14)) filter(predicate: (value: T, index: number, iter: this) => value is F, context?: any): Collection.Indexed; @@ -2968,7 +2968,7 @@ declare module Immutable { >F : Symbol(F, Decl(immutable.ts, 384, 13)) >context : Symbol(context, Decl(immutable.ts, 384, 89)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >F : Symbol(F, Decl(immutable.ts, 384, 13)) filter(predicate: (value: T, index: number, iter: this) => any, context?: any): this; @@ -2988,21 +2988,21 @@ declare module Immutable { >IterableIterator : Symbol(IterableIterator, Decl(lib.es2015.iterable.d.ts, --, --)) >T : Symbol(T, Decl(immutable.ts, 358, 29)) } - export module Set {} ->Set : Symbol(Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) + export namespace Set {} +>Set : Symbol(Set, Decl(immutable.ts, 388, 27), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) export function Set(collection: Iterable): Collection.Set; ->Set : Symbol(Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) +>Set : Symbol(Set, Decl(immutable.ts, 388, 27), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) >T : Symbol(T, Decl(immutable.ts, 389, 24)) >collection : Symbol(collection, Decl(immutable.ts, 389, 27)) >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --)) >T : Symbol(T, Decl(immutable.ts, 389, 24)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Set : Symbol(Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) +>Set : Symbol(Set, Decl(immutable.ts, 388, 27), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) >T : Symbol(T, Decl(immutable.ts, 389, 24)) export interface Set extends Collection { ->Set : Symbol(Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) +>Set : Symbol(Set, Decl(immutable.ts, 388, 27), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) >T : Symbol(T, Decl(immutable.ts, 390, 25)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) >T : Symbol(T, Decl(immutable.ts, 390, 25)) @@ -3032,7 +3032,7 @@ declare module Immutable { >C : Symbol(C, Decl(immutable.ts, 395, 13)) >C : Symbol(C, Decl(immutable.ts, 395, 13)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Set : Symbol(Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) +>Set : Symbol(Set, Decl(immutable.ts, 388, 27), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) >T : Symbol(T, Decl(immutable.ts, 390, 25)) >C : Symbol(C, Decl(immutable.ts, 395, 13)) @@ -3047,7 +3047,7 @@ declare module Immutable { >M : Symbol(M, Decl(immutable.ts, 396, 10)) >context : Symbol(context, Decl(immutable.ts, 396, 61)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Set : Symbol(Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) +>Set : Symbol(Set, Decl(immutable.ts, 388, 27), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) >M : Symbol(M, Decl(immutable.ts, 396, 10)) flatMap(mapper: (value: T, key: never, iter: this) => Iterable, context?: any): Collection.Set; @@ -3062,7 +3062,7 @@ declare module Immutable { >M : Symbol(M, Decl(immutable.ts, 397, 14)) >context : Symbol(context, Decl(immutable.ts, 397, 75)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Set : Symbol(Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) +>Set : Symbol(Set, Decl(immutable.ts, 388, 27), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) >M : Symbol(M, Decl(immutable.ts, 397, 14)) filter(predicate: (value: T, key: never, iter: this) => value is F, context?: any): Collection.Set; @@ -3078,7 +3078,7 @@ declare module Immutable { >F : Symbol(F, Decl(immutable.ts, 398, 13)) >context : Symbol(context, Decl(immutable.ts, 398, 86)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Set : Symbol(Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) +>Set : Symbol(Set, Decl(immutable.ts, 388, 27), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71)) >F : Symbol(F, Decl(immutable.ts, 398, 13)) filter(predicate: (value: T, key: never, iter: this) => any, context?: any): this; @@ -3114,7 +3114,7 @@ declare module Immutable { >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --)) >T : Symbol(T, Decl(immutable.ts, 404, 29)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) +>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 31), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79)) >T : Symbol(T, Decl(immutable.ts, 404, 29)) export function Collection(obj: {[key: string]: V}): Collection.Keyed; @@ -3124,7 +3124,7 @@ declare module Immutable { >key : Symbol(key, Decl(immutable.ts, 405, 39)) >V : Symbol(V, Decl(immutable.ts, 405, 29)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) ->Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) +>Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 29), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83)) >V : Symbol(V, Decl(immutable.ts, 405, 29)) export interface Collection extends ValueObject { @@ -3265,7 +3265,7 @@ declare module Immutable { toKeyedSeq(): Seq.Keyed; >toKeyedSeq : Symbol(Collection.toKeyedSeq, Decl(immutable.ts, 436, 18)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) ->Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) >K : Symbol(K, Decl(immutable.ts, 406, 30)) >V : Symbol(V, Decl(immutable.ts, 406, 32)) @@ -3410,7 +3410,7 @@ declare module Immutable { >G : Symbol(G, Decl(immutable.ts, 456, 12)) >context : Symbol(context, Decl(immutable.ts, 456, 60)) >Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more) ->Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) +>Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 264, 29), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more) >G : Symbol(G, Decl(immutable.ts, 456, 12)) >Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86)) >K : Symbol(K, Decl(immutable.ts, 406, 30)) diff --git a/tests/baselines/reference/complexRecursiveCollections.types b/tests/baselines/reference/complexRecursiveCollections.types index f0a093b34f4ab..e0d38c147495c 100644 --- a/tests/baselines/reference/complexRecursiveCollections.types +++ b/tests/baselines/reference/complexRecursiveCollections.types @@ -139,7 +139,7 @@ interface N2 extends N1 { // Test that complex recursive collections can pass the `extends` assignability check without // running out of memory. This bug was exposed in Typescript 2.4 when more generic signatures // started being checked. -declare module Immutable { +declare namespace Immutable { >Immutable : typeof Immutable > : ^^^^^^^^^^^^^^^^ @@ -236,7 +236,7 @@ declare module Immutable { >hashCode : () => number > : ^^^^^^ } - export module List { + export namespace List { >List : typeof List > : ^^^^^^^^^^^ @@ -546,7 +546,7 @@ declare module Immutable { >context : any > : ^^^ } - export module Map { + export namespace Map { >Map : typeof Map > : ^^^^^^^^^^ @@ -884,7 +884,7 @@ declare module Immutable { >context : any > : ^^^ } - export module OrderedMap { + export namespace OrderedMap { >OrderedMap : typeof OrderedMap > : ^^^^^^^^^^^^^^^^^ @@ -1022,7 +1022,7 @@ declare module Immutable { >context : any > : ^^^ } - export module Set { + export namespace Set { >Set : typeof Set > : ^^^^^^^^^^ @@ -1209,7 +1209,7 @@ declare module Immutable { >context : any > : ^^^ } - export module OrderedSet { + export namespace OrderedSet { >OrderedSet : typeof OrderedSet > : ^^^^^^^^^^^^^^^^^ @@ -1361,7 +1361,7 @@ declare module Immutable { >collections : Collection[] > : ^^^^^^^^^^^^^^^^^^^^^^ } - export module Stack { + export namespace Stack { >Stack : typeof Stack > : ^^^^^^^^^^^^ @@ -1539,7 +1539,7 @@ declare module Immutable { >Seq : any > : ^^^ - export module Record { + export namespace Record { >Record : typeof Record > : ^^^^^^^^^^^^^ @@ -1788,7 +1788,7 @@ declare module Immutable { >Record : any > : ^^^ - export module Seq { + export namespace Seq { >Seq : typeof Seq > : ^^^^^^^^^^ @@ -1810,7 +1810,7 @@ declare module Immutable { >Seq : any > : ^^^ - export module Keyed {} + export namespace Keyed {} export function Keyed(collection: Iterable<[K, V]>): Seq.Keyed; >Keyed : { (collection: Iterable<[K, V]>): Seq.Keyed; (obj: { [key: string]: V_1; }): Seq.Keyed; (): Seq.Keyed; (): Seq.Keyed; } > : ^^^ ^^ ^^ ^^ ^^^ ^^^^^^^^ ^^ ^^^ ^^^^^^^^^^^^^^^^ ^^^^^^ ^^^ @@ -1971,7 +1971,7 @@ declare module Immutable { >context : any > : ^^^ } - module Indexed { + namespace Indexed { >Indexed : typeof Indexed > : ^^^^^^^^^^^^^^ @@ -2089,7 +2089,7 @@ declare module Immutable { >context : any > : ^^^ } - export module Set { + export namespace Set { >Set : typeof Set > : ^^^^^^^^^^ @@ -2333,7 +2333,7 @@ declare module Immutable { >context : any > : ^^^ } - export module Collection { + export namespace Collection { >Collection : typeof Collection > : ^^^^^^^^^^^^^^^^^ @@ -2369,7 +2369,7 @@ declare module Immutable { >maybeOrdered : any > : ^^^ - export module Keyed {} + export namespace Keyed {} export function Keyed(collection: Iterable<[K, V]>): Collection.Keyed; >Keyed : { (collection: Iterable<[K, V]>): Collection.Keyed; (obj: { [key: string]: V_1; }): Collection.Keyed; } > : ^^^ ^^ ^^ ^^ ^^^ ^^^^^^^^ ^^ ^^^ ^^^ @@ -2532,7 +2532,7 @@ declare module Immutable { >iterator : unique symbol > : ^^^^^^^^^^^^^ } - export module Indexed {} + export namespace Indexed {} export function Indexed(collection: Iterable): Collection.Indexed; >Indexed : (collection: Iterable) => Collection.Indexed > : ^ ^^ ^^ ^^^^^ @@ -2775,7 +2775,7 @@ declare module Immutable { >iterator : unique symbol > : ^^^^^^^^^^^^^ } - export module Set {} + export namespace Set {} export function Set(collection: Iterable): Collection.Set; >Set : (collection: Iterable) => Collection.Set > : ^ ^^ ^^ ^^^^^ diff --git a/tests/baselines/reference/complicatedPrivacy.errors.txt b/tests/baselines/reference/complicatedPrivacy.errors.txt index 0131f5117a6f9..10fbd465c68bc 100644 --- a/tests/baselines/reference/complicatedPrivacy.errors.txt +++ b/tests/baselines/reference/complicatedPrivacy.errors.txt @@ -4,8 +4,8 @@ complicatedPrivacy.ts(73,55): error TS2694: Namespace 'mglo5' has no exported me ==== complicatedPrivacy.ts (3 errors) ==== - module m1 { - export module m2 { + namespace m1 { + export namespace m2 { export function f1(c1: C1) { @@ -51,7 +51,7 @@ complicatedPrivacy.ts(73,55): error TS2694: Namespace 'mglo5' has no exported me new (arg1: C1) : C1 }) { } - module m3 { + namespace m3 { function f2(f1: C1) { } @@ -77,8 +77,8 @@ complicatedPrivacy.ts(73,55): error TS2694: Namespace 'mglo5' has no exported me class C2 { } - module m2 { - export module m3 { + namespace m2 { + export namespace m3 { export class c_pr implements mglo5.i5, mglo5.i6 { ~~ @@ -88,12 +88,12 @@ complicatedPrivacy.ts(73,55): error TS2694: Namespace 'mglo5' has no exported me } } - module m4 { + namespace m4 { class C { } - module m5 { + namespace m5 { - export module m6 { + export namespace m6 { function f1() { return new C(); } @@ -104,7 +104,7 @@ complicatedPrivacy.ts(73,55): error TS2694: Namespace 'mglo5' has no exported me } } - module mglo5 { + namespace mglo5 { export interface i5 { f1(): string; } diff --git a/tests/baselines/reference/complicatedPrivacy.js b/tests/baselines/reference/complicatedPrivacy.js index f403b486cc2aa..0b8d56d8611c1 100644 --- a/tests/baselines/reference/complicatedPrivacy.js +++ b/tests/baselines/reference/complicatedPrivacy.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/complicatedPrivacy.ts] //// //// [complicatedPrivacy.ts] -module m1 { - export module m2 { +namespace m1 { + export namespace m2 { export function f1(c1: C1) { @@ -44,7 +44,7 @@ module m1 { new (arg1: C1) : C1 }) { } - module m3 { + namespace m3 { function f2(f1: C1) { } @@ -70,8 +70,8 @@ module m1 { class C2 { } -module m2 { - export module m3 { +namespace m2 { + export namespace m3 { export class c_pr implements mglo5.i5, mglo5.i6 { f1() { @@ -79,12 +79,12 @@ module m2 { } } - module m4 { + namespace m4 { class C { } - module m5 { + namespace m5 { - export module m6 { + export namespace m6 { function f1() { return new C(); } @@ -95,7 +95,7 @@ module m2 { } } -module mglo5 { +namespace mglo5 { export interface i5 { f1(): string; } diff --git a/tests/baselines/reference/complicatedPrivacy.symbols b/tests/baselines/reference/complicatedPrivacy.symbols index 3c06bdfa7c533..01708f27d7aa6 100644 --- a/tests/baselines/reference/complicatedPrivacy.symbols +++ b/tests/baselines/reference/complicatedPrivacy.symbols @@ -1,15 +1,15 @@ //// [tests/cases/compiler/complicatedPrivacy.ts] //// === complicatedPrivacy.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(complicatedPrivacy.ts, 0, 0)) - export module m2 { ->m2 : Symbol(m2, Decl(complicatedPrivacy.ts, 0, 11)) + export namespace m2 { +>m2 : Symbol(m2, Decl(complicatedPrivacy.ts, 0, 14)) export function f1(c1: C1) { ->f1 : Symbol(f1, Decl(complicatedPrivacy.ts, 1, 22)) +>f1 : Symbol(f1, Decl(complicatedPrivacy.ts, 1, 25)) >c1 : Symbol(c1, Decl(complicatedPrivacy.ts, 4, 27)) >C1 : Symbol(C1, Decl(complicatedPrivacy.ts, 50, 5)) } @@ -89,11 +89,11 @@ module m1 { }) { } - module m3 { + namespace m3 { >m3 : Symbol(m3, Decl(complicatedPrivacy.ts, 42, 5)) function f2(f1: C1) { ->f2 : Symbol(f2, Decl(complicatedPrivacy.ts, 43, 15)) +>f2 : Symbol(f2, Decl(complicatedPrivacy.ts, 43, 18)) >f1 : Symbol(f1, Decl(complicatedPrivacy.ts, 44, 20)) >C1 : Symbol(C1, Decl(complicatedPrivacy.ts, 50, 5)) } @@ -134,17 +134,17 @@ class C2 { >C2 : Symbol(C2, Decl(complicatedPrivacy.ts, 64, 1)) } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(complicatedPrivacy.ts, 67, 1)) - export module m3 { ->m3 : Symbol(m3, Decl(complicatedPrivacy.ts, 69, 11)) + export namespace m3 { +>m3 : Symbol(m3, Decl(complicatedPrivacy.ts, 69, 14)) export class c_pr implements mglo5.i5, mglo5.i6 { ->c_pr : Symbol(c_pr, Decl(complicatedPrivacy.ts, 70, 22)) ->mglo5.i5 : Symbol(mglo5.i5, Decl(complicatedPrivacy.ts, 94, 14)) +>c_pr : Symbol(c_pr, Decl(complicatedPrivacy.ts, 70, 25)) +>mglo5.i5 : Symbol(mglo5.i5, Decl(complicatedPrivacy.ts, 94, 17)) >mglo5 : Symbol(mglo5, Decl(complicatedPrivacy.ts, 92, 1)) ->i5 : Symbol(mglo5.i5, Decl(complicatedPrivacy.ts, 94, 14)) +>i5 : Symbol(mglo5.i5, Decl(complicatedPrivacy.ts, 94, 17)) >mglo5 : Symbol(mglo5, Decl(complicatedPrivacy.ts, 92, 1)) f1() { @@ -154,23 +154,23 @@ module m2 { } } - module m4 { + namespace m4 { >m4 : Symbol(m4, Decl(complicatedPrivacy.ts, 76, 9)) class C { ->C : Symbol(C, Decl(complicatedPrivacy.ts, 78, 19)) +>C : Symbol(C, Decl(complicatedPrivacy.ts, 78, 22)) } - module m5 { + namespace m5 { >m5 : Symbol(m5, Decl(complicatedPrivacy.ts, 80, 13)) - export module m6 { ->m6 : Symbol(m6, Decl(complicatedPrivacy.ts, 81, 23)) + export namespace m6 { +>m6 : Symbol(m6, Decl(complicatedPrivacy.ts, 81, 26)) function f1() { ->f1 : Symbol(f1, Decl(complicatedPrivacy.ts, 83, 34)) +>f1 : Symbol(f1, Decl(complicatedPrivacy.ts, 83, 37)) return new C(); ->C : Symbol(C, Decl(complicatedPrivacy.ts, 78, 19)) +>C : Symbol(C, Decl(complicatedPrivacy.ts, 78, 22)) } } } @@ -179,11 +179,11 @@ module m2 { } } -module mglo5 { +namespace mglo5 { >mglo5 : Symbol(mglo5, Decl(complicatedPrivacy.ts, 92, 1)) export interface i5 { ->i5 : Symbol(i5, Decl(complicatedPrivacy.ts, 94, 14)) +>i5 : Symbol(i5, Decl(complicatedPrivacy.ts, 94, 17)) f1(): string; >f1 : Symbol(i5.f1, Decl(complicatedPrivacy.ts, 95, 25)) diff --git a/tests/baselines/reference/complicatedPrivacy.types b/tests/baselines/reference/complicatedPrivacy.types index d0ff49fdceaa8..d82db62bcd99d 100644 --- a/tests/baselines/reference/complicatedPrivacy.types +++ b/tests/baselines/reference/complicatedPrivacy.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/complicatedPrivacy.ts] //// === complicatedPrivacy.ts === -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ - export module m2 { + export namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -111,7 +111,7 @@ module m1 { }) { } - module m3 { + namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ @@ -159,11 +159,11 @@ class C2 { > : ^^ } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ - export module m3 { + export namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ @@ -185,7 +185,7 @@ module m2 { } } - module m4 { + namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ @@ -193,11 +193,11 @@ module m2 { >C : C > : ^ } - module m5 { + namespace m5 { >m5 : typeof m5 > : ^^^^^^^^^ - export module m6 { + export namespace m6 { >m6 : typeof m6 > : ^^^^^^^^^ @@ -218,7 +218,7 @@ module m2 { } } -module mglo5 { +namespace mglo5 { export interface i5 { f1(): string; >f1 : () => string diff --git a/tests/baselines/reference/compoundAssignmentLHSIsValue.errors.txt b/tests/baselines/reference/compoundAssignmentLHSIsValue.errors.txt index 336d069206d36..329b9a26d48e3 100644 --- a/tests/baselines/reference/compoundAssignmentLHSIsValue.errors.txt +++ b/tests/baselines/reference/compoundAssignmentLHSIsValue.errors.txt @@ -125,7 +125,7 @@ compoundAssignmentLHSIsValue.ts(122,1): error TS2364: The left-hand side of an a !!! error TS2364: The left-hand side of an assignment expression must be a variable or a property access. // identifiers: module, class, enum, function - module M { export var a; } + namespace M { export var a; } M *= value; ~ !!! error TS2631: Cannot assign to 'M' because it is a namespace. diff --git a/tests/baselines/reference/compoundAssignmentLHSIsValue.js b/tests/baselines/reference/compoundAssignmentLHSIsValue.js index 9f6f502a05ca5..a803b44f0430e 100644 --- a/tests/baselines/reference/compoundAssignmentLHSIsValue.js +++ b/tests/baselines/reference/compoundAssignmentLHSIsValue.js @@ -29,7 +29,7 @@ this *= value; this += value; // identifiers: module, class, enum, function -module M { export var a; } +namespace M { export var a; } M *= value; M += value; diff --git a/tests/baselines/reference/compoundAssignmentLHSIsValue.symbols b/tests/baselines/reference/compoundAssignmentLHSIsValue.symbols index 8650b6e36583c..b3b3984a317d6 100644 --- a/tests/baselines/reference/compoundAssignmentLHSIsValue.symbols +++ b/tests/baselines/reference/compoundAssignmentLHSIsValue.symbols @@ -61,9 +61,9 @@ this += value; >value : Symbol(value, Decl(compoundAssignmentLHSIsValue.ts, 1, 3)) // identifiers: module, class, enum, function -module M { export var a; } +namespace M { export var a; } >M : Symbol(M, Decl(compoundAssignmentLHSIsValue.ts, 25, 14)) ->a : Symbol(a, Decl(compoundAssignmentLHSIsValue.ts, 28, 21)) +>a : Symbol(a, Decl(compoundAssignmentLHSIsValue.ts, 28, 24)) M *= value; >M : Symbol(M, Decl(compoundAssignmentLHSIsValue.ts, 25, 14)) diff --git a/tests/baselines/reference/compoundAssignmentLHSIsValue.types b/tests/baselines/reference/compoundAssignmentLHSIsValue.types index 186e83033ebc5..f0af86d23bd28 100644 --- a/tests/baselines/reference/compoundAssignmentLHSIsValue.types +++ b/tests/baselines/reference/compoundAssignmentLHSIsValue.types @@ -108,7 +108,7 @@ this += value; > : ^^^ // identifiers: module, class, enum, function -module M { export var a; } +namespace M { export var a; } >M : typeof M > : ^^^^^^^^ >a : any diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.errors.txt b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.errors.txt index cbb314d00cbef..fce7cd5bfe7e9 100644 --- a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.errors.txt +++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.errors.txt @@ -73,7 +73,7 @@ compoundExponentiationAssignmentLHSIsValue.ts(85,1): error TS2362: The left-hand !!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type. // identifiers: module, class, enum, function - module M { export var a; } + namespace M { export var a; } M **= value; ~ !!! error TS2631: Cannot assign to 'M' because it is a namespace. diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js index b6b07e6b08cd6..525cead33faef 100644 --- a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js +++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js @@ -24,7 +24,7 @@ function foo() { this **= value; // identifiers: module, class, enum, function -module M { export var a; } +namespace M { export var a; } M **= value; C **= value; diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.symbols b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.symbols index 10798be83f9c3..d61f02b39c94e 100644 --- a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.symbols +++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.symbols @@ -42,9 +42,9 @@ this **= value; >value : Symbol(value, Decl(compoundExponentiationAssignmentLHSIsValue.ts, 1, 3)) // identifiers: module, class, enum, function -module M { export var a; } +namespace M { export var a; } >M : Symbol(M, Decl(compoundExponentiationAssignmentLHSIsValue.ts, 20, 15)) ->a : Symbol(a, Decl(compoundExponentiationAssignmentLHSIsValue.ts, 23, 21)) +>a : Symbol(a, Decl(compoundExponentiationAssignmentLHSIsValue.ts, 23, 24)) M **= value; >M : Symbol(M, Decl(compoundExponentiationAssignmentLHSIsValue.ts, 20, 15)) diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.types b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.types index 22f818932bfe2..066a506516f4d 100644 --- a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.types +++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.types @@ -68,7 +68,7 @@ this **= value; > : ^^^ // identifiers: module, class, enum, function -module M { export var a; } +namespace M { export var a; } >M : typeof M > : ^^^^^^^^ >a : any diff --git a/tests/baselines/reference/compoundVarDecl1.js b/tests/baselines/reference/compoundVarDecl1.js index f8a8a664cbd75..1b9992d5f5355 100644 --- a/tests/baselines/reference/compoundVarDecl1.js +++ b/tests/baselines/reference/compoundVarDecl1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/compoundVarDecl1.ts] //// //// [compoundVarDecl1.ts] -module Foo { var a = 1, b = 1; a = b + 2; } +namespace Foo { var a = 1, b = 1; a = b + 2; } var foo = 4, bar = 5; diff --git a/tests/baselines/reference/compoundVarDecl1.symbols b/tests/baselines/reference/compoundVarDecl1.symbols index 8c4dde2f4e52e..1233f47d1f9d8 100644 --- a/tests/baselines/reference/compoundVarDecl1.symbols +++ b/tests/baselines/reference/compoundVarDecl1.symbols @@ -1,12 +1,12 @@ //// [tests/cases/compiler/compoundVarDecl1.ts] //// === compoundVarDecl1.ts === -module Foo { var a = 1, b = 1; a = b + 2; } +namespace Foo { var a = 1, b = 1; a = b + 2; } >Foo : Symbol(Foo, Decl(compoundVarDecl1.ts, 0, 0)) ->a : Symbol(a, Decl(compoundVarDecl1.ts, 0, 16)) ->b : Symbol(b, Decl(compoundVarDecl1.ts, 0, 23)) ->a : Symbol(a, Decl(compoundVarDecl1.ts, 0, 16)) ->b : Symbol(b, Decl(compoundVarDecl1.ts, 0, 23)) +>a : Symbol(a, Decl(compoundVarDecl1.ts, 0, 19)) +>b : Symbol(b, Decl(compoundVarDecl1.ts, 0, 26)) +>a : Symbol(a, Decl(compoundVarDecl1.ts, 0, 19)) +>b : Symbol(b, Decl(compoundVarDecl1.ts, 0, 26)) var foo = 4, bar = 5; >foo : Symbol(foo, Decl(compoundVarDecl1.ts, 2, 3)) diff --git a/tests/baselines/reference/compoundVarDecl1.types b/tests/baselines/reference/compoundVarDecl1.types index d65cbdad8500f..9df70e56a3850 100644 --- a/tests/baselines/reference/compoundVarDecl1.types +++ b/tests/baselines/reference/compoundVarDecl1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/compoundVarDecl1.ts] //// === compoundVarDecl1.ts === -module Foo { var a = 1, b = 1; a = b + 2; } +namespace Foo { var a = 1, b = 1; a = b + 2; } >Foo : typeof Foo > : ^^^^^^^^^^ >a : number diff --git a/tests/baselines/reference/computedPropertyNames19_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames19_ES5.errors.txt index b6dae2c235231..b5b9ae897a980 100644 --- a/tests/baselines/reference/computedPropertyNames19_ES5.errors.txt +++ b/tests/baselines/reference/computedPropertyNames19_ES5.errors.txt @@ -2,7 +2,7 @@ computedPropertyNames19_ES5.ts(3,10): error TS2331: 'this' cannot be referenced ==== computedPropertyNames19_ES5.ts (1 errors) ==== - module M { + namespace M { var obj = { [this.bar]: 0 ~~~~ diff --git a/tests/baselines/reference/computedPropertyNames19_ES5.js b/tests/baselines/reference/computedPropertyNames19_ES5.js index a61c8a24d5a8c..f100c749eb00c 100644 --- a/tests/baselines/reference/computedPropertyNames19_ES5.js +++ b/tests/baselines/reference/computedPropertyNames19_ES5.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES5.ts] //// //// [computedPropertyNames19_ES5.ts] -module M { +namespace M { var obj = { [this.bar]: 0 } diff --git a/tests/baselines/reference/computedPropertyNames19_ES5.symbols b/tests/baselines/reference/computedPropertyNames19_ES5.symbols index 368cbb45de665..fd66440b91c35 100644 --- a/tests/baselines/reference/computedPropertyNames19_ES5.symbols +++ b/tests/baselines/reference/computedPropertyNames19_ES5.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES5.ts] //// === computedPropertyNames19_ES5.ts === -module M { +namespace M { >M : Symbol(M, Decl(computedPropertyNames19_ES5.ts, 0, 0)) var obj = { diff --git a/tests/baselines/reference/computedPropertyNames19_ES5.types b/tests/baselines/reference/computedPropertyNames19_ES5.types index 1c9aca4d5c1b3..b3013a60d8eb2 100644 --- a/tests/baselines/reference/computedPropertyNames19_ES5.types +++ b/tests/baselines/reference/computedPropertyNames19_ES5.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES5.ts] //// === computedPropertyNames19_ES5.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/computedPropertyNames19_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames19_ES6.errors.txt index aa8cf71340f99..7155a3c3fb3a8 100644 --- a/tests/baselines/reference/computedPropertyNames19_ES6.errors.txt +++ b/tests/baselines/reference/computedPropertyNames19_ES6.errors.txt @@ -2,7 +2,7 @@ computedPropertyNames19_ES6.ts(3,10): error TS2331: 'this' cannot be referenced ==== computedPropertyNames19_ES6.ts (1 errors) ==== - module M { + namespace M { var obj = { [this.bar]: 0 ~~~~ diff --git a/tests/baselines/reference/computedPropertyNames19_ES6.js b/tests/baselines/reference/computedPropertyNames19_ES6.js index 61ddb687ae171..d604ea36c3f53 100644 --- a/tests/baselines/reference/computedPropertyNames19_ES6.js +++ b/tests/baselines/reference/computedPropertyNames19_ES6.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES6.ts] //// //// [computedPropertyNames19_ES6.ts] -module M { +namespace M { var obj = { [this.bar]: 0 } diff --git a/tests/baselines/reference/computedPropertyNames19_ES6.symbols b/tests/baselines/reference/computedPropertyNames19_ES6.symbols index 60c70da5b05ce..37741342d39a1 100644 --- a/tests/baselines/reference/computedPropertyNames19_ES6.symbols +++ b/tests/baselines/reference/computedPropertyNames19_ES6.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES6.ts] //// === computedPropertyNames19_ES6.ts === -module M { +namespace M { >M : Symbol(M, Decl(computedPropertyNames19_ES6.ts, 0, 0)) var obj = { diff --git a/tests/baselines/reference/computedPropertyNames19_ES6.types b/tests/baselines/reference/computedPropertyNames19_ES6.types index 1636d55200943..654fc1edf0e9a 100644 --- a/tests/baselines/reference/computedPropertyNames19_ES6.types +++ b/tests/baselines/reference/computedPropertyNames19_ES6.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES6.ts] //// === computedPropertyNames19_ES6.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/constDeclarations-access3.errors.txt b/tests/baselines/reference/constDeclarations-access3.errors.txt index a6265f7d63670..c52880fe7ed2f 100644 --- a/tests/baselines/reference/constDeclarations-access3.errors.txt +++ b/tests/baselines/reference/constDeclarations-access3.errors.txt @@ -19,7 +19,7 @@ constDeclarations-access3.ts(26,3): error TS2540: Cannot assign to 'x' because i ==== constDeclarations-access3.ts (18 errors) ==== - module M { + namespace M { export const x = 0; } diff --git a/tests/baselines/reference/constDeclarations-access3.js b/tests/baselines/reference/constDeclarations-access3.js index a5a01b6dbad65..a6f967bb8cd06 100644 --- a/tests/baselines/reference/constDeclarations-access3.js +++ b/tests/baselines/reference/constDeclarations-access3.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/constDeclarations-access3.ts] //// //// [constDeclarations-access3.ts] -module M { +namespace M { export const x = 0; } diff --git a/tests/baselines/reference/constDeclarations-access3.symbols b/tests/baselines/reference/constDeclarations-access3.symbols index 627a56d2d5e17..f1e837089ffba 100644 --- a/tests/baselines/reference/constDeclarations-access3.symbols +++ b/tests/baselines/reference/constDeclarations-access3.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/constDeclarations-access3.ts] //// === constDeclarations-access3.ts === -module M { +namespace M { >M : Symbol(M, Decl(constDeclarations-access3.ts, 0, 0)) export const x = 0; diff --git a/tests/baselines/reference/constDeclarations-access3.types b/tests/baselines/reference/constDeclarations-access3.types index 78061b4268fa0..86c661869cfc4 100644 --- a/tests/baselines/reference/constDeclarations-access3.types +++ b/tests/baselines/reference/constDeclarations-access3.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/constDeclarations-access3.ts] //// === constDeclarations-access3.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/constDeclarations-access4.errors.txt b/tests/baselines/reference/constDeclarations-access4.errors.txt index c1cd937f6e679..a1fcb44423593 100644 --- a/tests/baselines/reference/constDeclarations-access4.errors.txt +++ b/tests/baselines/reference/constDeclarations-access4.errors.txt @@ -19,7 +19,7 @@ constDeclarations-access4.ts(26,3): error TS2540: Cannot assign to 'x' because i ==== constDeclarations-access4.ts (18 errors) ==== - declare module M { + declare namespace M { const x: number; } diff --git a/tests/baselines/reference/constDeclarations-access4.js b/tests/baselines/reference/constDeclarations-access4.js index 1032e368b0e4c..1cfd9e19262c1 100644 --- a/tests/baselines/reference/constDeclarations-access4.js +++ b/tests/baselines/reference/constDeclarations-access4.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/constDeclarations-access4.ts] //// //// [constDeclarations-access4.ts] -declare module M { +declare namespace M { const x: number; } diff --git a/tests/baselines/reference/constDeclarations-access4.symbols b/tests/baselines/reference/constDeclarations-access4.symbols index ed22cde08e29e..bb6e045eb4f06 100644 --- a/tests/baselines/reference/constDeclarations-access4.symbols +++ b/tests/baselines/reference/constDeclarations-access4.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/constDeclarations-access4.ts] //// === constDeclarations-access4.ts === -declare module M { +declare namespace M { >M : Symbol(M, Decl(constDeclarations-access4.ts, 0, 0)) const x: number; diff --git a/tests/baselines/reference/constDeclarations-access4.types b/tests/baselines/reference/constDeclarations-access4.types index 54064b5a8599e..87393189ab2e4 100644 --- a/tests/baselines/reference/constDeclarations-access4.types +++ b/tests/baselines/reference/constDeclarations-access4.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/constDeclarations-access4.ts] //// === constDeclarations-access4.ts === -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/constDeclarations-ambient-errors.errors.txt b/tests/baselines/reference/constDeclarations-ambient-errors.errors.txt index c9aa397371737..ceaa5e8cde427 100644 --- a/tests/baselines/reference/constDeclarations-ambient-errors.errors.txt +++ b/tests/baselines/reference/constDeclarations-ambient-errors.errors.txt @@ -22,7 +22,7 @@ constDeclarations-ambient-errors.ts(8,24): error TS1039: Initializers are not al ~ !!! error TS1039: Initializers are not allowed in ambient contexts. - declare module M { + declare namespace M { const c6 = 0; const c7: number = 7; ~ diff --git a/tests/baselines/reference/constDeclarations-ambient-errors.js b/tests/baselines/reference/constDeclarations-ambient-errors.js index c05eda9bba7ec..a1ded5492565b 100644 --- a/tests/baselines/reference/constDeclarations-ambient-errors.js +++ b/tests/baselines/reference/constDeclarations-ambient-errors.js @@ -6,7 +6,7 @@ declare const c1: boolean = true; declare const c2: number = 0; declare const c3 = null, c4 :string = "", c5: any = 0; -declare module M { +declare namespace M { const c6 = 0; const c7: number = 7; } diff --git a/tests/baselines/reference/constDeclarations-ambient-errors.symbols b/tests/baselines/reference/constDeclarations-ambient-errors.symbols index 68d9bed8ce792..dab90a4e5f641 100644 --- a/tests/baselines/reference/constDeclarations-ambient-errors.symbols +++ b/tests/baselines/reference/constDeclarations-ambient-errors.symbols @@ -13,7 +13,7 @@ declare const c3 = null, c4 :string = "", c5: any = 0; >c4 : Symbol(c4, Decl(constDeclarations-ambient-errors.ts, 3, 24)) >c5 : Symbol(c5, Decl(constDeclarations-ambient-errors.ts, 3, 41)) -declare module M { +declare namespace M { >M : Symbol(M, Decl(constDeclarations-ambient-errors.ts, 3, 54)) const c6 = 0; diff --git a/tests/baselines/reference/constDeclarations-ambient-errors.types b/tests/baselines/reference/constDeclarations-ambient-errors.types index bad179053eb85..0df7869b51627 100644 --- a/tests/baselines/reference/constDeclarations-ambient-errors.types +++ b/tests/baselines/reference/constDeclarations-ambient-errors.types @@ -26,7 +26,7 @@ declare const c3 = null, c4 :string = "", c5: any = 0; >0 : 0 > : ^ -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/constDeclarations-ambient.js b/tests/baselines/reference/constDeclarations-ambient.js index c5a523f7bc3ca..92b46de553337 100644 --- a/tests/baselines/reference/constDeclarations-ambient.js +++ b/tests/baselines/reference/constDeclarations-ambient.js @@ -6,7 +6,7 @@ declare const c1: boolean; declare const c2: number; declare const c3, c4 :string, c5: any; -declare module M { +declare namespace M { const c6; const c7: number; } diff --git a/tests/baselines/reference/constDeclarations-ambient.symbols b/tests/baselines/reference/constDeclarations-ambient.symbols index 6048f44d5fd1a..c96e97df74607 100644 --- a/tests/baselines/reference/constDeclarations-ambient.symbols +++ b/tests/baselines/reference/constDeclarations-ambient.symbols @@ -13,7 +13,7 @@ declare const c3, c4 :string, c5: any; >c4 : Symbol(c4, Decl(constDeclarations-ambient.ts, 3, 17)) >c5 : Symbol(c5, Decl(constDeclarations-ambient.ts, 3, 29)) -declare module M { +declare namespace M { >M : Symbol(M, Decl(constDeclarations-ambient.ts, 3, 38)) const c6; diff --git a/tests/baselines/reference/constDeclarations-ambient.types b/tests/baselines/reference/constDeclarations-ambient.types index 78482ac1661b8..290ce7adeeaea 100644 --- a/tests/baselines/reference/constDeclarations-ambient.types +++ b/tests/baselines/reference/constDeclarations-ambient.types @@ -16,7 +16,7 @@ declare const c3, c4 :string, c5: any; > : ^^^^^^ >c5 : any -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/constDeclarations-scopes.errors.txt b/tests/baselines/reference/constDeclarations-scopes.errors.txt index 9e20946833e59..a715ebc860a44 100644 --- a/tests/baselines/reference/constDeclarations-scopes.errors.txt +++ b/tests/baselines/reference/constDeclarations-scopes.errors.txt @@ -105,7 +105,7 @@ constDeclarations-scopes.ts(27,1): error TS2410: The 'with' statement is not sup }; // modules - module m { + namespace m { const c = 0; n = c; diff --git a/tests/baselines/reference/constDeclarations-scopes.js b/tests/baselines/reference/constDeclarations-scopes.js index 9c728bfc81785..b7fbe9021102f 100644 --- a/tests/baselines/reference/constDeclarations-scopes.js +++ b/tests/baselines/reference/constDeclarations-scopes.js @@ -102,7 +102,7 @@ var F3 = function () { }; // modules -module m { +namespace m { const c = 0; n = c; diff --git a/tests/baselines/reference/constDeclarations-scopes.symbols b/tests/baselines/reference/constDeclarations-scopes.symbols index 661cace4d9209..6093e1a4ada4b 100644 --- a/tests/baselines/reference/constDeclarations-scopes.symbols +++ b/tests/baselines/reference/constDeclarations-scopes.symbols @@ -194,7 +194,7 @@ var F3 = function () { }; // modules -module m { +namespace m { >m : Symbol(m, Decl(constDeclarations-scopes.ts, 98, 2)) const c = 0; diff --git a/tests/baselines/reference/constDeclarations-scopes.types b/tests/baselines/reference/constDeclarations-scopes.types index 34f879f04a189..78aa5573412bc 100644 --- a/tests/baselines/reference/constDeclarations-scopes.types +++ b/tests/baselines/reference/constDeclarations-scopes.types @@ -378,7 +378,7 @@ var F3 = function () { }; // modules -module m { +namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/constDeclarations-validContexts.errors.txt b/tests/baselines/reference/constDeclarations-validContexts.errors.txt index 35f0f8b777163..ea2262681bf38 100644 --- a/tests/baselines/reference/constDeclarations-validContexts.errors.txt +++ b/tests/baselines/reference/constDeclarations-validContexts.errors.txt @@ -88,7 +88,7 @@ constDeclarations-validContexts.ts(18,1): error TS2410: The 'with' statement is }; // modules - module m { + namespace m { const c22 = 0; { diff --git a/tests/baselines/reference/constDeclarations-validContexts.js b/tests/baselines/reference/constDeclarations-validContexts.js index 0d42323e7d94a..138e4828780c8 100644 --- a/tests/baselines/reference/constDeclarations-validContexts.js +++ b/tests/baselines/reference/constDeclarations-validContexts.js @@ -85,7 +85,7 @@ var F3 = function () { }; // modules -module m { +namespace m { const c22 = 0; { diff --git a/tests/baselines/reference/constDeclarations-validContexts.symbols b/tests/baselines/reference/constDeclarations-validContexts.symbols index 59b8b07835e77..3496aabc5bb02 100644 --- a/tests/baselines/reference/constDeclarations-validContexts.symbols +++ b/tests/baselines/reference/constDeclarations-validContexts.symbols @@ -129,7 +129,7 @@ var F3 = function () { }; // modules -module m { +namespace m { >m : Symbol(m, Decl(constDeclarations-validContexts.ts, 81, 2)) const c22 = 0; diff --git a/tests/baselines/reference/constDeclarations-validContexts.types b/tests/baselines/reference/constDeclarations-validContexts.types index dfeaff20664f9..7ca9c9b2f2dd3 100644 --- a/tests/baselines/reference/constDeclarations-validContexts.types +++ b/tests/baselines/reference/constDeclarations-validContexts.types @@ -247,7 +247,7 @@ var F3 = function () { }; // modules -module m { +namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/constDeclarations2.js b/tests/baselines/reference/constDeclarations2.js index e870d7dcc99a8..f95a4755c655a 100644 --- a/tests/baselines/reference/constDeclarations2.js +++ b/tests/baselines/reference/constDeclarations2.js @@ -2,7 +2,7 @@ //// [constDeclarations2.ts] // No error -module M { +namespace M { export const c1 = false; export const c2: number = 23; export const c3 = 0, c4 :string = "", c5 = null; diff --git a/tests/baselines/reference/constDeclarations2.symbols b/tests/baselines/reference/constDeclarations2.symbols index 746f5854163cf..12496ffc41db6 100644 --- a/tests/baselines/reference/constDeclarations2.symbols +++ b/tests/baselines/reference/constDeclarations2.symbols @@ -2,7 +2,7 @@ === constDeclarations2.ts === // No error -module M { +namespace M { >M : Symbol(M, Decl(constDeclarations2.ts, 0, 0)) export const c1 = false; diff --git a/tests/baselines/reference/constDeclarations2.types b/tests/baselines/reference/constDeclarations2.types index 8a0e3d877f6df..872682c3f60d4 100644 --- a/tests/baselines/reference/constDeclarations2.types +++ b/tests/baselines/reference/constDeclarations2.types @@ -2,7 +2,7 @@ === constDeclarations2.ts === // No error -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/constEnumErrors.errors.txt b/tests/baselines/reference/constEnumErrors.errors.txt index 9c5eb5e7fa219..e02d569b52c84 100644 --- a/tests/baselines/reference/constEnumErrors.errors.txt +++ b/tests/baselines/reference/constEnumErrors.errors.txt @@ -1,5 +1,5 @@ constEnumErrors.ts(1,12): error TS2567: Enum declarations can only merge with namespace or other enum declarations. -constEnumErrors.ts(5,8): error TS2567: Enum declarations can only merge with namespace or other enum declarations. +constEnumErrors.ts(5,11): error TS2567: Enum declarations can only merge with namespace or other enum declarations. constEnumErrors.ts(12,9): error TS2651: A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums. constEnumErrors.ts(14,9): error TS2474: const enum member initializers must be constant expressions. constEnumErrors.ts(14,12): error TS2339: Property 'Z' does not exist on type 'typeof E1'. @@ -23,8 +23,8 @@ constEnumErrors.ts(43,9): error TS2478: 'const' enum member initializer was eval A } - module E { - ~ + namespace E { + ~ !!! error TS2567: Enum declarations can only merge with namespace or other enum declarations. var x = 1; } diff --git a/tests/baselines/reference/constEnumErrors.js b/tests/baselines/reference/constEnumErrors.js index de6677aaa4d4e..b5e89e328c373 100644 --- a/tests/baselines/reference/constEnumErrors.js +++ b/tests/baselines/reference/constEnumErrors.js @@ -5,7 +5,7 @@ const enum E { A } -module E { +namespace E { var x = 1; } diff --git a/tests/baselines/reference/constEnumErrors.symbols b/tests/baselines/reference/constEnumErrors.symbols index 7834f22be0a80..fc0456f60005a 100644 --- a/tests/baselines/reference/constEnumErrors.symbols +++ b/tests/baselines/reference/constEnumErrors.symbols @@ -8,7 +8,7 @@ const enum E { >A : Symbol(E.A, Decl(constEnumErrors.ts, 0, 14)) } -module E { +namespace E { >E : Symbol(E, Decl(constEnumErrors.ts, 2, 1)) var x = 1; diff --git a/tests/baselines/reference/constEnumErrors.types b/tests/baselines/reference/constEnumErrors.types index 3c1b64ca3c5ca..16e321b7206d6 100644 --- a/tests/baselines/reference/constEnumErrors.types +++ b/tests/baselines/reference/constEnumErrors.types @@ -10,7 +10,7 @@ const enum E { > : ^^^ } -module E { +namespace E { >E : typeof E > : ^^^^^^^^ diff --git a/tests/baselines/reference/constEnumMergingWithValues1.js b/tests/baselines/reference/constEnumMergingWithValues1.js index 4f79e90ef971d..b1d46d4b07e96 100644 --- a/tests/baselines/reference/constEnumMergingWithValues1.js +++ b/tests/baselines/reference/constEnumMergingWithValues1.js @@ -2,7 +2,7 @@ //// [m1.ts] function foo() {} -module foo { +namespace foo { const enum E { X } } diff --git a/tests/baselines/reference/constEnumMergingWithValues1.symbols b/tests/baselines/reference/constEnumMergingWithValues1.symbols index 660c5cd868c74..3dbda36c0c1dc 100644 --- a/tests/baselines/reference/constEnumMergingWithValues1.symbols +++ b/tests/baselines/reference/constEnumMergingWithValues1.symbols @@ -4,11 +4,11 @@ function foo() {} >foo : Symbol(foo, Decl(m1.ts, 0, 0), Decl(m1.ts, 0, 17)) -module foo { +namespace foo { >foo : Symbol(foo, Decl(m1.ts, 0, 0), Decl(m1.ts, 0, 17)) const enum E { X } ->E : Symbol(E, Decl(m1.ts, 1, 12)) +>E : Symbol(E, Decl(m1.ts, 1, 15)) >X : Symbol(E.X, Decl(m1.ts, 2, 18)) } diff --git a/tests/baselines/reference/constEnumMergingWithValues1.types b/tests/baselines/reference/constEnumMergingWithValues1.types index c7ef943ed57f8..fadcfc75d3587 100644 --- a/tests/baselines/reference/constEnumMergingWithValues1.types +++ b/tests/baselines/reference/constEnumMergingWithValues1.types @@ -5,7 +5,7 @@ function foo() {} >foo : typeof foo > : ^^^^^^^^^^ -module foo { +namespace foo { const enum E { X } >E : E > : ^ diff --git a/tests/baselines/reference/constEnumMergingWithValues2.js b/tests/baselines/reference/constEnumMergingWithValues2.js index eeb2971a79fbb..05169e1f8f3d4 100644 --- a/tests/baselines/reference/constEnumMergingWithValues2.js +++ b/tests/baselines/reference/constEnumMergingWithValues2.js @@ -2,7 +2,7 @@ //// [m1.ts] class foo {} -module foo { +namespace foo { const enum E { X } } diff --git a/tests/baselines/reference/constEnumMergingWithValues2.symbols b/tests/baselines/reference/constEnumMergingWithValues2.symbols index abd9518e9f78e..0c1fc623dec6b 100644 --- a/tests/baselines/reference/constEnumMergingWithValues2.symbols +++ b/tests/baselines/reference/constEnumMergingWithValues2.symbols @@ -4,11 +4,11 @@ class foo {} >foo : Symbol(foo, Decl(m1.ts, 0, 0), Decl(m1.ts, 0, 12)) -module foo { +namespace foo { >foo : Symbol(foo, Decl(m1.ts, 0, 0), Decl(m1.ts, 0, 12)) const enum E { X } ->E : Symbol(E, Decl(m1.ts, 1, 12)) +>E : Symbol(E, Decl(m1.ts, 1, 15)) >X : Symbol(E.X, Decl(m1.ts, 2, 18)) } diff --git a/tests/baselines/reference/constEnumMergingWithValues2.types b/tests/baselines/reference/constEnumMergingWithValues2.types index bd9ee140fb34e..3da7d3776820d 100644 --- a/tests/baselines/reference/constEnumMergingWithValues2.types +++ b/tests/baselines/reference/constEnumMergingWithValues2.types @@ -5,7 +5,7 @@ class foo {} >foo : foo > : ^^^ -module foo { +namespace foo { const enum E { X } >E : E > : ^ diff --git a/tests/baselines/reference/constEnumMergingWithValues3.js b/tests/baselines/reference/constEnumMergingWithValues3.js index e62efaeb72f17..d30e619319e6c 100644 --- a/tests/baselines/reference/constEnumMergingWithValues3.js +++ b/tests/baselines/reference/constEnumMergingWithValues3.js @@ -2,7 +2,7 @@ //// [m1.ts] enum foo { A } -module foo { +namespace foo { const enum E { X } } diff --git a/tests/baselines/reference/constEnumMergingWithValues3.symbols b/tests/baselines/reference/constEnumMergingWithValues3.symbols index cd47f31d2e91e..07114431ddf8d 100644 --- a/tests/baselines/reference/constEnumMergingWithValues3.symbols +++ b/tests/baselines/reference/constEnumMergingWithValues3.symbols @@ -5,11 +5,11 @@ enum foo { A } >foo : Symbol(foo, Decl(m1.ts, 0, 0), Decl(m1.ts, 0, 14)) >A : Symbol(foo.A, Decl(m1.ts, 0, 10)) -module foo { +namespace foo { >foo : Symbol(foo, Decl(m1.ts, 0, 0), Decl(m1.ts, 0, 14)) const enum E { X } ->E : Symbol(E, Decl(m1.ts, 1, 12)) +>E : Symbol(E, Decl(m1.ts, 1, 15)) >X : Symbol(E.X, Decl(m1.ts, 2, 18)) } diff --git a/tests/baselines/reference/constEnumMergingWithValues3.types b/tests/baselines/reference/constEnumMergingWithValues3.types index b5a54a76c06a4..798053424bef4 100644 --- a/tests/baselines/reference/constEnumMergingWithValues3.types +++ b/tests/baselines/reference/constEnumMergingWithValues3.types @@ -7,7 +7,7 @@ enum foo { A } >A : foo.A > : ^^^^^ -module foo { +namespace foo { const enum E { X } >E : E > : ^ diff --git a/tests/baselines/reference/constEnumMergingWithValues4.js b/tests/baselines/reference/constEnumMergingWithValues4.js index 6156fd0e4dfb6..867a967b5d099 100644 --- a/tests/baselines/reference/constEnumMergingWithValues4.js +++ b/tests/baselines/reference/constEnumMergingWithValues4.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/constEnumMergingWithValues4.ts] //// //// [m1.ts] -module foo { +namespace foo { const enum E { X } } -module foo { +namespace foo { var x = 1; } diff --git a/tests/baselines/reference/constEnumMergingWithValues4.symbols b/tests/baselines/reference/constEnumMergingWithValues4.symbols index 7de15036e3520..fbfe492e87c79 100644 --- a/tests/baselines/reference/constEnumMergingWithValues4.symbols +++ b/tests/baselines/reference/constEnumMergingWithValues4.symbols @@ -1,15 +1,15 @@ //// [tests/cases/compiler/constEnumMergingWithValues4.ts] //// === m1.ts === -module foo { +namespace foo { >foo : Symbol(foo, Decl(m1.ts, 0, 0), Decl(m1.ts, 2, 1)) const enum E { X } ->E : Symbol(E, Decl(m1.ts, 0, 12)) +>E : Symbol(E, Decl(m1.ts, 0, 15)) >X : Symbol(E.X, Decl(m1.ts, 1, 18)) } -module foo { +namespace foo { >foo : Symbol(foo, Decl(m1.ts, 0, 0), Decl(m1.ts, 2, 1)) var x = 1; diff --git a/tests/baselines/reference/constEnumMergingWithValues4.types b/tests/baselines/reference/constEnumMergingWithValues4.types index 383a7d7d9bb30..1f88c69a20148 100644 --- a/tests/baselines/reference/constEnumMergingWithValues4.types +++ b/tests/baselines/reference/constEnumMergingWithValues4.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/constEnumMergingWithValues4.ts] //// === m1.ts === -module foo { +namespace foo { const enum E { X } >E : E > : ^ @@ -9,7 +9,7 @@ module foo { > : ^^^ } -module foo { +namespace foo { >foo : typeof foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/constEnumMergingWithValues5.js b/tests/baselines/reference/constEnumMergingWithValues5.js index 93158fb30c1ce..c8816a7acf6e8 100644 --- a/tests/baselines/reference/constEnumMergingWithValues5.js +++ b/tests/baselines/reference/constEnumMergingWithValues5.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/constEnumMergingWithValues5.ts] //// //// [m1.ts] -module foo { +namespace foo { const enum E { X } } diff --git a/tests/baselines/reference/constEnumMergingWithValues5.symbols b/tests/baselines/reference/constEnumMergingWithValues5.symbols index 067337052b861..78ec7648311e3 100644 --- a/tests/baselines/reference/constEnumMergingWithValues5.symbols +++ b/tests/baselines/reference/constEnumMergingWithValues5.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/constEnumMergingWithValues5.ts] //// === m1.ts === -module foo { +namespace foo { >foo : Symbol(foo, Decl(m1.ts, 0, 0)) const enum E { X } ->E : Symbol(E, Decl(m1.ts, 0, 12)) +>E : Symbol(E, Decl(m1.ts, 0, 15)) >X : Symbol(E.X, Decl(m1.ts, 1, 18)) } diff --git a/tests/baselines/reference/constEnumMergingWithValues5.types b/tests/baselines/reference/constEnumMergingWithValues5.types index 18b4b276bc4a5..d573ee89d1d00 100644 --- a/tests/baselines/reference/constEnumMergingWithValues5.types +++ b/tests/baselines/reference/constEnumMergingWithValues5.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/constEnumMergingWithValues5.ts] //// === m1.ts === -module foo { +namespace foo { const enum E { X } >E : E > : ^ diff --git a/tests/baselines/reference/constEnumNamespaceReferenceCausesNoImport2.js b/tests/baselines/reference/constEnumNamespaceReferenceCausesNoImport2.js index 9c6a8d82164ec..518f0c19e6adc 100644 --- a/tests/baselines/reference/constEnumNamespaceReferenceCausesNoImport2.js +++ b/tests/baselines/reference/constEnumNamespaceReferenceCausesNoImport2.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/constEnumNamespaceReferenceCausesNoImport2.ts] //// //// [foo.ts] -export module ConstEnumOnlyModule { +export namespace ConstEnumOnlyModule { export const enum ConstFooEnum { Some, Values, diff --git a/tests/baselines/reference/constEnumOnlyModuleMerging.js b/tests/baselines/reference/constEnumOnlyModuleMerging.js index d35fce7e17627..4bcd24bf59e70 100644 --- a/tests/baselines/reference/constEnumOnlyModuleMerging.js +++ b/tests/baselines/reference/constEnumOnlyModuleMerging.js @@ -1,15 +1,15 @@ //// [tests/cases/compiler/constEnumOnlyModuleMerging.ts] //// //// [constEnumOnlyModuleMerging.ts] -module Outer { +namespace Outer { export var x = 1; } -module Outer { +namespace Outer { export const enum A { X } } -module B { +namespace B { import O = Outer; var x = O.A.X; var y = O.x; diff --git a/tests/baselines/reference/constEnumOnlyModuleMerging.symbols b/tests/baselines/reference/constEnumOnlyModuleMerging.symbols index e44dc6513f4aa..121c46a5ae917 100644 --- a/tests/baselines/reference/constEnumOnlyModuleMerging.symbols +++ b/tests/baselines/reference/constEnumOnlyModuleMerging.symbols @@ -1,39 +1,39 @@ //// [tests/cases/compiler/constEnumOnlyModuleMerging.ts] //// === constEnumOnlyModuleMerging.ts === -module Outer { +namespace Outer { >Outer : Symbol(Outer, Decl(constEnumOnlyModuleMerging.ts, 0, 0), Decl(constEnumOnlyModuleMerging.ts, 2, 1)) export var x = 1; >x : Symbol(x, Decl(constEnumOnlyModuleMerging.ts, 1, 14)) } -module Outer { +namespace Outer { >Outer : Symbol(Outer, Decl(constEnumOnlyModuleMerging.ts, 0, 0), Decl(constEnumOnlyModuleMerging.ts, 2, 1)) export const enum A { X } ->A : Symbol(A, Decl(constEnumOnlyModuleMerging.ts, 4, 14)) +>A : Symbol(A, Decl(constEnumOnlyModuleMerging.ts, 4, 17)) >X : Symbol(A.X, Decl(constEnumOnlyModuleMerging.ts, 5, 25)) } -module B { +namespace B { >B : Symbol(B, Decl(constEnumOnlyModuleMerging.ts, 6, 1)) import O = Outer; ->O : Symbol(O, Decl(constEnumOnlyModuleMerging.ts, 8, 10)) +>O : Symbol(O, Decl(constEnumOnlyModuleMerging.ts, 8, 13)) >Outer : Symbol(O, Decl(constEnumOnlyModuleMerging.ts, 0, 0), Decl(constEnumOnlyModuleMerging.ts, 2, 1)) var x = O.A.X; >x : Symbol(x, Decl(constEnumOnlyModuleMerging.ts, 10, 7)) >O.A.X : Symbol(O.A.X, Decl(constEnumOnlyModuleMerging.ts, 5, 25)) ->O.A : Symbol(O.A, Decl(constEnumOnlyModuleMerging.ts, 4, 14)) ->O : Symbol(O, Decl(constEnumOnlyModuleMerging.ts, 8, 10)) ->A : Symbol(O.A, Decl(constEnumOnlyModuleMerging.ts, 4, 14)) +>O.A : Symbol(O.A, Decl(constEnumOnlyModuleMerging.ts, 4, 17)) +>O : Symbol(O, Decl(constEnumOnlyModuleMerging.ts, 8, 13)) +>A : Symbol(O.A, Decl(constEnumOnlyModuleMerging.ts, 4, 17)) >X : Symbol(O.A.X, Decl(constEnumOnlyModuleMerging.ts, 5, 25)) var y = O.x; >y : Symbol(y, Decl(constEnumOnlyModuleMerging.ts, 11, 7)) >O.x : Symbol(O.x, Decl(constEnumOnlyModuleMerging.ts, 1, 14)) ->O : Symbol(O, Decl(constEnumOnlyModuleMerging.ts, 8, 10)) +>O : Symbol(O, Decl(constEnumOnlyModuleMerging.ts, 8, 13)) >x : Symbol(O.x, Decl(constEnumOnlyModuleMerging.ts, 1, 14)) } diff --git a/tests/baselines/reference/constEnumOnlyModuleMerging.types b/tests/baselines/reference/constEnumOnlyModuleMerging.types index 61cb0d0fb60df..6d064edc9f441 100644 --- a/tests/baselines/reference/constEnumOnlyModuleMerging.types +++ b/tests/baselines/reference/constEnumOnlyModuleMerging.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/constEnumOnlyModuleMerging.ts] //// === constEnumOnlyModuleMerging.ts === -module Outer { +namespace Outer { >Outer : typeof Outer > : ^^^^^^^^^^^^ @@ -12,7 +12,7 @@ module Outer { > : ^ } -module Outer { +namespace Outer { export const enum A { X } >A : A > : ^ @@ -20,7 +20,7 @@ module Outer { > : ^^^ } -module B { +namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/constEnums.js b/tests/baselines/reference/constEnums.js index 5712c277d7956..023a4cf8b341f 100644 --- a/tests/baselines/reference/constEnums.js +++ b/tests/baselines/reference/constEnums.js @@ -50,9 +50,9 @@ const enum Comments { "-->", } -module A { - export module B { - export module C { +namespace A { + export namespace B { + export namespace C { export const enum E { V1 = 1, V2 = A.B.C.E.V1 | 100 @@ -61,9 +61,9 @@ module A { } } -module A { - export module B { - export module C { +namespace A { + export namespace B { + export namespace C { export const enum E { V3 = A.B.C.E["V2"] & 200, V4 = A.B.C.E[`V1`] << 1, @@ -72,9 +72,9 @@ module A { } } -module A1 { - export module B { - export module C { +namespace A1 { + export namespace B { + export namespace C { export const enum E { V1 = 10, V2 = 110, @@ -83,16 +83,16 @@ module A1 { } } -module A2 { - export module B { - export module C { +namespace A2 { + export namespace B { + export namespace C { export const enum E { V1 = 10, V2 = 110, } } // module C will be classified as value - export module C { + export namespace C { var x = 1 } } diff --git a/tests/baselines/reference/constEnums.symbols b/tests/baselines/reference/constEnums.symbols index ffb7bed831de8..a3e08d57a7a74 100644 --- a/tests/baselines/reference/constEnums.symbols +++ b/tests/baselines/reference/constEnums.symbols @@ -162,17 +162,17 @@ const enum Comments { >"-->" : Symbol(Comments["-->"], Decl(constEnums.ts, 45, 11)) } -module A { +namespace A { >A : Symbol(A, Decl(constEnums.ts, 47, 1), Decl(constEnums.ts, 58, 1)) - export module B { ->B : Symbol(B, Decl(constEnums.ts, 49, 10), Decl(constEnums.ts, 60, 10)) + export namespace B { +>B : Symbol(B, Decl(constEnums.ts, 49, 13), Decl(constEnums.ts, 60, 13)) - export module C { ->C : Symbol(C, Decl(constEnums.ts, 50, 21), Decl(constEnums.ts, 61, 21)) + export namespace C { +>C : Symbol(C, Decl(constEnums.ts, 50, 24), Decl(constEnums.ts, 61, 24)) export const enum E { ->E : Symbol(E, Decl(constEnums.ts, 51, 25), Decl(constEnums.ts, 62, 25)) +>E : Symbol(E, Decl(constEnums.ts, 51, 28), Decl(constEnums.ts, 62, 28)) V1 = 1, >V1 : Symbol(I.V1, Decl(constEnums.ts, 52, 33)) @@ -180,68 +180,68 @@ module A { V2 = A.B.C.E.V1 | 100 >V2 : Symbol(I.V2, Decl(constEnums.ts, 53, 23)) >A.B.C.E.V1 : Symbol(I.V1, Decl(constEnums.ts, 52, 33)) ->A.B.C.E : Symbol(E, Decl(constEnums.ts, 51, 25), Decl(constEnums.ts, 62, 25)) ->A.B.C : Symbol(C, Decl(constEnums.ts, 50, 21), Decl(constEnums.ts, 61, 21)) ->A.B : Symbol(B, Decl(constEnums.ts, 49, 10), Decl(constEnums.ts, 60, 10)) +>A.B.C.E : Symbol(E, Decl(constEnums.ts, 51, 28), Decl(constEnums.ts, 62, 28)) +>A.B.C : Symbol(C, Decl(constEnums.ts, 50, 24), Decl(constEnums.ts, 61, 24)) +>A.B : Symbol(B, Decl(constEnums.ts, 49, 13), Decl(constEnums.ts, 60, 13)) >A : Symbol(A, Decl(constEnums.ts, 47, 1), Decl(constEnums.ts, 58, 1)) ->B : Symbol(B, Decl(constEnums.ts, 49, 10), Decl(constEnums.ts, 60, 10)) ->C : Symbol(C, Decl(constEnums.ts, 50, 21), Decl(constEnums.ts, 61, 21)) ->E : Symbol(E, Decl(constEnums.ts, 51, 25), Decl(constEnums.ts, 62, 25)) +>B : Symbol(B, Decl(constEnums.ts, 49, 13), Decl(constEnums.ts, 60, 13)) +>C : Symbol(C, Decl(constEnums.ts, 50, 24), Decl(constEnums.ts, 61, 24)) +>E : Symbol(E, Decl(constEnums.ts, 51, 28), Decl(constEnums.ts, 62, 28)) >V1 : Symbol(I.V1, Decl(constEnums.ts, 52, 33)) } } } } -module A { +namespace A { >A : Symbol(A, Decl(constEnums.ts, 47, 1), Decl(constEnums.ts, 58, 1)) - export module B { ->B : Symbol(B, Decl(constEnums.ts, 49, 10), Decl(constEnums.ts, 60, 10)) + export namespace B { +>B : Symbol(B, Decl(constEnums.ts, 49, 13), Decl(constEnums.ts, 60, 13)) - export module C { ->C : Symbol(C, Decl(constEnums.ts, 50, 21), Decl(constEnums.ts, 61, 21)) + export namespace C { +>C : Symbol(C, Decl(constEnums.ts, 50, 24), Decl(constEnums.ts, 61, 24)) export const enum E { ->E : Symbol(E, Decl(constEnums.ts, 51, 25), Decl(constEnums.ts, 62, 25)) +>E : Symbol(E, Decl(constEnums.ts, 51, 28), Decl(constEnums.ts, 62, 28)) V3 = A.B.C.E["V2"] & 200, >V3 : Symbol(I.V3, Decl(constEnums.ts, 63, 33)) ->A.B.C.E : Symbol(E, Decl(constEnums.ts, 51, 25), Decl(constEnums.ts, 62, 25)) ->A.B.C : Symbol(C, Decl(constEnums.ts, 50, 21), Decl(constEnums.ts, 61, 21)) ->A.B : Symbol(B, Decl(constEnums.ts, 49, 10), Decl(constEnums.ts, 60, 10)) +>A.B.C.E : Symbol(E, Decl(constEnums.ts, 51, 28), Decl(constEnums.ts, 62, 28)) +>A.B.C : Symbol(C, Decl(constEnums.ts, 50, 24), Decl(constEnums.ts, 61, 24)) +>A.B : Symbol(B, Decl(constEnums.ts, 49, 13), Decl(constEnums.ts, 60, 13)) >A : Symbol(A, Decl(constEnums.ts, 47, 1), Decl(constEnums.ts, 58, 1)) ->B : Symbol(B, Decl(constEnums.ts, 49, 10), Decl(constEnums.ts, 60, 10)) ->C : Symbol(C, Decl(constEnums.ts, 50, 21), Decl(constEnums.ts, 61, 21)) ->E : Symbol(E, Decl(constEnums.ts, 51, 25), Decl(constEnums.ts, 62, 25)) +>B : Symbol(B, Decl(constEnums.ts, 49, 13), Decl(constEnums.ts, 60, 13)) +>C : Symbol(C, Decl(constEnums.ts, 50, 24), Decl(constEnums.ts, 61, 24)) +>E : Symbol(E, Decl(constEnums.ts, 51, 28), Decl(constEnums.ts, 62, 28)) >"V2" : Symbol(I.V2, Decl(constEnums.ts, 53, 23)) V4 = A.B.C.E[`V1`] << 1, >V4 : Symbol(I.V4, Decl(constEnums.ts, 64, 41)) ->A.B.C.E : Symbol(E, Decl(constEnums.ts, 51, 25), Decl(constEnums.ts, 62, 25)) ->A.B.C : Symbol(C, Decl(constEnums.ts, 50, 21), Decl(constEnums.ts, 61, 21)) ->A.B : Symbol(B, Decl(constEnums.ts, 49, 10), Decl(constEnums.ts, 60, 10)) +>A.B.C.E : Symbol(E, Decl(constEnums.ts, 51, 28), Decl(constEnums.ts, 62, 28)) +>A.B.C : Symbol(C, Decl(constEnums.ts, 50, 24), Decl(constEnums.ts, 61, 24)) +>A.B : Symbol(B, Decl(constEnums.ts, 49, 13), Decl(constEnums.ts, 60, 13)) >A : Symbol(A, Decl(constEnums.ts, 47, 1), Decl(constEnums.ts, 58, 1)) ->B : Symbol(B, Decl(constEnums.ts, 49, 10), Decl(constEnums.ts, 60, 10)) ->C : Symbol(C, Decl(constEnums.ts, 50, 21), Decl(constEnums.ts, 61, 21)) ->E : Symbol(E, Decl(constEnums.ts, 51, 25), Decl(constEnums.ts, 62, 25)) +>B : Symbol(B, Decl(constEnums.ts, 49, 13), Decl(constEnums.ts, 60, 13)) +>C : Symbol(C, Decl(constEnums.ts, 50, 24), Decl(constEnums.ts, 61, 24)) +>E : Symbol(E, Decl(constEnums.ts, 51, 28), Decl(constEnums.ts, 62, 28)) >`V1` : Symbol(I.V1, Decl(constEnums.ts, 52, 33)) } } } } -module A1 { +namespace A1 { >A1 : Symbol(A1, Decl(constEnums.ts, 69, 1)) - export module B { ->B : Symbol(B, Decl(constEnums.ts, 71, 11)) + export namespace B { +>B : Symbol(B, Decl(constEnums.ts, 71, 14)) - export module C { ->C : Symbol(C, Decl(constEnums.ts, 72, 21)) + export namespace C { +>C : Symbol(C, Decl(constEnums.ts, 72, 24)) export const enum E { ->E : Symbol(E, Decl(constEnums.ts, 73, 25)) +>E : Symbol(E, Decl(constEnums.ts, 73, 28)) V1 = 10, >V1 : Symbol(E.V1, Decl(constEnums.ts, 74, 33)) @@ -253,17 +253,17 @@ module A1 { } } -module A2 { +namespace A2 { >A2 : Symbol(A2, Decl(constEnums.ts, 80, 1)) - export module B { ->B : Symbol(B, Decl(constEnums.ts, 82, 11)) + export namespace B { +>B : Symbol(B, Decl(constEnums.ts, 82, 14)) - export module C { ->C : Symbol(C, Decl(constEnums.ts, 83, 21), Decl(constEnums.ts, 89, 9)) + export namespace C { +>C : Symbol(C, Decl(constEnums.ts, 83, 24), Decl(constEnums.ts, 89, 9)) export const enum E { ->E : Symbol(E, Decl(constEnums.ts, 84, 25)) +>E : Symbol(E, Decl(constEnums.ts, 84, 28)) V1 = 10, >V1 : Symbol(E.V1, Decl(constEnums.ts, 85, 33)) @@ -273,8 +273,8 @@ module A2 { } } // module C will be classified as value - export module C { ->C : Symbol(C, Decl(constEnums.ts, 83, 21), Decl(constEnums.ts, 89, 9)) + export namespace C { +>C : Symbol(C, Decl(constEnums.ts, 83, 24), Decl(constEnums.ts, 89, 9)) var x = 1 >x : Symbol(x, Decl(constEnums.ts, 92, 15)) @@ -285,19 +285,19 @@ module A2 { import I = A.B.C.E; >I : Symbol(I, Decl(constEnums.ts, 95, 1)) >A : Symbol(A, Decl(constEnums.ts, 47, 1), Decl(constEnums.ts, 58, 1)) ->B : Symbol(A.B, Decl(constEnums.ts, 49, 10), Decl(constEnums.ts, 60, 10)) ->C : Symbol(A.B.C, Decl(constEnums.ts, 50, 21), Decl(constEnums.ts, 61, 21)) ->E : Symbol(I, Decl(constEnums.ts, 51, 25), Decl(constEnums.ts, 62, 25)) +>B : Symbol(A.B, Decl(constEnums.ts, 49, 13), Decl(constEnums.ts, 60, 13)) +>C : Symbol(A.B.C, Decl(constEnums.ts, 50, 24), Decl(constEnums.ts, 61, 24)) +>E : Symbol(I, Decl(constEnums.ts, 51, 28), Decl(constEnums.ts, 62, 28)) import I1 = A1.B; >I1 : Symbol(I1, Decl(constEnums.ts, 97, 19)) >A1 : Symbol(A1, Decl(constEnums.ts, 69, 1)) ->B : Symbol(I1, Decl(constEnums.ts, 71, 11)) +>B : Symbol(I1, Decl(constEnums.ts, 71, 14)) import I2 = A2.B; >I2 : Symbol(I2, Decl(constEnums.ts, 98, 17)) >A2 : Symbol(A2, Decl(constEnums.ts, 80, 1)) ->B : Symbol(I2, Decl(constEnums.ts, 82, 11)) +>B : Symbol(I2, Decl(constEnums.ts, 82, 14)) function foo0(e: I): void { >foo0 : Symbol(foo0, Decl(constEnums.ts, 99, 17)) @@ -322,27 +322,27 @@ function foo1(e: I1.C.E): void { >foo1 : Symbol(foo1, Decl(constEnums.ts, 106, 1)) >e : Symbol(e, Decl(constEnums.ts, 108, 14)) >I1 : Symbol(I1, Decl(constEnums.ts, 97, 19)) ->C : Symbol(I1.C, Decl(constEnums.ts, 72, 21)) ->E : Symbol(I1.C.E, Decl(constEnums.ts, 73, 25)) +>C : Symbol(I1.C, Decl(constEnums.ts, 72, 24)) +>E : Symbol(I1.C.E, Decl(constEnums.ts, 73, 28)) if (e === I1.C.E.V1) { >e : Symbol(e, Decl(constEnums.ts, 108, 14)) >I1.C.E.V1 : Symbol(I1.C.E.V1, Decl(constEnums.ts, 74, 33)) ->I1.C.E : Symbol(I1.C.E, Decl(constEnums.ts, 73, 25)) ->I1.C : Symbol(I1.C, Decl(constEnums.ts, 72, 21)) +>I1.C.E : Symbol(I1.C.E, Decl(constEnums.ts, 73, 28)) +>I1.C : Symbol(I1.C, Decl(constEnums.ts, 72, 24)) >I1 : Symbol(I1, Decl(constEnums.ts, 97, 19)) ->C : Symbol(I1.C, Decl(constEnums.ts, 72, 21)) ->E : Symbol(I1.C.E, Decl(constEnums.ts, 73, 25)) +>C : Symbol(I1.C, Decl(constEnums.ts, 72, 24)) +>E : Symbol(I1.C.E, Decl(constEnums.ts, 73, 28)) >V1 : Symbol(I1.C.E.V1, Decl(constEnums.ts, 74, 33)) } else if (e === I1.C.E.V2) { >e : Symbol(e, Decl(constEnums.ts, 108, 14)) >I1.C.E.V2 : Symbol(I1.C.E.V2, Decl(constEnums.ts, 75, 24)) ->I1.C.E : Symbol(I1.C.E, Decl(constEnums.ts, 73, 25)) ->I1.C : Symbol(I1.C, Decl(constEnums.ts, 72, 21)) +>I1.C.E : Symbol(I1.C.E, Decl(constEnums.ts, 73, 28)) +>I1.C : Symbol(I1.C, Decl(constEnums.ts, 72, 24)) >I1 : Symbol(I1, Decl(constEnums.ts, 97, 19)) ->C : Symbol(I1.C, Decl(constEnums.ts, 72, 21)) ->E : Symbol(I1.C.E, Decl(constEnums.ts, 73, 25)) +>C : Symbol(I1.C, Decl(constEnums.ts, 72, 24)) +>E : Symbol(I1.C.E, Decl(constEnums.ts, 73, 28)) >V2 : Symbol(I1.C.E.V2, Decl(constEnums.ts, 75, 24)) } } @@ -351,27 +351,27 @@ function foo2(e: I2.C.E): void { >foo2 : Symbol(foo2, Decl(constEnums.ts, 113, 1)) >e : Symbol(e, Decl(constEnums.ts, 115, 14)) >I2 : Symbol(I2, Decl(constEnums.ts, 98, 17)) ->C : Symbol(I2.C, Decl(constEnums.ts, 83, 21), Decl(constEnums.ts, 89, 9)) ->E : Symbol(I2.C.E, Decl(constEnums.ts, 84, 25)) +>C : Symbol(I2.C, Decl(constEnums.ts, 83, 24), Decl(constEnums.ts, 89, 9)) +>E : Symbol(I2.C.E, Decl(constEnums.ts, 84, 28)) if (e === I2.C.E.V1) { >e : Symbol(e, Decl(constEnums.ts, 115, 14)) >I2.C.E.V1 : Symbol(I2.C.E.V1, Decl(constEnums.ts, 85, 33)) ->I2.C.E : Symbol(I2.C.E, Decl(constEnums.ts, 84, 25)) ->I2.C : Symbol(I2.C, Decl(constEnums.ts, 83, 21), Decl(constEnums.ts, 89, 9)) +>I2.C.E : Symbol(I2.C.E, Decl(constEnums.ts, 84, 28)) +>I2.C : Symbol(I2.C, Decl(constEnums.ts, 83, 24), Decl(constEnums.ts, 89, 9)) >I2 : Symbol(I2, Decl(constEnums.ts, 98, 17)) ->C : Symbol(I2.C, Decl(constEnums.ts, 83, 21), Decl(constEnums.ts, 89, 9)) ->E : Symbol(I2.C.E, Decl(constEnums.ts, 84, 25)) +>C : Symbol(I2.C, Decl(constEnums.ts, 83, 24), Decl(constEnums.ts, 89, 9)) +>E : Symbol(I2.C.E, Decl(constEnums.ts, 84, 28)) >V1 : Symbol(I2.C.E.V1, Decl(constEnums.ts, 85, 33)) } else if (e === I2.C.E.V2) { >e : Symbol(e, Decl(constEnums.ts, 115, 14)) >I2.C.E.V2 : Symbol(I2.C.E.V2, Decl(constEnums.ts, 86, 24)) ->I2.C.E : Symbol(I2.C.E, Decl(constEnums.ts, 84, 25)) ->I2.C : Symbol(I2.C, Decl(constEnums.ts, 83, 21), Decl(constEnums.ts, 89, 9)) +>I2.C.E : Symbol(I2.C.E, Decl(constEnums.ts, 84, 28)) +>I2.C : Symbol(I2.C, Decl(constEnums.ts, 83, 24), Decl(constEnums.ts, 89, 9)) >I2 : Symbol(I2, Decl(constEnums.ts, 98, 17)) ->C : Symbol(I2.C, Decl(constEnums.ts, 83, 21), Decl(constEnums.ts, 89, 9)) ->E : Symbol(I2.C.E, Decl(constEnums.ts, 84, 25)) +>C : Symbol(I2.C, Decl(constEnums.ts, 83, 24), Decl(constEnums.ts, 89, 9)) +>E : Symbol(I2.C.E, Decl(constEnums.ts, 84, 28)) >V2 : Symbol(I2.C.E.V2, Decl(constEnums.ts, 86, 24)) } } @@ -531,44 +531,44 @@ function bar(e: A.B.C.E): number { >bar : Symbol(bar, Decl(constEnums.ts, 155, 1)) >e : Symbol(e, Decl(constEnums.ts, 157, 13)) >A : Symbol(A, Decl(constEnums.ts, 47, 1), Decl(constEnums.ts, 58, 1)) ->B : Symbol(A.B, Decl(constEnums.ts, 49, 10), Decl(constEnums.ts, 60, 10)) ->C : Symbol(A.B.C, Decl(constEnums.ts, 50, 21), Decl(constEnums.ts, 61, 21)) ->E : Symbol(I, Decl(constEnums.ts, 51, 25), Decl(constEnums.ts, 62, 25)) +>B : Symbol(A.B, Decl(constEnums.ts, 49, 13), Decl(constEnums.ts, 60, 13)) +>C : Symbol(A.B.C, Decl(constEnums.ts, 50, 24), Decl(constEnums.ts, 61, 24)) +>E : Symbol(I, Decl(constEnums.ts, 51, 28), Decl(constEnums.ts, 62, 28)) switch (e) { >e : Symbol(e, Decl(constEnums.ts, 157, 13)) case A.B.C.E.V1: return 1; >A.B.C.E.V1 : Symbol(I.V1, Decl(constEnums.ts, 52, 33)) ->A.B.C.E : Symbol(I, Decl(constEnums.ts, 51, 25), Decl(constEnums.ts, 62, 25)) ->A.B.C : Symbol(A.B.C, Decl(constEnums.ts, 50, 21), Decl(constEnums.ts, 61, 21)) ->A.B : Symbol(A.B, Decl(constEnums.ts, 49, 10), Decl(constEnums.ts, 60, 10)) +>A.B.C.E : Symbol(I, Decl(constEnums.ts, 51, 28), Decl(constEnums.ts, 62, 28)) +>A.B.C : Symbol(A.B.C, Decl(constEnums.ts, 50, 24), Decl(constEnums.ts, 61, 24)) +>A.B : Symbol(A.B, Decl(constEnums.ts, 49, 13), Decl(constEnums.ts, 60, 13)) >A : Symbol(A, Decl(constEnums.ts, 47, 1), Decl(constEnums.ts, 58, 1)) ->B : Symbol(A.B, Decl(constEnums.ts, 49, 10), Decl(constEnums.ts, 60, 10)) ->C : Symbol(A.B.C, Decl(constEnums.ts, 50, 21), Decl(constEnums.ts, 61, 21)) ->E : Symbol(I, Decl(constEnums.ts, 51, 25), Decl(constEnums.ts, 62, 25)) +>B : Symbol(A.B, Decl(constEnums.ts, 49, 13), Decl(constEnums.ts, 60, 13)) +>C : Symbol(A.B.C, Decl(constEnums.ts, 50, 24), Decl(constEnums.ts, 61, 24)) +>E : Symbol(I, Decl(constEnums.ts, 51, 28), Decl(constEnums.ts, 62, 28)) >V1 : Symbol(I.V1, Decl(constEnums.ts, 52, 33)) case A.B.C.E.V2: return 1; >A.B.C.E.V2 : Symbol(I.V2, Decl(constEnums.ts, 53, 23)) ->A.B.C.E : Symbol(I, Decl(constEnums.ts, 51, 25), Decl(constEnums.ts, 62, 25)) ->A.B.C : Symbol(A.B.C, Decl(constEnums.ts, 50, 21), Decl(constEnums.ts, 61, 21)) ->A.B : Symbol(A.B, Decl(constEnums.ts, 49, 10), Decl(constEnums.ts, 60, 10)) +>A.B.C.E : Symbol(I, Decl(constEnums.ts, 51, 28), Decl(constEnums.ts, 62, 28)) +>A.B.C : Symbol(A.B.C, Decl(constEnums.ts, 50, 24), Decl(constEnums.ts, 61, 24)) +>A.B : Symbol(A.B, Decl(constEnums.ts, 49, 13), Decl(constEnums.ts, 60, 13)) >A : Symbol(A, Decl(constEnums.ts, 47, 1), Decl(constEnums.ts, 58, 1)) ->B : Symbol(A.B, Decl(constEnums.ts, 49, 10), Decl(constEnums.ts, 60, 10)) ->C : Symbol(A.B.C, Decl(constEnums.ts, 50, 21), Decl(constEnums.ts, 61, 21)) ->E : Symbol(I, Decl(constEnums.ts, 51, 25), Decl(constEnums.ts, 62, 25)) +>B : Symbol(A.B, Decl(constEnums.ts, 49, 13), Decl(constEnums.ts, 60, 13)) +>C : Symbol(A.B.C, Decl(constEnums.ts, 50, 24), Decl(constEnums.ts, 61, 24)) +>E : Symbol(I, Decl(constEnums.ts, 51, 28), Decl(constEnums.ts, 62, 28)) >V2 : Symbol(I.V2, Decl(constEnums.ts, 53, 23)) case A.B.C.E.V3: return 1; >A.B.C.E.V3 : Symbol(I.V3, Decl(constEnums.ts, 63, 33)) ->A.B.C.E : Symbol(I, Decl(constEnums.ts, 51, 25), Decl(constEnums.ts, 62, 25)) ->A.B.C : Symbol(A.B.C, Decl(constEnums.ts, 50, 21), Decl(constEnums.ts, 61, 21)) ->A.B : Symbol(A.B, Decl(constEnums.ts, 49, 10), Decl(constEnums.ts, 60, 10)) +>A.B.C.E : Symbol(I, Decl(constEnums.ts, 51, 28), Decl(constEnums.ts, 62, 28)) +>A.B.C : Symbol(A.B.C, Decl(constEnums.ts, 50, 24), Decl(constEnums.ts, 61, 24)) +>A.B : Symbol(A.B, Decl(constEnums.ts, 49, 13), Decl(constEnums.ts, 60, 13)) >A : Symbol(A, Decl(constEnums.ts, 47, 1), Decl(constEnums.ts, 58, 1)) ->B : Symbol(A.B, Decl(constEnums.ts, 49, 10), Decl(constEnums.ts, 60, 10)) ->C : Symbol(A.B.C, Decl(constEnums.ts, 50, 21), Decl(constEnums.ts, 61, 21)) ->E : Symbol(I, Decl(constEnums.ts, 51, 25), Decl(constEnums.ts, 62, 25)) +>B : Symbol(A.B, Decl(constEnums.ts, 49, 13), Decl(constEnums.ts, 60, 13)) +>C : Symbol(A.B.C, Decl(constEnums.ts, 50, 24), Decl(constEnums.ts, 61, 24)) +>E : Symbol(I, Decl(constEnums.ts, 51, 28), Decl(constEnums.ts, 62, 28)) >V3 : Symbol(I.V3, Decl(constEnums.ts, 63, 33)) } } diff --git a/tests/baselines/reference/constEnums.types b/tests/baselines/reference/constEnums.types index bdc233f233f4d..e9629ffa06858 100644 --- a/tests/baselines/reference/constEnums.types +++ b/tests/baselines/reference/constEnums.types @@ -328,9 +328,9 @@ const enum Comments { > : ^^^^^^^^^^^^^^^^^^^^^^^^ } -module A { - export module B { - export module C { +namespace A { + export namespace B { + export namespace C { export const enum E { >E : E > : ^ @@ -371,9 +371,9 @@ module A { } } -module A { - export module B { - export module C { +namespace A { + export namespace B { + export namespace C { export const enum E { >E : E > : ^ @@ -434,9 +434,9 @@ module A { } } -module A1 { - export module B { - export module C { +namespace A1 { + export namespace B { + export namespace C { export const enum E { >E : E > : ^ @@ -457,15 +457,15 @@ module A1 { } } -module A2 { +namespace A2 { >A2 : typeof A2 > : ^^^^^^^^^ - export module B { + export namespace B { >B : typeof B > : ^^^^^^^^ - export module C { + export namespace C { export const enum E { >E : E > : ^ @@ -484,7 +484,7 @@ module A2 { } } // module C will be classified as value - export module C { + export namespace C { >C : typeof C > : ^^^^^^^^ diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance.errors.txt b/tests/baselines/reference/constructSignatureAssignabilityInInheritance.errors.txt index 37b823ae23154..929adc55baac9 100644 --- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance.errors.txt +++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance.errors.txt @@ -10,7 +10,7 @@ constructSignatureAssignabilityInInheritance.ts(67,15): error TS2430: Interface ==== constructSignatureAssignabilityInInheritance.ts (2 errors) ==== // Checking basic subtype relations with construct signatures - module ConstructSignature { + namespace ConstructSignature { interface Base { // T // M's new (x: number): void; // BUG 842221 @@ -42,7 +42,7 @@ constructSignatureAssignabilityInInheritance.ts(67,15): error TS2430: Interface } } - module MemberWithConstructSignature { + namespace MemberWithConstructSignature { interface Base { // T // M's a: new (x: number) => void; diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance.js b/tests/baselines/reference/constructSignatureAssignabilityInInheritance.js index 4131b77e2c4b7..eb4f2ab2aab45 100644 --- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance.js +++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance.js @@ -3,7 +3,7 @@ //// [constructSignatureAssignabilityInInheritance.ts] // Checking basic subtype relations with construct signatures -module ConstructSignature { +namespace ConstructSignature { interface Base { // T // M's new (x: number): void; // BUG 842221 @@ -35,7 +35,7 @@ module ConstructSignature { } } -module MemberWithConstructSignature { +namespace MemberWithConstructSignature { interface Base { // T // M's a: new (x: number) => void; diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance.symbols b/tests/baselines/reference/constructSignatureAssignabilityInInheritance.symbols index 37b52759c8c11..6776bdb83484f 100644 --- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance.symbols +++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance.symbols @@ -3,11 +3,11 @@ === constructSignatureAssignabilityInInheritance.ts === // Checking basic subtype relations with construct signatures -module ConstructSignature { +namespace ConstructSignature { >ConstructSignature : Symbol(ConstructSignature, Decl(constructSignatureAssignabilityInInheritance.ts, 0, 0)) interface Base { // T ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance.ts, 2, 27)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance.ts, 2, 30)) // M's new (x: number): void; // BUG 842221 @@ -21,7 +21,7 @@ module ConstructSignature { // S's interface I extends Base { >I : Symbol(I, Decl(constructSignatureAssignabilityInInheritance.ts, 7, 5)) ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance.ts, 2, 27)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance.ts, 2, 30)) // N's new (x: number): number; // satisfies subtype for both of base's call signatures @@ -63,11 +63,11 @@ module ConstructSignature { } } -module MemberWithConstructSignature { +namespace MemberWithConstructSignature { >MemberWithConstructSignature : Symbol(MemberWithConstructSignature, Decl(constructSignatureAssignabilityInInheritance.ts, 32, 1)) interface Base { // T ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance.ts, 34, 37)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance.ts, 34, 40)) // M's a: new (x: number) => void; @@ -88,7 +88,7 @@ module MemberWithConstructSignature { var b: Base; >b : Symbol(b, Decl(constructSignatureAssignabilityInInheritance.ts, 42, 7)) ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance.ts, 34, 37)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance.ts, 34, 40)) var r = new b.a(1); >r : Symbol(r, Decl(constructSignatureAssignabilityInInheritance.ts, 43, 7)) @@ -99,7 +99,7 @@ module MemberWithConstructSignature { // S's interface I extends Base { >I : Symbol(I, Decl(constructSignatureAssignabilityInInheritance.ts, 43, 23)) ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance.ts, 34, 37)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance.ts, 34, 40)) // N's a: new (x: number) => number; // ok because base returns void diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance.types index 41d74877dba8d..9406d70954a36 100644 --- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance.types +++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance.types @@ -3,7 +3,7 @@ === constructSignatureAssignabilityInInheritance.ts === // Checking basic subtype relations with construct signatures -module ConstructSignature { +namespace ConstructSignature { interface Base { // T // M's new (x: number): void; // BUG 842221 @@ -55,7 +55,7 @@ module ConstructSignature { } } -module MemberWithConstructSignature { +namespace MemberWithConstructSignature { >MemberWithConstructSignature : typeof MemberWithConstructSignature > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.errors.txt b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.errors.txt index 01f459ad6a7fc..6256795a9b973 100644 --- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.errors.txt +++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.errors.txt @@ -41,13 +41,13 @@ constructSignatureAssignabilityInInheritance3.ts(95,19): error TS2430: Interface // checking subtype relations for function types as it relates to contextual signature instantiation // error cases - module Errors { + namespace Errors { class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Derived { baz: string; } class OtherDerived extends Base { bing: string; } - module WithNonGenericSignaturesInBaseType { + namespace WithNonGenericSignaturesInBaseType { // base type with non-generic call signatures interface A { a2: new (x: number) => string[]; @@ -149,7 +149,7 @@ constructSignatureAssignabilityInInheritance3.ts(95,19): error TS2430: Interface } } - module WithGenericSignaturesInBaseType { + namespace WithGenericSignaturesInBaseType { // base type has generic call signature interface B { a2: new (x: T) => T[]; diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js index 17407ccf43f7a..11ec189445876 100644 --- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js +++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js @@ -4,13 +4,13 @@ // checking subtype relations for function types as it relates to contextual signature instantiation // error cases -module Errors { +namespace Errors { class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Derived { baz: string; } class OtherDerived extends Base { bing: string; } - module WithNonGenericSignaturesInBaseType { + namespace WithNonGenericSignaturesInBaseType { // base type with non-generic call signatures interface A { a2: new (x: number) => string[]; @@ -80,7 +80,7 @@ module Errors { } } - module WithGenericSignaturesInBaseType { + namespace WithGenericSignaturesInBaseType { // base type has generic call signature interface B { a2: new (x: T) => T[]; diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.symbols b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.symbols index 68492657842bd..a49b98e7fc1c6 100644 --- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.symbols +++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.symbols @@ -4,16 +4,16 @@ // checking subtype relations for function types as it relates to contextual signature instantiation // error cases -module Errors { +namespace Errors { >Errors : Symbol(Errors, Decl(constructSignatureAssignabilityInInheritance3.ts, 0, 0)) class Base { foo: string; } ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 18)) >foo : Symbol(Base.foo, Decl(constructSignatureAssignabilityInInheritance3.ts, 4, 16)) class Derived extends Base { bar: string; } >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance3.ts, 4, 31)) ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 18)) >bar : Symbol(Derived.bar, Decl(constructSignatureAssignabilityInInheritance3.ts, 5, 32)) class Derived2 extends Derived { baz: string; } @@ -23,15 +23,15 @@ module Errors { class OtherDerived extends Base { bing: string; } >OtherDerived : Symbol(OtherDerived, Decl(constructSignatureAssignabilityInInheritance3.ts, 6, 51)) ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 18)) >bing : Symbol(OtherDerived.bing, Decl(constructSignatureAssignabilityInInheritance3.ts, 7, 37)) - module WithNonGenericSignaturesInBaseType { + namespace WithNonGenericSignaturesInBaseType { >WithNonGenericSignaturesInBaseType : Symbol(WithNonGenericSignaturesInBaseType, Decl(constructSignatureAssignabilityInInheritance3.ts, 7, 53)) // base type with non-generic call signatures interface A { ->A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance3.ts, 9, 50)) a2: new (x: number) => string[]; >a2 : Symbol(A.a2, Decl(constructSignatureAssignabilityInInheritance3.ts, 11, 21)) @@ -41,31 +41,31 @@ module Errors { >a7 : Symbol(A.a7, Decl(constructSignatureAssignabilityInInheritance3.ts, 12, 44)) >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance3.ts, 13, 21)) >arg : Symbol(arg, Decl(constructSignatureAssignabilityInInheritance3.ts, 13, 25)) ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance3.ts, 4, 31)) >r : Symbol(r, Decl(constructSignatureAssignabilityInInheritance3.ts, 13, 52)) ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 18)) >Derived2 : Symbol(Derived2, Decl(constructSignatureAssignabilityInInheritance3.ts, 5, 47)) a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived; >a8 : Symbol(A.a8, Decl(constructSignatureAssignabilityInInheritance3.ts, 13, 73)) >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance3.ts, 14, 21)) >arg : Symbol(arg, Decl(constructSignatureAssignabilityInInheritance3.ts, 14, 25)) ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance3.ts, 4, 31)) >y : Symbol(y, Decl(constructSignatureAssignabilityInInheritance3.ts, 14, 47)) >arg2 : Symbol(arg2, Decl(constructSignatureAssignabilityInInheritance3.ts, 14, 52)) ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance3.ts, 4, 31)) >r : Symbol(r, Decl(constructSignatureAssignabilityInInheritance3.ts, 14, 80)) ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance3.ts, 4, 31)) a10: new (...x: Base[]) => Base; >a10 : Symbol(A.a10, Decl(constructSignatureAssignabilityInInheritance3.ts, 14, 100)) >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance3.ts, 15, 22)) ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 15)) ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 18)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 18)) a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base; >a11 : Symbol(A.a11, Decl(constructSignatureAssignabilityInInheritance3.ts, 15, 44)) @@ -74,13 +74,13 @@ module Errors { >y : Symbol(y, Decl(constructSignatureAssignabilityInInheritance3.ts, 16, 41)) >foo : Symbol(foo, Decl(constructSignatureAssignabilityInInheritance3.ts, 16, 46)) >bar : Symbol(bar, Decl(constructSignatureAssignabilityInInheritance3.ts, 16, 59)) ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 18)) a12: new (x: Array, y: Array) => Array; >a12 : Symbol(A.a12, Decl(constructSignatureAssignabilityInInheritance3.ts, 16, 83)) >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance3.ts, 17, 22)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 18)) >y : Symbol(y, Decl(constructSignatureAssignabilityInInheritance3.ts, 17, 37)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Derived2 : Symbol(Derived2, Decl(constructSignatureAssignabilityInInheritance3.ts, 5, 47)) @@ -132,7 +132,7 @@ module Errors { interface I extends A { >I : Symbol(I, Decl(constructSignatureAssignabilityInInheritance3.ts, 34, 9)) ->A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance3.ts, 9, 50)) a2: new (x: T) => U[]; // error, contextual signature instantiation doesn't relate return types so U is {}, not a subtype of string[] >a2 : Symbol(I.a2, Decl(constructSignatureAssignabilityInInheritance3.ts, 36, 31)) @@ -147,7 +147,7 @@ module Errors { >I2 : Symbol(I2, Decl(constructSignatureAssignabilityInInheritance3.ts, 38, 9)) >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance3.ts, 40, 21)) >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance3.ts, 40, 23)) ->A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance3.ts, 9, 50)) a2: new (x: T) => U[]; // error, no contextual signature instantiation since I2.a2 is not generic >a2 : Symbol(I2.a2, Decl(constructSignatureAssignabilityInInheritance3.ts, 40, 38)) @@ -158,13 +158,13 @@ module Errors { interface I3 extends A { >I3 : Symbol(I3, Decl(constructSignatureAssignabilityInInheritance3.ts, 42, 9)) ->A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance3.ts, 9, 50)) // valid, no inferences for V so it defaults to Derived2 a7: new (x: (arg: T) => U) => (r: T) => V; >a7 : Symbol(I3.a7, Decl(constructSignatureAssignabilityInInheritance3.ts, 44, 32)) >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance3.ts, 46, 21)) ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 18)) >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance3.ts, 46, 36)) >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance3.ts, 4, 31)) >V : Symbol(V, Decl(constructSignatureAssignabilityInInheritance3.ts, 46, 55)) @@ -180,12 +180,12 @@ module Errors { interface I4 extends A { >I4 : Symbol(I4, Decl(constructSignatureAssignabilityInInheritance3.ts, 47, 9)) ->A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance3.ts, 9, 50)) a8: new (x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U; // error, type mismatch >a8 : Symbol(I4.a8, Decl(constructSignatureAssignabilityInInheritance3.ts, 49, 32)) >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance3.ts, 50, 21)) ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 18)) >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance3.ts, 50, 36)) >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance3.ts, 4, 31)) >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance3.ts, 50, 56)) @@ -203,7 +203,7 @@ module Errors { interface I4B extends A { >I4B : Symbol(I4B, Decl(constructSignatureAssignabilityInInheritance3.ts, 51, 9)) ->A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance3.ts, 9, 50)) a10: new (...x: T[]) => T; // valid, parameter covariance works even after contextual signature instantiation >a10 : Symbol(I4B.a10, Decl(constructSignatureAssignabilityInInheritance3.ts, 53, 33)) @@ -216,7 +216,7 @@ module Errors { interface I4C extends A { >I4C : Symbol(I4C, Decl(constructSignatureAssignabilityInInheritance3.ts, 55, 9)) ->A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance3.ts, 9, 50)) a11: new (x: T, y: T) => T; // valid, even though x is a Base, parameter covariance works even after contextual signature instantiation >a11 : Symbol(I4C.a11, Decl(constructSignatureAssignabilityInInheritance3.ts, 57, 33)) @@ -231,7 +231,7 @@ module Errors { interface I4E extends A { >I4E : Symbol(I4E, Decl(constructSignatureAssignabilityInInheritance3.ts, 59, 9)) ->A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance3.ts, 9, 50)) a12: new >(x: Array, y: Array) => T; // valid, no inferences for T, defaults to Array >a12 : Symbol(I4E.a12, Decl(constructSignatureAssignabilityInInheritance3.ts, 61, 33)) @@ -240,16 +240,16 @@ module Errors { >Derived2 : Symbol(Derived2, Decl(constructSignatureAssignabilityInInheritance3.ts, 5, 47)) >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance3.ts, 62, 49)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 18)) >y : Symbol(y, Decl(constructSignatureAssignabilityInInheritance3.ts, 62, 64)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 18)) >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance3.ts, 62, 22)) } interface I6 extends A { >I6 : Symbol(I6, Decl(constructSignatureAssignabilityInInheritance3.ts, 63, 9)) ->A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance3.ts, 9, 50)) a15: new (x: { a: T; b: T }) => T; // error, T is {} which isn't an acceptable return type >a15 : Symbol(I6.a15, Decl(constructSignatureAssignabilityInInheritance3.ts, 65, 32)) @@ -264,12 +264,12 @@ module Errors { interface I7 extends A { >I7 : Symbol(I7, Decl(constructSignatureAssignabilityInInheritance3.ts, 67, 9)) ->A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance3.ts, 9, 50)) a15: new (x: { a: T; b: T }) => number; // error, T defaults to Base, which is not compatible with number or string >a15 : Symbol(I7.a15, Decl(constructSignatureAssignabilityInInheritance3.ts, 69, 32)) >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance3.ts, 70, 22)) ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 18)) >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance3.ts, 70, 38)) >a : Symbol(a, Decl(constructSignatureAssignabilityInInheritance3.ts, 70, 42)) >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance3.ts, 70, 22)) @@ -279,7 +279,7 @@ module Errors { interface I8 extends A { >I8 : Symbol(I8, Decl(constructSignatureAssignabilityInInheritance3.ts, 71, 9)) ->A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance3.ts, 9, 47)) +>A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance3.ts, 9, 50)) // ok, we relate each signature of a16 to b16, and within that, we make inferences from two different signatures in the respective A.a16 signature a16: new (x: new (a: T) => T) => T[]; @@ -293,12 +293,12 @@ module Errors { } } - module WithGenericSignaturesInBaseType { + namespace WithGenericSignaturesInBaseType { >WithGenericSignaturesInBaseType : Symbol(WithGenericSignaturesInBaseType, Decl(constructSignatureAssignabilityInInheritance3.ts, 77, 5)) // base type has generic call signature interface B { ->B : Symbol(B, Decl(constructSignatureAssignabilityInInheritance3.ts, 79, 44)) +>B : Symbol(B, Decl(constructSignatureAssignabilityInInheritance3.ts, 79, 47)) a2: new (x: T) => T[]; >a2 : Symbol(B.a2, Decl(constructSignatureAssignabilityInInheritance3.ts, 81, 21)) @@ -310,7 +310,7 @@ module Errors { interface I6 extends B { >I6 : Symbol(I6, Decl(constructSignatureAssignabilityInInheritance3.ts, 83, 9)) ->B : Symbol(B, Decl(constructSignatureAssignabilityInInheritance3.ts, 79, 44)) +>B : Symbol(B, Decl(constructSignatureAssignabilityInInheritance3.ts, 79, 47)) a2: new (x: T) => string[]; // error >a2 : Symbol(I6.a2, Decl(constructSignatureAssignabilityInInheritance3.ts, 85, 32)) @@ -357,7 +357,7 @@ module Errors { new (x: U): number[]; >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance3.ts, 102, 21)) ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 18)) >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance3.ts, 102, 37)) >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance3.ts, 102, 21)) @@ -371,7 +371,7 @@ module Errors { a14: new (x: T) => number[]; >a14 : Symbol(I8.a14, Decl(constructSignatureAssignabilityInInheritance3.ts, 106, 32)) >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance3.ts, 107, 22)) ->Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 15)) +>Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance3.ts, 3, 18)) >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance3.ts, 107, 38)) >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance3.ts, 107, 22)) } diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.types index 40be5b0764efc..6aa19f9b3c73b 100644 --- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.types +++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.types @@ -4,7 +4,7 @@ // checking subtype relations for function types as it relates to contextual signature instantiation // error cases -module Errors { +namespace Errors { >Errors : typeof Errors > : ^^^^^^^^^^^^^ @@ -38,7 +38,7 @@ module Errors { >bing : string > : ^^^^^^ - module WithNonGenericSignaturesInBaseType { + namespace WithNonGenericSignaturesInBaseType { // base type with non-generic call signatures interface A { a2: new (x: number) => string[]; @@ -267,7 +267,7 @@ module Errors { } } - module WithGenericSignaturesInBaseType { + namespace WithGenericSignaturesInBaseType { // base type has generic call signature interface B { a2: new (x: T) => T[]; diff --git a/tests/baselines/reference/constructSignaturesWithOverloads2.errors.txt b/tests/baselines/reference/constructSignaturesWithOverloads2.errors.txt index cfc821f16b4a5..e53b92bb3a79a 100644 --- a/tests/baselines/reference/constructSignaturesWithOverloads2.errors.txt +++ b/tests/baselines/reference/constructSignaturesWithOverloads2.errors.txt @@ -11,7 +11,7 @@ constructSignaturesWithOverloads2.ts(32,11): error TS2428: All declarations of ' constructor(x: number, y: string); constructor(x: number) { } } - module C { + namespace C { export var x = 1; } @@ -22,7 +22,7 @@ constructSignaturesWithOverloads2.ts(32,11): error TS2428: All declarations of ' constructor(x: T, y: string); constructor(x: T) { } } - module C2 { + namespace C2 { export var x = 1; } diff --git a/tests/baselines/reference/constructSignaturesWithOverloads2.js b/tests/baselines/reference/constructSignaturesWithOverloads2.js index 7fedc997df91b..df1db0bea05d3 100644 --- a/tests/baselines/reference/constructSignaturesWithOverloads2.js +++ b/tests/baselines/reference/constructSignaturesWithOverloads2.js @@ -9,7 +9,7 @@ class C { constructor(x: number, y: string); constructor(x: number) { } } -module C { +namespace C { export var x = 1; } @@ -20,7 +20,7 @@ class C2 { constructor(x: T, y: string); constructor(x: T) { } } -module C2 { +namespace C2 { export var x = 1; } diff --git a/tests/baselines/reference/constructSignaturesWithOverloads2.symbols b/tests/baselines/reference/constructSignaturesWithOverloads2.symbols index 23720874939a5..a2f7de61c93c9 100644 --- a/tests/baselines/reference/constructSignaturesWithOverloads2.symbols +++ b/tests/baselines/reference/constructSignaturesWithOverloads2.symbols @@ -18,7 +18,7 @@ class C { constructor(x: number) { } >x : Symbol(x, Decl(constructSignaturesWithOverloads2.ts, 6, 16)) } -module C { +namespace C { >C : Symbol(C, Decl(constructSignaturesWithOverloads2.ts, 0, 0), Decl(constructSignaturesWithOverloads2.ts, 7, 1)) export var x = 1; @@ -47,7 +47,7 @@ class C2 { >x : Symbol(x, Decl(constructSignaturesWithOverloads2.ts, 17, 16)) >T : Symbol(T, Decl(constructSignaturesWithOverloads2.ts, 14, 9)) } -module C2 { +namespace C2 { >C2 : Symbol(C2, Decl(constructSignaturesWithOverloads2.ts, 12, 22), Decl(constructSignaturesWithOverloads2.ts, 18, 1)) export var x = 1; diff --git a/tests/baselines/reference/constructSignaturesWithOverloads2.types b/tests/baselines/reference/constructSignaturesWithOverloads2.types index c7ce6bd6d93a8..2bbd9aae8b858 100644 --- a/tests/baselines/reference/constructSignaturesWithOverloads2.types +++ b/tests/baselines/reference/constructSignaturesWithOverloads2.types @@ -24,7 +24,7 @@ class C { >x : number > : ^^^^^^ } -module C { +namespace C { >C : typeof C > : ^^^^^^^^ @@ -67,7 +67,7 @@ class C2 { >x : T > : ^ } -module C2 { +namespace C2 { >C2 : typeof C2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/constructorArgWithGenericCallSignature.js b/tests/baselines/reference/constructorArgWithGenericCallSignature.js index cf299bb00605d..fa1a9664c9e32 100644 --- a/tests/baselines/reference/constructorArgWithGenericCallSignature.js +++ b/tests/baselines/reference/constructorArgWithGenericCallSignature.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/constructorArgWithGenericCallSignature.ts] //// //// [constructorArgWithGenericCallSignature.ts] -module Test { +namespace Test { export interface MyFunc { (value1: T): T; } diff --git a/tests/baselines/reference/constructorArgWithGenericCallSignature.symbols b/tests/baselines/reference/constructorArgWithGenericCallSignature.symbols index 61392a84367d4..6c623128a270a 100644 --- a/tests/baselines/reference/constructorArgWithGenericCallSignature.symbols +++ b/tests/baselines/reference/constructorArgWithGenericCallSignature.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/constructorArgWithGenericCallSignature.ts] //// === constructorArgWithGenericCallSignature.ts === -module Test { +namespace Test { >Test : Symbol(Test, Decl(constructorArgWithGenericCallSignature.ts, 0, 0)) export interface MyFunc { ->MyFunc : Symbol(MyFunc, Decl(constructorArgWithGenericCallSignature.ts, 0, 13)) +>MyFunc : Symbol(MyFunc, Decl(constructorArgWithGenericCallSignature.ts, 0, 16)) (value1: T): T; >T : Symbol(T, Decl(constructorArgWithGenericCallSignature.ts, 2, 9)) @@ -18,18 +18,18 @@ module Test { constructor(func: MyFunc) { } >func : Symbol(func, Decl(constructorArgWithGenericCallSignature.ts, 5, 20)) ->MyFunc : Symbol(MyFunc, Decl(constructorArgWithGenericCallSignature.ts, 0, 13)) +>MyFunc : Symbol(MyFunc, Decl(constructorArgWithGenericCallSignature.ts, 0, 16)) } export function F(func: MyFunc) { } >F : Symbol(F, Decl(constructorArgWithGenericCallSignature.ts, 6, 5)) >func : Symbol(func, Decl(constructorArgWithGenericCallSignature.ts, 8, 19)) ->MyFunc : Symbol(MyFunc, Decl(constructorArgWithGenericCallSignature.ts, 0, 13)) +>MyFunc : Symbol(MyFunc, Decl(constructorArgWithGenericCallSignature.ts, 0, 16)) } var func: Test.MyFunc; >func : Symbol(func, Decl(constructorArgWithGenericCallSignature.ts, 10, 3)) >Test : Symbol(Test, Decl(constructorArgWithGenericCallSignature.ts, 0, 0)) ->MyFunc : Symbol(Test.MyFunc, Decl(constructorArgWithGenericCallSignature.ts, 0, 13)) +>MyFunc : Symbol(Test.MyFunc, Decl(constructorArgWithGenericCallSignature.ts, 0, 16)) Test.F(func); // OK >Test.F : Symbol(Test.F, Decl(constructorArgWithGenericCallSignature.ts, 6, 5)) diff --git a/tests/baselines/reference/constructorArgWithGenericCallSignature.types b/tests/baselines/reference/constructorArgWithGenericCallSignature.types index 1cf9deb1ec3da..b7e4d7e6f6366 100644 --- a/tests/baselines/reference/constructorArgWithGenericCallSignature.types +++ b/tests/baselines/reference/constructorArgWithGenericCallSignature.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/constructorArgWithGenericCallSignature.ts] //// === constructorArgWithGenericCallSignature.ts === -module Test { +namespace Test { >Test : typeof Test > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/constructorHasPrototypeProperty.js b/tests/baselines/reference/constructorHasPrototypeProperty.js index 0fa5760d87730..e9ee55d46c60f 100644 --- a/tests/baselines/reference/constructorHasPrototypeProperty.js +++ b/tests/baselines/reference/constructorHasPrototypeProperty.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/classes/members/constructorFunctionTypes/constructorHasPrototypeProperty.ts] //// //// [constructorHasPrototypeProperty.ts] -module NonGeneric { +namespace NonGeneric { class C { foo: string; } @@ -16,7 +16,7 @@ module NonGeneric { r2.bar; } -module Generic { +namespace Generic { class C { foo: T; bar: U; diff --git a/tests/baselines/reference/constructorHasPrototypeProperty.symbols b/tests/baselines/reference/constructorHasPrototypeProperty.symbols index 812c6cafe6719..a600fce153eef 100644 --- a/tests/baselines/reference/constructorHasPrototypeProperty.symbols +++ b/tests/baselines/reference/constructorHasPrototypeProperty.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/classes/members/constructorFunctionTypes/constructorHasPrototypeProperty.ts] //// === constructorHasPrototypeProperty.ts === -module NonGeneric { +namespace NonGeneric { >NonGeneric : Symbol(NonGeneric, Decl(constructorHasPrototypeProperty.ts, 0, 0)) class C { ->C : Symbol(C, Decl(constructorHasPrototypeProperty.ts, 0, 19)) +>C : Symbol(C, Decl(constructorHasPrototypeProperty.ts, 0, 22)) foo: string; >foo : Symbol(C.foo, Decl(constructorHasPrototypeProperty.ts, 1, 13)) @@ -13,7 +13,7 @@ module NonGeneric { class D extends C { >D : Symbol(D, Decl(constructorHasPrototypeProperty.ts, 3, 5)) ->C : Symbol(C, Decl(constructorHasPrototypeProperty.ts, 0, 19)) +>C : Symbol(C, Decl(constructorHasPrototypeProperty.ts, 0, 22)) bar: string; >bar : Symbol(D.bar, Decl(constructorHasPrototypeProperty.ts, 5, 23)) @@ -22,7 +22,7 @@ module NonGeneric { var r = C.prototype; >r : Symbol(r, Decl(constructorHasPrototypeProperty.ts, 9, 7)) >C.prototype : Symbol(C.prototype) ->C : Symbol(C, Decl(constructorHasPrototypeProperty.ts, 0, 19)) +>C : Symbol(C, Decl(constructorHasPrototypeProperty.ts, 0, 22)) >prototype : Symbol(C.prototype) r.foo; @@ -42,11 +42,11 @@ module NonGeneric { >bar : Symbol(D.bar, Decl(constructorHasPrototypeProperty.ts, 5, 23)) } -module Generic { +namespace Generic { >Generic : Symbol(Generic, Decl(constructorHasPrototypeProperty.ts, 13, 1)) class C { ->C : Symbol(C, Decl(constructorHasPrototypeProperty.ts, 15, 16)) +>C : Symbol(C, Decl(constructorHasPrototypeProperty.ts, 15, 19)) >T : Symbol(T, Decl(constructorHasPrototypeProperty.ts, 16, 12)) >U : Symbol(U, Decl(constructorHasPrototypeProperty.ts, 16, 14)) @@ -63,7 +63,7 @@ module Generic { >D : Symbol(D, Decl(constructorHasPrototypeProperty.ts, 19, 5)) >T : Symbol(T, Decl(constructorHasPrototypeProperty.ts, 21, 12)) >U : Symbol(U, Decl(constructorHasPrototypeProperty.ts, 21, 14)) ->C : Symbol(C, Decl(constructorHasPrototypeProperty.ts, 15, 16)) +>C : Symbol(C, Decl(constructorHasPrototypeProperty.ts, 15, 19)) >T : Symbol(T, Decl(constructorHasPrototypeProperty.ts, 21, 12)) >U : Symbol(U, Decl(constructorHasPrototypeProperty.ts, 21, 14)) @@ -79,7 +79,7 @@ module Generic { var r = C.prototype; // C >r : Symbol(r, Decl(constructorHasPrototypeProperty.ts, 26, 7)) >C.prototype : Symbol(C.prototype) ->C : Symbol(C, Decl(constructorHasPrototypeProperty.ts, 15, 16)) +>C : Symbol(C, Decl(constructorHasPrototypeProperty.ts, 15, 19)) >prototype : Symbol(C.prototype) var ra = r.foo; // any diff --git a/tests/baselines/reference/constructorHasPrototypeProperty.types b/tests/baselines/reference/constructorHasPrototypeProperty.types index a0fa6c1c172e6..c7969b6c0b57b 100644 --- a/tests/baselines/reference/constructorHasPrototypeProperty.types +++ b/tests/baselines/reference/constructorHasPrototypeProperty.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/classes/members/constructorFunctionTypes/constructorHasPrototypeProperty.ts] //// === constructorHasPrototypeProperty.ts === -module NonGeneric { +namespace NonGeneric { >NonGeneric : typeof NonGeneric > : ^^^^^^^^^^^^^^^^^ @@ -62,7 +62,7 @@ module NonGeneric { > : ^^^^^^ } -module Generic { +namespace Generic { >Generic : typeof Generic > : ^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/constructorOverloads4.errors.txt b/tests/baselines/reference/constructorOverloads4.errors.txt index 92562825b89a6..bda005f15144d 100644 --- a/tests/baselines/reference/constructorOverloads4.errors.txt +++ b/tests/baselines/reference/constructorOverloads4.errors.txt @@ -3,7 +3,7 @@ constructorOverloads4.ts(10,1): error TS2349: This expression is not callable. ==== constructorOverloads4.ts (1 errors) ==== - declare module M { + declare namespace M { export class Function { constructor(...args: string[]); } diff --git a/tests/baselines/reference/constructorOverloads4.js b/tests/baselines/reference/constructorOverloads4.js index 12e8f809ccc8d..bf0b60d949b8b 100644 --- a/tests/baselines/reference/constructorOverloads4.js +++ b/tests/baselines/reference/constructorOverloads4.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/constructorOverloads4.ts] //// //// [constructorOverloads4.ts] -declare module M { +declare namespace M { export class Function { constructor(...args: string[]); } diff --git a/tests/baselines/reference/constructorOverloads4.symbols b/tests/baselines/reference/constructorOverloads4.symbols index 2d36ada4a30b3..4cbb0eb406943 100644 --- a/tests/baselines/reference/constructorOverloads4.symbols +++ b/tests/baselines/reference/constructorOverloads4.symbols @@ -1,33 +1,33 @@ //// [tests/cases/compiler/constructorOverloads4.ts] //// === constructorOverloads4.ts === -declare module M { +declare namespace M { >M : Symbol(M, Decl(constructorOverloads4.ts, 0, 0)) export class Function { ->Function : Symbol(Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 18)) +>Function : Symbol(Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 21)) constructor(...args: string[]); >args : Symbol(args, Decl(constructorOverloads4.ts, 2, 20)) } export function Function(...args: any[]): any; ->Function : Symbol(Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 18)) +>Function : Symbol(Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 21)) >args : Symbol(args, Decl(constructorOverloads4.ts, 4, 29)) export function Function(...args: string[]): Function; ->Function : Symbol(Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 18)) +>Function : Symbol(Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 21)) >args : Symbol(args, Decl(constructorOverloads4.ts, 5, 29)) ->Function : Symbol(Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 18)) +>Function : Symbol(Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 21)) } (new M.Function("return 5"))(); ->M.Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 18)) +>M.Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 21)) >M : Symbol(M, Decl(constructorOverloads4.ts, 0, 0)) ->Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 18)) +>Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 21)) M.Function("yo"); ->M.Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 18)) +>M.Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 21)) >M : Symbol(M, Decl(constructorOverloads4.ts, 0, 0)) ->Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 18)) +>Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 21)) diff --git a/tests/baselines/reference/constructorOverloads4.types b/tests/baselines/reference/constructorOverloads4.types index 5ef47e27acf3f..8c78a86c52d07 100644 --- a/tests/baselines/reference/constructorOverloads4.types +++ b/tests/baselines/reference/constructorOverloads4.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/constructorOverloads4.ts] //// === constructorOverloads4.ts === -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/constructorOverloads5.js b/tests/baselines/reference/constructorOverloads5.js index 9c5788936c927..3cd36ce116bdc 100644 --- a/tests/baselines/reference/constructorOverloads5.js +++ b/tests/baselines/reference/constructorOverloads5.js @@ -3,7 +3,7 @@ //// [constructorOverloads5.ts] interface IArguments {} - declare module M { + declare namespace M { export function RegExp(pattern: string): RegExp; export function RegExp(pattern: string, flags: string): RegExp; export class RegExp { diff --git a/tests/baselines/reference/constructorOverloads5.symbols b/tests/baselines/reference/constructorOverloads5.symbols index ce385996cb6dd..6d7cdec80f132 100644 --- a/tests/baselines/reference/constructorOverloads5.symbols +++ b/tests/baselines/reference/constructorOverloads5.symbols @@ -4,22 +4,22 @@ interface IArguments {} >IArguments : Symbol(IArguments, Decl(lib.es5.d.ts, --, --), Decl(constructorOverloads5.ts, 0, 0)) - declare module M { + declare namespace M { >M : Symbol(M, Decl(constructorOverloads5.ts, 0, 24)) export function RegExp(pattern: string): RegExp; ->RegExp : Symbol(RegExp, Decl(constructorOverloads5.ts, 2, 19), Decl(constructorOverloads5.ts, 3, 52), Decl(constructorOverloads5.ts, 4, 67)) +>RegExp : Symbol(RegExp, Decl(constructorOverloads5.ts, 2, 22), Decl(constructorOverloads5.ts, 3, 52), Decl(constructorOverloads5.ts, 4, 67)) >pattern : Symbol(pattern, Decl(constructorOverloads5.ts, 3, 27)) ->RegExp : Symbol(RegExp, Decl(constructorOverloads5.ts, 2, 19), Decl(constructorOverloads5.ts, 3, 52), Decl(constructorOverloads5.ts, 4, 67)) +>RegExp : Symbol(RegExp, Decl(constructorOverloads5.ts, 2, 22), Decl(constructorOverloads5.ts, 3, 52), Decl(constructorOverloads5.ts, 4, 67)) export function RegExp(pattern: string, flags: string): RegExp; ->RegExp : Symbol(RegExp, Decl(constructorOverloads5.ts, 2, 19), Decl(constructorOverloads5.ts, 3, 52), Decl(constructorOverloads5.ts, 4, 67)) +>RegExp : Symbol(RegExp, Decl(constructorOverloads5.ts, 2, 22), Decl(constructorOverloads5.ts, 3, 52), Decl(constructorOverloads5.ts, 4, 67)) >pattern : Symbol(pattern, Decl(constructorOverloads5.ts, 4, 27)) >flags : Symbol(flags, Decl(constructorOverloads5.ts, 4, 43)) ->RegExp : Symbol(RegExp, Decl(constructorOverloads5.ts, 2, 19), Decl(constructorOverloads5.ts, 3, 52), Decl(constructorOverloads5.ts, 4, 67)) +>RegExp : Symbol(RegExp, Decl(constructorOverloads5.ts, 2, 22), Decl(constructorOverloads5.ts, 3, 52), Decl(constructorOverloads5.ts, 4, 67)) export class RegExp { ->RegExp : Symbol(RegExp, Decl(constructorOverloads5.ts, 2, 19), Decl(constructorOverloads5.ts, 3, 52), Decl(constructorOverloads5.ts, 4, 67)) +>RegExp : Symbol(RegExp, Decl(constructorOverloads5.ts, 2, 22), Decl(constructorOverloads5.ts, 3, 52), Decl(constructorOverloads5.ts, 4, 67)) constructor(pattern: string); >pattern : Symbol(pattern, Decl(constructorOverloads5.ts, 6, 20)) diff --git a/tests/baselines/reference/constructorOverloads5.types b/tests/baselines/reference/constructorOverloads5.types index faa51ebd03e93..10b8a066f9ef0 100644 --- a/tests/baselines/reference/constructorOverloads5.types +++ b/tests/baselines/reference/constructorOverloads5.types @@ -3,7 +3,7 @@ === constructorOverloads5.ts === interface IArguments {} - declare module M { + declare namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt index fcdb9edc337d7..4acac636af7c2 100644 --- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt +++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt @@ -110,7 +110,7 @@ constructorWithIncompleteTypeAnnotation.ts(261,1): error TS1128: Declaration or !!! error TS1005: ';' expected. - module TypeScriptAllInOne { + namespace TypeScriptAllInOne { export class Program { static Main(...args: string[]) { try { diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js index 1cf5c5bf38c1d..b90c7c07da390 100644 --- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js +++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js @@ -14,7 +14,7 @@ declare module "fs" { import fs = module("fs"); -module TypeScriptAllInOne { +namespace TypeScriptAllInOne { export class Program { static Main(...args: string[]) { try { diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.symbols b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.symbols index defff2eae076f..aedba390a3368 100644 --- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.symbols +++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.symbols @@ -25,11 +25,11 @@ import fs = module("fs"); >fs : Symbol(fs, Decl(constructorWithIncompleteTypeAnnotation.ts, 8, 1)) -module TypeScriptAllInOne { +namespace TypeScriptAllInOne { >TypeScriptAllInOne : Symbol(TypeScriptAllInOne, Decl(constructorWithIncompleteTypeAnnotation.ts, 10, 25)) export class Program { ->Program : Symbol(Program, Decl(constructorWithIncompleteTypeAnnotation.ts, 13, 27)) +>Program : Symbol(Program, Decl(constructorWithIncompleteTypeAnnotation.ts, 13, 30)) static Main(...args: string[]) { >Main : Symbol(Program.Main, Decl(constructorWithIncompleteTypeAnnotation.ts, 14, 26)) @@ -649,8 +649,8 @@ interface IDisposable { TypeScriptAllInOne.Program.Main(); >TypeScriptAllInOne.Program.Main : Symbol(TypeScriptAllInOne.Program.Main, Decl(constructorWithIncompleteTypeAnnotation.ts, 14, 26)) ->TypeScriptAllInOne.Program : Symbol(TypeScriptAllInOne.Program, Decl(constructorWithIncompleteTypeAnnotation.ts, 13, 27)) +>TypeScriptAllInOne.Program : Symbol(TypeScriptAllInOne.Program, Decl(constructorWithIncompleteTypeAnnotation.ts, 13, 30)) >TypeScriptAllInOne : Symbol(TypeScriptAllInOne, Decl(constructorWithIncompleteTypeAnnotation.ts, 10, 25)) ->Program : Symbol(TypeScriptAllInOne.Program, Decl(constructorWithIncompleteTypeAnnotation.ts, 13, 27)) +>Program : Symbol(TypeScriptAllInOne.Program, Decl(constructorWithIncompleteTypeAnnotation.ts, 13, 30)) >Main : Symbol(TypeScriptAllInOne.Program.Main, Decl(constructorWithIncompleteTypeAnnotation.ts, 14, 26)) diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types index 1732ef9e66df6..d05a348f1a54a 100644 --- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types +++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types @@ -35,7 +35,7 @@ import fs = module("fs"); > : ^^^^ -module TypeScriptAllInOne { +namespace TypeScriptAllInOne { >TypeScriptAllInOne : typeof TypeScriptAllInOne > : ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/contextualTyping.errors.txt b/tests/baselines/reference/contextualTyping.errors.txt index adb7c9330d969..664d9780d6393 100644 --- a/tests/baselines/reference/contextualTyping.errors.txt +++ b/tests/baselines/reference/contextualTyping.errors.txt @@ -23,7 +23,7 @@ contextualTyping.ts(223,5): error TS2741: Property 'x' is missing in type '{}' b } // CONTEXT: Module property declaration - module C2T5 { + namespace C2T5 { export var foo: (i: number, s: string) => number = function(i) { return i; } @@ -68,7 +68,7 @@ contextualTyping.ts(223,5): error TS2741: Property 'x' is missing in type '{}' b } // CONTEXT: Module property assignment - module C5T5 { + namespace C5T5 { export var foo: (i: number, s: string) => string; foo = function(i, s) { return s; diff --git a/tests/baselines/reference/contextualTyping.js b/tests/baselines/reference/contextualTyping.js index 6fbb60fdbddc8..78fe56d48446b 100644 --- a/tests/baselines/reference/contextualTyping.js +++ b/tests/baselines/reference/contextualTyping.js @@ -21,7 +21,7 @@ class C1T5 { } // CONTEXT: Module property declaration -module C2T5 { +namespace C2T5 { export var foo: (i: number, s: string) => number = function(i) { return i; } @@ -66,7 +66,7 @@ class C4T5 { } // CONTEXT: Module property assignment -module C5T5 { +namespace C5T5 { export var foo: (i: number, s: string) => string; foo = function(i, s) { return s; diff --git a/tests/baselines/reference/contextualTyping.js.map b/tests/baselines/reference/contextualTyping.js.map index 40a1237be86fc..3f5b41d1da3e8 100644 --- a/tests/baselines/reference/contextualTyping.js.map +++ b/tests/baselines/reference/contextualTyping.js.map @@ -1,3 +1,3 @@ //// [contextualTyping.js.map] -{"version":3,"file":"contextualTyping.js","sourceRoot":"","sources":["contextualTyping.ts"],"names":[],"mappings":"AAYA,sCAAsC;AACtC;IAAA;QACI,QAAG,GAAqC,UAAS,CAAC;YAC9C,OAAO,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;IAAD,WAAC;AAAD,CAAC,AAJD,IAIC;AAED,uCAAuC;AACvC,IAAO,IAAI,CAIV;AAJD,WAAO,IAAI;IACI,QAAG,GAAqC,UAAS,CAAC;QACzD,OAAO,CAAC,CAAC;IACb,CAAC,CAAA;AACL,CAAC,EAJM,IAAI,KAAJ,IAAI,QAIV;AAED,gCAAgC;AAChC,IAAI,IAAI,GAA0B,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC7D,IAAI,IAAI,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAA;AACF,IAAI,IAAI,GAAa,EAAE,CAAC;AACxB,IAAI,IAAI,GAAe,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACxD,IAAI,IAAI,GAAwB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClE,IAAI,IAAI,GAAmC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChF,IAAI,IAAI,GAGJ,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9B,IAAI,IAAI,GAAqC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACvE,IAAI,IAAI,GAAe,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AAC/B,IAAI,KAAK,GAAW,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC5C,IAAI,KAAK,GAAwC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChF,IAAI,KAAK,GAAS;IACd,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAEF,qCAAqC;AACrC;IAEI;QACI,IAAI,CAAC,GAAG,GAAG,UAAS,CAAC,EAAE,CAAC;YACpB,OAAO,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;IACL,WAAC;AAAD,CAAC,AAPD,IAOC;AAED,sCAAsC;AACtC,IAAO,IAAI,CAKV;AALD,WAAO,IAAI;IAEP,KAAA,GAAG,GAAG,UAAS,CAAC,EAAE,CAAC;QACf,OAAO,CAAC,CAAC;IACb,CAAC,CAAA;AACL,CAAC,EALM,IAAI,KAAJ,IAAI,QAKV;AAED,+BAA+B;AAC/B,IAAI,IAAyB,CAAC;AAC9B,IAAI,GAAwB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAE9D,kCAAkC;AAClC,IAAI,IAAY,CAAC;AACjB,IAAI,CAAC,CAAC,CAAC,GAAS,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC;AAuBzB,IAAI,KAAK,GAkBS,CAAC,EAAE,CAAC,CAAC;AAEvB,KAAK,CAAC,EAAE,GAAG,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AACtC,KAAK,CAAC,EAAE,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;AACd,KAAK,CAAC,EAAE,GAAG,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC7C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChD,KAAK,CAAC,EAAE,GAAG,UAAS,CAAS,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC;AAE5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACrC,KAAK,CAAC,EAAE,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACnB,KAAK,CAAC,GAAG,GAAG,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AACpC,KAAK,CAAC,GAAG,GAAG,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3C,KAAK,CAAC,GAAG,GAAG;IACR,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AACF,yBAAyB;AACzB,SAAS,IAAI,CAAC,CAAsB,IAAG,CAAC;AAAA,CAAC;AACzC,IAAI,CAAC,UAAS,CAAC;IACX,OAAa,CAAC,EAAE,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAEH,4BAA4B;AAC5B,IAAI,KAAK,GAA8B,cAAa,OAAO,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAE/F,0BAA0B;AAC1B;IAAc,eAAY,CAAsB;IAAI,CAAC;IAAC,YAAC;AAAD,CAAC,AAAvD,IAAuD;AAAA,CAAC;AACxD,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAErD,qCAAqC;AACrC,IAAI,KAAK,GAA2B,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC/D,IAAI,KAAK,GAAU,CAAC;IAChB,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,IAAI,KAAK,GAAc,EAAE,CAAC;AAC1B,IAAI,KAAK,GAAgB,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC1D,IAAI,KAAK,GAAyB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACpE,IAAI,KAAK,GAAoC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClF,IAAI,KAAK,GAGN,UAAS,CAAQ,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC;AAEnC,IAAI,KAAK,GAAsC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,IAAI,KAAK,GAAgB,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACjC,IAAI,MAAM,GAAY,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9C,IAAI,MAAM,GAAyC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClF,IAAI,MAAM,GAAU;IAChB,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAOF,SAAS,GAAG,CAAC,CAAC,EAAC,CAAC,IAAI,OAAO,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC;AAEjC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC;AAcnB,KAAK,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/B,KAAK,CAAC,SAAS,CAAC,GAAG,GAAG,UAAS,EAAE,EAAE,EAAE;IACjC,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,KAAK,CAAC,SAAS,GAAG;IACd,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,GAAG,EAAE,UAAS,EAAE,EAAE,EAAE;QAChB,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAC;AAIF,IAAI,CAAC,GAAM,EAAG,CAAC"} -//// https://sokra.github.io/source-map-visualization#base64,Ly8gQ09OVEVYVDogQ2xhc3MgcHJvcGVydHkgZGVjbGFyYXRpb24NCnZhciBDMVQ1ID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgIGZ1bmN0aW9uIEMxVDUoKSB7DQogICAgICAgIHRoaXMuZm9vID0gZnVuY3Rpb24gKGkpIHsNCiAgICAgICAgICAgIHJldHVybiBpOw0KICAgICAgICB9Ow0KICAgIH0NCiAgICByZXR1cm4gQzFUNTsNCn0oKSk7DQovLyBDT05URVhUOiBNb2R1bGUgcHJvcGVydHkgZGVjbGFyYXRpb24NCnZhciBDMlQ1Ow0KKGZ1bmN0aW9uIChDMlQ1KSB7DQogICAgQzJUNS5mb28gPSBmdW5jdGlvbiAoaSkgew0KICAgICAgICByZXR1cm4gaTsNCiAgICB9Ow0KfSkoQzJUNSB8fCAoQzJUNSA9IHt9KSk7DQovLyBDT05URVhUOiBWYXJpYWJsZSBkZWNsYXJhdGlvbg0KdmFyIGMzdDEgPSAoZnVuY3Rpb24gKHMpIHsgcmV0dXJuIHM7IH0pOw0KdmFyIGMzdDIgPSAoew0KICAgIG46IDENCn0pOw0KdmFyIGMzdDMgPSBbXTsNCnZhciBjM3Q0ID0gZnVuY3Rpb24gKCkgeyByZXR1cm4gKHt9KTsgfTsNCnZhciBjM3Q1ID0gZnVuY3Rpb24gKG4pIHsgcmV0dXJuICh7fSk7IH07DQp2YXIgYzN0NiA9IGZ1bmN0aW9uIChuLCBzKSB7IHJldHVybiAoe30pOyB9Ow0KdmFyIGMzdDcgPSBmdW5jdGlvbiAobikgeyByZXR1cm4gbjsgfTsNCnZhciBjM3Q4ID0gZnVuY3Rpb24gKG4pIHsgcmV0dXJuIG47IH07DQp2YXIgYzN0OSA9IFtbXSwgW11dOw0KdmFyIGMzdDEwID0gWyh7fSksICh7fSldOw0KdmFyIGMzdDExID0gW2Z1bmN0aW9uIChuLCBzKSB7IHJldHVybiBzOyB9XTsNCnZhciBjM3QxMiA9IHsNCiAgICBmb286ICh7fSkNCn07DQp2YXIgYzN0MTMgPSAoew0KICAgIGY6IGZ1bmN0aW9uIChpLCBzKSB7IHJldHVybiBzOyB9DQp9KTsNCnZhciBjM3QxNCA9ICh7DQogICAgYTogW10NCn0pOw0KLy8gQ09OVEVYVDogQ2xhc3MgcHJvcGVydHkgYXNzaWdubWVudA0KdmFyIEM0VDUgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgZnVuY3Rpb24gQzRUNSgpIHsNCiAgICAgICAgdGhpcy5mb28gPSBmdW5jdGlvbiAoaSwgcykgew0KICAgICAgICAgICAgcmV0dXJuIHM7DQogICAgICAgIH07DQogICAgfQ0KICAgIHJldHVybiBDNFQ1Ow0KfSgpKTsNCi8vIENPTlRFWFQ6IE1vZHVsZSBwcm9wZXJ0eSBhc3NpZ25tZW50DQp2YXIgQzVUNTsNCihmdW5jdGlvbiAoQzVUNSkgew0KICAgIEM1VDUuZm9vID0gZnVuY3Rpb24gKGksIHMpIHsNCiAgICAgICAgcmV0dXJuIHM7DQogICAgfTsNCn0pKEM1VDUgfHwgKEM1VDUgPSB7fSkpOw0KLy8gQ09OVEVYVDogVmFyaWFibGUgYXNzaWdubWVudA0KdmFyIGM2dDU7DQpjNnQ1ID0gZnVuY3Rpb24gKG4pIHsgcmV0dXJuICh7fSk7IH07DQovLyBDT05URVhUOiBBcnJheSBpbmRleCBhc3NpZ25tZW50DQp2YXIgYzd0MjsNCmM3dDJbMF0gPSAoeyBuOiAxIH0pOw0KdmFyIG9iamM4ID0gKHt9KTsNCm9iamM4LnQxID0gKGZ1bmN0aW9uIChzKSB7IHJldHVybiBzOyB9KTsNCm9iamM4LnQyID0gKHsNCiAgICBuOiAxDQp9KTsNCm9iamM4LnQzID0gW107DQpvYmpjOC50NCA9IGZ1bmN0aW9uICgpIHsgcmV0dXJuICh7fSk7IH07DQpvYmpjOC50NSA9IGZ1bmN0aW9uIChuKSB7IHJldHVybiAoe30pOyB9Ow0Kb2JqYzgudDYgPSBmdW5jdGlvbiAobiwgcykgeyByZXR1cm4gKHt9KTsgfTsNCm9iamM4LnQ3ID0gZnVuY3Rpb24gKG4pIHsgcmV0dXJuIG47IH07DQpvYmpjOC50OCA9IGZ1bmN0aW9uIChuKSB7IHJldHVybiBuOyB9Ow0Kb2JqYzgudDkgPSBbW10sIFtdXTsNCm9iamM4LnQxMCA9IFsoe30pLCAoe30pXTsNCm9iamM4LnQxMSA9IFtmdW5jdGlvbiAobiwgcykgeyByZXR1cm4gczsgfV07DQpvYmpjOC50MTIgPSB7DQogICAgZm9vOiAoe30pDQp9Ow0Kb2JqYzgudDEzID0gKHsNCiAgICBmOiBmdW5jdGlvbiAoaSwgcykgeyByZXR1cm4gczsgfQ0KfSk7DQpvYmpjOC50MTQgPSAoew0KICAgIGE6IFtdDQp9KTsNCi8vIENPTlRFWFQ6IEZ1bmN0aW9uIGNhbGwNCmZ1bmN0aW9uIGM5dDUoZikgeyB9DQo7DQpjOXQ1KGZ1bmN0aW9uIChuKSB7DQogICAgcmV0dXJuICh7fSk7DQp9KTsNCi8vIENPTlRFWFQ6IFJldHVybiBzdGF0ZW1lbnQNCnZhciBjMTB0NSA9IGZ1bmN0aW9uICgpIHsgcmV0dXJuIGZ1bmN0aW9uIChuKSB7IHJldHVybiAoe30pOyB9OyB9Ow0KLy8gQ09OVEVYVDogTmV3aW5nIGEgY2xhc3MNCnZhciBDMTF0NSA9IC8qKiBAY2xhc3MgKi8gKGZ1bmN0aW9uICgpIHsNCiAgICBmdW5jdGlvbiBDMTF0NShmKSB7DQogICAgfQ0KICAgIHJldHVybiBDMTF0NTsNCn0oKSk7DQo7DQp2YXIgaSA9IG5ldyBDMTF0NShmdW5jdGlvbiAobikgeyByZXR1cm4gKHt9KTsgfSk7DQovLyBDT05URVhUOiBUeXBlIGFubm90YXRlZCBleHByZXNzaW9uDQp2YXIgYzEydDEgPSAoZnVuY3Rpb24gKHMpIHsgcmV0dXJuIHM7IH0pOw0KdmFyIGMxMnQyID0gKHsNCiAgICBuOiAxDQp9KTsNCnZhciBjMTJ0MyA9IFtdOw0KdmFyIGMxMnQ0ID0gZnVuY3Rpb24gKCkgeyByZXR1cm4gKHt9KTsgfTsNCnZhciBjMTJ0NSA9IGZ1bmN0aW9uIChuKSB7IHJldHVybiAoe30pOyB9Ow0KdmFyIGMxMnQ2ID0gZnVuY3Rpb24gKG4sIHMpIHsgcmV0dXJuICh7fSk7IH07DQp2YXIgYzEydDcgPSBmdW5jdGlvbiAobikgeyByZXR1cm4gbjsgfTsNCnZhciBjMTJ0OCA9IGZ1bmN0aW9uIChuKSB7IHJldHVybiBuOyB9Ow0KdmFyIGMxMnQ5ID0gW1tdLCBbXV07DQp2YXIgYzEydDEwID0gWyh7fSksICh7fSldOw0KdmFyIGMxMnQxMSA9IFtmdW5jdGlvbiAobiwgcykgeyByZXR1cm4gczsgfV07DQp2YXIgYzEydDEyID0gew0KICAgIGZvbzogKHt9KQ0KfTsNCnZhciBjMTJ0MTMgPSAoew0KICAgIGY6IGZ1bmN0aW9uIChpLCBzKSB7IHJldHVybiBzOyB9DQp9KTsNCnZhciBjMTJ0MTQgPSAoew0KICAgIGE6IFtdDQp9KTsNCmZ1bmN0aW9uIEVGMShhLCBiKSB7IHJldHVybiBhICsgYjsgfQ0KdmFyIGVmdiA9IEVGMSgxLCAyKTsNClBvaW50Lm9yaWdpbiA9IG5ldyBQb2ludCgwLCAwKTsNClBvaW50LnByb3RvdHlwZS5hZGQgPSBmdW5jdGlvbiAoZHgsIGR5KSB7DQogICAgcmV0dXJuIG5ldyBQb2ludCh0aGlzLnggKyBkeCwgdGhpcy55ICsgZHkpOw0KfTsNClBvaW50LnByb3RvdHlwZSA9IHsNCiAgICB4OiAwLA0KICAgIHk6IDAsDQogICAgYWRkOiBmdW5jdGlvbiAoZHgsIGR5KSB7DQogICAgICAgIHJldHVybiBuZXcgUG9pbnQodGhpcy54ICsgZHgsIHRoaXMueSArIGR5KTsNCiAgICB9DQp9Ow0KdmFyIHggPSB7fTsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPWNvbnRleHR1YWxUeXBpbmcuanMubWFw,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGV4dHVhbFR5cGluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNvbnRleHR1YWxUeXBpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBWUEsc0NBQXNDO0FBQ3RDO0lBQUE7UUFDSSxRQUFHLEdBQXFDLFVBQVMsQ0FBQztZQUM5QyxPQUFPLENBQUMsQ0FBQztRQUNiLENBQUMsQ0FBQTtJQUNMLENBQUM7SUFBRCxXQUFDO0FBQUQsQ0FBQyxBQUpELElBSUM7QUFFRCx1Q0FBdUM7QUFDdkMsSUFBTyxJQUFJLENBSVY7QUFKRCxXQUFPLElBQUk7SUFDSSxRQUFHLEdBQXFDLFVBQVMsQ0FBQztRQUN6RCxPQUFPLENBQUMsQ0FBQztJQUNiLENBQUMsQ0FBQTtBQUNMLENBQUMsRUFKTSxJQUFJLEtBQUosSUFBSSxRQUlWO0FBRUQsZ0NBQWdDO0FBQ2hDLElBQUksSUFBSSxHQUEwQixDQUFDLFVBQVMsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDN0QsSUFBSSxJQUFJLEdBQVMsQ0FBQztJQUNkLENBQUMsRUFBRSxDQUFDO0NBQ1AsQ0FBQyxDQUFBO0FBQ0YsSUFBSSxJQUFJLEdBQWEsRUFBRSxDQUFDO0FBQ3hCLElBQUksSUFBSSxHQUFlLGNBQWEsT0FBYSxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDO0FBQ3hELElBQUksSUFBSSxHQUF3QixVQUFTLENBQUMsSUFBSSxPQUFhLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUM7QUFDbEUsSUFBSSxJQUFJLEdBQW1DLFVBQVMsQ0FBQyxFQUFFLENBQUMsSUFBSSxPQUFhLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUM7QUFDaEYsSUFBSSxJQUFJLEdBR0osVUFBUyxDQUFDLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFFOUIsSUFBSSxJQUFJLEdBQXFDLFVBQVMsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3ZFLElBQUksSUFBSSxHQUFlLENBQUMsRUFBRSxFQUFDLEVBQUUsQ0FBQyxDQUFDO0FBQy9CLElBQUksS0FBSyxHQUFXLENBQU8sQ0FBQyxFQUFFLENBQUMsRUFBTyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDNUMsSUFBSSxLQUFLLEdBQXdDLENBQUMsVUFBUyxDQUFDLEVBQUUsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDaEYsSUFBSSxLQUFLLEdBQVM7SUFDZCxHQUFHLEVBQVEsQ0FBQyxFQUFFLENBQUM7Q0FDbEIsQ0FBQTtBQUNELElBQUksS0FBSyxHQUFTLENBQUM7SUFDZixDQUFDLEVBQUUsVUFBUyxDQUFDLEVBQUUsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQztDQUNsQyxDQUFDLENBQUE7QUFDRixJQUFJLEtBQUssR0FBUyxDQUFDO0lBQ2YsQ0FBQyxFQUFFLEVBQUU7Q0FDUixDQUFDLENBQUE7QUFFRixxQ0FBcUM7QUFDckM7SUFFSTtRQUNJLElBQUksQ0FBQyxHQUFHLEdBQUcsVUFBUyxDQUFDLEVBQUUsQ0FBQztZQUNwQixPQUFPLENBQUMsQ0FBQztRQUNiLENBQUMsQ0FBQTtJQUNMLENBQUM7SUFDTCxXQUFDO0FBQUQsQ0FBQyxBQVBELElBT0M7QUFFRCxzQ0FBc0M7QUFDdEMsSUFBTyxJQUFJLENBS1Y7QUFMRCxXQUFPLElBQUk7SUFFUCxLQUFBLEdBQUcsR0FBRyxVQUFTLENBQUMsRUFBRSxDQUFDO1FBQ2YsT0FBTyxDQUFDLENBQUM7SUFDYixDQUFDLENBQUE7QUFDTCxDQUFDLEVBTE0sSUFBSSxLQUFKLElBQUksUUFLVjtBQUVELCtCQUErQjtBQUMvQixJQUFJLElBQXlCLENBQUM7QUFDOUIsSUFBSSxHQUF3QixVQUFTLENBQUMsSUFBSSxPQUFhLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUM7QUFFOUQsa0NBQWtDO0FBQ2xDLElBQUksSUFBWSxDQUFDO0FBQ2pCLElBQUksQ0FBQyxDQUFDLENBQUMsR0FBUyxDQUFDLEVBQUMsQ0FBQyxFQUFFLENBQUMsRUFBQyxDQUFDLENBQUM7QUF1QnpCLElBQUksS0FBSyxHQWtCUyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0FBRXZCLEtBQUssQ0FBQyxFQUFFLEdBQUcsQ0FBQyxVQUFTLENBQUMsSUFBSSxPQUFPLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3RDLEtBQUssQ0FBQyxFQUFFLEdBQVMsQ0FBQztJQUNkLENBQUMsRUFBRSxDQUFDO0NBQ1AsQ0FBQyxDQUFDO0FBQ0gsS0FBSyxDQUFDLEVBQUUsR0FBRyxFQUFFLENBQUM7QUFDZCxLQUFLLENBQUMsRUFBRSxHQUFHLGNBQWEsT0FBYSxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDO0FBQzVDLEtBQUssQ0FBQyxFQUFFLEdBQUcsVUFBUyxDQUFDLElBQUksT0FBYSxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDO0FBQzdDLEtBQUssQ0FBQyxFQUFFLEdBQUcsVUFBUyxDQUFDLEVBQUUsQ0FBQyxJQUFJLE9BQWEsQ0FBQyxFQUFFLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQztBQUNoRCxLQUFLLENBQUMsRUFBRSxHQUFHLFVBQVMsQ0FBUyxJQUFJLE9BQU8sQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDO0FBRTVDLEtBQUssQ0FBQyxFQUFFLEdBQUcsVUFBUyxDQUFDLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDckMsS0FBSyxDQUFDLEVBQUUsR0FBRyxDQUFDLEVBQUUsRUFBQyxFQUFFLENBQUMsQ0FBQztBQUNuQixLQUFLLENBQUMsR0FBRyxHQUFHLENBQU8sQ0FBQyxFQUFFLENBQUMsRUFBTyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDcEMsS0FBSyxDQUFDLEdBQUcsR0FBRyxDQUFDLFVBQVMsQ0FBQyxFQUFFLENBQUMsSUFBSSxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQzNDLEtBQUssQ0FBQyxHQUFHLEdBQUc7SUFDUixHQUFHLEVBQVEsQ0FBQyxFQUFFLENBQUM7Q0FDbEIsQ0FBQTtBQUNELEtBQUssQ0FBQyxHQUFHLEdBQVMsQ0FBQztJQUNmLENBQUMsRUFBRSxVQUFTLENBQUMsRUFBRSxDQUFDLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDO0NBQ2xDLENBQUMsQ0FBQTtBQUNGLEtBQUssQ0FBQyxHQUFHLEdBQVMsQ0FBQztJQUNmLENBQUMsRUFBRSxFQUFFO0NBQ1IsQ0FBQyxDQUFBO0FBQ0YseUJBQXlCO0FBQ3pCLFNBQVMsSUFBSSxDQUFDLENBQXNCLElBQUcsQ0FBQztBQUFBLENBQUM7QUFDekMsSUFBSSxDQUFDLFVBQVMsQ0FBQztJQUNYLE9BQWEsQ0FBQyxFQUFFLENBQUMsQ0FBQztBQUN0QixDQUFDLENBQUMsQ0FBQztBQUVILDRCQUE0QjtBQUM1QixJQUFJLEtBQUssR0FBOEIsY0FBYSxPQUFPLFVBQVMsQ0FBQyxJQUFJLE9BQWEsQ0FBQyxFQUFFLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQztBQUUvRiwwQkFBMEI7QUFDMUI7SUFBYyxlQUFZLENBQXNCO0lBQUksQ0FBQztJQUFDLFlBQUM7QUFBRCxDQUFDLEFBQXZELElBQXVEO0FBQUEsQ0FBQztBQUN4RCxJQUFJLENBQUMsR0FBRyxJQUFJLEtBQUssQ0FBQyxVQUFTLENBQUMsSUFBSSxPQUFhLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUVyRCxxQ0FBcUM7QUFDckMsSUFBSSxLQUFLLEdBQTJCLENBQUMsVUFBUyxDQUFDLElBQUksT0FBTyxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUMvRCxJQUFJLEtBQUssR0FBVSxDQUFDO0lBQ2hCLENBQUMsRUFBRSxDQUFDO0NBQ1AsQ0FBQyxDQUFDO0FBQ0gsSUFBSSxLQUFLLEdBQWMsRUFBRSxDQUFDO0FBQzFCLElBQUksS0FBSyxHQUFnQixjQUFhLE9BQWEsQ0FBQyxFQUFFLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQztBQUMxRCxJQUFJLEtBQUssR0FBeUIsVUFBUyxDQUFDLElBQUksT0FBYSxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDO0FBQ3BFLElBQUksS0FBSyxHQUFvQyxVQUFTLENBQUMsRUFBRSxDQUFDLElBQUksT0FBYSxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDO0FBQ2xGLElBQUksS0FBSyxHQUdOLFVBQVMsQ0FBUSxJQUFJLE9BQU8sQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDO0FBRW5DLElBQUksS0FBSyxHQUFzQyxVQUFTLENBQUMsSUFBSSxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUN6RSxJQUFJLEtBQUssR0FBZ0IsQ0FBQyxFQUFFLEVBQUMsRUFBRSxDQUFDLENBQUM7QUFDakMsSUFBSSxNQUFNLEdBQVksQ0FBTyxDQUFDLEVBQUUsQ0FBQyxFQUFPLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztBQUM5QyxJQUFJLE1BQU0sR0FBeUMsQ0FBQyxVQUFTLENBQUMsRUFBRSxDQUFDLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNsRixJQUFJLE1BQU0sR0FBVTtJQUNoQixHQUFHLEVBQVEsQ0FBQyxFQUFFLENBQUM7Q0FDbEIsQ0FBQTtBQUNELElBQUksTUFBTSxHQUFVLENBQUM7SUFDakIsQ0FBQyxFQUFFLFVBQVMsQ0FBQyxFQUFFLENBQUMsSUFBSSxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUM7Q0FDbEMsQ0FBQyxDQUFBO0FBQ0YsSUFBSSxNQUFNLEdBQVUsQ0FBQztJQUNqQixDQUFDLEVBQUUsRUFBRTtDQUNSLENBQUMsQ0FBQTtBQU9GLFNBQVMsR0FBRyxDQUFDLENBQUMsRUFBQyxDQUFDLElBQUksT0FBTyxDQUFDLEdBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUVqQyxJQUFJLEdBQUcsR0FBRyxHQUFHLENBQUMsQ0FBQyxFQUFDLENBQUMsQ0FBQyxDQUFDO0FBY25CLEtBQUssQ0FBQyxNQUFNLEdBQUcsSUFBSSxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0FBRS9CLEtBQUssQ0FBQyxTQUFTLENBQUMsR0FBRyxHQUFHLFVBQVMsRUFBRSxFQUFFLEVBQUU7SUFDakMsT0FBTyxJQUFJLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxJQUFJLENBQUMsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDO0FBQy9DLENBQUMsQ0FBQztBQUVGLEtBQUssQ0FBQyxTQUFTLEdBQUc7SUFDZCxDQUFDLEVBQUUsQ0FBQztJQUNKLENBQUMsRUFBRSxDQUFDO0lBQ0osR0FBRyxFQUFFLFVBQVMsRUFBRSxFQUFFLEVBQUU7UUFDaEIsT0FBTyxJQUFJLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxJQUFJLENBQUMsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDO0lBQy9DLENBQUM7Q0FDSixDQUFDO0FBSUYsSUFBSSxDQUFDLEdBQU0sRUFBRyxDQUFDIn0=,Ly8gREVGQVVMVCBJTlRFUkZBQ0VTCmludGVyZmFjZSBJRm9vIHsKICAgIG46IG51bWJlcjsKICAgIHM6IHN0cmluZzsKICAgIGYoaTogbnVtYmVyLCBzOiBzdHJpbmcpOiBzdHJpbmc7CiAgICBhOiBudW1iZXJbXTsKfQoKaW50ZXJmYWNlIElCYXIgewogICAgZm9vOiBJRm9vOwp9CgovLyBDT05URVhUOiBDbGFzcyBwcm9wZXJ0eSBkZWNsYXJhdGlvbgpjbGFzcyBDMVQ1IHsKICAgIGZvbzogKGk6IG51bWJlciwgczogc3RyaW5nKSA9PiBudW1iZXIgPSBmdW5jdGlvbihpKSB7CiAgICAgICAgcmV0dXJuIGk7CiAgICB9Cn0KCi8vIENPTlRFWFQ6IE1vZHVsZSBwcm9wZXJ0eSBkZWNsYXJhdGlvbgptb2R1bGUgQzJUNSB7CiAgICBleHBvcnQgdmFyIGZvbzogKGk6IG51bWJlciwgczogc3RyaW5nKSA9PiBudW1iZXIgPSBmdW5jdGlvbihpKSB7CiAgICAgICAgcmV0dXJuIGk7CiAgICB9Cn0KCi8vIENPTlRFWFQ6IFZhcmlhYmxlIGRlY2xhcmF0aW9uCnZhciBjM3QxOiAoczogc3RyaW5nKSA9PiBzdHJpbmcgPSAoZnVuY3Rpb24ocykgeyByZXR1cm4gcyB9KTsKdmFyIGMzdDIgPSA8SUZvbz4oewogICAgbjogMQp9KQp2YXIgYzN0MzogbnVtYmVyW10gPSBbXTsKdmFyIGMzdDQ6ICgpID0+IElGb28gPSBmdW5jdGlvbigpIHsgcmV0dXJuIDxJRm9vPih7fSkgfTsKdmFyIGMzdDU6IChuOiBudW1iZXIpID0+IElGb28gPSBmdW5jdGlvbihuKSB7IHJldHVybiA8SUZvbz4oe30pIH07CnZhciBjM3Q2OiAobjogbnVtYmVyLCBzOiBzdHJpbmcpID0+IElGb28gPSBmdW5jdGlvbihuLCBzKSB7IHJldHVybiA8SUZvbz4oe30pIH07CnZhciBjM3Q3OiB7CiAgICAobjogbnVtYmVyKTogbnVtYmVyOyAgICAKICAgIChzMTogc3RyaW5nKTogbnVtYmVyOwp9ID0gZnVuY3Rpb24obikgeyByZXR1cm4gbjsgfTsKCnZhciBjM3Q4OiAobjogbnVtYmVyLCBzOiBzdHJpbmcpID0+IG51bWJlciA9IGZ1bmN0aW9uKG4pIHsgcmV0dXJuIG47IH07CnZhciBjM3Q5OiBudW1iZXJbXVtdID0gW1tdLFtdXTsKdmFyIGMzdDEwOiBJRm9vW10gPSBbPElGb28+KHt9KSw8SUZvbz4oe30pXTsKdmFyIGMzdDExOiB7KG46IG51bWJlciwgczogc3RyaW5nKTogc3RyaW5nO31bXSA9IFtmdW5jdGlvbihuLCBzKSB7IHJldHVybiBzOyB9XTsKdmFyIGMzdDEyOiBJQmFyID0gewogICAgZm9vOiA8SUZvbz4oe30pCn0KdmFyIGMzdDEzID0gPElGb28+KHsKICAgIGY6IGZ1bmN0aW9uKGksIHMpIHsgcmV0dXJuIHM7IH0KfSkKdmFyIGMzdDE0ID0gPElGb28+KHsKICAgIGE6IFtdCn0pCgovLyBDT05URVhUOiBDbGFzcyBwcm9wZXJ0eSBhc3NpZ25tZW50CmNsYXNzIEM0VDUgewogICAgZm9vOiAoaTogbnVtYmVyLCBzOiBzdHJpbmcpID0+IHN0cmluZzsKICAgIGNvbnN0cnVjdG9yKCkgewogICAgICAgIHRoaXMuZm9vID0gZnVuY3Rpb24oaSwgcykgewogICAgICAgICAgICByZXR1cm4gczsKICAgICAgICB9CiAgICB9Cn0KCi8vIENPTlRFWFQ6IE1vZHVsZSBwcm9wZXJ0eSBhc3NpZ25tZW50Cm1vZHVsZSBDNVQ1IHsKICAgIGV4cG9ydCB2YXIgZm9vOiAoaTogbnVtYmVyLCBzOiBzdHJpbmcpID0+IHN0cmluZzsKICAgIGZvbyA9IGZ1bmN0aW9uKGksIHMpIHsKICAgICAgICByZXR1cm4gczsKICAgIH0KfQoKLy8gQ09OVEVYVDogVmFyaWFibGUgYXNzaWdubWVudAp2YXIgYzZ0NTogKG46IG51bWJlcikgPT4gSUZvbzsKYzZ0NSA9IDwobjogbnVtYmVyKSA9PiBJRm9vPmZ1bmN0aW9uKG4pIHsgcmV0dXJuIDxJRm9vPih7fSkgfTsKCi8vIENPTlRFWFQ6IEFycmF5IGluZGV4IGFzc2lnbm1lbnQKdmFyIGM3dDI6IElGb29bXTsKYzd0MlswXSA9IDxJRm9vPih7bjogMX0pOwoKLy8gQ09OVEVYVDogT2JqZWN0IHByb3BlcnR5IGFzc2lnbm1lbnQKaW50ZXJmYWNlIElQbGFjZUhvbGRlciB7CiAgICB0MTogKHM6IHN0cmluZykgPT4gc3RyaW5nOwogICAgdDI6IElGb287CiAgICB0MzogbnVtYmVyW107CiAgICB0NDogKCkgPT4gSUZvbzsKICAgIHQ1OiAobjogbnVtYmVyKSA9PiBJRm9vOwogICAgdDY6IChuOiBudW1iZXIsIHM6IHN0cmluZykgPT4gSUZvbzsKICAgIHQ3OiB7CiAgICAgICAgICAgIChuOiBudW1iZXIsIHM6IHN0cmluZyk6IG51bWJlcjsgICAgCiAgICAgICAgICAgIC8vKHMxOiBzdHJpbmcsIHMyOiBzdHJpbmcpOiBudW1iZXI7CiAgICAgICAgfTsKICAgIHQ4OiAobjogbnVtYmVyLCBzOiBzdHJpbmcpID0+IG51bWJlcjsKICAgIHQ5OiBudW1iZXJbXVtdOwogICAgdDEwOiBJRm9vW107CiAgICB0MTE6IHsobjogbnVtYmVyLCBzOiBzdHJpbmcpOiBzdHJpbmc7fVtdOwogICAgdDEyOiBJQmFyOwogICAgdDEzOiBJRm9vOwogICAgdDE0OiBJRm9vOwogICAgfQoKdmFyIG9iamM4OiB7CiAgICB0MTogKHM6IHN0cmluZykgPT4gc3RyaW5nOwogICAgdDI6IElGb287CiAgICB0MzogbnVtYmVyW107CiAgICB0NDogKCkgPT4gSUZvbzsKICAgIHQ1OiAobjogbnVtYmVyKSA9PiBJRm9vOwogICAgdDY6IChuOiBudW1iZXIsIHM6IHN0cmluZykgPT4gSUZvbzsKICAgIHQ3OiB7CiAgICAgICAgICAgIChuOiBudW1iZXIsIHM6IHN0cmluZyk6IG51bWJlcjsgICAgCiAgICAgICAgICAgIC8vKHMxOiBzdHJpbmcsIHMyOiBzdHJpbmcpOiBudW1iZXI7CiAgICAgICAgfTsKICAgIHQ4OiAobjogbnVtYmVyLCBzOiBzdHJpbmcpID0+IG51bWJlcjsKICAgIHQ5OiBudW1iZXJbXVtdOwogICAgdDEwOiBJRm9vW107CiAgICB0MTE6IHsobjogbnVtYmVyLCBzOiBzdHJpbmcpOiBzdHJpbmc7fVtdOwogICAgdDEyOiBJQmFyOwogICAgdDEzOiBJRm9vOwogICAgdDE0OiBJRm9vOwp9ID0gPElQbGFjZUhvbGRlcj4oe30pOwoKb2JqYzgudDEgPSAoZnVuY3Rpb24ocykgeyByZXR1cm4gcyB9KTsKb2JqYzgudDIgPSA8SUZvbz4oewogICAgbjogMQp9KTsKb2JqYzgudDMgPSBbXTsKb2JqYzgudDQgPSBmdW5jdGlvbigpIHsgcmV0dXJuIDxJRm9vPih7fSkgfTsKb2JqYzgudDUgPSBmdW5jdGlvbihuKSB7IHJldHVybiA8SUZvbz4oe30pIH07Cm9iamM4LnQ2ID0gZnVuY3Rpb24obiwgcykgeyByZXR1cm4gPElGb28+KHt9KSB9OwpvYmpjOC50NyA9IGZ1bmN0aW9uKG46IG51bWJlcikgeyByZXR1cm4gbiB9OwoKb2JqYzgudDggPSBmdW5jdGlvbihuKSB7IHJldHVybiBuOyB9OwpvYmpjOC50OSA9IFtbXSxbXV07Cm9iamM4LnQxMCA9IFs8SUZvbz4oe30pLDxJRm9vPih7fSldOwpvYmpjOC50MTEgPSBbZnVuY3Rpb24obiwgcykgeyByZXR1cm4gczsgfV07Cm9iamM4LnQxMiA9IHsKICAgIGZvbzogPElGb28+KHt9KQp9Cm9iamM4LnQxMyA9IDxJRm9vPih7CiAgICBmOiBmdW5jdGlvbihpLCBzKSB7IHJldHVybiBzOyB9Cn0pCm9iamM4LnQxNCA9IDxJRm9vPih7CiAgICBhOiBbXQp9KQovLyBDT05URVhUOiBGdW5jdGlvbiBjYWxsCmZ1bmN0aW9uIGM5dDUoZjogKG46IG51bWJlcikgPT4gSUZvbykge307CmM5dDUoZnVuY3Rpb24obikgewogICAgcmV0dXJuIDxJRm9vPih7fSk7Cn0pOwoKLy8gQ09OVEVYVDogUmV0dXJuIHN0YXRlbWVudAp2YXIgYzEwdDU6ICgpID0+IChuOiBudW1iZXIpID0+IElGb28gPSBmdW5jdGlvbigpIHsgcmV0dXJuIGZ1bmN0aW9uKG4pIHsgcmV0dXJuIDxJRm9vPih7fSkgfSB9OwoKLy8gQ09OVEVYVDogTmV3aW5nIGEgY2xhc3MKY2xhc3MgQzExdDUgeyBjb25zdHJ1Y3RvcihmOiAobjogbnVtYmVyKSA9PiBJRm9vKSB7IH0gfTsKdmFyIGkgPSBuZXcgQzExdDUoZnVuY3Rpb24obikgeyByZXR1cm4gPElGb28+KHt9KSB9KTsKCi8vIENPTlRFWFQ6IFR5cGUgYW5ub3RhdGVkIGV4cHJlc3Npb24KdmFyIGMxMnQxID0gPChzOiBzdHJpbmcpID0+IHN0cmluZz4gKGZ1bmN0aW9uKHMpIHsgcmV0dXJuIHMgfSk7CnZhciBjMTJ0MiA9IDxJRm9vPiAoewogICAgbjogMQp9KTsKdmFyIGMxMnQzID0gPG51bWJlcltdPiBbXTsKdmFyIGMxMnQ0ID0gPCgpID0+IElGb28+IGZ1bmN0aW9uKCkgeyByZXR1cm4gPElGb28+KHt9KSB9Owp2YXIgYzEydDUgPSA8KG46IG51bWJlcikgPT4gSUZvbz4gZnVuY3Rpb24obikgeyByZXR1cm4gPElGb28+KHt9KSB9Owp2YXIgYzEydDYgPSA8KG46IG51bWJlciwgczogc3RyaW5nKSA9PiBJRm9vPiBmdW5jdGlvbihuLCBzKSB7IHJldHVybiA8SUZvbz4oe30pIH07CnZhciBjMTJ0NyA9IDx7CiAgICAobjogbnVtYmVyLCBzOiBzdHJpbmcpOiBudW1iZXI7ICAgIAogICAgLy8oczE6IHN0cmluZywgczI6IHN0cmluZyk6IG51bWJlcjsKfT4gZnVuY3Rpb24objpudW1iZXIpIHsgcmV0dXJuIG4gfTsKCnZhciBjMTJ0OCA9IDwobjogbnVtYmVyLCBzOiBzdHJpbmcpID0+IG51bWJlcj4gZnVuY3Rpb24obikgeyByZXR1cm4gbjsgfTsKdmFyIGMxMnQ5ID0gPG51bWJlcltdW10+IFtbXSxbXV07CnZhciBjMTJ0MTAgPSA8SUZvb1tdPiBbPElGb28+KHt9KSw8SUZvbz4oe30pXTsKdmFyIGMxMnQxMSA9IDx7KG46IG51bWJlciwgczogc3RyaW5nKTogc3RyaW5nO31bXT4gW2Z1bmN0aW9uKG4sIHMpIHsgcmV0dXJuIHM7IH1dOwp2YXIgYzEydDEyID0gPElCYXI+IHsKICAgIGZvbzogPElGb28+KHt9KQp9CnZhciBjMTJ0MTMgPSA8SUZvbz4gKHsKICAgIGY6IGZ1bmN0aW9uKGksIHMpIHsgcmV0dXJuIHM7IH0KfSkKdmFyIGMxMnQxNCA9IDxJRm9vPiAoewogICAgYTogW10KfSkKCi8vIENPTlRFWFQ6IENvbnRleHR1YWwgdHlwaW5nIGRlY2xhcmF0aW9ucwoKLy8gY29udGV4dHVhbGx5IHR5cGluZyBmdW5jdGlvbiBkZWNsYXJhdGlvbnMKZGVjbGFyZSBmdW5jdGlvbiBFRjEoYTpudW1iZXIsIGI6bnVtYmVyKTpudW1iZXI7CgpmdW5jdGlvbiBFRjEoYSxiKSB7IHJldHVybiBhK2I7IH0KCnZhciBlZnYgPSBFRjEoMSwyKTsKCgovLyBjb250ZXh0dWFsbHkgdHlwaW5nIGZyb20gYW1iaWVudCBjbGFzcyBkZWNsYXJhdGlvbnMKZGVjbGFyZSBjbGFzcyBQb2ludAp7CiAgICAgIGNvbnN0cnVjdG9yKHg6IG51bWJlciwgeTogbnVtYmVyKTsKICAgICAgeDogbnVtYmVyOwogICAgICB5OiBudW1iZXI7CiAgICAgIGFkZChkeDogbnVtYmVyLCBkeTogbnVtYmVyKTogUG9pbnQ7CiAgICAgIHN0YXRpYyBvcmlnaW46IFBvaW50OwoKfQoKUG9pbnQub3JpZ2luID0gbmV3IFBvaW50KDAsIDApOwoKUG9pbnQucHJvdG90eXBlLmFkZCA9IGZ1bmN0aW9uKGR4LCBkeSkgewogICAgcmV0dXJuIG5ldyBQb2ludCh0aGlzLnggKyBkeCwgdGhpcy55ICsgZHkpOwp9OwoKUG9pbnQucHJvdG90eXBlID0gewogICAgeDogMCwKICAgIHk6IDAsCiAgICBhZGQ6IGZ1bmN0aW9uKGR4LCBkeSkgewogICAgICAgIHJldHVybiBuZXcgUG9pbnQodGhpcy54ICsgZHgsIHRoaXMueSArIGR5KTsKICAgIH0KfTsKCmludGVyZmFjZSBBIHsgeDogc3RyaW5nOyB9CmludGVyZmFjZSBCIGV4dGVuZHMgQSB7IH0KdmFyIHg6IEIgPSB7IH07Cg== +{"version":3,"file":"contextualTyping.js","sourceRoot":"","sources":["contextualTyping.ts"],"names":[],"mappings":"AAYA,sCAAsC;AACtC;IAAA;QACI,QAAG,GAAqC,UAAS,CAAC;YAC9C,OAAO,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;IAAD,WAAC;AAAD,CAAC,AAJD,IAIC;AAED,uCAAuC;AACvC,IAAU,IAAI,CAIb;AAJD,WAAU,IAAI;IACC,QAAG,GAAqC,UAAS,CAAC;QACzD,OAAO,CAAC,CAAC;IACb,CAAC,CAAA;AACL,CAAC,EAJS,IAAI,KAAJ,IAAI,QAIb;AAED,gCAAgC;AAChC,IAAI,IAAI,GAA0B,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC7D,IAAI,IAAI,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAA;AACF,IAAI,IAAI,GAAa,EAAE,CAAC;AACxB,IAAI,IAAI,GAAe,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACxD,IAAI,IAAI,GAAwB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClE,IAAI,IAAI,GAAmC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChF,IAAI,IAAI,GAGJ,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9B,IAAI,IAAI,GAAqC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACvE,IAAI,IAAI,GAAe,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AAC/B,IAAI,KAAK,GAAW,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC5C,IAAI,KAAK,GAAwC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChF,IAAI,KAAK,GAAS;IACd,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAEF,qCAAqC;AACrC;IAEI;QACI,IAAI,CAAC,GAAG,GAAG,UAAS,CAAC,EAAE,CAAC;YACpB,OAAO,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;IACL,WAAC;AAAD,CAAC,AAPD,IAOC;AAED,sCAAsC;AACtC,IAAU,IAAI,CAKb;AALD,WAAU,IAAI;IAEV,KAAA,GAAG,GAAG,UAAS,CAAC,EAAE,CAAC;QACf,OAAO,CAAC,CAAC;IACb,CAAC,CAAA;AACL,CAAC,EALS,IAAI,KAAJ,IAAI,QAKb;AAED,+BAA+B;AAC/B,IAAI,IAAyB,CAAC;AAC9B,IAAI,GAAwB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAE9D,kCAAkC;AAClC,IAAI,IAAY,CAAC;AACjB,IAAI,CAAC,CAAC,CAAC,GAAS,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC;AAuBzB,IAAI,KAAK,GAkBS,CAAC,EAAE,CAAC,CAAC;AAEvB,KAAK,CAAC,EAAE,GAAG,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AACtC,KAAK,CAAC,EAAE,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;AACd,KAAK,CAAC,EAAE,GAAG,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC7C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChD,KAAK,CAAC,EAAE,GAAG,UAAS,CAAS,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC;AAE5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACrC,KAAK,CAAC,EAAE,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACnB,KAAK,CAAC,GAAG,GAAG,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AACpC,KAAK,CAAC,GAAG,GAAG,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3C,KAAK,CAAC,GAAG,GAAG;IACR,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AACF,yBAAyB;AACzB,SAAS,IAAI,CAAC,CAAsB,IAAG,CAAC;AAAA,CAAC;AACzC,IAAI,CAAC,UAAS,CAAC;IACX,OAAa,CAAC,EAAE,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAEH,4BAA4B;AAC5B,IAAI,KAAK,GAA8B,cAAa,OAAO,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAE/F,0BAA0B;AAC1B;IAAc,eAAY,CAAsB;IAAI,CAAC;IAAC,YAAC;AAAD,CAAC,AAAvD,IAAuD;AAAA,CAAC;AACxD,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAErD,qCAAqC;AACrC,IAAI,KAAK,GAA2B,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC/D,IAAI,KAAK,GAAU,CAAC;IAChB,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,IAAI,KAAK,GAAc,EAAE,CAAC;AAC1B,IAAI,KAAK,GAAgB,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC1D,IAAI,KAAK,GAAyB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACpE,IAAI,KAAK,GAAoC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClF,IAAI,KAAK,GAGN,UAAS,CAAQ,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC;AAEnC,IAAI,KAAK,GAAsC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,IAAI,KAAK,GAAgB,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACjC,IAAI,MAAM,GAAY,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9C,IAAI,MAAM,GAAyC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClF,IAAI,MAAM,GAAU;IAChB,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAOF,SAAS,GAAG,CAAC,CAAC,EAAC,CAAC,IAAI,OAAO,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC;AAEjC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC;AAcnB,KAAK,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/B,KAAK,CAAC,SAAS,CAAC,GAAG,GAAG,UAAS,EAAE,EAAE,EAAE;IACjC,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,KAAK,CAAC,SAAS,GAAG;IACd,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,GAAG,EAAE,UAAS,EAAE,EAAE,EAAE;QAChB,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAC;AAIF,IAAI,CAAC,GAAM,EAAG,CAAC"} +//// https://sokra.github.io/source-map-visualization#base64,Ly8gQ09OVEVYVDogQ2xhc3MgcHJvcGVydHkgZGVjbGFyYXRpb24NCnZhciBDMVQ1ID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgIGZ1bmN0aW9uIEMxVDUoKSB7DQogICAgICAgIHRoaXMuZm9vID0gZnVuY3Rpb24gKGkpIHsNCiAgICAgICAgICAgIHJldHVybiBpOw0KICAgICAgICB9Ow0KICAgIH0NCiAgICByZXR1cm4gQzFUNTsNCn0oKSk7DQovLyBDT05URVhUOiBNb2R1bGUgcHJvcGVydHkgZGVjbGFyYXRpb24NCnZhciBDMlQ1Ow0KKGZ1bmN0aW9uIChDMlQ1KSB7DQogICAgQzJUNS5mb28gPSBmdW5jdGlvbiAoaSkgew0KICAgICAgICByZXR1cm4gaTsNCiAgICB9Ow0KfSkoQzJUNSB8fCAoQzJUNSA9IHt9KSk7DQovLyBDT05URVhUOiBWYXJpYWJsZSBkZWNsYXJhdGlvbg0KdmFyIGMzdDEgPSAoZnVuY3Rpb24gKHMpIHsgcmV0dXJuIHM7IH0pOw0KdmFyIGMzdDIgPSAoew0KICAgIG46IDENCn0pOw0KdmFyIGMzdDMgPSBbXTsNCnZhciBjM3Q0ID0gZnVuY3Rpb24gKCkgeyByZXR1cm4gKHt9KTsgfTsNCnZhciBjM3Q1ID0gZnVuY3Rpb24gKG4pIHsgcmV0dXJuICh7fSk7IH07DQp2YXIgYzN0NiA9IGZ1bmN0aW9uIChuLCBzKSB7IHJldHVybiAoe30pOyB9Ow0KdmFyIGMzdDcgPSBmdW5jdGlvbiAobikgeyByZXR1cm4gbjsgfTsNCnZhciBjM3Q4ID0gZnVuY3Rpb24gKG4pIHsgcmV0dXJuIG47IH07DQp2YXIgYzN0OSA9IFtbXSwgW11dOw0KdmFyIGMzdDEwID0gWyh7fSksICh7fSldOw0KdmFyIGMzdDExID0gW2Z1bmN0aW9uIChuLCBzKSB7IHJldHVybiBzOyB9XTsNCnZhciBjM3QxMiA9IHsNCiAgICBmb286ICh7fSkNCn07DQp2YXIgYzN0MTMgPSAoew0KICAgIGY6IGZ1bmN0aW9uIChpLCBzKSB7IHJldHVybiBzOyB9DQp9KTsNCnZhciBjM3QxNCA9ICh7DQogICAgYTogW10NCn0pOw0KLy8gQ09OVEVYVDogQ2xhc3MgcHJvcGVydHkgYXNzaWdubWVudA0KdmFyIEM0VDUgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgZnVuY3Rpb24gQzRUNSgpIHsNCiAgICAgICAgdGhpcy5mb28gPSBmdW5jdGlvbiAoaSwgcykgew0KICAgICAgICAgICAgcmV0dXJuIHM7DQogICAgICAgIH07DQogICAgfQ0KICAgIHJldHVybiBDNFQ1Ow0KfSgpKTsNCi8vIENPTlRFWFQ6IE1vZHVsZSBwcm9wZXJ0eSBhc3NpZ25tZW50DQp2YXIgQzVUNTsNCihmdW5jdGlvbiAoQzVUNSkgew0KICAgIEM1VDUuZm9vID0gZnVuY3Rpb24gKGksIHMpIHsNCiAgICAgICAgcmV0dXJuIHM7DQogICAgfTsNCn0pKEM1VDUgfHwgKEM1VDUgPSB7fSkpOw0KLy8gQ09OVEVYVDogVmFyaWFibGUgYXNzaWdubWVudA0KdmFyIGM2dDU7DQpjNnQ1ID0gZnVuY3Rpb24gKG4pIHsgcmV0dXJuICh7fSk7IH07DQovLyBDT05URVhUOiBBcnJheSBpbmRleCBhc3NpZ25tZW50DQp2YXIgYzd0MjsNCmM3dDJbMF0gPSAoeyBuOiAxIH0pOw0KdmFyIG9iamM4ID0gKHt9KTsNCm9iamM4LnQxID0gKGZ1bmN0aW9uIChzKSB7IHJldHVybiBzOyB9KTsNCm9iamM4LnQyID0gKHsNCiAgICBuOiAxDQp9KTsNCm9iamM4LnQzID0gW107DQpvYmpjOC50NCA9IGZ1bmN0aW9uICgpIHsgcmV0dXJuICh7fSk7IH07DQpvYmpjOC50NSA9IGZ1bmN0aW9uIChuKSB7IHJldHVybiAoe30pOyB9Ow0Kb2JqYzgudDYgPSBmdW5jdGlvbiAobiwgcykgeyByZXR1cm4gKHt9KTsgfTsNCm9iamM4LnQ3ID0gZnVuY3Rpb24gKG4pIHsgcmV0dXJuIG47IH07DQpvYmpjOC50OCA9IGZ1bmN0aW9uIChuKSB7IHJldHVybiBuOyB9Ow0Kb2JqYzgudDkgPSBbW10sIFtdXTsNCm9iamM4LnQxMCA9IFsoe30pLCAoe30pXTsNCm9iamM4LnQxMSA9IFtmdW5jdGlvbiAobiwgcykgeyByZXR1cm4gczsgfV07DQpvYmpjOC50MTIgPSB7DQogICAgZm9vOiAoe30pDQp9Ow0Kb2JqYzgudDEzID0gKHsNCiAgICBmOiBmdW5jdGlvbiAoaSwgcykgeyByZXR1cm4gczsgfQ0KfSk7DQpvYmpjOC50MTQgPSAoew0KICAgIGE6IFtdDQp9KTsNCi8vIENPTlRFWFQ6IEZ1bmN0aW9uIGNhbGwNCmZ1bmN0aW9uIGM5dDUoZikgeyB9DQo7DQpjOXQ1KGZ1bmN0aW9uIChuKSB7DQogICAgcmV0dXJuICh7fSk7DQp9KTsNCi8vIENPTlRFWFQ6IFJldHVybiBzdGF0ZW1lbnQNCnZhciBjMTB0NSA9IGZ1bmN0aW9uICgpIHsgcmV0dXJuIGZ1bmN0aW9uIChuKSB7IHJldHVybiAoe30pOyB9OyB9Ow0KLy8gQ09OVEVYVDogTmV3aW5nIGEgY2xhc3MNCnZhciBDMTF0NSA9IC8qKiBAY2xhc3MgKi8gKGZ1bmN0aW9uICgpIHsNCiAgICBmdW5jdGlvbiBDMTF0NShmKSB7DQogICAgfQ0KICAgIHJldHVybiBDMTF0NTsNCn0oKSk7DQo7DQp2YXIgaSA9IG5ldyBDMTF0NShmdW5jdGlvbiAobikgeyByZXR1cm4gKHt9KTsgfSk7DQovLyBDT05URVhUOiBUeXBlIGFubm90YXRlZCBleHByZXNzaW9uDQp2YXIgYzEydDEgPSAoZnVuY3Rpb24gKHMpIHsgcmV0dXJuIHM7IH0pOw0KdmFyIGMxMnQyID0gKHsNCiAgICBuOiAxDQp9KTsNCnZhciBjMTJ0MyA9IFtdOw0KdmFyIGMxMnQ0ID0gZnVuY3Rpb24gKCkgeyByZXR1cm4gKHt9KTsgfTsNCnZhciBjMTJ0NSA9IGZ1bmN0aW9uIChuKSB7IHJldHVybiAoe30pOyB9Ow0KdmFyIGMxMnQ2ID0gZnVuY3Rpb24gKG4sIHMpIHsgcmV0dXJuICh7fSk7IH07DQp2YXIgYzEydDcgPSBmdW5jdGlvbiAobikgeyByZXR1cm4gbjsgfTsNCnZhciBjMTJ0OCA9IGZ1bmN0aW9uIChuKSB7IHJldHVybiBuOyB9Ow0KdmFyIGMxMnQ5ID0gW1tdLCBbXV07DQp2YXIgYzEydDEwID0gWyh7fSksICh7fSldOw0KdmFyIGMxMnQxMSA9IFtmdW5jdGlvbiAobiwgcykgeyByZXR1cm4gczsgfV07DQp2YXIgYzEydDEyID0gew0KICAgIGZvbzogKHt9KQ0KfTsNCnZhciBjMTJ0MTMgPSAoew0KICAgIGY6IGZ1bmN0aW9uIChpLCBzKSB7IHJldHVybiBzOyB9DQp9KTsNCnZhciBjMTJ0MTQgPSAoew0KICAgIGE6IFtdDQp9KTsNCmZ1bmN0aW9uIEVGMShhLCBiKSB7IHJldHVybiBhICsgYjsgfQ0KdmFyIGVmdiA9IEVGMSgxLCAyKTsNClBvaW50Lm9yaWdpbiA9IG5ldyBQb2ludCgwLCAwKTsNClBvaW50LnByb3RvdHlwZS5hZGQgPSBmdW5jdGlvbiAoZHgsIGR5KSB7DQogICAgcmV0dXJuIG5ldyBQb2ludCh0aGlzLnggKyBkeCwgdGhpcy55ICsgZHkpOw0KfTsNClBvaW50LnByb3RvdHlwZSA9IHsNCiAgICB4OiAwLA0KICAgIHk6IDAsDQogICAgYWRkOiBmdW5jdGlvbiAoZHgsIGR5KSB7DQogICAgICAgIHJldHVybiBuZXcgUG9pbnQodGhpcy54ICsgZHgsIHRoaXMueSArIGR5KTsNCiAgICB9DQp9Ow0KdmFyIHggPSB7fTsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPWNvbnRleHR1YWxUeXBpbmcuanMubWFw,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGV4dHVhbFR5cGluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNvbnRleHR1YWxUeXBpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBWUEsc0NBQXNDO0FBQ3RDO0lBQUE7UUFDSSxRQUFHLEdBQXFDLFVBQVMsQ0FBQztZQUM5QyxPQUFPLENBQUMsQ0FBQztRQUNiLENBQUMsQ0FBQTtJQUNMLENBQUM7SUFBRCxXQUFDO0FBQUQsQ0FBQyxBQUpELElBSUM7QUFFRCx1Q0FBdUM7QUFDdkMsSUFBVSxJQUFJLENBSWI7QUFKRCxXQUFVLElBQUk7SUFDQyxRQUFHLEdBQXFDLFVBQVMsQ0FBQztRQUN6RCxPQUFPLENBQUMsQ0FBQztJQUNiLENBQUMsQ0FBQTtBQUNMLENBQUMsRUFKUyxJQUFJLEtBQUosSUFBSSxRQUliO0FBRUQsZ0NBQWdDO0FBQ2hDLElBQUksSUFBSSxHQUEwQixDQUFDLFVBQVMsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDN0QsSUFBSSxJQUFJLEdBQVMsQ0FBQztJQUNkLENBQUMsRUFBRSxDQUFDO0NBQ1AsQ0FBQyxDQUFBO0FBQ0YsSUFBSSxJQUFJLEdBQWEsRUFBRSxDQUFDO0FBQ3hCLElBQUksSUFBSSxHQUFlLGNBQWEsT0FBYSxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDO0FBQ3hELElBQUksSUFBSSxHQUF3QixVQUFTLENBQUMsSUFBSSxPQUFhLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUM7QUFDbEUsSUFBSSxJQUFJLEdBQW1DLFVBQVMsQ0FBQyxFQUFFLENBQUMsSUFBSSxPQUFhLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUM7QUFDaEYsSUFBSSxJQUFJLEdBR0osVUFBUyxDQUFDLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFFOUIsSUFBSSxJQUFJLEdBQXFDLFVBQVMsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3ZFLElBQUksSUFBSSxHQUFlLENBQUMsRUFBRSxFQUFDLEVBQUUsQ0FBQyxDQUFDO0FBQy9CLElBQUksS0FBSyxHQUFXLENBQU8sQ0FBQyxFQUFFLENBQUMsRUFBTyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDNUMsSUFBSSxLQUFLLEdBQXdDLENBQUMsVUFBUyxDQUFDLEVBQUUsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDaEYsSUFBSSxLQUFLLEdBQVM7SUFDZCxHQUFHLEVBQVEsQ0FBQyxFQUFFLENBQUM7Q0FDbEIsQ0FBQTtBQUNELElBQUksS0FBSyxHQUFTLENBQUM7SUFDZixDQUFDLEVBQUUsVUFBUyxDQUFDLEVBQUUsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQztDQUNsQyxDQUFDLENBQUE7QUFDRixJQUFJLEtBQUssR0FBUyxDQUFDO0lBQ2YsQ0FBQyxFQUFFLEVBQUU7Q0FDUixDQUFDLENBQUE7QUFFRixxQ0FBcUM7QUFDckM7SUFFSTtRQUNJLElBQUksQ0FBQyxHQUFHLEdBQUcsVUFBUyxDQUFDLEVBQUUsQ0FBQztZQUNwQixPQUFPLENBQUMsQ0FBQztRQUNiLENBQUMsQ0FBQTtJQUNMLENBQUM7SUFDTCxXQUFDO0FBQUQsQ0FBQyxBQVBELElBT0M7QUFFRCxzQ0FBc0M7QUFDdEMsSUFBVSxJQUFJLENBS2I7QUFMRCxXQUFVLElBQUk7SUFFVixLQUFBLEdBQUcsR0FBRyxVQUFTLENBQUMsRUFBRSxDQUFDO1FBQ2YsT0FBTyxDQUFDLENBQUM7SUFDYixDQUFDLENBQUE7QUFDTCxDQUFDLEVBTFMsSUFBSSxLQUFKLElBQUksUUFLYjtBQUVELCtCQUErQjtBQUMvQixJQUFJLElBQXlCLENBQUM7QUFDOUIsSUFBSSxHQUF3QixVQUFTLENBQUMsSUFBSSxPQUFhLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUM7QUFFOUQsa0NBQWtDO0FBQ2xDLElBQUksSUFBWSxDQUFDO0FBQ2pCLElBQUksQ0FBQyxDQUFDLENBQUMsR0FBUyxDQUFDLEVBQUMsQ0FBQyxFQUFFLENBQUMsRUFBQyxDQUFDLENBQUM7QUF1QnpCLElBQUksS0FBSyxHQWtCUyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0FBRXZCLEtBQUssQ0FBQyxFQUFFLEdBQUcsQ0FBQyxVQUFTLENBQUMsSUFBSSxPQUFPLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3RDLEtBQUssQ0FBQyxFQUFFLEdBQVMsQ0FBQztJQUNkLENBQUMsRUFBRSxDQUFDO0NBQ1AsQ0FBQyxDQUFDO0FBQ0gsS0FBSyxDQUFDLEVBQUUsR0FBRyxFQUFFLENBQUM7QUFDZCxLQUFLLENBQUMsRUFBRSxHQUFHLGNBQWEsT0FBYSxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDO0FBQzVDLEtBQUssQ0FBQyxFQUFFLEdBQUcsVUFBUyxDQUFDLElBQUksT0FBYSxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDO0FBQzdDLEtBQUssQ0FBQyxFQUFFLEdBQUcsVUFBUyxDQUFDLEVBQUUsQ0FBQyxJQUFJLE9BQWEsQ0FBQyxFQUFFLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQztBQUNoRCxLQUFLLENBQUMsRUFBRSxHQUFHLFVBQVMsQ0FBUyxJQUFJLE9BQU8sQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDO0FBRTVDLEtBQUssQ0FBQyxFQUFFLEdBQUcsVUFBUyxDQUFDLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDckMsS0FBSyxDQUFDLEVBQUUsR0FBRyxDQUFDLEVBQUUsRUFBQyxFQUFFLENBQUMsQ0FBQztBQUNuQixLQUFLLENBQUMsR0FBRyxHQUFHLENBQU8sQ0FBQyxFQUFFLENBQUMsRUFBTyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDcEMsS0FBSyxDQUFDLEdBQUcsR0FBRyxDQUFDLFVBQVMsQ0FBQyxFQUFFLENBQUMsSUFBSSxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQzNDLEtBQUssQ0FBQyxHQUFHLEdBQUc7SUFDUixHQUFHLEVBQVEsQ0FBQyxFQUFFLENBQUM7Q0FDbEIsQ0FBQTtBQUNELEtBQUssQ0FBQyxHQUFHLEdBQVMsQ0FBQztJQUNmLENBQUMsRUFBRSxVQUFTLENBQUMsRUFBRSxDQUFDLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDO0NBQ2xDLENBQUMsQ0FBQTtBQUNGLEtBQUssQ0FBQyxHQUFHLEdBQVMsQ0FBQztJQUNmLENBQUMsRUFBRSxFQUFFO0NBQ1IsQ0FBQyxDQUFBO0FBQ0YseUJBQXlCO0FBQ3pCLFNBQVMsSUFBSSxDQUFDLENBQXNCLElBQUcsQ0FBQztBQUFBLENBQUM7QUFDekMsSUFBSSxDQUFDLFVBQVMsQ0FBQztJQUNYLE9BQWEsQ0FBQyxFQUFFLENBQUMsQ0FBQztBQUN0QixDQUFDLENBQUMsQ0FBQztBQUVILDRCQUE0QjtBQUM1QixJQUFJLEtBQUssR0FBOEIsY0FBYSxPQUFPLFVBQVMsQ0FBQyxJQUFJLE9BQWEsQ0FBQyxFQUFFLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQztBQUUvRiwwQkFBMEI7QUFDMUI7SUFBYyxlQUFZLENBQXNCO0lBQUksQ0FBQztJQUFDLFlBQUM7QUFBRCxDQUFDLEFBQXZELElBQXVEO0FBQUEsQ0FBQztBQUN4RCxJQUFJLENBQUMsR0FBRyxJQUFJLEtBQUssQ0FBQyxVQUFTLENBQUMsSUFBSSxPQUFhLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUVyRCxxQ0FBcUM7QUFDckMsSUFBSSxLQUFLLEdBQTJCLENBQUMsVUFBUyxDQUFDLElBQUksT0FBTyxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUMvRCxJQUFJLEtBQUssR0FBVSxDQUFDO0lBQ2hCLENBQUMsRUFBRSxDQUFDO0NBQ1AsQ0FBQyxDQUFDO0FBQ0gsSUFBSSxLQUFLLEdBQWMsRUFBRSxDQUFDO0FBQzFCLElBQUksS0FBSyxHQUFnQixjQUFhLE9BQWEsQ0FBQyxFQUFFLENBQUMsQ0FBQSxDQUFDLENBQUMsQ0FBQztBQUMxRCxJQUFJLEtBQUssR0FBeUIsVUFBUyxDQUFDLElBQUksT0FBYSxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDO0FBQ3BFLElBQUksS0FBSyxHQUFvQyxVQUFTLENBQUMsRUFBRSxDQUFDLElBQUksT0FBYSxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDO0FBQ2xGLElBQUksS0FBSyxHQUdOLFVBQVMsQ0FBUSxJQUFJLE9BQU8sQ0FBQyxDQUFBLENBQUMsQ0FBQyxDQUFDO0FBRW5DLElBQUksS0FBSyxHQUFzQyxVQUFTLENBQUMsSUFBSSxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUN6RSxJQUFJLEtBQUssR0FBZ0IsQ0FBQyxFQUFFLEVBQUMsRUFBRSxDQUFDLENBQUM7QUFDakMsSUFBSSxNQUFNLEdBQVksQ0FBTyxDQUFDLEVBQUUsQ0FBQyxFQUFPLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztBQUM5QyxJQUFJLE1BQU0sR0FBeUMsQ0FBQyxVQUFTLENBQUMsRUFBRSxDQUFDLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNsRixJQUFJLE1BQU0sR0FBVTtJQUNoQixHQUFHLEVBQVEsQ0FBQyxFQUFFLENBQUM7Q0FDbEIsQ0FBQTtBQUNELElBQUksTUFBTSxHQUFVLENBQUM7SUFDakIsQ0FBQyxFQUFFLFVBQVMsQ0FBQyxFQUFFLENBQUMsSUFBSSxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUM7Q0FDbEMsQ0FBQyxDQUFBO0FBQ0YsSUFBSSxNQUFNLEdBQVUsQ0FBQztJQUNqQixDQUFDLEVBQUUsRUFBRTtDQUNSLENBQUMsQ0FBQTtBQU9GLFNBQVMsR0FBRyxDQUFDLENBQUMsRUFBQyxDQUFDLElBQUksT0FBTyxDQUFDLEdBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUVqQyxJQUFJLEdBQUcsR0FBRyxHQUFHLENBQUMsQ0FBQyxFQUFDLENBQUMsQ0FBQyxDQUFDO0FBY25CLEtBQUssQ0FBQyxNQUFNLEdBQUcsSUFBSSxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0FBRS9CLEtBQUssQ0FBQyxTQUFTLENBQUMsR0FBRyxHQUFHLFVBQVMsRUFBRSxFQUFFLEVBQUU7SUFDakMsT0FBTyxJQUFJLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxJQUFJLENBQUMsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDO0FBQy9DLENBQUMsQ0FBQztBQUVGLEtBQUssQ0FBQyxTQUFTLEdBQUc7SUFDZCxDQUFDLEVBQUUsQ0FBQztJQUNKLENBQUMsRUFBRSxDQUFDO0lBQ0osR0FBRyxFQUFFLFVBQVMsRUFBRSxFQUFFLEVBQUU7UUFDaEIsT0FBTyxJQUFJLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxJQUFJLENBQUMsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDO0lBQy9DLENBQUM7Q0FDSixDQUFDO0FBSUYsSUFBSSxDQUFDLEdBQU0sRUFBRyxDQUFDIn0=,Ly8gREVGQVVMVCBJTlRFUkZBQ0VTCmludGVyZmFjZSBJRm9vIHsKICAgIG46IG51bWJlcjsKICAgIHM6IHN0cmluZzsKICAgIGYoaTogbnVtYmVyLCBzOiBzdHJpbmcpOiBzdHJpbmc7CiAgICBhOiBudW1iZXJbXTsKfQoKaW50ZXJmYWNlIElCYXIgewogICAgZm9vOiBJRm9vOwp9CgovLyBDT05URVhUOiBDbGFzcyBwcm9wZXJ0eSBkZWNsYXJhdGlvbgpjbGFzcyBDMVQ1IHsKICAgIGZvbzogKGk6IG51bWJlciwgczogc3RyaW5nKSA9PiBudW1iZXIgPSBmdW5jdGlvbihpKSB7CiAgICAgICAgcmV0dXJuIGk7CiAgICB9Cn0KCi8vIENPTlRFWFQ6IE1vZHVsZSBwcm9wZXJ0eSBkZWNsYXJhdGlvbgpuYW1lc3BhY2UgQzJUNSB7CiAgICBleHBvcnQgdmFyIGZvbzogKGk6IG51bWJlciwgczogc3RyaW5nKSA9PiBudW1iZXIgPSBmdW5jdGlvbihpKSB7CiAgICAgICAgcmV0dXJuIGk7CiAgICB9Cn0KCi8vIENPTlRFWFQ6IFZhcmlhYmxlIGRlY2xhcmF0aW9uCnZhciBjM3QxOiAoczogc3RyaW5nKSA9PiBzdHJpbmcgPSAoZnVuY3Rpb24ocykgeyByZXR1cm4gcyB9KTsKdmFyIGMzdDIgPSA8SUZvbz4oewogICAgbjogMQp9KQp2YXIgYzN0MzogbnVtYmVyW10gPSBbXTsKdmFyIGMzdDQ6ICgpID0+IElGb28gPSBmdW5jdGlvbigpIHsgcmV0dXJuIDxJRm9vPih7fSkgfTsKdmFyIGMzdDU6IChuOiBudW1iZXIpID0+IElGb28gPSBmdW5jdGlvbihuKSB7IHJldHVybiA8SUZvbz4oe30pIH07CnZhciBjM3Q2OiAobjogbnVtYmVyLCBzOiBzdHJpbmcpID0+IElGb28gPSBmdW5jdGlvbihuLCBzKSB7IHJldHVybiA8SUZvbz4oe30pIH07CnZhciBjM3Q3OiB7CiAgICAobjogbnVtYmVyKTogbnVtYmVyOyAgICAKICAgIChzMTogc3RyaW5nKTogbnVtYmVyOwp9ID0gZnVuY3Rpb24obikgeyByZXR1cm4gbjsgfTsKCnZhciBjM3Q4OiAobjogbnVtYmVyLCBzOiBzdHJpbmcpID0+IG51bWJlciA9IGZ1bmN0aW9uKG4pIHsgcmV0dXJuIG47IH07CnZhciBjM3Q5OiBudW1iZXJbXVtdID0gW1tdLFtdXTsKdmFyIGMzdDEwOiBJRm9vW10gPSBbPElGb28+KHt9KSw8SUZvbz4oe30pXTsKdmFyIGMzdDExOiB7KG46IG51bWJlciwgczogc3RyaW5nKTogc3RyaW5nO31bXSA9IFtmdW5jdGlvbihuLCBzKSB7IHJldHVybiBzOyB9XTsKdmFyIGMzdDEyOiBJQmFyID0gewogICAgZm9vOiA8SUZvbz4oe30pCn0KdmFyIGMzdDEzID0gPElGb28+KHsKICAgIGY6IGZ1bmN0aW9uKGksIHMpIHsgcmV0dXJuIHM7IH0KfSkKdmFyIGMzdDE0ID0gPElGb28+KHsKICAgIGE6IFtdCn0pCgovLyBDT05URVhUOiBDbGFzcyBwcm9wZXJ0eSBhc3NpZ25tZW50CmNsYXNzIEM0VDUgewogICAgZm9vOiAoaTogbnVtYmVyLCBzOiBzdHJpbmcpID0+IHN0cmluZzsKICAgIGNvbnN0cnVjdG9yKCkgewogICAgICAgIHRoaXMuZm9vID0gZnVuY3Rpb24oaSwgcykgewogICAgICAgICAgICByZXR1cm4gczsKICAgICAgICB9CiAgICB9Cn0KCi8vIENPTlRFWFQ6IE1vZHVsZSBwcm9wZXJ0eSBhc3NpZ25tZW50Cm5hbWVzcGFjZSBDNVQ1IHsKICAgIGV4cG9ydCB2YXIgZm9vOiAoaTogbnVtYmVyLCBzOiBzdHJpbmcpID0+IHN0cmluZzsKICAgIGZvbyA9IGZ1bmN0aW9uKGksIHMpIHsKICAgICAgICByZXR1cm4gczsKICAgIH0KfQoKLy8gQ09OVEVYVDogVmFyaWFibGUgYXNzaWdubWVudAp2YXIgYzZ0NTogKG46IG51bWJlcikgPT4gSUZvbzsKYzZ0NSA9IDwobjogbnVtYmVyKSA9PiBJRm9vPmZ1bmN0aW9uKG4pIHsgcmV0dXJuIDxJRm9vPih7fSkgfTsKCi8vIENPTlRFWFQ6IEFycmF5IGluZGV4IGFzc2lnbm1lbnQKdmFyIGM3dDI6IElGb29bXTsKYzd0MlswXSA9IDxJRm9vPih7bjogMX0pOwoKLy8gQ09OVEVYVDogT2JqZWN0IHByb3BlcnR5IGFzc2lnbm1lbnQKaW50ZXJmYWNlIElQbGFjZUhvbGRlciB7CiAgICB0MTogKHM6IHN0cmluZykgPT4gc3RyaW5nOwogICAgdDI6IElGb287CiAgICB0MzogbnVtYmVyW107CiAgICB0NDogKCkgPT4gSUZvbzsKICAgIHQ1OiAobjogbnVtYmVyKSA9PiBJRm9vOwogICAgdDY6IChuOiBudW1iZXIsIHM6IHN0cmluZykgPT4gSUZvbzsKICAgIHQ3OiB7CiAgICAgICAgICAgIChuOiBudW1iZXIsIHM6IHN0cmluZyk6IG51bWJlcjsgICAgCiAgICAgICAgICAgIC8vKHMxOiBzdHJpbmcsIHMyOiBzdHJpbmcpOiBudW1iZXI7CiAgICAgICAgfTsKICAgIHQ4OiAobjogbnVtYmVyLCBzOiBzdHJpbmcpID0+IG51bWJlcjsKICAgIHQ5OiBudW1iZXJbXVtdOwogICAgdDEwOiBJRm9vW107CiAgICB0MTE6IHsobjogbnVtYmVyLCBzOiBzdHJpbmcpOiBzdHJpbmc7fVtdOwogICAgdDEyOiBJQmFyOwogICAgdDEzOiBJRm9vOwogICAgdDE0OiBJRm9vOwogICAgfQoKdmFyIG9iamM4OiB7CiAgICB0MTogKHM6IHN0cmluZykgPT4gc3RyaW5nOwogICAgdDI6IElGb287CiAgICB0MzogbnVtYmVyW107CiAgICB0NDogKCkgPT4gSUZvbzsKICAgIHQ1OiAobjogbnVtYmVyKSA9PiBJRm9vOwogICAgdDY6IChuOiBudW1iZXIsIHM6IHN0cmluZykgPT4gSUZvbzsKICAgIHQ3OiB7CiAgICAgICAgICAgIChuOiBudW1iZXIsIHM6IHN0cmluZyk6IG51bWJlcjsgICAgCiAgICAgICAgICAgIC8vKHMxOiBzdHJpbmcsIHMyOiBzdHJpbmcpOiBudW1iZXI7CiAgICAgICAgfTsKICAgIHQ4OiAobjogbnVtYmVyLCBzOiBzdHJpbmcpID0+IG51bWJlcjsKICAgIHQ5OiBudW1iZXJbXVtdOwogICAgdDEwOiBJRm9vW107CiAgICB0MTE6IHsobjogbnVtYmVyLCBzOiBzdHJpbmcpOiBzdHJpbmc7fVtdOwogICAgdDEyOiBJQmFyOwogICAgdDEzOiBJRm9vOwogICAgdDE0OiBJRm9vOwp9ID0gPElQbGFjZUhvbGRlcj4oe30pOwoKb2JqYzgudDEgPSAoZnVuY3Rpb24ocykgeyByZXR1cm4gcyB9KTsKb2JqYzgudDIgPSA8SUZvbz4oewogICAgbjogMQp9KTsKb2JqYzgudDMgPSBbXTsKb2JqYzgudDQgPSBmdW5jdGlvbigpIHsgcmV0dXJuIDxJRm9vPih7fSkgfTsKb2JqYzgudDUgPSBmdW5jdGlvbihuKSB7IHJldHVybiA8SUZvbz4oe30pIH07Cm9iamM4LnQ2ID0gZnVuY3Rpb24obiwgcykgeyByZXR1cm4gPElGb28+KHt9KSB9OwpvYmpjOC50NyA9IGZ1bmN0aW9uKG46IG51bWJlcikgeyByZXR1cm4gbiB9OwoKb2JqYzgudDggPSBmdW5jdGlvbihuKSB7IHJldHVybiBuOyB9OwpvYmpjOC50OSA9IFtbXSxbXV07Cm9iamM4LnQxMCA9IFs8SUZvbz4oe30pLDxJRm9vPih7fSldOwpvYmpjOC50MTEgPSBbZnVuY3Rpb24obiwgcykgeyByZXR1cm4gczsgfV07Cm9iamM4LnQxMiA9IHsKICAgIGZvbzogPElGb28+KHt9KQp9Cm9iamM4LnQxMyA9IDxJRm9vPih7CiAgICBmOiBmdW5jdGlvbihpLCBzKSB7IHJldHVybiBzOyB9Cn0pCm9iamM4LnQxNCA9IDxJRm9vPih7CiAgICBhOiBbXQp9KQovLyBDT05URVhUOiBGdW5jdGlvbiBjYWxsCmZ1bmN0aW9uIGM5dDUoZjogKG46IG51bWJlcikgPT4gSUZvbykge307CmM5dDUoZnVuY3Rpb24obikgewogICAgcmV0dXJuIDxJRm9vPih7fSk7Cn0pOwoKLy8gQ09OVEVYVDogUmV0dXJuIHN0YXRlbWVudAp2YXIgYzEwdDU6ICgpID0+IChuOiBudW1iZXIpID0+IElGb28gPSBmdW5jdGlvbigpIHsgcmV0dXJuIGZ1bmN0aW9uKG4pIHsgcmV0dXJuIDxJRm9vPih7fSkgfSB9OwoKLy8gQ09OVEVYVDogTmV3aW5nIGEgY2xhc3MKY2xhc3MgQzExdDUgeyBjb25zdHJ1Y3RvcihmOiAobjogbnVtYmVyKSA9PiBJRm9vKSB7IH0gfTsKdmFyIGkgPSBuZXcgQzExdDUoZnVuY3Rpb24obikgeyByZXR1cm4gPElGb28+KHt9KSB9KTsKCi8vIENPTlRFWFQ6IFR5cGUgYW5ub3RhdGVkIGV4cHJlc3Npb24KdmFyIGMxMnQxID0gPChzOiBzdHJpbmcpID0+IHN0cmluZz4gKGZ1bmN0aW9uKHMpIHsgcmV0dXJuIHMgfSk7CnZhciBjMTJ0MiA9IDxJRm9vPiAoewogICAgbjogMQp9KTsKdmFyIGMxMnQzID0gPG51bWJlcltdPiBbXTsKdmFyIGMxMnQ0ID0gPCgpID0+IElGb28+IGZ1bmN0aW9uKCkgeyByZXR1cm4gPElGb28+KHt9KSB9Owp2YXIgYzEydDUgPSA8KG46IG51bWJlcikgPT4gSUZvbz4gZnVuY3Rpb24obikgeyByZXR1cm4gPElGb28+KHt9KSB9Owp2YXIgYzEydDYgPSA8KG46IG51bWJlciwgczogc3RyaW5nKSA9PiBJRm9vPiBmdW5jdGlvbihuLCBzKSB7IHJldHVybiA8SUZvbz4oe30pIH07CnZhciBjMTJ0NyA9IDx7CiAgICAobjogbnVtYmVyLCBzOiBzdHJpbmcpOiBudW1iZXI7ICAgIAogICAgLy8oczE6IHN0cmluZywgczI6IHN0cmluZyk6IG51bWJlcjsKfT4gZnVuY3Rpb24objpudW1iZXIpIHsgcmV0dXJuIG4gfTsKCnZhciBjMTJ0OCA9IDwobjogbnVtYmVyLCBzOiBzdHJpbmcpID0+IG51bWJlcj4gZnVuY3Rpb24obikgeyByZXR1cm4gbjsgfTsKdmFyIGMxMnQ5ID0gPG51bWJlcltdW10+IFtbXSxbXV07CnZhciBjMTJ0MTAgPSA8SUZvb1tdPiBbPElGb28+KHt9KSw8SUZvbz4oe30pXTsKdmFyIGMxMnQxMSA9IDx7KG46IG51bWJlciwgczogc3RyaW5nKTogc3RyaW5nO31bXT4gW2Z1bmN0aW9uKG4sIHMpIHsgcmV0dXJuIHM7IH1dOwp2YXIgYzEydDEyID0gPElCYXI+IHsKICAgIGZvbzogPElGb28+KHt9KQp9CnZhciBjMTJ0MTMgPSA8SUZvbz4gKHsKICAgIGY6IGZ1bmN0aW9uKGksIHMpIHsgcmV0dXJuIHM7IH0KfSkKdmFyIGMxMnQxNCA9IDxJRm9vPiAoewogICAgYTogW10KfSkKCi8vIENPTlRFWFQ6IENvbnRleHR1YWwgdHlwaW5nIGRlY2xhcmF0aW9ucwoKLy8gY29udGV4dHVhbGx5IHR5cGluZyBmdW5jdGlvbiBkZWNsYXJhdGlvbnMKZGVjbGFyZSBmdW5jdGlvbiBFRjEoYTpudW1iZXIsIGI6bnVtYmVyKTpudW1iZXI7CgpmdW5jdGlvbiBFRjEoYSxiKSB7IHJldHVybiBhK2I7IH0KCnZhciBlZnYgPSBFRjEoMSwyKTsKCgovLyBjb250ZXh0dWFsbHkgdHlwaW5nIGZyb20gYW1iaWVudCBjbGFzcyBkZWNsYXJhdGlvbnMKZGVjbGFyZSBjbGFzcyBQb2ludAp7CiAgICAgIGNvbnN0cnVjdG9yKHg6IG51bWJlciwgeTogbnVtYmVyKTsKICAgICAgeDogbnVtYmVyOwogICAgICB5OiBudW1iZXI7CiAgICAgIGFkZChkeDogbnVtYmVyLCBkeTogbnVtYmVyKTogUG9pbnQ7CiAgICAgIHN0YXRpYyBvcmlnaW46IFBvaW50OwoKfQoKUG9pbnQub3JpZ2luID0gbmV3IFBvaW50KDAsIDApOwoKUG9pbnQucHJvdG90eXBlLmFkZCA9IGZ1bmN0aW9uKGR4LCBkeSkgewogICAgcmV0dXJuIG5ldyBQb2ludCh0aGlzLnggKyBkeCwgdGhpcy55ICsgZHkpOwp9OwoKUG9pbnQucHJvdG90eXBlID0gewogICAgeDogMCwKICAgIHk6IDAsCiAgICBhZGQ6IGZ1bmN0aW9uKGR4LCBkeSkgewogICAgICAgIHJldHVybiBuZXcgUG9pbnQodGhpcy54ICsgZHgsIHRoaXMueSArIGR5KTsKICAgIH0KfTsKCmludGVyZmFjZSBBIHsgeDogc3RyaW5nOyB9CmludGVyZmFjZSBCIGV4dGVuZHMgQSB7IH0KdmFyIHg6IEIgPSB7IH07Cg== diff --git a/tests/baselines/reference/contextualTyping.sourcemap.txt b/tests/baselines/reference/contextualTyping.sourcemap.txt index fe3a65219c456..88a9b9d71668f 100644 --- a/tests/baselines/reference/contextualTyping.sourcemap.txt +++ b/tests/baselines/reference/contextualTyping.sourcemap.txt @@ -142,7 +142,7 @@ sourceFile:contextualTyping.ts 5 > ^^^^^^^^^^-> 1 > > -2 >module +2 >namespace 3 > C2T5 4 > { > export var foo: (i: number, s: string) => number = function(i) { @@ -150,8 +150,8 @@ sourceFile:contextualTyping.ts > } > } 1 >Emitted(11, 1) Source(21, 1) + SourceIndex(0) -2 >Emitted(11, 5) Source(21, 8) + SourceIndex(0) -3 >Emitted(11, 9) Source(21, 12) + SourceIndex(0) +2 >Emitted(11, 5) Source(21, 11) + SourceIndex(0) +3 >Emitted(11, 9) Source(21, 15) + SourceIndex(0) 4 >Emitted(11, 10) Source(25, 2) + SourceIndex(0) --- >>>(function (C2T5) { @@ -160,11 +160,11 @@ sourceFile:contextualTyping.ts 3 > ^^^^ 4 > ^^^^^^^^^^^^^^^-> 1-> -2 >module +2 >namespace 3 > C2T5 1->Emitted(12, 1) Source(21, 1) + SourceIndex(0) -2 >Emitted(12, 12) Source(21, 8) + SourceIndex(0) -3 >Emitted(12, 16) Source(21, 12) + SourceIndex(0) +2 >Emitted(12, 12) Source(21, 11) + SourceIndex(0) +3 >Emitted(12, 16) Source(21, 15) + SourceIndex(0) --- >>> C2T5.foo = function (i) { 1->^^^^ @@ -235,10 +235,10 @@ sourceFile:contextualTyping.ts > } 1->Emitted(16, 1) Source(25, 1) + SourceIndex(0) 2 >Emitted(16, 2) Source(25, 2) + SourceIndex(0) -3 >Emitted(16, 4) Source(21, 8) + SourceIndex(0) -4 >Emitted(16, 8) Source(21, 12) + SourceIndex(0) -5 >Emitted(16, 13) Source(21, 8) + SourceIndex(0) -6 >Emitted(16, 17) Source(21, 12) + SourceIndex(0) +3 >Emitted(16, 4) Source(21, 11) + SourceIndex(0) +4 >Emitted(16, 8) Source(21, 15) + SourceIndex(0) +5 >Emitted(16, 13) Source(21, 11) + SourceIndex(0) +6 >Emitted(16, 17) Source(21, 15) + SourceIndex(0) 7 >Emitted(16, 25) Source(25, 2) + SourceIndex(0) --- >>>// CONTEXT: Variable declaration @@ -1046,7 +1046,7 @@ sourceFile:contextualTyping.ts 5 > ^^^^^^^^^^-> 1 > > -2 >module +2 >namespace 3 > C5T5 4 > { > export var foo: (i: number, s: string) => string; @@ -1055,8 +1055,8 @@ sourceFile:contextualTyping.ts > } > } 1 >Emitted(50, 1) Source(66, 1) + SourceIndex(0) -2 >Emitted(50, 5) Source(66, 8) + SourceIndex(0) -3 >Emitted(50, 9) Source(66, 12) + SourceIndex(0) +2 >Emitted(50, 5) Source(66, 11) + SourceIndex(0) +3 >Emitted(50, 9) Source(66, 15) + SourceIndex(0) 4 >Emitted(50, 10) Source(71, 2) + SourceIndex(0) --- >>>(function (C5T5) { @@ -1065,11 +1065,11 @@ sourceFile:contextualTyping.ts 3 > ^^^^ 4 > ^^^^^^^^^^^^^^^^^^-> 1-> -2 >module +2 >namespace 3 > C5T5 1->Emitted(51, 1) Source(66, 1) + SourceIndex(0) -2 >Emitted(51, 12) Source(66, 8) + SourceIndex(0) -3 >Emitted(51, 16) Source(66, 12) + SourceIndex(0) +2 >Emitted(51, 12) Source(66, 11) + SourceIndex(0) +3 >Emitted(51, 16) Source(66, 15) + SourceIndex(0) --- >>> C5T5.foo = function (i, s) { 1->^^^^ @@ -1151,10 +1151,10 @@ sourceFile:contextualTyping.ts > } 1->Emitted(55, 1) Source(71, 1) + SourceIndex(0) 2 >Emitted(55, 2) Source(71, 2) + SourceIndex(0) -3 >Emitted(55, 4) Source(66, 8) + SourceIndex(0) -4 >Emitted(55, 8) Source(66, 12) + SourceIndex(0) -5 >Emitted(55, 13) Source(66, 8) + SourceIndex(0) -6 >Emitted(55, 17) Source(66, 12) + SourceIndex(0) +3 >Emitted(55, 4) Source(66, 11) + SourceIndex(0) +4 >Emitted(55, 8) Source(66, 15) + SourceIndex(0) +5 >Emitted(55, 13) Source(66, 11) + SourceIndex(0) +6 >Emitted(55, 17) Source(66, 15) + SourceIndex(0) 7 >Emitted(55, 25) Source(71, 2) + SourceIndex(0) --- >>>// CONTEXT: Variable assignment diff --git a/tests/baselines/reference/contextualTyping.symbols b/tests/baselines/reference/contextualTyping.symbols index e334194c31598..225a450bcd6b7 100644 --- a/tests/baselines/reference/contextualTyping.symbols +++ b/tests/baselines/reference/contextualTyping.symbols @@ -44,7 +44,7 @@ class C1T5 { } // CONTEXT: Module property declaration -module C2T5 { +namespace C2T5 { >C2T5 : Symbol(C2T5, Decl(contextualTyping.ts, 17, 1)) export var foo: (i: number, s: string) => number = function(i) { @@ -186,7 +186,7 @@ class C4T5 { } // CONTEXT: Module property assignment -module C5T5 { +namespace C5T5 { >C5T5 : Symbol(C5T5, Decl(contextualTyping.ts, 62, 1)) export var foo: (i: number, s: string) => string; diff --git a/tests/baselines/reference/contextualTyping.types b/tests/baselines/reference/contextualTyping.types index 91a02669eecc6..b3613681d08ad 100644 --- a/tests/baselines/reference/contextualTyping.types +++ b/tests/baselines/reference/contextualTyping.types @@ -54,7 +54,7 @@ class C1T5 { } // CONTEXT: Module property declaration -module C2T5 { +namespace C2T5 { >C2T5 : typeof C2T5 > : ^^^^^^^^^^^ @@ -337,7 +337,7 @@ class C4T5 { } // CONTEXT: Module property assignment -module C5T5 { +namespace C5T5 { >C5T5 : typeof C5T5 > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/convertKeywordsYes.errors.txt b/tests/baselines/reference/convertKeywordsYes.errors.txt index c88882db813e8..de9cad2cb2484 100644 --- a/tests/baselines/reference/convertKeywordsYes.errors.txt +++ b/tests/baselines/reference/convertKeywordsYes.errors.txt @@ -302,7 +302,7 @@ convertKeywordsYes.ts(303,11): error TS1213: Identifier expected. 'yield' is a r with, } - module bigModule { + namespace bigModule { class constructor { } class implements { } ~~~~~~~~~~ diff --git a/tests/baselines/reference/convertKeywordsYes.js b/tests/baselines/reference/convertKeywordsYes.js index b576793482c5e..3cfe582213a74 100644 --- a/tests/baselines/reference/convertKeywordsYes.js +++ b/tests/baselines/reference/convertKeywordsYes.js @@ -290,7 +290,7 @@ enum bigEnum { with, } -module bigModule { +namespace bigModule { class constructor { } class implements { } class interface { } diff --git a/tests/baselines/reference/convertKeywordsYes.symbols b/tests/baselines/reference/convertKeywordsYes.symbols index 8acdd5e2c8a02..62d0a7f5df65b 100644 --- a/tests/baselines/reference/convertKeywordsYes.symbols +++ b/tests/baselines/reference/convertKeywordsYes.symbols @@ -835,11 +835,11 @@ enum bigEnum { >with : Symbol(bigEnum.with, Decl(convertKeywordsYes.ts, 285, 10)) } -module bigModule { +namespace bigModule { >bigModule : Symbol(bigModule, Decl(convertKeywordsYes.ts, 287, 1)) class constructor { } ->constructor : Symbol(constructor, Decl(convertKeywordsYes.ts, 289, 18)) +>constructor : Symbol(constructor, Decl(convertKeywordsYes.ts, 289, 21)) class implements { } >implements : Symbol(implements, Decl(convertKeywordsYes.ts, 290, 25)) diff --git a/tests/baselines/reference/convertKeywordsYes.types b/tests/baselines/reference/convertKeywordsYes.types index a10e84caffda4..8526b317c275e 100644 --- a/tests/baselines/reference/convertKeywordsYes.types +++ b/tests/baselines/reference/convertKeywordsYes.types @@ -1301,7 +1301,7 @@ enum bigEnum { > : ^^^^^^^^^^^^ } -module bigModule { +namespace bigModule { >bigModule : typeof bigModule > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/covariance1.js b/tests/baselines/reference/covariance1.js index cb8a45d615817..06260bfb03eee 100644 --- a/tests/baselines/reference/covariance1.js +++ b/tests/baselines/reference/covariance1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/covariance1.ts] //// //// [covariance1.ts] -module M { +namespace M { interface X { m1:number; } export class XX implements X { constructor(public m1:number) { } } diff --git a/tests/baselines/reference/covariance1.symbols b/tests/baselines/reference/covariance1.symbols index 282e2d4f43230..97beb9bc176c0 100644 --- a/tests/baselines/reference/covariance1.symbols +++ b/tests/baselines/reference/covariance1.symbols @@ -1,22 +1,22 @@ //// [tests/cases/compiler/covariance1.ts] //// === covariance1.ts === -module M { +namespace M { >M : Symbol(M, Decl(covariance1.ts, 0, 0)) interface X { m1:number; } ->X : Symbol(X, Decl(covariance1.ts, 0, 10)) +>X : Symbol(X, Decl(covariance1.ts, 0, 13)) >m1 : Symbol(X.m1, Decl(covariance1.ts, 2, 17)) export class XX implements X { constructor(public m1:number) { } } >XX : Symbol(XX, Decl(covariance1.ts, 2, 30)) ->X : Symbol(X, Decl(covariance1.ts, 0, 10)) +>X : Symbol(X, Decl(covariance1.ts, 0, 13)) >m1 : Symbol(XX.m1, Decl(covariance1.ts, 3, 47)) interface Y { x:X; } >Y : Symbol(Y, Decl(covariance1.ts, 3, 70)) >x : Symbol(Y.x, Decl(covariance1.ts, 5, 17)) ->X : Symbol(X, Decl(covariance1.ts, 0, 10)) +>X : Symbol(X, Decl(covariance1.ts, 0, 13)) export function f(y:Y) { } >f : Symbol(f, Decl(covariance1.ts, 5, 24)) @@ -25,7 +25,7 @@ module M { var a:X; >a : Symbol(a, Decl(covariance1.ts, 9, 7)) ->X : Symbol(X, Decl(covariance1.ts, 0, 10)) +>X : Symbol(X, Decl(covariance1.ts, 0, 13)) f({x:a}); // ok >f : Symbol(f, Decl(covariance1.ts, 5, 24)) diff --git a/tests/baselines/reference/covariance1.types b/tests/baselines/reference/covariance1.types index 75d34dc316e0d..afbf56b81fd17 100644 --- a/tests/baselines/reference/covariance1.types +++ b/tests/baselines/reference/covariance1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/covariance1.ts] //// === covariance1.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/crashRegressionTest.errors.txt b/tests/baselines/reference/crashRegressionTest.errors.txt index 57eef1da00bfa..771d1ea21b233 100644 --- a/tests/baselines/reference/crashRegressionTest.errors.txt +++ b/tests/baselines/reference/crashRegressionTest.errors.txt @@ -2,7 +2,7 @@ crashRegressionTest.ts(16,56): error TS2339: Property '_name' does not exist on ==== crashRegressionTest.ts (1 errors) ==== - module MsPortal.Util.TemplateEngine { + namespace MsPortal.Util.TemplateEngine { "use strict"; interface TemplateKeyValue { diff --git a/tests/baselines/reference/crashRegressionTest.js b/tests/baselines/reference/crashRegressionTest.js index 06426d063b359..81b8b46cfb8d1 100644 --- a/tests/baselines/reference/crashRegressionTest.js +++ b/tests/baselines/reference/crashRegressionTest.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/crashRegressionTest.ts] //// //// [crashRegressionTest.ts] -module MsPortal.Util.TemplateEngine { +namespace MsPortal.Util.TemplateEngine { "use strict"; interface TemplateKeyValue { diff --git a/tests/baselines/reference/crashRegressionTest.symbols b/tests/baselines/reference/crashRegressionTest.symbols index fd06da713e44c..feff5a7465bfc 100644 --- a/tests/baselines/reference/crashRegressionTest.symbols +++ b/tests/baselines/reference/crashRegressionTest.symbols @@ -1,10 +1,10 @@ //// [tests/cases/compiler/crashRegressionTest.ts] //// === crashRegressionTest.ts === -module MsPortal.Util.TemplateEngine { +namespace MsPortal.Util.TemplateEngine { >MsPortal : Symbol(MsPortal, Decl(crashRegressionTest.ts, 0, 0)) ->Util : Symbol(Util, Decl(crashRegressionTest.ts, 0, 16)) ->TemplateEngine : Symbol(TemplateEngine, Decl(crashRegressionTest.ts, 0, 21)) +>Util : Symbol(Util, Decl(crashRegressionTest.ts, 0, 19)) +>TemplateEngine : Symbol(TemplateEngine, Decl(crashRegressionTest.ts, 0, 24)) "use strict"; diff --git a/tests/baselines/reference/crashRegressionTest.types b/tests/baselines/reference/crashRegressionTest.types index 8e1067015b203..76d3e433d6a0c 100644 --- a/tests/baselines/reference/crashRegressionTest.types +++ b/tests/baselines/reference/crashRegressionTest.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/crashRegressionTest.ts] //// === crashRegressionTest.ts === -module MsPortal.Util.TemplateEngine { +namespace MsPortal.Util.TemplateEngine { >MsPortal : typeof MsPortal > : ^^^^^^^^^^^^^^^ >Util : typeof Util diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.js b/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.js index 2747dd997defd..5853848f91032 100644 --- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.js +++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.js @@ -2,7 +2,7 @@ //// [declFileAliasUseBeforeDeclaration2.ts] declare module "test" { - module A { + namespace A { class C { } } diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.symbols b/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.symbols index 5c03ec2ea1f46..cc414b955ac72 100644 --- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.symbols +++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.symbols @@ -4,11 +4,11 @@ declare module "test" { >"test" : Symbol("test", Decl(declFileAliasUseBeforeDeclaration2.ts, 0, 0)) - module A { + namespace A { >A : Symbol(A, Decl(declFileAliasUseBeforeDeclaration2.ts, 0, 23)) class C { ->C : Symbol(C, Decl(declFileAliasUseBeforeDeclaration2.ts, 1, 14)) +>C : Symbol(C, Decl(declFileAliasUseBeforeDeclaration2.ts, 1, 17)) } } class B extends E { @@ -18,5 +18,5 @@ declare module "test" { import E = A.C; >E : Symbol(E, Decl(declFileAliasUseBeforeDeclaration2.ts, 6, 5)) >A : Symbol(A, Decl(declFileAliasUseBeforeDeclaration2.ts, 0, 23)) ->C : Symbol(E, Decl(declFileAliasUseBeforeDeclaration2.ts, 1, 14)) +>C : Symbol(E, Decl(declFileAliasUseBeforeDeclaration2.ts, 1, 17)) } diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.types b/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.types index d8e95d6d61ae4..f2a16fb24d506 100644 --- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.types +++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.types @@ -5,7 +5,7 @@ declare module "test" { >"test" : typeof import("test") > : ^^^^^^^^^^^^^^^^^^^^^ - module A { + namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js index 93df52982b668..267611214d374 100644 --- a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js +++ b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js @@ -2,8 +2,8 @@ //// [declFileAmbientExternalModuleWithSingleExportedModule_0.ts] declare module "SubModule" { - export module m { - export module m3 { + export namespace m { + export namespace m3 { interface c { } } diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.symbols b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.symbols index fd4567e0eb071..81c1f698224cb 100644 --- a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.symbols +++ b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.symbols @@ -9,22 +9,22 @@ export var x: SubModule.m.m3.c; >x : Symbol(x, Decl(declFileAmbientExternalModuleWithSingleExportedModule_1.ts, 2, 10)) >SubModule : Symbol(SubModule, Decl(declFileAmbientExternalModuleWithSingleExportedModule_1.ts, 0, 0)) >m : Symbol(SubModule.m, Decl(declFileAmbientExternalModuleWithSingleExportedModule_0.ts, 0, 28)) ->m3 : Symbol(SubModule.m.m3, Decl(declFileAmbientExternalModuleWithSingleExportedModule_0.ts, 1, 21)) ->c : Symbol(SubModule.m.m3.c, Decl(declFileAmbientExternalModuleWithSingleExportedModule_0.ts, 2, 26)) +>m3 : Symbol(SubModule.m.m3, Decl(declFileAmbientExternalModuleWithSingleExportedModule_0.ts, 1, 24)) +>c : Symbol(SubModule.m.m3.c, Decl(declFileAmbientExternalModuleWithSingleExportedModule_0.ts, 2, 29)) === declFileAmbientExternalModuleWithSingleExportedModule_0.ts === declare module "SubModule" { >"SubModule" : Symbol("SubModule", Decl(declFileAmbientExternalModuleWithSingleExportedModule_0.ts, 0, 0)) - export module m { + export namespace m { >m : Symbol(m, Decl(declFileAmbientExternalModuleWithSingleExportedModule_0.ts, 0, 28)) - export module m3 { ->m3 : Symbol(m3, Decl(declFileAmbientExternalModuleWithSingleExportedModule_0.ts, 1, 21)) + export namespace m3 { +>m3 : Symbol(m3, Decl(declFileAmbientExternalModuleWithSingleExportedModule_0.ts, 1, 24)) interface c { ->c : Symbol(c, Decl(declFileAmbientExternalModuleWithSingleExportedModule_0.ts, 2, 26)) +>c : Symbol(c, Decl(declFileAmbientExternalModuleWithSingleExportedModule_0.ts, 2, 29)) } } } diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types index cffface2bd63b..178bac6b778a9 100644 --- a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types +++ b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types @@ -22,8 +22,8 @@ declare module "SubModule" { >"SubModule" : typeof import("SubModule") > : ^^^^^^^^^^^^^^^^^^^^^^^^^^ - export module m { - export module m3 { + export namespace m { + export namespace m3 { interface c { } } diff --git a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js index 10633bbae1e23..95dc4ceb52279 100644 --- a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js +++ b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/declFileExportAssignmentImportInternalModule.ts] //// //// [declFileExportAssignmentImportInternalModule.ts] -module m3 { - export module m2 { +namespace m3 { + export namespace m2 { export interface connectModule { (res, req, next): void; } diff --git a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.symbols b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.symbols index 57761c692d526..eff94912a736c 100644 --- a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.symbols +++ b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.symbols @@ -1,14 +1,14 @@ //// [tests/cases/compiler/declFileExportAssignmentImportInternalModule.ts] //// === declFileExportAssignmentImportInternalModule.ts === -module m3 { +namespace m3 { >m3 : Symbol(m3, Decl(declFileExportAssignmentImportInternalModule.ts, 0, 0)) - export module m2 { ->m2 : Symbol(m2, Decl(declFileExportAssignmentImportInternalModule.ts, 0, 11)) + export namespace m2 { +>m2 : Symbol(m2, Decl(declFileExportAssignmentImportInternalModule.ts, 0, 14)) export interface connectModule { ->connectModule : Symbol(connectModule, Decl(declFileExportAssignmentImportInternalModule.ts, 1, 22)) +>connectModule : Symbol(connectModule, Decl(declFileExportAssignmentImportInternalModule.ts, 1, 25)) (res, req, next): void; >res : Symbol(res, Decl(declFileExportAssignmentImportInternalModule.ts, 3, 13)) @@ -21,7 +21,7 @@ module m3 { use: (mod: connectModule) => connectExport; >use : Symbol(connectExport.use, Decl(declFileExportAssignmentImportInternalModule.ts, 5, 40)) >mod : Symbol(mod, Decl(declFileExportAssignmentImportInternalModule.ts, 6, 18)) ->connectModule : Symbol(connectModule, Decl(declFileExportAssignmentImportInternalModule.ts, 1, 22)) +>connectModule : Symbol(connectModule, Decl(declFileExportAssignmentImportInternalModule.ts, 1, 25)) >connectExport : Symbol(connectExport, Decl(declFileExportAssignmentImportInternalModule.ts, 4, 9)) listen: (port: number) => void; @@ -35,18 +35,18 @@ module m3 { >server : Symbol(server, Decl(declFileExportAssignmentImportInternalModule.ts, 12, 14)) (): m2.connectExport; ->m2 : Symbol(m2, Decl(declFileExportAssignmentImportInternalModule.ts, 0, 11)) +>m2 : Symbol(m2, Decl(declFileExportAssignmentImportInternalModule.ts, 0, 14)) >connectExport : Symbol(m2.connectExport, Decl(declFileExportAssignmentImportInternalModule.ts, 4, 9)) test1: m2.connectModule; >test1 : Symbol(test1, Decl(declFileExportAssignmentImportInternalModule.ts, 13, 29)) ->m2 : Symbol(m2, Decl(declFileExportAssignmentImportInternalModule.ts, 0, 11)) ->connectModule : Symbol(m2.connectModule, Decl(declFileExportAssignmentImportInternalModule.ts, 1, 22)) +>m2 : Symbol(m2, Decl(declFileExportAssignmentImportInternalModule.ts, 0, 14)) +>connectModule : Symbol(m2.connectModule, Decl(declFileExportAssignmentImportInternalModule.ts, 1, 25)) test2(): m2.connectModule; >test2 : Symbol(test2, Decl(declFileExportAssignmentImportInternalModule.ts, 14, 32)) ->m2 : Symbol(m2, Decl(declFileExportAssignmentImportInternalModule.ts, 0, 11)) ->connectModule : Symbol(m2.connectModule, Decl(declFileExportAssignmentImportInternalModule.ts, 1, 22)) +>m2 : Symbol(m2, Decl(declFileExportAssignmentImportInternalModule.ts, 0, 14)) +>connectModule : Symbol(m2.connectModule, Decl(declFileExportAssignmentImportInternalModule.ts, 1, 25)) }; } diff --git a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.types b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.types index 39642342a034c..7bc73b715dd84 100644 --- a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.types +++ b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declFileExportAssignmentImportInternalModule.ts] //// === declFileExportAssignmentImportInternalModule.ts === -module m3 { +namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ - export module m2 { + export namespace m2 { export interface connectModule { (res, req, next): void; >res : any diff --git a/tests/baselines/reference/declFileExportImportChain.js b/tests/baselines/reference/declFileExportImportChain.js index a0daf8a31f47a..abce73855fe18 100644 --- a/tests/baselines/reference/declFileExportImportChain.js +++ b/tests/baselines/reference/declFileExportImportChain.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/declFileExportImportChain.ts] //// //// [declFileExportImportChain_a.ts] -module m1 { - export module m2 { +namespace m1 { + export namespace m2 { export class c1 { } } diff --git a/tests/baselines/reference/declFileExportImportChain.symbols b/tests/baselines/reference/declFileExportImportChain.symbols index 3f1424d5685a3..caab50c16cae6 100644 --- a/tests/baselines/reference/declFileExportImportChain.symbols +++ b/tests/baselines/reference/declFileExportImportChain.symbols @@ -9,18 +9,18 @@ export var x: c.b1.a.m2.c1; >c : Symbol(c, Decl(declFileExportImportChain_d.ts, 0, 0)) >b1 : Symbol(c.b1, Decl(declFileExportImportChain_c.ts, 0, 0)) >a : Symbol(c.b1.a, Decl(declFileExportImportChain_b.ts, 0, 0)) ->m2 : Symbol(c.b1.a.m2, Decl(declFileExportImportChain_a.ts, 0, 11)) ->c1 : Symbol(c.b1.a.m2.c1, Decl(declFileExportImportChain_a.ts, 1, 22)) +>m2 : Symbol(c.b1.a.m2, Decl(declFileExportImportChain_a.ts, 0, 14)) +>c1 : Symbol(c.b1.a.m2.c1, Decl(declFileExportImportChain_a.ts, 1, 25)) === declFileExportImportChain_a.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(declFileExportImportChain_a.ts, 0, 0)) - export module m2 { ->m2 : Symbol(m2, Decl(declFileExportImportChain_a.ts, 0, 11)) + export namespace m2 { +>m2 : Symbol(m2, Decl(declFileExportImportChain_a.ts, 0, 14)) export class c1 { ->c1 : Symbol(c1, Decl(declFileExportImportChain_a.ts, 1, 22)) +>c1 : Symbol(c1, Decl(declFileExportImportChain_a.ts, 1, 25)) } } } diff --git a/tests/baselines/reference/declFileExportImportChain.types b/tests/baselines/reference/declFileExportImportChain.types index 4286641caa4a0..e3a1029c1e74e 100644 --- a/tests/baselines/reference/declFileExportImportChain.types +++ b/tests/baselines/reference/declFileExportImportChain.types @@ -18,11 +18,11 @@ export var x: c.b1.a.m2.c1; > : ^^^ === declFileExportImportChain_a.ts === -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ - export module m2 { + export namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/declFileExportImportChain2.js b/tests/baselines/reference/declFileExportImportChain2.js index 848e048cf5e53..985c9286fe51c 100644 --- a/tests/baselines/reference/declFileExportImportChain2.js +++ b/tests/baselines/reference/declFileExportImportChain2.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/declFileExportImportChain2.ts] //// //// [declFileExportImportChain2_a.ts] -module m1 { - export module m2 { +namespace m1 { + export namespace m2 { export class c1 { } } diff --git a/tests/baselines/reference/declFileExportImportChain2.symbols b/tests/baselines/reference/declFileExportImportChain2.symbols index 513020b1f3a5e..acfc7e3cdfdd0 100644 --- a/tests/baselines/reference/declFileExportImportChain2.symbols +++ b/tests/baselines/reference/declFileExportImportChain2.symbols @@ -8,18 +8,18 @@ export var x: c.b.m2.c1; >x : Symbol(x, Decl(declFileExportImportChain2_d.ts, 1, 10)) >c : Symbol(c, Decl(declFileExportImportChain2_d.ts, 0, 0)) >b : Symbol(c.b, Decl(declFileExportImportChain2_c.ts, 0, 0)) ->m2 : Symbol(c.b.m2, Decl(declFileExportImportChain2_a.ts, 0, 11)) ->c1 : Symbol(c.b.m2.c1, Decl(declFileExportImportChain2_a.ts, 1, 22)) +>m2 : Symbol(c.b.m2, Decl(declFileExportImportChain2_a.ts, 0, 14)) +>c1 : Symbol(c.b.m2.c1, Decl(declFileExportImportChain2_a.ts, 1, 25)) === declFileExportImportChain2_a.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(declFileExportImportChain2_a.ts, 0, 0)) - export module m2 { ->m2 : Symbol(m2, Decl(declFileExportImportChain2_a.ts, 0, 11)) + export namespace m2 { +>m2 : Symbol(m2, Decl(declFileExportImportChain2_a.ts, 0, 14)) export class c1 { ->c1 : Symbol(c1, Decl(declFileExportImportChain2_a.ts, 1, 22)) +>c1 : Symbol(c1, Decl(declFileExportImportChain2_a.ts, 1, 25)) } } } diff --git a/tests/baselines/reference/declFileExportImportChain2.types b/tests/baselines/reference/declFileExportImportChain2.types index 8ae01c253096b..41e428c416b28 100644 --- a/tests/baselines/reference/declFileExportImportChain2.types +++ b/tests/baselines/reference/declFileExportImportChain2.types @@ -16,11 +16,11 @@ export var x: c.b.m2.c1; > : ^^^ === declFileExportImportChain2_a.ts === -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ - export module m2 { + export namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/declFileGenericType.js b/tests/baselines/reference/declFileGenericType.js index e3d6fec029517..610b7104098b5 100644 --- a/tests/baselines/reference/declFileGenericType.js +++ b/tests/baselines/reference/declFileGenericType.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declFileGenericType.ts] //// //// [declFileGenericType.ts] -export module C { +export namespace C { export class A{ } export class B { } diff --git a/tests/baselines/reference/declFileGenericType.symbols b/tests/baselines/reference/declFileGenericType.symbols index b770f419272a7..f27a51a28d408 100644 --- a/tests/baselines/reference/declFileGenericType.symbols +++ b/tests/baselines/reference/declFileGenericType.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declFileGenericType.ts] //// === declFileGenericType.ts === -export module C { +export namespace C { >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) export class A{ } ->A : Symbol(A, Decl(declFileGenericType.ts, 0, 17)) +>A : Symbol(A, Decl(declFileGenericType.ts, 0, 20)) >T : Symbol(T, Decl(declFileGenericType.ts, 1, 19)) export class B { } @@ -16,7 +16,7 @@ export module C { >T : Symbol(T, Decl(declFileGenericType.ts, 4, 22)) >x : Symbol(x, Decl(declFileGenericType.ts, 4, 25)) >T : Symbol(T, Decl(declFileGenericType.ts, 4, 22)) ->A : Symbol(A, Decl(declFileGenericType.ts, 0, 17)) +>A : Symbol(A, Decl(declFileGenericType.ts, 0, 20)) >B : Symbol(B, Decl(declFileGenericType.ts, 1, 24)) export function F2(x: T): C.A { return null; } @@ -25,7 +25,7 @@ export module C { >x : Symbol(x, Decl(declFileGenericType.ts, 5, 26)) >T : Symbol(T, Decl(declFileGenericType.ts, 5, 23)) >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) ->A : Symbol(A, Decl(declFileGenericType.ts, 0, 17)) +>A : Symbol(A, Decl(declFileGenericType.ts, 0, 20)) >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) >B : Symbol(B, Decl(declFileGenericType.ts, 1, 24)) @@ -35,20 +35,20 @@ export module C { >x : Symbol(x, Decl(declFileGenericType.ts, 6, 26)) >T : Symbol(T, Decl(declFileGenericType.ts, 6, 23)) >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) ->A : Symbol(A, Decl(declFileGenericType.ts, 0, 17)) +>A : Symbol(A, Decl(declFileGenericType.ts, 0, 20)) >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) >B : Symbol(B, Decl(declFileGenericType.ts, 1, 24)) export function F4>(x: T): Array> { return null; } >F4 : Symbol(F4, Decl(declFileGenericType.ts, 6, 60)) >T : Symbol(T, Decl(declFileGenericType.ts, 7, 23)) ->A : Symbol(A, Decl(declFileGenericType.ts, 0, 17)) +>A : Symbol(A, Decl(declFileGenericType.ts, 0, 20)) >B : Symbol(B, Decl(declFileGenericType.ts, 1, 24)) >x : Symbol(x, Decl(declFileGenericType.ts, 7, 39)) >T : Symbol(T, Decl(declFileGenericType.ts, 7, 23)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) ->A : Symbol(A, Decl(declFileGenericType.ts, 0, 17)) +>A : Symbol(A, Decl(declFileGenericType.ts, 0, 20)) >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) >B : Symbol(B, Decl(declFileGenericType.ts, 1, 24)) @@ -60,7 +60,7 @@ export module C { export function F6>(x: T): T { return null; } >F6 : Symbol(F6, Decl(declFileGenericType.ts, 9, 47)) >T : Symbol(T, Decl(declFileGenericType.ts, 11, 23)) ->A : Symbol(A, Decl(declFileGenericType.ts, 0, 17)) +>A : Symbol(A, Decl(declFileGenericType.ts, 0, 20)) >B : Symbol(B, Decl(declFileGenericType.ts, 1, 24)) >x : Symbol(x, Decl(declFileGenericType.ts, 11, 39)) >T : Symbol(T, Decl(declFileGenericType.ts, 11, 23)) @@ -80,7 +80,7 @@ export module C { export var a: C.A; >a : Symbol(a, Decl(declFileGenericType.ts, 20, 10)) >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) ->A : Symbol(C.A, Decl(declFileGenericType.ts, 0, 17)) +>A : Symbol(C.A, Decl(declFileGenericType.ts, 0, 20)) >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) >B : Symbol(C.B, Decl(declFileGenericType.ts, 1, 24)) @@ -115,12 +115,12 @@ export var x = (new C.D>(new C.A())).val; >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) >D : Symbol(C.D, Decl(declFileGenericType.ts, 11, 64)) >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) ->A : Symbol(C.A, Decl(declFileGenericType.ts, 0, 17)) +>A : Symbol(C.A, Decl(declFileGenericType.ts, 0, 20)) >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) >B : Symbol(C.B, Decl(declFileGenericType.ts, 1, 24)) ->C.A : Symbol(C.A, Decl(declFileGenericType.ts, 0, 17)) +>C.A : Symbol(C.A, Decl(declFileGenericType.ts, 0, 20)) >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) ->A : Symbol(C.A, Decl(declFileGenericType.ts, 0, 17)) +>A : Symbol(C.A, Decl(declFileGenericType.ts, 0, 20)) >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) >B : Symbol(C.B, Decl(declFileGenericType.ts, 1, 24)) >val : Symbol(C.D.val, Decl(declFileGenericType.ts, 15, 20)) @@ -129,7 +129,7 @@ export function f>() { } >f : Symbol(f, Decl(declFileGenericType.ts, 27, 55)) >T : Symbol(T, Decl(declFileGenericType.ts, 29, 18)) >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) ->A : Symbol(C.A, Decl(declFileGenericType.ts, 0, 17)) +>A : Symbol(C.A, Decl(declFileGenericType.ts, 0, 20)) >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) >B : Symbol(C.B, Decl(declFileGenericType.ts, 1, 24)) @@ -139,23 +139,23 @@ export var g = C.F5>(); >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) >F5 : Symbol(C.F5, Decl(declFileGenericType.ts, 7, 78)) >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) ->A : Symbol(C.A, Decl(declFileGenericType.ts, 0, 17)) +>A : Symbol(C.A, Decl(declFileGenericType.ts, 0, 20)) >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) >B : Symbol(C.B, Decl(declFileGenericType.ts, 1, 24)) export class h extends C.A{ } >h : Symbol(h, Decl(declFileGenericType.ts, 31, 32)) ->C.A : Symbol(C.A, Decl(declFileGenericType.ts, 0, 17)) +>C.A : Symbol(C.A, Decl(declFileGenericType.ts, 0, 20)) >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) ->A : Symbol(C.A, Decl(declFileGenericType.ts, 0, 17)) +>A : Symbol(C.A, Decl(declFileGenericType.ts, 0, 20)) >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) >B : Symbol(C.B, Decl(declFileGenericType.ts, 1, 24)) export interface i extends C.A { } >i : Symbol(i, Decl(declFileGenericType.ts, 33, 34)) ->C.A : Symbol(C.A, Decl(declFileGenericType.ts, 0, 17)) +>C.A : Symbol(C.A, Decl(declFileGenericType.ts, 0, 20)) >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) ->A : Symbol(C.A, Decl(declFileGenericType.ts, 0, 17)) +>A : Symbol(C.A, Decl(declFileGenericType.ts, 0, 20)) >C : Symbol(C, Decl(declFileGenericType.ts, 0, 0)) >B : Symbol(C.B, Decl(declFileGenericType.ts, 1, 24)) diff --git a/tests/baselines/reference/declFileGenericType.types b/tests/baselines/reference/declFileGenericType.types index 59b39ae184c24..5c5eb55a7b6e1 100644 --- a/tests/baselines/reference/declFileGenericType.types +++ b/tests/baselines/reference/declFileGenericType.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declFileGenericType.ts] //// === declFileGenericType.ts === -export module C { +export namespace C { >C : typeof C > : ^^^^^^^^ diff --git a/tests/baselines/reference/declFileGenericType2.errors.txt b/tests/baselines/reference/declFileGenericType2.errors.txt new file mode 100644 index 0000000000000..08e398fb25e40 --- /dev/null +++ b/tests/baselines/reference/declFileGenericType2.errors.txt @@ -0,0 +1,71 @@ +declFileGenericType2.ts(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +declFileGenericType2.ts(1,23): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +declFileGenericType2.ts(5,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +declFileGenericType2.ts(5,23): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +declFileGenericType2.ts(9,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +declFileGenericType2.ts(9,23): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +declFileGenericType2.ts(13,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +declFileGenericType2.ts(13,23): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +declFileGenericType2.ts(13,27): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== declFileGenericType2.ts (9 errors) ==== + declare module templa.mvc { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface IModel { + } + } + declare module templa.mvc { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface IController { + } + } + declare module templa.mvc { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + class AbstractController implements mvc.IController { + } + } + declare module templa.mvc.composite { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface ICompositeControllerModel extends mvc.IModel { + getControllers(): mvc.IController[]; + } + } + namespace templa.dom.mvc { + export interface IElementController extends templa.mvc.IController { + } + } + // Module + namespace templa.dom.mvc { + + export class AbstractElementController extends templa.mvc.AbstractController implements IElementController { + constructor() { + super(); + } + } + } + // Module + namespace templa.dom.mvc.composite { + export class AbstractCompositeElementController extends templa.dom.mvc.AbstractElementController { + public _controllers: templa.mvc.IController[]; + constructor() { + super(); + this._controllers = []; + } + } + } + \ No newline at end of file diff --git a/tests/baselines/reference/declFileGenericType2.js b/tests/baselines/reference/declFileGenericType2.js index f13b3bed145c0..b7d75ef84b8f5 100644 --- a/tests/baselines/reference/declFileGenericType2.js +++ b/tests/baselines/reference/declFileGenericType2.js @@ -18,12 +18,12 @@ declare module templa.mvc.composite { getControllers(): mvc.IController[]; } } -module templa.dom.mvc { +namespace templa.dom.mvc { export interface IElementController extends templa.mvc.IController { } } // Module -module templa.dom.mvc { +namespace templa.dom.mvc { export class AbstractElementController extends templa.mvc.AbstractController implements IElementController { constructor() { @@ -32,7 +32,7 @@ module templa.dom.mvc { } } // Module -module templa.dom.mvc.composite { +namespace templa.dom.mvc.composite { export class AbstractCompositeElementController extends templa.dom.mvc.AbstractElementController { public _controllers: templa.mvc.IController[]; constructor() { diff --git a/tests/baselines/reference/declFileGenericType2.symbols b/tests/baselines/reference/declFileGenericType2.symbols index b9e8819c1805f..d35d90e44b6b2 100644 --- a/tests/baselines/reference/declFileGenericType2.symbols +++ b/tests/baselines/reference/declFileGenericType2.symbols @@ -56,13 +56,13 @@ declare module templa.mvc.composite { >IModel : Symbol(IModel, Decl(declFileGenericType2.ts, 0, 27)) } } -module templa.dom.mvc { +namespace templa.dom.mvc { >templa : Symbol(templa, Decl(declFileGenericType2.ts, 0, 0), Decl(declFileGenericType2.ts, 3, 1), Decl(declFileGenericType2.ts, 7, 1), Decl(declFileGenericType2.ts, 11, 1), Decl(declFileGenericType2.ts, 16, 1) ... and 2 more) ->dom : Symbol(dom, Decl(declFileGenericType2.ts, 17, 14), Decl(declFileGenericType2.ts, 22, 14), Decl(declFileGenericType2.ts, 31, 14)) ->mvc : Symbol(mvc, Decl(declFileGenericType2.ts, 17, 18), Decl(declFileGenericType2.ts, 22, 18), Decl(declFileGenericType2.ts, 31, 18)) +>dom : Symbol(dom, Decl(declFileGenericType2.ts, 17, 17), Decl(declFileGenericType2.ts, 22, 17), Decl(declFileGenericType2.ts, 31, 17)) +>mvc : Symbol(mvc, Decl(declFileGenericType2.ts, 17, 21), Decl(declFileGenericType2.ts, 22, 21), Decl(declFileGenericType2.ts, 31, 21)) export interface IElementController extends templa.mvc.IController { ->IElementController : Symbol(IElementController, Decl(declFileGenericType2.ts, 17, 23)) +>IElementController : Symbol(IElementController, Decl(declFileGenericType2.ts, 17, 26)) >ModelType : Symbol(ModelType, Decl(declFileGenericType2.ts, 18, 40)) >templa : Symbol(templa, Decl(declFileGenericType2.ts, 0, 0), Decl(declFileGenericType2.ts, 3, 1), Decl(declFileGenericType2.ts, 7, 1), Decl(declFileGenericType2.ts, 11, 1), Decl(declFileGenericType2.ts, 16, 1) ... and 2 more) >mvc : Symbol(mvc, Decl(declFileGenericType2.ts, 0, 22), Decl(declFileGenericType2.ts, 4, 22), Decl(declFileGenericType2.ts, 8, 22), Decl(declFileGenericType2.ts, 12, 22)) @@ -76,13 +76,13 @@ module templa.dom.mvc { } } // Module -module templa.dom.mvc { +namespace templa.dom.mvc { >templa : Symbol(templa, Decl(declFileGenericType2.ts, 0, 0), Decl(declFileGenericType2.ts, 3, 1), Decl(declFileGenericType2.ts, 7, 1), Decl(declFileGenericType2.ts, 11, 1), Decl(declFileGenericType2.ts, 16, 1) ... and 2 more) ->dom : Symbol(dom, Decl(declFileGenericType2.ts, 17, 14), Decl(declFileGenericType2.ts, 22, 14), Decl(declFileGenericType2.ts, 31, 14)) ->mvc : Symbol(mvc, Decl(declFileGenericType2.ts, 17, 18), Decl(declFileGenericType2.ts, 22, 18), Decl(declFileGenericType2.ts, 31, 18)) +>dom : Symbol(dom, Decl(declFileGenericType2.ts, 17, 17), Decl(declFileGenericType2.ts, 22, 17), Decl(declFileGenericType2.ts, 31, 17)) +>mvc : Symbol(mvc, Decl(declFileGenericType2.ts, 17, 21), Decl(declFileGenericType2.ts, 22, 21), Decl(declFileGenericType2.ts, 31, 21)) export class AbstractElementController extends templa.mvc.AbstractController implements IElementController { ->AbstractElementController : Symbol(AbstractElementController, Decl(declFileGenericType2.ts, 22, 23)) +>AbstractElementController : Symbol(AbstractElementController, Decl(declFileGenericType2.ts, 22, 26)) >ModelType : Symbol(ModelType, Decl(declFileGenericType2.ts, 24, 43)) >templa : Symbol(templa, Decl(declFileGenericType2.ts, 0, 0), Decl(declFileGenericType2.ts, 3, 1), Decl(declFileGenericType2.ts, 7, 1), Decl(declFileGenericType2.ts, 11, 1), Decl(declFileGenericType2.ts, 16, 1) ... and 2 more) >mvc : Symbol(mvc, Decl(declFileGenericType2.ts, 0, 22), Decl(declFileGenericType2.ts, 4, 22), Decl(declFileGenericType2.ts, 8, 22), Decl(declFileGenericType2.ts, 12, 22)) @@ -93,7 +93,7 @@ module templa.dom.mvc { >mvc : Symbol(mvc, Decl(declFileGenericType2.ts, 0, 22), Decl(declFileGenericType2.ts, 4, 22), Decl(declFileGenericType2.ts, 8, 22), Decl(declFileGenericType2.ts, 12, 22)) >AbstractController : Symbol(templa.mvc.AbstractController, Decl(declFileGenericType2.ts, 8, 27)) >ModelType : Symbol(ModelType, Decl(declFileGenericType2.ts, 24, 43)) ->IElementController : Symbol(IElementController, Decl(declFileGenericType2.ts, 17, 23)) +>IElementController : Symbol(IElementController, Decl(declFileGenericType2.ts, 17, 26)) >ModelType : Symbol(ModelType, Decl(declFileGenericType2.ts, 24, 43)) constructor() { @@ -103,26 +103,26 @@ module templa.dom.mvc { } } // Module -module templa.dom.mvc.composite { +namespace templa.dom.mvc.composite { >templa : Symbol(templa, Decl(declFileGenericType2.ts, 0, 0), Decl(declFileGenericType2.ts, 3, 1), Decl(declFileGenericType2.ts, 7, 1), Decl(declFileGenericType2.ts, 11, 1), Decl(declFileGenericType2.ts, 16, 1) ... and 2 more) ->dom : Symbol(dom, Decl(declFileGenericType2.ts, 17, 14), Decl(declFileGenericType2.ts, 22, 14), Decl(declFileGenericType2.ts, 31, 14)) ->mvc : Symbol(mvc, Decl(declFileGenericType2.ts, 17, 18), Decl(declFileGenericType2.ts, 22, 18), Decl(declFileGenericType2.ts, 31, 18)) ->composite : Symbol(composite, Decl(declFileGenericType2.ts, 31, 22)) +>dom : Symbol(dom, Decl(declFileGenericType2.ts, 17, 17), Decl(declFileGenericType2.ts, 22, 17), Decl(declFileGenericType2.ts, 31, 17)) +>mvc : Symbol(mvc, Decl(declFileGenericType2.ts, 17, 21), Decl(declFileGenericType2.ts, 22, 21), Decl(declFileGenericType2.ts, 31, 21)) +>composite : Symbol(composite, Decl(declFileGenericType2.ts, 31, 25)) export class AbstractCompositeElementController extends templa.dom.mvc.AbstractElementController { ->AbstractCompositeElementController : Symbol(AbstractCompositeElementController, Decl(declFileGenericType2.ts, 31, 33)) +>AbstractCompositeElementController : Symbol(AbstractCompositeElementController, Decl(declFileGenericType2.ts, 31, 36)) >ModelType : Symbol(ModelType, Decl(declFileGenericType2.ts, 32, 52)) >templa : Symbol(templa, Decl(declFileGenericType2.ts, 0, 0), Decl(declFileGenericType2.ts, 3, 1), Decl(declFileGenericType2.ts, 7, 1), Decl(declFileGenericType2.ts, 11, 1), Decl(declFileGenericType2.ts, 16, 1) ... and 2 more) >mvc : Symbol(mvc, Decl(declFileGenericType2.ts, 0, 22), Decl(declFileGenericType2.ts, 4, 22), Decl(declFileGenericType2.ts, 8, 22), Decl(declFileGenericType2.ts, 12, 22)) >composite : Symbol(templa.mvc.composite, Decl(declFileGenericType2.ts, 12, 26)) >ICompositeControllerModel : Symbol(templa.mvc.composite.ICompositeControllerModel, Decl(declFileGenericType2.ts, 12, 37)) ->templa.dom.mvc.AbstractElementController : Symbol(AbstractElementController, Decl(declFileGenericType2.ts, 22, 23)) ->templa.dom.mvc : Symbol(mvc, Decl(declFileGenericType2.ts, 17, 18), Decl(declFileGenericType2.ts, 22, 18), Decl(declFileGenericType2.ts, 31, 18)) ->templa.dom : Symbol(dom, Decl(declFileGenericType2.ts, 17, 14), Decl(declFileGenericType2.ts, 22, 14), Decl(declFileGenericType2.ts, 31, 14)) +>templa.dom.mvc.AbstractElementController : Symbol(AbstractElementController, Decl(declFileGenericType2.ts, 22, 26)) +>templa.dom.mvc : Symbol(mvc, Decl(declFileGenericType2.ts, 17, 21), Decl(declFileGenericType2.ts, 22, 21), Decl(declFileGenericType2.ts, 31, 21)) +>templa.dom : Symbol(dom, Decl(declFileGenericType2.ts, 17, 17), Decl(declFileGenericType2.ts, 22, 17), Decl(declFileGenericType2.ts, 31, 17)) >templa : Symbol(templa, Decl(declFileGenericType2.ts, 0, 0), Decl(declFileGenericType2.ts, 3, 1), Decl(declFileGenericType2.ts, 7, 1), Decl(declFileGenericType2.ts, 11, 1), Decl(declFileGenericType2.ts, 16, 1) ... and 2 more) ->dom : Symbol(dom, Decl(declFileGenericType2.ts, 17, 14), Decl(declFileGenericType2.ts, 22, 14), Decl(declFileGenericType2.ts, 31, 14)) ->mvc : Symbol(mvc, Decl(declFileGenericType2.ts, 17, 18), Decl(declFileGenericType2.ts, 22, 18), Decl(declFileGenericType2.ts, 31, 18)) ->AbstractElementController : Symbol(AbstractElementController, Decl(declFileGenericType2.ts, 22, 23)) +>dom : Symbol(dom, Decl(declFileGenericType2.ts, 17, 17), Decl(declFileGenericType2.ts, 22, 17), Decl(declFileGenericType2.ts, 31, 17)) +>mvc : Symbol(mvc, Decl(declFileGenericType2.ts, 17, 21), Decl(declFileGenericType2.ts, 22, 21), Decl(declFileGenericType2.ts, 31, 21)) +>AbstractElementController : Symbol(AbstractElementController, Decl(declFileGenericType2.ts, 22, 26)) >ModelType : Symbol(ModelType, Decl(declFileGenericType2.ts, 32, 52)) public _controllers: templa.mvc.IController[]; @@ -136,11 +136,11 @@ module templa.dom.mvc.composite { constructor() { super(); ->super : Symbol(AbstractElementController, Decl(declFileGenericType2.ts, 22, 23)) +>super : Symbol(AbstractElementController, Decl(declFileGenericType2.ts, 22, 26)) this._controllers = []; >this._controllers : Symbol(AbstractCompositeElementController._controllers, Decl(declFileGenericType2.ts, 32, 179)) ->this : Symbol(AbstractCompositeElementController, Decl(declFileGenericType2.ts, 31, 33)) +>this : Symbol(AbstractCompositeElementController, Decl(declFileGenericType2.ts, 31, 36)) >_controllers : Symbol(AbstractCompositeElementController._controllers, Decl(declFileGenericType2.ts, 32, 179)) } } diff --git a/tests/baselines/reference/declFileGenericType2.types b/tests/baselines/reference/declFileGenericType2.types index 33c7e716ac49e..c7db5558b94ec 100644 --- a/tests/baselines/reference/declFileGenericType2.types +++ b/tests/baselines/reference/declFileGenericType2.types @@ -44,7 +44,7 @@ declare module templa.mvc.composite { > : ^^^ } } -module templa.dom.mvc { +namespace templa.dom.mvc { export interface IElementController extends templa.mvc.IController { >templa : any > : ^^^ @@ -59,7 +59,7 @@ module templa.dom.mvc { } } // Module -module templa.dom.mvc { +namespace templa.dom.mvc { >templa : typeof templa > : ^^^^^^^^^^^^^ >dom : typeof dom @@ -95,7 +95,7 @@ module templa.dom.mvc { } } // Module -module templa.dom.mvc.composite { +namespace templa.dom.mvc.composite { >templa : typeof templa > : ^^^^^^^^^^^^^ >dom : typeof dom diff --git a/tests/baselines/reference/declFileImportChainInExportAssignment.js b/tests/baselines/reference/declFileImportChainInExportAssignment.js index a2f5e21dfeb8a..4017e4a0aada0 100644 --- a/tests/baselines/reference/declFileImportChainInExportAssignment.js +++ b/tests/baselines/reference/declFileImportChainInExportAssignment.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/declFileImportChainInExportAssignment.ts] //// //// [declFileImportChainInExportAssignment.ts] -module m { - export module c { +namespace m { + export namespace c { export class c { } } diff --git a/tests/baselines/reference/declFileImportChainInExportAssignment.symbols b/tests/baselines/reference/declFileImportChainInExportAssignment.symbols index e41e241c2afb0..b1b39b5dbe913 100644 --- a/tests/baselines/reference/declFileImportChainInExportAssignment.symbols +++ b/tests/baselines/reference/declFileImportChainInExportAssignment.symbols @@ -1,21 +1,21 @@ //// [tests/cases/compiler/declFileImportChainInExportAssignment.ts] //// === declFileImportChainInExportAssignment.ts === -module m { +namespace m { >m : Symbol(m, Decl(declFileImportChainInExportAssignment.ts, 0, 0)) - export module c { ->c : Symbol(c, Decl(declFileImportChainInExportAssignment.ts, 0, 10)) + export namespace c { +>c : Symbol(c, Decl(declFileImportChainInExportAssignment.ts, 0, 13)) export class c { ->c : Symbol(c, Decl(declFileImportChainInExportAssignment.ts, 1, 21)) +>c : Symbol(c, Decl(declFileImportChainInExportAssignment.ts, 1, 24)) } } } import a = m.c; >a : Symbol(a, Decl(declFileImportChainInExportAssignment.ts, 5, 1)) >m : Symbol(m, Decl(declFileImportChainInExportAssignment.ts, 0, 0)) ->c : Symbol(a, Decl(declFileImportChainInExportAssignment.ts, 0, 10)) +>c : Symbol(a, Decl(declFileImportChainInExportAssignment.ts, 0, 13)) import b = a; >b : Symbol(b, Decl(declFileImportChainInExportAssignment.ts, 6, 15)) diff --git a/tests/baselines/reference/declFileImportChainInExportAssignment.types b/tests/baselines/reference/declFileImportChainInExportAssignment.types index 3f13c64485edc..37065ba610b51 100644 --- a/tests/baselines/reference/declFileImportChainInExportAssignment.types +++ b/tests/baselines/reference/declFileImportChainInExportAssignment.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declFileImportChainInExportAssignment.ts] //// === declFileImportChainInExportAssignment.ts === -module m { +namespace m { >m : typeof m > : ^^^^^^^^ - export module c { + export namespace c { >c : typeof m.c > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js index 65bac37e0e884..0769da7850ac8 100644 --- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js +++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declFileImportModuleWithExportAssignment.ts] //// //// [declFileImportModuleWithExportAssignment_0.ts] -module m2 { +namespace m2 { export interface connectModule { (res, req, next): void; } diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.symbols b/tests/baselines/reference/declFileImportModuleWithExportAssignment.symbols index 22b9b303bffff..046296332f92f 100644 --- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.symbols +++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.symbols @@ -15,11 +15,11 @@ a.test1(null, null, null); >test1 : Symbol(test1, Decl(declFileImportModuleWithExportAssignment_0.ts, 11, 25)) === declFileImportModuleWithExportAssignment_0.ts === -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(declFileImportModuleWithExportAssignment_0.ts, 0, 0), Decl(declFileImportModuleWithExportAssignment_0.ts, 10, 3)) export interface connectModule { ->connectModule : Symbol(connectModule, Decl(declFileImportModuleWithExportAssignment_0.ts, 0, 11)) +>connectModule : Symbol(connectModule, Decl(declFileImportModuleWithExportAssignment_0.ts, 0, 14)) (res, req, next): void; >res : Symbol(res, Decl(declFileImportModuleWithExportAssignment_0.ts, 2, 9)) @@ -32,7 +32,7 @@ module m2 { use: (mod: connectModule) => connectExport; >use : Symbol(connectExport.use, Decl(declFileImportModuleWithExportAssignment_0.ts, 4, 36)) >mod : Symbol(mod, Decl(declFileImportModuleWithExportAssignment_0.ts, 5, 14)) ->connectModule : Symbol(connectModule, Decl(declFileImportModuleWithExportAssignment_0.ts, 0, 11)) +>connectModule : Symbol(connectModule, Decl(declFileImportModuleWithExportAssignment_0.ts, 0, 14)) >connectExport : Symbol(connectExport, Decl(declFileImportModuleWithExportAssignment_0.ts, 3, 5)) listen: (port: number) => void; @@ -51,12 +51,12 @@ var m2: { test1: m2.connectModule; >test1 : Symbol(test1, Decl(declFileImportModuleWithExportAssignment_0.ts, 11, 25)) >m2 : Symbol(m2, Decl(declFileImportModuleWithExportAssignment_0.ts, 0, 0), Decl(declFileImportModuleWithExportAssignment_0.ts, 10, 3)) ->connectModule : Symbol(m2.connectModule, Decl(declFileImportModuleWithExportAssignment_0.ts, 0, 11)) +>connectModule : Symbol(m2.connectModule, Decl(declFileImportModuleWithExportAssignment_0.ts, 0, 14)) test2(): m2.connectModule; >test2 : Symbol(test2, Decl(declFileImportModuleWithExportAssignment_0.ts, 12, 28)) >m2 : Symbol(m2, Decl(declFileImportModuleWithExportAssignment_0.ts, 0, 0), Decl(declFileImportModuleWithExportAssignment_0.ts, 10, 3)) ->connectModule : Symbol(m2.connectModule, Decl(declFileImportModuleWithExportAssignment_0.ts, 0, 11)) +>connectModule : Symbol(m2.connectModule, Decl(declFileImportModuleWithExportAssignment_0.ts, 0, 14)) }; export = m2; diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.types b/tests/baselines/reference/declFileImportModuleWithExportAssignment.types index e87f98845ca8c..6a1ba40c6e715 100644 --- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.types +++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.types @@ -23,7 +23,7 @@ a.test1(null, null, null); > : ^^^^^^^^^^^^^^^^ === declFileImportModuleWithExportAssignment_0.ts === -module m2 { +namespace m2 { export interface connectModule { (res, req, next): void; >res : any diff --git a/tests/baselines/reference/declFileInternalAliases.js b/tests/baselines/reference/declFileInternalAliases.js index b5ae88711f994..87dfcac577771 100644 --- a/tests/baselines/reference/declFileInternalAliases.js +++ b/tests/baselines/reference/declFileInternalAliases.js @@ -1,15 +1,15 @@ //// [tests/cases/compiler/declFileInternalAliases.ts] //// //// [declFileInternalAliases.ts] -module m { +namespace m { export class c { } } -module m1 { +namespace m1 { import x = m.c; export var d = new x(); // emit the type as m.c } -module m2 { +namespace m2 { export import x = m.c; export var d = new x(); // emit the type as x } diff --git a/tests/baselines/reference/declFileInternalAliases.symbols b/tests/baselines/reference/declFileInternalAliases.symbols index 3adb75f95b1e9..7fd795030ad0e 100644 --- a/tests/baselines/reference/declFileInternalAliases.symbols +++ b/tests/baselines/reference/declFileInternalAliases.symbols @@ -1,34 +1,34 @@ //// [tests/cases/compiler/declFileInternalAliases.ts] //// === declFileInternalAliases.ts === -module m { +namespace m { >m : Symbol(m, Decl(declFileInternalAliases.ts, 0, 0)) export class c { ->c : Symbol(c, Decl(declFileInternalAliases.ts, 0, 10)) +>c : Symbol(c, Decl(declFileInternalAliases.ts, 0, 13)) } } -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(declFileInternalAliases.ts, 3, 1)) import x = m.c; ->x : Symbol(x, Decl(declFileInternalAliases.ts, 4, 11)) +>x : Symbol(x, Decl(declFileInternalAliases.ts, 4, 14)) >m : Symbol(m, Decl(declFileInternalAliases.ts, 0, 0)) ->c : Symbol(x, Decl(declFileInternalAliases.ts, 0, 10)) +>c : Symbol(x, Decl(declFileInternalAliases.ts, 0, 13)) export var d = new x(); // emit the type as m.c >d : Symbol(d, Decl(declFileInternalAliases.ts, 6, 14)) ->x : Symbol(x, Decl(declFileInternalAliases.ts, 4, 11)) +>x : Symbol(x, Decl(declFileInternalAliases.ts, 4, 14)) } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(declFileInternalAliases.ts, 7, 1)) export import x = m.c; ->x : Symbol(x, Decl(declFileInternalAliases.ts, 8, 11)) +>x : Symbol(x, Decl(declFileInternalAliases.ts, 8, 14)) >m : Symbol(m, Decl(declFileInternalAliases.ts, 0, 0)) ->c : Symbol(x, Decl(declFileInternalAliases.ts, 0, 10)) +>c : Symbol(x, Decl(declFileInternalAliases.ts, 0, 13)) export var d = new x(); // emit the type as x >d : Symbol(d, Decl(declFileInternalAliases.ts, 10, 14)) ->x : Symbol(x, Decl(declFileInternalAliases.ts, 8, 11)) +>x : Symbol(x, Decl(declFileInternalAliases.ts, 8, 14)) } diff --git a/tests/baselines/reference/declFileInternalAliases.types b/tests/baselines/reference/declFileInternalAliases.types index 0717ecb37c89b..f7505ea878ee1 100644 --- a/tests/baselines/reference/declFileInternalAliases.types +++ b/tests/baselines/reference/declFileInternalAliases.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declFileInternalAliases.ts] //// === declFileInternalAliases.ts === -module m { +namespace m { >m : typeof m > : ^^^^^^^^ @@ -10,7 +10,7 @@ module m { > : ^ } } -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -30,7 +30,7 @@ module m1 { >x : typeof x > : ^^^^^^^^ } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js index 908aa40322ebe..0a7d2dec1624b 100644 --- a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js +++ b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declFileModuleAssignmentInObjectLiteralProperty.ts] //// //// [declFileModuleAssignmentInObjectLiteralProperty.ts] -module m1 { +namespace m1 { export class c { } } diff --git a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.symbols b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.symbols index b850c172b131e..f2b17a010ba9f 100644 --- a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.symbols +++ b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declFileModuleAssignmentInObjectLiteralProperty.ts] //// === declFileModuleAssignmentInObjectLiteralProperty.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(declFileModuleAssignmentInObjectLiteralProperty.ts, 0, 0)) export class c { ->c : Symbol(c, Decl(declFileModuleAssignmentInObjectLiteralProperty.ts, 0, 11)) +>c : Symbol(c, Decl(declFileModuleAssignmentInObjectLiteralProperty.ts, 0, 14)) } } var d = { @@ -19,8 +19,8 @@ var d = { m2: { c: m1.c }, >m2 : Symbol(m2, Decl(declFileModuleAssignmentInObjectLiteralProperty.ts, 5, 18)) >c : Symbol(c, Decl(declFileModuleAssignmentInObjectLiteralProperty.ts, 6, 9)) ->m1.c : Symbol(m1.c, Decl(declFileModuleAssignmentInObjectLiteralProperty.ts, 0, 11)) +>m1.c : Symbol(m1.c, Decl(declFileModuleAssignmentInObjectLiteralProperty.ts, 0, 14)) >m1 : Symbol(m1, Decl(declFileModuleAssignmentInObjectLiteralProperty.ts, 0, 0)) ->c : Symbol(m1.c, Decl(declFileModuleAssignmentInObjectLiteralProperty.ts, 0, 11)) +>c : Symbol(m1.c, Decl(declFileModuleAssignmentInObjectLiteralProperty.ts, 0, 14)) }; diff --git a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.types b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.types index 8823065269f8e..76dbda1ed39ba 100644 --- a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.types +++ b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declFileModuleAssignmentInObjectLiteralProperty.ts] //// === declFileModuleAssignmentInObjectLiteralProperty.ts === -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/declFileModuleContinuation.js b/tests/baselines/reference/declFileModuleContinuation.js index f2026a93affce..6e9629e9242e1 100644 --- a/tests/baselines/reference/declFileModuleContinuation.js +++ b/tests/baselines/reference/declFileModuleContinuation.js @@ -1,12 +1,12 @@ //// [tests/cases/compiler/declFileModuleContinuation.ts] //// //// [declFileModuleContinuation.ts] -module A.C { +namespace A.C { export interface Z { } } -module A.B.C { +namespace A.B.C { export class W implements A.C.Z { } } diff --git a/tests/baselines/reference/declFileModuleContinuation.symbols b/tests/baselines/reference/declFileModuleContinuation.symbols index 31f793b229731..7fbd49cbf8a84 100644 --- a/tests/baselines/reference/declFileModuleContinuation.symbols +++ b/tests/baselines/reference/declFileModuleContinuation.symbols @@ -1,26 +1,26 @@ //// [tests/cases/compiler/declFileModuleContinuation.ts] //// === declFileModuleContinuation.ts === -module A.C { +namespace A.C { >A : Symbol(A, Decl(declFileModuleContinuation.ts, 0, 0), Decl(declFileModuleContinuation.ts, 3, 1)) ->C : Symbol(C, Decl(declFileModuleContinuation.ts, 0, 9)) +>C : Symbol(C, Decl(declFileModuleContinuation.ts, 0, 12)) export interface Z { ->Z : Symbol(Z, Decl(declFileModuleContinuation.ts, 0, 12)) +>Z : Symbol(Z, Decl(declFileModuleContinuation.ts, 0, 15)) } } -module A.B.C { +namespace A.B.C { >A : Symbol(A, Decl(declFileModuleContinuation.ts, 0, 0), Decl(declFileModuleContinuation.ts, 3, 1)) ->B : Symbol(B, Decl(declFileModuleContinuation.ts, 5, 9)) ->C : Symbol(C, Decl(declFileModuleContinuation.ts, 5, 11)) +>B : Symbol(B, Decl(declFileModuleContinuation.ts, 5, 12)) +>C : Symbol(C, Decl(declFileModuleContinuation.ts, 5, 14)) export class W implements A.C.Z { ->W : Symbol(W, Decl(declFileModuleContinuation.ts, 5, 14)) ->A.C.Z : Symbol(A.C.Z, Decl(declFileModuleContinuation.ts, 0, 12)) ->A.C : Symbol(C, Decl(declFileModuleContinuation.ts, 0, 9)) +>W : Symbol(W, Decl(declFileModuleContinuation.ts, 5, 17)) +>A.C.Z : Symbol(A.C.Z, Decl(declFileModuleContinuation.ts, 0, 15)) +>A.C : Symbol(C, Decl(declFileModuleContinuation.ts, 0, 12)) >A : Symbol(A, Decl(declFileModuleContinuation.ts, 0, 0), Decl(declFileModuleContinuation.ts, 3, 1)) ->C : Symbol(C, Decl(declFileModuleContinuation.ts, 0, 9)) ->Z : Symbol(A.C.Z, Decl(declFileModuleContinuation.ts, 0, 12)) +>C : Symbol(C, Decl(declFileModuleContinuation.ts, 0, 12)) +>Z : Symbol(A.C.Z, Decl(declFileModuleContinuation.ts, 0, 15)) } } diff --git a/tests/baselines/reference/declFileModuleContinuation.types b/tests/baselines/reference/declFileModuleContinuation.types index 58ee39f8244fc..430b437ca835d 100644 --- a/tests/baselines/reference/declFileModuleContinuation.types +++ b/tests/baselines/reference/declFileModuleContinuation.types @@ -1,12 +1,12 @@ //// [tests/cases/compiler/declFileModuleContinuation.ts] //// === declFileModuleContinuation.ts === -module A.C { +namespace A.C { export interface Z { } } -module A.B.C { +namespace A.B.C { >A : typeof A > : ^^^^^^^^ >B : typeof B diff --git a/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js b/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js index dff1a93f272a4..25b4c9c7eddf6 100644 --- a/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js +++ b/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declFileModuleWithPropertyOfTypeModule.ts] //// //// [declFileModuleWithPropertyOfTypeModule.ts] -module m { +namespace m { export class c { } diff --git a/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.symbols b/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.symbols index de5038b3807f8..5fd1ccffc635a 100644 --- a/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.symbols +++ b/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declFileModuleWithPropertyOfTypeModule.ts] //// === declFileModuleWithPropertyOfTypeModule.ts === -module m { +namespace m { >m : Symbol(m, Decl(declFileModuleWithPropertyOfTypeModule.ts, 0, 0)) export class c { ->c : Symbol(c, Decl(declFileModuleWithPropertyOfTypeModule.ts, 0, 10)) +>c : Symbol(c, Decl(declFileModuleWithPropertyOfTypeModule.ts, 0, 13)) } export var a = m; diff --git a/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.types b/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.types index 686d05cd08d75..c4e98197171da 100644 --- a/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.types +++ b/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declFileModuleWithPropertyOfTypeModule.ts] //// === declFileModuleWithPropertyOfTypeModule.ts === -module m { +namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/declFileTypeAnnotationArrayType.js b/tests/baselines/reference/declFileTypeAnnotationArrayType.js index 9f3bc3fd1659c..0fbdd8bed4e0a 100644 --- a/tests/baselines/reference/declFileTypeAnnotationArrayType.js +++ b/tests/baselines/reference/declFileTypeAnnotationArrayType.js @@ -3,7 +3,7 @@ //// [declFileTypeAnnotationArrayType.ts] class c { } -module m { +namespace m { export class c { } export class g { diff --git a/tests/baselines/reference/declFileTypeAnnotationArrayType.symbols b/tests/baselines/reference/declFileTypeAnnotationArrayType.symbols index dfcaf6aa18de4..396b1e865a8fa 100644 --- a/tests/baselines/reference/declFileTypeAnnotationArrayType.symbols +++ b/tests/baselines/reference/declFileTypeAnnotationArrayType.symbols @@ -4,11 +4,11 @@ class c { >c : Symbol(c, Decl(declFileTypeAnnotationArrayType.ts, 0, 0)) } -module m { +namespace m { >m : Symbol(m, Decl(declFileTypeAnnotationArrayType.ts, 1, 1)) export class c { ->c : Symbol(c, Decl(declFileTypeAnnotationArrayType.ts, 2, 10)) +>c : Symbol(c, Decl(declFileTypeAnnotationArrayType.ts, 2, 13)) } export class g { >g : Symbol(g, Decl(declFileTypeAnnotationArrayType.ts, 4, 5)) @@ -39,20 +39,20 @@ function foo2() { function foo3(): m.c[] { >foo3 : Symbol(foo3, Decl(declFileTypeAnnotationArrayType.ts, 17, 1)) >m : Symbol(m, Decl(declFileTypeAnnotationArrayType.ts, 1, 1)) ->c : Symbol(m.c, Decl(declFileTypeAnnotationArrayType.ts, 2, 10)) +>c : Symbol(m.c, Decl(declFileTypeAnnotationArrayType.ts, 2, 13)) return [new m.c()]; ->m.c : Symbol(m.c, Decl(declFileTypeAnnotationArrayType.ts, 2, 10)) +>m.c : Symbol(m.c, Decl(declFileTypeAnnotationArrayType.ts, 2, 13)) >m : Symbol(m, Decl(declFileTypeAnnotationArrayType.ts, 1, 1)) ->c : Symbol(m.c, Decl(declFileTypeAnnotationArrayType.ts, 2, 10)) +>c : Symbol(m.c, Decl(declFileTypeAnnotationArrayType.ts, 2, 13)) } function foo4() { >foo4 : Symbol(foo4, Decl(declFileTypeAnnotationArrayType.ts, 22, 1)) return m.c; ->m.c : Symbol(m.c, Decl(declFileTypeAnnotationArrayType.ts, 2, 10)) +>m.c : Symbol(m.c, Decl(declFileTypeAnnotationArrayType.ts, 2, 13)) >m : Symbol(m, Decl(declFileTypeAnnotationArrayType.ts, 1, 1)) ->c : Symbol(m.c, Decl(declFileTypeAnnotationArrayType.ts, 2, 10)) +>c : Symbol(m.c, Decl(declFileTypeAnnotationArrayType.ts, 2, 13)) } // Just the name with type arguments diff --git a/tests/baselines/reference/declFileTypeAnnotationArrayType.types b/tests/baselines/reference/declFileTypeAnnotationArrayType.types index 3d2adb4655f5a..cb613e13c655c 100644 --- a/tests/baselines/reference/declFileTypeAnnotationArrayType.types +++ b/tests/baselines/reference/declFileTypeAnnotationArrayType.types @@ -5,7 +5,7 @@ class c { >c : c > : ^ } -module m { +namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/declFileTypeAnnotationTupleType.js b/tests/baselines/reference/declFileTypeAnnotationTupleType.js index 2600fa5f4cfbf..692582868766a 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTupleType.js +++ b/tests/baselines/reference/declFileTypeAnnotationTupleType.js @@ -3,7 +3,7 @@ //// [declFileTypeAnnotationTupleType.ts] class c { } -module m { +namespace m { export class c { } export class g { diff --git a/tests/baselines/reference/declFileTypeAnnotationTupleType.symbols b/tests/baselines/reference/declFileTypeAnnotationTupleType.symbols index ede64cf3f1198..0df1436e40b60 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTupleType.symbols +++ b/tests/baselines/reference/declFileTypeAnnotationTupleType.symbols @@ -4,11 +4,11 @@ class c { >c : Symbol(c, Decl(declFileTypeAnnotationTupleType.ts, 0, 0)) } -module m { +namespace m { >m : Symbol(m, Decl(declFileTypeAnnotationTupleType.ts, 1, 1)) export class c { ->c : Symbol(c, Decl(declFileTypeAnnotationTupleType.ts, 2, 10)) +>c : Symbol(c, Decl(declFileTypeAnnotationTupleType.ts, 2, 13)) } export class g { >g : Symbol(g, Decl(declFileTypeAnnotationTupleType.ts, 4, 5)) @@ -25,11 +25,11 @@ var k: [c, m.c] = [new c(), new m.c()]; >k : Symbol(k, Decl(declFileTypeAnnotationTupleType.ts, 12, 3)) >c : Symbol(c, Decl(declFileTypeAnnotationTupleType.ts, 0, 0)) >m : Symbol(m, Decl(declFileTypeAnnotationTupleType.ts, 1, 1)) ->c : Symbol(m.c, Decl(declFileTypeAnnotationTupleType.ts, 2, 10)) +>c : Symbol(m.c, Decl(declFileTypeAnnotationTupleType.ts, 2, 13)) >c : Symbol(c, Decl(declFileTypeAnnotationTupleType.ts, 0, 0)) ->m.c : Symbol(m.c, Decl(declFileTypeAnnotationTupleType.ts, 2, 10)) +>m.c : Symbol(m.c, Decl(declFileTypeAnnotationTupleType.ts, 2, 13)) >m : Symbol(m, Decl(declFileTypeAnnotationTupleType.ts, 1, 1)) ->c : Symbol(m.c, Decl(declFileTypeAnnotationTupleType.ts, 2, 10)) +>c : Symbol(m.c, Decl(declFileTypeAnnotationTupleType.ts, 2, 13)) var l = k; >l : Symbol(l, Decl(declFileTypeAnnotationTupleType.ts, 13, 3)) diff --git a/tests/baselines/reference/declFileTypeAnnotationTupleType.types b/tests/baselines/reference/declFileTypeAnnotationTupleType.types index 87d52435015d5..7553647334253 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTupleType.types +++ b/tests/baselines/reference/declFileTypeAnnotationTupleType.types @@ -5,7 +5,7 @@ class c { >c : c > : ^ } -module m { +namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeAlias.js b/tests/baselines/reference/declFileTypeAnnotationTypeAlias.js index e06dd61b97f01..e3a93bda3283b 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeAlias.js +++ b/tests/baselines/reference/declFileTypeAnnotationTypeAlias.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declFileTypeAnnotationTypeAlias.ts] //// //// [declFileTypeAnnotationTypeAlias.ts] -module M { +namespace M { export type Value = string | number | boolean; export var x: Value; @@ -10,7 +10,7 @@ module M { export type C = c; - export module m { + export namespace m { export class c { } } @@ -24,9 +24,9 @@ interface Window { someMethod(); } -module M { +namespace M { export type W = Window | string; - export module N { + export namespace N { export class Window { } export var p: W; } diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeAlias.symbols b/tests/baselines/reference/declFileTypeAnnotationTypeAlias.symbols index 89a8dd34d05f5..c06ac34a37bc1 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeAlias.symbols +++ b/tests/baselines/reference/declFileTypeAnnotationTypeAlias.symbols @@ -1,15 +1,15 @@ //// [tests/cases/compiler/declFileTypeAnnotationTypeAlias.ts] //// === declFileTypeAnnotationTypeAlias.ts === -module M { +namespace M { >M : Symbol(M, Decl(declFileTypeAnnotationTypeAlias.ts, 0, 0), Decl(declFileTypeAnnotationTypeAlias.ts, 21, 1)) export type Value = string | number | boolean; ->Value : Symbol(Value, Decl(declFileTypeAnnotationTypeAlias.ts, 0, 10)) +>Value : Symbol(Value, Decl(declFileTypeAnnotationTypeAlias.ts, 0, 13)) export var x: Value; >x : Symbol(x, Decl(declFileTypeAnnotationTypeAlias.ts, 2, 14)) ->Value : Symbol(Value, Decl(declFileTypeAnnotationTypeAlias.ts, 0, 10)) +>Value : Symbol(Value, Decl(declFileTypeAnnotationTypeAlias.ts, 0, 13)) export class c { >c : Symbol(c, Decl(declFileTypeAnnotationTypeAlias.ts, 2, 24)) @@ -19,18 +19,18 @@ module M { >C : Symbol(C, Decl(declFileTypeAnnotationTypeAlias.ts, 5, 5)) >c : Symbol(c, Decl(declFileTypeAnnotationTypeAlias.ts, 2, 24)) - export module m { + export namespace m { >m : Symbol(m, Decl(declFileTypeAnnotationTypeAlias.ts, 7, 22)) export class c { ->c : Symbol(c, Decl(declFileTypeAnnotationTypeAlias.ts, 9, 21)) +>c : Symbol(c, Decl(declFileTypeAnnotationTypeAlias.ts, 9, 24)) } } export type MC = m.c; >MC : Symbol(MC, Decl(declFileTypeAnnotationTypeAlias.ts, 12, 5)) >m : Symbol(m, Decl(declFileTypeAnnotationTypeAlias.ts, 7, 22)) ->c : Symbol(m.c, Decl(declFileTypeAnnotationTypeAlias.ts, 9, 21)) +>c : Symbol(m.c, Decl(declFileTypeAnnotationTypeAlias.ts, 9, 24)) export type fc = () => c; >fc : Symbol(fc, Decl(declFileTypeAnnotationTypeAlias.ts, 14, 25)) @@ -44,21 +44,21 @@ interface Window { >someMethod : Symbol(Window.someMethod, Decl(declFileTypeAnnotationTypeAlias.ts, 19, 18)) } -module M { +namespace M { >M : Symbol(M, Decl(declFileTypeAnnotationTypeAlias.ts, 0, 0), Decl(declFileTypeAnnotationTypeAlias.ts, 21, 1)) export type W = Window | string; ->W : Symbol(W, Decl(declFileTypeAnnotationTypeAlias.ts, 23, 10)) +>W : Symbol(W, Decl(declFileTypeAnnotationTypeAlias.ts, 23, 13)) >Window : Symbol(Window, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(declFileTypeAnnotationTypeAlias.ts, 17, 1)) - export module N { + export namespace N { >N : Symbol(N, Decl(declFileTypeAnnotationTypeAlias.ts, 24, 36)) export class Window { } ->Window : Symbol(Window, Decl(declFileTypeAnnotationTypeAlias.ts, 25, 21)) +>Window : Symbol(Window, Decl(declFileTypeAnnotationTypeAlias.ts, 25, 24)) export var p: W; >p : Symbol(p, Decl(declFileTypeAnnotationTypeAlias.ts, 27, 18)) ->W : Symbol(W, Decl(declFileTypeAnnotationTypeAlias.ts, 23, 10)) +>W : Symbol(W, Decl(declFileTypeAnnotationTypeAlias.ts, 23, 13)) } } diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeAlias.types b/tests/baselines/reference/declFileTypeAnnotationTypeAlias.types index eee0a4e7c96a6..0c61e120155ad 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeAlias.types +++ b/tests/baselines/reference/declFileTypeAnnotationTypeAlias.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declFileTypeAnnotationTypeAlias.ts] //// === declFileTypeAnnotationTypeAlias.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -22,7 +22,7 @@ module M { >C : c > : ^ - export module m { + export namespace m { >m : typeof m > : ^^^^^^^^ @@ -49,7 +49,7 @@ interface Window { > : ^^^^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -57,7 +57,7 @@ module M { >W : W > : ^ - export module N { + export namespace N { >N : typeof N > : ^^^^^^^^ diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.js b/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.js index 6180f99cda972..9b8f2f3f7b05c 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.js +++ b/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.js @@ -5,7 +5,7 @@ class c { } class g { } -module m { +namespace m { export class c { } } diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.symbols b/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.symbols index e7cba3a30dceb..ca57b6085ece9 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.symbols +++ b/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.symbols @@ -8,11 +8,11 @@ class g { >g : Symbol(g, Decl(declFileTypeAnnotationTypeLiteral.ts, 1, 1)) >T : Symbol(T, Decl(declFileTypeAnnotationTypeLiteral.ts, 2, 8)) } -module m { +namespace m { >m : Symbol(m, Decl(declFileTypeAnnotationTypeLiteral.ts, 3, 1)) export class c { ->c : Symbol(c, Decl(declFileTypeAnnotationTypeLiteral.ts, 4, 10)) +>c : Symbol(c, Decl(declFileTypeAnnotationTypeLiteral.ts, 4, 13)) } } @@ -37,7 +37,7 @@ var x: { new (a: string): m.c; >a : Symbol(a, Decl(declFileTypeAnnotationTypeLiteral.ts, 17, 9)) >m : Symbol(m, Decl(declFileTypeAnnotationTypeLiteral.ts, 3, 1)) ->c : Symbol(m.c, Decl(declFileTypeAnnotationTypeLiteral.ts, 4, 10)) +>c : Symbol(m.c, Decl(declFileTypeAnnotationTypeLiteral.ts, 4, 13)) // Indexers [n: number]: c; @@ -82,5 +82,5 @@ var z: new (a: string) => m.c; >z : Symbol(z, Decl(declFileTypeAnnotationTypeLiteral.ts, 37, 3)) >a : Symbol(a, Decl(declFileTypeAnnotationTypeLiteral.ts, 37, 12)) >m : Symbol(m, Decl(declFileTypeAnnotationTypeLiteral.ts, 3, 1)) ->c : Symbol(m.c, Decl(declFileTypeAnnotationTypeLiteral.ts, 4, 10)) +>c : Symbol(m.c, Decl(declFileTypeAnnotationTypeLiteral.ts, 4, 13)) diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.types b/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.types index 31d42350451e7..4ab9e6468ecf0 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.types +++ b/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.types @@ -9,7 +9,7 @@ class g { >g : g > : ^^^^ } -module m { +namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeQuery.js b/tests/baselines/reference/declFileTypeAnnotationTypeQuery.js index 6145369ebdfd4..f5f0f1eb99997 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeQuery.js +++ b/tests/baselines/reference/declFileTypeAnnotationTypeQuery.js @@ -3,7 +3,7 @@ //// [declFileTypeAnnotationTypeQuery.ts] class c { } -module m { +namespace m { export class c { } export class g { diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeQuery.symbols b/tests/baselines/reference/declFileTypeAnnotationTypeQuery.symbols index 98fd34a166ffd..048f166238f48 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeQuery.symbols +++ b/tests/baselines/reference/declFileTypeAnnotationTypeQuery.symbols @@ -4,11 +4,11 @@ class c { >c : Symbol(c, Decl(declFileTypeAnnotationTypeQuery.ts, 0, 0)) } -module m { +namespace m { >m : Symbol(m, Decl(declFileTypeAnnotationTypeQuery.ts, 1, 1)) export class c { ->c : Symbol(c, Decl(declFileTypeAnnotationTypeQuery.ts, 2, 10)) +>c : Symbol(c, Decl(declFileTypeAnnotationTypeQuery.ts, 2, 13)) } export class g { >g : Symbol(g, Decl(declFileTypeAnnotationTypeQuery.ts, 4, 5)) @@ -38,22 +38,22 @@ function foo2() { // Qualified name function foo3(): typeof m.c { >foo3 : Symbol(foo3, Decl(declFileTypeAnnotationTypeQuery.ts, 17, 1)) ->m.c : Symbol(m.c, Decl(declFileTypeAnnotationTypeQuery.ts, 2, 10)) +>m.c : Symbol(m.c, Decl(declFileTypeAnnotationTypeQuery.ts, 2, 13)) >m : Symbol(m, Decl(declFileTypeAnnotationTypeQuery.ts, 1, 1)) ->c : Symbol(m.c, Decl(declFileTypeAnnotationTypeQuery.ts, 2, 10)) +>c : Symbol(m.c, Decl(declFileTypeAnnotationTypeQuery.ts, 2, 13)) return m.c; ->m.c : Symbol(m.c, Decl(declFileTypeAnnotationTypeQuery.ts, 2, 10)) +>m.c : Symbol(m.c, Decl(declFileTypeAnnotationTypeQuery.ts, 2, 13)) >m : Symbol(m, Decl(declFileTypeAnnotationTypeQuery.ts, 1, 1)) ->c : Symbol(m.c, Decl(declFileTypeAnnotationTypeQuery.ts, 2, 10)) +>c : Symbol(m.c, Decl(declFileTypeAnnotationTypeQuery.ts, 2, 13)) } function foo4() { >foo4 : Symbol(foo4, Decl(declFileTypeAnnotationTypeQuery.ts, 22, 1)) return m.c; ->m.c : Symbol(m.c, Decl(declFileTypeAnnotationTypeQuery.ts, 2, 10)) +>m.c : Symbol(m.c, Decl(declFileTypeAnnotationTypeQuery.ts, 2, 13)) >m : Symbol(m, Decl(declFileTypeAnnotationTypeQuery.ts, 1, 1)) ->c : Symbol(m.c, Decl(declFileTypeAnnotationTypeQuery.ts, 2, 10)) +>c : Symbol(m.c, Decl(declFileTypeAnnotationTypeQuery.ts, 2, 13)) } // Just the name with type arguments diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeQuery.types b/tests/baselines/reference/declFileTypeAnnotationTypeQuery.types index a46b376fd9690..3e6310e473ccb 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeQuery.types +++ b/tests/baselines/reference/declFileTypeAnnotationTypeQuery.types @@ -5,7 +5,7 @@ class c { >c : c > : ^ } -module m { +namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeReference.js b/tests/baselines/reference/declFileTypeAnnotationTypeReference.js index 7ac6e76052454..a13f38e78ead8 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeReference.js +++ b/tests/baselines/reference/declFileTypeAnnotationTypeReference.js @@ -3,7 +3,7 @@ //// [declFileTypeAnnotationTypeReference.ts] class c { } -module m { +namespace m { export class c { } export class g { diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeReference.symbols b/tests/baselines/reference/declFileTypeAnnotationTypeReference.symbols index c407ae21741f7..90e999a3b4692 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeReference.symbols +++ b/tests/baselines/reference/declFileTypeAnnotationTypeReference.symbols @@ -4,11 +4,11 @@ class c { >c : Symbol(c, Decl(declFileTypeAnnotationTypeReference.ts, 0, 0)) } -module m { +namespace m { >m : Symbol(m, Decl(declFileTypeAnnotationTypeReference.ts, 1, 1)) export class c { ->c : Symbol(c, Decl(declFileTypeAnnotationTypeReference.ts, 2, 10)) +>c : Symbol(c, Decl(declFileTypeAnnotationTypeReference.ts, 2, 13)) } export class g { >g : Symbol(g, Decl(declFileTypeAnnotationTypeReference.ts, 4, 5)) @@ -39,20 +39,20 @@ function foo2() { function foo3(): m.c { >foo3 : Symbol(foo3, Decl(declFileTypeAnnotationTypeReference.ts, 17, 1)) >m : Symbol(m, Decl(declFileTypeAnnotationTypeReference.ts, 1, 1)) ->c : Symbol(m.c, Decl(declFileTypeAnnotationTypeReference.ts, 2, 10)) +>c : Symbol(m.c, Decl(declFileTypeAnnotationTypeReference.ts, 2, 13)) return new m.c(); ->m.c : Symbol(m.c, Decl(declFileTypeAnnotationTypeReference.ts, 2, 10)) +>m.c : Symbol(m.c, Decl(declFileTypeAnnotationTypeReference.ts, 2, 13)) >m : Symbol(m, Decl(declFileTypeAnnotationTypeReference.ts, 1, 1)) ->c : Symbol(m.c, Decl(declFileTypeAnnotationTypeReference.ts, 2, 10)) +>c : Symbol(m.c, Decl(declFileTypeAnnotationTypeReference.ts, 2, 13)) } function foo4() { >foo4 : Symbol(foo4, Decl(declFileTypeAnnotationTypeReference.ts, 22, 1)) return new m.c(); ->m.c : Symbol(m.c, Decl(declFileTypeAnnotationTypeReference.ts, 2, 10)) +>m.c : Symbol(m.c, Decl(declFileTypeAnnotationTypeReference.ts, 2, 13)) >m : Symbol(m, Decl(declFileTypeAnnotationTypeReference.ts, 1, 1)) ->c : Symbol(m.c, Decl(declFileTypeAnnotationTypeReference.ts, 2, 10)) +>c : Symbol(m.c, Decl(declFileTypeAnnotationTypeReference.ts, 2, 13)) } // Just the name with type arguments diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeReference.types b/tests/baselines/reference/declFileTypeAnnotationTypeReference.types index 698c85a67dfb9..5b0bbcfa49d00 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeReference.types +++ b/tests/baselines/reference/declFileTypeAnnotationTypeReference.types @@ -5,7 +5,7 @@ class c { >c : c > : ^ } -module m { +namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/declFileTypeAnnotationUnionType.js b/tests/baselines/reference/declFileTypeAnnotationUnionType.js index 649abee50f6d8..197ad34d440a9 100644 --- a/tests/baselines/reference/declFileTypeAnnotationUnionType.js +++ b/tests/baselines/reference/declFileTypeAnnotationUnionType.js @@ -4,7 +4,7 @@ class c { private p: string; } -module m { +namespace m { export class c { private q: string; } diff --git a/tests/baselines/reference/declFileTypeAnnotationUnionType.symbols b/tests/baselines/reference/declFileTypeAnnotationUnionType.symbols index 71cfa4fe17146..0193e6bb7cb1a 100644 --- a/tests/baselines/reference/declFileTypeAnnotationUnionType.symbols +++ b/tests/baselines/reference/declFileTypeAnnotationUnionType.symbols @@ -7,11 +7,11 @@ class c { private p: string; >p : Symbol(c.p, Decl(declFileTypeAnnotationUnionType.ts, 0, 9)) } -module m { +namespace m { >m : Symbol(m, Decl(declFileTypeAnnotationUnionType.ts, 2, 1)) export class c { ->c : Symbol(c, Decl(declFileTypeAnnotationUnionType.ts, 3, 10)) +>c : Symbol(c, Decl(declFileTypeAnnotationUnionType.ts, 3, 13)) private q: string; >q : Symbol(c.q, Decl(declFileTypeAnnotationUnionType.ts, 4, 20)) @@ -37,18 +37,18 @@ var k: c | m.c = new c() || new m.c(); >k : Symbol(k, Decl(declFileTypeAnnotationUnionType.ts, 16, 3)) >c : Symbol(c, Decl(declFileTypeAnnotationUnionType.ts, 0, 0)) >m : Symbol(m, Decl(declFileTypeAnnotationUnionType.ts, 2, 1)) ->c : Symbol(m.c, Decl(declFileTypeAnnotationUnionType.ts, 3, 10)) +>c : Symbol(m.c, Decl(declFileTypeAnnotationUnionType.ts, 3, 13)) >c : Symbol(c, Decl(declFileTypeAnnotationUnionType.ts, 0, 0)) ->m.c : Symbol(m.c, Decl(declFileTypeAnnotationUnionType.ts, 3, 10)) +>m.c : Symbol(m.c, Decl(declFileTypeAnnotationUnionType.ts, 3, 13)) >m : Symbol(m, Decl(declFileTypeAnnotationUnionType.ts, 2, 1)) ->c : Symbol(m.c, Decl(declFileTypeAnnotationUnionType.ts, 3, 10)) +>c : Symbol(m.c, Decl(declFileTypeAnnotationUnionType.ts, 3, 13)) var l = new c() || new m.c(); >l : Symbol(l, Decl(declFileTypeAnnotationUnionType.ts, 17, 3)) >c : Symbol(c, Decl(declFileTypeAnnotationUnionType.ts, 0, 0)) ->m.c : Symbol(m.c, Decl(declFileTypeAnnotationUnionType.ts, 3, 10)) +>m.c : Symbol(m.c, Decl(declFileTypeAnnotationUnionType.ts, 3, 13)) >m : Symbol(m, Decl(declFileTypeAnnotationUnionType.ts, 2, 1)) ->c : Symbol(m.c, Decl(declFileTypeAnnotationUnionType.ts, 3, 10)) +>c : Symbol(m.c, Decl(declFileTypeAnnotationUnionType.ts, 3, 13)) var x: g | m.g | (() => c) = new g() || new m.g() || (() => new c()); >x : Symbol(x, Decl(declFileTypeAnnotationUnionType.ts, 19, 3)) diff --git a/tests/baselines/reference/declFileTypeAnnotationUnionType.types b/tests/baselines/reference/declFileTypeAnnotationUnionType.types index 2c07df3315a99..9140b6b5be46f 100644 --- a/tests/baselines/reference/declFileTypeAnnotationUnionType.types +++ b/tests/baselines/reference/declFileTypeAnnotationUnionType.types @@ -9,7 +9,7 @@ class c { >p : string > : ^^^^^^ } -module m { +namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js index 8cdbb889f80e9..9cec0df4b5b79 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js @@ -1,14 +1,14 @@ //// [tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts] //// //// [declFileTypeAnnotationVisibilityErrorAccessors.ts] -module m { +namespace m { class private1 { } export class public1 { } - module m2 { + namespace m2 { export class public2 { } } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.symbols b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.symbols index 654a8a1fc0a9f..113d7ab8de654 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.symbols +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.symbols @@ -1,22 +1,22 @@ //// [tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts] //// === declFileTypeAnnotationVisibilityErrorAccessors.ts === -module m { +namespace m { >m : Symbol(m, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 0, 0)) class private1 { ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 0, 13)) } export class public1 { >public1 : Symbol(public1, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 2, 5)) } - module m2 { + namespace m2 { >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 5, 5)) export class public2 { ->public2 : Symbol(public2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 7, 15)) +>public2 : Symbol(public2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 7, 18)) } } @@ -26,7 +26,7 @@ module m { // getter with annotation get foo1(): private1 { >foo1 : Symbol(c.foo1, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 12, 20)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 0, 13)) return; } @@ -36,14 +36,14 @@ module m { >foo2 : Symbol(c.foo2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 16, 9)) return new private1(); ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 0, 13)) } // setter with annotation set foo3(param: private1) { >foo3 : Symbol(c.foo3, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 21, 9)) >param : Symbol(param, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 24, 17)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 0, 13)) } // Both - getter without annotation, setter with annotation @@ -51,25 +51,25 @@ module m { >foo4 : Symbol(c.foo4, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 25, 9), Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 30, 9)) return new private1(); ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 0, 13)) } set foo4(param: private1) { >foo4 : Symbol(c.foo4, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 25, 9), Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 30, 9)) >param : Symbol(param, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 31, 17)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 0, 13)) } // Both - with annotation get foo5(): private1 { >foo5 : Symbol(c.foo5, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 32, 9), Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 37, 9)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 0, 13)) return; } set foo5(param: private1) { >foo5 : Symbol(c.foo5, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 32, 9), Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 37, 9)) >param : Symbol(param, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 38, 17)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 0, 13)) } // getter with annotation @@ -125,7 +125,7 @@ module m { get foo111(): m2.public2 { >foo111 : Symbol(c.foo111, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 67, 9)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 5, 5)) ->public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 7, 15)) +>public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 7, 18)) return; } @@ -135,9 +135,9 @@ module m { >foo112 : Symbol(c.foo112, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 72, 9)) return new m2.public2(); ->m2.public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 7, 15)) +>m2.public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 7, 18)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 5, 5)) ->public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 7, 15)) +>public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 7, 18)) } // setter with annotation @@ -145,7 +145,7 @@ module m { >foo113 : Symbol(c.foo113, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 77, 9)) >param : Symbol(param, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 80, 19)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 5, 5)) ->public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 7, 15)) +>public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 7, 18)) } // Both - getter without annotation, setter with annotation @@ -153,22 +153,22 @@ module m { >foo114 : Symbol(c.foo114, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 81, 9), Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 86, 9)) return new m2.public2(); ->m2.public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 7, 15)) +>m2.public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 7, 18)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 5, 5)) ->public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 7, 15)) +>public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 7, 18)) } set foo114(param: m2.public2) { >foo114 : Symbol(c.foo114, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 81, 9), Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 86, 9)) >param : Symbol(param, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 87, 19)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 5, 5)) ->public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 7, 15)) +>public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 7, 18)) } // Both - with annotation get foo115(): m2.public2 { >foo115 : Symbol(c.foo115, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 88, 9), Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 93, 9)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 5, 5)) ->public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 7, 15)) +>public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 7, 18)) return; } @@ -176,7 +176,7 @@ module m { >foo115 : Symbol(c.foo115, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 88, 9), Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 93, 9)) >param : Symbol(param, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 94, 19)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 5, 5)) ->public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 7, 15)) +>public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorAccessors.ts, 7, 18)) } } } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.types b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.types index 65120a2357b6f..3c4fe70b3c0f3 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.types +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts] //// === declFileTypeAnnotationVisibilityErrorAccessors.ts === -module m { +namespace m { >m : typeof m > : ^^^^^^^^ @@ -15,7 +15,7 @@ module m { > : ^^^^^^^ } - module m2 { + namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js index e101c1657af66..4f675d9e4bb8f 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts] //// //// [declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts] -module m { +namespace m { class private1 { } @@ -29,7 +29,7 @@ module m { export function foo14(param = new public1()) { } - module m2 { + namespace m2 { export class public2 { } } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.symbols b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.symbols index 663f630c997ce..b1132430ac2bc 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.symbols +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts] //// === declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts === -module m { +namespace m { >m : Symbol(m, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 0, 0)) class private1 { ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 0, 13)) } export class public1 { @@ -16,23 +16,23 @@ module m { function foo1(param: private1) { >foo1 : Symbol(foo1, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 5, 5)) >param : Symbol(param, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 8, 18)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 0, 13)) } function foo2(param = new private1()) { >foo2 : Symbol(foo2, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 9, 5)) >param : Symbol(param, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 10, 18)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 0, 13)) } export function foo3(param : private1) { >foo3 : Symbol(foo3, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 11, 5)) >param : Symbol(param, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 13, 25)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 0, 13)) } export function foo4(param = new private1()) { >foo4 : Symbol(foo4, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 14, 5)) >param : Symbol(param, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 15, 25)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 0, 13)) } function foo11(param: public1) { @@ -57,11 +57,11 @@ module m { >public1 : Symbol(public1, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 2, 5)) } - module m2 { + namespace m2 { >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 26, 5)) export class public2 { ->public2 : Symbol(public2, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 28, 15)) +>public2 : Symbol(public2, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 28, 18)) } } @@ -69,28 +69,28 @@ module m { >foo111 : Symbol(foo111, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 31, 5)) >param : Symbol(param, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 33, 20)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 26, 5)) ->public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 28, 15)) +>public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 28, 18)) } function foo112(param = new m2.public2()) { >foo112 : Symbol(foo112, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 34, 5)) >param : Symbol(param, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 35, 20)) ->m2.public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 28, 15)) +>m2.public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 28, 18)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 26, 5)) ->public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 28, 15)) +>public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 28, 18)) } export function foo113(param: m2.public2) { >foo113 : Symbol(foo113, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 36, 5)) >param : Symbol(param, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 38, 27)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 26, 5)) ->public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 28, 15)) +>public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 28, 18)) } export function foo114(param = new m2.public2()) { >foo114 : Symbol(foo114, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 39, 5)) >param : Symbol(param, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 40, 27)) ->m2.public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 28, 15)) +>m2.public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 28, 18)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 26, 5)) ->public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 28, 15)) +>public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts, 28, 18)) } } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.types b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.types index f8a32ebc3630e..28c4b653656a5 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.types +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts] //// === declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts === -module m { +namespace m { >m : typeof m > : ^^^^^^^^ @@ -84,7 +84,7 @@ module m { > : ^^^^^^^^^^^^^^ } - module m2 { + namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js index bf1c17b6a2440..b125f13b8390f 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts] //// //// [declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts] -module m { +namespace m { class private1 { } @@ -37,7 +37,7 @@ module m { return new public1(); } - module m2 { + namespace m2 { export class public2 { } } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.symbols b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.symbols index 0c4da9c57c431..86293aefe05fa 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.symbols +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts] //// === declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts === -module m { +namespace m { >m : Symbol(m, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 0, 0)) class private1 { ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 0, 13)) } export class public1 { @@ -15,7 +15,7 @@ module m { // Directly using names from this module function foo1(): private1 { >foo1 : Symbol(foo1, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 5, 5)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 0, 13)) return; } @@ -23,12 +23,12 @@ module m { >foo2 : Symbol(foo2, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 10, 5)) return new private1(); ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 0, 13)) } export function foo3(): private1 { >foo3 : Symbol(foo3, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 13, 5)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 0, 13)) return; } @@ -36,7 +36,7 @@ module m { >foo4 : Symbol(foo4, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 17, 5)) return new private1(); ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 0, 13)) } function foo11(): public1 { @@ -65,18 +65,18 @@ module m { >public1 : Symbol(public1, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 2, 5)) } - module m2 { + namespace m2 { >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 34, 5)) export class public2 { ->public2 : Symbol(public2, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 36, 15)) +>public2 : Symbol(public2, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 36, 18)) } } function foo111(): m2.public2 { >foo111 : Symbol(foo111, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 39, 5)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 34, 5)) ->public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 36, 15)) +>public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 36, 18)) return; } @@ -84,15 +84,15 @@ module m { >foo112 : Symbol(foo112, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 43, 5)) return new m2.public2(); ->m2.public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 36, 15)) +>m2.public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 36, 18)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 34, 5)) ->public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 36, 15)) +>public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 36, 18)) } export function foo113(): m2.public2 { >foo113 : Symbol(foo113, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 46, 5)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 34, 5)) ->public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 36, 15)) +>public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 36, 18)) return; } @@ -100,9 +100,9 @@ module m { >foo114 : Symbol(foo114, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 50, 5)) return new m2.public2(); ->m2.public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 36, 15)) +>m2.public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 36, 18)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 34, 5)) ->public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 36, 15)) +>public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts, 36, 18)) } } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.types b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.types index 5519ff634df8a..99b97c5c0d7b1 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.types +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts] //// === declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts === -module m { +namespace m { >m : typeof m > : ^^^^^^^^ @@ -84,7 +84,7 @@ module m { > : ^^^^^^^^^^^^^^ } - module m2 { + namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js index c2a5df30d34a6..4eeac635d81c1 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js @@ -5,28 +5,28 @@ interface Window { someMethod(); } -module M { +namespace M { type W = Window | string; - export module N { + export namespace N { export class Window { } export var p: W; // Should report error that W is private } } -module M1 { +namespace M1 { export type W = Window | string; - export module N { + export namespace N { export class Window { } export var p: W; // No error } } -module M2 { +namespace M2 { class private1 { } class public1 { } - module m3 { + namespace m3 { export class public1 { } } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.symbols b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.symbols index d025f3931857b..a1fe3ca1692c8 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.symbols +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.symbols @@ -8,68 +8,68 @@ interface Window { >someMethod : Symbol(Window.someMethod, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 0, 18)) } -module M { +namespace M { >M : Symbol(M, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 2, 1)) type W = Window | string; ->W : Symbol(W, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 4, 10)) +>W : Symbol(W, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 4, 13)) >Window : Symbol(Window, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 0, 0)) - export module N { + export namespace N { >N : Symbol(N, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 5, 29)) export class Window { } ->Window : Symbol(Window, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 6, 21)) +>Window : Symbol(Window, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 6, 24)) export var p: W; // Should report error that W is private >p : Symbol(p, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 8, 18)) ->W : Symbol(W, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 4, 10)) +>W : Symbol(W, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 4, 13)) } } -module M1 { +namespace M1 { >M1 : Symbol(M1, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 10, 1)) export type W = Window | string; ->W : Symbol(W, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 12, 11)) +>W : Symbol(W, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 12, 14)) >Window : Symbol(Window, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 0, 0)) - export module N { + export namespace N { >N : Symbol(N, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 13, 36)) export class Window { } ->Window : Symbol(Window, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 14, 21)) +>Window : Symbol(Window, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 14, 24)) export var p: W; // No error >p : Symbol(p, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 16, 18)) ->W : Symbol(W, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 12, 11)) +>W : Symbol(W, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 12, 14)) } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 18, 1)) class private1 { ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 20, 11)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 20, 14)) } class public1 { >public1 : Symbol(public1, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 22, 5)) } - module m3 { + namespace m3 { >m3 : Symbol(m3, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 24, 5)) export class public1 { ->public1 : Symbol(public1, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 25, 15)) +>public1 : Symbol(public1, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 25, 18)) } } type t1 = private1; >t1 : Symbol(t1, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 28, 5)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 20, 11)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 20, 14)) export type t2 = private1; // error >t2 : Symbol(t2, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 30, 23)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 20, 11)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 20, 14)) type t11 = public1; >t11 : Symbol(t11, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 31, 30)) @@ -82,11 +82,11 @@ module M2 { type t111 = m3.public1; >t111 : Symbol(t111, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 34, 30)) >m3 : Symbol(m3, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 24, 5)) ->public1 : Symbol(m3.public1, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 25, 15)) +>public1 : Symbol(m3.public1, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 25, 18)) export type t112 = m3.public1; // error >t112 : Symbol(t112, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 36, 27)) >m3 : Symbol(m3, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 24, 5)) ->public1 : Symbol(m3.public1, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 25, 15)) +>public1 : Symbol(m3.public1, Decl(declFileTypeAnnotationVisibilityErrorTypeAlias.ts, 25, 18)) } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.types b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.types index da303d5a2b20f..bd2d713a469e4 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.types +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.types @@ -7,7 +7,7 @@ interface Window { > : ^^^^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -15,7 +15,7 @@ module M { >W : W > : ^ - export module N { + export namespace N { >N : typeof N > : ^^^^^^^^ @@ -29,7 +29,7 @@ module M { } } -module M1 { +namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ @@ -37,7 +37,7 @@ module M1 { >W : W > : ^ - export module N { + export namespace N { >N : typeof N > : ^^^^^^^^ @@ -51,7 +51,7 @@ module M1 { } } -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ @@ -63,7 +63,7 @@ module M2 { >public1 : public1 > : ^^^^^^^ } - module m3 { + namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js index 2a89acf5c8e0e..70131c134a387 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js @@ -1,10 +1,10 @@ //// [tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts] //// //// [declFileTypeAnnotationVisibilityErrorTypeLiteral.ts] -module m { +namespace m { class private1 { } - module m2 { + namespace m2 { export class public1 { } } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.symbols b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.symbols index d9ba371acd197..af402e9d0841e 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.symbols +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.symbols @@ -1,17 +1,17 @@ //// [tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts] //// === declFileTypeAnnotationVisibilityErrorTypeLiteral.ts === -module m { +namespace m { >m : Symbol(m, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 0, 0)) class private1 { ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 0, 13)) } - module m2 { + namespace m2 { >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 2, 5)) export class public1 { ->public1 : Symbol(public1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 3, 15)) +>public1 : Symbol(public1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 3, 18)) } } @@ -20,29 +20,29 @@ module m { x: private1; >x : Symbol(x, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 8, 19)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 0, 13)) y: m2.public1; >y : Symbol(y, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 9, 20)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 2, 5)) ->public1 : Symbol(m2.public1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 3, 15)) +>public1 : Symbol(m2.public1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 3, 18)) (): m2.public1[]; >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 2, 5)) ->public1 : Symbol(m2.public1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 3, 15)) +>public1 : Symbol(m2.public1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 3, 18)) method(): private1; >method : Symbol(method, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 11, 25)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 0, 13)) [n: number]: private1; >n : Symbol(n, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 13, 9)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 0, 13)) [s: string]: m2.public1; >s : Symbol(s, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 14, 9)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 2, 5)) ->public1 : Symbol(m2.public1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 3, 15)) +>public1 : Symbol(m2.public1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 3, 18)) }; export var x2 = { @@ -50,19 +50,19 @@ module m { x: new private1(), >x : Symbol(x, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 16, 21)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 0, 13)) y: new m2.public1(), >y : Symbol(y, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 17, 26)) ->m2.public1 : Symbol(m2.public1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 3, 15)) +>m2.public1 : Symbol(m2.public1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 3, 18)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 2, 5)) ->public1 : Symbol(m2.public1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 3, 15)) +>public1 : Symbol(m2.public1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 3, 18)) method() { >method : Symbol(method, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 18, 28)) return new private1(); ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 0, 13)) } }; export var x3 = x; @@ -73,9 +73,9 @@ module m { export var y: (a: private1) => m2.public1; >y : Symbol(y, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 26, 14)) >a : Symbol(a, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 26, 19)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 0, 13)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 2, 5)) ->public1 : Symbol(m2.public1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 3, 15)) +>public1 : Symbol(m2.public1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 3, 18)) export var y2 = y; >y2 : Symbol(y2, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 27, 14)) @@ -85,9 +85,9 @@ module m { export var z: new (a: private1) => m2.public1; >z : Symbol(z, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 30, 14)) >a : Symbol(a, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 30, 23)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 0, 13)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 2, 5)) ->public1 : Symbol(m2.public1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 3, 15)) +>public1 : Symbol(m2.public1, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 3, 18)) export var z2 = z; >z2 : Symbol(z2, Decl(declFileTypeAnnotationVisibilityErrorTypeLiteral.ts, 31, 14)) diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.types b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.types index 0d4f6f49920bf..1b13ddd93434d 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.types +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts] //// === declFileTypeAnnotationVisibilityErrorTypeLiteral.ts === -module m { +namespace m { >m : typeof m > : ^^^^^^^^ @@ -9,7 +9,7 @@ module m { >private1 : private1 > : ^^^^^^^^ } - module m2 { + namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js index 20387523b2441..68b0fcaf5c7c5 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts] //// //// [declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts] -module m { +namespace m { class private1 { } @@ -21,7 +21,7 @@ module m { export var k2: public1; export var l2 = new public1(); - module m2 { + namespace m2 { export class public2 { } } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.symbols b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.symbols index 542d3e3335e3f..e36928749b2fa 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.symbols +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts] //// === declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts === -module m { +namespace m { >m : Symbol(m, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 0, 0)) class private1 { ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 0, 13)) } export class public1 { @@ -15,19 +15,19 @@ module m { // Directly using names from this module var x: private1; >x : Symbol(x, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 8, 7)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 0, 13)) var y = new private1(); >y : Symbol(y, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 9, 7)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 0, 13)) export var k: private1; >k : Symbol(k, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 11, 14)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 0, 13)) export var l = new private1(); >l : Symbol(l, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 12, 14)) ->private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 0, 10)) +>private1 : Symbol(private1, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 0, 13)) var x2: public1; >x2 : Symbol(x2, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 14, 7)) @@ -45,34 +45,34 @@ module m { >l2 : Symbol(l2, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 18, 14)) >public1 : Symbol(public1, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 2, 5)) - module m2 { + namespace m2 { >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 18, 34)) export class public2 { ->public2 : Symbol(public2, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 20, 15)) +>public2 : Symbol(public2, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 20, 18)) } } var x3: m2.public2; >x3 : Symbol(x3, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 25, 7)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 18, 34)) ->public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 20, 15)) +>public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 20, 18)) var y3 = new m2.public2(); >y3 : Symbol(y3, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 26, 7)) ->m2.public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 20, 15)) +>m2.public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 20, 18)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 18, 34)) ->public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 20, 15)) +>public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 20, 18)) export var k3: m2.public2; >k3 : Symbol(k3, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 28, 14)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 18, 34)) ->public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 20, 15)) +>public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 20, 18)) export var l3 = new m2.public2(); >l3 : Symbol(l3, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 29, 14)) ->m2.public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 20, 15)) +>m2.public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 20, 18)) >m2 : Symbol(m2, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 18, 34)) ->public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 20, 15)) +>public2 : Symbol(m2.public2, Decl(declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts, 20, 18)) } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.types b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.types index 9d85e1f85b59b..8aa08dbcb627d 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.types +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts] //// === declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts === -module m { +namespace m { >m : typeof m > : ^^^^^^^^ @@ -64,7 +64,7 @@ module m { >public1 : typeof public1 > : ^^^^^^^^^^^^^^ - module m2 { + namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/declFileTypeofInAnonymousType.js b/tests/baselines/reference/declFileTypeofInAnonymousType.js index 57292acfb6fdb..8ee97c1648586 100644 --- a/tests/baselines/reference/declFileTypeofInAnonymousType.js +++ b/tests/baselines/reference/declFileTypeofInAnonymousType.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declFileTypeofInAnonymousType.ts] //// //// [declFileTypeofInAnonymousType.ts] -module m1 { +namespace m1 { export class c { } export enum e { diff --git a/tests/baselines/reference/declFileTypeofInAnonymousType.symbols b/tests/baselines/reference/declFileTypeofInAnonymousType.symbols index 8e7979ad61a63..20c275e15a786 100644 --- a/tests/baselines/reference/declFileTypeofInAnonymousType.symbols +++ b/tests/baselines/reference/declFileTypeofInAnonymousType.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declFileTypeofInAnonymousType.ts] //// === declFileTypeofInAnonymousType.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(declFileTypeofInAnonymousType.ts, 0, 0)) export class c { ->c : Symbol(c, Decl(declFileTypeofInAnonymousType.ts, 0, 11)) +>c : Symbol(c, Decl(declFileTypeofInAnonymousType.ts, 0, 14)) } export enum e { >e : Symbol(e, Decl(declFileTypeofInAnonymousType.ts, 2, 5)) @@ -24,16 +24,16 @@ var a: { c: m1.c; }; >a : Symbol(a, Decl(declFileTypeofInAnonymousType.ts, 9, 3)) >c : Symbol(c, Decl(declFileTypeofInAnonymousType.ts, 9, 8)) >m1 : Symbol(m1, Decl(declFileTypeofInAnonymousType.ts, 0, 0)) ->c : Symbol(m1.c, Decl(declFileTypeofInAnonymousType.ts, 0, 11)) +>c : Symbol(m1.c, Decl(declFileTypeofInAnonymousType.ts, 0, 14)) var b = { >b : Symbol(b, Decl(declFileTypeofInAnonymousType.ts, 10, 3)) c: m1.c, >c : Symbol(c, Decl(declFileTypeofInAnonymousType.ts, 10, 9)) ->m1.c : Symbol(m1.c, Decl(declFileTypeofInAnonymousType.ts, 0, 11)) +>m1.c : Symbol(m1.c, Decl(declFileTypeofInAnonymousType.ts, 0, 14)) >m1 : Symbol(m1, Decl(declFileTypeofInAnonymousType.ts, 0, 0)) ->c : Symbol(m1.c, Decl(declFileTypeofInAnonymousType.ts, 0, 11)) +>c : Symbol(m1.c, Decl(declFileTypeofInAnonymousType.ts, 0, 14)) m1: m1 >m1 : Symbol(m1, Decl(declFileTypeofInAnonymousType.ts, 11, 12)) @@ -56,9 +56,9 @@ var d = { mc: { cl: m1.c }, >mc : Symbol(mc, Decl(declFileTypeofInAnonymousType.ts, 16, 19)) >cl : Symbol(cl, Decl(declFileTypeofInAnonymousType.ts, 17, 9)) ->m1.c : Symbol(m1.c, Decl(declFileTypeofInAnonymousType.ts, 0, 11)) +>m1.c : Symbol(m1.c, Decl(declFileTypeofInAnonymousType.ts, 0, 14)) >m1 : Symbol(m1, Decl(declFileTypeofInAnonymousType.ts, 0, 0)) ->c : Symbol(m1.c, Decl(declFileTypeofInAnonymousType.ts, 0, 11)) +>c : Symbol(m1.c, Decl(declFileTypeofInAnonymousType.ts, 0, 14)) me: { en: m1.e }, >me : Symbol(me, Decl(declFileTypeofInAnonymousType.ts, 17, 21)) diff --git a/tests/baselines/reference/declFileTypeofInAnonymousType.types b/tests/baselines/reference/declFileTypeofInAnonymousType.types index 269d761e9584c..3eeabcc256f77 100644 --- a/tests/baselines/reference/declFileTypeofInAnonymousType.types +++ b/tests/baselines/reference/declFileTypeofInAnonymousType.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declFileTypeofInAnonymousType.ts] //// === declFileTypeofInAnonymousType.ts === -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/declFileTypeofModule.js b/tests/baselines/reference/declFileTypeofModule.js index 6afaf6d1534b7..54927390c252b 100644 --- a/tests/baselines/reference/declFileTypeofModule.js +++ b/tests/baselines/reference/declFileTypeofModule.js @@ -1,13 +1,13 @@ //// [tests/cases/compiler/declFileTypeofModule.ts] //// //// [declFileTypeofModule.ts] -module m1 { +namespace m1 { export var c: string; } var m1_1 = m1; var m1_2: typeof m1; -module m2 { +namespace m2 { export var d: typeof m2; } diff --git a/tests/baselines/reference/declFileTypeofModule.symbols b/tests/baselines/reference/declFileTypeofModule.symbols index aa4599bd9b7de..b59790727a75b 100644 --- a/tests/baselines/reference/declFileTypeofModule.symbols +++ b/tests/baselines/reference/declFileTypeofModule.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declFileTypeofModule.ts] //// === declFileTypeofModule.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(declFileTypeofModule.ts, 0, 0)) export var c: string; @@ -15,7 +15,7 @@ var m1_2: typeof m1; >m1_2 : Symbol(m1_2, Decl(declFileTypeofModule.ts, 4, 3)) >m1 : Symbol(m1, Decl(declFileTypeofModule.ts, 0, 0)) -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(declFileTypeofModule.ts, 4, 20)) export var d: typeof m2; diff --git a/tests/baselines/reference/declFileTypeofModule.types b/tests/baselines/reference/declFileTypeofModule.types index 85563ba43870a..7311c9115c486 100644 --- a/tests/baselines/reference/declFileTypeofModule.types +++ b/tests/baselines/reference/declFileTypeofModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declFileTypeofModule.ts] //// === declFileTypeofModule.ts === -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -21,7 +21,7 @@ var m1_2: typeof m1; >m1 : typeof m1 > : ^^^^^^^^^ -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.errors.txt b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.errors.txt new file mode 100644 index 0000000000000..8796549146c56 --- /dev/null +++ b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.errors.txt @@ -0,0 +1,31 @@ +declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts(1,18): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts(1,20): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts (3 errors) ==== + declare module A.B.Base { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export class W { + id: number; + } + } + namespace X.Y.base { + + export class W extends A.B.Base.W { + name: string; + } + } + + namespace X.Y.base.Z { + + export class W extends X.Y.base.W { + value: boolean; + } + } + \ No newline at end of file diff --git a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js index 4704ce9bf0af1..8bcbeae6f8e63 100644 --- a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js +++ b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js @@ -6,14 +6,14 @@ declare module A.B.Base { id: number; } } -module X.Y.base { +namespace X.Y.base { export class W extends A.B.Base.W { name: string; } } -module X.Y.base.Z { +namespace X.Y.base.Z { export class W extends X.Y.base.W { value: boolean; diff --git a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.symbols b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.symbols index 3b36e3b190df2..836f52571db9a 100644 --- a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.symbols +++ b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.symbols @@ -13,13 +13,13 @@ declare module A.B.Base { >id : Symbol(W.id, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 1, 20)) } } -module X.Y.base { +namespace X.Y.base { >X : Symbol(X, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 4, 1), Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 10, 1)) ->Y : Symbol(Y, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 5, 9), Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 12, 9)) ->base : Symbol(base, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 5, 11), Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 12, 11)) +>Y : Symbol(Y, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 5, 12), Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 12, 12)) +>base : Symbol(base, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 5, 14), Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 12, 14)) export class W extends A.B.Base.W { ->W : Symbol(W, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 5, 17)) +>W : Symbol(W, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 5, 20)) >A.B.Base.W : Symbol(A.B.Base.W, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 0, 25)) >A.B.Base : Symbol(A.B.Base, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 0, 19)) >A.B : Symbol(A.B, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 0, 17)) @@ -33,22 +33,22 @@ module X.Y.base { } } -module X.Y.base.Z { +namespace X.Y.base.Z { >X : Symbol(X, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 4, 1), Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 10, 1)) ->Y : Symbol(Y, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 5, 9), Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 12, 9)) ->base : Symbol(base, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 5, 11), Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 12, 11)) ->Z : Symbol(Z, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 12, 16)) +>Y : Symbol(Y, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 5, 12), Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 12, 12)) +>base : Symbol(base, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 5, 14), Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 12, 14)) +>Z : Symbol(Z, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 12, 19)) export class W extends X.Y.base.W { ->W : Symbol(W, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 12, 19)) +>W : Symbol(W, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 12, 22)) >TValue : Symbol(TValue, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 14, 19)) ->X.Y.base.W : Symbol(W, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 5, 17)) ->X.Y.base : Symbol(base, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 5, 11), Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 12, 11)) ->X.Y : Symbol(Y, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 5, 9), Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 12, 9)) +>X.Y.base.W : Symbol(W, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 5, 20)) +>X.Y.base : Symbol(base, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 5, 14), Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 12, 14)) +>X.Y : Symbol(Y, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 5, 12), Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 12, 12)) >X : Symbol(X, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 4, 1), Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 10, 1)) ->Y : Symbol(Y, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 5, 9), Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 12, 9)) ->base : Symbol(base, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 5, 11), Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 12, 11)) ->W : Symbol(W, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 5, 17)) +>Y : Symbol(Y, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 5, 12), Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 12, 12)) +>base : Symbol(base, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 5, 14), Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 12, 14)) +>W : Symbol(W, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 5, 20)) value: boolean; >value : Symbol(W.value, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 14, 47)) diff --git a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.types b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.types index 0ff836d8c9176..3c86b63a29a95 100644 --- a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.types +++ b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.types @@ -18,7 +18,7 @@ declare module A.B.Base { > : ^^^^^^ } } -module X.Y.base { +namespace X.Y.base { >X : typeof X > : ^^^^^^^^ >Y : typeof Y @@ -50,7 +50,7 @@ module X.Y.base { } } -module X.Y.base.Z { +namespace X.Y.base.Z { >X : typeof X > : ^^^^^^^^ >Y : typeof Y diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.errors.txt b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.errors.txt index 9d677e4bf7aba..dac66868a5172 100644 --- a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.errors.txt +++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.errors.txt @@ -9,7 +9,7 @@ declFile.d.ts(7,5): error TS1038: A 'declare' modifier cannot be used in an alre var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file ==== declFile.d.ts (4 errors) ==== - declare module M { + declare namespace M { declare var x; ~~~~~~~ !!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. @@ -17,7 +17,7 @@ declFile.d.ts(7,5): error TS1038: A 'declare' modifier cannot be used in an alre ~~~~~~~ !!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. - declare module N { } + declare namespace N { } ~~~~~~~ !!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.js b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.js index 14dd0f131383b..8efe2ad37a503 100644 --- a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.js +++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declFileWithErrorsInInputDeclarationFile.ts] //// //// [declFile.d.ts] -declare module M { +declare namespace M { declare var x; declare function f(); - declare module N { } + declare namespace N { } declare class C { } } diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.symbols b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.symbols index 4ee76498fbc22..7042e03eea9f6 100644 --- a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.symbols +++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.symbols @@ -4,12 +4,12 @@ /// var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file >x : Symbol(x, Decl(client.ts, 1, 3)) ->M.C : Symbol(M.C, Decl(declFile.d.ts, 4, 24)) +>M.C : Symbol(M.C, Decl(declFile.d.ts, 4, 27)) >M : Symbol(M, Decl(declFile.d.ts, 0, 0)) ->C : Symbol(M.C, Decl(declFile.d.ts, 4, 24)) +>C : Symbol(M.C, Decl(declFile.d.ts, 4, 27)) === declFile.d.ts === -declare module M { +declare namespace M { >M : Symbol(M, Decl(declFile.d.ts, 0, 0)) declare var x; @@ -18,10 +18,10 @@ declare module M { declare function f(); >f : Symbol(f, Decl(declFile.d.ts, 1, 18)) - declare module N { } + declare namespace N { } >N : Symbol(N, Decl(declFile.d.ts, 2, 25)) declare class C { } ->C : Symbol(C, Decl(declFile.d.ts, 4, 24)) +>C : Symbol(C, Decl(declFile.d.ts, 4, 27)) } diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.types b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.types index af4d30fc9a845..e1699677a1444 100644 --- a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.types +++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFile.types @@ -15,7 +15,7 @@ var x = new M.C(); // Declaration file wont get emitted because there are errors > : ^^^^^^^^^^ === declFile.d.ts === -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ @@ -27,7 +27,7 @@ declare module M { >f : () => any > : ^^^^^^^^^ - declare module N { } + declare namespace N { } declare class C { } >C : C diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt index 9d677e4bf7aba..dac66868a5172 100644 --- a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt +++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt @@ -9,7 +9,7 @@ declFile.d.ts(7,5): error TS1038: A 'declare' modifier cannot be used in an alre var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file ==== declFile.d.ts (4 errors) ==== - declare module M { + declare namespace M { declare var x; ~~~~~~~ !!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. @@ -17,7 +17,7 @@ declFile.d.ts(7,5): error TS1038: A 'declare' modifier cannot be used in an alre ~~~~~~~ !!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. - declare module N { } + declare namespace N { } ~~~~~~~ !!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.js b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.js index f1181d74686ef..083bbf465580b 100644 --- a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.js +++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts] //// //// [declFile.d.ts] -declare module M { +declare namespace M { declare var x; declare function f(); - declare module N { } + declare namespace N { } declare class C { } } diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.symbols b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.symbols index 1a473d9c37efa..f77dd680a4c9c 100644 --- a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.symbols +++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.symbols @@ -4,12 +4,12 @@ /// var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file >x : Symbol(x, Decl(client.ts, 1, 3)) ->M.C : Symbol(M.C, Decl(declFile.d.ts, 4, 24)) +>M.C : Symbol(M.C, Decl(declFile.d.ts, 4, 27)) >M : Symbol(M, Decl(declFile.d.ts, 0, 0)) ->C : Symbol(M.C, Decl(declFile.d.ts, 4, 24)) +>C : Symbol(M.C, Decl(declFile.d.ts, 4, 27)) === declFile.d.ts === -declare module M { +declare namespace M { >M : Symbol(M, Decl(declFile.d.ts, 0, 0)) declare var x; @@ -18,10 +18,10 @@ declare module M { declare function f(); >f : Symbol(f, Decl(declFile.d.ts, 1, 18)) - declare module N { } + declare namespace N { } >N : Symbol(N, Decl(declFile.d.ts, 2, 25)) declare class C { } ->C : Symbol(C, Decl(declFile.d.ts, 4, 24)) +>C : Symbol(C, Decl(declFile.d.ts, 4, 27)) } diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.types b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.types index 1e3254312fcf1..1528d5f05a087 100644 --- a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.types +++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.types @@ -15,7 +15,7 @@ var x = new M.C(); // Declaration file wont get emitted because there are errors > : ^^^^^^^^^^ === declFile.d.ts === -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ @@ -27,7 +27,7 @@ declare module M { >f : () => any > : ^^^^^^^^^ - declare module N { } + declare namespace N { } declare class C { } >C : C diff --git a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.errors.txt b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.errors.txt new file mode 100644 index 0000000000000..25d2a18db625a --- /dev/null +++ b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.errors.txt @@ -0,0 +1,29 @@ +declFileWithExtendsClauseThatHasItsContainerNameConflict.ts(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +declFileWithExtendsClauseThatHasItsContainerNameConflict.ts(1,18): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +declFileWithExtendsClauseThatHasItsContainerNameConflict.ts(1,20): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== declFileWithExtendsClauseThatHasItsContainerNameConflict.ts (3 errors) ==== + declare module A.B.C { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + class B { + } + } + + namespace A.B { + export class EventManager { + id: number; + + } + } + + namespace A.B.C { + export class ContextMenu extends EventManager { + name: string; + } + } \ No newline at end of file diff --git a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js index 00ae333dfadd3..a652cc0794511 100644 --- a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js +++ b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js @@ -6,14 +6,14 @@ declare module A.B.C { } } -module A.B { +namespace A.B { export class EventManager { id: number; } } -module A.B.C { +namespace A.B.C { export class ContextMenu extends EventManager { name: string; } diff --git a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.symbols b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.symbols index b97870d1e9b39..5368954b8927b 100644 --- a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.symbols +++ b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.symbols @@ -3,20 +3,20 @@ === declFileWithExtendsClauseThatHasItsContainerNameConflict.ts === declare module A.B.C { >A : Symbol(A, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 0, 0), Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 3, 1), Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 10, 1)) ->B : Symbol(B, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 0, 17), Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 5, 9), Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 12, 9)) ->C : Symbol(C, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 0, 19), Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 12, 11)) +>B : Symbol(B, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 0, 17), Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 5, 12), Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 12, 12)) +>C : Symbol(C, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 0, 19), Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 12, 14)) class B { >B : Symbol(B, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 0, 22)) } } -module A.B { +namespace A.B { >A : Symbol(A, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 0, 0), Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 3, 1), Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 10, 1)) ->B : Symbol(B, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 0, 17), Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 5, 9), Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 12, 9)) +>B : Symbol(B, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 0, 17), Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 5, 12), Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 12, 12)) export class EventManager { ->EventManager : Symbol(EventManager, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 5, 12)) +>EventManager : Symbol(EventManager, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 5, 15)) id: number; >id : Symbol(EventManager.id, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 6, 31)) @@ -24,14 +24,14 @@ module A.B { } } -module A.B.C { +namespace A.B.C { >A : Symbol(A, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 0, 0), Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 3, 1), Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 10, 1)) ->B : Symbol(B, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 0, 17), Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 5, 9), Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 12, 9)) ->C : Symbol(C, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 0, 19), Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 12, 11)) +>B : Symbol(B, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 0, 17), Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 5, 12), Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 12, 12)) +>C : Symbol(C, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 0, 19), Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 12, 14)) export class ContextMenu extends EventManager { ->ContextMenu : Symbol(ContextMenu, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 12, 14)) ->EventManager : Symbol(EventManager, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 5, 12)) +>ContextMenu : Symbol(ContextMenu, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 12, 17)) +>EventManager : Symbol(EventManager, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 5, 15)) name: string; >name : Symbol(ContextMenu.name, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 13, 51)) diff --git a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.types b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.types index 7c65e05d6ff04..25b24ad8d8a03 100644 --- a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.types +++ b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.types @@ -15,7 +15,7 @@ declare module A.B.C { } } -module A.B { +namespace A.B { >A : typeof A > : ^^^^^^^^ >B : typeof B @@ -32,7 +32,7 @@ module A.B { } } -module A.B.C { +namespace A.B.C { >A : typeof A > : ^^^^^^^^ >B : typeof B diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js index f25083f46f921..504c83dd9f100 100644 --- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js +++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js @@ -1,12 +1,12 @@ //// [tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause1.ts] //// //// [declFileWithInternalModuleNameConflictsInExtendsClause1.ts] -module X.A.C { +namespace X.A.C { export interface Z { } } -module X.A.B.C { - module A { +namespace X.A.B.C { + namespace A { } export class W implements X.A.C.Z { // This needs to be referred as X.A.C.Z as A has conflict } diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.symbols b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.symbols index 48daf1ce97213..5bcf4fe00ea05 100644 --- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.symbols +++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.symbols @@ -1,32 +1,32 @@ //// [tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause1.ts] //// === declFileWithInternalModuleNameConflictsInExtendsClause1.ts === -module X.A.C { +namespace X.A.C { >X : Symbol(X, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 0), Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 3, 1)) ->A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 9), Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 4, 9)) ->C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 11)) +>A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 12), Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 4, 12)) +>C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 14)) export interface Z { ->Z : Symbol(Z, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 14)) +>Z : Symbol(Z, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 17)) } } -module X.A.B.C { +namespace X.A.B.C { >X : Symbol(X, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 0), Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 3, 1)) ->A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 9), Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 4, 9)) ->B : Symbol(B, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 4, 11)) ->C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 4, 13)) +>A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 12), Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 4, 12)) +>B : Symbol(B, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 4, 14)) +>C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 4, 16)) - module A { ->A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 4, 16)) + namespace A { +>A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 4, 19)) } export class W implements X.A.C.Z { // This needs to be referred as X.A.C.Z as A has conflict >W : Symbol(W, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 6, 5)) ->X.A.C.Z : Symbol(X.A.C.Z, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 14)) ->X.A.C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 11)) ->X.A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 9), Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 4, 9)) +>X.A.C.Z : Symbol(X.A.C.Z, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 17)) +>X.A.C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 14)) +>X.A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 12), Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 4, 12)) >X : Symbol(X, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 0), Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 3, 1)) ->A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 9), Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 4, 9)) ->C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 11)) ->Z : Symbol(X.A.C.Z, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 14)) +>A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 12), Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 4, 12)) +>C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 14)) +>Z : Symbol(X.A.C.Z, Decl(declFileWithInternalModuleNameConflictsInExtendsClause1.ts, 0, 17)) } } diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.types b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.types index ca8a3802692e4..2c123fdc77d9e 100644 --- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.types +++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause1.ts] //// === declFileWithInternalModuleNameConflictsInExtendsClause1.ts === -module X.A.C { +namespace X.A.C { export interface Z { } } -module X.A.B.C { +namespace X.A.B.C { >X : typeof X > : ^^^^^^^^ >A : typeof A @@ -15,7 +15,7 @@ module X.A.B.C { >C : typeof C > : ^^^^^^^^ - module A { + namespace A { } export class W implements X.A.C.Z { // This needs to be referred as X.A.C.Z as A has conflict >W : W diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js index 2a28f1a494ce9..0453e54557897 100644 --- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js +++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js @@ -1,17 +1,17 @@ //// [tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause2.ts] //// //// [declFileWithInternalModuleNameConflictsInExtendsClause2.ts] -module X.A.C { +namespace X.A.C { export interface Z { } } -module X.A.B.C { +namespace X.A.B.C { export class W implements A.C.Z { // This can refer to it as A.C.Z } } -module X.A.B.C { - module A { +namespace X.A.B.C { + namespace A { } } diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.symbols b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.symbols index b607ff5cfb359..7649ee2cc75ca 100644 --- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.symbols +++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.symbols @@ -1,38 +1,38 @@ //// [tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause2.ts] //// === declFileWithInternalModuleNameConflictsInExtendsClause2.ts === -module X.A.C { +namespace X.A.C { >X : Symbol(X, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 0), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 3, 1), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 7, 1)) ->A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 9), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 4, 9), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 9, 9)) ->C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 11)) +>A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 12), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 4, 12), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 9, 12)) +>C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 14)) export interface Z { ->Z : Symbol(Z, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 14)) +>Z : Symbol(Z, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 17)) } } -module X.A.B.C { +namespace X.A.B.C { >X : Symbol(X, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 0), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 3, 1), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 7, 1)) ->A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 9), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 4, 9), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 9, 9)) ->B : Symbol(B, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 4, 11), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 9, 11)) ->C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 4, 13), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 9, 13)) +>A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 12), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 4, 12), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 9, 12)) +>B : Symbol(B, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 4, 14), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 9, 14)) +>C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 4, 16), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 9, 16)) export class W implements A.C.Z { // This can refer to it as A.C.Z ->W : Symbol(W, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 4, 16)) ->A.C.Z : Symbol(A.C.Z, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 14)) ->A.C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 11)) ->A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 9), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 4, 9), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 9, 9)) ->C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 11)) ->Z : Symbol(A.C.Z, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 14)) +>W : Symbol(W, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 4, 19)) +>A.C.Z : Symbol(A.C.Z, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 17)) +>A.C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 14)) +>A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 12), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 4, 12), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 9, 12)) +>C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 14)) +>Z : Symbol(A.C.Z, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 17)) } } -module X.A.B.C { +namespace X.A.B.C { >X : Symbol(X, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 0), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 3, 1), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 7, 1)) ->A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 9), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 4, 9), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 9, 9)) ->B : Symbol(B, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 4, 11), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 9, 11)) ->C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 4, 13), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 9, 13)) +>A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 0, 12), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 4, 12), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 9, 12)) +>B : Symbol(B, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 4, 14), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 9, 14)) +>C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 4, 16), Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 9, 16)) - module A { ->A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 9, 16)) + namespace A { +>A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause2.ts, 9, 19)) } } diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.types b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.types index ed4b1ba6d0d2a..e93fd73fe0124 100644 --- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.types +++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause2.ts] //// === declFileWithInternalModuleNameConflictsInExtendsClause2.ts === -module X.A.C { +namespace X.A.C { export interface Z { } } -module X.A.B.C { +namespace X.A.B.C { >X : typeof X > : ^^^^^^^^ >A : typeof A @@ -27,7 +27,7 @@ module X.A.B.C { } } -module X.A.B.C { - module A { +namespace X.A.B.C { + namespace A { } } diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js index 45302b2f92c92..dcdaacc2298c7 100644 --- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js +++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js @@ -1,17 +1,17 @@ //// [tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause3.ts] //// //// [declFileWithInternalModuleNameConflictsInExtendsClause3.ts] -module X.A.C { +namespace X.A.C { export interface Z { } } -module X.A.B.C { +namespace X.A.B.C { export class W implements X.A.C.Z { // This needs to be referred as X.A.C.Z as A has conflict } } -module X.A.B.C { - export module A { +namespace X.A.B.C { + export namespace A { } } diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.symbols b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.symbols index 855a667da0127..e0e188f4255b4 100644 --- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.symbols +++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.symbols @@ -1,40 +1,40 @@ //// [tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause3.ts] //// === declFileWithInternalModuleNameConflictsInExtendsClause3.ts === -module X.A.C { +namespace X.A.C { >X : Symbol(X, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 0), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 3, 1), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 7, 1)) ->A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 9), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 4, 9), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 9, 9)) ->C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 11)) +>A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 12), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 4, 12), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 9, 12)) +>C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 14)) export interface Z { ->Z : Symbol(Z, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 14)) +>Z : Symbol(Z, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 17)) } } -module X.A.B.C { +namespace X.A.B.C { >X : Symbol(X, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 0), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 3, 1), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 7, 1)) ->A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 9), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 4, 9), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 9, 9)) ->B : Symbol(B, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 4, 11), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 9, 11)) ->C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 4, 13), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 9, 13)) +>A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 12), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 4, 12), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 9, 12)) +>B : Symbol(B, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 4, 14), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 9, 14)) +>C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 4, 16), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 9, 16)) export class W implements X.A.C.Z { // This needs to be referred as X.A.C.Z as A has conflict ->W : Symbol(W, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 4, 16)) ->X.A.C.Z : Symbol(X.A.C.Z, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 14)) ->X.A.C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 11)) ->X.A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 9), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 4, 9), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 9, 9)) +>W : Symbol(W, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 4, 19)) +>X.A.C.Z : Symbol(X.A.C.Z, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 17)) +>X.A.C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 14)) +>X.A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 12), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 4, 12), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 9, 12)) >X : Symbol(X, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 0), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 3, 1), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 7, 1)) ->A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 9), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 4, 9), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 9, 9)) ->C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 11)) ->Z : Symbol(X.A.C.Z, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 14)) +>A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 12), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 4, 12), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 9, 12)) +>C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 14)) +>Z : Symbol(X.A.C.Z, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 17)) } } -module X.A.B.C { +namespace X.A.B.C { >X : Symbol(X, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 0), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 3, 1), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 7, 1)) ->A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 9), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 4, 9), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 9, 9)) ->B : Symbol(B, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 4, 11), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 9, 11)) ->C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 4, 13), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 9, 13)) +>A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 0, 12), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 4, 12), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 9, 12)) +>B : Symbol(B, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 4, 14), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 9, 14)) +>C : Symbol(C, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 4, 16), Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 9, 16)) - export module A { ->A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 9, 16)) + export namespace A { +>A : Symbol(A, Decl(declFileWithInternalModuleNameConflictsInExtendsClause3.ts, 9, 19)) } } diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.types b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.types index 896d6bf86ee49..d48d79112deea 100644 --- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.types +++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause3.ts] //// === declFileWithInternalModuleNameConflictsInExtendsClause3.ts === -module X.A.C { +namespace X.A.C { export interface Z { } } -module X.A.B.C { +namespace X.A.B.C { >X : typeof X > : ^^^^^^^^ >A : typeof A @@ -31,7 +31,7 @@ module X.A.B.C { } } -module X.A.B.C { - export module A { +namespace X.A.B.C { + export namespace A { } } diff --git a/tests/baselines/reference/declInput-2.js b/tests/baselines/reference/declInput-2.js index 8262ce5f3699d..9ef3a296a0572 100644 --- a/tests/baselines/reference/declInput-2.js +++ b/tests/baselines/reference/declInput-2.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declInput-2.ts] //// //// [declInput-2.ts] -module M { +namespace M { class C { } export class E {} export interface I1 {} diff --git a/tests/baselines/reference/declInput-2.symbols b/tests/baselines/reference/declInput-2.symbols index df9224b31ac2d..975f06d920318 100644 --- a/tests/baselines/reference/declInput-2.symbols +++ b/tests/baselines/reference/declInput-2.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declInput-2.ts] //// === declInput-2.ts === -module M { +namespace M { >M : Symbol(M, Decl(declInput-2.ts, 0, 0)) class C { } ->C : Symbol(C, Decl(declInput-2.ts, 0, 10)) +>C : Symbol(C, Decl(declInput-2.ts, 0, 13)) export class E {} >E : Symbol(E, Decl(declInput-2.ts, 1, 15)) @@ -21,7 +21,7 @@ module M { private c: C; // don't generate >c : Symbol(D.c, Decl(declInput-2.ts, 5, 20)) ->C : Symbol(C, Decl(declInput-2.ts, 0, 10)) +>C : Symbol(C, Decl(declInput-2.ts, 0, 13)) public m1: number; >m1 : Symbol(D.m1, Decl(declInput-2.ts, 6, 21)) @@ -31,7 +31,7 @@ module M { public m22: C; // don't generate >m22 : Symbol(D.m22, Decl(declInput-2.ts, 8, 26)) ->C : Symbol(C, Decl(declInput-2.ts, 0, 10)) +>C : Symbol(C, Decl(declInput-2.ts, 0, 13)) public m23: E; >m23 : Symbol(D.m23, Decl(declInput-2.ts, 9, 22)) @@ -69,7 +69,7 @@ module M { public m3():C { return new C(); } >m3 : Symbol(D.m3, Decl(declInput-2.ts, 17, 28)) ->C : Symbol(C, Decl(declInput-2.ts, 0, 10)) ->C : Symbol(C, Decl(declInput-2.ts, 0, 10)) +>C : Symbol(C, Decl(declInput-2.ts, 0, 13)) +>C : Symbol(C, Decl(declInput-2.ts, 0, 13)) } } diff --git a/tests/baselines/reference/declInput-2.types b/tests/baselines/reference/declInput-2.types index 8d409900b284b..bcfb17a86e17e 100644 --- a/tests/baselines/reference/declInput-2.types +++ b/tests/baselines/reference/declInput-2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declInput-2.ts] //// === declInput-2.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/declInput4.js b/tests/baselines/reference/declInput4.js index 1684a11db5a5e..d7c20cbcca3bc 100644 --- a/tests/baselines/reference/declInput4.js +++ b/tests/baselines/reference/declInput4.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declInput4.ts] //// //// [declInput4.ts] -module M { +namespace M { class C { } export class E {} export interface I1 {} diff --git a/tests/baselines/reference/declInput4.symbols b/tests/baselines/reference/declInput4.symbols index be7952accacf9..ab3e9cee9482d 100644 --- a/tests/baselines/reference/declInput4.symbols +++ b/tests/baselines/reference/declInput4.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declInput4.ts] //// === declInput4.ts === -module M { +namespace M { >M : Symbol(M, Decl(declInput4.ts, 0, 0)) class C { } ->C : Symbol(C, Decl(declInput4.ts, 0, 10)) +>C : Symbol(C, Decl(declInput4.ts, 0, 13)) export class E {} >E : Symbol(E, Decl(declInput4.ts, 1, 15)) diff --git a/tests/baselines/reference/declInput4.types b/tests/baselines/reference/declInput4.types index 81a836dcf0475..d01de76d0d211 100644 --- a/tests/baselines/reference/declInput4.types +++ b/tests/baselines/reference/declInput4.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declInput4.ts] //// === declInput4.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/declarationEmitDestructuringArrayPattern3.js b/tests/baselines/reference/declarationEmitDestructuringArrayPattern3.js index 457d1c0e88c2e..9b0dc665e390a 100644 --- a/tests/baselines/reference/declarationEmitDestructuringArrayPattern3.js +++ b/tests/baselines/reference/declarationEmitDestructuringArrayPattern3.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declarationEmitDestructuringArrayPattern3.ts] //// //// [declarationEmitDestructuringArrayPattern3.ts] -module M { +namespace M { export var [a, b] = [1, 2]; } diff --git a/tests/baselines/reference/declarationEmitDestructuringArrayPattern3.symbols b/tests/baselines/reference/declarationEmitDestructuringArrayPattern3.symbols index fac50c293e567..32f28da9c5852 100644 --- a/tests/baselines/reference/declarationEmitDestructuringArrayPattern3.symbols +++ b/tests/baselines/reference/declarationEmitDestructuringArrayPattern3.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declarationEmitDestructuringArrayPattern3.ts] //// === declarationEmitDestructuringArrayPattern3.ts === -module M { +namespace M { >M : Symbol(M, Decl(declarationEmitDestructuringArrayPattern3.ts, 0, 0)) export var [a, b] = [1, 2]; diff --git a/tests/baselines/reference/declarationEmitDestructuringArrayPattern3.types b/tests/baselines/reference/declarationEmitDestructuringArrayPattern3.types index 004c74cad6997..dae5c15ac32b7 100644 --- a/tests/baselines/reference/declarationEmitDestructuringArrayPattern3.types +++ b/tests/baselines/reference/declarationEmitDestructuringArrayPattern3.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declarationEmitDestructuringArrayPattern3.ts] //// === declarationEmitDestructuringArrayPattern3.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.errors.txt b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.errors.txt index 0a47f24e6e3a8..aaff71b7f36af 100644 --- a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.errors.txt +++ b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.errors.txt @@ -31,6 +31,6 @@ declarationEmitDestructuringObjectLiteralPattern.ts(6,20): error TS2353: Object } var { a4, b4, c4 } = f15(); - module m { + namespace m { export var { a4, b4, c4 } = f15(); } \ No newline at end of file diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js index 5c3936c85a826..1a62adf884fba 100644 --- a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js +++ b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js @@ -19,7 +19,7 @@ function f15() { } var { a4, b4, c4 } = f15(); -module m { +namespace m { export var { a4, b4, c4 } = f15(); } diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.symbols b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.symbols index 3c0162787e49a..c91475b23d1b9 100644 --- a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.symbols +++ b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.symbols @@ -79,7 +79,7 @@ var { a4, b4, c4 } = f15(); >c4 : Symbol(c4, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 16, 13)) >f15 : Symbol(f15, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 8, 89)) -module m { +namespace m { >m : Symbol(m, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 16, 27)) export var { a4, b4, c4 } = f15(); diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.types b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.types index 804c8e9533c7b..c5ab338eb5e22 100644 --- a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.types +++ b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.types @@ -193,7 +193,7 @@ var { a4, b4, c4 } = f15(); >f15 : () => { a4: string; b4: number; c4: boolean; } > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -module m { +namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.js b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.js index ad59c4a34ea49..6ca61ccda6001 100644 --- a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.js +++ b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.js @@ -11,7 +11,7 @@ function f15() { } var { a4, b4, c4 } = f15(); -module m { +namespace m { export var { a4, b4, c4 } = f15(); } diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.symbols b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.symbols index a2e1e460f7349..6761f139eec97 100644 --- a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.symbols +++ b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.symbols @@ -39,7 +39,7 @@ var { a4, b4, c4 } = f15(); >c4 : Symbol(c4, Decl(declarationEmitDestructuringObjectLiteralPattern2.ts, 8, 13)) >f15 : Symbol(f15, Decl(declarationEmitDestructuringObjectLiteralPattern2.ts, 0, 89)) -module m { +namespace m { >m : Symbol(m, Decl(declarationEmitDestructuringObjectLiteralPattern2.ts, 8, 27)) export var { a4, b4, c4 } = f15(); diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.types b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.types index 8f94dac153c38..692b140bf425c 100644 --- a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.types +++ b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.types @@ -85,7 +85,7 @@ var { a4, b4, c4 } = f15(); >f15 : () => { a4: string; b4: number; c4: boolean; } > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -module m { +namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js b/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js index bc3917ede8e4b..f3e0587a87324 100644 --- a/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js +++ b/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declarationEmitDestructuringPrivacyError.ts] //// //// [declarationEmitDestructuringPrivacyError.ts] -module m { +namespace m { class c { } export var [x, y, z] = [10, new c(), 30]; diff --git a/tests/baselines/reference/declarationEmitDestructuringPrivacyError.symbols b/tests/baselines/reference/declarationEmitDestructuringPrivacyError.symbols index aaef63f4241d8..496aab51e35a7 100644 --- a/tests/baselines/reference/declarationEmitDestructuringPrivacyError.symbols +++ b/tests/baselines/reference/declarationEmitDestructuringPrivacyError.symbols @@ -1,15 +1,15 @@ //// [tests/cases/compiler/declarationEmitDestructuringPrivacyError.ts] //// === declarationEmitDestructuringPrivacyError.ts === -module m { +namespace m { >m : Symbol(m, Decl(declarationEmitDestructuringPrivacyError.ts, 0, 0)) class c { ->c : Symbol(c, Decl(declarationEmitDestructuringPrivacyError.ts, 0, 10)) +>c : Symbol(c, Decl(declarationEmitDestructuringPrivacyError.ts, 0, 13)) } export var [x, y, z] = [10, new c(), 30]; >x : Symbol(x, Decl(declarationEmitDestructuringPrivacyError.ts, 3, 16)) >y : Symbol(y, Decl(declarationEmitDestructuringPrivacyError.ts, 3, 18)) >z : Symbol(z, Decl(declarationEmitDestructuringPrivacyError.ts, 3, 21)) ->c : Symbol(c, Decl(declarationEmitDestructuringPrivacyError.ts, 0, 10)) +>c : Symbol(c, Decl(declarationEmitDestructuringPrivacyError.ts, 0, 13)) } diff --git a/tests/baselines/reference/declarationEmitDestructuringPrivacyError.types b/tests/baselines/reference/declarationEmitDestructuringPrivacyError.types index 1e440725fa5d3..5db7a8572ef70 100644 --- a/tests/baselines/reference/declarationEmitDestructuringPrivacyError.types +++ b/tests/baselines/reference/declarationEmitDestructuringPrivacyError.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declarationEmitDestructuringPrivacyError.ts] //// === declarationEmitDestructuringPrivacyError.ts === -module m { +namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js b/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js index 7f220e5ed5151..712488b0a01d2 100644 --- a/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js +++ b/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/declarationEmitImportInExportAssignmentModule.ts] //// //// [declarationEmitImportInExportAssignmentModule.ts] -module m { - export module c { +namespace m { + export namespace c { export class c { } } diff --git a/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.symbols b/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.symbols index e8b3331bcf6fa..7e019d7d53585 100644 --- a/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.symbols +++ b/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.symbols @@ -1,19 +1,19 @@ //// [tests/cases/compiler/declarationEmitImportInExportAssignmentModule.ts] //// === declarationEmitImportInExportAssignmentModule.ts === -module m { +namespace m { >m : Symbol(m, Decl(declarationEmitImportInExportAssignmentModule.ts, 0, 0)) - export module c { ->c : Symbol(c, Decl(declarationEmitImportInExportAssignmentModule.ts, 0, 10)) + export namespace c { +>c : Symbol(c, Decl(declarationEmitImportInExportAssignmentModule.ts, 0, 13)) export class c { ->c : Symbol(c, Decl(declarationEmitImportInExportAssignmentModule.ts, 1, 21)) +>c : Symbol(c, Decl(declarationEmitImportInExportAssignmentModule.ts, 1, 24)) } } import x = c; >x : Symbol(x, Decl(declarationEmitImportInExportAssignmentModule.ts, 4, 5)) ->c : Symbol(c, Decl(declarationEmitImportInExportAssignmentModule.ts, 0, 10)) +>c : Symbol(c, Decl(declarationEmitImportInExportAssignmentModule.ts, 0, 13)) export var a: typeof x; >a : Symbol(a, Decl(declarationEmitImportInExportAssignmentModule.ts, 6, 14)) diff --git a/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.types b/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.types index 4224c0c2e266a..a366782b243e5 100644 --- a/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.types +++ b/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declarationEmitImportInExportAssignmentModule.ts] //// === declarationEmitImportInExportAssignmentModule.ts === -module m { +namespace m { >m : typeof m > : ^^^^^^^^ - export module c { + export namespace c { >c : typeof m.c > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/declarationEmitNameConflicts.errors.txt b/tests/baselines/reference/declarationEmitNameConflicts.errors.txt new file mode 100644 index 0000000000000..16637d0236c87 --- /dev/null +++ b/tests/baselines/reference/declarationEmitNameConflicts.errors.txt @@ -0,0 +1,62 @@ +declarationEmit_nameConflicts_0.ts(16,8): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +declarationEmit_nameConflicts_0.ts(16,17): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +declarationEmit_nameConflicts_0.ts(31,8): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +declarationEmit_nameConflicts_0.ts(31,17): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== declarationEmit_nameConflicts_0.ts (4 errors) ==== + import im = require('./declarationEmit_nameConflicts_1'); + export namespace M { + export function f() { } + export class C { } + export namespace N { + export function g() { }; + export interface I { } + } + + export import a = M.f; + export import b = M.C; + export import c = N; + export import d = im; + } + + export module M.P { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export function f() { } + export class C { } + export namespace N { + export function g() { }; + export interface I { } + } + export import im = M.P.f; + export var a = M.a; // emitted incorrectly as typeof f + export var b = M.b; // ok + export var c = M.c; // ok + export var g = M.c.g; // ok + export var d = M.d; // emitted incorrectly as typeof im + } + + export module M.Q { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export function f() { } + export class C { } + export namespace N { + export function g() { }; + export interface I { } + } + export interface b extends M.b { } // ok + export interface I extends M.c.I { } // ok + export namespace c { + export interface I extends M.c.I { } // ok + } + } +==== declarationEmit_nameConflicts_1.ts (0 errors) ==== + namespace f { export class c { } } + export = f; + \ No newline at end of file diff --git a/tests/baselines/reference/declarationEmitNameConflicts.js b/tests/baselines/reference/declarationEmitNameConflicts.js index c9e0cdc0e7f8c..9abf13ece8958 100644 --- a/tests/baselines/reference/declarationEmitNameConflicts.js +++ b/tests/baselines/reference/declarationEmitNameConflicts.js @@ -1,15 +1,15 @@ //// [tests/cases/compiler/declarationEmitNameConflicts.ts] //// //// [declarationEmit_nameConflicts_1.ts] -module f { export class c { } } +namespace f { export class c { } } export = f; //// [declarationEmit_nameConflicts_0.ts] import im = require('./declarationEmit_nameConflicts_1'); -export module M { +export namespace M { export function f() { } export class C { } - export module N { + export namespace N { export function g() { }; export interface I { } } @@ -23,7 +23,7 @@ export module M { export module M.P { export function f() { } export class C { } - export module N { + export namespace N { export function g() { }; export interface I { } } @@ -38,13 +38,13 @@ export module M.P { export module M.Q { export function f() { } export class C { } - export module N { + export namespace N { export function g() { }; export interface I { } } export interface b extends M.b { } // ok export interface I extends M.c.I { } // ok - export module c { + export namespace c { export interface I extends M.c.I { } // ok } } diff --git a/tests/baselines/reference/declarationEmitNameConflicts.symbols b/tests/baselines/reference/declarationEmitNameConflicts.symbols index 6bf133c0d92b5..0d9d429780fbf 100644 --- a/tests/baselines/reference/declarationEmitNameConflicts.symbols +++ b/tests/baselines/reference/declarationEmitNameConflicts.symbols @@ -4,20 +4,20 @@ import im = require('./declarationEmit_nameConflicts_1'); >im : Symbol(im, Decl(declarationEmit_nameConflicts_0.ts, 0, 0)) -export module M { +export namespace M { >M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 57), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1)) export function f() { } ->f : Symbol(f, Decl(declarationEmit_nameConflicts_0.ts, 1, 17)) +>f : Symbol(f, Decl(declarationEmit_nameConflicts_0.ts, 1, 20)) export class C { } >C : Symbol(C, Decl(declarationEmit_nameConflicts_0.ts, 2, 27)) - export module N { + export namespace N { >N : Symbol(N, Decl(declarationEmit_nameConflicts_0.ts, 3, 22)) export function g() { }; ->g : Symbol(g, Decl(declarationEmit_nameConflicts_0.ts, 4, 21)) +>g : Symbol(g, Decl(declarationEmit_nameConflicts_0.ts, 4, 24)) export interface I { } >I : Symbol(I, Decl(declarationEmit_nameConflicts_0.ts, 5, 32)) @@ -26,7 +26,7 @@ export module M { export import a = M.f; >a : Symbol(a, Decl(declarationEmit_nameConflicts_0.ts, 7, 5)) >M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 57), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1)) ->f : Symbol(f, Decl(declarationEmit_nameConflicts_0.ts, 1, 17)) +>f : Symbol(f, Decl(declarationEmit_nameConflicts_0.ts, 1, 20)) export import b = M.C; >b : Symbol(b, Decl(declarationEmit_nameConflicts_0.ts, 9, 26)) @@ -52,11 +52,11 @@ export module M.P { export class C { } >C : Symbol(C, Decl(declarationEmit_nameConflicts_0.ts, 16, 27)) - export module N { + export namespace N { >N : Symbol(N, Decl(declarationEmit_nameConflicts_0.ts, 17, 22)) export function g() { }; ->g : Symbol(g, Decl(declarationEmit_nameConflicts_0.ts, 18, 21)) +>g : Symbol(g, Decl(declarationEmit_nameConflicts_0.ts, 18, 24)) export interface I { } >I : Symbol(I, Decl(declarationEmit_nameConflicts_0.ts, 19, 32)) @@ -87,11 +87,11 @@ export module M.P { export var g = M.c.g; // ok >g : Symbol(g, Decl(declarationEmit_nameConflicts_0.ts, 26, 14)) ->M.c.g : Symbol(c.g, Decl(declarationEmit_nameConflicts_0.ts, 4, 21)) +>M.c.g : Symbol(c.g, Decl(declarationEmit_nameConflicts_0.ts, 4, 24)) >M.c : Symbol(c, Decl(declarationEmit_nameConflicts_0.ts, 10, 26)) >M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 57), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1)) >c : Symbol(c, Decl(declarationEmit_nameConflicts_0.ts, 10, 26)) ->g : Symbol(c.g, Decl(declarationEmit_nameConflicts_0.ts, 4, 21)) +>g : Symbol(c.g, Decl(declarationEmit_nameConflicts_0.ts, 4, 24)) export var d = M.d; // emitted incorrectly as typeof im >d : Symbol(d, Decl(declarationEmit_nameConflicts_0.ts, 27, 14)) @@ -110,11 +110,11 @@ export module M.Q { export class C { } >C : Symbol(C, Decl(declarationEmit_nameConflicts_0.ts, 31, 27)) - export module N { + export namespace N { >N : Symbol(N, Decl(declarationEmit_nameConflicts_0.ts, 32, 22)) export function g() { }; ->g : Symbol(g, Decl(declarationEmit_nameConflicts_0.ts, 33, 21)) +>g : Symbol(g, Decl(declarationEmit_nameConflicts_0.ts, 33, 24)) export interface I { } >I : Symbol(I, Decl(declarationEmit_nameConflicts_0.ts, 34, 32)) @@ -133,11 +133,11 @@ export module M.Q { >c : Symbol(c, Decl(declarationEmit_nameConflicts_0.ts, 10, 26)) >I : Symbol(M.c.I, Decl(declarationEmit_nameConflicts_0.ts, 5, 32)) - export module c { + export namespace c { >c : Symbol(c, Decl(declarationEmit_nameConflicts_0.ts, 38, 40)) export interface I extends M.c.I { } // ok ->I : Symbol(I, Decl(declarationEmit_nameConflicts_0.ts, 39, 21)) +>I : Symbol(I, Decl(declarationEmit_nameConflicts_0.ts, 39, 24)) >M.c.I : Symbol(M.c.I, Decl(declarationEmit_nameConflicts_0.ts, 5, 32)) >M.c : Symbol(c, Decl(declarationEmit_nameConflicts_0.ts, 10, 26)) >M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 57), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1)) @@ -146,9 +146,9 @@ export module M.Q { } } === declarationEmit_nameConflicts_1.ts === -module f { export class c { } } +namespace f { export class c { } } >f : Symbol(f, Decl(declarationEmit_nameConflicts_1.ts, 0, 0)) ->c : Symbol(c, Decl(declarationEmit_nameConflicts_1.ts, 0, 10)) +>c : Symbol(c, Decl(declarationEmit_nameConflicts_1.ts, 0, 13)) export = f; >f : Symbol(f, Decl(declarationEmit_nameConflicts_1.ts, 0, 0)) diff --git a/tests/baselines/reference/declarationEmitNameConflicts.types b/tests/baselines/reference/declarationEmitNameConflicts.types index 6ac0588f1a226..d941511093e2a 100644 --- a/tests/baselines/reference/declarationEmitNameConflicts.types +++ b/tests/baselines/reference/declarationEmitNameConflicts.types @@ -5,7 +5,7 @@ import im = require('./declarationEmit_nameConflicts_1'); >im : typeof im > : ^^^^^^^^^ -export module M { +export namespace M { >M : typeof M > : ^^^^^^^^ @@ -17,7 +17,7 @@ export module M { >C : C > : ^ - export module N { + export namespace N { >N : typeof N > : ^^^^^^^^ @@ -71,7 +71,7 @@ export module M.P { >C : C > : ^ - export module N { + export namespace N { >N : typeof N > : ^^^^^^^^ @@ -160,7 +160,7 @@ export module M.Q { >C : C > : ^ - export module N { + export namespace N { >N : typeof N > : ^^^^^^^^ @@ -182,7 +182,7 @@ export module M.Q { >c : typeof M.N > : ^^^^^^^^^^ - export module c { + export namespace c { export interface I extends M.c.I { } // ok >M.c : typeof M.N > : ^^^^^^^^^^ @@ -193,7 +193,7 @@ export module M.Q { } } === declarationEmit_nameConflicts_1.ts === -module f { export class c { } } +namespace f { export class c { } } >f : typeof f > : ^^^^^^^^ >c : c diff --git a/tests/baselines/reference/declarationEmitNameConflicts2.js b/tests/baselines/reference/declarationEmitNameConflicts2.js index bbcf0565d06a1..f7ffe32381d0c 100644 --- a/tests/baselines/reference/declarationEmitNameConflicts2.js +++ b/tests/baselines/reference/declarationEmitNameConflicts2.js @@ -1,16 +1,16 @@ //// [tests/cases/compiler/declarationEmitNameConflicts2.ts] //// //// [declarationEmitNameConflicts2.ts] -module X.Y.base { +namespace X.Y.base { export function f() { } export class C { } - export module M { + export namespace M { export var v; } export enum E { } } -module X.Y.base.Z { +namespace X.Y.base.Z { export var f = X.Y.base.f; // Should be base.f export var C = X.Y.base.C; // Should be base.C export var M = X.Y.base.M; // Should be base.M diff --git a/tests/baselines/reference/declarationEmitNameConflicts2.symbols b/tests/baselines/reference/declarationEmitNameConflicts2.symbols index 68def2e797c1a..3d8e343402727 100644 --- a/tests/baselines/reference/declarationEmitNameConflicts2.symbols +++ b/tests/baselines/reference/declarationEmitNameConflicts2.symbols @@ -1,18 +1,18 @@ //// [tests/cases/compiler/declarationEmitNameConflicts2.ts] //// === declarationEmitNameConflicts2.ts === -module X.Y.base { +namespace X.Y.base { >X : Symbol(X, Decl(declarationEmitNameConflicts2.ts, 0, 0), Decl(declarationEmitNameConflicts2.ts, 7, 1)) ->Y : Symbol(Y, Decl(declarationEmitNameConflicts2.ts, 0, 9), Decl(declarationEmitNameConflicts2.ts, 9, 9)) ->base : Symbol(base, Decl(declarationEmitNameConflicts2.ts, 0, 11), Decl(declarationEmitNameConflicts2.ts, 9, 11)) +>Y : Symbol(Y, Decl(declarationEmitNameConflicts2.ts, 0, 12), Decl(declarationEmitNameConflicts2.ts, 9, 12)) +>base : Symbol(base, Decl(declarationEmitNameConflicts2.ts, 0, 14), Decl(declarationEmitNameConflicts2.ts, 9, 14)) export function f() { } ->f : Symbol(f, Decl(declarationEmitNameConflicts2.ts, 0, 17)) +>f : Symbol(f, Decl(declarationEmitNameConflicts2.ts, 0, 20)) export class C { } >C : Symbol(C, Decl(declarationEmitNameConflicts2.ts, 1, 27)) - export module M { + export namespace M { >M : Symbol(M, Decl(declarationEmitNameConflicts2.ts, 2, 22)) export var v; @@ -22,49 +22,49 @@ module X.Y.base { >E : Symbol(E, Decl(declarationEmitNameConflicts2.ts, 5, 5)) } -module X.Y.base.Z { +namespace X.Y.base.Z { >X : Symbol(X, Decl(declarationEmitNameConflicts2.ts, 0, 0), Decl(declarationEmitNameConflicts2.ts, 7, 1)) ->Y : Symbol(Y, Decl(declarationEmitNameConflicts2.ts, 0, 9), Decl(declarationEmitNameConflicts2.ts, 9, 9)) ->base : Symbol(base, Decl(declarationEmitNameConflicts2.ts, 0, 11), Decl(declarationEmitNameConflicts2.ts, 9, 11)) ->Z : Symbol(Z, Decl(declarationEmitNameConflicts2.ts, 9, 16)) +>Y : Symbol(Y, Decl(declarationEmitNameConflicts2.ts, 0, 12), Decl(declarationEmitNameConflicts2.ts, 9, 12)) +>base : Symbol(base, Decl(declarationEmitNameConflicts2.ts, 0, 14), Decl(declarationEmitNameConflicts2.ts, 9, 14)) +>Z : Symbol(Z, Decl(declarationEmitNameConflicts2.ts, 9, 19)) export var f = X.Y.base.f; // Should be base.f >f : Symbol(f, Decl(declarationEmitNameConflicts2.ts, 10, 14)) ->X.Y.base.f : Symbol(f, Decl(declarationEmitNameConflicts2.ts, 0, 17)) ->X.Y.base : Symbol(base, Decl(declarationEmitNameConflicts2.ts, 0, 11), Decl(declarationEmitNameConflicts2.ts, 9, 11)) ->X.Y : Symbol(Y, Decl(declarationEmitNameConflicts2.ts, 0, 9), Decl(declarationEmitNameConflicts2.ts, 9, 9)) +>X.Y.base.f : Symbol(f, Decl(declarationEmitNameConflicts2.ts, 0, 20)) +>X.Y.base : Symbol(base, Decl(declarationEmitNameConflicts2.ts, 0, 14), Decl(declarationEmitNameConflicts2.ts, 9, 14)) +>X.Y : Symbol(Y, Decl(declarationEmitNameConflicts2.ts, 0, 12), Decl(declarationEmitNameConflicts2.ts, 9, 12)) >X : Symbol(X, Decl(declarationEmitNameConflicts2.ts, 0, 0), Decl(declarationEmitNameConflicts2.ts, 7, 1)) ->Y : Symbol(Y, Decl(declarationEmitNameConflicts2.ts, 0, 9), Decl(declarationEmitNameConflicts2.ts, 9, 9)) ->base : Symbol(base, Decl(declarationEmitNameConflicts2.ts, 0, 11), Decl(declarationEmitNameConflicts2.ts, 9, 11)) ->f : Symbol(f, Decl(declarationEmitNameConflicts2.ts, 0, 17)) +>Y : Symbol(Y, Decl(declarationEmitNameConflicts2.ts, 0, 12), Decl(declarationEmitNameConflicts2.ts, 9, 12)) +>base : Symbol(base, Decl(declarationEmitNameConflicts2.ts, 0, 14), Decl(declarationEmitNameConflicts2.ts, 9, 14)) +>f : Symbol(f, Decl(declarationEmitNameConflicts2.ts, 0, 20)) export var C = X.Y.base.C; // Should be base.C >C : Symbol(C, Decl(declarationEmitNameConflicts2.ts, 11, 14)) >X.Y.base.C : Symbol(C, Decl(declarationEmitNameConflicts2.ts, 1, 27)) ->X.Y.base : Symbol(base, Decl(declarationEmitNameConflicts2.ts, 0, 11), Decl(declarationEmitNameConflicts2.ts, 9, 11)) ->X.Y : Symbol(Y, Decl(declarationEmitNameConflicts2.ts, 0, 9), Decl(declarationEmitNameConflicts2.ts, 9, 9)) +>X.Y.base : Symbol(base, Decl(declarationEmitNameConflicts2.ts, 0, 14), Decl(declarationEmitNameConflicts2.ts, 9, 14)) +>X.Y : Symbol(Y, Decl(declarationEmitNameConflicts2.ts, 0, 12), Decl(declarationEmitNameConflicts2.ts, 9, 12)) >X : Symbol(X, Decl(declarationEmitNameConflicts2.ts, 0, 0), Decl(declarationEmitNameConflicts2.ts, 7, 1)) ->Y : Symbol(Y, Decl(declarationEmitNameConflicts2.ts, 0, 9), Decl(declarationEmitNameConflicts2.ts, 9, 9)) ->base : Symbol(base, Decl(declarationEmitNameConflicts2.ts, 0, 11), Decl(declarationEmitNameConflicts2.ts, 9, 11)) +>Y : Symbol(Y, Decl(declarationEmitNameConflicts2.ts, 0, 12), Decl(declarationEmitNameConflicts2.ts, 9, 12)) +>base : Symbol(base, Decl(declarationEmitNameConflicts2.ts, 0, 14), Decl(declarationEmitNameConflicts2.ts, 9, 14)) >C : Symbol(C, Decl(declarationEmitNameConflicts2.ts, 1, 27)) export var M = X.Y.base.M; // Should be base.M >M : Symbol(M, Decl(declarationEmitNameConflicts2.ts, 12, 14)) >X.Y.base.M : Symbol(M, Decl(declarationEmitNameConflicts2.ts, 2, 22)) ->X.Y.base : Symbol(base, Decl(declarationEmitNameConflicts2.ts, 0, 11), Decl(declarationEmitNameConflicts2.ts, 9, 11)) ->X.Y : Symbol(Y, Decl(declarationEmitNameConflicts2.ts, 0, 9), Decl(declarationEmitNameConflicts2.ts, 9, 9)) +>X.Y.base : Symbol(base, Decl(declarationEmitNameConflicts2.ts, 0, 14), Decl(declarationEmitNameConflicts2.ts, 9, 14)) +>X.Y : Symbol(Y, Decl(declarationEmitNameConflicts2.ts, 0, 12), Decl(declarationEmitNameConflicts2.ts, 9, 12)) >X : Symbol(X, Decl(declarationEmitNameConflicts2.ts, 0, 0), Decl(declarationEmitNameConflicts2.ts, 7, 1)) ->Y : Symbol(Y, Decl(declarationEmitNameConflicts2.ts, 0, 9), Decl(declarationEmitNameConflicts2.ts, 9, 9)) ->base : Symbol(base, Decl(declarationEmitNameConflicts2.ts, 0, 11), Decl(declarationEmitNameConflicts2.ts, 9, 11)) +>Y : Symbol(Y, Decl(declarationEmitNameConflicts2.ts, 0, 12), Decl(declarationEmitNameConflicts2.ts, 9, 12)) +>base : Symbol(base, Decl(declarationEmitNameConflicts2.ts, 0, 14), Decl(declarationEmitNameConflicts2.ts, 9, 14)) >M : Symbol(M, Decl(declarationEmitNameConflicts2.ts, 2, 22)) export var E = X.Y.base.E; // Should be base.E >E : Symbol(E, Decl(declarationEmitNameConflicts2.ts, 13, 14)) >X.Y.base.E : Symbol(E, Decl(declarationEmitNameConflicts2.ts, 5, 5)) ->X.Y.base : Symbol(base, Decl(declarationEmitNameConflicts2.ts, 0, 11), Decl(declarationEmitNameConflicts2.ts, 9, 11)) ->X.Y : Symbol(Y, Decl(declarationEmitNameConflicts2.ts, 0, 9), Decl(declarationEmitNameConflicts2.ts, 9, 9)) +>X.Y.base : Symbol(base, Decl(declarationEmitNameConflicts2.ts, 0, 14), Decl(declarationEmitNameConflicts2.ts, 9, 14)) +>X.Y : Symbol(Y, Decl(declarationEmitNameConflicts2.ts, 0, 12), Decl(declarationEmitNameConflicts2.ts, 9, 12)) >X : Symbol(X, Decl(declarationEmitNameConflicts2.ts, 0, 0), Decl(declarationEmitNameConflicts2.ts, 7, 1)) ->Y : Symbol(Y, Decl(declarationEmitNameConflicts2.ts, 0, 9), Decl(declarationEmitNameConflicts2.ts, 9, 9)) ->base : Symbol(base, Decl(declarationEmitNameConflicts2.ts, 0, 11), Decl(declarationEmitNameConflicts2.ts, 9, 11)) +>Y : Symbol(Y, Decl(declarationEmitNameConflicts2.ts, 0, 12), Decl(declarationEmitNameConflicts2.ts, 9, 12)) +>base : Symbol(base, Decl(declarationEmitNameConflicts2.ts, 0, 14), Decl(declarationEmitNameConflicts2.ts, 9, 14)) >E : Symbol(E, Decl(declarationEmitNameConflicts2.ts, 5, 5)) } diff --git a/tests/baselines/reference/declarationEmitNameConflicts2.types b/tests/baselines/reference/declarationEmitNameConflicts2.types index b6df9551cfaf1..9f5079d722932 100644 --- a/tests/baselines/reference/declarationEmitNameConflicts2.types +++ b/tests/baselines/reference/declarationEmitNameConflicts2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declarationEmitNameConflicts2.ts] //// === declarationEmitNameConflicts2.ts === -module X.Y.base { +namespace X.Y.base { >X : typeof X > : ^^^^^^^^ >Y : typeof Y @@ -17,7 +17,7 @@ module X.Y.base { >C : C > : ^ - export module M { + export namespace M { >M : typeof M > : ^^^^^^^^ @@ -29,7 +29,7 @@ module X.Y.base { > : ^ } -module X.Y.base.Z { +namespace X.Y.base.Z { >X : typeof X > : ^^^^^^^^ >Y : typeof Y diff --git a/tests/baselines/reference/declarationEmitNameConflicts3.js b/tests/baselines/reference/declarationEmitNameConflicts3.js index 4720e548438ae..e3b0a85b854ae 100644 --- a/tests/baselines/reference/declarationEmitNameConflicts3.js +++ b/tests/baselines/reference/declarationEmitNameConflicts3.js @@ -1,20 +1,20 @@ //// [tests/cases/compiler/declarationEmitNameConflicts3.ts] //// //// [declarationEmitNameConflicts3.ts] -module M { +namespace M { export interface D { } - export module D { + export namespace D { export function f() { } } - export module C { + export namespace C { export function f() { } } - export module E { + export namespace E { export function f() { } } } -module M.P { +namespace M.P { export class C { static f() { } } diff --git a/tests/baselines/reference/declarationEmitNameConflicts3.symbols b/tests/baselines/reference/declarationEmitNameConflicts3.symbols index 7ac2416b91ac3..58c3bdf40bd74 100644 --- a/tests/baselines/reference/declarationEmitNameConflicts3.symbols +++ b/tests/baselines/reference/declarationEmitNameConflicts3.symbols @@ -1,45 +1,45 @@ //// [tests/cases/compiler/declarationEmitNameConflicts3.ts] //// === declarationEmitNameConflicts3.ts === -module M { +namespace M { >M : Symbol(M, Decl(declarationEmitNameConflicts3.ts, 0, 0), Decl(declarationEmitNameConflicts3.ts, 11, 1)) export interface D { } ->D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 0, 10), Decl(declarationEmitNameConflicts3.ts, 1, 26)) +>D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 0, 13), Decl(declarationEmitNameConflicts3.ts, 1, 26)) - export module D { ->D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 0, 10), Decl(declarationEmitNameConflicts3.ts, 1, 26)) + export namespace D { +>D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 0, 13), Decl(declarationEmitNameConflicts3.ts, 1, 26)) export function f() { } ->f : Symbol(f, Decl(declarationEmitNameConflicts3.ts, 2, 21)) +>f : Symbol(f, Decl(declarationEmitNameConflicts3.ts, 2, 24)) } - export module C { + export namespace C { >C : Symbol(C, Decl(declarationEmitNameConflicts3.ts, 4, 5)) export function f() { } ->f : Symbol(f, Decl(declarationEmitNameConflicts3.ts, 5, 21)) +>f : Symbol(f, Decl(declarationEmitNameConflicts3.ts, 5, 24)) } - export module E { + export namespace E { >E : Symbol(E, Decl(declarationEmitNameConflicts3.ts, 7, 5)) export function f() { } ->f : Symbol(f, Decl(declarationEmitNameConflicts3.ts, 8, 21)) +>f : Symbol(f, Decl(declarationEmitNameConflicts3.ts, 8, 24)) } } -module M.P { +namespace M.P { >M : Symbol(M, Decl(declarationEmitNameConflicts3.ts, 0, 0), Decl(declarationEmitNameConflicts3.ts, 11, 1)) ->P : Symbol(P, Decl(declarationEmitNameConflicts3.ts, 13, 9)) +>P : Symbol(P, Decl(declarationEmitNameConflicts3.ts, 13, 12)) export class C { ->C : Symbol(C, Decl(declarationEmitNameConflicts3.ts, 13, 12)) +>C : Symbol(C, Decl(declarationEmitNameConflicts3.ts, 13, 15)) static f() { } >f : Symbol(C.f, Decl(declarationEmitNameConflicts3.ts, 14, 20)) } export class E extends C { } >E : Symbol(E, Decl(declarationEmitNameConflicts3.ts, 16, 5)) ->C : Symbol(C, Decl(declarationEmitNameConflicts3.ts, 13, 12)) +>C : Symbol(C, Decl(declarationEmitNameConflicts3.ts, 13, 15)) export enum D { >D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 17, 32)) @@ -50,29 +50,29 @@ module M.P { export var v: M.D; // ok >v : Symbol(v, Decl(declarationEmitNameConflicts3.ts, 21, 14)) >M : Symbol(M, Decl(declarationEmitNameConflicts3.ts, 0, 0), Decl(declarationEmitNameConflicts3.ts, 11, 1)) ->D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 0, 10), Decl(declarationEmitNameConflicts3.ts, 1, 26)) +>D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 0, 13), Decl(declarationEmitNameConflicts3.ts, 1, 26)) export var w = M.D.f; // error, should be typeof M.D.f >w : Symbol(w, Decl(declarationEmitNameConflicts3.ts, 22, 14)) ->M.D.f : Symbol(M.D.f, Decl(declarationEmitNameConflicts3.ts, 2, 21)) ->M.D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 0, 10), Decl(declarationEmitNameConflicts3.ts, 1, 26)) +>M.D.f : Symbol(M.D.f, Decl(declarationEmitNameConflicts3.ts, 2, 24)) +>M.D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 0, 13), Decl(declarationEmitNameConflicts3.ts, 1, 26)) >M : Symbol(M, Decl(declarationEmitNameConflicts3.ts, 0, 0), Decl(declarationEmitNameConflicts3.ts, 11, 1)) ->D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 0, 10), Decl(declarationEmitNameConflicts3.ts, 1, 26)) ->f : Symbol(M.D.f, Decl(declarationEmitNameConflicts3.ts, 2, 21)) +>D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 0, 13), Decl(declarationEmitNameConflicts3.ts, 1, 26)) +>f : Symbol(M.D.f, Decl(declarationEmitNameConflicts3.ts, 2, 24)) export var x = M.C.f; // error, should be typeof M.C.f >x : Symbol(x, Decl(declarationEmitNameConflicts3.ts, 23, 14), Decl(declarationEmitNameConflicts3.ts, 24, 14)) ->M.C.f : Symbol(C.f, Decl(declarationEmitNameConflicts3.ts, 5, 21)) +>M.C.f : Symbol(C.f, Decl(declarationEmitNameConflicts3.ts, 5, 24)) >M.C : Symbol(C, Decl(declarationEmitNameConflicts3.ts, 4, 5)) >M : Symbol(M, Decl(declarationEmitNameConflicts3.ts, 0, 0), Decl(declarationEmitNameConflicts3.ts, 11, 1)) >C : Symbol(C, Decl(declarationEmitNameConflicts3.ts, 4, 5)) ->f : Symbol(C.f, Decl(declarationEmitNameConflicts3.ts, 5, 21)) +>f : Symbol(C.f, Decl(declarationEmitNameConflicts3.ts, 5, 24)) export var x = M.E.f; // error, should be typeof M.E.f >x : Symbol(x, Decl(declarationEmitNameConflicts3.ts, 23, 14), Decl(declarationEmitNameConflicts3.ts, 24, 14)) ->M.E.f : Symbol(E.f, Decl(declarationEmitNameConflicts3.ts, 8, 21)) +>M.E.f : Symbol(E.f, Decl(declarationEmitNameConflicts3.ts, 8, 24)) >M.E : Symbol(E, Decl(declarationEmitNameConflicts3.ts, 7, 5)) >M : Symbol(M, Decl(declarationEmitNameConflicts3.ts, 0, 0), Decl(declarationEmitNameConflicts3.ts, 11, 1)) >E : Symbol(E, Decl(declarationEmitNameConflicts3.ts, 7, 5)) ->f : Symbol(E.f, Decl(declarationEmitNameConflicts3.ts, 8, 21)) +>f : Symbol(E.f, Decl(declarationEmitNameConflicts3.ts, 8, 24)) } diff --git a/tests/baselines/reference/declarationEmitNameConflicts3.types b/tests/baselines/reference/declarationEmitNameConflicts3.types index edaadc9a4b1eb..5d66c9fc8f951 100644 --- a/tests/baselines/reference/declarationEmitNameConflicts3.types +++ b/tests/baselines/reference/declarationEmitNameConflicts3.types @@ -1,12 +1,12 @@ //// [tests/cases/compiler/declarationEmitNameConflicts3.ts] //// === declarationEmitNameConflicts3.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ export interface D { } - export module D { + export namespace D { >D : typeof D > : ^^^^^^^^ @@ -14,7 +14,7 @@ module M { >f : () => void > : ^^^^^^^^^^ } - export module C { + export namespace C { >C : typeof C > : ^^^^^^^^ @@ -22,7 +22,7 @@ module M { >f : () => void > : ^^^^^^^^^^ } - export module E { + export namespace E { >E : typeof E > : ^^^^^^^^ @@ -32,7 +32,7 @@ module M { } } -module M.P { +namespace M.P { >M : typeof M > : ^^^^^^^^ >P : typeof P diff --git a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js index 608174fbd10ad..7f187bf3abca4 100644 --- a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js +++ b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js @@ -1,10 +1,10 @@ //// [tests/cases/compiler/declarationEmitNameConflictsWithAlias.ts] //// //// [declarationEmitNameConflictsWithAlias.ts] -export module C { export interface I { } } +export namespace C { export interface I { } } export import v = C; -export module M { - export module C { export interface I { } } +export namespace M { + export namespace C { export interface I { } } export var w: v.I; // Gets emitted as C.I, which is the wrong interface } diff --git a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.symbols b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.symbols index bdaa554b96fa2..b5b9ff078c2aa 100644 --- a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.symbols +++ b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.symbols @@ -1,23 +1,23 @@ //// [tests/cases/compiler/declarationEmitNameConflictsWithAlias.ts] //// === declarationEmitNameConflictsWithAlias.ts === -export module C { export interface I { } } +export namespace C { export interface I { } } >C : Symbol(C, Decl(declarationEmitNameConflictsWithAlias.ts, 0, 0)) ->I : Symbol(I, Decl(declarationEmitNameConflictsWithAlias.ts, 0, 17)) +>I : Symbol(I, Decl(declarationEmitNameConflictsWithAlias.ts, 0, 20)) export import v = C; ->v : Symbol(v, Decl(declarationEmitNameConflictsWithAlias.ts, 0, 42)) +>v : Symbol(v, Decl(declarationEmitNameConflictsWithAlias.ts, 0, 45)) >C : Symbol(C, Decl(declarationEmitNameConflictsWithAlias.ts, 0, 0)) -export module M { +export namespace M { >M : Symbol(M, Decl(declarationEmitNameConflictsWithAlias.ts, 1, 20)) - export module C { export interface I { } } ->C : Symbol(C, Decl(declarationEmitNameConflictsWithAlias.ts, 2, 17)) ->I : Symbol(I, Decl(declarationEmitNameConflictsWithAlias.ts, 3, 21)) + export namespace C { export interface I { } } +>C : Symbol(C, Decl(declarationEmitNameConflictsWithAlias.ts, 2, 20)) +>I : Symbol(I, Decl(declarationEmitNameConflictsWithAlias.ts, 3, 24)) export var w: v.I; // Gets emitted as C.I, which is the wrong interface >w : Symbol(w, Decl(declarationEmitNameConflictsWithAlias.ts, 4, 14)) ->v : Symbol(v, Decl(declarationEmitNameConflictsWithAlias.ts, 0, 42)) ->I : Symbol(v.I, Decl(declarationEmitNameConflictsWithAlias.ts, 0, 17)) +>v : Symbol(v, Decl(declarationEmitNameConflictsWithAlias.ts, 0, 45)) +>I : Symbol(v.I, Decl(declarationEmitNameConflictsWithAlias.ts, 0, 20)) } diff --git a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.types b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.types index 9b67cf259f9bc..d97fc47f13bd3 100644 --- a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.types +++ b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.types @@ -1,17 +1,17 @@ //// [tests/cases/compiler/declarationEmitNameConflictsWithAlias.ts] //// === declarationEmitNameConflictsWithAlias.ts === -export module C { export interface I { } } +export namespace C { export interface I { } } export import v = C; >v : any > : ^^^ >C : error -export module M { +export namespace M { >M : typeof M > : ^^^^^^^^ - export module C { export interface I { } } + export namespace C { export interface I { } } export var w: v.I; // Gets emitted as C.I, which is the wrong interface >w : v.I > : ^^^ diff --git a/tests/baselines/reference/declarationMaps.js b/tests/baselines/reference/declarationMaps.js index 1129dcac17795..483346be73e7f 100644 --- a/tests/baselines/reference/declarationMaps.js +++ b/tests/baselines/reference/declarationMaps.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declarationMaps.ts] //// //// [declarationMaps.ts] -module m2 { +namespace m2 { export interface connectModule { (res, req, next): void; } diff --git a/tests/baselines/reference/declarationMaps.js.map b/tests/baselines/reference/declarationMaps.js.map index e26401dd61deb..3ea3a7c3facac 100644 --- a/tests/baselines/reference/declarationMaps.js.map +++ b/tests/baselines/reference/declarationMaps.js.map @@ -1,3 +1,3 @@ //// [declarationMaps.d.ts.map] -{"version":3,"file":"declarationMaps.d.ts","sourceRoot":"","sources":["declarationMaps.ts"],"names":[],"mappings":"AAAA,kBAAO,EAAE,CAAC;IACN,UAAiB,aAAa;QAC1B,CAAC,GAAG,KAAA,EAAE,GAAG,KAAA,EAAE,IAAI,KAAA,GAAG,IAAI,CAAC;KAC1B;IACD,UAAiB,aAAa;QAC1B,GAAG,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,aAAa,CAAC;QAC3C,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;KAClC;CAEJ;AAED,QAAA,IAAI,EAAE,EAAE;IACJ,IAAI,EAAE,CAAC,aAAa,CAAC;IACrB,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC;IACxB,KAAK,IAAI,EAAE,CAAC,aAAa,CAAC;CAC7B,CAAC;AAEF,SAAS,EAAE,CAAC"} -//// https://sokra.github.io/source-map-visualization#base64,ZGVjbGFyZSBuYW1lc3BhY2UgbTIgew0KICAgIGludGVyZmFjZSBjb25uZWN0TW9kdWxlIHsNCiAgICAgICAgKHJlczogYW55LCByZXE6IGFueSwgbmV4dDogYW55KTogdm9pZDsNCiAgICB9DQogICAgaW50ZXJmYWNlIGNvbm5lY3RFeHBvcnQgew0KICAgICAgICB1c2U6IChtb2Q6IGNvbm5lY3RNb2R1bGUpID0+IGNvbm5lY3RFeHBvcnQ7DQogICAgICAgIGxpc3RlbjogKHBvcnQ6IG51bWJlcikgPT4gdm9pZDsNCiAgICB9DQp9DQpkZWNsYXJlIHZhciBtMjogew0KICAgICgpOiBtMi5jb25uZWN0RXhwb3J0Ow0KICAgIHRlc3QxOiBtMi5jb25uZWN0TW9kdWxlOw0KICAgIHRlc3QyKCk6IG0yLmNvbm5lY3RNb2R1bGU7DQp9Ow0KZXhwb3J0ID0gbTI7DQovLyMgc291cmNlTWFwcGluZ1VSTD1kZWNsYXJhdGlvbk1hcHMuZC50cy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVjbGFyYXRpb25NYXBzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJkZWNsYXJhdGlvbk1hcHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsa0JBQU8sRUFBRSxDQUFDO0lBQ04sVUFBaUIsYUFBYTtRQUMxQixDQUFDLEdBQUcsS0FBQSxFQUFFLEdBQUcsS0FBQSxFQUFFLElBQUksS0FBQSxHQUFHLElBQUksQ0FBQztLQUMxQjtJQUNELFVBQWlCLGFBQWE7UUFDMUIsR0FBRyxFQUFFLENBQUMsR0FBRyxFQUFFLGFBQWEsS0FBSyxhQUFhLENBQUM7UUFDM0MsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLE1BQU0sS0FBSyxJQUFJLENBQUM7S0FDbEM7Q0FFSjtBQUVELFFBQUEsSUFBSSxFQUFFLEVBQUU7SUFDSixJQUFJLEVBQUUsQ0FBQyxhQUFhLENBQUM7SUFDckIsS0FBSyxFQUFFLEVBQUUsQ0FBQyxhQUFhLENBQUM7SUFDeEIsS0FBSyxJQUFJLEVBQUUsQ0FBQyxhQUFhLENBQUM7Q0FDN0IsQ0FBQztBQUVGLFNBQVMsRUFBRSxDQUFDIn0=,bW9kdWxlIG0yIHsKICAgIGV4cG9ydCBpbnRlcmZhY2UgY29ubmVjdE1vZHVsZSB7CiAgICAgICAgKHJlcywgcmVxLCBuZXh0KTogdm9pZDsKICAgIH0KICAgIGV4cG9ydCBpbnRlcmZhY2UgY29ubmVjdEV4cG9ydCB7CiAgICAgICAgdXNlOiAobW9kOiBjb25uZWN0TW9kdWxlKSA9PiBjb25uZWN0RXhwb3J0OwogICAgICAgIGxpc3RlbjogKHBvcnQ6IG51bWJlcikgPT4gdm9pZDsKICAgIH0KCn0KCnZhciBtMjogewogICAgKCk6IG0yLmNvbm5lY3RFeHBvcnQ7CiAgICB0ZXN0MTogbTIuY29ubmVjdE1vZHVsZTsKICAgIHRlc3QyKCk6IG0yLmNvbm5lY3RNb2R1bGU7Cn07CgpleHBvcnQgPSBtMjs= +{"version":3,"file":"declarationMaps.d.ts","sourceRoot":"","sources":["declarationMaps.ts"],"names":[],"mappings":"AAAA,kBAAU,EAAE,CAAC;IACT,UAAiB,aAAa;QAC1B,CAAC,GAAG,KAAA,EAAE,GAAG,KAAA,EAAE,IAAI,KAAA,GAAG,IAAI,CAAC;KAC1B;IACD,UAAiB,aAAa;QAC1B,GAAG,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,aAAa,CAAC;QAC3C,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;KAClC;CAEJ;AAED,QAAA,IAAI,EAAE,EAAE;IACJ,IAAI,EAAE,CAAC,aAAa,CAAC;IACrB,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC;IACxB,KAAK,IAAI,EAAE,CAAC,aAAa,CAAC;CAC7B,CAAC;AAEF,SAAS,EAAE,CAAC"} +//// https://sokra.github.io/source-map-visualization#base64,ZGVjbGFyZSBuYW1lc3BhY2UgbTIgew0KICAgIGludGVyZmFjZSBjb25uZWN0TW9kdWxlIHsNCiAgICAgICAgKHJlczogYW55LCByZXE6IGFueSwgbmV4dDogYW55KTogdm9pZDsNCiAgICB9DQogICAgaW50ZXJmYWNlIGNvbm5lY3RFeHBvcnQgew0KICAgICAgICB1c2U6IChtb2Q6IGNvbm5lY3RNb2R1bGUpID0+IGNvbm5lY3RFeHBvcnQ7DQogICAgICAgIGxpc3RlbjogKHBvcnQ6IG51bWJlcikgPT4gdm9pZDsNCiAgICB9DQp9DQpkZWNsYXJlIHZhciBtMjogew0KICAgICgpOiBtMi5jb25uZWN0RXhwb3J0Ow0KICAgIHRlc3QxOiBtMi5jb25uZWN0TW9kdWxlOw0KICAgIHRlc3QyKCk6IG0yLmNvbm5lY3RNb2R1bGU7DQp9Ow0KZXhwb3J0ID0gbTI7DQovLyMgc291cmNlTWFwcGluZ1VSTD1kZWNsYXJhdGlvbk1hcHMuZC50cy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVjbGFyYXRpb25NYXBzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJkZWNsYXJhdGlvbk1hcHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsa0JBQVUsRUFBRSxDQUFDO0lBQ1QsVUFBaUIsYUFBYTtRQUMxQixDQUFDLEdBQUcsS0FBQSxFQUFFLEdBQUcsS0FBQSxFQUFFLElBQUksS0FBQSxHQUFHLElBQUksQ0FBQztLQUMxQjtJQUNELFVBQWlCLGFBQWE7UUFDMUIsR0FBRyxFQUFFLENBQUMsR0FBRyxFQUFFLGFBQWEsS0FBSyxhQUFhLENBQUM7UUFDM0MsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLE1BQU0sS0FBSyxJQUFJLENBQUM7S0FDbEM7Q0FFSjtBQUVELFFBQUEsSUFBSSxFQUFFLEVBQUU7SUFDSixJQUFJLEVBQUUsQ0FBQyxhQUFhLENBQUM7SUFDckIsS0FBSyxFQUFFLEVBQUUsQ0FBQyxhQUFhLENBQUM7SUFDeEIsS0FBSyxJQUFJLEVBQUUsQ0FBQyxhQUFhLENBQUM7Q0FDN0IsQ0FBQztBQUVGLFNBQVMsRUFBRSxDQUFDIn0=,bmFtZXNwYWNlIG0yIHsKICAgIGV4cG9ydCBpbnRlcmZhY2UgY29ubmVjdE1vZHVsZSB7CiAgICAgICAgKHJlcywgcmVxLCBuZXh0KTogdm9pZDsKICAgIH0KICAgIGV4cG9ydCBpbnRlcmZhY2UgY29ubmVjdEV4cG9ydCB7CiAgICAgICAgdXNlOiAobW9kOiBjb25uZWN0TW9kdWxlKSA9PiBjb25uZWN0RXhwb3J0OwogICAgICAgIGxpc3RlbjogKHBvcnQ6IG51bWJlcikgPT4gdm9pZDsKICAgIH0KCn0KCnZhciBtMjogewogICAgKCk6IG0yLmNvbm5lY3RFeHBvcnQ7CiAgICB0ZXN0MTogbTIuY29ubmVjdE1vZHVsZTsKICAgIHRlc3QyKCk6IG0yLmNvbm5lY3RNb2R1bGU7Cn07CgpleHBvcnQgPSBtMjs= diff --git a/tests/baselines/reference/declarationMaps.sourcemap.txt b/tests/baselines/reference/declarationMaps.sourcemap.txt index c1784ff9afa8a..52a4b1b704e3e 100644 --- a/tests/baselines/reference/declarationMaps.sourcemap.txt +++ b/tests/baselines/reference/declarationMaps.sourcemap.txt @@ -15,13 +15,13 @@ sourceFile:declarationMaps.ts 4 > ^ 5 > ^^^^^^^^^-> 1 > -2 >module +2 >namespace 3 > m2 4 > 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 19) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 21) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 22) Source(1, 11) + SourceIndex(0) +2 >Emitted(1, 19) Source(1, 11) + SourceIndex(0) +3 >Emitted(1, 21) Source(1, 13) + SourceIndex(0) +4 >Emitted(1, 22) Source(1, 14) + SourceIndex(0) --- >>> interface connectModule { 1->^^^^ diff --git a/tests/baselines/reference/declarationMaps.symbols b/tests/baselines/reference/declarationMaps.symbols index 1bc439499b017..e956b8944ecee 100644 --- a/tests/baselines/reference/declarationMaps.symbols +++ b/tests/baselines/reference/declarationMaps.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declarationMaps.ts] //// === declarationMaps.ts === -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(declarationMaps.ts, 0, 0), Decl(declarationMaps.ts, 11, 3)) export interface connectModule { ->connectModule : Symbol(connectModule, Decl(declarationMaps.ts, 0, 11)) +>connectModule : Symbol(connectModule, Decl(declarationMaps.ts, 0, 14)) (res, req, next): void; >res : Symbol(res, Decl(declarationMaps.ts, 2, 9)) @@ -18,7 +18,7 @@ module m2 { use: (mod: connectModule) => connectExport; >use : Symbol(connectExport.use, Decl(declarationMaps.ts, 4, 36)) >mod : Symbol(mod, Decl(declarationMaps.ts, 5, 14)) ->connectModule : Symbol(connectModule, Decl(declarationMaps.ts, 0, 11)) +>connectModule : Symbol(connectModule, Decl(declarationMaps.ts, 0, 14)) >connectExport : Symbol(connectExport, Decl(declarationMaps.ts, 3, 5)) listen: (port: number) => void; @@ -38,12 +38,12 @@ var m2: { test1: m2.connectModule; >test1 : Symbol(test1, Decl(declarationMaps.ts, 12, 25)) >m2 : Symbol(m2, Decl(declarationMaps.ts, 0, 0), Decl(declarationMaps.ts, 11, 3)) ->connectModule : Symbol(m2.connectModule, Decl(declarationMaps.ts, 0, 11)) +>connectModule : Symbol(m2.connectModule, Decl(declarationMaps.ts, 0, 14)) test2(): m2.connectModule; >test2 : Symbol(test2, Decl(declarationMaps.ts, 13, 28)) >m2 : Symbol(m2, Decl(declarationMaps.ts, 0, 0), Decl(declarationMaps.ts, 11, 3)) ->connectModule : Symbol(m2.connectModule, Decl(declarationMaps.ts, 0, 11)) +>connectModule : Symbol(m2.connectModule, Decl(declarationMaps.ts, 0, 14)) }; diff --git a/tests/baselines/reference/declarationMaps.types b/tests/baselines/reference/declarationMaps.types index dd9f1dd9a8218..6b67150655cb7 100644 --- a/tests/baselines/reference/declarationMaps.types +++ b/tests/baselines/reference/declarationMaps.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declarationMaps.ts] //// === declarationMaps.ts === -module m2 { +namespace m2 { export interface connectModule { (res, req, next): void; >res : any diff --git a/tests/baselines/reference/declarationMapsWithoutDeclaration.errors.txt b/tests/baselines/reference/declarationMapsWithoutDeclaration.errors.txt index ba3e9d6c33792..b254f30cc92d8 100644 --- a/tests/baselines/reference/declarationMapsWithoutDeclaration.errors.txt +++ b/tests/baselines/reference/declarationMapsWithoutDeclaration.errors.txt @@ -3,7 +3,7 @@ error TS5069: Option 'declarationMap' cannot be specified without specifying opt !!! error TS5069: Option 'declarationMap' cannot be specified without specifying option 'declaration' or option 'composite'. ==== declarationMapsWithoutDeclaration.ts (0 errors) ==== - module m2 { + namespace m2 { export interface connectModule { (res, req, next): void; } diff --git a/tests/baselines/reference/declarationMapsWithoutDeclaration.js b/tests/baselines/reference/declarationMapsWithoutDeclaration.js index 77743fd289e08..adf5c0ccaf21a 100644 --- a/tests/baselines/reference/declarationMapsWithoutDeclaration.js +++ b/tests/baselines/reference/declarationMapsWithoutDeclaration.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declarationMapsWithoutDeclaration.ts] //// //// [declarationMapsWithoutDeclaration.ts] -module m2 { +namespace m2 { export interface connectModule { (res, req, next): void; } diff --git a/tests/baselines/reference/declarationMapsWithoutDeclaration.symbols b/tests/baselines/reference/declarationMapsWithoutDeclaration.symbols index 327eea8f6655e..f8e0849051b58 100644 --- a/tests/baselines/reference/declarationMapsWithoutDeclaration.symbols +++ b/tests/baselines/reference/declarationMapsWithoutDeclaration.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declarationMapsWithoutDeclaration.ts] //// === declarationMapsWithoutDeclaration.ts === -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(declarationMapsWithoutDeclaration.ts, 0, 0), Decl(declarationMapsWithoutDeclaration.ts, 11, 3)) export interface connectModule { ->connectModule : Symbol(connectModule, Decl(declarationMapsWithoutDeclaration.ts, 0, 11)) +>connectModule : Symbol(connectModule, Decl(declarationMapsWithoutDeclaration.ts, 0, 14)) (res, req, next): void; >res : Symbol(res, Decl(declarationMapsWithoutDeclaration.ts, 2, 9)) @@ -18,7 +18,7 @@ module m2 { use: (mod: connectModule) => connectExport; >use : Symbol(connectExport.use, Decl(declarationMapsWithoutDeclaration.ts, 4, 36)) >mod : Symbol(mod, Decl(declarationMapsWithoutDeclaration.ts, 5, 14)) ->connectModule : Symbol(connectModule, Decl(declarationMapsWithoutDeclaration.ts, 0, 11)) +>connectModule : Symbol(connectModule, Decl(declarationMapsWithoutDeclaration.ts, 0, 14)) >connectExport : Symbol(connectExport, Decl(declarationMapsWithoutDeclaration.ts, 3, 5)) listen: (port: number) => void; @@ -38,12 +38,12 @@ var m2: { test1: m2.connectModule; >test1 : Symbol(test1, Decl(declarationMapsWithoutDeclaration.ts, 12, 25)) >m2 : Symbol(m2, Decl(declarationMapsWithoutDeclaration.ts, 0, 0), Decl(declarationMapsWithoutDeclaration.ts, 11, 3)) ->connectModule : Symbol(m2.connectModule, Decl(declarationMapsWithoutDeclaration.ts, 0, 11)) +>connectModule : Symbol(m2.connectModule, Decl(declarationMapsWithoutDeclaration.ts, 0, 14)) test2(): m2.connectModule; >test2 : Symbol(test2, Decl(declarationMapsWithoutDeclaration.ts, 13, 28)) >m2 : Symbol(m2, Decl(declarationMapsWithoutDeclaration.ts, 0, 0), Decl(declarationMapsWithoutDeclaration.ts, 11, 3)) ->connectModule : Symbol(m2.connectModule, Decl(declarationMapsWithoutDeclaration.ts, 0, 11)) +>connectModule : Symbol(m2.connectModule, Decl(declarationMapsWithoutDeclaration.ts, 0, 14)) }; diff --git a/tests/baselines/reference/declarationMapsWithoutDeclaration.types b/tests/baselines/reference/declarationMapsWithoutDeclaration.types index 831691bf3ff9e..5aaaf4f706f7a 100644 --- a/tests/baselines/reference/declarationMapsWithoutDeclaration.types +++ b/tests/baselines/reference/declarationMapsWithoutDeclaration.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declarationMapsWithoutDeclaration.ts] //// === declarationMapsWithoutDeclaration.ts === -module m2 { +namespace m2 { export interface connectModule { (res, req, next): void; >res : any diff --git a/tests/baselines/reference/declarationsAndAssignments.errors.txt b/tests/baselines/reference/declarationsAndAssignments.errors.txt index 935c5f230bba6..bf2f168a34955 100644 --- a/tests/baselines/reference/declarationsAndAssignments.errors.txt +++ b/tests/baselines/reference/declarationsAndAssignments.errors.txt @@ -165,7 +165,7 @@ declarationsAndAssignments.ts(138,9): error TS2322: Type 'number' is not assigna ~~~~~~~~~~~~ !!! error TS2741: Property 'x' is missing in type '{ y: false; }' but required in type '{ x: any; y?: boolean; }'. - module M { + namespace M { export var [a, b] = [1, 2]; } diff --git a/tests/baselines/reference/declarationsAndAssignments.js b/tests/baselines/reference/declarationsAndAssignments.js index 1ca3ca80c9fc2..7821ad1d77ee6 100644 --- a/tests/baselines/reference/declarationsAndAssignments.js +++ b/tests/baselines/reference/declarationsAndAssignments.js @@ -108,7 +108,7 @@ f14([2, ["abc", { x: 0, y: true }]]); f14([2, ["abc", { x: 0 }]]); f14([2, ["abc", { y: false }]]); // Error, no x -module M { +namespace M { export var [a, b] = [1, 2]; } diff --git a/tests/baselines/reference/declarationsAndAssignments.symbols b/tests/baselines/reference/declarationsAndAssignments.symbols index f1c3bef537bea..81e98b6bc9f8a 100644 --- a/tests/baselines/reference/declarationsAndAssignments.symbols +++ b/tests/baselines/reference/declarationsAndAssignments.symbols @@ -341,7 +341,7 @@ f14([2, ["abc", { y: false }]]); // Error, no x >f14 : Symbol(f14, Decl(declarationsAndAssignments.ts, 96, 1)) >y : Symbol(y, Decl(declarationsAndAssignments.ts, 105, 17)) -module M { +namespace M { >M : Symbol(M, Decl(declarationsAndAssignments.ts, 105, 32)) export var [a, b] = [1, 2]; diff --git a/tests/baselines/reference/declarationsAndAssignments.types b/tests/baselines/reference/declarationsAndAssignments.types index 7f50a7b18bc5a..11b4ce7c39580 100644 --- a/tests/baselines/reference/declarationsAndAssignments.types +++ b/tests/baselines/reference/declarationsAndAssignments.types @@ -777,7 +777,7 @@ f14([2, ["abc", { y: false }]]); // Error, no x >false : false > : ^^^^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/declareAlreadySeen.errors.txt b/tests/baselines/reference/declareAlreadySeen.errors.txt index 02a9b3802cafa..60300691711f2 100644 --- a/tests/baselines/reference/declareAlreadySeen.errors.txt +++ b/tests/baselines/reference/declareAlreadySeen.errors.txt @@ -5,7 +5,7 @@ declareAlreadySeen.ts(7,13): error TS1030: 'declare' modifier already seen. ==== declareAlreadySeen.ts (4 errors) ==== - module M { + namespace M { declare declare var x; ~~~~~~~ !!! error TS1030: 'declare' modifier already seen. @@ -13,7 +13,7 @@ declareAlreadySeen.ts(7,13): error TS1030: 'declare' modifier already seen. ~~~~~~~ !!! error TS1030: 'declare' modifier already seen. - declare declare module N { } + declare declare namespace N { } ~~~~~~~ !!! error TS1030: 'declare' modifier already seen. diff --git a/tests/baselines/reference/declareAlreadySeen.js b/tests/baselines/reference/declareAlreadySeen.js index c69a29fbb03ab..0c1d8dd5a01b6 100644 --- a/tests/baselines/reference/declareAlreadySeen.js +++ b/tests/baselines/reference/declareAlreadySeen.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declareAlreadySeen.ts] //// //// [declareAlreadySeen.ts] -module M { +namespace M { declare declare var x; declare declare function f(); - declare declare module N { } + declare declare namespace N { } declare declare class C { } } diff --git a/tests/baselines/reference/declareAlreadySeen.symbols b/tests/baselines/reference/declareAlreadySeen.symbols index 5c6d7566a97ca..7d53eeb886d31 100644 --- a/tests/baselines/reference/declareAlreadySeen.symbols +++ b/tests/baselines/reference/declareAlreadySeen.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declareAlreadySeen.ts] //// === declareAlreadySeen.ts === -module M { +namespace M { >M : Symbol(M, Decl(declareAlreadySeen.ts, 0, 0)) declare declare var x; @@ -10,9 +10,9 @@ module M { declare declare function f(); >f : Symbol(f, Decl(declareAlreadySeen.ts, 1, 26)) - declare declare module N { } + declare declare namespace N { } >N : Symbol(N, Decl(declareAlreadySeen.ts, 2, 33)) declare declare class C { } ->C : Symbol(C, Decl(declareAlreadySeen.ts, 4, 32)) +>C : Symbol(C, Decl(declareAlreadySeen.ts, 4, 35)) } diff --git a/tests/baselines/reference/declareAlreadySeen.types b/tests/baselines/reference/declareAlreadySeen.types index e8f748d520d18..61ae9f520bc51 100644 --- a/tests/baselines/reference/declareAlreadySeen.types +++ b/tests/baselines/reference/declareAlreadySeen.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declareAlreadySeen.ts] //// === declareAlreadySeen.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -13,7 +13,7 @@ module M { >f : () => any > : ^^^^^^^^^ - declare declare module N { } + declare declare namespace N { } declare declare class C { } >C : C diff --git a/tests/baselines/reference/declareDottedExtend.errors.txt b/tests/baselines/reference/declareDottedExtend.errors.txt new file mode 100644 index 0000000000000..1328a7d1ab192 --- /dev/null +++ b/tests/baselines/reference/declareDottedExtend.errors.txt @@ -0,0 +1,20 @@ +declareDottedExtend.ts(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +declareDottedExtend.ts(1,18): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== declareDottedExtend.ts (2 errors) ==== + declare module A.B + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + { + export class C{ } + } + + import ab = A.B; + + class D extends ab.C{ } + + class E extends A.B.C{ } + \ No newline at end of file diff --git a/tests/baselines/reference/declareDottedModuleName.js b/tests/baselines/reference/declareDottedModuleName.js index a7ea2f35919d7..5b807c05132e6 100644 --- a/tests/baselines/reference/declareDottedModuleName.js +++ b/tests/baselines/reference/declareDottedModuleName.js @@ -1,15 +1,15 @@ //// [tests/cases/compiler/declareDottedModuleName.ts] //// //// [declareDottedModuleName.ts] -module M { - module P.Q { } // This shouldnt be emitted +namespace M { + namespace P.Q { } // This shouldnt be emitted } -module M { - export module R.S { } //This should be emitted +namespace M { + export namespace R.S { } //This should be emitted } -module T.U { // This needs to be emitted +namespace T.U { // This needs to be emitted } //// [declareDottedModuleName.js] diff --git a/tests/baselines/reference/declareDottedModuleName.symbols b/tests/baselines/reference/declareDottedModuleName.symbols index e5c5b9a816a1b..312a45e461d7c 100644 --- a/tests/baselines/reference/declareDottedModuleName.symbols +++ b/tests/baselines/reference/declareDottedModuleName.symbols @@ -1,23 +1,23 @@ //// [tests/cases/compiler/declareDottedModuleName.ts] //// === declareDottedModuleName.ts === -module M { +namespace M { >M : Symbol(M, Decl(declareDottedModuleName.ts, 0, 0), Decl(declareDottedModuleName.ts, 2, 1)) - module P.Q { } // This shouldnt be emitted ->P : Symbol(P, Decl(declareDottedModuleName.ts, 0, 10)) ->Q : Symbol(Q, Decl(declareDottedModuleName.ts, 1, 13)) + namespace P.Q { } // This shouldnt be emitted +>P : Symbol(P, Decl(declareDottedModuleName.ts, 0, 13)) +>Q : Symbol(Q, Decl(declareDottedModuleName.ts, 1, 16)) } -module M { +namespace M { >M : Symbol(M, Decl(declareDottedModuleName.ts, 0, 0), Decl(declareDottedModuleName.ts, 2, 1)) - export module R.S { } //This should be emitted ->R : Symbol(R, Decl(declareDottedModuleName.ts, 4, 10)) ->S : Symbol(S, Decl(declareDottedModuleName.ts, 5, 20)) + export namespace R.S { } //This should be emitted +>R : Symbol(R, Decl(declareDottedModuleName.ts, 4, 13)) +>S : Symbol(S, Decl(declareDottedModuleName.ts, 5, 23)) } -module T.U { // This needs to be emitted +namespace T.U { // This needs to be emitted >T : Symbol(T, Decl(declareDottedModuleName.ts, 6, 1)) ->U : Symbol(U, Decl(declareDottedModuleName.ts, 8, 9)) +>U : Symbol(U, Decl(declareDottedModuleName.ts, 8, 12)) } diff --git a/tests/baselines/reference/declareDottedModuleName.types b/tests/baselines/reference/declareDottedModuleName.types index 6dbf9ab415f03..d60ae6bc6d54e 100644 --- a/tests/baselines/reference/declareDottedModuleName.types +++ b/tests/baselines/reference/declareDottedModuleName.types @@ -2,13 +2,13 @@ === declareDottedModuleName.ts === -module M { - module P.Q { } // This shouldnt be emitted +namespace M { + namespace P.Q { } // This shouldnt be emitted } -module M { - export module R.S { } //This should be emitted +namespace M { + export namespace R.S { } //This should be emitted } -module T.U { // This needs to be emitted +namespace T.U { // This needs to be emitted } diff --git a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.js b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.js index 3f8e1a342a809..8683d3d7d1c93 100644 --- a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.js +++ b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.js @@ -7,7 +7,7 @@ declare module "express" { function express(): express.ExpressServer; - module express { + namespace express { export interface ExpressServer { diff --git a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.symbols b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.symbols index 7d70f58092fcc..4e199a345a2ed 100644 --- a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.symbols +++ b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.symbols @@ -10,18 +10,18 @@ declare module "express" { function express(): express.ExpressServer; >express : Symbol(express, Decl(declareExternalModuleWithExportAssignedFundule.ts, 2, 21), Decl(declareExternalModuleWithExportAssignedFundule.ts, 4, 46)) >express : Symbol(express, Decl(declareExternalModuleWithExportAssignedFundule.ts, 2, 21), Decl(declareExternalModuleWithExportAssignedFundule.ts, 4, 46)) ->ExpressServer : Symbol(express.ExpressServer, Decl(declareExternalModuleWithExportAssignedFundule.ts, 6, 20)) +>ExpressServer : Symbol(express.ExpressServer, Decl(declareExternalModuleWithExportAssignedFundule.ts, 6, 23)) - module express { + namespace express { >express : Symbol(express, Decl(declareExternalModuleWithExportAssignedFundule.ts, 2, 21), Decl(declareExternalModuleWithExportAssignedFundule.ts, 4, 46)) export interface ExpressServer { ->ExpressServer : Symbol(ExpressServer, Decl(declareExternalModuleWithExportAssignedFundule.ts, 6, 20)) +>ExpressServer : Symbol(ExpressServer, Decl(declareExternalModuleWithExportAssignedFundule.ts, 6, 23)) enable(name: string): ExpressServer; >enable : Symbol(ExpressServer.enable, Decl(declareExternalModuleWithExportAssignedFundule.ts, 8, 40)) >name : Symbol(name, Decl(declareExternalModuleWithExportAssignedFundule.ts, 10, 19)) ->ExpressServer : Symbol(ExpressServer, Decl(declareExternalModuleWithExportAssignedFundule.ts, 6, 20)) +>ExpressServer : Symbol(ExpressServer, Decl(declareExternalModuleWithExportAssignedFundule.ts, 6, 23)) post(path: RegExp, handler: (req: Function) => void ): void; >post : Symbol(ExpressServer.post, Decl(declareExternalModuleWithExportAssignedFundule.ts, 10, 48)) diff --git a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types index 6f4e3c7f076bc..463155990e1cf 100644 --- a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types +++ b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types @@ -15,7 +15,7 @@ declare module "express" { >express : any > : ^^^ - module express { + namespace express { >express : typeof express > : ^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/declareFileExportAssignment.js b/tests/baselines/reference/declareFileExportAssignment.js index ed4b9e960e965..b183c71909e5a 100644 --- a/tests/baselines/reference/declareFileExportAssignment.js +++ b/tests/baselines/reference/declareFileExportAssignment.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declareFileExportAssignment.ts] //// //// [declareFileExportAssignment.ts] -module m2 { +namespace m2 { export interface connectModule { (res, req, next): void; } diff --git a/tests/baselines/reference/declareFileExportAssignment.symbols b/tests/baselines/reference/declareFileExportAssignment.symbols index 4fcb69bcccfad..4d053e65905bd 100644 --- a/tests/baselines/reference/declareFileExportAssignment.symbols +++ b/tests/baselines/reference/declareFileExportAssignment.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declareFileExportAssignment.ts] //// === declareFileExportAssignment.ts === -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(declareFileExportAssignment.ts, 0, 0), Decl(declareFileExportAssignment.ts, 11, 3)) export interface connectModule { ->connectModule : Symbol(connectModule, Decl(declareFileExportAssignment.ts, 0, 11)) +>connectModule : Symbol(connectModule, Decl(declareFileExportAssignment.ts, 0, 14)) (res, req, next): void; >res : Symbol(res, Decl(declareFileExportAssignment.ts, 2, 9)) @@ -18,7 +18,7 @@ module m2 { use: (mod: connectModule) => connectExport; >use : Symbol(connectExport.use, Decl(declareFileExportAssignment.ts, 4, 36)) >mod : Symbol(mod, Decl(declareFileExportAssignment.ts, 5, 14)) ->connectModule : Symbol(connectModule, Decl(declareFileExportAssignment.ts, 0, 11)) +>connectModule : Symbol(connectModule, Decl(declareFileExportAssignment.ts, 0, 14)) >connectExport : Symbol(connectExport, Decl(declareFileExportAssignment.ts, 3, 5)) listen: (port: number) => void; @@ -38,12 +38,12 @@ var m2: { test1: m2.connectModule; >test1 : Symbol(test1, Decl(declareFileExportAssignment.ts, 12, 25)) >m2 : Symbol(m2, Decl(declareFileExportAssignment.ts, 0, 0), Decl(declareFileExportAssignment.ts, 11, 3)) ->connectModule : Symbol(m2.connectModule, Decl(declareFileExportAssignment.ts, 0, 11)) +>connectModule : Symbol(m2.connectModule, Decl(declareFileExportAssignment.ts, 0, 14)) test2(): m2.connectModule; >test2 : Symbol(test2, Decl(declareFileExportAssignment.ts, 13, 28)) >m2 : Symbol(m2, Decl(declareFileExportAssignment.ts, 0, 0), Decl(declareFileExportAssignment.ts, 11, 3)) ->connectModule : Symbol(m2.connectModule, Decl(declareFileExportAssignment.ts, 0, 11)) +>connectModule : Symbol(m2.connectModule, Decl(declareFileExportAssignment.ts, 0, 14)) }; diff --git a/tests/baselines/reference/declareFileExportAssignment.types b/tests/baselines/reference/declareFileExportAssignment.types index 7227046f2f8dd..83be40668b05f 100644 --- a/tests/baselines/reference/declareFileExportAssignment.types +++ b/tests/baselines/reference/declareFileExportAssignment.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declareFileExportAssignment.ts] //// === declareFileExportAssignment.ts === -module m2 { +namespace m2 { export interface connectModule { (res, req, next): void; >res : any diff --git a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js index a442fcc99fe5f..18a17244c7808 100644 --- a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js +++ b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declareFileExportAssignmentWithVarFromVariableStatement.ts] //// //// [declareFileExportAssignmentWithVarFromVariableStatement.ts] -module m2 { +namespace m2 { export interface connectModule { (res, req, next): void; } diff --git a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.symbols b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.symbols index ec49b2f1b96c3..9a46ddb0632bc 100644 --- a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.symbols +++ b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/declareFileExportAssignmentWithVarFromVariableStatement.ts] //// === declareFileExportAssignmentWithVarFromVariableStatement.ts === -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 0, 0), Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 11, 11)) export interface connectModule { ->connectModule : Symbol(connectModule, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 0, 11)) +>connectModule : Symbol(connectModule, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 0, 14)) (res, req, next): void; >res : Symbol(res, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 2, 9)) @@ -18,7 +18,7 @@ module m2 { use: (mod: connectModule) => connectExport; >use : Symbol(connectExport.use, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 4, 36)) >mod : Symbol(mod, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 5, 14)) ->connectModule : Symbol(connectModule, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 0, 11)) +>connectModule : Symbol(connectModule, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 0, 14)) >connectExport : Symbol(connectExport, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 3, 5)) listen: (port: number) => void; @@ -39,12 +39,12 @@ var x = 10, m2: { test1: m2.connectModule; >test1 : Symbol(test1, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 12, 25)) >m2 : Symbol(m2, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 0, 0), Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 11, 11)) ->connectModule : Symbol(m2.connectModule, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 0, 11)) +>connectModule : Symbol(m2.connectModule, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 0, 14)) test2(): m2.connectModule; >test2 : Symbol(test2, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 13, 28)) >m2 : Symbol(m2, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 0, 0), Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 11, 11)) ->connectModule : Symbol(m2.connectModule, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 0, 11)) +>connectModule : Symbol(m2.connectModule, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 0, 14)) }; diff --git a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types index a5dae84ceb261..3e577f48061d9 100644 --- a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types +++ b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declareFileExportAssignmentWithVarFromVariableStatement.ts] //// === declareFileExportAssignmentWithVarFromVariableStatement.ts === -module m2 { +namespace m2 { export interface connectModule { (res, req, next): void; >res : any diff --git a/tests/baselines/reference/decoratorOnClassMethod11.errors.txt b/tests/baselines/reference/decoratorOnClassMethod11.errors.txt index fc5349bd32097..dd19010f0ca5d 100644 --- a/tests/baselines/reference/decoratorOnClassMethod11.errors.txt +++ b/tests/baselines/reference/decoratorOnClassMethod11.errors.txt @@ -2,7 +2,7 @@ decoratorOnClassMethod11.ts(5,11): error TS2331: 'this' cannot be referenced in ==== decoratorOnClassMethod11.ts (1 errors) ==== - module M { + namespace M { class C { decorator(target: Object, key: string): void { } diff --git a/tests/baselines/reference/decoratorOnClassMethod11.js b/tests/baselines/reference/decoratorOnClassMethod11.js index 4d577dde5a628..27cd204d0a688 100644 --- a/tests/baselines/reference/decoratorOnClassMethod11.js +++ b/tests/baselines/reference/decoratorOnClassMethod11.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/decorators/class/method/decoratorOnClassMethod11.ts] //// //// [decoratorOnClassMethod11.ts] -module M { +namespace M { class C { decorator(target: Object, key: string): void { } diff --git a/tests/baselines/reference/decoratorOnClassMethod11.symbols b/tests/baselines/reference/decoratorOnClassMethod11.symbols index 2ab9662569ce9..e047c855ae7f5 100644 --- a/tests/baselines/reference/decoratorOnClassMethod11.symbols +++ b/tests/baselines/reference/decoratorOnClassMethod11.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/decorators/class/method/decoratorOnClassMethod11.ts] //// === decoratorOnClassMethod11.ts === -module M { +namespace M { >M : Symbol(M, Decl(decoratorOnClassMethod11.ts, 0, 0)) class C { ->C : Symbol(C, Decl(decoratorOnClassMethod11.ts, 0, 10)) +>C : Symbol(C, Decl(decoratorOnClassMethod11.ts, 0, 13)) decorator(target: Object, key: string): void { } >decorator : Symbol(C.decorator, Decl(decoratorOnClassMethod11.ts, 1, 13)) diff --git a/tests/baselines/reference/decoratorOnClassMethod11.types b/tests/baselines/reference/decoratorOnClassMethod11.types index 5b2b2734cb2b1..01cdb62db564c 100644 --- a/tests/baselines/reference/decoratorOnClassMethod11.types +++ b/tests/baselines/reference/decoratorOnClassMethod11.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/decorators/class/method/decoratorOnClassMethod11.ts] //// === decoratorOnClassMethod11.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/decoratorOnClassMethod12.errors.txt b/tests/baselines/reference/decoratorOnClassMethod12.errors.txt index 419533fd0cbb9..4bb4d1c959243 100644 --- a/tests/baselines/reference/decoratorOnClassMethod12.errors.txt +++ b/tests/baselines/reference/decoratorOnClassMethod12.errors.txt @@ -2,7 +2,7 @@ decoratorOnClassMethod12.ts(6,11): error TS2660: 'super' can only be referenced ==== decoratorOnClassMethod12.ts (1 errors) ==== - module M { + namespace M { class S { decorator(target: Object, key: string): void { } } diff --git a/tests/baselines/reference/decoratorOnClassMethod12.js b/tests/baselines/reference/decoratorOnClassMethod12.js index 831be5471530c..64aa5e87c004c 100644 --- a/tests/baselines/reference/decoratorOnClassMethod12.js +++ b/tests/baselines/reference/decoratorOnClassMethod12.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/decorators/class/method/decoratorOnClassMethod12.ts] //// //// [decoratorOnClassMethod12.ts] -module M { +namespace M { class S { decorator(target: Object, key: string): void { } } diff --git a/tests/baselines/reference/decoratorOnClassMethod12.symbols b/tests/baselines/reference/decoratorOnClassMethod12.symbols index 838af744903cb..f4c5a3b45e582 100644 --- a/tests/baselines/reference/decoratorOnClassMethod12.symbols +++ b/tests/baselines/reference/decoratorOnClassMethod12.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/decorators/class/method/decoratorOnClassMethod12.ts] //// === decoratorOnClassMethod12.ts === -module M { +namespace M { >M : Symbol(M, Decl(decoratorOnClassMethod12.ts, 0, 0)) class S { ->S : Symbol(S, Decl(decoratorOnClassMethod12.ts, 0, 10)) +>S : Symbol(S, Decl(decoratorOnClassMethod12.ts, 0, 13)) decorator(target: Object, key: string): void { } >decorator : Symbol(S.decorator, Decl(decoratorOnClassMethod12.ts, 1, 13)) @@ -15,7 +15,7 @@ module M { } class C extends S { >C : Symbol(C, Decl(decoratorOnClassMethod12.ts, 3, 5)) ->S : Symbol(S, Decl(decoratorOnClassMethod12.ts, 0, 10)) +>S : Symbol(S, Decl(decoratorOnClassMethod12.ts, 0, 13)) @(super.decorator) method() { } diff --git a/tests/baselines/reference/decoratorOnClassMethod12.types b/tests/baselines/reference/decoratorOnClassMethod12.types index 1dfd20f51f030..8fcb02d1ad91b 100644 --- a/tests/baselines/reference/decoratorOnClassMethod12.types +++ b/tests/baselines/reference/decoratorOnClassMethod12.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/decorators/class/method/decoratorOnClassMethod12.ts] //// === decoratorOnClassMethod12.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/decoratorOnImportEquals1.errors.txt b/tests/baselines/reference/decoratorOnImportEquals1.errors.txt index c0c7249c7e4a0..d444b884c6ae2 100644 --- a/tests/baselines/reference/decoratorOnImportEquals1.errors.txt +++ b/tests/baselines/reference/decoratorOnImportEquals1.errors.txt @@ -4,11 +4,11 @@ decoratorOnImportEquals1.ts(8,5): error TS1206: Decorators are not valid here. ==== decoratorOnImportEquals1.ts (1 errors) ==== declare function dec(target: T): T; - module M1 { + namespace M1 { export var X: number; } - module M2 { + namespace M2 { @dec ~ !!! error TS1206: Decorators are not valid here. diff --git a/tests/baselines/reference/decoratorOnImportEquals1.js b/tests/baselines/reference/decoratorOnImportEquals1.js index 5d1dd0d00a3d6..f1ea1e8ea5b94 100644 --- a/tests/baselines/reference/decoratorOnImportEquals1.js +++ b/tests/baselines/reference/decoratorOnImportEquals1.js @@ -3,11 +3,11 @@ //// [decoratorOnImportEquals1.ts] declare function dec(target: T): T; -module M1 { +namespace M1 { export var X: number; } -module M2 { +namespace M2 { @dec import X = M1.X; } diff --git a/tests/baselines/reference/decoratorOnImportEquals1.symbols b/tests/baselines/reference/decoratorOnImportEquals1.symbols index 14212e79d1be1..08d5ab55224b7 100644 --- a/tests/baselines/reference/decoratorOnImportEquals1.symbols +++ b/tests/baselines/reference/decoratorOnImportEquals1.symbols @@ -8,21 +8,21 @@ declare function dec(target: T): T; >T : Symbol(T, Decl(decoratorOnImportEquals1.ts, 0, 21)) >T : Symbol(T, Decl(decoratorOnImportEquals1.ts, 0, 21)) -module M1 { +namespace M1 { >M1 : Symbol(M1, Decl(decoratorOnImportEquals1.ts, 0, 38)) export var X: number; >X : Symbol(X, Decl(decoratorOnImportEquals1.ts, 3, 14)) } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(decoratorOnImportEquals1.ts, 4, 1)) @dec >dec : Symbol(dec, Decl(decoratorOnImportEquals1.ts, 0, 0)) import X = M1.X; ->X : Symbol(X, Decl(decoratorOnImportEquals1.ts, 6, 11)) +>X : Symbol(X, Decl(decoratorOnImportEquals1.ts, 6, 14)) >M1 : Symbol(M1, Decl(decoratorOnImportEquals1.ts, 0, 38)) >X : Symbol(X, Decl(decoratorOnImportEquals1.ts, 3, 14)) } diff --git a/tests/baselines/reference/decoratorOnImportEquals1.types b/tests/baselines/reference/decoratorOnImportEquals1.types index c6aa9c5815502..6f700311a1784 100644 --- a/tests/baselines/reference/decoratorOnImportEquals1.types +++ b/tests/baselines/reference/decoratorOnImportEquals1.types @@ -7,7 +7,7 @@ declare function dec(target: T): T; >target : T > : ^ -module M1 { +namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ @@ -16,7 +16,7 @@ module M1 { > : ^^^^^^ } -module M2 { +namespace M2 { @dec >dec : (target: T) => T > : ^ ^^ ^^ ^^^^^ diff --git a/tests/baselines/reference/decoratorOnInternalModule.errors.txt b/tests/baselines/reference/decoratorOnInternalModule.errors.txt index f28d1870dfc1c..616b025437826 100644 --- a/tests/baselines/reference/decoratorOnInternalModule.errors.txt +++ b/tests/baselines/reference/decoratorOnInternalModule.errors.txt @@ -7,6 +7,6 @@ decoratorOnInternalModule.ts(3,1): error TS1206: Decorators are not valid here. @dec ~ !!! error TS1206: Decorators are not valid here. - module M { + namespace M { } \ No newline at end of file diff --git a/tests/baselines/reference/decoratorOnInternalModule.js b/tests/baselines/reference/decoratorOnInternalModule.js index d8e6dc941e8df..1c92c8ffa328f 100644 --- a/tests/baselines/reference/decoratorOnInternalModule.js +++ b/tests/baselines/reference/decoratorOnInternalModule.js @@ -4,7 +4,7 @@ declare function dec(target: T): T; @dec -module M { +namespace M { } diff --git a/tests/baselines/reference/decoratorOnInternalModule.symbols b/tests/baselines/reference/decoratorOnInternalModule.symbols index 02ac439ebb963..75647fade0ce2 100644 --- a/tests/baselines/reference/decoratorOnInternalModule.symbols +++ b/tests/baselines/reference/decoratorOnInternalModule.symbols @@ -11,7 +11,7 @@ declare function dec(target: T): T; @dec >dec : Symbol(dec, Decl(decoratorOnInternalModule.ts, 0, 0)) -module M { +namespace M { >M : Symbol(M, Decl(decoratorOnInternalModule.ts, 0, 38)) } diff --git a/tests/baselines/reference/decoratorOnInternalModule.types b/tests/baselines/reference/decoratorOnInternalModule.types index 97fa59782e1fd..cadded76e556e 100644 --- a/tests/baselines/reference/decoratorOnInternalModule.types +++ b/tests/baselines/reference/decoratorOnInternalModule.types @@ -11,6 +11,6 @@ declare function dec(target: T): T; >dec : (target: T) => T > : ^ ^^ ^^ ^^^^^ -module M { +namespace M { } diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherType.js b/tests/baselines/reference/decrementOperatorWithAnyOtherType.js index f5558fa10447a..9a27094a67e5b 100644 --- a/tests/baselines/reference/decrementOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/decrementOperatorWithAnyOtherType.js @@ -10,7 +10,7 @@ var obj = {x:1,y:null}; class A { public a: any; } -module M { +namespace M { export var n: any; } var objA = new A(); diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherType.symbols b/tests/baselines/reference/decrementOperatorWithAnyOtherType.symbols index 1571f2b5f8e2b..c424934e1e444 100644 --- a/tests/baselines/reference/decrementOperatorWithAnyOtherType.symbols +++ b/tests/baselines/reference/decrementOperatorWithAnyOtherType.symbols @@ -23,7 +23,7 @@ class A { public a: any; >a : Symbol(A.a, Decl(decrementOperatorWithAnyOtherType.ts, 6, 9)) } -module M { +namespace M { >M : Symbol(M, Decl(decrementOperatorWithAnyOtherType.ts, 8, 1)) export var n: any; diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherType.types b/tests/baselines/reference/decrementOperatorWithAnyOtherType.types index edaef29571fd5..2b038fd879da2 100644 --- a/tests/baselines/reference/decrementOperatorWithAnyOtherType.types +++ b/tests/baselines/reference/decrementOperatorWithAnyOtherType.types @@ -38,7 +38,7 @@ class A { public a: any; >a : any } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.errors.txt b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.errors.txt index a30ddc5d7ee10..dac2aad2c92fb 100644 --- a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.errors.txt +++ b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.errors.txt @@ -70,7 +70,7 @@ decrementOperatorWithAnyOtherTypeInvalidOperations.ts(72,12): error TS1109: Expr return a; } } - module M { + namespace M { export var n: any; } var objA = new A(); diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js index 0b9a55fc64dc4..15e149c778387 100644 --- a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js +++ b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js @@ -18,7 +18,7 @@ class A { return a; } } -module M { +namespace M { export var n: any; } var objA = new A(); diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.symbols b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.symbols index 634ded342db65..4315ba14cfa22 100644 --- a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.symbols +++ b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.symbols @@ -41,7 +41,7 @@ class A { >a : Symbol(a, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 13, 11)) } } -module M { +namespace M { >M : Symbol(M, Decl(decrementOperatorWithAnyOtherTypeInvalidOperations.ts, 16, 1)) export var n: any; diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.types b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.types index 91045f7d95009..c46452ebe4c16 100644 --- a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.types +++ b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.types @@ -67,7 +67,7 @@ class A { > : ^^^ } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/decrementOperatorWithNumberType.js b/tests/baselines/reference/decrementOperatorWithNumberType.js index 1ccccc2911df4..31978acf713fa 100644 --- a/tests/baselines/reference/decrementOperatorWithNumberType.js +++ b/tests/baselines/reference/decrementOperatorWithNumberType.js @@ -8,7 +8,7 @@ var NUMBER1: number[] = [1, 2]; class A { public a: number; } -module M { +namespace M { export var n: number; } diff --git a/tests/baselines/reference/decrementOperatorWithNumberType.symbols b/tests/baselines/reference/decrementOperatorWithNumberType.symbols index 45649e367740a..38bba2da65018 100644 --- a/tests/baselines/reference/decrementOperatorWithNumberType.symbols +++ b/tests/baselines/reference/decrementOperatorWithNumberType.symbols @@ -14,7 +14,7 @@ class A { public a: number; >a : Symbol(A.a, Decl(decrementOperatorWithNumberType.ts, 4, 9)) } -module M { +namespace M { >M : Symbol(M, Decl(decrementOperatorWithNumberType.ts, 6, 1)) export var n: number; diff --git a/tests/baselines/reference/decrementOperatorWithNumberType.types b/tests/baselines/reference/decrementOperatorWithNumberType.types index 9e62698d3db03..673736a9fc0d3 100644 --- a/tests/baselines/reference/decrementOperatorWithNumberType.types +++ b/tests/baselines/reference/decrementOperatorWithNumberType.types @@ -24,7 +24,7 @@ class A { >a : number > : ^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.errors.txt b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.errors.txt index 1949b2cc66745..212bcd2a5c2df 100644 --- a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.errors.txt +++ b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.errors.txt @@ -31,7 +31,7 @@ decrementOperatorWithNumberTypeInvalidOperations.ts(46,1): error TS2357: The ope public a: number; static foo() { return 1; } } - module M { + namespace M { export var n: number; } diff --git a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js index c9027e37b44a7..ed1a9c60e8128 100644 --- a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js +++ b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js @@ -11,7 +11,7 @@ class A { public a: number; static foo() { return 1; } } -module M { +namespace M { export var n: number; } diff --git a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.symbols b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.symbols index 461fa182779f4..bf6b7d623a648 100644 --- a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.symbols +++ b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.symbols @@ -20,7 +20,7 @@ class A { static foo() { return 1; } >foo : Symbol(A.foo, Decl(decrementOperatorWithNumberTypeInvalidOperations.ts, 7, 21)) } -module M { +namespace M { >M : Symbol(M, Decl(decrementOperatorWithNumberTypeInvalidOperations.ts, 9, 1)) export var n: number; diff --git a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.types b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.types index 211d6a628708c..dda36256f07f4 100644 --- a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.types +++ b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.types @@ -36,7 +36,7 @@ class A { >1 : 1 > : ^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.errors.txt b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.errors.txt index 6f2e25175c05e..b4ef56d81e586 100644 --- a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.errors.txt +++ b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.errors.txt @@ -39,7 +39,7 @@ decrementOperatorWithUnsupportedBooleanType.ts(54,11): error TS2356: An arithmet public a: boolean; static foo() { return true; } } - module M { + namespace M { export var n: boolean; } diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js index 1a27d6ee9bbb7..5e1d1cdf55bc7 100644 --- a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js +++ b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js @@ -10,7 +10,7 @@ class A { public a: boolean; static foo() { return true; } } -module M { +namespace M { export var n: boolean; } diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.symbols b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.symbols index 240684e70906d..cd777f813b651 100644 --- a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.symbols +++ b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.symbols @@ -17,7 +17,7 @@ class A { static foo() { return true; } >foo : Symbol(A.foo, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 6, 22)) } -module M { +namespace M { >M : Symbol(M, Decl(decrementOperatorWithUnsupportedBooleanType.ts, 8, 1)) export var n: boolean; diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.types b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.types index 717517ec636ab..bc878233a3f37 100644 --- a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.types +++ b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.types @@ -26,7 +26,7 @@ class A { >true : true > : ^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.errors.txt b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.errors.txt index acfb968b4085d..4af5b2599b8b4 100644 --- a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.errors.txt +++ b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.errors.txt @@ -50,7 +50,7 @@ decrementOperatorWithUnsupportedStringType.ts(65,11): error TS2356: An arithmeti public a: string; static foo() { return ""; } } - module M { + namespace M { export var n: string; } diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js index 070ed8b15b260..7f56d22342f74 100644 --- a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js +++ b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js @@ -11,7 +11,7 @@ class A { public a: string; static foo() { return ""; } } -module M { +namespace M { export var n: string; } diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.symbols b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.symbols index 737a4110b5f97..5ece05a621a89 100644 --- a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.symbols +++ b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.symbols @@ -20,7 +20,7 @@ class A { static foo() { return ""; } >foo : Symbol(A.foo, Decl(decrementOperatorWithUnsupportedStringType.ts, 7, 21)) } -module M { +namespace M { >M : Symbol(M, Decl(decrementOperatorWithUnsupportedStringType.ts, 9, 1)) export var n: string; diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.types b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.types index 980933beee7a5..feeea54376ef6 100644 --- a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.types +++ b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.types @@ -36,7 +36,7 @@ class A { >"" : "" > : ^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/defaultArgsInFunctionExpressions.errors.txt b/tests/baselines/reference/defaultArgsInFunctionExpressions.errors.txt index 3c2f0998ac2af..b13d583cfebae 100644 --- a/tests/baselines/reference/defaultArgsInFunctionExpressions.errors.txt +++ b/tests/baselines/reference/defaultArgsInFunctionExpressions.errors.txt @@ -48,8 +48,8 @@ defaultArgsInFunctionExpressions.ts(28,15): error TS2708: Cannot use namespace ' !!! error TS2352: Conversion of type 'string' to type 'number' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first. // Instantiated module - module T { } - module U { + namespace T { } + namespace U { export var x; } diff --git a/tests/baselines/reference/defaultArgsInFunctionExpressions.js b/tests/baselines/reference/defaultArgsInFunctionExpressions.js index c304a719d8cb0..8c4651a57311e 100644 --- a/tests/baselines/reference/defaultArgsInFunctionExpressions.js +++ b/tests/baselines/reference/defaultArgsInFunctionExpressions.js @@ -23,8 +23,8 @@ var f4: (a: number) => void = function (a = "") { }; var f5: (a: (s: string) => any) => void = function (a = s => s) { }; // Instantiated module -module T { } -module U { +namespace T { } +namespace U { export var x; } diff --git a/tests/baselines/reference/defaultArgsInFunctionExpressions.symbols b/tests/baselines/reference/defaultArgsInFunctionExpressions.symbols index 34adf9dd69abd..27edda98fb46c 100644 --- a/tests/baselines/reference/defaultArgsInFunctionExpressions.symbols +++ b/tests/baselines/reference/defaultArgsInFunctionExpressions.symbols @@ -64,11 +64,11 @@ var f5: (a: (s: string) => any) => void = function (a = s => s) { }; >s : Symbol(s, Decl(defaultArgsInFunctionExpressions.ts, 19, 55)) // Instantiated module -module T { } +namespace T { } >T : Symbol(T, Decl(defaultArgsInFunctionExpressions.ts, 19, 76)) -module U { ->U : Symbol(U, Decl(defaultArgsInFunctionExpressions.ts, 22, 12)) +namespace U { +>U : Symbol(U, Decl(defaultArgsInFunctionExpressions.ts, 22, 15)) export var x; >x : Symbol(x, Decl(defaultArgsInFunctionExpressions.ts, 24, 14)) @@ -81,7 +81,7 @@ var f6 = (t = T) => { }; var f7 = (t = U) => { return t; }; >f7 : Symbol(f7, Decl(defaultArgsInFunctionExpressions.ts, 28, 3)) >t : Symbol(t, Decl(defaultArgsInFunctionExpressions.ts, 28, 10)) ->U : Symbol(U, Decl(defaultArgsInFunctionExpressions.ts, 22, 12)) +>U : Symbol(U, Decl(defaultArgsInFunctionExpressions.ts, 22, 15)) >t : Symbol(t, Decl(defaultArgsInFunctionExpressions.ts, 28, 10)) f7().x; diff --git a/tests/baselines/reference/defaultArgsInFunctionExpressions.types b/tests/baselines/reference/defaultArgsInFunctionExpressions.types index 07a036eac06d7..947ec4b971d8c 100644 --- a/tests/baselines/reference/defaultArgsInFunctionExpressions.types +++ b/tests/baselines/reference/defaultArgsInFunctionExpressions.types @@ -152,8 +152,8 @@ var f5: (a: (s: string) => any) => void = function (a = s => s) { }; > : ^^^^^^ // Instantiated module -module T { } -module U { +namespace T { } +namespace U { >U : typeof U > : ^^^^^^^^ diff --git a/tests/baselines/reference/deleteOperatorWithAnyOtherType.errors.txt b/tests/baselines/reference/deleteOperatorWithAnyOtherType.errors.txt index 1a4f2b723b211..2bfa9fb37ce6f 100644 --- a/tests/baselines/reference/deleteOperatorWithAnyOtherType.errors.txt +++ b/tests/baselines/reference/deleteOperatorWithAnyOtherType.errors.txt @@ -44,7 +44,7 @@ deleteOperatorWithAnyOtherType.ts(57,8): error TS2703: The operand of a 'delete' return a; } } - module M { + namespace M { export var n: any; } var objA = new A(); diff --git a/tests/baselines/reference/deleteOperatorWithAnyOtherType.js b/tests/baselines/reference/deleteOperatorWithAnyOtherType.js index 830bce8feee30..558121f113dc8 100644 --- a/tests/baselines/reference/deleteOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/deleteOperatorWithAnyOtherType.js @@ -19,7 +19,7 @@ class A { return a; } } -module M { +namespace M { export var n: any; } var objA = new A(); diff --git a/tests/baselines/reference/deleteOperatorWithAnyOtherType.symbols b/tests/baselines/reference/deleteOperatorWithAnyOtherType.symbols index 16e723ca7a1f1..d76ad90cadfa9 100644 --- a/tests/baselines/reference/deleteOperatorWithAnyOtherType.symbols +++ b/tests/baselines/reference/deleteOperatorWithAnyOtherType.symbols @@ -45,7 +45,7 @@ class A { >a : Symbol(a, Decl(deleteOperatorWithAnyOtherType.ts, 14, 11)) } } -module M { +namespace M { >M : Symbol(M, Decl(deleteOperatorWithAnyOtherType.ts, 17, 1)) export var n: any; diff --git a/tests/baselines/reference/deleteOperatorWithAnyOtherType.types b/tests/baselines/reference/deleteOperatorWithAnyOtherType.types index 6ea3ba1c7bb45..aa521d6c4c79d 100644 --- a/tests/baselines/reference/deleteOperatorWithAnyOtherType.types +++ b/tests/baselines/reference/deleteOperatorWithAnyOtherType.types @@ -72,7 +72,7 @@ class A { > : ^^^ } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/deleteOperatorWithBooleanType.errors.txt b/tests/baselines/reference/deleteOperatorWithBooleanType.errors.txt index 63a0d427ded7d..f46de29b79ebf 100644 --- a/tests/baselines/reference/deleteOperatorWithBooleanType.errors.txt +++ b/tests/baselines/reference/deleteOperatorWithBooleanType.errors.txt @@ -21,7 +21,7 @@ deleteOperatorWithBooleanType.ts(36,8): error TS2703: The operand of a 'delete' public a: boolean; static foo() { return false; } } - module M { + namespace M { export var n: boolean; } diff --git a/tests/baselines/reference/deleteOperatorWithBooleanType.js b/tests/baselines/reference/deleteOperatorWithBooleanType.js index 0778e7c8e1b91..dc38d82c5d198 100644 --- a/tests/baselines/reference/deleteOperatorWithBooleanType.js +++ b/tests/baselines/reference/deleteOperatorWithBooleanType.js @@ -10,7 +10,7 @@ class A { public a: boolean; static foo() { return false; } } -module M { +namespace M { export var n: boolean; } diff --git a/tests/baselines/reference/deleteOperatorWithBooleanType.symbols b/tests/baselines/reference/deleteOperatorWithBooleanType.symbols index b6d4cd7fd2898..2e32bf4a01c60 100644 --- a/tests/baselines/reference/deleteOperatorWithBooleanType.symbols +++ b/tests/baselines/reference/deleteOperatorWithBooleanType.symbols @@ -17,7 +17,7 @@ class A { static foo() { return false; } >foo : Symbol(A.foo, Decl(deleteOperatorWithBooleanType.ts, 6, 22)) } -module M { +namespace M { >M : Symbol(M, Decl(deleteOperatorWithBooleanType.ts, 8, 1)) export var n: boolean; diff --git a/tests/baselines/reference/deleteOperatorWithBooleanType.types b/tests/baselines/reference/deleteOperatorWithBooleanType.types index 379e583d322b8..76a02dd23bf0b 100644 --- a/tests/baselines/reference/deleteOperatorWithBooleanType.types +++ b/tests/baselines/reference/deleteOperatorWithBooleanType.types @@ -26,7 +26,7 @@ class A { >false : false > : ^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/deleteOperatorWithNumberType.errors.txt b/tests/baselines/reference/deleteOperatorWithNumberType.errors.txt index 97094ff5839d4..204d920a189fd 100644 --- a/tests/baselines/reference/deleteOperatorWithNumberType.errors.txt +++ b/tests/baselines/reference/deleteOperatorWithNumberType.errors.txt @@ -28,7 +28,7 @@ deleteOperatorWithNumberType.ts(42,8): error TS2703: The operand of a 'delete' o public a: number; static foo() { return 1; } } - module M { + namespace M { export var n: number; } diff --git a/tests/baselines/reference/deleteOperatorWithNumberType.js b/tests/baselines/reference/deleteOperatorWithNumberType.js index e57ab8647be37..7968bf2208e89 100644 --- a/tests/baselines/reference/deleteOperatorWithNumberType.js +++ b/tests/baselines/reference/deleteOperatorWithNumberType.js @@ -11,7 +11,7 @@ class A { public a: number; static foo() { return 1; } } -module M { +namespace M { export var n: number; } diff --git a/tests/baselines/reference/deleteOperatorWithNumberType.symbols b/tests/baselines/reference/deleteOperatorWithNumberType.symbols index 534b1d9f2097f..9445b513fd68a 100644 --- a/tests/baselines/reference/deleteOperatorWithNumberType.symbols +++ b/tests/baselines/reference/deleteOperatorWithNumberType.symbols @@ -20,7 +20,7 @@ class A { static foo() { return 1; } >foo : Symbol(A.foo, Decl(deleteOperatorWithNumberType.ts, 7, 21)) } -module M { +namespace M { >M : Symbol(M, Decl(deleteOperatorWithNumberType.ts, 9, 1)) export var n: number; diff --git a/tests/baselines/reference/deleteOperatorWithNumberType.types b/tests/baselines/reference/deleteOperatorWithNumberType.types index a2379e7568dfe..4832c43be4713 100644 --- a/tests/baselines/reference/deleteOperatorWithNumberType.types +++ b/tests/baselines/reference/deleteOperatorWithNumberType.types @@ -36,7 +36,7 @@ class A { >1 : 1 > : ^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/deleteOperatorWithStringType.errors.txt b/tests/baselines/reference/deleteOperatorWithStringType.errors.txt index a872e8a070b99..02a6dee07181e 100644 --- a/tests/baselines/reference/deleteOperatorWithStringType.errors.txt +++ b/tests/baselines/reference/deleteOperatorWithStringType.errors.txt @@ -29,7 +29,7 @@ deleteOperatorWithStringType.ts(43,8): error TS2703: The operand of a 'delete' o public a: string; static foo() { return ""; } } - module M { + namespace M { export var n: string; } diff --git a/tests/baselines/reference/deleteOperatorWithStringType.js b/tests/baselines/reference/deleteOperatorWithStringType.js index f6f0c37c06b35..b77be424eb784 100644 --- a/tests/baselines/reference/deleteOperatorWithStringType.js +++ b/tests/baselines/reference/deleteOperatorWithStringType.js @@ -11,7 +11,7 @@ class A { public a: string; static foo() { return ""; } } -module M { +namespace M { export var n: string; } diff --git a/tests/baselines/reference/deleteOperatorWithStringType.symbols b/tests/baselines/reference/deleteOperatorWithStringType.symbols index 1f8f7366a8acb..5740ae6f151e6 100644 --- a/tests/baselines/reference/deleteOperatorWithStringType.symbols +++ b/tests/baselines/reference/deleteOperatorWithStringType.symbols @@ -20,7 +20,7 @@ class A { static foo() { return ""; } >foo : Symbol(A.foo, Decl(deleteOperatorWithStringType.ts, 7, 21)) } -module M { +namespace M { >M : Symbol(M, Decl(deleteOperatorWithStringType.ts, 9, 1)) export var n: string; diff --git a/tests/baselines/reference/deleteOperatorWithStringType.types b/tests/baselines/reference/deleteOperatorWithStringType.types index e9c54756f4410..b8eae1af69595 100644 --- a/tests/baselines/reference/deleteOperatorWithStringType.types +++ b/tests/baselines/reference/deleteOperatorWithStringType.types @@ -36,7 +36,7 @@ class A { >"" : "" > : ^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/differentTypesWithSameName.errors.txt b/tests/baselines/reference/differentTypesWithSameName.errors.txt index 6d55e14bc103e..e90f5194ed5ff 100644 --- a/tests/baselines/reference/differentTypesWithSameName.errors.txt +++ b/tests/baselines/reference/differentTypesWithSameName.errors.txt @@ -3,7 +3,7 @@ differentTypesWithSameName.ts(16,15): error TS2345: Argument of type 'variable' ==== differentTypesWithSameName.ts (1 errors) ==== - module m { + namespace m { export class variable{ s: string; } diff --git a/tests/baselines/reference/differentTypesWithSameName.js b/tests/baselines/reference/differentTypesWithSameName.js index e21af9010f929..1662e9c19324b 100644 --- a/tests/baselines/reference/differentTypesWithSameName.js +++ b/tests/baselines/reference/differentTypesWithSameName.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/differentTypesWithSameName.ts] //// //// [differentTypesWithSameName.ts] -module m { +namespace m { export class variable{ s: string; } diff --git a/tests/baselines/reference/differentTypesWithSameName.symbols b/tests/baselines/reference/differentTypesWithSameName.symbols index 4dd5f0b41786e..d64e4c9f3eeb2 100644 --- a/tests/baselines/reference/differentTypesWithSameName.symbols +++ b/tests/baselines/reference/differentTypesWithSameName.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/differentTypesWithSameName.ts] //// === differentTypesWithSameName.ts === -module m { +namespace m { >m : Symbol(m, Decl(differentTypesWithSameName.ts, 0, 0)) export class variable{ ->variable : Symbol(variable, Decl(differentTypesWithSameName.ts, 0, 10)) +>variable : Symbol(variable, Decl(differentTypesWithSameName.ts, 0, 13)) s: string; >s : Symbol(variable.s, Decl(differentTypesWithSameName.ts, 1, 24)) @@ -14,7 +14,7 @@ module m { >doSomething : Symbol(doSomething, Decl(differentTypesWithSameName.ts, 3, 3)) >v : Symbol(v, Decl(differentTypesWithSameName.ts, 4, 30)) >m : Symbol(m, Decl(differentTypesWithSameName.ts, 0, 0)) ->variable : Symbol(variable, Decl(differentTypesWithSameName.ts, 0, 10)) +>variable : Symbol(variable, Decl(differentTypesWithSameName.ts, 0, 13)) } } diff --git a/tests/baselines/reference/differentTypesWithSameName.types b/tests/baselines/reference/differentTypesWithSameName.types index 4c502a7fb5d68..57214e3f94ad4 100644 --- a/tests/baselines/reference/differentTypesWithSameName.types +++ b/tests/baselines/reference/differentTypesWithSameName.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/differentTypesWithSameName.ts] //// === differentTypesWithSameName.ts === -module m { +namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.errors.txt b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.errors.txt index 05981baf43cb6..42efe6eba7b2f 100644 --- a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.errors.txt +++ b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.errors.txt @@ -102,7 +102,7 @@ disallowLineTerminatorBeforeArrow.ts(72,9): error TS1200: Line terminator not pe ~~ !!! error TS1200: Line terminator not permitted before arrow. - module m { + namespace m { class City { constructor(x: number, thing = () => 100) { diff --git a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js index f3c3d0100357e..ac98e691914ae 100644 --- a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js +++ b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js @@ -56,7 +56,7 @@ foo(() foo(() => { return false; }); -module m { +namespace m { class City { constructor(x: number, thing = () => 100) { diff --git a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.symbols b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.symbols index 7b452c0e6fd0d..229e990abae35 100644 --- a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.symbols +++ b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.symbols @@ -136,11 +136,11 @@ foo(() => { return false; }); -module m { +namespace m { >m : Symbol(m, Decl(disallowLineTerminatorBeforeArrow.ts, 53, 26)) class City { ->City : Symbol(City, Decl(disallowLineTerminatorBeforeArrow.ts, 55, 10)) +>City : Symbol(City, Decl(disallowLineTerminatorBeforeArrow.ts, 55, 13)) constructor(x: number, thing = () >x : Symbol(x, Decl(disallowLineTerminatorBeforeArrow.ts, 57, 20)) @@ -169,7 +169,7 @@ module m { >x : Symbol(x, Decl(disallowLineTerminatorBeforeArrow.ts, 70, 18)) => new City(Enum.claw); ->City : Symbol(City, Decl(disallowLineTerminatorBeforeArrow.ts, 55, 10)) +>City : Symbol(City, Decl(disallowLineTerminatorBeforeArrow.ts, 55, 13)) >Enum.claw : Symbol(Enum.claw, Decl(disallowLineTerminatorBeforeArrow.ts, 65, 22)) >Enum : Symbol(Enum, Decl(disallowLineTerminatorBeforeArrow.ts, 63, 5)) >claw : Symbol(Enum.claw, Decl(disallowLineTerminatorBeforeArrow.ts, 65, 22)) diff --git a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.types b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.types index 10f7f1e8a1d59..aa8fabdeb1ff2 100644 --- a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.types +++ b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.types @@ -251,7 +251,7 @@ foo(() >false : false > : ^^^^^ -module m { +namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/dottedModuleName.errors.txt b/tests/baselines/reference/dottedModuleName.errors.txt index f60c698a5e20c..e7e724af3bed0 100644 --- a/tests/baselines/reference/dottedModuleName.errors.txt +++ b/tests/baselines/reference/dottedModuleName.errors.txt @@ -1,16 +1,25 @@ dottedModuleName.ts(3,29): error TS1144: '{' or ';' expected. dottedModuleName.ts(3,33): error TS2552: Cannot find name 'x'. Did you mean 'X'? +dottedModuleName.ts(4,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +dottedModuleName.ts(4,18): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +dottedModuleName.ts(4,20): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. -==== dottedModuleName.ts (2 errors) ==== - module M { - export module N { +==== dottedModuleName.ts (5 errors) ==== + namespace M { + export namespace N { export function f(x:number)=>2*x; ~~ !!! error TS1144: '{' or ';' expected. ~ !!! error TS2552: Cannot find name 'x'. Did you mean 'X'? export module X.Y.Z { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. export var v2=f(v); } } @@ -18,9 +27,9 @@ dottedModuleName.ts(3,33): error TS2552: Cannot find name 'x'. Did you mean 'X'? - module M.N { - export module X { - export module Y.Z { + namespace M.N { + export namespace X { + export namespace Y.Z { export var v=f(10); } } diff --git a/tests/baselines/reference/dottedModuleName.js b/tests/baselines/reference/dottedModuleName.js index d34e61f153247..03ed9af226f1f 100644 --- a/tests/baselines/reference/dottedModuleName.js +++ b/tests/baselines/reference/dottedModuleName.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/dottedModuleName.ts] //// //// [dottedModuleName.ts] -module M { - export module N { +namespace M { + export namespace N { export function f(x:number)=>2*x; export module X.Y.Z { export var v2=f(v); @@ -12,9 +12,9 @@ module M { -module M.N { - export module X { - export module Y.Z { +namespace M.N { + export namespace X { + export namespace Y.Z { export var v=f(10); } } diff --git a/tests/baselines/reference/dottedModuleName.symbols b/tests/baselines/reference/dottedModuleName.symbols index f35c1db75798e..4efbc1c69e198 100644 --- a/tests/baselines/reference/dottedModuleName.symbols +++ b/tests/baselines/reference/dottedModuleName.symbols @@ -1,24 +1,24 @@ //// [tests/cases/compiler/dottedModuleName.ts] //// === dottedModuleName.ts === -module M { +namespace M { >M : Symbol(M, Decl(dottedModuleName.ts, 0, 0), Decl(dottedModuleName.ts, 7, 1)) - export module N { ->N : Symbol(N, Decl(dottedModuleName.ts, 0, 10), Decl(dottedModuleName.ts, 11, 9)) + export namespace N { +>N : Symbol(N, Decl(dottedModuleName.ts, 0, 13), Decl(dottedModuleName.ts, 11, 12)) export function f(x:number)=>2*x; ->f : Symbol(f, Decl(dottedModuleName.ts, 1, 21)) +>f : Symbol(f, Decl(dottedModuleName.ts, 1, 24)) >x : Symbol(x, Decl(dottedModuleName.ts, 2, 19)) export module X.Y.Z { ->X : Symbol(X, Decl(dottedModuleName.ts, 2, 34), Decl(dottedModuleName.ts, 11, 12)) ->Y : Symbol(Y, Decl(dottedModuleName.ts, 3, 17), Decl(dottedModuleName.ts, 12, 21)) ->Z : Symbol(Z, Decl(dottedModuleName.ts, 3, 19), Decl(dottedModuleName.ts, 13, 17)) +>X : Symbol(X, Decl(dottedModuleName.ts, 2, 34), Decl(dottedModuleName.ts, 11, 15)) +>Y : Symbol(Y, Decl(dottedModuleName.ts, 3, 17), Decl(dottedModuleName.ts, 12, 24)) +>Z : Symbol(Z, Decl(dottedModuleName.ts, 3, 19), Decl(dottedModuleName.ts, 13, 20)) export var v2=f(v); >v2 : Symbol(v2, Decl(dottedModuleName.ts, 4, 15)) ->f : Symbol(f, Decl(dottedModuleName.ts, 1, 21)) +>f : Symbol(f, Decl(dottedModuleName.ts, 1, 24)) >v : Symbol(v, Decl(dottedModuleName.ts, 14, 15)) } } @@ -26,20 +26,20 @@ module M { -module M.N { +namespace M.N { >M : Symbol(M, Decl(dottedModuleName.ts, 0, 0), Decl(dottedModuleName.ts, 7, 1)) ->N : Symbol(N, Decl(dottedModuleName.ts, 0, 10), Decl(dottedModuleName.ts, 11, 9)) +>N : Symbol(N, Decl(dottedModuleName.ts, 0, 13), Decl(dottedModuleName.ts, 11, 12)) - export module X { ->X : Symbol(X, Decl(dottedModuleName.ts, 2, 34), Decl(dottedModuleName.ts, 11, 12)) + export namespace X { +>X : Symbol(X, Decl(dottedModuleName.ts, 2, 34), Decl(dottedModuleName.ts, 11, 15)) - export module Y.Z { ->Y : Symbol(Y, Decl(dottedModuleName.ts, 3, 17), Decl(dottedModuleName.ts, 12, 21)) ->Z : Symbol(Z, Decl(dottedModuleName.ts, 3, 19), Decl(dottedModuleName.ts, 13, 17)) + export namespace Y.Z { +>Y : Symbol(Y, Decl(dottedModuleName.ts, 3, 17), Decl(dottedModuleName.ts, 12, 24)) +>Z : Symbol(Z, Decl(dottedModuleName.ts, 3, 19), Decl(dottedModuleName.ts, 13, 20)) export var v=f(10); >v : Symbol(v, Decl(dottedModuleName.ts, 14, 15)) ->f : Symbol(f, Decl(dottedModuleName.ts, 1, 21)) +>f : Symbol(f, Decl(dottedModuleName.ts, 1, 24)) } } } diff --git a/tests/baselines/reference/dottedModuleName.types b/tests/baselines/reference/dottedModuleName.types index 29eb2fff71506..926001372b719 100644 --- a/tests/baselines/reference/dottedModuleName.types +++ b/tests/baselines/reference/dottedModuleName.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/dottedModuleName.ts] //// === dottedModuleName.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ - export module N { + export namespace N { >N : typeof N > : ^^^^^^^^ @@ -44,17 +44,17 @@ module M { -module M.N { +namespace M.N { >M : typeof M > : ^^^^^^^^ >N : typeof N > : ^^^^^^^^ - export module X { + export namespace X { >X : typeof X > : ^^^^^^^^ - export module Y.Z { + export namespace Y.Z { >Y : typeof Y > : ^^^^^^^^ >Z : typeof Z diff --git a/tests/baselines/reference/dottedModuleName2.js b/tests/baselines/reference/dottedModuleName2.js index e59a39e896eb8..65c4e4cccf4c5 100644 --- a/tests/baselines/reference/dottedModuleName2.js +++ b/tests/baselines/reference/dottedModuleName2.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/dottedModuleName2.ts] //// //// [dottedModuleName2.ts] -module A.B { +namespace A.B { export var x = 1; @@ -9,7 +9,7 @@ module A.B { -module AA { export module B { +namespace AA { export namespace B { export var x = 1; @@ -22,7 +22,7 @@ var tmpOK = AA.B.x; var tmpError = A.B.x; -module A.B.C +namespace A.B.C { @@ -32,7 +32,7 @@ module A.B.C -module M +namespace M { diff --git a/tests/baselines/reference/dottedModuleName2.symbols b/tests/baselines/reference/dottedModuleName2.symbols index e4543bf608549..2512b81402601 100644 --- a/tests/baselines/reference/dottedModuleName2.symbols +++ b/tests/baselines/reference/dottedModuleName2.symbols @@ -1,9 +1,9 @@ //// [tests/cases/compiler/dottedModuleName2.ts] //// === dottedModuleName2.ts === -module A.B { +namespace A.B { >A : Symbol(A, Decl(dottedModuleName2.ts, 0, 0), Decl(dottedModuleName2.ts, 18, 21)) ->B : Symbol(B, Decl(dottedModuleName2.ts, 0, 9), Decl(dottedModuleName2.ts, 21, 9)) +>B : Symbol(B, Decl(dottedModuleName2.ts, 0, 12), Decl(dottedModuleName2.ts, 21, 12)) export var x = 1; >x : Symbol(x, Decl(dottedModuleName2.ts, 2, 12)) @@ -12,9 +12,9 @@ module A.B { -module AA { export module B { +namespace AA { export namespace B { >AA : Symbol(AA, Decl(dottedModuleName2.ts, 4, 1)) ->B : Symbol(B, Decl(dottedModuleName2.ts, 8, 11)) +>B : Symbol(B, Decl(dottedModuleName2.ts, 8, 14)) export var x = 1; >x : Symbol(x, Decl(dottedModuleName2.ts, 10, 12)) @@ -26,24 +26,24 @@ module AA { export module B { var tmpOK = AA.B.x; >tmpOK : Symbol(tmpOK, Decl(dottedModuleName2.ts, 16, 3)) >AA.B.x : Symbol(AA.B.x, Decl(dottedModuleName2.ts, 10, 12)) ->AA.B : Symbol(AA.B, Decl(dottedModuleName2.ts, 8, 11)) +>AA.B : Symbol(AA.B, Decl(dottedModuleName2.ts, 8, 14)) >AA : Symbol(AA, Decl(dottedModuleName2.ts, 4, 1)) ->B : Symbol(AA.B, Decl(dottedModuleName2.ts, 8, 11)) +>B : Symbol(AA.B, Decl(dottedModuleName2.ts, 8, 14)) >x : Symbol(AA.B.x, Decl(dottedModuleName2.ts, 10, 12)) var tmpError = A.B.x; >tmpError : Symbol(tmpError, Decl(dottedModuleName2.ts, 18, 3)) >A.B.x : Symbol(A.B.x, Decl(dottedModuleName2.ts, 2, 12)) ->A.B : Symbol(A.B, Decl(dottedModuleName2.ts, 0, 9), Decl(dottedModuleName2.ts, 21, 9)) +>A.B : Symbol(A.B, Decl(dottedModuleName2.ts, 0, 12), Decl(dottedModuleName2.ts, 21, 12)) >A : Symbol(A, Decl(dottedModuleName2.ts, 0, 0), Decl(dottedModuleName2.ts, 18, 21)) ->B : Symbol(A.B, Decl(dottedModuleName2.ts, 0, 9), Decl(dottedModuleName2.ts, 21, 9)) +>B : Symbol(A.B, Decl(dottedModuleName2.ts, 0, 12), Decl(dottedModuleName2.ts, 21, 12)) >x : Symbol(A.B.x, Decl(dottedModuleName2.ts, 2, 12)) -module A.B.C +namespace A.B.C >A : Symbol(A, Decl(dottedModuleName2.ts, 0, 0), Decl(dottedModuleName2.ts, 18, 21)) ->B : Symbol(B, Decl(dottedModuleName2.ts, 0, 9), Decl(dottedModuleName2.ts, 21, 9)) ->C : Symbol(C, Decl(dottedModuleName2.ts, 21, 11)) +>B : Symbol(B, Decl(dottedModuleName2.ts, 0, 12), Decl(dottedModuleName2.ts, 21, 12)) +>C : Symbol(C, Decl(dottedModuleName2.ts, 21, 14)) { @@ -54,7 +54,7 @@ module A.B.C -module M +namespace M >M : Symbol(M, Decl(dottedModuleName2.ts, 27, 1)) { @@ -66,13 +66,13 @@ module M import X2 = A.B; >X2 : Symbol(X2, Decl(dottedModuleName2.ts, 35, 18)) >A : Symbol(X1, Decl(dottedModuleName2.ts, 0, 0), Decl(dottedModuleName2.ts, 18, 21)) ->B : Symbol(X1.B, Decl(dottedModuleName2.ts, 0, 9), Decl(dottedModuleName2.ts, 21, 9)) +>B : Symbol(X1.B, Decl(dottedModuleName2.ts, 0, 12), Decl(dottedModuleName2.ts, 21, 12)) import X3 = A.B.C; >X3 : Symbol(X3, Decl(dottedModuleName2.ts, 37, 20)) >A : Symbol(X1, Decl(dottedModuleName2.ts, 0, 0), Decl(dottedModuleName2.ts, 18, 21)) ->B : Symbol(X1.B, Decl(dottedModuleName2.ts, 0, 9), Decl(dottedModuleName2.ts, 21, 9)) ->C : Symbol(X2.C, Decl(dottedModuleName2.ts, 21, 11)) +>B : Symbol(X1.B, Decl(dottedModuleName2.ts, 0, 12), Decl(dottedModuleName2.ts, 21, 12)) +>C : Symbol(X2.C, Decl(dottedModuleName2.ts, 21, 14)) } diff --git a/tests/baselines/reference/dottedModuleName2.types b/tests/baselines/reference/dottedModuleName2.types index d29a01a5748a0..13430275a7181 100644 --- a/tests/baselines/reference/dottedModuleName2.types +++ b/tests/baselines/reference/dottedModuleName2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/dottedModuleName2.ts] //// === dottedModuleName2.ts === -module A.B { +namespace A.B { >A : typeof A > : ^^^^^^^^ >B : typeof B @@ -17,7 +17,7 @@ module A.B { -module AA { export module B { +namespace AA { export namespace B { >AA : typeof AA > : ^^^^^^^^^ >B : typeof B @@ -62,7 +62,7 @@ var tmpError = A.B.x; > : ^^^^^^ -module A.B.C +namespace A.B.C >A : typeof A > : ^^^^^^^^ >B : typeof B @@ -82,7 +82,7 @@ module A.B.C -module M +namespace M { diff --git a/tests/baselines/reference/downlevelLetConst13.js b/tests/baselines/reference/downlevelLetConst13.js index b0008b8fcb589..41595a46ac11a 100644 --- a/tests/baselines/reference/downlevelLetConst13.js +++ b/tests/baselines/reference/downlevelLetConst13.js @@ -11,7 +11,7 @@ export const [bar2] = [2]; export let {a: bar3} = { a: 1 }; export const {a: bar4} = { a: 1 }; -export module M { +export namespace M { export let baz = 100; export const baz2 = true; export let [bar5] = [1]; diff --git a/tests/baselines/reference/downlevelLetConst13.symbols b/tests/baselines/reference/downlevelLetConst13.symbols index 4f2a715622ce2..feff5dcd653cd 100644 --- a/tests/baselines/reference/downlevelLetConst13.symbols +++ b/tests/baselines/reference/downlevelLetConst13.symbols @@ -26,7 +26,7 @@ export const {a: bar4} = { a: 1 }; >bar4 : Symbol(bar4, Decl(downlevelLetConst13.ts, 8, 14)) >a : Symbol(a, Decl(downlevelLetConst13.ts, 8, 26)) -export module M { +export namespace M { >M : Symbol(M, Decl(downlevelLetConst13.ts, 8, 34)) export let baz = 100; diff --git a/tests/baselines/reference/downlevelLetConst13.types b/tests/baselines/reference/downlevelLetConst13.types index 8db9396d7dddd..40f20e82d2e07 100644 --- a/tests/baselines/reference/downlevelLetConst13.types +++ b/tests/baselines/reference/downlevelLetConst13.types @@ -59,7 +59,7 @@ export const {a: bar4} = { a: 1 }; >1 : 1 > : ^ -export module M { +export namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/downlevelLetConst16.errors.txt b/tests/baselines/reference/downlevelLetConst16.errors.txt index fe8ff968d7946..3e5267338045a 100644 --- a/tests/baselines/reference/downlevelLetConst16.errors.txt +++ b/tests/baselines/reference/downlevelLetConst16.errors.txt @@ -107,7 +107,7 @@ downlevelLetConst16.ts(223,17): error TS2339: Property 'a' does not exist on typ use(x); } - module M1 { + namespace M1 { let x = 1; use(x); let [y] = [1]; @@ -116,7 +116,7 @@ downlevelLetConst16.ts(223,17): error TS2339: Property 'a' does not exist on typ use(z); } - module M2 { + namespace M2 { { let x = 1; use(x); @@ -128,7 +128,7 @@ downlevelLetConst16.ts(223,17): error TS2339: Property 'a' does not exist on typ use(x); } - module M3 { + namespace M3 { const x = 1; use(x); const [y] = [1]; @@ -138,7 +138,7 @@ downlevelLetConst16.ts(223,17): error TS2339: Property 'a' does not exist on typ } - module M4 { + namespace M4 { { const x = 1; use(x); diff --git a/tests/baselines/reference/downlevelLetConst16.js b/tests/baselines/reference/downlevelLetConst16.js index e728e96ec3bf9..9da0b0f6412f2 100644 --- a/tests/baselines/reference/downlevelLetConst16.js +++ b/tests/baselines/reference/downlevelLetConst16.js @@ -101,7 +101,7 @@ function bar2() { use(x); } -module M1 { +namespace M1 { let x = 1; use(x); let [y] = [1]; @@ -110,7 +110,7 @@ module M1 { use(z); } -module M2 { +namespace M2 { { let x = 1; use(x); @@ -122,7 +122,7 @@ module M2 { use(x); } -module M3 { +namespace M3 { const x = 1; use(x); const [y] = [1]; @@ -132,7 +132,7 @@ module M3 { } -module M4 { +namespace M4 { { const x = 1; use(x); diff --git a/tests/baselines/reference/downlevelLetConst16.symbols b/tests/baselines/reference/downlevelLetConst16.symbols index 1e99ea1d78576..12377de81cd50 100644 --- a/tests/baselines/reference/downlevelLetConst16.symbols +++ b/tests/baselines/reference/downlevelLetConst16.symbols @@ -270,7 +270,7 @@ function bar2() { >x : Symbol(x, Decl(downlevelLetConst16.ts, 4, 3)) } -module M1 { +namespace M1 { >M1 : Symbol(M1, Decl(downlevelLetConst16.ts, 98, 1)) let x = 1; @@ -297,7 +297,7 @@ module M1 { >z : Symbol(z, Decl(downlevelLetConst16.ts, 105, 9)) } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(downlevelLetConst16.ts, 107, 1)) { let x = 1; @@ -328,7 +328,7 @@ module M2 { >x : Symbol(x, Decl(downlevelLetConst16.ts, 4, 3)) } -module M3 { +namespace M3 { >M3 : Symbol(M3, Decl(downlevelLetConst16.ts, 119, 1)) const x = 1; @@ -356,7 +356,7 @@ module M3 { } -module M4 { +namespace M4 { >M4 : Symbol(M4, Decl(downlevelLetConst16.ts, 129, 1)) { const x = 1; diff --git a/tests/baselines/reference/downlevelLetConst16.types b/tests/baselines/reference/downlevelLetConst16.types index fcf125771132f..95777611fb721 100644 --- a/tests/baselines/reference/downlevelLetConst16.types +++ b/tests/baselines/reference/downlevelLetConst16.types @@ -533,7 +533,7 @@ function bar2() { > : ^^^^^^ } -module M1 { +namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ @@ -588,7 +588,7 @@ module M1 { > : ^^^^^^ } -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ { @@ -651,7 +651,7 @@ module M2 { > : ^^^^^^ } -module M3 { +namespace M3 { >M3 : typeof M3 > : ^^^^^^^^^ @@ -707,7 +707,7 @@ module M3 { } -module M4 { +namespace M4 { >M4 : typeof M4 > : ^^^^^^^^^ { diff --git a/tests/baselines/reference/duplicateAnonymousInners1.js b/tests/baselines/reference/duplicateAnonymousInners1.js index 572641cc557da..5a77051b4a6a3 100644 --- a/tests/baselines/reference/duplicateAnonymousInners1.js +++ b/tests/baselines/reference/duplicateAnonymousInners1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/duplicateAnonymousInners1.ts] //// //// [duplicateAnonymousInners1.ts] -module Foo { +namespace Foo { class Helper { @@ -14,7 +14,7 @@ module Foo { } -module Foo { +namespace Foo { // Should not be an error class Helper { diff --git a/tests/baselines/reference/duplicateAnonymousInners1.symbols b/tests/baselines/reference/duplicateAnonymousInners1.symbols index 80deb473ac63f..664020249f3fc 100644 --- a/tests/baselines/reference/duplicateAnonymousInners1.symbols +++ b/tests/baselines/reference/duplicateAnonymousInners1.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/duplicateAnonymousInners1.ts] //// === duplicateAnonymousInners1.ts === -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(duplicateAnonymousInners1.ts, 0, 0), Decl(duplicateAnonymousInners1.ts, 10, 1)) class Helper { ->Helper : Symbol(Helper, Decl(duplicateAnonymousInners1.ts, 0, 12)) +>Helper : Symbol(Helper, Decl(duplicateAnonymousInners1.ts, 0, 15)) } @@ -19,12 +19,12 @@ module Foo { } -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(duplicateAnonymousInners1.ts, 0, 0), Decl(duplicateAnonymousInners1.ts, 10, 1)) // Should not be an error class Helper { ->Helper : Symbol(Helper, Decl(duplicateAnonymousInners1.ts, 13, 12)) +>Helper : Symbol(Helper, Decl(duplicateAnonymousInners1.ts, 13, 15)) } diff --git a/tests/baselines/reference/duplicateAnonymousInners1.types b/tests/baselines/reference/duplicateAnonymousInners1.types index 8f0a9df849c07..050510aea14c1 100644 --- a/tests/baselines/reference/duplicateAnonymousInners1.types +++ b/tests/baselines/reference/duplicateAnonymousInners1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/duplicateAnonymousInners1.ts] //// === duplicateAnonymousInners1.ts === -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ @@ -25,7 +25,7 @@ module Foo { } -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/duplicateAnonymousModuleClasses.js b/tests/baselines/reference/duplicateAnonymousModuleClasses.js index f64c2425ba1b3..9ac2bb0f4e091 100644 --- a/tests/baselines/reference/duplicateAnonymousModuleClasses.js +++ b/tests/baselines/reference/duplicateAnonymousModuleClasses.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/duplicateAnonymousModuleClasses.ts] //// //// [duplicateAnonymousModuleClasses.ts] -module F { +namespace F { class Helper { @@ -10,7 +10,7 @@ module F { } -module F { +namespace F { // Should not be an error class Helper { @@ -19,7 +19,7 @@ module F { } -module Foo { +namespace Foo { class Helper { @@ -28,7 +28,7 @@ module Foo { } -module Foo { +namespace Foo { // Should not be an error class Helper { @@ -37,8 +37,8 @@ module Foo { } -module Gar { - module Foo { +namespace Gar { + namespace Foo { class Helper { @@ -47,7 +47,7 @@ module Gar { } - module Foo { + namespace Foo { // Should not be an error class Helper { diff --git a/tests/baselines/reference/duplicateAnonymousModuleClasses.symbols b/tests/baselines/reference/duplicateAnonymousModuleClasses.symbols index 22f290010b22d..bcf1a0324e90b 100644 --- a/tests/baselines/reference/duplicateAnonymousModuleClasses.symbols +++ b/tests/baselines/reference/duplicateAnonymousModuleClasses.symbols @@ -1,70 +1,70 @@ //// [tests/cases/compiler/duplicateAnonymousModuleClasses.ts] //// === duplicateAnonymousModuleClasses.ts === -module F { +namespace F { >F : Symbol(F, Decl(duplicateAnonymousModuleClasses.ts, 0, 0), Decl(duplicateAnonymousModuleClasses.ts, 6, 1)) class Helper { ->Helper : Symbol(Helper, Decl(duplicateAnonymousModuleClasses.ts, 0, 10)) +>Helper : Symbol(Helper, Decl(duplicateAnonymousModuleClasses.ts, 0, 13)) } } -module F { +namespace F { >F : Symbol(F, Decl(duplicateAnonymousModuleClasses.ts, 0, 0), Decl(duplicateAnonymousModuleClasses.ts, 6, 1)) // Should not be an error class Helper { ->Helper : Symbol(Helper, Decl(duplicateAnonymousModuleClasses.ts, 9, 10)) +>Helper : Symbol(Helper, Decl(duplicateAnonymousModuleClasses.ts, 9, 13)) } } -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(duplicateAnonymousModuleClasses.ts, 16, 1), Decl(duplicateAnonymousModuleClasses.ts, 24, 1)) class Helper { ->Helper : Symbol(Helper, Decl(duplicateAnonymousModuleClasses.ts, 18, 12)) +>Helper : Symbol(Helper, Decl(duplicateAnonymousModuleClasses.ts, 18, 15)) } } -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(duplicateAnonymousModuleClasses.ts, 16, 1), Decl(duplicateAnonymousModuleClasses.ts, 24, 1)) // Should not be an error class Helper { ->Helper : Symbol(Helper, Decl(duplicateAnonymousModuleClasses.ts, 27, 12)) +>Helper : Symbol(Helper, Decl(duplicateAnonymousModuleClasses.ts, 27, 15)) } } -module Gar { +namespace Gar { >Gar : Symbol(Gar, Decl(duplicateAnonymousModuleClasses.ts, 34, 1)) - module Foo { ->Foo : Symbol(Foo, Decl(duplicateAnonymousModuleClasses.ts, 36, 12), Decl(duplicateAnonymousModuleClasses.ts, 43, 5)) + namespace Foo { +>Foo : Symbol(Foo, Decl(duplicateAnonymousModuleClasses.ts, 36, 15), Decl(duplicateAnonymousModuleClasses.ts, 43, 5)) class Helper { ->Helper : Symbol(Helper, Decl(duplicateAnonymousModuleClasses.ts, 37, 16)) +>Helper : Symbol(Helper, Decl(duplicateAnonymousModuleClasses.ts, 37, 19)) } } - module Foo { ->Foo : Symbol(Foo, Decl(duplicateAnonymousModuleClasses.ts, 36, 12), Decl(duplicateAnonymousModuleClasses.ts, 43, 5)) + namespace Foo { +>Foo : Symbol(Foo, Decl(duplicateAnonymousModuleClasses.ts, 36, 15), Decl(duplicateAnonymousModuleClasses.ts, 43, 5)) // Should not be an error class Helper { ->Helper : Symbol(Helper, Decl(duplicateAnonymousModuleClasses.ts, 46, 16)) +>Helper : Symbol(Helper, Decl(duplicateAnonymousModuleClasses.ts, 46, 19)) } diff --git a/tests/baselines/reference/duplicateAnonymousModuleClasses.types b/tests/baselines/reference/duplicateAnonymousModuleClasses.types index a7bf0a820b3e2..a8fbf166c563f 100644 --- a/tests/baselines/reference/duplicateAnonymousModuleClasses.types +++ b/tests/baselines/reference/duplicateAnonymousModuleClasses.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/duplicateAnonymousModuleClasses.ts] //// === duplicateAnonymousModuleClasses.ts === -module F { +namespace F { >F : typeof F > : ^^^^^^^^ @@ -14,7 +14,7 @@ module F { } -module F { +namespace F { >F : typeof F > : ^^^^^^^^ @@ -27,7 +27,7 @@ module F { } -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ @@ -40,7 +40,7 @@ module Foo { } -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ @@ -53,11 +53,11 @@ module Foo { } -module Gar { +namespace Gar { >Gar : typeof Gar > : ^^^^^^^^^^ - module Foo { + namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ @@ -70,7 +70,7 @@ module Gar { } - module Foo { + namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/duplicateExportAssignments.errors.txt b/tests/baselines/reference/duplicateExportAssignments.errors.txt index 8f056cc1de1a0..7bd4d4a5dd735 100644 --- a/tests/baselines/reference/duplicateExportAssignments.errors.txt +++ b/tests/baselines/reference/duplicateExportAssignments.errors.txt @@ -32,7 +32,7 @@ foo5.ts(6,10): error TS2300: Duplicate identifier 'export='. !!! error TS2300: Duplicate identifier 'export='. ==== foo3.ts (2 errors) ==== - module x { + namespace x { export var x = 10; } class y { diff --git a/tests/baselines/reference/duplicateExportAssignments.js b/tests/baselines/reference/duplicateExportAssignments.js index e33e86e59bc96..d80867b0b5fa9 100644 --- a/tests/baselines/reference/duplicateExportAssignments.js +++ b/tests/baselines/reference/duplicateExportAssignments.js @@ -13,7 +13,7 @@ export = x; export = y; //// [foo3.ts] -module x { +namespace x { export var x = 10; } class y { diff --git a/tests/baselines/reference/duplicateExportAssignments.symbols b/tests/baselines/reference/duplicateExportAssignments.symbols index d6def9421137a..4d7a3f971a639 100644 --- a/tests/baselines/reference/duplicateExportAssignments.symbols +++ b/tests/baselines/reference/duplicateExportAssignments.symbols @@ -27,7 +27,7 @@ export = y; >y : Symbol(y, Decl(foo2.ts, 0, 11)) === foo3.ts === -module x { +namespace x { >x : Symbol(x, Decl(foo3.ts, 0, 0)) export var x = 10; diff --git a/tests/baselines/reference/duplicateExportAssignments.types b/tests/baselines/reference/duplicateExportAssignments.types index 67d3bfa9d743c..9e44459f3a4f1 100644 --- a/tests/baselines/reference/duplicateExportAssignments.types +++ b/tests/baselines/reference/duplicateExportAssignments.types @@ -41,7 +41,7 @@ export = y; > : ^ === foo3.ts === -module x { +namespace x { >x : typeof import("foo3") > : ^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.errors.txt b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.errors.txt index f3b0a7b9c194d..fba1ab1b48ce7 100644 --- a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.errors.txt +++ b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.errors.txt @@ -5,44 +5,44 @@ duplicateIdentifiersAcrossContainerBoundaries.ts(41,16): error TS2300: Duplicate ==== duplicateIdentifiersAcrossContainerBoundaries.ts (4 errors) ==== - module M { + namespace M { export interface I { } } - module M { + namespace M { export class I { } } - module M { + namespace M { export function f() { } ~ !!! error TS2814: Function with bodies can only merge with classes that are ambient. !!! related TS6506 duplicateIdentifiersAcrossContainerBoundaries.ts:12:18: Consider adding a 'declare' modifier to this class. } - module M { + namespace M { export class f { } // error ~ !!! error TS2813: Class declaration cannot implement overload list for 'f'. !!! related TS6506 duplicateIdentifiersAcrossContainerBoundaries.ts:12:18: Consider adding a 'declare' modifier to this class. } - module M { + namespace M { function g() { } } - module M { + namespace M { export class g { } // no error } - module M { + namespace M { export class C { } } - module M { + namespace M { function C() { } // no error } - module M { + namespace M { export var v = 3; } - module M { + namespace M { export var v = 3; // error for redeclaring var in a different parent } @@ -52,18 +52,18 @@ duplicateIdentifiersAcrossContainerBoundaries.ts(41,16): error TS2300: Duplicate !!! error TS2300: Duplicate identifier 'x'. } - module Foo { + namespace Foo { export var x: number; // error for redeclaring var in a different parent ~ !!! error TS2300: Duplicate identifier 'x'. } - module N { - export module F { + namespace N { + export namespace F { var t; } } - declare module N { + declare namespace N { export function F(); // no error because function is ambient } \ No newline at end of file diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js index 1d47296bba963..283907af8ccff 100644 --- a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js +++ b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js @@ -1,38 +1,38 @@ //// [tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts] //// //// [duplicateIdentifiersAcrossContainerBoundaries.ts] -module M { +namespace M { export interface I { } } -module M { +namespace M { export class I { } } -module M { +namespace M { export function f() { } } -module M { +namespace M { export class f { } // error } -module M { +namespace M { function g() { } } -module M { +namespace M { export class g { } // no error } -module M { +namespace M { export class C { } } -module M { +namespace M { function C() { } // no error } -module M { +namespace M { export var v = 3; } -module M { +namespace M { export var v = 3; // error for redeclaring var in a different parent } @@ -40,16 +40,16 @@ class Foo { static x: number; } -module Foo { +namespace Foo { export var x: number; // error for redeclaring var in a different parent } -module N { - export module F { +namespace N { + export namespace F { var t; } } -declare module N { +declare namespace N { export function F(); // no error because function is ambient } diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.symbols b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.symbols index 16f9a8791d0df..df243aa1636bc 100644 --- a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.symbols +++ b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.symbols @@ -1,65 +1,65 @@ //// [tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts] //// === duplicateIdentifiersAcrossContainerBoundaries.ts === -module M { +namespace M { >M : Symbol(M, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 0, 0), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 2, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 5, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 9, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 12, 1) ... and 5 more) export interface I { } ->I : Symbol(I, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 0, 10), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 3, 10)) +>I : Symbol(I, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 0, 13), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 3, 13)) } -module M { +namespace M { >M : Symbol(M, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 0, 0), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 2, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 5, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 9, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 12, 1) ... and 5 more) export class I { } ->I : Symbol(I, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 0, 10), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 3, 10)) +>I : Symbol(I, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 0, 13), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 3, 13)) } -module M { +namespace M { >M : Symbol(M, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 0, 0), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 2, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 5, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 9, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 12, 1) ... and 5 more) export function f() { } ->f : Symbol(f, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 7, 10), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 10, 10)) +>f : Symbol(f, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 7, 13), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 10, 13)) } -module M { +namespace M { >M : Symbol(M, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 0, 0), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 2, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 5, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 9, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 12, 1) ... and 5 more) export class f { } // error ->f : Symbol(f, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 7, 10), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 10, 10)) +>f : Symbol(f, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 7, 13), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 10, 13)) } -module M { +namespace M { >M : Symbol(M, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 0, 0), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 2, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 5, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 9, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 12, 1) ... and 5 more) function g() { } ->g : Symbol(g, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 14, 10)) +>g : Symbol(g, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 14, 13)) } -module M { +namespace M { >M : Symbol(M, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 0, 0), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 2, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 5, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 9, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 12, 1) ... and 5 more) export class g { } // no error ->g : Symbol(g, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 17, 10)) +>g : Symbol(g, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 17, 13)) } -module M { +namespace M { >M : Symbol(M, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 0, 0), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 2, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 5, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 9, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 12, 1) ... and 5 more) export class C { } ->C : Symbol(C, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 21, 10)) +>C : Symbol(C, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 21, 13)) } -module M { +namespace M { >M : Symbol(M, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 0, 0), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 2, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 5, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 9, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 12, 1) ... and 5 more) function C() { } // no error ->C : Symbol(C, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 24, 10)) +>C : Symbol(C, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 24, 13)) } -module M { +namespace M { >M : Symbol(M, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 0, 0), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 2, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 5, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 9, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 12, 1) ... and 5 more) export var v = 3; >v : Symbol(v, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 29, 14), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 32, 14)) } -module M { +namespace M { >M : Symbol(M, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 0, 0), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 2, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 5, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 9, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 12, 1) ... and 5 more) export var v = 3; // error for redeclaring var in a different parent @@ -73,27 +73,27 @@ class Foo { >x : Symbol(Foo.x, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 35, 11)) } -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 33, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 37, 1)) export var x: number; // error for redeclaring var in a different parent >x : Symbol(x, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 40, 14)) } -module N { +namespace N { >N : Symbol(N, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 41, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 47, 1)) - export module F { ->F : Symbol(F, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 43, 10), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 48, 18)) + export namespace F { +>F : Symbol(F, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 43, 13), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 48, 21)) var t; >t : Symbol(t, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 45, 11)) } } -declare module N { +declare namespace N { >N : Symbol(N, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 41, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 47, 1)) export function F(); // no error because function is ambient ->F : Symbol(F, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 43, 10), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 48, 18)) +>F : Symbol(F, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 43, 13), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 48, 21)) } diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.types b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.types index 903dc85288717..18e2d33d6633b 100644 --- a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.types +++ b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.types @@ -1,10 +1,10 @@ //// [tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts] //// === duplicateIdentifiersAcrossContainerBoundaries.ts === -module M { +namespace M { export interface I { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -13,7 +13,7 @@ module M { > : ^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -21,7 +21,7 @@ module M { >f : typeof f > : ^^^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -30,7 +30,7 @@ module M { > : ^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -38,7 +38,7 @@ module M { >g : () => void > : ^^^^^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -47,7 +47,7 @@ module M { > : ^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -55,7 +55,7 @@ module M { >C : C > : ^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -64,7 +64,7 @@ module M { > : ^^^^^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -74,7 +74,7 @@ module M { >3 : 3 > : ^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -94,7 +94,7 @@ class Foo { > : ^^^^^^ } -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ @@ -103,11 +103,11 @@ module Foo { > : ^^^^^^ } -module N { +namespace N { >N : typeof N > : ^^^^^^^^ - export module F { + export namespace F { >F : typeof F > : ^^^^^^^^ @@ -116,7 +116,7 @@ module N { > : ^^^ } } -declare module N { +declare namespace N { >N : typeof N > : ^^^^^^^^ diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.errors.txt b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.errors.txt index 808860e9fefe8..7c703c1c7ea4f 100644 --- a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.errors.txt +++ b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.errors.txt @@ -3,7 +3,7 @@ file1.ts(4,10): error TS2814: Function with bodies can only merge with classes t file1.ts(8,12): error TS2300: Duplicate identifier 'x'. file2.ts(3,10): error TS2814: Function with bodies can only merge with classes that are ambient. file2.ts(4,7): error TS2813: Class declaration cannot implement overload list for 'f'. -file2.ts(7,8): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged. +file2.ts(7,11): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged. file2.ts(8,16): error TS2300: Duplicate identifier 'x'. @@ -27,8 +27,8 @@ file2.ts(8,16): error TS2300: Duplicate identifier 'x'. !!! related TS6203 file2.ts:8:16: 'x' was also declared here. } - module N { - export module F { + namespace N { + export namespace F { var t; } } @@ -46,8 +46,8 @@ file2.ts(8,16): error TS2300: Duplicate identifier 'x'. !!! related TS6506 file2.ts:4:7: Consider adding a 'declare' modifier to this class. var v = 3; - module Foo { - ~~~ + namespace Foo { + ~~~ !!! error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged. export var x: number; // error for redeclaring var in a different parent ~ @@ -55,7 +55,7 @@ file2.ts(8,16): error TS2300: Duplicate identifier 'x'. !!! related TS6203 file1.ts:8:12: 'x' was also declared here. } - declare module N { + declare namespace N { export function F(); // no error because function is ambient } \ No newline at end of file diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js index bc718c83f040f..6a0efdc220ef0 100644 --- a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js +++ b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js @@ -11,8 +11,8 @@ class Foo { static x: number; } -module N { - export module F { +namespace N { + export namespace F { var t; } } @@ -24,11 +24,11 @@ function C2() { } // error -- cannot merge function with non-ambient class class f { } // error -- cannot merge function with non-ambient class var v = 3; -module Foo { +namespace Foo { export var x: number; // error for redeclaring var in a different parent } -declare module N { +declare namespace N { export function F(); // no error because function is ambient } diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.symbols b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.symbols index ff53fa13f0148..873482354b489 100644 --- a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.symbols +++ b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.symbols @@ -23,11 +23,11 @@ class Foo { >x : Symbol(Foo.x, Decl(file1.ts, 6, 11)) } -module N { +namespace N { >N : Symbol(N, Decl(file1.ts, 8, 1), Decl(file2.ts, 8, 1)) - export module F { ->F : Symbol(F, Decl(file1.ts, 10, 10), Decl(file2.ts, 10, 18)) + export namespace F { +>F : Symbol(F, Decl(file1.ts, 10, 13), Decl(file2.ts, 10, 21)) var t; >t : Symbol(t, Decl(file1.ts, 12, 11)) @@ -50,17 +50,17 @@ class f { } // error -- cannot merge function with non-ambient class var v = 3; >v : Symbol(v, Decl(file1.ts, 4, 3), Decl(file2.ts, 4, 3)) -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(file1.ts, 4, 10), Decl(file2.ts, 4, 10)) export var x: number; // error for redeclaring var in a different parent >x : Symbol(x, Decl(file2.ts, 7, 14)) } -declare module N { +declare namespace N { >N : Symbol(N, Decl(file1.ts, 8, 1), Decl(file2.ts, 8, 1)) export function F(); // no error because function is ambient ->F : Symbol(F, Decl(file1.ts, 10, 10), Decl(file2.ts, 10, 18)) +>F : Symbol(F, Decl(file1.ts, 10, 13), Decl(file2.ts, 10, 21)) } diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.types b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.types index 504e1b6a4f4c8..e6f9b7dc101b9 100644 --- a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.types +++ b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.types @@ -29,11 +29,11 @@ class Foo { > : ^^^^^^ } -module N { +namespace N { >N : typeof N > : ^^^^^^^^ - export module F { + export namespace F { >F : typeof F > : ^^^^^^^^ @@ -63,7 +63,7 @@ var v = 3; >3 : 3 > : ^ -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ @@ -72,7 +72,7 @@ module Foo { > : ^^^^^^ } -declare module N { +declare namespace N { >N : typeof N > : ^^^^^^^^ diff --git a/tests/baselines/reference/duplicateStringIndexers.errors.txt b/tests/baselines/reference/duplicateStringIndexers.errors.txt index 5761f7411b53c..e5200403507ae 100644 --- a/tests/baselines/reference/duplicateStringIndexers.errors.txt +++ b/tests/baselines/reference/duplicateStringIndexers.errors.txt @@ -15,7 +15,7 @@ duplicateStringIndexers.ts(31,9): error TS2374: Duplicate index signature for ty ==== duplicateStringIndexers.ts (12 errors) ==== // it is an error to have duplicate index signatures of the same kind in a type - module test { + namespace test { interface Number { [x: string]: string; ~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/baselines/reference/duplicateStringIndexers.js b/tests/baselines/reference/duplicateStringIndexers.js index 303f50737ce3a..a36899e2b87b7 100644 --- a/tests/baselines/reference/duplicateStringIndexers.js +++ b/tests/baselines/reference/duplicateStringIndexers.js @@ -3,7 +3,7 @@ //// [duplicateStringIndexers.ts] // it is an error to have duplicate index signatures of the same kind in a type -module test { +namespace test { interface Number { [x: string]: string; [x: string]: string; diff --git a/tests/baselines/reference/duplicateStringIndexers.symbols b/tests/baselines/reference/duplicateStringIndexers.symbols index 53a4453d3b12b..8087374a25616 100644 --- a/tests/baselines/reference/duplicateStringIndexers.symbols +++ b/tests/baselines/reference/duplicateStringIndexers.symbols @@ -3,11 +3,11 @@ === duplicateStringIndexers.ts === // it is an error to have duplicate index signatures of the same kind in a type -module test { +namespace test { >test : Symbol(test, Decl(duplicateStringIndexers.ts, 0, 0)) interface Number { ->Number : Symbol(Number, Decl(duplicateStringIndexers.ts, 2, 13)) +>Number : Symbol(Number, Decl(duplicateStringIndexers.ts, 2, 16)) [x: string]: string; >x : Symbol(x, Decl(duplicateStringIndexers.ts, 4, 9)) diff --git a/tests/baselines/reference/duplicateStringIndexers.types b/tests/baselines/reference/duplicateStringIndexers.types index dc61bcd0294ba..fd658855045f0 100644 --- a/tests/baselines/reference/duplicateStringIndexers.types +++ b/tests/baselines/reference/duplicateStringIndexers.types @@ -3,7 +3,7 @@ === duplicateStringIndexers.ts === // it is an error to have duplicate index signatures of the same kind in a type -module test { +namespace test { >test : typeof test > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.errors.txt b/tests/baselines/reference/duplicateSymbolsExportMatching.errors.txt index d08a3313c2047..188c7da0fc336 100644 --- a/tests/baselines/reference/duplicateSymbolsExportMatching.errors.txt +++ b/tests/baselines/reference/duplicateSymbolsExportMatching.errors.txt @@ -2,46 +2,46 @@ duplicateSymbolsExportMatching.ts(24,15): error TS2395: Individual declarations duplicateSymbolsExportMatching.ts(25,22): error TS2395: Individual declarations in merged declaration 'I' must be all exported or all local. duplicateSymbolsExportMatching.ts(26,22): error TS2395: Individual declarations in merged declaration 'E' must be all exported or all local. duplicateSymbolsExportMatching.ts(27,15): error TS2395: Individual declarations in merged declaration 'E' must be all exported or all local. -duplicateSymbolsExportMatching.ts(32,12): error TS2395: Individual declarations in merged declaration 'inst' must be all exported or all local. -duplicateSymbolsExportMatching.ts(35,19): error TS2395: Individual declarations in merged declaration 'inst' must be all exported or all local. +duplicateSymbolsExportMatching.ts(32,15): error TS2395: Individual declarations in merged declaration 'inst' must be all exported or all local. +duplicateSymbolsExportMatching.ts(35,22): error TS2395: Individual declarations in merged declaration 'inst' must be all exported or all local. duplicateSymbolsExportMatching.ts(42,9): error TS2395: Individual declarations in merged declaration 'v' must be all exported or all local. duplicateSymbolsExportMatching.ts(43,16): error TS2395: Individual declarations in merged declaration 'v' must be all exported or all local. duplicateSymbolsExportMatching.ts(44,9): error TS2395: Individual declarations in merged declaration 'w' must be all exported or all local. duplicateSymbolsExportMatching.ts(45,16): error TS2395: Individual declarations in merged declaration 'w' must be all exported or all local. -duplicateSymbolsExportMatching.ts(49,12): error TS2395: Individual declarations in merged declaration 'F' must be all exported or all local. -duplicateSymbolsExportMatching.ts(49,12): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. +duplicateSymbolsExportMatching.ts(49,15): error TS2395: Individual declarations in merged declaration 'F' must be all exported or all local. +duplicateSymbolsExportMatching.ts(49,15): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. duplicateSymbolsExportMatching.ts(52,21): error TS2395: Individual declarations in merged declaration 'F' must be all exported or all local. duplicateSymbolsExportMatching.ts(56,11): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local. -duplicateSymbolsExportMatching.ts(57,12): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local. -duplicateSymbolsExportMatching.ts(58,19): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local. +duplicateSymbolsExportMatching.ts(57,15): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local. +duplicateSymbolsExportMatching.ts(58,22): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local. duplicateSymbolsExportMatching.ts(64,11): error TS2395: Individual declarations in merged declaration 'D' must be all exported or all local. duplicateSymbolsExportMatching.ts(65,18): error TS2395: Individual declarations in merged declaration 'D' must be all exported or all local. ==== duplicateSymbolsExportMatching.ts (18 errors) ==== - module M { + namespace M { export interface E { } interface I { } } - module M { + namespace M { export interface E { } // ok interface I { } // ok } // Doesn't match export visibility, but it's in a different parent, so it's ok - module M { + namespace M { interface E { } // ok export interface I { } // ok } - module N { + namespace N { interface I { } interface I { } // ok export interface E { } export interface E { } // ok } - module N2 { + namespace N2 { interface I { } ~ !!! error TS2395: Individual declarations in merged declaration 'I' must be all exported or all local. @@ -57,21 +57,21 @@ duplicateSymbolsExportMatching.ts(65,18): error TS2395: Individual declarations } // Should report error only once for instantiated module - module M { - module inst { - ~~~~ + namespace M { + namespace inst { + ~~~~ !!! error TS2395: Individual declarations in merged declaration 'inst' must be all exported or all local. var t; } - export module inst { // one error - ~~~~ + export namespace inst { // one error + ~~~~ !!! error TS2395: Individual declarations in merged declaration 'inst' must be all exported or all local. var t; } } // Variables of the same / different type - module M2 { + namespace M2 { var v: string; ~ !!! error TS2395: Individual declarations in merged declaration 'v' must be all exported or all local. @@ -86,11 +86,11 @@ duplicateSymbolsExportMatching.ts(65,18): error TS2395: Individual declarations !!! error TS2395: Individual declarations in merged declaration 'w' must be all exported or all local. } - module M { - module F { - ~ + namespace M { + namespace F { + ~ !!! error TS2395: Individual declarations in merged declaration 'F' must be all exported or all local. - ~ + ~ !!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. var t; } @@ -99,15 +99,15 @@ duplicateSymbolsExportMatching.ts(65,18): error TS2395: Individual declarations !!! error TS2395: Individual declarations in merged declaration 'F' must be all exported or all local. } - module M { + namespace M { class C { } ~ !!! error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local. - module C { } - ~ + namespace C { } + ~ !!! error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local. - export module C { // Two visibility errors (one for the clodule symbol, and one for the merged container symbol) - ~ + export namespace C { // Two visibility errors (one for the clodule symbol, and one for the merged container symbol) + ~ !!! error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local. var t; } diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.js b/tests/baselines/reference/duplicateSymbolsExportMatching.js index 5d6cbf7c9ef6d..745f78bff88a2 100644 --- a/tests/baselines/reference/duplicateSymbolsExportMatching.js +++ b/tests/baselines/reference/duplicateSymbolsExportMatching.js @@ -1,29 +1,29 @@ //// [tests/cases/compiler/duplicateSymbolsExportMatching.ts] //// //// [duplicateSymbolsExportMatching.ts] -module M { +namespace M { export interface E { } interface I { } } -module M { +namespace M { export interface E { } // ok interface I { } // ok } // Doesn't match export visibility, but it's in a different parent, so it's ok -module M { +namespace M { interface E { } // ok export interface I { } // ok } -module N { +namespace N { interface I { } interface I { } // ok export interface E { } export interface E { } // ok } -module N2 { +namespace N2 { interface I { } export interface I { } // error export interface E { } @@ -31,34 +31,34 @@ module N2 { } // Should report error only once for instantiated module -module M { - module inst { +namespace M { + namespace inst { var t; } - export module inst { // one error + export namespace inst { // one error var t; } } // Variables of the same / different type -module M2 { +namespace M2 { var v: string; export var v: string; // one error (visibility) var w: number; export var w: string; // two errors (visibility and type mismatch) } -module M { - module F { +namespace M { + namespace F { var t; } export function F() { } // Only one error for duplicate identifier (don't consider visibility) } -module M { +namespace M { class C { } - module C { } - export module C { // Two visibility errors (one for the clodule symbol, and one for the merged container symbol) + namespace C { } + export namespace C { // Two visibility errors (one for the clodule symbol, and one for the merged container symbol) var t; } } diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.symbols b/tests/baselines/reference/duplicateSymbolsExportMatching.symbols index 25e855e4ac89b..cb1b779f60f1f 100644 --- a/tests/baselines/reference/duplicateSymbolsExportMatching.symbols +++ b/tests/baselines/reference/duplicateSymbolsExportMatching.symbols @@ -1,44 +1,44 @@ //// [tests/cases/compiler/duplicateSymbolsExportMatching.ts] //// === duplicateSymbolsExportMatching.ts === -module M { +namespace M { >M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 3, 1), Decl(duplicateSymbolsExportMatching.ts, 7, 1), Decl(duplicateSymbolsExportMatching.ts, 27, 1), Decl(duplicateSymbolsExportMatching.ts, 45, 1) ... and 1 more) export interface E { } ->E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 0, 10), Decl(duplicateSymbolsExportMatching.ts, 4, 10)) +>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 0, 13), Decl(duplicateSymbolsExportMatching.ts, 4, 13)) interface I { } >I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 1, 26)) } -module M { +namespace M { >M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 3, 1), Decl(duplicateSymbolsExportMatching.ts, 7, 1), Decl(duplicateSymbolsExportMatching.ts, 27, 1), Decl(duplicateSymbolsExportMatching.ts, 45, 1) ... and 1 more) export interface E { } // ok ->E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 0, 10), Decl(duplicateSymbolsExportMatching.ts, 4, 10)) +>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 0, 13), Decl(duplicateSymbolsExportMatching.ts, 4, 13)) interface I { } // ok >I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 5, 26)) } // Doesn't match export visibility, but it's in a different parent, so it's ok -module M { +namespace M { >M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 3, 1), Decl(duplicateSymbolsExportMatching.ts, 7, 1), Decl(duplicateSymbolsExportMatching.ts, 27, 1), Decl(duplicateSymbolsExportMatching.ts, 45, 1) ... and 1 more) interface E { } // ok ->E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 10, 10)) +>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 10, 13)) export interface I { } // ok >I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 11, 19)) } -module N { +namespace N { >N : Symbol(N, Decl(duplicateSymbolsExportMatching.ts, 13, 1)) interface I { } ->I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 15, 10), Decl(duplicateSymbolsExportMatching.ts, 16, 19)) +>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 15, 13), Decl(duplicateSymbolsExportMatching.ts, 16, 19)) interface I { } // ok ->I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 15, 10), Decl(duplicateSymbolsExportMatching.ts, 16, 19)) +>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 15, 13), Decl(duplicateSymbolsExportMatching.ts, 16, 19)) export interface E { } >E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 17, 19), Decl(duplicateSymbolsExportMatching.ts, 18, 26)) @@ -47,11 +47,11 @@ module N { >E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 17, 19), Decl(duplicateSymbolsExportMatching.ts, 18, 26)) } -module N2 { +namespace N2 { >N2 : Symbol(N2, Decl(duplicateSymbolsExportMatching.ts, 20, 1)) interface I { } ->I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 22, 11), Decl(duplicateSymbolsExportMatching.ts, 23, 19)) +>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 22, 14), Decl(duplicateSymbolsExportMatching.ts, 23, 19)) export interface I { } // error >I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 23, 19)) @@ -64,16 +64,16 @@ module N2 { } // Should report error only once for instantiated module -module M { +namespace M { >M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 3, 1), Decl(duplicateSymbolsExportMatching.ts, 7, 1), Decl(duplicateSymbolsExportMatching.ts, 27, 1), Decl(duplicateSymbolsExportMatching.ts, 45, 1) ... and 1 more) - module inst { ->inst : Symbol(inst, Decl(duplicateSymbolsExportMatching.ts, 30, 10), Decl(duplicateSymbolsExportMatching.ts, 33, 5)) + namespace inst { +>inst : Symbol(inst, Decl(duplicateSymbolsExportMatching.ts, 30, 13), Decl(duplicateSymbolsExportMatching.ts, 33, 5)) var t; >t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 32, 11)) } - export module inst { // one error + export namespace inst { // one error >inst : Symbol(inst, Decl(duplicateSymbolsExportMatching.ts, 33, 5)) var t; @@ -82,7 +82,7 @@ module M { } // Variables of the same / different type -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(duplicateSymbolsExportMatching.ts, 37, 1)) var v: string; @@ -98,11 +98,11 @@ module M2 { >w : Symbol(w, Decl(duplicateSymbolsExportMatching.ts, 44, 14)) } -module M { +namespace M { >M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 3, 1), Decl(duplicateSymbolsExportMatching.ts, 7, 1), Decl(duplicateSymbolsExportMatching.ts, 27, 1), Decl(duplicateSymbolsExportMatching.ts, 45, 1) ... and 1 more) - module F { ->F : Symbol(F, Decl(duplicateSymbolsExportMatching.ts, 50, 5), Decl(duplicateSymbolsExportMatching.ts, 47, 10)) + namespace F { +>F : Symbol(F, Decl(duplicateSymbolsExportMatching.ts, 50, 5), Decl(duplicateSymbolsExportMatching.ts, 47, 13)) var t; >t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 49, 11)) @@ -111,17 +111,17 @@ module M { >F : Symbol(F, Decl(duplicateSymbolsExportMatching.ts, 50, 5)) } -module M { +namespace M { >M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 3, 1), Decl(duplicateSymbolsExportMatching.ts, 7, 1), Decl(duplicateSymbolsExportMatching.ts, 27, 1), Decl(duplicateSymbolsExportMatching.ts, 45, 1) ... and 1 more) class C { } ->C : Symbol(C, Decl(duplicateSymbolsExportMatching.ts, 54, 10), Decl(duplicateSymbolsExportMatching.ts, 55, 15), Decl(duplicateSymbolsExportMatching.ts, 56, 16)) +>C : Symbol(C, Decl(duplicateSymbolsExportMatching.ts, 54, 13), Decl(duplicateSymbolsExportMatching.ts, 55, 15), Decl(duplicateSymbolsExportMatching.ts, 56, 19)) - module C { } ->C : Symbol(C, Decl(duplicateSymbolsExportMatching.ts, 54, 10), Decl(duplicateSymbolsExportMatching.ts, 55, 15), Decl(duplicateSymbolsExportMatching.ts, 56, 16)) + namespace C { } +>C : Symbol(C, Decl(duplicateSymbolsExportMatching.ts, 54, 13), Decl(duplicateSymbolsExportMatching.ts, 55, 15), Decl(duplicateSymbolsExportMatching.ts, 56, 19)) - export module C { // Two visibility errors (one for the clodule symbol, and one for the merged container symbol) ->C : Symbol(C, Decl(duplicateSymbolsExportMatching.ts, 56, 16)) + export namespace C { // Two visibility errors (one for the clodule symbol, and one for the merged container symbol) +>C : Symbol(C, Decl(duplicateSymbolsExportMatching.ts, 56, 19)) var t; >t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 58, 11)) diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.types b/tests/baselines/reference/duplicateSymbolsExportMatching.types index 6681ea14860af..deb6278d48766 100644 --- a/tests/baselines/reference/duplicateSymbolsExportMatching.types +++ b/tests/baselines/reference/duplicateSymbolsExportMatching.types @@ -1,29 +1,29 @@ //// [tests/cases/compiler/duplicateSymbolsExportMatching.ts] //// === duplicateSymbolsExportMatching.ts === -module M { +namespace M { export interface E { } interface I { } } -module M { +namespace M { export interface E { } // ok interface I { } // ok } // Doesn't match export visibility, but it's in a different parent, so it's ok -module M { +namespace M { interface E { } // ok export interface I { } // ok } -module N { +namespace N { interface I { } interface I { } // ok export interface E { } export interface E { } // ok } -module N2 { +namespace N2 { interface I { } export interface I { } // error export interface E { } @@ -31,11 +31,11 @@ module N2 { } // Should report error only once for instantiated module -module M { +namespace M { >M : typeof M > : ^^^^^^^^ - module inst { + namespace inst { >inst : typeof inst > : ^^^^^^^^^^^ @@ -43,7 +43,7 @@ module M { >t : any > : ^^^ } - export module inst { // one error + export namespace inst { // one error >inst : typeof M.inst > : ^^^^^^^^^^^^^ @@ -54,7 +54,7 @@ module M { } // Variables of the same / different type -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ @@ -75,11 +75,11 @@ module M2 { > : ^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ - module F { + namespace F { >F : typeof F > : ^^^^^^^^ @@ -92,7 +92,7 @@ module M { > : ^^^^^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -100,8 +100,8 @@ module M { >C : C > : ^ - module C { } - export module C { // Two visibility errors (one for the clodule symbol, and one for the merged container symbol) + namespace C { } + export namespace C { // Two visibility errors (one for the clodule symbol, and one for the merged container symbol) >C : typeof M.C > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/duplicateVarAndImport.js b/tests/baselines/reference/duplicateVarAndImport.js index 0d5a9c4188cac..d387c69916616 100644 --- a/tests/baselines/reference/duplicateVarAndImport.js +++ b/tests/baselines/reference/duplicateVarAndImport.js @@ -4,7 +4,7 @@ // no error since module is not instantiated var a; -module M { } +namespace M { } import a = M; //// [duplicateVarAndImport.js] diff --git a/tests/baselines/reference/duplicateVarAndImport.symbols b/tests/baselines/reference/duplicateVarAndImport.symbols index 455f0509f1646..9c2948a11d6d1 100644 --- a/tests/baselines/reference/duplicateVarAndImport.symbols +++ b/tests/baselines/reference/duplicateVarAndImport.symbols @@ -4,12 +4,12 @@ // no error since module is not instantiated var a; ->a : Symbol(a, Decl(duplicateVarAndImport.ts, 2, 3), Decl(duplicateVarAndImport.ts, 3, 12)) +>a : Symbol(a, Decl(duplicateVarAndImport.ts, 2, 3), Decl(duplicateVarAndImport.ts, 3, 15)) -module M { } +namespace M { } >M : Symbol(M, Decl(duplicateVarAndImport.ts, 2, 6)) import a = M; ->a : Symbol(a, Decl(duplicateVarAndImport.ts, 2, 3), Decl(duplicateVarAndImport.ts, 3, 12)) +>a : Symbol(a, Decl(duplicateVarAndImport.ts, 2, 3), Decl(duplicateVarAndImport.ts, 3, 15)) >M : Symbol(M, Decl(duplicateVarAndImport.ts, 2, 6)) diff --git a/tests/baselines/reference/duplicateVarAndImport.types b/tests/baselines/reference/duplicateVarAndImport.types index 02974fcbde6b4..dd68bca37267f 100644 --- a/tests/baselines/reference/duplicateVarAndImport.types +++ b/tests/baselines/reference/duplicateVarAndImport.types @@ -6,7 +6,7 @@ var a; >a : any -module M { } +namespace M { } import a = M; >a : any > : ^^^ diff --git a/tests/baselines/reference/duplicateVarAndImport2.errors.txt b/tests/baselines/reference/duplicateVarAndImport2.errors.txt index 343834034a9ba..7afd8c1489e25 100644 --- a/tests/baselines/reference/duplicateVarAndImport2.errors.txt +++ b/tests/baselines/reference/duplicateVarAndImport2.errors.txt @@ -4,7 +4,7 @@ duplicateVarAndImport2.ts(4,1): error TS2440: Import declaration conflicts with ==== duplicateVarAndImport2.ts (1 errors) ==== // error since module is instantiated var a; - module M { export var x = 1; } + namespace M { export var x = 1; } import a = M; ~~~~~~~~~~~~~ !!! error TS2440: Import declaration conflicts with local declaration of 'a'. \ No newline at end of file diff --git a/tests/baselines/reference/duplicateVarAndImport2.js b/tests/baselines/reference/duplicateVarAndImport2.js index b27003792ba86..2280b95c5f1a0 100644 --- a/tests/baselines/reference/duplicateVarAndImport2.js +++ b/tests/baselines/reference/duplicateVarAndImport2.js @@ -3,7 +3,7 @@ //// [duplicateVarAndImport2.ts] // error since module is instantiated var a; -module M { export var x = 1; } +namespace M { export var x = 1; } import a = M; //// [duplicateVarAndImport2.js] diff --git a/tests/baselines/reference/duplicateVarAndImport2.symbols b/tests/baselines/reference/duplicateVarAndImport2.symbols index 9ebb242341823..bf2c4d32eb864 100644 --- a/tests/baselines/reference/duplicateVarAndImport2.symbols +++ b/tests/baselines/reference/duplicateVarAndImport2.symbols @@ -3,13 +3,13 @@ === duplicateVarAndImport2.ts === // error since module is instantiated var a; ->a : Symbol(a, Decl(duplicateVarAndImport2.ts, 1, 3), Decl(duplicateVarAndImport2.ts, 2, 30)) +>a : Symbol(a, Decl(duplicateVarAndImport2.ts, 1, 3), Decl(duplicateVarAndImport2.ts, 2, 33)) -module M { export var x = 1; } +namespace M { export var x = 1; } >M : Symbol(M, Decl(duplicateVarAndImport2.ts, 1, 6)) ->x : Symbol(x, Decl(duplicateVarAndImport2.ts, 2, 21)) +>x : Symbol(x, Decl(duplicateVarAndImport2.ts, 2, 24)) import a = M; ->a : Symbol(a, Decl(duplicateVarAndImport2.ts, 1, 3), Decl(duplicateVarAndImport2.ts, 2, 30)) +>a : Symbol(a, Decl(duplicateVarAndImport2.ts, 1, 3), Decl(duplicateVarAndImport2.ts, 2, 33)) >M : Symbol(M, Decl(duplicateVarAndImport2.ts, 1, 6)) diff --git a/tests/baselines/reference/duplicateVarAndImport2.types b/tests/baselines/reference/duplicateVarAndImport2.types index ad236ddd3fa92..301e1e4afc6a4 100644 --- a/tests/baselines/reference/duplicateVarAndImport2.types +++ b/tests/baselines/reference/duplicateVarAndImport2.types @@ -6,7 +6,7 @@ var a; >a : any > : ^^^ -module M { export var x = 1; } +namespace M { export var x = 1; } >M : typeof M > : ^^^^^^^^ >x : number diff --git a/tests/baselines/reference/duplicateVariablesByScope.js b/tests/baselines/reference/duplicateVariablesByScope.js index 5c51844db7bb2..bd7f658ae6cd1 100644 --- a/tests/baselines/reference/duplicateVariablesByScope.js +++ b/tests/baselines/reference/duplicateVariablesByScope.js @@ -3,7 +3,7 @@ //// [duplicateVariablesByScope.ts] // duplicate local variables are only reported at global scope -module M { +namespace M { for (var j = 0; j < 10; j++) { } diff --git a/tests/baselines/reference/duplicateVariablesByScope.symbols b/tests/baselines/reference/duplicateVariablesByScope.symbols index 3c118ea3094c5..9a302f5cdf39f 100644 --- a/tests/baselines/reference/duplicateVariablesByScope.symbols +++ b/tests/baselines/reference/duplicateVariablesByScope.symbols @@ -3,7 +3,7 @@ === duplicateVariablesByScope.ts === // duplicate local variables are only reported at global scope -module M { +namespace M { >M : Symbol(M, Decl(duplicateVariablesByScope.ts, 0, 0)) for (var j = 0; j < 10; j++) { diff --git a/tests/baselines/reference/duplicateVariablesByScope.types b/tests/baselines/reference/duplicateVariablesByScope.types index 286b775cb1dae..d52b426b5d716 100644 --- a/tests/baselines/reference/duplicateVariablesByScope.types +++ b/tests/baselines/reference/duplicateVariablesByScope.types @@ -3,7 +3,7 @@ === duplicateVariablesByScope.ts === // duplicate local variables are only reported at global scope -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/duplicateVariablesWithAny.errors.txt b/tests/baselines/reference/duplicateVariablesWithAny.errors.txt index 0752acccdfd8d..aacd053336764 100644 --- a/tests/baselines/reference/duplicateVariablesWithAny.errors.txt +++ b/tests/baselines/reference/duplicateVariablesWithAny.errors.txt @@ -18,7 +18,7 @@ duplicateVariablesWithAny.ts(13,9): error TS2403: Subsequent variable declaratio !!! error TS2403: Subsequent variable declarations must have the same type. Variable 'y' must be of type 'string', but here has type 'any'. !!! related TS6203 duplicateVariablesWithAny.ts:5:5: 'y' was also declared here. - module N { + namespace N { var x: any; var x = 2; //error ~ diff --git a/tests/baselines/reference/duplicateVariablesWithAny.js b/tests/baselines/reference/duplicateVariablesWithAny.js index 1590ab88938d6..a343053bee58b 100644 --- a/tests/baselines/reference/duplicateVariablesWithAny.js +++ b/tests/baselines/reference/duplicateVariablesWithAny.js @@ -8,7 +8,7 @@ var x = 2; //error var y = ""; var y; //error -module N { +namespace N { var x: any; var x = 2; //error diff --git a/tests/baselines/reference/duplicateVariablesWithAny.symbols b/tests/baselines/reference/duplicateVariablesWithAny.symbols index e5539679d63a0..c0b3c39a56f1f 100644 --- a/tests/baselines/reference/duplicateVariablesWithAny.symbols +++ b/tests/baselines/reference/duplicateVariablesWithAny.symbols @@ -14,7 +14,7 @@ var y = ""; var y; //error >y : Symbol(y, Decl(duplicateVariablesWithAny.ts, 4, 3), Decl(duplicateVariablesWithAny.ts, 5, 3)) -module N { +namespace N { >N : Symbol(N, Decl(duplicateVariablesWithAny.ts, 5, 6)) var x: any; diff --git a/tests/baselines/reference/duplicateVariablesWithAny.types b/tests/baselines/reference/duplicateVariablesWithAny.types index 6364277e0aa22..5dece16d098d1 100644 --- a/tests/baselines/reference/duplicateVariablesWithAny.types +++ b/tests/baselines/reference/duplicateVariablesWithAny.types @@ -22,7 +22,7 @@ var y; //error >y : string > : ^^^^^^ -module N { +namespace N { >N : typeof N > : ^^^^^^^^ diff --git a/tests/baselines/reference/duplicateVarsAcrossFileBoundaries.errors.txt b/tests/baselines/reference/duplicateVarsAcrossFileBoundaries.errors.txt index a5f612ce701b1..ebe80ab2aefe5 100644 --- a/tests/baselines/reference/duplicateVarsAcrossFileBoundaries.errors.txt +++ b/tests/baselines/reference/duplicateVarsAcrossFileBoundaries.errors.txt @@ -35,11 +35,11 @@ duplicateVarsAcrossFileBoundaries_2.ts(3,5): error TS2403: Subsequent variable d var z = 0; ==== duplicateVarsAcrossFileBoundaries_4.ts (0 errors) ==== - module P { } + namespace P { } import p = P; var q; ==== duplicateVarsAcrossFileBoundaries_5.ts (0 errors) ==== - module Q { } + namespace Q { } import q = Q; var p; \ No newline at end of file diff --git a/tests/baselines/reference/duplicateVarsAcrossFileBoundaries.js b/tests/baselines/reference/duplicateVarsAcrossFileBoundaries.js index 4e60fa535b5c0..c70ebcab20a46 100644 --- a/tests/baselines/reference/duplicateVarsAcrossFileBoundaries.js +++ b/tests/baselines/reference/duplicateVarsAcrossFileBoundaries.js @@ -19,12 +19,12 @@ var y = ""; var z = 0; //// [duplicateVarsAcrossFileBoundaries_4.ts] -module P { } +namespace P { } import p = P; var q; //// [duplicateVarsAcrossFileBoundaries_5.ts] -module Q { } +namespace Q { } import q = Q; var p; diff --git a/tests/baselines/reference/duplicateVarsAcrossFileBoundaries.symbols b/tests/baselines/reference/duplicateVarsAcrossFileBoundaries.symbols index 895101b57ebc1..7d66162cd1d4d 100644 --- a/tests/baselines/reference/duplicateVarsAcrossFileBoundaries.symbols +++ b/tests/baselines/reference/duplicateVarsAcrossFileBoundaries.symbols @@ -35,22 +35,22 @@ var z = 0; >z : Symbol(z, Decl(duplicateVarsAcrossFileBoundaries_1.ts, 1, 3), Decl(duplicateVarsAcrossFileBoundaries_2.ts, 2, 3), Decl(duplicateVarsAcrossFileBoundaries_3.ts, 2, 3)) === duplicateVarsAcrossFileBoundaries_4.ts === -module P { } +namespace P { } >P : Symbol(P, Decl(duplicateVarsAcrossFileBoundaries_4.ts, 0, 0), Decl(duplicateVarsAcrossFileBoundaries_5.ts, 2, 3)) import p = P; ->p : Symbol(p, Decl(duplicateVarsAcrossFileBoundaries_4.ts, 0, 12)) +>p : Symbol(p, Decl(duplicateVarsAcrossFileBoundaries_4.ts, 0, 15)) >P : Symbol(P, Decl(duplicateVarsAcrossFileBoundaries_4.ts, 0, 0), Decl(duplicateVarsAcrossFileBoundaries_5.ts, 2, 3)) var q; ->q : Symbol(q, Decl(duplicateVarsAcrossFileBoundaries_4.ts, 2, 3), Decl(duplicateVarsAcrossFileBoundaries_5.ts, 0, 12)) +>q : Symbol(q, Decl(duplicateVarsAcrossFileBoundaries_4.ts, 2, 3), Decl(duplicateVarsAcrossFileBoundaries_5.ts, 0, 15)) === duplicateVarsAcrossFileBoundaries_5.ts === -module Q { } +namespace Q { } >Q : Symbol(Q, Decl(duplicateVarsAcrossFileBoundaries_5.ts, 0, 0)) import q = Q; ->q : Symbol(q, Decl(duplicateVarsAcrossFileBoundaries_4.ts, 2, 3), Decl(duplicateVarsAcrossFileBoundaries_5.ts, 0, 12)) +>q : Symbol(q, Decl(duplicateVarsAcrossFileBoundaries_4.ts, 2, 3), Decl(duplicateVarsAcrossFileBoundaries_5.ts, 0, 15)) >Q : Symbol(Q, Decl(duplicateVarsAcrossFileBoundaries_5.ts, 0, 0)) var p; diff --git a/tests/baselines/reference/duplicateVarsAcrossFileBoundaries.types b/tests/baselines/reference/duplicateVarsAcrossFileBoundaries.types index 425898a325798..e7f8921321218 100644 --- a/tests/baselines/reference/duplicateVarsAcrossFileBoundaries.types +++ b/tests/baselines/reference/duplicateVarsAcrossFileBoundaries.types @@ -65,7 +65,7 @@ var z = 0; > : ^ === duplicateVarsAcrossFileBoundaries_4.ts === -module P { } +namespace P { } import p = P; >p : any > : ^^^ @@ -77,7 +77,7 @@ var q; > : ^^^ === duplicateVarsAcrossFileBoundaries_5.ts === -module Q { } +namespace Q { } import q = Q; >q : any > : ^^^ diff --git a/tests/baselines/reference/emitMemberAccessExpression.js b/tests/baselines/reference/emitMemberAccessExpression.js index bdda7b833d2ff..5d1eb93484ef3 100644 --- a/tests/baselines/reference/emitMemberAccessExpression.js +++ b/tests/baselines/reference/emitMemberAccessExpression.js @@ -7,7 +7,7 @@ //// [emitMemberAccessExpression_file2.ts] /// "use strict"; -module Microsoft.PeopleAtWork.Model { +namespace Microsoft.PeopleAtWork.Model { export class _Person { public populate(raw: any) { var res = Model.KnockoutExtentions; @@ -19,7 +19,7 @@ module Microsoft.PeopleAtWork.Model { /// /// declare var OData: any; -module Microsoft.PeopleAtWork.Model { +namespace Microsoft.PeopleAtWork.Model { export class KnockoutExtentions { } } diff --git a/tests/baselines/reference/emitMemberAccessExpression.symbols b/tests/baselines/reference/emitMemberAccessExpression.symbols index ef1232c5e9b4c..7c033b204b37c 100644 --- a/tests/baselines/reference/emitMemberAccessExpression.symbols +++ b/tests/baselines/reference/emitMemberAccessExpression.symbols @@ -6,13 +6,13 @@ declare var OData: any; >OData : Symbol(OData, Decl(emitMemberAccessExpression_file3.ts, 2, 11)) -module Microsoft.PeopleAtWork.Model { +namespace Microsoft.PeopleAtWork.Model { >Microsoft : Symbol(Microsoft, Decl(emitMemberAccessExpression_file2.ts, 1, 13), Decl(emitMemberAccessExpression_file3.ts, 2, 23)) ->PeopleAtWork : Symbol(PeopleAtWork, Decl(emitMemberAccessExpression_file2.ts, 2, 17), Decl(emitMemberAccessExpression_file3.ts, 3, 17)) ->Model : Symbol(Model, Decl(emitMemberAccessExpression_file2.ts, 2, 30), Decl(emitMemberAccessExpression_file3.ts, 3, 30)) +>PeopleAtWork : Symbol(PeopleAtWork, Decl(emitMemberAccessExpression_file2.ts, 2, 20), Decl(emitMemberAccessExpression_file3.ts, 3, 20)) +>Model : Symbol(Model, Decl(emitMemberAccessExpression_file2.ts, 2, 33), Decl(emitMemberAccessExpression_file3.ts, 3, 33)) export class KnockoutExtentions { ->KnockoutExtentions : Symbol(KnockoutExtentions, Decl(emitMemberAccessExpression_file3.ts, 3, 37)) +>KnockoutExtentions : Symbol(KnockoutExtentions, Decl(emitMemberAccessExpression_file3.ts, 3, 40)) } } === emitMemberAccessExpression_file1.ts === @@ -23,13 +23,13 @@ module Microsoft.PeopleAtWork.Model { === emitMemberAccessExpression_file2.ts === /// "use strict"; -module Microsoft.PeopleAtWork.Model { +namespace Microsoft.PeopleAtWork.Model { >Microsoft : Symbol(Microsoft, Decl(emitMemberAccessExpression_file2.ts, 1, 13), Decl(emitMemberAccessExpression_file3.ts, 2, 23)) ->PeopleAtWork : Symbol(PeopleAtWork, Decl(emitMemberAccessExpression_file2.ts, 2, 17), Decl(emitMemberAccessExpression_file3.ts, 3, 17)) ->Model : Symbol(Model, Decl(emitMemberAccessExpression_file2.ts, 2, 30), Decl(emitMemberAccessExpression_file3.ts, 3, 30)) +>PeopleAtWork : Symbol(PeopleAtWork, Decl(emitMemberAccessExpression_file2.ts, 2, 20), Decl(emitMemberAccessExpression_file3.ts, 3, 20)) +>Model : Symbol(Model, Decl(emitMemberAccessExpression_file2.ts, 2, 33), Decl(emitMemberAccessExpression_file3.ts, 3, 33)) export class _Person { ->_Person : Symbol(_Person, Decl(emitMemberAccessExpression_file2.ts, 2, 37)) +>_Person : Symbol(_Person, Decl(emitMemberAccessExpression_file2.ts, 2, 40)) public populate(raw: any) { >populate : Symbol(_Person.populate, Decl(emitMemberAccessExpression_file2.ts, 3, 26)) @@ -37,9 +37,9 @@ module Microsoft.PeopleAtWork.Model { var res = Model.KnockoutExtentions; >res : Symbol(res, Decl(emitMemberAccessExpression_file2.ts, 5, 15)) ->Model.KnockoutExtentions : Symbol(KnockoutExtentions, Decl(emitMemberAccessExpression_file3.ts, 3, 37)) ->Model : Symbol(Model, Decl(emitMemberAccessExpression_file2.ts, 2, 30), Decl(emitMemberAccessExpression_file3.ts, 3, 30)) ->KnockoutExtentions : Symbol(KnockoutExtentions, Decl(emitMemberAccessExpression_file3.ts, 3, 37)) +>Model.KnockoutExtentions : Symbol(KnockoutExtentions, Decl(emitMemberAccessExpression_file3.ts, 3, 40)) +>Model : Symbol(Model, Decl(emitMemberAccessExpression_file2.ts, 2, 33), Decl(emitMemberAccessExpression_file3.ts, 3, 33)) +>KnockoutExtentions : Symbol(KnockoutExtentions, Decl(emitMemberAccessExpression_file3.ts, 3, 40)) } } } diff --git a/tests/baselines/reference/emitMemberAccessExpression.types b/tests/baselines/reference/emitMemberAccessExpression.types index 312ed1fa0d771..f2188afb4977b 100644 --- a/tests/baselines/reference/emitMemberAccessExpression.types +++ b/tests/baselines/reference/emitMemberAccessExpression.types @@ -6,7 +6,7 @@ declare var OData: any; >OData : any -module Microsoft.PeopleAtWork.Model { +namespace Microsoft.PeopleAtWork.Model { >Microsoft : typeof Microsoft > : ^^^^^^^^^^^^^^^^ >PeopleAtWork : typeof PeopleAtWork @@ -31,7 +31,7 @@ module Microsoft.PeopleAtWork.Model { >"use strict" : "use strict" > : ^^^^^^^^^^^^ -module Microsoft.PeopleAtWork.Model { +namespace Microsoft.PeopleAtWork.Model { >Microsoft : typeof Microsoft > : ^^^^^^^^^^^^^^^^ >PeopleAtWork : typeof PeopleAtWork diff --git a/tests/baselines/reference/enumAssignability.errors.txt b/tests/baselines/reference/enumAssignability.errors.txt index 36a4c7eb63e65..f81fa8cfe9c8c 100644 --- a/tests/baselines/reference/enumAssignability.errors.txt +++ b/tests/baselines/reference/enumAssignability.errors.txt @@ -51,7 +51,7 @@ enumAssignability.ts(52,13): error TS2322: Type 'E' is not assignable to type 'B var x: number = e; // ok x = f; // ok - module Others { + namespace Others { var a: any = e; // ok class C { diff --git a/tests/baselines/reference/enumAssignability.js b/tests/baselines/reference/enumAssignability.js index 8788bdfd4d545..870074686a0cf 100644 --- a/tests/baselines/reference/enumAssignability.js +++ b/tests/baselines/reference/enumAssignability.js @@ -16,7 +16,7 @@ f = 1; // ok var x: number = e; // ok x = f; // ok -module Others { +namespace Others { var a: any = e; // ok class C { diff --git a/tests/baselines/reference/enumAssignability.symbols b/tests/baselines/reference/enumAssignability.symbols index 4aca6c8cd628e..b52346d2350ce 100644 --- a/tests/baselines/reference/enumAssignability.symbols +++ b/tests/baselines/reference/enumAssignability.symbols @@ -45,7 +45,7 @@ x = f; // ok >x : Symbol(x, Decl(enumAssignability.ts, 12, 3)) >f : Symbol(f, Decl(enumAssignability.ts, 6, 3)) -module Others { +namespace Others { >Others : Symbol(Others, Decl(enumAssignability.ts, 13, 6)) var a: any = e; // ok diff --git a/tests/baselines/reference/enumAssignability.types b/tests/baselines/reference/enumAssignability.types index 5645153f3b462..20d1b9d14157a 100644 --- a/tests/baselines/reference/enumAssignability.types +++ b/tests/baselines/reference/enumAssignability.types @@ -81,7 +81,7 @@ x = f; // ok >f : F > : ^ -module Others { +namespace Others { >Others : typeof Others > : ^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/enumAssignabilityInInheritance.errors.txt b/tests/baselines/reference/enumAssignabilityInInheritance.errors.txt index 3bfdd2aae934e..5376fb075019b 100644 --- a/tests/baselines/reference/enumAssignabilityInInheritance.errors.txt +++ b/tests/baselines/reference/enumAssignabilityInInheritance.errors.txt @@ -86,7 +86,7 @@ enumAssignabilityInInheritance.ts(109,5): error TS2403: Subsequent variable decl var r4 = foo13(E.A); function f() { } - module f { + namespace f { export var bar = 1; } declare function foo14(x: typeof f): typeof f; @@ -95,7 +95,7 @@ enumAssignabilityInInheritance.ts(109,5): error TS2403: Subsequent variable decl var r4 = foo14(E.A); class CC { baz: string } - module CC { + namespace CC { export var bar = 1; } declare function foo15(x: CC): CC; diff --git a/tests/baselines/reference/enumAssignabilityInInheritance.js b/tests/baselines/reference/enumAssignabilityInInheritance.js index 179810e782c2a..839f1905aca39 100644 --- a/tests/baselines/reference/enumAssignabilityInInheritance.js +++ b/tests/baselines/reference/enumAssignabilityInInheritance.js @@ -84,7 +84,7 @@ declare function foo13(x: E): E; var r4 = foo13(E.A); function f() { } -module f { +namespace f { export var bar = 1; } declare function foo14(x: typeof f): typeof f; @@ -93,7 +93,7 @@ declare function foo14(x: E): E; var r4 = foo14(E.A); class CC { baz: string } -module CC { +namespace CC { export var bar = 1; } declare function foo15(x: CC): CC; diff --git a/tests/baselines/reference/enumAssignabilityInInheritance.symbols b/tests/baselines/reference/enumAssignabilityInInheritance.symbols index 08a7045bd9fdd..041abc972bbad 100644 --- a/tests/baselines/reference/enumAssignabilityInInheritance.symbols +++ b/tests/baselines/reference/enumAssignabilityInInheritance.symbols @@ -299,7 +299,7 @@ var r4 = foo13(E.A); function f() { } >f : Symbol(f, Decl(enumAssignabilityInInheritance.ts, 80, 20), Decl(enumAssignabilityInInheritance.ts, 82, 16)) -module f { +namespace f { >f : Symbol(f, Decl(enumAssignabilityInInheritance.ts, 80, 20), Decl(enumAssignabilityInInheritance.ts, 82, 16)) export var bar = 1; @@ -328,7 +328,7 @@ class CC { baz: string } >CC : Symbol(CC, Decl(enumAssignabilityInInheritance.ts, 89, 20), Decl(enumAssignabilityInInheritance.ts, 91, 24)) >baz : Symbol(CC.baz, Decl(enumAssignabilityInInheritance.ts, 91, 10)) -module CC { +namespace CC { >CC : Symbol(CC, Decl(enumAssignabilityInInheritance.ts, 89, 20), Decl(enumAssignabilityInInheritance.ts, 91, 24)) export var bar = 1; diff --git a/tests/baselines/reference/enumAssignabilityInInheritance.types b/tests/baselines/reference/enumAssignabilityInInheritance.types index d8fb673be94ea..c76d100322c91 100644 --- a/tests/baselines/reference/enumAssignabilityInInheritance.types +++ b/tests/baselines/reference/enumAssignabilityInInheritance.types @@ -423,7 +423,7 @@ function f() { } >f : typeof f > : ^^^^^^^^ -module f { +namespace f { >f : typeof f > : ^^^^^^^^ @@ -469,7 +469,7 @@ class CC { baz: string } >baz : string > : ^^^^^^ -module CC { +namespace CC { >CC : typeof CC > : ^^^^^^^^^ diff --git a/tests/baselines/reference/enumAssignmentCompat.errors.txt b/tests/baselines/reference/enumAssignmentCompat.errors.txt index 277f7a39c7e72..12f91348682c4 100644 --- a/tests/baselines/reference/enumAssignmentCompat.errors.txt +++ b/tests/baselines/reference/enumAssignmentCompat.errors.txt @@ -8,7 +8,7 @@ enumAssignmentCompat.ts(34,5): error TS2322: Type '3' is not assignable to type ==== enumAssignmentCompat.ts (7 errors) ==== - module W { + namespace W { export class D { } } diff --git a/tests/baselines/reference/enumAssignmentCompat.js b/tests/baselines/reference/enumAssignmentCompat.js index 0569980e8445a..ab0b70f0f7fb8 100644 --- a/tests/baselines/reference/enumAssignmentCompat.js +++ b/tests/baselines/reference/enumAssignmentCompat.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/enumAssignmentCompat.ts] //// //// [enumAssignmentCompat.ts] -module W { +namespace W { export class D { } } diff --git a/tests/baselines/reference/enumAssignmentCompat.symbols b/tests/baselines/reference/enumAssignmentCompat.symbols index 8975e39e1f41d..aacf299627802 100644 --- a/tests/baselines/reference/enumAssignmentCompat.symbols +++ b/tests/baselines/reference/enumAssignmentCompat.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/enumAssignmentCompat.ts] //// === enumAssignmentCompat.ts === -module W { +namespace W { >W : Symbol(W, Decl(enumAssignmentCompat.ts, 0, 0), Decl(enumAssignmentCompat.ts, 2, 1)) export class D { } ->D : Symbol(D, Decl(enumAssignmentCompat.ts, 0, 10)) +>D : Symbol(D, Decl(enumAssignmentCompat.ts, 0, 13)) } enum W { @@ -113,12 +113,12 @@ i = W.a; >a : Symbol(W.a, Decl(enumAssignmentCompat.ts, 4, 8)) W.D; ->W.D : Symbol(W.D, Decl(enumAssignmentCompat.ts, 0, 10)) +>W.D : Symbol(W.D, Decl(enumAssignmentCompat.ts, 0, 13)) >W : Symbol(W, Decl(enumAssignmentCompat.ts, 0, 0), Decl(enumAssignmentCompat.ts, 2, 1)) ->D : Symbol(W.D, Decl(enumAssignmentCompat.ts, 0, 10)) +>D : Symbol(W.D, Decl(enumAssignmentCompat.ts, 0, 13)) var p: W.D; >p : Symbol(p, Decl(enumAssignmentCompat.ts, 37, 3)) >W : Symbol(W, Decl(enumAssignmentCompat.ts, 0, 0), Decl(enumAssignmentCompat.ts, 2, 1)) ->D : Symbol(W.D, Decl(enumAssignmentCompat.ts, 0, 10)) +>D : Symbol(W.D, Decl(enumAssignmentCompat.ts, 0, 13)) diff --git a/tests/baselines/reference/enumAssignmentCompat.types b/tests/baselines/reference/enumAssignmentCompat.types index 1f77d28c34d9c..854a2cbcef3c7 100644 --- a/tests/baselines/reference/enumAssignmentCompat.types +++ b/tests/baselines/reference/enumAssignmentCompat.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/enumAssignmentCompat.ts] //// === enumAssignmentCompat.ts === -module W { +namespace W { >W : typeof W > : ^^^^^^^^ diff --git a/tests/baselines/reference/enumAssignmentCompat2.errors.txt b/tests/baselines/reference/enumAssignmentCompat2.errors.txt index 1921f57eb3052..ceac94ac5d8ef 100644 --- a/tests/baselines/reference/enumAssignmentCompat2.errors.txt +++ b/tests/baselines/reference/enumAssignmentCompat2.errors.txt @@ -14,7 +14,7 @@ enumAssignmentCompat2.ts(33,5): error TS2322: Type '3' is not assignable to type } - module W { + namespace W { export class D { } } diff --git a/tests/baselines/reference/enumAssignmentCompat2.js b/tests/baselines/reference/enumAssignmentCompat2.js index bc290995edb6e..4da32220f9c06 100644 --- a/tests/baselines/reference/enumAssignmentCompat2.js +++ b/tests/baselines/reference/enumAssignmentCompat2.js @@ -7,7 +7,7 @@ enum W { } -module W { +namespace W { export class D { } } diff --git a/tests/baselines/reference/enumAssignmentCompat2.symbols b/tests/baselines/reference/enumAssignmentCompat2.symbols index 78a66eafa4a15..91165d835ba1f 100644 --- a/tests/baselines/reference/enumAssignmentCompat2.symbols +++ b/tests/baselines/reference/enumAssignmentCompat2.symbols @@ -11,11 +11,11 @@ enum W { } -module W { +namespace W { >W : Symbol(W, Decl(enumAssignmentCompat2.ts, 0, 0), Decl(enumAssignmentCompat2.ts, 4, 1)) export class D { } ->D : Symbol(D, Decl(enumAssignmentCompat2.ts, 6, 10)) +>D : Symbol(D, Decl(enumAssignmentCompat2.ts, 6, 13)) } interface WStatic { @@ -112,12 +112,12 @@ i = W.a; >a : Symbol(W.a, Decl(enumAssignmentCompat2.ts, 0, 8)) W.D; ->W.D : Symbol(W.D, Decl(enumAssignmentCompat2.ts, 6, 10)) +>W.D : Symbol(W.D, Decl(enumAssignmentCompat2.ts, 6, 13)) >W : Symbol(W, Decl(enumAssignmentCompat2.ts, 0, 0), Decl(enumAssignmentCompat2.ts, 4, 1)) ->D : Symbol(W.D, Decl(enumAssignmentCompat2.ts, 6, 10)) +>D : Symbol(W.D, Decl(enumAssignmentCompat2.ts, 6, 13)) var p: W.D; >p : Symbol(p, Decl(enumAssignmentCompat2.ts, 36, 3)) >W : Symbol(W, Decl(enumAssignmentCompat2.ts, 0, 0), Decl(enumAssignmentCompat2.ts, 4, 1)) ->D : Symbol(W.D, Decl(enumAssignmentCompat2.ts, 6, 10)) +>D : Symbol(W.D, Decl(enumAssignmentCompat2.ts, 6, 13)) diff --git a/tests/baselines/reference/enumAssignmentCompat2.types b/tests/baselines/reference/enumAssignmentCompat2.types index 829c5a7937807..a8203694ee64f 100644 --- a/tests/baselines/reference/enumAssignmentCompat2.types +++ b/tests/baselines/reference/enumAssignmentCompat2.types @@ -15,7 +15,7 @@ enum W { } -module W { +namespace W { >W : typeof W > : ^^^^^^^^ diff --git a/tests/baselines/reference/enumAssignmentCompat3.errors.txt b/tests/baselines/reference/enumAssignmentCompat3.errors.txt index 9c10fd6b13d95..c9207db308055 100644 --- a/tests/baselines/reference/enumAssignmentCompat3.errors.txt +++ b/tests/baselines/reference/enumAssignmentCompat3.errors.txt @@ -72,7 +72,7 @@ enumAssignmentCompat3.ts(87,1): error TS2322: Type 'First.E' is not assignable t export enum E { a, b, c } - export module E { + export namespace E { export let d = 5; } } diff --git a/tests/baselines/reference/enumAssignmentCompat3.js b/tests/baselines/reference/enumAssignmentCompat3.js index 755ddb169cfec..6cde4593a82c0 100644 --- a/tests/baselines/reference/enumAssignmentCompat3.js +++ b/tests/baselines/reference/enumAssignmentCompat3.js @@ -52,7 +52,7 @@ namespace Merged2 { export enum E { a, b, c } - export module E { + export namespace E { export let d = 5; } } diff --git a/tests/baselines/reference/enumAssignmentCompat3.symbols b/tests/baselines/reference/enumAssignmentCompat3.symbols index 00ee430fc60b3..7b8ff5fc9e335 100644 --- a/tests/baselines/reference/enumAssignmentCompat3.symbols +++ b/tests/baselines/reference/enumAssignmentCompat3.symbols @@ -122,7 +122,7 @@ namespace Merged2 { >b : Symbol(E.b, Decl(enumAssignmentCompat3.ts, 49, 10)) >c : Symbol(E.c, Decl(enumAssignmentCompat3.ts, 49, 13)) } - export module E { + export namespace E { >E : Symbol(E, Decl(enumAssignmentCompat3.ts, 47, 19), Decl(enumAssignmentCompat3.ts, 50, 5)) export let d = 5; diff --git a/tests/baselines/reference/enumAssignmentCompat3.types b/tests/baselines/reference/enumAssignmentCompat3.types index 2415b1f676907..0296cef8a7431 100644 --- a/tests/baselines/reference/enumAssignmentCompat3.types +++ b/tests/baselines/reference/enumAssignmentCompat3.types @@ -173,7 +173,7 @@ namespace Merged2 { >c : E.c > : ^^^ } - export module E { + export namespace E { >E : typeof E > : ^^^^^^^^ diff --git a/tests/baselines/reference/enumBasics3.errors.txt b/tests/baselines/reference/enumBasics3.errors.txt index 534234050029b..31477d2ee6dfd 100644 --- a/tests/baselines/reference/enumBasics3.errors.txt +++ b/tests/baselines/reference/enumBasics3.errors.txt @@ -3,7 +3,7 @@ enumBasics3.ts(14,20): error TS2339: Property 'a' does not exist on type 'E1.a'. ==== enumBasics3.ts (2 errors) ==== - module M { + namespace M { export namespace N { export enum E1 { a = 1, @@ -14,7 +14,7 @@ enumBasics3.ts(14,20): error TS2339: Property 'a' does not exist on type 'E1.a'. } } - module M { + namespace M { export namespace N { export enum E2 { b = M.N.E1.a, diff --git a/tests/baselines/reference/enumBasics3.js b/tests/baselines/reference/enumBasics3.js index 1112f826fd1fe..d2a8c21ad7922 100644 --- a/tests/baselines/reference/enumBasics3.js +++ b/tests/baselines/reference/enumBasics3.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/enumBasics3.ts] //// //// [enumBasics3.ts] -module M { +namespace M { export namespace N { export enum E1 { a = 1, @@ -10,7 +10,7 @@ module M { } } -module M { +namespace M { export namespace N { export enum E2 { b = M.N.E1.a, diff --git a/tests/baselines/reference/enumBasics3.symbols b/tests/baselines/reference/enumBasics3.symbols index c8636ab5a3ba8..99cefe0fea1c8 100644 --- a/tests/baselines/reference/enumBasics3.symbols +++ b/tests/baselines/reference/enumBasics3.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/enumBasics3.ts] //// === enumBasics3.ts === -module M { +namespace M { >M : Symbol(M, Decl(enumBasics3.ts, 0, 0), Decl(enumBasics3.ts, 7, 1)) export namespace N { ->N : Symbol(N, Decl(enumBasics3.ts, 0, 10), Decl(enumBasics3.ts, 9, 10)) +>N : Symbol(N, Decl(enumBasics3.ts, 0, 13), Decl(enumBasics3.ts, 9, 13)) export enum E1 { >E1 : Symbol(E1, Decl(enumBasics3.ts, 1, 22)) @@ -20,11 +20,11 @@ module M { } } -module M { +namespace M { >M : Symbol(M, Decl(enumBasics3.ts, 0, 0), Decl(enumBasics3.ts, 7, 1)) export namespace N { ->N : Symbol(N, Decl(enumBasics3.ts, 0, 10), Decl(enumBasics3.ts, 9, 10)) +>N : Symbol(N, Decl(enumBasics3.ts, 0, 13), Decl(enumBasics3.ts, 9, 13)) export enum E2 { >E2 : Symbol(E2, Decl(enumBasics3.ts, 10, 22)) @@ -33,9 +33,9 @@ module M { >b : Symbol(E2.b, Decl(enumBasics3.ts, 11, 20)) >M.N.E1.a : Symbol(E1.a, Decl(enumBasics3.ts, 2, 20)) >M.N.E1 : Symbol(E1, Decl(enumBasics3.ts, 1, 22)) ->M.N : Symbol(N, Decl(enumBasics3.ts, 0, 10), Decl(enumBasics3.ts, 9, 10)) +>M.N : Symbol(N, Decl(enumBasics3.ts, 0, 13), Decl(enumBasics3.ts, 9, 13)) >M : Symbol(M, Decl(enumBasics3.ts, 0, 0), Decl(enumBasics3.ts, 7, 1)) ->N : Symbol(N, Decl(enumBasics3.ts, 0, 10), Decl(enumBasics3.ts, 9, 10)) +>N : Symbol(N, Decl(enumBasics3.ts, 0, 13), Decl(enumBasics3.ts, 9, 13)) >E1 : Symbol(E1, Decl(enumBasics3.ts, 1, 22)) >a : Symbol(E1.a, Decl(enumBasics3.ts, 2, 20)) @@ -43,9 +43,9 @@ module M { >c : Symbol(E2.c, Decl(enumBasics3.ts, 12, 19)) >M.N.E1.a : Symbol(E1.a, Decl(enumBasics3.ts, 2, 20)) >M.N.E1 : Symbol(E1, Decl(enumBasics3.ts, 1, 22)) ->M.N : Symbol(N, Decl(enumBasics3.ts, 0, 10), Decl(enumBasics3.ts, 9, 10)) +>M.N : Symbol(N, Decl(enumBasics3.ts, 0, 13), Decl(enumBasics3.ts, 9, 13)) >M : Symbol(M, Decl(enumBasics3.ts, 0, 0), Decl(enumBasics3.ts, 7, 1)) ->N : Symbol(N, Decl(enumBasics3.ts, 0, 10), Decl(enumBasics3.ts, 9, 10)) +>N : Symbol(N, Decl(enumBasics3.ts, 0, 13), Decl(enumBasics3.ts, 9, 13)) >E1 : Symbol(E1, Decl(enumBasics3.ts, 1, 22)) >a : Symbol(E1.a, Decl(enumBasics3.ts, 2, 20)) } diff --git a/tests/baselines/reference/enumBasics3.types b/tests/baselines/reference/enumBasics3.types index f8ead4b6a53b3..cab19be42d7c5 100644 --- a/tests/baselines/reference/enumBasics3.types +++ b/tests/baselines/reference/enumBasics3.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/enumBasics3.ts] //// === enumBasics3.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -32,7 +32,7 @@ module M { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/enumDecl1.js b/tests/baselines/reference/enumDecl1.js index 65680b23e5248..5d90868cbd122 100644 --- a/tests/baselines/reference/enumDecl1.js +++ b/tests/baselines/reference/enumDecl1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/enumDecl1.ts] //// //// [enumDecl1.ts] -declare module mAmbient { +declare namespace mAmbient { enum e { x, y, diff --git a/tests/baselines/reference/enumDecl1.symbols b/tests/baselines/reference/enumDecl1.symbols index b9085e522ef4a..75717ff64c2bf 100644 --- a/tests/baselines/reference/enumDecl1.symbols +++ b/tests/baselines/reference/enumDecl1.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/enumDecl1.ts] //// === enumDecl1.ts === -declare module mAmbient { +declare namespace mAmbient { >mAmbient : Symbol(mAmbient, Decl(enumDecl1.ts, 0, 0)) enum e { ->e : Symbol(e, Decl(enumDecl1.ts, 0, 25)) +>e : Symbol(e, Decl(enumDecl1.ts, 0, 28)) x, >x : Symbol(e.x, Decl(enumDecl1.ts, 1, 12)) diff --git a/tests/baselines/reference/enumDecl1.types b/tests/baselines/reference/enumDecl1.types index 1b45fb037b98a..d3548d8de8818 100644 --- a/tests/baselines/reference/enumDecl1.types +++ b/tests/baselines/reference/enumDecl1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/enumDecl1.ts] //// === enumDecl1.ts === -declare module mAmbient { +declare namespace mAmbient { >mAmbient : typeof mAmbient > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.errors.txt b/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.errors.txt index de8ee8ae4477e..2d59946d08fb6 100644 --- a/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.errors.txt +++ b/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.errors.txt @@ -130,7 +130,7 @@ enumIsNotASubtypeOfAnythingButNumber.ts(117,5): error TS2411: Property 'foo' of function f() { } - module f { + namespace f { export var bar = 1; } interface I15 { @@ -142,7 +142,7 @@ enumIsNotASubtypeOfAnythingButNumber.ts(117,5): error TS2411: Property 'foo' of class c { baz: string } - module c { + namespace c { export var bar = 1; } interface I16 { diff --git a/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.js b/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.js index a97c2fa2500ca..3b9aa210c7554 100644 --- a/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.js +++ b/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.js @@ -90,7 +90,7 @@ interface I14 { function f() { } -module f { +namespace f { export var bar = 1; } interface I15 { @@ -100,7 +100,7 @@ interface I15 { class c { baz: string } -module c { +namespace c { export var bar = 1; } interface I16 { diff --git a/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.symbols b/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.symbols index c99b8732b3eb8..3bce1bb854142 100644 --- a/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.symbols +++ b/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.symbols @@ -202,7 +202,7 @@ interface I14 { function f() { } >f : Symbol(f, Decl(enumIsNotASubtypeOfAnythingButNumber.ts, 85, 1), Decl(enumIsNotASubtypeOfAnythingButNumber.ts, 88, 16)) -module f { +namespace f { >f : Symbol(f, Decl(enumIsNotASubtypeOfAnythingButNumber.ts, 85, 1), Decl(enumIsNotASubtypeOfAnythingButNumber.ts, 88, 16)) export var bar = 1; @@ -225,7 +225,7 @@ class c { baz: string } >c : Symbol(c, Decl(enumIsNotASubtypeOfAnythingButNumber.ts, 95, 1), Decl(enumIsNotASubtypeOfAnythingButNumber.ts, 98, 23)) >baz : Symbol(c.baz, Decl(enumIsNotASubtypeOfAnythingButNumber.ts, 98, 9)) -module c { +namespace c { >c : Symbol(c, Decl(enumIsNotASubtypeOfAnythingButNumber.ts, 95, 1), Decl(enumIsNotASubtypeOfAnythingButNumber.ts, 98, 23)) export var bar = 1; diff --git a/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.types b/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.types index 0dd33cfc2eece..0e28e1010b07b 100644 --- a/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.types +++ b/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.types @@ -189,7 +189,7 @@ function f() { } >f : typeof f > : ^^^^^^^^ -module f { +namespace f { >f : typeof f > : ^^^^^^^^ @@ -218,7 +218,7 @@ class c { baz: string } >baz : string > : ^^^^^^ -module c { +namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.errors.txt b/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.errors.txt index f33a845975fdb..b74001920c76e 100644 --- a/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.errors.txt +++ b/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.errors.txt @@ -6,23 +6,23 @@ enumLiteralAssignableToEnumInsideUnion.ts(28,7): error TS2322: Type 'Foo.A' is n ==== enumLiteralAssignableToEnumInsideUnion.ts (5 errors) ==== - module X { + namespace X { export enum Foo { A, B } } - module Y { + namespace Y { export enum Foo { A, B } } - module Z { + namespace Z { export enum Foo { A = 1 << 1, B = 1 << 2, } } - module Ka { + namespace Ka { export enum Foo { A = 1 << 10, B = 1 << 11, diff --git a/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.js b/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.js index 8f9876fb0a510..3a660f327ef3c 100644 --- a/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.js +++ b/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.js @@ -1,23 +1,23 @@ //// [tests/cases/compiler/enumLiteralAssignableToEnumInsideUnion.ts] //// //// [enumLiteralAssignableToEnumInsideUnion.ts] -module X { +namespace X { export enum Foo { A, B } } -module Y { +namespace Y { export enum Foo { A, B } } -module Z { +namespace Z { export enum Foo { A = 1 << 1, B = 1 << 2, } } -module Ka { +namespace Ka { export enum Foo { A = 1 << 10, B = 1 << 11, diff --git a/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.symbols b/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.symbols index 3255742fdb812..e60faeb949e78 100644 --- a/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.symbols +++ b/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.symbols @@ -1,33 +1,33 @@ //// [tests/cases/compiler/enumLiteralAssignableToEnumInsideUnion.ts] //// === enumLiteralAssignableToEnumInsideUnion.ts === -module X { +namespace X { >X : Symbol(X, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 0, 0)) export enum Foo { ->Foo : Symbol(Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 0, 10)) +>Foo : Symbol(Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 0, 13)) A, B >A : Symbol(Foo.A, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 1, 21)) >B : Symbol(Foo.B, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 2, 10)) } } -module Y { +namespace Y { >Y : Symbol(Y, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 4, 1)) export enum Foo { ->Foo : Symbol(Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 5, 10)) +>Foo : Symbol(Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 5, 13)) A, B >A : Symbol(Foo.A, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 6, 21)) >B : Symbol(Foo.B, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 7, 10)) } } -module Z { +namespace Z { >Z : Symbol(Z, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 9, 1)) export enum Foo { ->Foo : Symbol(Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 10, 10)) +>Foo : Symbol(Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 10, 13)) A = 1 << 1, >A : Symbol(Foo.A, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 11, 21)) @@ -36,11 +36,11 @@ module Z { >B : Symbol(Foo.B, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 12, 19)) } } -module Ka { +namespace Ka { >Ka : Symbol(Ka, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 15, 1)) export enum Foo { ->Foo : Symbol(Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 16, 11)) +>Foo : Symbol(Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 16, 14)) A = 1 << 10, >A : Symbol(Foo.A, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 17, 21)) @@ -52,66 +52,66 @@ module Ka { const e0: X.Foo | boolean = Y.Foo.A; // ok >e0 : Symbol(e0, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 22, 5)) >X : Symbol(X, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 0, 0)) ->Foo : Symbol(X.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 0, 10)) +>Foo : Symbol(X.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 0, 13)) >Y.Foo.A : Symbol(Y.Foo.A, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 6, 21)) ->Y.Foo : Symbol(Y.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 5, 10)) +>Y.Foo : Symbol(Y.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 5, 13)) >Y : Symbol(Y, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 4, 1)) ->Foo : Symbol(Y.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 5, 10)) +>Foo : Symbol(Y.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 5, 13)) >A : Symbol(Y.Foo.A, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 6, 21)) const e1: X.Foo | boolean = Z.Foo.A; // not legal, Z is computed >e1 : Symbol(e1, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 23, 5)) >X : Symbol(X, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 0, 0)) ->Foo : Symbol(X.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 0, 10)) +>Foo : Symbol(X.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 0, 13)) >Z.Foo.A : Symbol(Z.Foo.A, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 11, 21)) ->Z.Foo : Symbol(Z.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 10, 10)) +>Z.Foo : Symbol(Z.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 10, 13)) >Z : Symbol(Z, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 9, 1)) ->Foo : Symbol(Z.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 10, 10)) +>Foo : Symbol(Z.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 10, 13)) >A : Symbol(Z.Foo.A, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 11, 21)) const e2: X.Foo.A | X.Foo.B | boolean = Z.Foo.A; // still not legal >e2 : Symbol(e2, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 24, 5)) >X : Symbol(X, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 0, 0)) ->Foo : Symbol(X.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 0, 10)) +>Foo : Symbol(X.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 0, 13)) >A : Symbol(X.Foo.A, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 1, 21)) >X : Symbol(X, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 0, 0)) ->Foo : Symbol(X.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 0, 10)) +>Foo : Symbol(X.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 0, 13)) >B : Symbol(X.Foo.B, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 2, 10)) >Z.Foo.A : Symbol(Z.Foo.A, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 11, 21)) ->Z.Foo : Symbol(Z.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 10, 10)) +>Z.Foo : Symbol(Z.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 10, 13)) >Z : Symbol(Z, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 9, 1)) ->Foo : Symbol(Z.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 10, 10)) +>Foo : Symbol(Z.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 10, 13)) >A : Symbol(Z.Foo.A, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 11, 21)) const e3: X.Foo.B | boolean = Z.Foo.A; // not legal >e3 : Symbol(e3, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 25, 5)) >X : Symbol(X, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 0, 0)) ->Foo : Symbol(X.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 0, 10)) +>Foo : Symbol(X.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 0, 13)) >B : Symbol(X.Foo.B, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 2, 10)) >Z.Foo.A : Symbol(Z.Foo.A, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 11, 21)) ->Z.Foo : Symbol(Z.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 10, 10)) +>Z.Foo : Symbol(Z.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 10, 13)) >Z : Symbol(Z, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 9, 1)) ->Foo : Symbol(Z.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 10, 10)) +>Foo : Symbol(Z.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 10, 13)) >A : Symbol(Z.Foo.A, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 11, 21)) const e4: X.Foo.A | boolean = Z.Foo.A; // not legal either because Z.Foo is computed and Z.Foo.A is not necessarily assignable to X.Foo.A >e4 : Symbol(e4, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 26, 5)) >X : Symbol(X, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 0, 0)) ->Foo : Symbol(X.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 0, 10)) +>Foo : Symbol(X.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 0, 13)) >A : Symbol(X.Foo.A, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 1, 21)) >Z.Foo.A : Symbol(Z.Foo.A, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 11, 21)) ->Z.Foo : Symbol(Z.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 10, 10)) +>Z.Foo : Symbol(Z.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 10, 13)) >Z : Symbol(Z, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 9, 1)) ->Foo : Symbol(Z.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 10, 10)) +>Foo : Symbol(Z.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 10, 13)) >A : Symbol(Z.Foo.A, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 11, 21)) const e5: Ka.Foo | boolean = Z.Foo.A; // ok >e5 : Symbol(e5, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 27, 5)) >Ka : Symbol(Ka, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 15, 1)) ->Foo : Symbol(Ka.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 16, 11)) +>Foo : Symbol(Ka.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 16, 14)) >Z.Foo.A : Symbol(Z.Foo.A, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 11, 21)) ->Z.Foo : Symbol(Z.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 10, 10)) +>Z.Foo : Symbol(Z.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 10, 13)) >Z : Symbol(Z, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 9, 1)) ->Foo : Symbol(Z.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 10, 10)) +>Foo : Symbol(Z.Foo, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 10, 13)) >A : Symbol(Z.Foo.A, Decl(enumLiteralAssignableToEnumInsideUnion.ts, 11, 21)) diff --git a/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.types b/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.types index 2c27c0ec8ad42..88d92e553e4c0 100644 --- a/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.types +++ b/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/enumLiteralAssignableToEnumInsideUnion.ts] //// === enumLiteralAssignableToEnumInsideUnion.ts === -module X { +namespace X { >X : typeof X > : ^^^^^^^^ @@ -16,7 +16,7 @@ module X { > : ^^^^^ } } -module Y { +namespace Y { >Y : typeof Y > : ^^^^^^^^ @@ -31,7 +31,7 @@ module Y { > : ^^^^^ } } -module Z { +namespace Z { >Z : typeof Z > : ^^^^^^^^ @@ -60,7 +60,7 @@ module Z { > : ^ } } -module Ka { +namespace Ka { >Ka : typeof Ka > : ^^^^^^^^^ diff --git a/tests/baselines/reference/enumMerging.js b/tests/baselines/reference/enumMerging.js index a0c38a914c4f7..f8a6121cdfd9c 100644 --- a/tests/baselines/reference/enumMerging.js +++ b/tests/baselines/reference/enumMerging.js @@ -3,7 +3,7 @@ //// [enumMerging.ts] // Enum with only constant members across 2 declarations with the same root module // Enum with initializer in all declarations with constant members with the same root module -module M1 { +namespace M1 { enum EImpl1 { A, B, C } @@ -24,7 +24,7 @@ module M1 { } // Enum with only computed members across 2 declarations with the same root module -module M2 { +namespace M2 { export enum EComp2 { A = 'foo'.length, B = 'foo'.length, C = 'foo'.length } @@ -37,7 +37,7 @@ module M2 { } // Enum with initializer in only one of two declarations with constant members with the same root module -module M3 { +namespace M3 { enum EInit { A, B @@ -49,18 +49,18 @@ module M3 { } // Enums with same name but different root module -module M4 { +namespace M4 { export enum Color { Red, Green, Blue } } -module M5 { +namespace M5 { export enum Color { Red, Green, Blue } } -module M6.A { +namespace M6.A { export enum Color { Red, Green, Blue } } -module M6 { - export module A { +namespace M6 { + export namespace A { export enum Color { Yellow = 1 } } var t = A.Color.Yellow; diff --git a/tests/baselines/reference/enumMerging.symbols b/tests/baselines/reference/enumMerging.symbols index d74457db3eb16..0f337a1909cd2 100644 --- a/tests/baselines/reference/enumMerging.symbols +++ b/tests/baselines/reference/enumMerging.symbols @@ -3,11 +3,11 @@ === enumMerging.ts === // Enum with only constant members across 2 declarations with the same root module // Enum with initializer in all declarations with constant members with the same root module -module M1 { +namespace M1 { >M1 : Symbol(M1, Decl(enumMerging.ts, 0, 0)) enum EImpl1 { ->EImpl1 : Symbol(EImpl1, Decl(enumMerging.ts, 2, 11), Decl(enumMerging.ts, 5, 5)) +>EImpl1 : Symbol(EImpl1, Decl(enumMerging.ts, 2, 14), Decl(enumMerging.ts, 5, 5)) A, B, C >A : Symbol(EImpl1.A, Decl(enumMerging.ts, 3, 17)) @@ -16,7 +16,7 @@ module M1 { } enum EImpl1 { ->EImpl1 : Symbol(EImpl1, Decl(enumMerging.ts, 2, 11), Decl(enumMerging.ts, 5, 5)) +>EImpl1 : Symbol(EImpl1, Decl(enumMerging.ts, 2, 14), Decl(enumMerging.ts, 5, 5)) D = 1, E, F >D : Symbol(EImpl1.D, Decl(enumMerging.ts, 7, 17)) @@ -65,11 +65,11 @@ module M1 { } // Enum with only computed members across 2 declarations with the same root module -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(enumMerging.ts, 20, 1)) export enum EComp2 { ->EComp2 : Symbol(EComp2, Decl(enumMerging.ts, 23, 11), Decl(enumMerging.ts, 26, 5)) +>EComp2 : Symbol(EComp2, Decl(enumMerging.ts, 23, 14), Decl(enumMerging.ts, 26, 5)) A = 'foo'.length, B = 'foo'.length, C = 'foo'.length >A : Symbol(EComp2.A, Decl(enumMerging.ts, 24, 24)) @@ -84,7 +84,7 @@ module M2 { } export enum EComp2 { ->EComp2 : Symbol(EComp2, Decl(enumMerging.ts, 23, 11), Decl(enumMerging.ts, 26, 5)) +>EComp2 : Symbol(EComp2, Decl(enumMerging.ts, 23, 14), Decl(enumMerging.ts, 26, 5)) D = 'foo'.length, E = 'foo'.length, F = 'foo'.length >D : Symbol(EComp2.D, Decl(enumMerging.ts, 28, 24)) @@ -101,31 +101,31 @@ module M2 { var x = [EComp2.A, EComp2.B, EComp2.C, EComp2.D, EComp2.E, EComp2.F]; >x : Symbol(x, Decl(enumMerging.ts, 32, 7)) >EComp2.A : Symbol(EComp2.A, Decl(enumMerging.ts, 24, 24)) ->EComp2 : Symbol(EComp2, Decl(enumMerging.ts, 23, 11), Decl(enumMerging.ts, 26, 5)) +>EComp2 : Symbol(EComp2, Decl(enumMerging.ts, 23, 14), Decl(enumMerging.ts, 26, 5)) >A : Symbol(EComp2.A, Decl(enumMerging.ts, 24, 24)) >EComp2.B : Symbol(EComp2.B, Decl(enumMerging.ts, 25, 25)) ->EComp2 : Symbol(EComp2, Decl(enumMerging.ts, 23, 11), Decl(enumMerging.ts, 26, 5)) +>EComp2 : Symbol(EComp2, Decl(enumMerging.ts, 23, 14), Decl(enumMerging.ts, 26, 5)) >B : Symbol(EComp2.B, Decl(enumMerging.ts, 25, 25)) >EComp2.C : Symbol(EComp2.C, Decl(enumMerging.ts, 25, 43)) ->EComp2 : Symbol(EComp2, Decl(enumMerging.ts, 23, 11), Decl(enumMerging.ts, 26, 5)) +>EComp2 : Symbol(EComp2, Decl(enumMerging.ts, 23, 14), Decl(enumMerging.ts, 26, 5)) >C : Symbol(EComp2.C, Decl(enumMerging.ts, 25, 43)) >EComp2.D : Symbol(EComp2.D, Decl(enumMerging.ts, 28, 24)) ->EComp2 : Symbol(EComp2, Decl(enumMerging.ts, 23, 11), Decl(enumMerging.ts, 26, 5)) +>EComp2 : Symbol(EComp2, Decl(enumMerging.ts, 23, 14), Decl(enumMerging.ts, 26, 5)) >D : Symbol(EComp2.D, Decl(enumMerging.ts, 28, 24)) >EComp2.E : Symbol(EComp2.E, Decl(enumMerging.ts, 29, 25)) ->EComp2 : Symbol(EComp2, Decl(enumMerging.ts, 23, 11), Decl(enumMerging.ts, 26, 5)) +>EComp2 : Symbol(EComp2, Decl(enumMerging.ts, 23, 14), Decl(enumMerging.ts, 26, 5)) >E : Symbol(EComp2.E, Decl(enumMerging.ts, 29, 25)) >EComp2.F : Symbol(EComp2.F, Decl(enumMerging.ts, 29, 43)) ->EComp2 : Symbol(EComp2, Decl(enumMerging.ts, 23, 11), Decl(enumMerging.ts, 26, 5)) +>EComp2 : Symbol(EComp2, Decl(enumMerging.ts, 23, 14), Decl(enumMerging.ts, 26, 5)) >F : Symbol(EComp2.F, Decl(enumMerging.ts, 29, 43)) } // Enum with initializer in only one of two declarations with constant members with the same root module -module M3 { +namespace M3 { >M3 : Symbol(M3, Decl(enumMerging.ts, 33, 1)) enum EInit { ->EInit : Symbol(EInit, Decl(enumMerging.ts, 36, 11), Decl(enumMerging.ts, 40, 5)) +>EInit : Symbol(EInit, Decl(enumMerging.ts, 36, 14), Decl(enumMerging.ts, 40, 5)) A, >A : Symbol(EInit.A, Decl(enumMerging.ts, 37, 16)) @@ -135,7 +135,7 @@ module M3 { } enum EInit { ->EInit : Symbol(EInit, Decl(enumMerging.ts, 36, 11), Decl(enumMerging.ts, 40, 5)) +>EInit : Symbol(EInit, Decl(enumMerging.ts, 36, 14), Decl(enumMerging.ts, 40, 5)) C = 1, D, E >C : Symbol(EInit.C, Decl(enumMerging.ts, 42, 16)) @@ -145,59 +145,59 @@ module M3 { } // Enums with same name but different root module -module M4 { +namespace M4 { >M4 : Symbol(M4, Decl(enumMerging.ts, 45, 1)) export enum Color { Red, Green, Blue } ->Color : Symbol(Color, Decl(enumMerging.ts, 48, 11)) +>Color : Symbol(Color, Decl(enumMerging.ts, 48, 14)) >Red : Symbol(Color.Red, Decl(enumMerging.ts, 49, 23)) >Green : Symbol(Color.Green, Decl(enumMerging.ts, 49, 28)) >Blue : Symbol(Color.Blue, Decl(enumMerging.ts, 49, 35)) } -module M5 { +namespace M5 { >M5 : Symbol(M5, Decl(enumMerging.ts, 50, 1)) export enum Color { Red, Green, Blue } ->Color : Symbol(Color, Decl(enumMerging.ts, 51, 11)) +>Color : Symbol(Color, Decl(enumMerging.ts, 51, 14)) >Red : Symbol(Color.Red, Decl(enumMerging.ts, 52, 23)) >Green : Symbol(Color.Green, Decl(enumMerging.ts, 52, 28)) >Blue : Symbol(Color.Blue, Decl(enumMerging.ts, 52, 35)) } -module M6.A { +namespace M6.A { >M6 : Symbol(M6, Decl(enumMerging.ts, 53, 1), Decl(enumMerging.ts, 57, 1)) ->A : Symbol(A, Decl(enumMerging.ts, 55, 10), Decl(enumMerging.ts, 58, 11)) +>A : Symbol(A, Decl(enumMerging.ts, 55, 13), Decl(enumMerging.ts, 58, 14)) export enum Color { Red, Green, Blue } ->Color : Symbol(Color, Decl(enumMerging.ts, 55, 13), Decl(enumMerging.ts, 59, 21)) +>Color : Symbol(Color, Decl(enumMerging.ts, 55, 16), Decl(enumMerging.ts, 59, 24)) >Red : Symbol(Color.Red, Decl(enumMerging.ts, 56, 23)) >Green : Symbol(Color.Green, Decl(enumMerging.ts, 56, 28)) >Blue : Symbol(Color.Blue, Decl(enumMerging.ts, 56, 35)) } -module M6 { +namespace M6 { >M6 : Symbol(M6, Decl(enumMerging.ts, 53, 1), Decl(enumMerging.ts, 57, 1)) - export module A { ->A : Symbol(A, Decl(enumMerging.ts, 55, 10), Decl(enumMerging.ts, 58, 11)) + export namespace A { +>A : Symbol(A, Decl(enumMerging.ts, 55, 13), Decl(enumMerging.ts, 58, 14)) export enum Color { Yellow = 1 } ->Color : Symbol(Color, Decl(enumMerging.ts, 55, 13), Decl(enumMerging.ts, 59, 21)) +>Color : Symbol(Color, Decl(enumMerging.ts, 55, 16), Decl(enumMerging.ts, 59, 24)) >Yellow : Symbol(Color.Yellow, Decl(enumMerging.ts, 60, 27)) } var t = A.Color.Yellow; >t : Symbol(t, Decl(enumMerging.ts, 62, 7)) >A.Color.Yellow : Symbol(A.Color.Yellow, Decl(enumMerging.ts, 60, 27)) ->A.Color : Symbol(A.Color, Decl(enumMerging.ts, 55, 13), Decl(enumMerging.ts, 59, 21)) ->A : Symbol(A, Decl(enumMerging.ts, 55, 10), Decl(enumMerging.ts, 58, 11)) ->Color : Symbol(A.Color, Decl(enumMerging.ts, 55, 13), Decl(enumMerging.ts, 59, 21)) +>A.Color : Symbol(A.Color, Decl(enumMerging.ts, 55, 16), Decl(enumMerging.ts, 59, 24)) +>A : Symbol(A, Decl(enumMerging.ts, 55, 13), Decl(enumMerging.ts, 58, 14)) +>Color : Symbol(A.Color, Decl(enumMerging.ts, 55, 16), Decl(enumMerging.ts, 59, 24)) >Yellow : Symbol(A.Color.Yellow, Decl(enumMerging.ts, 60, 27)) t = A.Color.Red; >t : Symbol(t, Decl(enumMerging.ts, 62, 7)) >A.Color.Red : Symbol(A.Color.Red, Decl(enumMerging.ts, 56, 23)) ->A.Color : Symbol(A.Color, Decl(enumMerging.ts, 55, 13), Decl(enumMerging.ts, 59, 21)) ->A : Symbol(A, Decl(enumMerging.ts, 55, 10), Decl(enumMerging.ts, 58, 11)) ->Color : Symbol(A.Color, Decl(enumMerging.ts, 55, 13), Decl(enumMerging.ts, 59, 21)) +>A.Color : Symbol(A.Color, Decl(enumMerging.ts, 55, 16), Decl(enumMerging.ts, 59, 24)) +>A : Symbol(A, Decl(enumMerging.ts, 55, 13), Decl(enumMerging.ts, 58, 14)) +>Color : Symbol(A.Color, Decl(enumMerging.ts, 55, 16), Decl(enumMerging.ts, 59, 24)) >Red : Symbol(A.Color.Red, Decl(enumMerging.ts, 56, 23)) } diff --git a/tests/baselines/reference/enumMerging.types b/tests/baselines/reference/enumMerging.types index 5586a56222de3..eeec2de2a615c 100644 --- a/tests/baselines/reference/enumMerging.types +++ b/tests/baselines/reference/enumMerging.types @@ -3,7 +3,7 @@ === enumMerging.ts === // Enum with only constant members across 2 declarations with the same root module // Enum with initializer in all declarations with constant members with the same root module -module M1 { +namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ @@ -117,7 +117,7 @@ module M1 { } // Enum with only computed members across 2 declarations with the same root module -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ @@ -227,7 +227,7 @@ module M2 { } // Enum with initializer in only one of two declarations with constant members with the same root module -module M3 { +namespace M3 { >M3 : typeof M3 > : ^^^^^^^^^ @@ -261,7 +261,7 @@ module M3 { } // Enums with same name but different root module -module M4 { +namespace M4 { >M4 : typeof M4 > : ^^^^^^^^^ @@ -275,7 +275,7 @@ module M4 { >Blue : Color.Blue > : ^^^^^^^^^^ } -module M5 { +namespace M5 { >M5 : typeof M5 > : ^^^^^^^^^ @@ -290,7 +290,7 @@ module M5 { > : ^^^^^^^^^^ } -module M6.A { +namespace M6.A { >M6 : typeof M6 > : ^^^^^^^^^ >A : typeof A @@ -306,11 +306,11 @@ module M6.A { >Blue : Color.Blue > : ^^^^^^^^^^ } -module M6 { +namespace M6 { >M6 : typeof M6 > : ^^^^^^^^^ - export module A { + export namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/enumMergingErrors.errors.txt b/tests/baselines/reference/enumMergingErrors.errors.txt index e0d3ba2e8233a..bc0c89ae4a5be 100644 --- a/tests/baselines/reference/enumMergingErrors.errors.txt +++ b/tests/baselines/reference/enumMergingErrors.errors.txt @@ -4,30 +4,30 @@ enumMergingErrors.ts(38,22): error TS2432: In an enum with multiple declarations ==== enumMergingErrors.ts (2 errors) ==== // Enum with constant, computed, constant members split across 3 declarations with the same root module - module M { + namespace M { export enum E1 { A = 0 } export enum E2 { C } export enum E3 { A = 0 } } - module M { + namespace M { export enum E1 { B = 'foo'.length } export enum E2 { B = 'foo'.length } export enum E3 { C } } - module M { + namespace M { export enum E1 { C } export enum E2 { A = 0 } export enum E3 { B = 'foo'.length } } // Enum with no initializer in either declaration with constant members with the same root module - module M1 { + namespace M1 { export enum E1 { A = 0 } } - module M1 { + namespace M1 { export enum E1 { B } } - module M1 { + namespace M1 { export enum E1 { C } ~ !!! error TS2432: In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element. @@ -35,13 +35,13 @@ enumMergingErrors.ts(38,22): error TS2432: In an enum with multiple declarations // Enum with initializer in only one of three declarations with constant members with the same root module - module M2 { + namespace M2 { export enum E1 { A } } - module M2 { + namespace M2 { export enum E1 { B = 0 } } - module M2 { + namespace M2 { export enum E1 { C } ~ !!! error TS2432: In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element. diff --git a/tests/baselines/reference/enumMergingErrors.js b/tests/baselines/reference/enumMergingErrors.js index a807f58e2caff..2c2d29a4d1e2f 100644 --- a/tests/baselines/reference/enumMergingErrors.js +++ b/tests/baselines/reference/enumMergingErrors.js @@ -2,42 +2,42 @@ //// [enumMergingErrors.ts] // Enum with constant, computed, constant members split across 3 declarations with the same root module -module M { +namespace M { export enum E1 { A = 0 } export enum E2 { C } export enum E3 { A = 0 } } -module M { +namespace M { export enum E1 { B = 'foo'.length } export enum E2 { B = 'foo'.length } export enum E3 { C } } -module M { +namespace M { export enum E1 { C } export enum E2 { A = 0 } export enum E3 { B = 'foo'.length } } // Enum with no initializer in either declaration with constant members with the same root module -module M1 { +namespace M1 { export enum E1 { A = 0 } } -module M1 { +namespace M1 { export enum E1 { B } } -module M1 { +namespace M1 { export enum E1 { C } } // Enum with initializer in only one of three declarations with constant members with the same root module -module M2 { +namespace M2 { export enum E1 { A } } -module M2 { +namespace M2 { export enum E1 { B = 0 } } -module M2 { +namespace M2 { export enum E1 { C } } diff --git a/tests/baselines/reference/enumMergingErrors.symbols b/tests/baselines/reference/enumMergingErrors.symbols index 2b51b9b36d0cd..19ace384149cc 100644 --- a/tests/baselines/reference/enumMergingErrors.symbols +++ b/tests/baselines/reference/enumMergingErrors.symbols @@ -2,11 +2,11 @@ === enumMergingErrors.ts === // Enum with constant, computed, constant members split across 3 declarations with the same root module -module M { +namespace M { >M : Symbol(M, Decl(enumMergingErrors.ts, 0, 0), Decl(enumMergingErrors.ts, 5, 1), Decl(enumMergingErrors.ts, 10, 1)) export enum E1 { A = 0 } ->E1 : Symbol(E1, Decl(enumMergingErrors.ts, 1, 10), Decl(enumMergingErrors.ts, 6, 10), Decl(enumMergingErrors.ts, 11, 10)) +>E1 : Symbol(E1, Decl(enumMergingErrors.ts, 1, 13), Decl(enumMergingErrors.ts, 6, 13), Decl(enumMergingErrors.ts, 11, 13)) >A : Symbol(E1.A, Decl(enumMergingErrors.ts, 2, 20)) export enum E2 { C } @@ -17,11 +17,11 @@ module M { >E3 : Symbol(E3, Decl(enumMergingErrors.ts, 3, 24), Decl(enumMergingErrors.ts, 8, 39), Decl(enumMergingErrors.ts, 13, 28)) >A : Symbol(E3.A, Decl(enumMergingErrors.ts, 4, 20)) } -module M { +namespace M { >M : Symbol(M, Decl(enumMergingErrors.ts, 0, 0), Decl(enumMergingErrors.ts, 5, 1), Decl(enumMergingErrors.ts, 10, 1)) export enum E1 { B = 'foo'.length } ->E1 : Symbol(E1, Decl(enumMergingErrors.ts, 1, 10), Decl(enumMergingErrors.ts, 6, 10), Decl(enumMergingErrors.ts, 11, 10)) +>E1 : Symbol(E1, Decl(enumMergingErrors.ts, 1, 13), Decl(enumMergingErrors.ts, 6, 13), Decl(enumMergingErrors.ts, 11, 13)) >B : Symbol(E1.B, Decl(enumMergingErrors.ts, 7, 20)) >'foo'.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --)) >length : Symbol(String.length, Decl(lib.es5.d.ts, --, --)) @@ -36,11 +36,11 @@ module M { >E3 : Symbol(E3, Decl(enumMergingErrors.ts, 3, 24), Decl(enumMergingErrors.ts, 8, 39), Decl(enumMergingErrors.ts, 13, 28)) >C : Symbol(E3.C, Decl(enumMergingErrors.ts, 9, 20)) } -module M { +namespace M { >M : Symbol(M, Decl(enumMergingErrors.ts, 0, 0), Decl(enumMergingErrors.ts, 5, 1), Decl(enumMergingErrors.ts, 10, 1)) export enum E1 { C } ->E1 : Symbol(E1, Decl(enumMergingErrors.ts, 1, 10), Decl(enumMergingErrors.ts, 6, 10), Decl(enumMergingErrors.ts, 11, 10)) +>E1 : Symbol(E1, Decl(enumMergingErrors.ts, 1, 13), Decl(enumMergingErrors.ts, 6, 13), Decl(enumMergingErrors.ts, 11, 13)) >C : Symbol(E1.C, Decl(enumMergingErrors.ts, 12, 20)) export enum E2 { A = 0 } @@ -55,49 +55,49 @@ module M { } // Enum with no initializer in either declaration with constant members with the same root module -module M1 { +namespace M1 { >M1 : Symbol(M1, Decl(enumMergingErrors.ts, 15, 1), Decl(enumMergingErrors.ts, 20, 1), Decl(enumMergingErrors.ts, 23, 1)) export enum E1 { A = 0 } ->E1 : Symbol(E1, Decl(enumMergingErrors.ts, 18, 11), Decl(enumMergingErrors.ts, 21, 11), Decl(enumMergingErrors.ts, 24, 11)) +>E1 : Symbol(E1, Decl(enumMergingErrors.ts, 18, 14), Decl(enumMergingErrors.ts, 21, 14), Decl(enumMergingErrors.ts, 24, 14)) >A : Symbol(E1.A, Decl(enumMergingErrors.ts, 19, 20)) } -module M1 { +namespace M1 { >M1 : Symbol(M1, Decl(enumMergingErrors.ts, 15, 1), Decl(enumMergingErrors.ts, 20, 1), Decl(enumMergingErrors.ts, 23, 1)) export enum E1 { B } ->E1 : Symbol(E1, Decl(enumMergingErrors.ts, 18, 11), Decl(enumMergingErrors.ts, 21, 11), Decl(enumMergingErrors.ts, 24, 11)) +>E1 : Symbol(E1, Decl(enumMergingErrors.ts, 18, 14), Decl(enumMergingErrors.ts, 21, 14), Decl(enumMergingErrors.ts, 24, 14)) >B : Symbol(E1.B, Decl(enumMergingErrors.ts, 22, 20)) } -module M1 { +namespace M1 { >M1 : Symbol(M1, Decl(enumMergingErrors.ts, 15, 1), Decl(enumMergingErrors.ts, 20, 1), Decl(enumMergingErrors.ts, 23, 1)) export enum E1 { C } ->E1 : Symbol(E1, Decl(enumMergingErrors.ts, 18, 11), Decl(enumMergingErrors.ts, 21, 11), Decl(enumMergingErrors.ts, 24, 11)) +>E1 : Symbol(E1, Decl(enumMergingErrors.ts, 18, 14), Decl(enumMergingErrors.ts, 21, 14), Decl(enumMergingErrors.ts, 24, 14)) >C : Symbol(E1.C, Decl(enumMergingErrors.ts, 25, 20)) } // Enum with initializer in only one of three declarations with constant members with the same root module -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(enumMergingErrors.ts, 26, 1), Decl(enumMergingErrors.ts, 32, 1), Decl(enumMergingErrors.ts, 35, 1)) export enum E1 { A } ->E1 : Symbol(E1, Decl(enumMergingErrors.ts, 30, 11), Decl(enumMergingErrors.ts, 33, 11), Decl(enumMergingErrors.ts, 36, 11)) +>E1 : Symbol(E1, Decl(enumMergingErrors.ts, 30, 14), Decl(enumMergingErrors.ts, 33, 14), Decl(enumMergingErrors.ts, 36, 14)) >A : Symbol(E1.A, Decl(enumMergingErrors.ts, 31, 20)) } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(enumMergingErrors.ts, 26, 1), Decl(enumMergingErrors.ts, 32, 1), Decl(enumMergingErrors.ts, 35, 1)) export enum E1 { B = 0 } ->E1 : Symbol(E1, Decl(enumMergingErrors.ts, 30, 11), Decl(enumMergingErrors.ts, 33, 11), Decl(enumMergingErrors.ts, 36, 11)) +>E1 : Symbol(E1, Decl(enumMergingErrors.ts, 30, 14), Decl(enumMergingErrors.ts, 33, 14), Decl(enumMergingErrors.ts, 36, 14)) >B : Symbol(E1.B, Decl(enumMergingErrors.ts, 34, 20)) } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(enumMergingErrors.ts, 26, 1), Decl(enumMergingErrors.ts, 32, 1), Decl(enumMergingErrors.ts, 35, 1)) export enum E1 { C } ->E1 : Symbol(E1, Decl(enumMergingErrors.ts, 30, 11), Decl(enumMergingErrors.ts, 33, 11), Decl(enumMergingErrors.ts, 36, 11)) +>E1 : Symbol(E1, Decl(enumMergingErrors.ts, 30, 14), Decl(enumMergingErrors.ts, 33, 14), Decl(enumMergingErrors.ts, 36, 14)) >C : Symbol(E1.C, Decl(enumMergingErrors.ts, 37, 20)) } diff --git a/tests/baselines/reference/enumMergingErrors.types b/tests/baselines/reference/enumMergingErrors.types index 963a299bf36bf..7059e49701091 100644 --- a/tests/baselines/reference/enumMergingErrors.types +++ b/tests/baselines/reference/enumMergingErrors.types @@ -2,7 +2,7 @@ === enumMergingErrors.ts === // Enum with constant, computed, constant members split across 3 declarations with the same root module -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -28,7 +28,7 @@ module M { >0 : 0 > : ^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -62,7 +62,7 @@ module M { >C : E3.A > : ^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -94,7 +94,7 @@ module M { } // Enum with no initializer in either declaration with constant members with the same root module -module M1 { +namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ @@ -106,7 +106,7 @@ module M1 { >0 : 0 > : ^ } -module M1 { +namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ @@ -116,7 +116,7 @@ module M1 { >B : E1.A > : ^^^^ } -module M1 { +namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ @@ -129,7 +129,7 @@ module M1 { // Enum with initializer in only one of three declarations with constant members with the same root module -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ @@ -139,7 +139,7 @@ module M2 { >A : E1.A > : ^^^^ } -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ @@ -151,7 +151,7 @@ module M2 { >0 : 0 > : ^ } -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/enumsWithMultipleDeclarations3.js b/tests/baselines/reference/enumsWithMultipleDeclarations3.js index dd4ba6cb79976..d23017459463d 100644 --- a/tests/baselines/reference/enumsWithMultipleDeclarations3.js +++ b/tests/baselines/reference/enumsWithMultipleDeclarations3.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/enumsWithMultipleDeclarations3.ts] //// //// [enumsWithMultipleDeclarations3.ts] -module E { +namespace E { } enum E { diff --git a/tests/baselines/reference/enumsWithMultipleDeclarations3.symbols b/tests/baselines/reference/enumsWithMultipleDeclarations3.symbols index a0121d315847f..cf8886cba9ab5 100644 --- a/tests/baselines/reference/enumsWithMultipleDeclarations3.symbols +++ b/tests/baselines/reference/enumsWithMultipleDeclarations3.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/enumsWithMultipleDeclarations3.ts] //// === enumsWithMultipleDeclarations3.ts === -module E { +namespace E { >E : Symbol(E, Decl(enumsWithMultipleDeclarations3.ts, 0, 0), Decl(enumsWithMultipleDeclarations3.ts, 1, 1)) } diff --git a/tests/baselines/reference/enumsWithMultipleDeclarations3.types b/tests/baselines/reference/enumsWithMultipleDeclarations3.types index 2c3270e9c3321..0d697d1397036 100644 --- a/tests/baselines/reference/enumsWithMultipleDeclarations3.types +++ b/tests/baselines/reference/enumsWithMultipleDeclarations3.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/enumsWithMultipleDeclarations3.ts] //// === enumsWithMultipleDeclarations3.ts === -module E { +namespace E { } enum E { diff --git a/tests/baselines/reference/es5ExportEqualsDts.js b/tests/baselines/reference/es5ExportEqualsDts.js index 06ab915bddc34..5ad7f34c49a11 100644 --- a/tests/baselines/reference/es5ExportEqualsDts.js +++ b/tests/baselines/reference/es5ExportEqualsDts.js @@ -8,7 +8,7 @@ class A { } } -module A { +namespace A { export interface B { } } diff --git a/tests/baselines/reference/es5ExportEqualsDts.symbols b/tests/baselines/reference/es5ExportEqualsDts.symbols index f7370baf3d190..7ed6986e62a26 100644 --- a/tests/baselines/reference/es5ExportEqualsDts.symbols +++ b/tests/baselines/reference/es5ExportEqualsDts.symbols @@ -10,18 +10,18 @@ class A { var aVal: A.B; >aVal : Symbol(aVal, Decl(es5ExportEqualsDts.ts, 2, 11)) >A : Symbol(A, Decl(es5ExportEqualsDts.ts, 0, 0), Decl(es5ExportEqualsDts.ts, 5, 1)) ->B : Symbol(A.B, Decl(es5ExportEqualsDts.ts, 7, 10)) +>B : Symbol(A.B, Decl(es5ExportEqualsDts.ts, 7, 13)) return aVal; >aVal : Symbol(aVal, Decl(es5ExportEqualsDts.ts, 2, 11)) } } -module A { +namespace A { >A : Symbol(A, Decl(es5ExportEqualsDts.ts, 0, 0), Decl(es5ExportEqualsDts.ts, 5, 1)) export interface B { } ->B : Symbol(B, Decl(es5ExportEqualsDts.ts, 7, 10)) +>B : Symbol(B, Decl(es5ExportEqualsDts.ts, 7, 13)) } export = A diff --git a/tests/baselines/reference/es5ExportEqualsDts.types b/tests/baselines/reference/es5ExportEqualsDts.types index 0f544cfadc07d..b4168d3b70446 100644 --- a/tests/baselines/reference/es5ExportEqualsDts.types +++ b/tests/baselines/reference/es5ExportEqualsDts.types @@ -21,7 +21,7 @@ class A { } } -module A { +namespace A { export interface B { } } diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.errors.txt b/tests/baselines/reference/es5ModuleInternalNamedImports.errors.txt index f5cd3e7810753..0963c4ef7fcbe 100644 --- a/tests/baselines/reference/es5ModuleInternalNamedImports.errors.txt +++ b/tests/baselines/reference/es5ModuleInternalNamedImports.errors.txt @@ -13,7 +13,7 @@ es5ModuleInternalNamedImports.ts(34,16): error TS2792: Cannot find module 'M3'. ==== es5ModuleInternalNamedImports.ts (12 errors) ==== - export module M { + export namespace M { // variable export var M_V = 0; // interface @@ -21,9 +21,9 @@ es5ModuleInternalNamedImports.ts(34,16): error TS2792: Cannot find module 'M3'. //calss export class M_C { } // instantiated module - export module M_M { var x; } + export namespace M_M { var x; } // uninstantiated module - export module M_MU { } + export namespace M_MU { } // function export function M_F() { } // enum diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.js b/tests/baselines/reference/es5ModuleInternalNamedImports.js index e1a3ece2f9182..28c43195e5860 100644 --- a/tests/baselines/reference/es5ModuleInternalNamedImports.js +++ b/tests/baselines/reference/es5ModuleInternalNamedImports.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/es5ModuleInternalNamedImports.ts] //// //// [es5ModuleInternalNamedImports.ts] -export module M { +export namespace M { // variable export var M_V = 0; // interface @@ -9,9 +9,9 @@ export module M { //calss export class M_C { } // instantiated module - export module M_M { var x; } + export namespace M_M { var x; } // uninstantiated module - export module M_MU { } + export namespace M_MU { } // function export function M_F() { } // enum diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.symbols b/tests/baselines/reference/es5ModuleInternalNamedImports.symbols index b8dc3cf4ec254..314422061d419 100644 --- a/tests/baselines/reference/es5ModuleInternalNamedImports.symbols +++ b/tests/baselines/reference/es5ModuleInternalNamedImports.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/es5ModuleInternalNamedImports.ts] //// === es5ModuleInternalNamedImports.ts === -export module M { +export namespace M { >M : Symbol(M, Decl(es5ModuleInternalNamedImports.ts, 0, 0)) // variable @@ -17,17 +17,17 @@ export module M { >M_C : Symbol(M_C, Decl(es5ModuleInternalNamedImports.ts, 4, 28)) // instantiated module - export module M_M { var x; } + export namespace M_M { var x; } >M_M : Symbol(M_M, Decl(es5ModuleInternalNamedImports.ts, 6, 24)) ->x : Symbol(x, Decl(es5ModuleInternalNamedImports.ts, 8, 27)) +>x : Symbol(x, Decl(es5ModuleInternalNamedImports.ts, 8, 30)) // uninstantiated module - export module M_MU { } ->M_MU : Symbol(M_MU, Decl(es5ModuleInternalNamedImports.ts, 8, 32)) + export namespace M_MU { } +>M_MU : Symbol(M_MU, Decl(es5ModuleInternalNamedImports.ts, 8, 35)) // function export function M_F() { } ->M_F : Symbol(M_F, Decl(es5ModuleInternalNamedImports.ts, 10, 26)) +>M_F : Symbol(M_F, Decl(es5ModuleInternalNamedImports.ts, 10, 29)) // enum export enum M_E { } @@ -60,11 +60,11 @@ export module M { >m : Symbol(m, Decl(es5ModuleInternalNamedImports.ts, 24, 12)) export {M_MU as mu}; ->M_MU : Symbol(M_MU, Decl(es5ModuleInternalNamedImports.ts, 8, 32)) +>M_MU : Symbol(M_MU, Decl(es5ModuleInternalNamedImports.ts, 8, 35)) >mu : Symbol(mu, Decl(es5ModuleInternalNamedImports.ts, 25, 12)) export {M_F as f}; ->M_F : Symbol(M_F, Decl(es5ModuleInternalNamedImports.ts, 10, 26)) +>M_F : Symbol(M_F, Decl(es5ModuleInternalNamedImports.ts, 10, 29)) >f : Symbol(f, Decl(es5ModuleInternalNamedImports.ts, 26, 12)) export {M_E as e}; diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.types b/tests/baselines/reference/es5ModuleInternalNamedImports.types index bcb788712c496..7aafad5faddad 100644 --- a/tests/baselines/reference/es5ModuleInternalNamedImports.types +++ b/tests/baselines/reference/es5ModuleInternalNamedImports.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/es5ModuleInternalNamedImports.ts] //// === es5ModuleInternalNamedImports.ts === -export module M { +export namespace M { >M : typeof M > : ^^^^^^^^ @@ -20,14 +20,14 @@ export module M { > : ^^^ // instantiated module - export module M_M { var x; } + export namespace M_M { var x; } >M_M : typeof M_M > : ^^^^^^^^^^ >x : any > : ^^^ // uninstantiated module - export module M_MU { } + export namespace M_MU { } // function export function M_F() { } >M_F : () => void diff --git a/tests/baselines/reference/es6ClassTest.errors.txt b/tests/baselines/reference/es6ClassTest.errors.txt index 22547bed6d257..d95cc9d466090 100644 --- a/tests/baselines/reference/es6ClassTest.errors.txt +++ b/tests/baselines/reference/es6ClassTest.errors.txt @@ -37,7 +37,7 @@ es6ClassTest.ts(25,44): error TS1015: Parameter cannot have question mark and in var f = new Foo(); - declare module AmbientMod { + declare namespace AmbientMod { export class Provide { foo:number; zoo:string; diff --git a/tests/baselines/reference/es6ClassTest.js b/tests/baselines/reference/es6ClassTest.js index 0620805654f9e..1fdfda16a932a 100644 --- a/tests/baselines/reference/es6ClassTest.js +++ b/tests/baselines/reference/es6ClassTest.js @@ -34,7 +34,7 @@ class Foo extends Bar { var f = new Foo(); -declare module AmbientMod { +declare namespace AmbientMod { export class Provide { foo:number; zoo:string; diff --git a/tests/baselines/reference/es6ClassTest.symbols b/tests/baselines/reference/es6ClassTest.symbols index 2ee5ab99cb3da..81f483d6c4028 100644 --- a/tests/baselines/reference/es6ClassTest.symbols +++ b/tests/baselines/reference/es6ClassTest.symbols @@ -77,11 +77,11 @@ var f = new Foo(); >f : Symbol(f, Decl(es6ClassTest.ts, 31, 3)) >Foo : Symbol(Foo, Decl(es6ClassTest.ts, 7, 1)) -declare module AmbientMod { +declare namespace AmbientMod { >AmbientMod : Symbol(AmbientMod, Decl(es6ClassTest.ts, 31, 18)) export class Provide { ->Provide : Symbol(Provide, Decl(es6ClassTest.ts, 33, 27)) +>Provide : Symbol(Provide, Decl(es6ClassTest.ts, 33, 30)) foo:number; >foo : Symbol(Provide.foo, Decl(es6ClassTest.ts, 34, 23)) diff --git a/tests/baselines/reference/es6ClassTest.types b/tests/baselines/reference/es6ClassTest.types index 8ccc78af184b4..b929daee1edfc 100644 --- a/tests/baselines/reference/es6ClassTest.types +++ b/tests/baselines/reference/es6ClassTest.types @@ -129,7 +129,7 @@ var f = new Foo(); >Foo : typeof Foo > : ^^^^^^^^^^ -declare module AmbientMod { +declare namespace AmbientMod { >AmbientMod : typeof AmbientMod > : ^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/es6ClassTest3.js b/tests/baselines/reference/es6ClassTest3.js index 62834c5048c3d..dd39dc1e34926 100644 --- a/tests/baselines/reference/es6ClassTest3.js +++ b/tests/baselines/reference/es6ClassTest3.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/es6ClassTest3.ts] //// //// [es6ClassTest3.ts] -module M { +namespace M { class Visibility { public foo() { }; private bar() { }; diff --git a/tests/baselines/reference/es6ClassTest3.symbols b/tests/baselines/reference/es6ClassTest3.symbols index c1d74722eac07..673ea5577bf50 100644 --- a/tests/baselines/reference/es6ClassTest3.symbols +++ b/tests/baselines/reference/es6ClassTest3.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/es6ClassTest3.ts] //// === es6ClassTest3.ts === -module M { +namespace M { >M : Symbol(M, Decl(es6ClassTest3.ts, 0, 0)) class Visibility { ->Visibility : Symbol(Visibility, Decl(es6ClassTest3.ts, 0, 10)) +>Visibility : Symbol(Visibility, Decl(es6ClassTest3.ts, 0, 13)) public foo() { }; >foo : Symbol(Visibility.foo, Decl(es6ClassTest3.ts, 1, 19)) @@ -25,12 +25,12 @@ module M { constructor() { this.x = 1; >this.x : Symbol(Visibility.x, Decl(es6ClassTest3.ts, 3, 23)) ->this : Symbol(Visibility, Decl(es6ClassTest3.ts, 0, 10)) +>this : Symbol(Visibility, Decl(es6ClassTest3.ts, 0, 13)) >x : Symbol(Visibility.x, Decl(es6ClassTest3.ts, 3, 23)) this.y = 2; >this.y : Symbol(Visibility.y, Decl(es6ClassTest3.ts, 4, 26)) ->this : Symbol(Visibility, Decl(es6ClassTest3.ts, 0, 10)) +>this : Symbol(Visibility, Decl(es6ClassTest3.ts, 0, 13)) >y : Symbol(Visibility.y, Decl(es6ClassTest3.ts, 4, 26)) } } diff --git a/tests/baselines/reference/es6ClassTest3.types b/tests/baselines/reference/es6ClassTest3.types index cfd2a2a20aa25..0972431c57423 100644 --- a/tests/baselines/reference/es6ClassTest3.types +++ b/tests/baselines/reference/es6ClassTest3.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/es6ClassTest3.ts] //// === es6ClassTest3.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/es6ClassTest5.js b/tests/baselines/reference/es6ClassTest5.js index 10a1c412f5866..129342d5b5016 100644 --- a/tests/baselines/reference/es6ClassTest5.js +++ b/tests/baselines/reference/es6ClassTest5.js @@ -7,7 +7,7 @@ class C1T5 { return i; } } -module C2T5 {} +namespace C2T5 {} class bigClass { public break = 1; diff --git a/tests/baselines/reference/es6ClassTest5.symbols b/tests/baselines/reference/es6ClassTest5.symbols index 342c66ef27c78..73da74a3587f9 100644 --- a/tests/baselines/reference/es6ClassTest5.symbols +++ b/tests/baselines/reference/es6ClassTest5.symbols @@ -16,11 +16,11 @@ class C1T5 { >i : Symbol(i, Decl(es6ClassTest5.ts, 2, 6)) } } -module C2T5 {} +namespace C2T5 {} >C2T5 : Symbol(C2T5, Decl(es6ClassTest5.ts, 5, 1)) class bigClass { ->bigClass : Symbol(bigClass, Decl(es6ClassTest5.ts, 6, 14)) +>bigClass : Symbol(bigClass, Decl(es6ClassTest5.ts, 6, 17)) public break = 1; >break : Symbol(bigClass.break, Decl(es6ClassTest5.ts, 8, 17)) diff --git a/tests/baselines/reference/es6ClassTest5.types b/tests/baselines/reference/es6ClassTest5.types index e321fdb008d25..e6955852af23d 100644 --- a/tests/baselines/reference/es6ClassTest5.types +++ b/tests/baselines/reference/es6ClassTest5.types @@ -24,7 +24,7 @@ class C1T5 { > : ^^^^^^ } } -module C2T5 {} +namespace C2T5 {} class bigClass { >bigClass : bigClass diff --git a/tests/baselines/reference/es6ClassTest7.js b/tests/baselines/reference/es6ClassTest7.js index e0352d1d20e71..2411bf53ee85c 100644 --- a/tests/baselines/reference/es6ClassTest7.js +++ b/tests/baselines/reference/es6ClassTest7.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/es6ClassTest7.ts] //// //// [es6ClassTest7.ts] -declare module M { +declare namespace M { export class Foo { } } diff --git a/tests/baselines/reference/es6ClassTest7.symbols b/tests/baselines/reference/es6ClassTest7.symbols index 8ed13daa18bfc..e21d3e9a25bd0 100644 --- a/tests/baselines/reference/es6ClassTest7.symbols +++ b/tests/baselines/reference/es6ClassTest7.symbols @@ -1,18 +1,18 @@ //// [tests/cases/compiler/es6ClassTest7.ts] //// === es6ClassTest7.ts === -declare module M { +declare namespace M { >M : Symbol(M, Decl(es6ClassTest7.ts, 0, 0)) export class Foo { ->Foo : Symbol(Foo, Decl(es6ClassTest7.ts, 0, 18)) +>Foo : Symbol(Foo, Decl(es6ClassTest7.ts, 0, 21)) } } class Bar extends M.Foo { >Bar : Symbol(Bar, Decl(es6ClassTest7.ts, 3, 1)) ->M.Foo : Symbol(M.Foo, Decl(es6ClassTest7.ts, 0, 18)) +>M.Foo : Symbol(M.Foo, Decl(es6ClassTest7.ts, 0, 21)) >M : Symbol(M, Decl(es6ClassTest7.ts, 0, 0)) ->Foo : Symbol(M.Foo, Decl(es6ClassTest7.ts, 0, 18)) +>Foo : Symbol(M.Foo, Decl(es6ClassTest7.ts, 0, 21)) } diff --git a/tests/baselines/reference/es6ClassTest7.types b/tests/baselines/reference/es6ClassTest7.types index 0f3a428dca8d3..2c9a1d5361f3c 100644 --- a/tests/baselines/reference/es6ClassTest7.types +++ b/tests/baselines/reference/es6ClassTest7.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/es6ClassTest7.ts] //// === es6ClassTest7.ts === -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/es6ExportAll.js b/tests/baselines/reference/es6ExportAll.js index a47ea92be5111..59bcb62fc24ba 100644 --- a/tests/baselines/reference/es6ExportAll.js +++ b/tests/baselines/reference/es6ExportAll.js @@ -5,11 +5,11 @@ export class c { } export interface i { } -export module m { +export namespace m { export var x = 10; } export var x = 10; -export module uninstantiated { +export namespace uninstantiated { } //// [client.ts] diff --git a/tests/baselines/reference/es6ExportAll.symbols b/tests/baselines/reference/es6ExportAll.symbols index 435c747b317d7..b9d7711aeabc5 100644 --- a/tests/baselines/reference/es6ExportAll.symbols +++ b/tests/baselines/reference/es6ExportAll.symbols @@ -7,7 +7,7 @@ export class c { export interface i { >i : Symbol(i, Decl(server.ts, 1, 1)) } -export module m { +export namespace m { >m : Symbol(m, Decl(server.ts, 3, 1)) export var x = 10; @@ -16,7 +16,7 @@ export module m { export var x = 10; >x : Symbol(x, Decl(server.ts, 7, 10)) -export module uninstantiated { +export namespace uninstantiated { >uninstantiated : Symbol(uninstantiated, Decl(server.ts, 7, 18)) } diff --git a/tests/baselines/reference/es6ExportAll.types b/tests/baselines/reference/es6ExportAll.types index c962c42c68896..c0379e1668a33 100644 --- a/tests/baselines/reference/es6ExportAll.types +++ b/tests/baselines/reference/es6ExportAll.types @@ -7,7 +7,7 @@ export class c { } export interface i { } -export module m { +export namespace m { >m : typeof m > : ^^^^^^^^ @@ -23,7 +23,7 @@ export var x = 10; >10 : 10 > : ^^ -export module uninstantiated { +export namespace uninstantiated { } === client.ts === diff --git a/tests/baselines/reference/es6ExportAllInEs5.js b/tests/baselines/reference/es6ExportAllInEs5.js index bca51095554d8..a70a6d71eb176 100644 --- a/tests/baselines/reference/es6ExportAllInEs5.js +++ b/tests/baselines/reference/es6ExportAllInEs5.js @@ -5,11 +5,11 @@ export class c { } export interface i { } -export module m { +export namespace m { export var x = 10; } export var x = 10; -export module uninstantiated { +export namespace uninstantiated { } //// [client.ts] diff --git a/tests/baselines/reference/es6ExportAllInEs5.symbols b/tests/baselines/reference/es6ExportAllInEs5.symbols index 4a35fa83ae51f..c70c4328fa85b 100644 --- a/tests/baselines/reference/es6ExportAllInEs5.symbols +++ b/tests/baselines/reference/es6ExportAllInEs5.symbols @@ -7,7 +7,7 @@ export class c { export interface i { >i : Symbol(i, Decl(server.ts, 1, 1)) } -export module m { +export namespace m { >m : Symbol(m, Decl(server.ts, 3, 1)) export var x = 10; @@ -16,7 +16,7 @@ export module m { export var x = 10; >x : Symbol(x, Decl(server.ts, 7, 10)) -export module uninstantiated { +export namespace uninstantiated { >uninstantiated : Symbol(uninstantiated, Decl(server.ts, 7, 18)) } diff --git a/tests/baselines/reference/es6ExportAllInEs5.types b/tests/baselines/reference/es6ExportAllInEs5.types index 88dd69a3e172d..25d7c9d56d570 100644 --- a/tests/baselines/reference/es6ExportAllInEs5.types +++ b/tests/baselines/reference/es6ExportAllInEs5.types @@ -7,7 +7,7 @@ export class c { } export interface i { } -export module m { +export namespace m { >m : typeof m > : ^^^^^^^^ @@ -23,7 +23,7 @@ export var x = 10; >10 : 10 > : ^^ -export module uninstantiated { +export namespace uninstantiated { } === client.ts === diff --git a/tests/baselines/reference/es6ExportClause.js b/tests/baselines/reference/es6ExportClause.js index eaf6536aafe4a..4f2ce7f883507 100644 --- a/tests/baselines/reference/es6ExportClause.js +++ b/tests/baselines/reference/es6ExportClause.js @@ -5,11 +5,11 @@ class c { } interface i { } -module m { +namespace m { export var x = 10; } var x = 10; -module uninstantiated { +namespace uninstantiated { } export { c }; export { c as c2 }; diff --git a/tests/baselines/reference/es6ExportClause.symbols b/tests/baselines/reference/es6ExportClause.symbols index 42b9ebfc9b183..5b56d008264fb 100644 --- a/tests/baselines/reference/es6ExportClause.symbols +++ b/tests/baselines/reference/es6ExportClause.symbols @@ -7,7 +7,7 @@ class c { interface i { >i : Symbol(i, Decl(server.ts, 1, 1)) } -module m { +namespace m { >m : Symbol(m, Decl(server.ts, 3, 1)) export var x = 10; @@ -16,7 +16,7 @@ module m { var x = 10; >x : Symbol(x, Decl(server.ts, 7, 3)) -module uninstantiated { +namespace uninstantiated { >uninstantiated : Symbol(uninstantiated, Decl(server.ts, 7, 11)) } export { c }; diff --git a/tests/baselines/reference/es6ExportClause.types b/tests/baselines/reference/es6ExportClause.types index 6cd293d659f6b..266e9a29f49da 100644 --- a/tests/baselines/reference/es6ExportClause.types +++ b/tests/baselines/reference/es6ExportClause.types @@ -7,7 +7,7 @@ class c { } interface i { } -module m { +namespace m { >m : typeof m > : ^^^^^^^^ @@ -23,7 +23,7 @@ var x = 10; >10 : 10 > : ^^ -module uninstantiated { +namespace uninstantiated { } export { c }; >c : typeof c diff --git a/tests/baselines/reference/es6ExportClauseInEs5.js b/tests/baselines/reference/es6ExportClauseInEs5.js index b2d30fa7567a3..12b289d3faf0d 100644 --- a/tests/baselines/reference/es6ExportClauseInEs5.js +++ b/tests/baselines/reference/es6ExportClauseInEs5.js @@ -5,11 +5,11 @@ class c { } interface i { } -module m { +namespace m { export var x = 10; } var x = 10; -module uninstantiated { +namespace uninstantiated { } export { c }; export { c as c2 }; diff --git a/tests/baselines/reference/es6ExportClauseInEs5.symbols b/tests/baselines/reference/es6ExportClauseInEs5.symbols index 7b54ef2e694ea..38655337378df 100644 --- a/tests/baselines/reference/es6ExportClauseInEs5.symbols +++ b/tests/baselines/reference/es6ExportClauseInEs5.symbols @@ -7,7 +7,7 @@ class c { interface i { >i : Symbol(i, Decl(server.ts, 1, 1)) } -module m { +namespace m { >m : Symbol(m, Decl(server.ts, 3, 1)) export var x = 10; @@ -16,7 +16,7 @@ module m { var x = 10; >x : Symbol(x, Decl(server.ts, 7, 3)) -module uninstantiated { +namespace uninstantiated { >uninstantiated : Symbol(uninstantiated, Decl(server.ts, 7, 11)) } export { c }; diff --git a/tests/baselines/reference/es6ExportClauseInEs5.types b/tests/baselines/reference/es6ExportClauseInEs5.types index 5537e4974c0ab..d9958dcc12609 100644 --- a/tests/baselines/reference/es6ExportClauseInEs5.types +++ b/tests/baselines/reference/es6ExportClauseInEs5.types @@ -7,7 +7,7 @@ class c { } interface i { } -module m { +namespace m { >m : typeof m > : ^^^^^^^^ @@ -23,7 +23,7 @@ var x = 10; >10 : 10 > : ^^ -module uninstantiated { +namespace uninstantiated { } export { c }; >c : typeof c diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js index f9bd8f844847e..5b97b10bc72f6 100644 --- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js +++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js @@ -5,11 +5,11 @@ export class c { } export interface i { } -export module m { +export namespace m { export var x = 10; } export var x = 10; -export module uninstantiated { +export namespace uninstantiated { } //// [client.ts] diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.symbols b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.symbols index 4ba4b8aea4387..8138b7480650f 100644 --- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.symbols +++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.symbols @@ -7,7 +7,7 @@ export class c { export interface i { >i : Symbol(i, Decl(server.ts, 1, 1)) } -export module m { +export namespace m { >m : Symbol(m, Decl(server.ts, 3, 1)) export var x = 10; @@ -16,7 +16,7 @@ export module m { export var x = 10; >x : Symbol(x, Decl(server.ts, 7, 10)) -export module uninstantiated { +export namespace uninstantiated { >uninstantiated : Symbol(uninstantiated, Decl(server.ts, 7, 18)) } diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.types b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.types index 8f0f979af27dd..780c37727aa5c 100644 --- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.types +++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.types @@ -7,7 +7,7 @@ export class c { } export interface i { } -export module m { +export namespace m { >m : typeof m > : ^^^^^^^^ @@ -23,7 +23,7 @@ export var x = 10; >10 : 10 > : ^^ -export module uninstantiated { +export namespace uninstantiated { } === client.ts === diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js index 50bd55e9a5d63..f634d6410c56f 100644 --- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js +++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js @@ -5,11 +5,11 @@ export class c { } export interface i { } -export module m { +export namespace m { export var x = 10; } export var x = 10; -export module uninstantiated { +export namespace uninstantiated { } //// [client.ts] diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.symbols b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.symbols index 0bcee045a1d24..99e6cb5844305 100644 --- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.symbols +++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.symbols @@ -7,7 +7,7 @@ export class c { export interface i { >i : Symbol(i, Decl(server.ts, 1, 1)) } -export module m { +export namespace m { >m : Symbol(m, Decl(server.ts, 3, 1)) export var x = 10; @@ -16,7 +16,7 @@ export module m { export var x = 10; >x : Symbol(x, Decl(server.ts, 7, 10)) -export module uninstantiated { +export namespace uninstantiated { >uninstantiated : Symbol(uninstantiated, Decl(server.ts, 7, 18)) } diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.types b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.types index 739fa4bc7f433..5abe03e681ded 100644 --- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.types +++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.types @@ -7,7 +7,7 @@ export class c { } export interface i { } -export module m { +export namespace m { >m : typeof m > : ^^^^^^^^ @@ -23,7 +23,7 @@ export var x = 10; >10 : 10 > : ^^ -export module uninstantiated { +export namespace uninstantiated { } === client.ts === diff --git a/tests/baselines/reference/es6ExportEqualsInterop.errors.txt b/tests/baselines/reference/es6ExportEqualsInterop.errors.txt index 5d34ca0b7f131..0791e708a90f5 100644 --- a/tests/baselines/reference/es6ExportEqualsInterop.errors.txt +++ b/tests/baselines/reference/es6ExportEqualsInterop.errors.txt @@ -231,7 +231,7 @@ main.ts(106,15): error TS2498: Module '"class-module"' uses 'export =' and canno } declare module "module" { - module Foo { + namespace Foo { export var a: number; export var b: number; } @@ -243,7 +243,7 @@ main.ts(106,15): error TS2498: Module '"class-module"' uses 'export =' and canno x: number; y: number; } - module Foo { + namespace Foo { export var a: number; export var b: number; } @@ -251,7 +251,7 @@ main.ts(106,15): error TS2498: Module '"class-module"' uses 'export =' and canno } declare module "variable-module" { - module Foo { + namespace Foo { interface Bar { x: number; y: number; @@ -271,7 +271,7 @@ main.ts(106,15): error TS2498: Module '"class-module"' uses 'export =' and canno declare module "function-module" { function foo(); - module foo { + namespace foo { export var a: number; export var b: number; } @@ -291,7 +291,7 @@ main.ts(106,15): error TS2498: Module '"class-module"' uses 'export =' and canno x: number; y: number; } - module Foo { + namespace Foo { export var a: number; export var b: number; } diff --git a/tests/baselines/reference/es6ExportEqualsInterop.js b/tests/baselines/reference/es6ExportEqualsInterop.js index b42bf42e1f4e5..5de9c59808b50 100644 --- a/tests/baselines/reference/es6ExportEqualsInterop.js +++ b/tests/baselines/reference/es6ExportEqualsInterop.js @@ -30,7 +30,7 @@ declare module "interface-variable" { } declare module "module" { - module Foo { + namespace Foo { export var a: number; export var b: number; } @@ -42,7 +42,7 @@ declare module "interface-module" { x: number; y: number; } - module Foo { + namespace Foo { export var a: number; export var b: number; } @@ -50,7 +50,7 @@ declare module "interface-module" { } declare module "variable-module" { - module Foo { + namespace Foo { interface Bar { x: number; y: number; @@ -70,7 +70,7 @@ declare module "function" { declare module "function-module" { function foo(); - module foo { + namespace foo { export var a: number; export var b: number; } @@ -90,7 +90,7 @@ declare module "class-module" { x: number; y: number; } - module Foo { + namespace Foo { export var a: number; export var b: number; } diff --git a/tests/baselines/reference/es6ExportEqualsInterop.symbols b/tests/baselines/reference/es6ExportEqualsInterop.symbols index 57f1b4b9354ec..44a55ac191839 100644 --- a/tests/baselines/reference/es6ExportEqualsInterop.symbols +++ b/tests/baselines/reference/es6ExportEqualsInterop.symbols @@ -359,7 +359,7 @@ declare module "interface-variable" { declare module "module" { >"module" : Symbol("module", Decl(modules.d.ts, 26, 1)) - module Foo { + namespace Foo { >Foo : Symbol(Foo, Decl(modules.d.ts, 28, 25)) export var a: number; @@ -384,7 +384,7 @@ declare module "interface-module" { y: number; >y : Symbol(Foo.y, Decl(modules.d.ts, 38, 18)) } - module Foo { + namespace Foo { >Foo : Symbol(Foo, Decl(modules.d.ts, 36, 35), Decl(modules.d.ts, 40, 5)) export var a: number; @@ -400,11 +400,11 @@ declare module "interface-module" { declare module "variable-module" { >"variable-module" : Symbol("variable-module", Decl(modules.d.ts, 46, 1)) - module Foo { + namespace Foo { >Foo : Symbol(Foo, Decl(modules.d.ts, 48, 34), Decl(modules.d.ts, 55, 7)) interface Bar { ->Bar : Symbol(Bar, Decl(modules.d.ts, 49, 16)) +>Bar : Symbol(Bar, Decl(modules.d.ts, 49, 19)) x: number; >x : Symbol(Bar.x, Decl(modules.d.ts, 50, 23)) @@ -442,7 +442,7 @@ declare module "function-module" { function foo(); >foo : Symbol(foo, Decl(modules.d.ts, 67, 34), Decl(modules.d.ts, 68, 19)) - module foo { + namespace foo { >foo : Symbol(foo, Decl(modules.d.ts, 67, 34), Decl(modules.d.ts, 68, 19)) export var a: number; @@ -483,7 +483,7 @@ declare module "class-module" { y: number; >y : Symbol(Foo.y, Decl(modules.d.ts, 86, 18)) } - module Foo { + namespace Foo { >Foo : Symbol(Foo, Decl(modules.d.ts, 84, 31), Decl(modules.d.ts, 88, 5)) export var a: number; diff --git a/tests/baselines/reference/es6ExportEqualsInterop.types b/tests/baselines/reference/es6ExportEqualsInterop.types index e7a53a89faec6..50d106803f9cb 100644 --- a/tests/baselines/reference/es6ExportEqualsInterop.types +++ b/tests/baselines/reference/es6ExportEqualsInterop.types @@ -534,7 +534,7 @@ declare module "module" { >"module" : typeof import("module") > : ^^^^^^^^^^^^^^^^^^^^^^^ - module Foo { + namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ @@ -564,7 +564,7 @@ declare module "interface-module" { >y : number > : ^^^^^^ } - module Foo { + namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ @@ -585,7 +585,7 @@ declare module "variable-module" { >"variable-module" : typeof import("variable-module") > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - module Foo { + namespace Foo { interface Bar { x: number; >x : number @@ -634,7 +634,7 @@ declare module "function-module" { >foo : typeof foo > : ^^^^^^^^^^ - module foo { + namespace foo { >foo : typeof foo > : ^^^^^^^^^^ @@ -688,7 +688,7 @@ declare module "class-module" { >y : number > : ^^^^^^ } - module Foo { + namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/es6ImportEqualsDeclaration2.js b/tests/baselines/reference/es6ImportEqualsDeclaration2.js index 5458cf6b67307..0fd5ed7b34c6c 100644 --- a/tests/baselines/reference/es6ImportEqualsDeclaration2.js +++ b/tests/baselines/reference/es6ImportEqualsDeclaration2.js @@ -8,7 +8,7 @@ declare module "other" { declare module "server" { import events = require("other"); // Ambient declaration, no error expected. - module S { + namespace S { export var a: number; } diff --git a/tests/baselines/reference/es6ImportEqualsDeclaration2.symbols b/tests/baselines/reference/es6ImportEqualsDeclaration2.symbols index e92fb9c9bfb9d..d7c915347f583 100644 --- a/tests/baselines/reference/es6ImportEqualsDeclaration2.symbols +++ b/tests/baselines/reference/es6ImportEqualsDeclaration2.symbols @@ -14,7 +14,7 @@ declare module "server" { import events = require("other"); // Ambient declaration, no error expected. >events : Symbol(events, Decl(server.d.ts, 4, 25)) - module S { + namespace S { >S : Symbol(S, Decl(server.d.ts, 5, 37)) export var a: number; diff --git a/tests/baselines/reference/es6ImportEqualsDeclaration2.types b/tests/baselines/reference/es6ImportEqualsDeclaration2.types index ddf00d2346aff..a6e90a386c0f6 100644 --- a/tests/baselines/reference/es6ImportEqualsDeclaration2.types +++ b/tests/baselines/reference/es6ImportEqualsDeclaration2.types @@ -18,7 +18,7 @@ declare module "server" { >events : typeof events > : ^^^^^^^^^^^^^ - module S { + namespace S { >S : typeof S > : ^^^^^^^^ diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js index ba5bc41241238..366464ca52389 100644 --- a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js +++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts] //// //// [es6ImportNamedImportInIndirectExportAssignment_0.ts] -export module a { +export namespace a { export class c { } } diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.symbols b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.symbols index 6451e09fcad4c..dbb564d9dec80 100644 --- a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.symbols +++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts] //// === es6ImportNamedImportInIndirectExportAssignment_0.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(es6ImportNamedImportInIndirectExportAssignment_0.ts, 0, 0)) export class c { ->c : Symbol(c, Decl(es6ImportNamedImportInIndirectExportAssignment_0.ts, 0, 17)) +>c : Symbol(c, Decl(es6ImportNamedImportInIndirectExportAssignment_0.ts, 0, 20)) } } diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.types b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.types index d68c44580b2bb..9bfad738b5b87 100644 --- a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.types +++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts] //// === es6ImportNamedImportInIndirectExportAssignment_0.ts === -export module a { +export namespace a { >a : typeof a > : ^^^^^^^^ diff --git a/tests/baselines/reference/es6ModuleClassDeclaration.js b/tests/baselines/reference/es6ModuleClassDeclaration.js index a569703bfa91d..a540774e5eb0e 100644 --- a/tests/baselines/reference/es6ModuleClassDeclaration.js +++ b/tests/baselines/reference/es6ModuleClassDeclaration.js @@ -36,7 +36,7 @@ class c2 { new c(); new c2(); -export module m1 { +export namespace m1 { export class c3 { constructor() { } @@ -74,7 +74,7 @@ export module m1 { new c3(); new c4(); } -module m2 { +namespace m2 { export class c3 { constructor() { } diff --git a/tests/baselines/reference/es6ModuleClassDeclaration.symbols b/tests/baselines/reference/es6ModuleClassDeclaration.symbols index 3b3ef68128545..d3b81991b037f 100644 --- a/tests/baselines/reference/es6ModuleClassDeclaration.symbols +++ b/tests/baselines/reference/es6ModuleClassDeclaration.symbols @@ -67,11 +67,11 @@ new c(); new c2(); >c2 : Symbol(c2, Decl(es6ModuleClassDeclaration.ts, 15, 1)) -export module m1 { +export namespace m1 { >m1 : Symbol(m1, Decl(es6ModuleClassDeclaration.ts, 33, 9)) export class c3 { ->c3 : Symbol(c3, Decl(es6ModuleClassDeclaration.ts, 35, 18)) +>c3 : Symbol(c3, Decl(es6ModuleClassDeclaration.ts, 35, 21)) constructor() { } @@ -137,16 +137,16 @@ export module m1 { >c2 : Symbol(c2, Decl(es6ModuleClassDeclaration.ts, 15, 1)) new c3(); ->c3 : Symbol(c3, Decl(es6ModuleClassDeclaration.ts, 35, 18)) +>c3 : Symbol(c3, Decl(es6ModuleClassDeclaration.ts, 35, 21)) new c4(); >c4 : Symbol(c4, Decl(es6ModuleClassDeclaration.ts, 51, 5)) } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(es6ModuleClassDeclaration.ts, 72, 1)) export class c3 { ->c3 : Symbol(c3, Decl(es6ModuleClassDeclaration.ts, 73, 11)) +>c3 : Symbol(c3, Decl(es6ModuleClassDeclaration.ts, 73, 14)) constructor() { } @@ -212,13 +212,13 @@ module m2 { >c2 : Symbol(c2, Decl(es6ModuleClassDeclaration.ts, 15, 1)) new c3(); ->c3 : Symbol(c3, Decl(es6ModuleClassDeclaration.ts, 73, 11)) +>c3 : Symbol(c3, Decl(es6ModuleClassDeclaration.ts, 73, 14)) new c4(); >c4 : Symbol(c4, Decl(es6ModuleClassDeclaration.ts, 89, 5)) new m1.c3(); ->m1.c3 : Symbol(m1.c3, Decl(es6ModuleClassDeclaration.ts, 35, 18)) +>m1.c3 : Symbol(m1.c3, Decl(es6ModuleClassDeclaration.ts, 35, 21)) >m1 : Symbol(m1, Decl(es6ModuleClassDeclaration.ts, 33, 9)) ->c3 : Symbol(m1.c3, Decl(es6ModuleClassDeclaration.ts, 35, 18)) +>c3 : Symbol(m1.c3, Decl(es6ModuleClassDeclaration.ts, 35, 21)) } diff --git a/tests/baselines/reference/es6ModuleClassDeclaration.types b/tests/baselines/reference/es6ModuleClassDeclaration.types index 8235210f21988..dcc613af4d413 100644 --- a/tests/baselines/reference/es6ModuleClassDeclaration.types +++ b/tests/baselines/reference/es6ModuleClassDeclaration.types @@ -107,7 +107,7 @@ new c2(); >c2 : typeof c2 > : ^^^^^^^^^ -export module m1 { +export namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -229,7 +229,7 @@ export module m1 { >c4 : typeof c4 > : ^^^^^^^^^ } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/es6ModuleConst.js b/tests/baselines/reference/es6ModuleConst.js index 1ee17ca81ea50..0e6bc62657d86 100644 --- a/tests/baselines/reference/es6ModuleConst.js +++ b/tests/baselines/reference/es6ModuleConst.js @@ -5,13 +5,13 @@ export const a = "hello"; export const x: string = a, y = x; const b = y; const c: string = b, d = c; -export module m1 { +export namespace m1 { export const k = a; export const l: string = b, m = k; const n = m1.k; const o: string = n, p = k; } -module m2 { +namespace m2 { export const k = a; export const l: string = b, m = k; const n = m1.k; diff --git a/tests/baselines/reference/es6ModuleConst.symbols b/tests/baselines/reference/es6ModuleConst.symbols index d8a57e84ddd09..eeb4e8868a5f7 100644 --- a/tests/baselines/reference/es6ModuleConst.symbols +++ b/tests/baselines/reference/es6ModuleConst.symbols @@ -20,7 +20,7 @@ const c: string = b, d = c; >d : Symbol(d, Decl(es6ModuleConst.ts, 3, 20)) >c : Symbol(c, Decl(es6ModuleConst.ts, 3, 5)) -export module m1 { +export namespace m1 { >m1 : Symbol(m1, Decl(es6ModuleConst.ts, 3, 27)) export const k = a; @@ -45,7 +45,7 @@ export module m1 { >p : Symbol(p, Decl(es6ModuleConst.ts, 8, 24)) >k : Symbol(k, Decl(es6ModuleConst.ts, 5, 16)) } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(es6ModuleConst.ts, 9, 1)) export const k = a; diff --git a/tests/baselines/reference/es6ModuleConst.types b/tests/baselines/reference/es6ModuleConst.types index 496017d052c7a..50a712d300361 100644 --- a/tests/baselines/reference/es6ModuleConst.types +++ b/tests/baselines/reference/es6ModuleConst.types @@ -33,7 +33,7 @@ const c: string = b, d = c; >c : string > : ^^^^^^ -export module m1 { +export namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -73,7 +73,7 @@ export module m1 { >k : "hello" > : ^^^^^^^ } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/es6ModuleConstEnumDeclaration.js b/tests/baselines/reference/es6ModuleConstEnumDeclaration.js index 69a23623fc9be..3f943cee8a91f 100644 --- a/tests/baselines/reference/es6ModuleConstEnumDeclaration.js +++ b/tests/baselines/reference/es6ModuleConstEnumDeclaration.js @@ -13,7 +13,7 @@ const enum e2 { } var x = e1.a; var y = e2.x; -export module m1 { +export namespace m1 { export const enum e3 { a, b, @@ -29,7 +29,7 @@ export module m1 { var x2 = e3.a; var y2 = e4.x; } -module m2 { +namespace m2 { export const enum e5 { a, b, diff --git a/tests/baselines/reference/es6ModuleConstEnumDeclaration.symbols b/tests/baselines/reference/es6ModuleConstEnumDeclaration.symbols index 02e5d21457aa5..7e2c08ea82dff 100644 --- a/tests/baselines/reference/es6ModuleConstEnumDeclaration.symbols +++ b/tests/baselines/reference/es6ModuleConstEnumDeclaration.symbols @@ -37,11 +37,11 @@ var y = e2.x; >e2 : Symbol(e2, Decl(es6ModuleConstEnumDeclaration.ts, 4, 1)) >x : Symbol(e2.x, Decl(es6ModuleConstEnumDeclaration.ts, 5, 15)) -export module m1 { +export namespace m1 { >m1 : Symbol(m1, Decl(es6ModuleConstEnumDeclaration.ts, 11, 13)) export const enum e3 { ->e3 : Symbol(e3, Decl(es6ModuleConstEnumDeclaration.ts, 12, 18)) +>e3 : Symbol(e3, Decl(es6ModuleConstEnumDeclaration.ts, 12, 21)) a, >a : Symbol(e3.a, Decl(es6ModuleConstEnumDeclaration.ts, 13, 26)) @@ -79,7 +79,7 @@ export module m1 { var x2 = e3.a; >x2 : Symbol(x2, Decl(es6ModuleConstEnumDeclaration.ts, 25, 7)) >e3.a : Symbol(e3.a, Decl(es6ModuleConstEnumDeclaration.ts, 13, 26)) ->e3 : Symbol(e3, Decl(es6ModuleConstEnumDeclaration.ts, 12, 18)) +>e3 : Symbol(e3, Decl(es6ModuleConstEnumDeclaration.ts, 12, 21)) >a : Symbol(e3.a, Decl(es6ModuleConstEnumDeclaration.ts, 13, 26)) var y2 = e4.x; @@ -88,11 +88,11 @@ export module m1 { >e4 : Symbol(e4, Decl(es6ModuleConstEnumDeclaration.ts, 17, 5)) >x : Symbol(e4.x, Decl(es6ModuleConstEnumDeclaration.ts, 18, 19)) } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(es6ModuleConstEnumDeclaration.ts, 27, 1)) export const enum e5 { ->e5 : Symbol(e5, Decl(es6ModuleConstEnumDeclaration.ts, 28, 11)) +>e5 : Symbol(e5, Decl(es6ModuleConstEnumDeclaration.ts, 28, 14)) a, >a : Symbol(e5.a, Decl(es6ModuleConstEnumDeclaration.ts, 29, 26)) @@ -130,7 +130,7 @@ module m2 { var x2 = e5.a; >x2 : Symbol(x2, Decl(es6ModuleConstEnumDeclaration.ts, 41, 7)) >e5.a : Symbol(e5.a, Decl(es6ModuleConstEnumDeclaration.ts, 29, 26)) ->e5 : Symbol(e5, Decl(es6ModuleConstEnumDeclaration.ts, 28, 11)) +>e5 : Symbol(e5, Decl(es6ModuleConstEnumDeclaration.ts, 28, 14)) >a : Symbol(e5.a, Decl(es6ModuleConstEnumDeclaration.ts, 29, 26)) var y2 = e6.x; @@ -142,8 +142,8 @@ module m2 { var x3 = m1.e3.a; >x3 : Symbol(x3, Decl(es6ModuleConstEnumDeclaration.ts, 43, 7)) >m1.e3.a : Symbol(m1.e3.a, Decl(es6ModuleConstEnumDeclaration.ts, 13, 26)) ->m1.e3 : Symbol(m1.e3, Decl(es6ModuleConstEnumDeclaration.ts, 12, 18)) +>m1.e3 : Symbol(m1.e3, Decl(es6ModuleConstEnumDeclaration.ts, 12, 21)) >m1 : Symbol(m1, Decl(es6ModuleConstEnumDeclaration.ts, 11, 13)) ->e3 : Symbol(m1.e3, Decl(es6ModuleConstEnumDeclaration.ts, 12, 18)) +>e3 : Symbol(m1.e3, Decl(es6ModuleConstEnumDeclaration.ts, 12, 21)) >a : Symbol(m1.e3.a, Decl(es6ModuleConstEnumDeclaration.ts, 13, 26)) } diff --git a/tests/baselines/reference/es6ModuleConstEnumDeclaration.types b/tests/baselines/reference/es6ModuleConstEnumDeclaration.types index f466540aec200..cba2cedb46297 100644 --- a/tests/baselines/reference/es6ModuleConstEnumDeclaration.types +++ b/tests/baselines/reference/es6ModuleConstEnumDeclaration.types @@ -53,7 +53,7 @@ var y = e2.x; >x : e2.x > : ^^^^ -export module m1 { +export namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -129,7 +129,7 @@ export module m1 { >x : e4.x > : ^^^^ } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/es6ModuleConstEnumDeclaration2.js b/tests/baselines/reference/es6ModuleConstEnumDeclaration2.js index c91c9a7fdc9e8..c94e03e67061e 100644 --- a/tests/baselines/reference/es6ModuleConstEnumDeclaration2.js +++ b/tests/baselines/reference/es6ModuleConstEnumDeclaration2.js @@ -13,7 +13,7 @@ const enum e2 { } var x = e1.a; var y = e2.x; -export module m1 { +export namespace m1 { export const enum e3 { a, b, @@ -29,7 +29,7 @@ export module m1 { var x2 = e3.a; var y2 = e4.x; } -module m2 { +namespace m2 { export const enum e5 { a, b, diff --git a/tests/baselines/reference/es6ModuleConstEnumDeclaration2.symbols b/tests/baselines/reference/es6ModuleConstEnumDeclaration2.symbols index e6f7ecdda64ab..942f1e986dad7 100644 --- a/tests/baselines/reference/es6ModuleConstEnumDeclaration2.symbols +++ b/tests/baselines/reference/es6ModuleConstEnumDeclaration2.symbols @@ -37,11 +37,11 @@ var y = e2.x; >e2 : Symbol(e2, Decl(es6ModuleConstEnumDeclaration2.ts, 4, 1)) >x : Symbol(e2.x, Decl(es6ModuleConstEnumDeclaration2.ts, 5, 15)) -export module m1 { +export namespace m1 { >m1 : Symbol(m1, Decl(es6ModuleConstEnumDeclaration2.ts, 11, 13)) export const enum e3 { ->e3 : Symbol(e3, Decl(es6ModuleConstEnumDeclaration2.ts, 12, 18)) +>e3 : Symbol(e3, Decl(es6ModuleConstEnumDeclaration2.ts, 12, 21)) a, >a : Symbol(e3.a, Decl(es6ModuleConstEnumDeclaration2.ts, 13, 26)) @@ -79,7 +79,7 @@ export module m1 { var x2 = e3.a; >x2 : Symbol(x2, Decl(es6ModuleConstEnumDeclaration2.ts, 25, 7)) >e3.a : Symbol(e3.a, Decl(es6ModuleConstEnumDeclaration2.ts, 13, 26)) ->e3 : Symbol(e3, Decl(es6ModuleConstEnumDeclaration2.ts, 12, 18)) +>e3 : Symbol(e3, Decl(es6ModuleConstEnumDeclaration2.ts, 12, 21)) >a : Symbol(e3.a, Decl(es6ModuleConstEnumDeclaration2.ts, 13, 26)) var y2 = e4.x; @@ -88,11 +88,11 @@ export module m1 { >e4 : Symbol(e4, Decl(es6ModuleConstEnumDeclaration2.ts, 17, 5)) >x : Symbol(e4.x, Decl(es6ModuleConstEnumDeclaration2.ts, 18, 19)) } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(es6ModuleConstEnumDeclaration2.ts, 27, 1)) export const enum e5 { ->e5 : Symbol(e5, Decl(es6ModuleConstEnumDeclaration2.ts, 28, 11)) +>e5 : Symbol(e5, Decl(es6ModuleConstEnumDeclaration2.ts, 28, 14)) a, >a : Symbol(e5.a, Decl(es6ModuleConstEnumDeclaration2.ts, 29, 26)) @@ -130,7 +130,7 @@ module m2 { var x2 = e5.a; >x2 : Symbol(x2, Decl(es6ModuleConstEnumDeclaration2.ts, 41, 7)) >e5.a : Symbol(e5.a, Decl(es6ModuleConstEnumDeclaration2.ts, 29, 26)) ->e5 : Symbol(e5, Decl(es6ModuleConstEnumDeclaration2.ts, 28, 11)) +>e5 : Symbol(e5, Decl(es6ModuleConstEnumDeclaration2.ts, 28, 14)) >a : Symbol(e5.a, Decl(es6ModuleConstEnumDeclaration2.ts, 29, 26)) var y2 = e6.x; @@ -142,8 +142,8 @@ module m2 { var x3 = m1.e3.a; >x3 : Symbol(x3, Decl(es6ModuleConstEnumDeclaration2.ts, 43, 7)) >m1.e3.a : Symbol(m1.e3.a, Decl(es6ModuleConstEnumDeclaration2.ts, 13, 26)) ->m1.e3 : Symbol(m1.e3, Decl(es6ModuleConstEnumDeclaration2.ts, 12, 18)) +>m1.e3 : Symbol(m1.e3, Decl(es6ModuleConstEnumDeclaration2.ts, 12, 21)) >m1 : Symbol(m1, Decl(es6ModuleConstEnumDeclaration2.ts, 11, 13)) ->e3 : Symbol(m1.e3, Decl(es6ModuleConstEnumDeclaration2.ts, 12, 18)) +>e3 : Symbol(m1.e3, Decl(es6ModuleConstEnumDeclaration2.ts, 12, 21)) >a : Symbol(m1.e3.a, Decl(es6ModuleConstEnumDeclaration2.ts, 13, 26)) } diff --git a/tests/baselines/reference/es6ModuleConstEnumDeclaration2.types b/tests/baselines/reference/es6ModuleConstEnumDeclaration2.types index 85ca26ef61f19..c086755728196 100644 --- a/tests/baselines/reference/es6ModuleConstEnumDeclaration2.types +++ b/tests/baselines/reference/es6ModuleConstEnumDeclaration2.types @@ -53,7 +53,7 @@ var y = e2.x; >x : e2.x > : ^^^^ -export module m1 { +export namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -129,7 +129,7 @@ export module m1 { >x : e4.x > : ^^^^ } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/es6ModuleEnumDeclaration.js b/tests/baselines/reference/es6ModuleEnumDeclaration.js index e1fbe849cb651..ac6caf7aae9a3 100644 --- a/tests/baselines/reference/es6ModuleEnumDeclaration.js +++ b/tests/baselines/reference/es6ModuleEnumDeclaration.js @@ -13,7 +13,7 @@ enum e2 { } var x = e1.a; var y = e2.x; -export module m1 { +export namespace m1 { export enum e3 { a, b, @@ -29,7 +29,7 @@ export module m1 { var x2 = e3.a; var y2 = e4.x; } -module m2 { +namespace m2 { export enum e5 { a, b, diff --git a/tests/baselines/reference/es6ModuleEnumDeclaration.symbols b/tests/baselines/reference/es6ModuleEnumDeclaration.symbols index ef7910d4a54ca..417cd31ac30e7 100644 --- a/tests/baselines/reference/es6ModuleEnumDeclaration.symbols +++ b/tests/baselines/reference/es6ModuleEnumDeclaration.symbols @@ -37,11 +37,11 @@ var y = e2.x; >e2 : Symbol(e2, Decl(es6ModuleEnumDeclaration.ts, 4, 1)) >x : Symbol(e2.x, Decl(es6ModuleEnumDeclaration.ts, 5, 9)) -export module m1 { +export namespace m1 { >m1 : Symbol(m1, Decl(es6ModuleEnumDeclaration.ts, 11, 13)) export enum e3 { ->e3 : Symbol(e3, Decl(es6ModuleEnumDeclaration.ts, 12, 18)) +>e3 : Symbol(e3, Decl(es6ModuleEnumDeclaration.ts, 12, 21)) a, >a : Symbol(e3.a, Decl(es6ModuleEnumDeclaration.ts, 13, 20)) @@ -79,7 +79,7 @@ export module m1 { var x2 = e3.a; >x2 : Symbol(x2, Decl(es6ModuleEnumDeclaration.ts, 25, 7)) >e3.a : Symbol(e3.a, Decl(es6ModuleEnumDeclaration.ts, 13, 20)) ->e3 : Symbol(e3, Decl(es6ModuleEnumDeclaration.ts, 12, 18)) +>e3 : Symbol(e3, Decl(es6ModuleEnumDeclaration.ts, 12, 21)) >a : Symbol(e3.a, Decl(es6ModuleEnumDeclaration.ts, 13, 20)) var y2 = e4.x; @@ -88,11 +88,11 @@ export module m1 { >e4 : Symbol(e4, Decl(es6ModuleEnumDeclaration.ts, 17, 5)) >x : Symbol(e4.x, Decl(es6ModuleEnumDeclaration.ts, 18, 13)) } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(es6ModuleEnumDeclaration.ts, 27, 1)) export enum e5 { ->e5 : Symbol(e5, Decl(es6ModuleEnumDeclaration.ts, 28, 11)) +>e5 : Symbol(e5, Decl(es6ModuleEnumDeclaration.ts, 28, 14)) a, >a : Symbol(e5.a, Decl(es6ModuleEnumDeclaration.ts, 29, 20)) @@ -130,7 +130,7 @@ module m2 { var x2 = e5.a; >x2 : Symbol(x2, Decl(es6ModuleEnumDeclaration.ts, 41, 7)) >e5.a : Symbol(e5.a, Decl(es6ModuleEnumDeclaration.ts, 29, 20)) ->e5 : Symbol(e5, Decl(es6ModuleEnumDeclaration.ts, 28, 11)) +>e5 : Symbol(e5, Decl(es6ModuleEnumDeclaration.ts, 28, 14)) >a : Symbol(e5.a, Decl(es6ModuleEnumDeclaration.ts, 29, 20)) var y2 = e6.x; @@ -142,8 +142,8 @@ module m2 { var x3 = m1.e3.a; >x3 : Symbol(x3, Decl(es6ModuleEnumDeclaration.ts, 43, 7)) >m1.e3.a : Symbol(m1.e3.a, Decl(es6ModuleEnumDeclaration.ts, 13, 20)) ->m1.e3 : Symbol(m1.e3, Decl(es6ModuleEnumDeclaration.ts, 12, 18)) +>m1.e3 : Symbol(m1.e3, Decl(es6ModuleEnumDeclaration.ts, 12, 21)) >m1 : Symbol(m1, Decl(es6ModuleEnumDeclaration.ts, 11, 13)) ->e3 : Symbol(m1.e3, Decl(es6ModuleEnumDeclaration.ts, 12, 18)) +>e3 : Symbol(m1.e3, Decl(es6ModuleEnumDeclaration.ts, 12, 21)) >a : Symbol(m1.e3.a, Decl(es6ModuleEnumDeclaration.ts, 13, 20)) } diff --git a/tests/baselines/reference/es6ModuleEnumDeclaration.types b/tests/baselines/reference/es6ModuleEnumDeclaration.types index 9217d478ec155..bae65cfedc8fa 100644 --- a/tests/baselines/reference/es6ModuleEnumDeclaration.types +++ b/tests/baselines/reference/es6ModuleEnumDeclaration.types @@ -53,7 +53,7 @@ var y = e2.x; >x : e2.x > : ^^^^ -export module m1 { +export namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -129,7 +129,7 @@ export module m1 { >x : e4.x > : ^^^^ } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/es6ModuleFunctionDeclaration.js b/tests/baselines/reference/es6ModuleFunctionDeclaration.js index 065cc1936aaaa..05f4bdb67f1e9 100644 --- a/tests/baselines/reference/es6ModuleFunctionDeclaration.js +++ b/tests/baselines/reference/es6ModuleFunctionDeclaration.js @@ -8,7 +8,7 @@ function foo2() { foo(); foo2(); -export module m1 { +export namespace m1 { export function foo3() { } function foo4() { @@ -18,7 +18,7 @@ export module m1 { foo3(); foo4(); } -module m2 { +namespace m2 { export function foo3() { } function foo4() { diff --git a/tests/baselines/reference/es6ModuleFunctionDeclaration.symbols b/tests/baselines/reference/es6ModuleFunctionDeclaration.symbols index ff5845d2c9680..0cc9e0c44ac50 100644 --- a/tests/baselines/reference/es6ModuleFunctionDeclaration.symbols +++ b/tests/baselines/reference/es6ModuleFunctionDeclaration.symbols @@ -13,11 +13,11 @@ foo(); foo2(); >foo2 : Symbol(foo2, Decl(es6ModuleFunctionDeclaration.ts, 1, 1)) -export module m1 { +export namespace m1 { >m1 : Symbol(m1, Decl(es6ModuleFunctionDeclaration.ts, 5, 7)) export function foo3() { ->foo3 : Symbol(foo3, Decl(es6ModuleFunctionDeclaration.ts, 7, 18)) +>foo3 : Symbol(foo3, Decl(es6ModuleFunctionDeclaration.ts, 7, 21)) } function foo4() { >foo4 : Symbol(foo4, Decl(es6ModuleFunctionDeclaration.ts, 9, 5)) @@ -29,16 +29,16 @@ export module m1 { >foo2 : Symbol(foo2, Decl(es6ModuleFunctionDeclaration.ts, 1, 1)) foo3(); ->foo3 : Symbol(foo3, Decl(es6ModuleFunctionDeclaration.ts, 7, 18)) +>foo3 : Symbol(foo3, Decl(es6ModuleFunctionDeclaration.ts, 7, 21)) foo4(); >foo4 : Symbol(foo4, Decl(es6ModuleFunctionDeclaration.ts, 9, 5)) } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(es6ModuleFunctionDeclaration.ts, 16, 1)) export function foo3() { ->foo3 : Symbol(foo3, Decl(es6ModuleFunctionDeclaration.ts, 17, 11)) +>foo3 : Symbol(foo3, Decl(es6ModuleFunctionDeclaration.ts, 17, 14)) } function foo4() { >foo4 : Symbol(foo4, Decl(es6ModuleFunctionDeclaration.ts, 19, 5)) @@ -50,13 +50,13 @@ module m2 { >foo2 : Symbol(foo2, Decl(es6ModuleFunctionDeclaration.ts, 1, 1)) foo3(); ->foo3 : Symbol(foo3, Decl(es6ModuleFunctionDeclaration.ts, 17, 11)) +>foo3 : Symbol(foo3, Decl(es6ModuleFunctionDeclaration.ts, 17, 14)) foo4(); >foo4 : Symbol(foo4, Decl(es6ModuleFunctionDeclaration.ts, 19, 5)) m1.foo3(); ->m1.foo3 : Symbol(m1.foo3, Decl(es6ModuleFunctionDeclaration.ts, 7, 18)) +>m1.foo3 : Symbol(m1.foo3, Decl(es6ModuleFunctionDeclaration.ts, 7, 21)) >m1 : Symbol(m1, Decl(es6ModuleFunctionDeclaration.ts, 5, 7)) ->foo3 : Symbol(m1.foo3, Decl(es6ModuleFunctionDeclaration.ts, 7, 18)) +>foo3 : Symbol(m1.foo3, Decl(es6ModuleFunctionDeclaration.ts, 7, 21)) } diff --git a/tests/baselines/reference/es6ModuleFunctionDeclaration.types b/tests/baselines/reference/es6ModuleFunctionDeclaration.types index 5cf799ca84831..be470e93df716 100644 --- a/tests/baselines/reference/es6ModuleFunctionDeclaration.types +++ b/tests/baselines/reference/es6ModuleFunctionDeclaration.types @@ -21,7 +21,7 @@ foo2(); >foo2 : () => void > : ^^^^^^^^^^ -export module m1 { +export namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -57,7 +57,7 @@ export module m1 { >foo4 : () => void > : ^^^^^^^^^^ } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/es6ModuleInternalImport.js b/tests/baselines/reference/es6ModuleInternalImport.js index c76ed72c4aa0f..5d9d8b176260d 100644 --- a/tests/baselines/reference/es6ModuleInternalImport.js +++ b/tests/baselines/reference/es6ModuleInternalImport.js @@ -1,19 +1,19 @@ //// [tests/cases/compiler/es6ModuleInternalImport.ts] //// //// [es6ModuleInternalImport.ts] -export module m { +export namespace m { export var a = 10; } export import a1 = m.a; import a2 = m.a; var x = a1 + a2; -export module m1 { +export namespace m1 { export import a3 = m.a; import a4 = m.a; var x = a1 + a2; var x2 = a3 + a4; } -module m2 { +namespace m2 { export import a3 = m.a; import a4 = m.a; var x = a1 + a2; diff --git a/tests/baselines/reference/es6ModuleInternalImport.symbols b/tests/baselines/reference/es6ModuleInternalImport.symbols index d3cca56e1a92c..72a079fc865fd 100644 --- a/tests/baselines/reference/es6ModuleInternalImport.symbols +++ b/tests/baselines/reference/es6ModuleInternalImport.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/es6ModuleInternalImport.ts] //// === es6ModuleInternalImport.ts === -export module m { +export namespace m { >m : Symbol(m, Decl(es6ModuleInternalImport.ts, 0, 0)) export var a = 10; @@ -22,11 +22,11 @@ var x = a1 + a2; >a1 : Symbol(a1, Decl(es6ModuleInternalImport.ts, 2, 1)) >a2 : Symbol(a2, Decl(es6ModuleInternalImport.ts, 3, 23)) -export module m1 { +export namespace m1 { >m1 : Symbol(m1, Decl(es6ModuleInternalImport.ts, 5, 16)) export import a3 = m.a; ->a3 : Symbol(a3, Decl(es6ModuleInternalImport.ts, 6, 18)) +>a3 : Symbol(a3, Decl(es6ModuleInternalImport.ts, 6, 21)) >m : Symbol(m, Decl(es6ModuleInternalImport.ts, 0, 0)) >a : Symbol(a4, Decl(es6ModuleInternalImport.ts, 1, 14)) @@ -42,14 +42,14 @@ export module m1 { var x2 = a3 + a4; >x2 : Symbol(x2, Decl(es6ModuleInternalImport.ts, 10, 7)) ->a3 : Symbol(a3, Decl(es6ModuleInternalImport.ts, 6, 18)) +>a3 : Symbol(a3, Decl(es6ModuleInternalImport.ts, 6, 21)) >a4 : Symbol(a4, Decl(es6ModuleInternalImport.ts, 7, 27)) } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(es6ModuleInternalImport.ts, 11, 1)) export import a3 = m.a; ->a3 : Symbol(a3, Decl(es6ModuleInternalImport.ts, 12, 11)) +>a3 : Symbol(a3, Decl(es6ModuleInternalImport.ts, 12, 14)) >m : Symbol(m, Decl(es6ModuleInternalImport.ts, 0, 0)) >a : Symbol(a4, Decl(es6ModuleInternalImport.ts, 1, 14)) @@ -65,15 +65,15 @@ module m2 { var x2 = a3 + a4; >x2 : Symbol(x2, Decl(es6ModuleInternalImport.ts, 16, 7)) ->a3 : Symbol(a3, Decl(es6ModuleInternalImport.ts, 12, 11)) +>a3 : Symbol(a3, Decl(es6ModuleInternalImport.ts, 12, 14)) >a4 : Symbol(a4, Decl(es6ModuleInternalImport.ts, 13, 27)) var x4 = m1.a3 + m2.a3; >x4 : Symbol(x4, Decl(es6ModuleInternalImport.ts, 17, 7)) ->m1.a3 : Symbol(m1.a3, Decl(es6ModuleInternalImport.ts, 6, 18)) +>m1.a3 : Symbol(m1.a3, Decl(es6ModuleInternalImport.ts, 6, 21)) >m1 : Symbol(m1, Decl(es6ModuleInternalImport.ts, 5, 16)) ->a3 : Symbol(m1.a3, Decl(es6ModuleInternalImport.ts, 6, 18)) ->m2.a3 : Symbol(a3, Decl(es6ModuleInternalImport.ts, 12, 11)) +>a3 : Symbol(m1.a3, Decl(es6ModuleInternalImport.ts, 6, 21)) +>m2.a3 : Symbol(a3, Decl(es6ModuleInternalImport.ts, 12, 14)) >m2 : Symbol(m2, Decl(es6ModuleInternalImport.ts, 11, 1)) ->a3 : Symbol(a3, Decl(es6ModuleInternalImport.ts, 12, 11)) +>a3 : Symbol(a3, Decl(es6ModuleInternalImport.ts, 12, 14)) } diff --git a/tests/baselines/reference/es6ModuleInternalImport.types b/tests/baselines/reference/es6ModuleInternalImport.types index e5ffb0061f010..168ee8f8cab28 100644 --- a/tests/baselines/reference/es6ModuleInternalImport.types +++ b/tests/baselines/reference/es6ModuleInternalImport.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/es6ModuleInternalImport.ts] //// === es6ModuleInternalImport.ts === -export module m { +export namespace m { >m : typeof m > : ^^^^^^^^ @@ -37,7 +37,7 @@ var x = a1 + a2; >a2 : number > : ^^^^^^ -export module m1 { +export namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -77,7 +77,7 @@ export module m1 { >a4 : number > : ^^^^^^ } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/es6ModuleInternalNamedImports.errors.txt b/tests/baselines/reference/es6ModuleInternalNamedImports.errors.txt index 0d0a4fe07ac8d..f9fd1209a17a5 100644 --- a/tests/baselines/reference/es6ModuleInternalNamedImports.errors.txt +++ b/tests/baselines/reference/es6ModuleInternalNamedImports.errors.txt @@ -9,7 +9,7 @@ es6ModuleInternalNamedImports.ts(29,5): error TS1194: Export declarations are no ==== es6ModuleInternalNamedImports.ts (8 errors) ==== - export module M { + export namespace M { // variable export var M_V = 0; // interface @@ -17,9 +17,9 @@ es6ModuleInternalNamedImports.ts(29,5): error TS1194: Export declarations are no //calss export class M_C { } // instantiated module - export module M_M { var x; } + export namespace M_M { var x; } // uninstantiated module - export module M_MU { } + export namespace M_MU { } // function export function M_F() { } // enum diff --git a/tests/baselines/reference/es6ModuleInternalNamedImports.js b/tests/baselines/reference/es6ModuleInternalNamedImports.js index decbc72290643..cf54b78ec7123 100644 --- a/tests/baselines/reference/es6ModuleInternalNamedImports.js +++ b/tests/baselines/reference/es6ModuleInternalNamedImports.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/es6ModuleInternalNamedImports.ts] //// //// [es6ModuleInternalNamedImports.ts] -export module M { +export namespace M { // variable export var M_V = 0; // interface @@ -9,9 +9,9 @@ export module M { //calss export class M_C { } // instantiated module - export module M_M { var x; } + export namespace M_M { var x; } // uninstantiated module - export module M_MU { } + export namespace M_MU { } // function export function M_F() { } // enum diff --git a/tests/baselines/reference/es6ModuleInternalNamedImports.symbols b/tests/baselines/reference/es6ModuleInternalNamedImports.symbols index de9a1685a1feb..39c2eb2ed5de7 100644 --- a/tests/baselines/reference/es6ModuleInternalNamedImports.symbols +++ b/tests/baselines/reference/es6ModuleInternalNamedImports.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/es6ModuleInternalNamedImports.ts] //// === es6ModuleInternalNamedImports.ts === -export module M { +export namespace M { >M : Symbol(M, Decl(es6ModuleInternalNamedImports.ts, 0, 0)) // variable @@ -17,17 +17,17 @@ export module M { >M_C : Symbol(M_C, Decl(es6ModuleInternalNamedImports.ts, 4, 28)) // instantiated module - export module M_M { var x; } + export namespace M_M { var x; } >M_M : Symbol(M_M, Decl(es6ModuleInternalNamedImports.ts, 6, 24)) ->x : Symbol(x, Decl(es6ModuleInternalNamedImports.ts, 8, 27)) +>x : Symbol(x, Decl(es6ModuleInternalNamedImports.ts, 8, 30)) // uninstantiated module - export module M_MU { } ->M_MU : Symbol(M_MU, Decl(es6ModuleInternalNamedImports.ts, 8, 32)) + export namespace M_MU { } +>M_MU : Symbol(M_MU, Decl(es6ModuleInternalNamedImports.ts, 8, 35)) // function export function M_F() { } ->M_F : Symbol(M_F, Decl(es6ModuleInternalNamedImports.ts, 10, 26)) +>M_F : Symbol(M_F, Decl(es6ModuleInternalNamedImports.ts, 10, 29)) // enum export enum M_E { } @@ -60,11 +60,11 @@ export module M { >m : Symbol(m, Decl(es6ModuleInternalNamedImports.ts, 24, 12)) export {M_MU as mu}; ->M_MU : Symbol(M_MU, Decl(es6ModuleInternalNamedImports.ts, 8, 32)) +>M_MU : Symbol(M_MU, Decl(es6ModuleInternalNamedImports.ts, 8, 35)) >mu : Symbol(mu, Decl(es6ModuleInternalNamedImports.ts, 25, 12)) export {M_F as f}; ->M_F : Symbol(M_F, Decl(es6ModuleInternalNamedImports.ts, 10, 26)) +>M_F : Symbol(M_F, Decl(es6ModuleInternalNamedImports.ts, 10, 29)) >f : Symbol(f, Decl(es6ModuleInternalNamedImports.ts, 26, 12)) export {M_E as e}; diff --git a/tests/baselines/reference/es6ModuleInternalNamedImports.types b/tests/baselines/reference/es6ModuleInternalNamedImports.types index d53c0a66e2461..9831c0e5d1216 100644 --- a/tests/baselines/reference/es6ModuleInternalNamedImports.types +++ b/tests/baselines/reference/es6ModuleInternalNamedImports.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/es6ModuleInternalNamedImports.ts] //// === es6ModuleInternalNamedImports.ts === -export module M { +export namespace M { >M : typeof M > : ^^^^^^^^ @@ -20,14 +20,14 @@ export module M { > : ^^^ // instantiated module - export module M_M { var x; } + export namespace M_M { var x; } >M_M : typeof M_M > : ^^^^^^^^^^ >x : any > : ^^^ // uninstantiated module - export module M_MU { } + export namespace M_MU { } // function export function M_F() { } >M_F : () => void diff --git a/tests/baselines/reference/es6ModuleInternalNamedImports2.errors.txt b/tests/baselines/reference/es6ModuleInternalNamedImports2.errors.txt index 5f8dde403e91d..cd7c5dc9d87d0 100644 --- a/tests/baselines/reference/es6ModuleInternalNamedImports2.errors.txt +++ b/tests/baselines/reference/es6ModuleInternalNamedImports2.errors.txt @@ -9,7 +9,7 @@ es6ModuleInternalNamedImports2.ts(31,5): error TS1194: Export declarations are n ==== es6ModuleInternalNamedImports2.ts (8 errors) ==== - export module M { + export namespace M { // variable export var M_V = 0; // interface @@ -17,9 +17,9 @@ es6ModuleInternalNamedImports2.ts(31,5): error TS1194: Export declarations are n //calss export class M_C { } // instantiated module - export module M_M { var x; } + export namespace M_M { var x; } // uninstantiated module - export module M_MU { } + export namespace M_MU { } // function export function M_F() { } // enum @@ -30,7 +30,7 @@ es6ModuleInternalNamedImports2.ts(31,5): error TS1194: Export declarations are n export import M_A = M_M; } - export module M { + export namespace M { // Reexports export {M_V as v}; ~~~~~~~~~~~~~~~~~~ diff --git a/tests/baselines/reference/es6ModuleInternalNamedImports2.js b/tests/baselines/reference/es6ModuleInternalNamedImports2.js index 6f9ce9c663ba5..d5e07f1effb27 100644 --- a/tests/baselines/reference/es6ModuleInternalNamedImports2.js +++ b/tests/baselines/reference/es6ModuleInternalNamedImports2.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/es6ModuleInternalNamedImports2.ts] //// //// [es6ModuleInternalNamedImports2.ts] -export module M { +export namespace M { // variable export var M_V = 0; // interface @@ -9,9 +9,9 @@ export module M { //calss export class M_C { } // instantiated module - export module M_M { var x; } + export namespace M_M { var x; } // uninstantiated module - export module M_MU { } + export namespace M_MU { } // function export function M_F() { } // enum @@ -22,7 +22,7 @@ export module M { export import M_A = M_M; } -export module M { +export namespace M { // Reexports export {M_V as v}; export {M_I as i}; diff --git a/tests/baselines/reference/es6ModuleInternalNamedImports2.symbols b/tests/baselines/reference/es6ModuleInternalNamedImports2.symbols index f0e44b0e501b1..a0694bb661b5c 100644 --- a/tests/baselines/reference/es6ModuleInternalNamedImports2.symbols +++ b/tests/baselines/reference/es6ModuleInternalNamedImports2.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/es6ModuleInternalNamedImports2.ts] //// === es6ModuleInternalNamedImports2.ts === -export module M { +export namespace M { >M : Symbol(M, Decl(es6ModuleInternalNamedImports2.ts, 0, 0), Decl(es6ModuleInternalNamedImports2.ts, 19, 1)) // variable @@ -17,17 +17,17 @@ export module M { >M_C : Symbol(M_C, Decl(es6ModuleInternalNamedImports2.ts, 4, 28)) // instantiated module - export module M_M { var x; } + export namespace M_M { var x; } >M_M : Symbol(M_M, Decl(es6ModuleInternalNamedImports2.ts, 6, 24)) ->x : Symbol(x, Decl(es6ModuleInternalNamedImports2.ts, 8, 27)) +>x : Symbol(x, Decl(es6ModuleInternalNamedImports2.ts, 8, 30)) // uninstantiated module - export module M_MU { } ->M_MU : Symbol(M_MU, Decl(es6ModuleInternalNamedImports2.ts, 8, 32)) + export namespace M_MU { } +>M_MU : Symbol(M_MU, Decl(es6ModuleInternalNamedImports2.ts, 8, 35)) // function export function M_F() { } ->M_F : Symbol(M_F, Decl(es6ModuleInternalNamedImports2.ts, 10, 26)) +>M_F : Symbol(M_F, Decl(es6ModuleInternalNamedImports2.ts, 10, 29)) // enum export enum M_E { } @@ -43,7 +43,7 @@ export module M { >M_M : Symbol(M_M, Decl(es6ModuleInternalNamedImports2.ts, 6, 24)) } -export module M { +export namespace M { >M : Symbol(M, Decl(es6ModuleInternalNamedImports2.ts, 0, 0), Decl(es6ModuleInternalNamedImports2.ts, 19, 1)) // Reexports @@ -64,11 +64,11 @@ export module M { >m : Symbol(m, Decl(es6ModuleInternalNamedImports2.ts, 26, 12)) export {M_MU as mu}; ->M_MU : Symbol(M_MU, Decl(es6ModuleInternalNamedImports2.ts, 8, 32)) +>M_MU : Symbol(M_MU, Decl(es6ModuleInternalNamedImports2.ts, 8, 35)) >mu : Symbol(mu, Decl(es6ModuleInternalNamedImports2.ts, 27, 12)) export {M_F as f}; ->M_F : Symbol(M_F, Decl(es6ModuleInternalNamedImports2.ts, 10, 26)) +>M_F : Symbol(M_F, Decl(es6ModuleInternalNamedImports2.ts, 10, 29)) >f : Symbol(f, Decl(es6ModuleInternalNamedImports2.ts, 28, 12)) export {M_E as e}; diff --git a/tests/baselines/reference/es6ModuleInternalNamedImports2.types b/tests/baselines/reference/es6ModuleInternalNamedImports2.types index 03e27bd496bc0..babcd9b6a2e95 100644 --- a/tests/baselines/reference/es6ModuleInternalNamedImports2.types +++ b/tests/baselines/reference/es6ModuleInternalNamedImports2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/es6ModuleInternalNamedImports2.ts] //// === es6ModuleInternalNamedImports2.ts === -export module M { +export namespace M { >M : typeof M > : ^^^^^^^^ @@ -20,14 +20,14 @@ export module M { > : ^^^ // instantiated module - export module M_M { var x; } + export namespace M_M { var x; } >M_M : typeof M_M > : ^^^^^^^^^^ >x : any > : ^^^ // uninstantiated module - export module M_MU { } + export namespace M_MU { } // function export function M_F() { } >M_F : () => void @@ -51,7 +51,7 @@ export module M { > : ^^^^^^^^^^ } -export module M { +export namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/es6ModuleLet.js b/tests/baselines/reference/es6ModuleLet.js index 5de0dbcdf1b60..d3851805ee0e9 100644 --- a/tests/baselines/reference/es6ModuleLet.js +++ b/tests/baselines/reference/es6ModuleLet.js @@ -5,13 +5,13 @@ export let a = "hello"; export let x: string = a, y = x; let b = y; let c: string = b, d = c; -export module m1 { +export namespace m1 { export let k = a; export let l: string = b, m = k; let n = m1.k; let o: string = n, p = k; } -module m2 { +namespace m2 { export let k = a; export let l: string = b, m = k; let n = m1.k; diff --git a/tests/baselines/reference/es6ModuleLet.symbols b/tests/baselines/reference/es6ModuleLet.symbols index 2a778fc65db2c..36b289d792200 100644 --- a/tests/baselines/reference/es6ModuleLet.symbols +++ b/tests/baselines/reference/es6ModuleLet.symbols @@ -20,7 +20,7 @@ let c: string = b, d = c; >d : Symbol(d, Decl(es6ModuleLet.ts, 3, 18)) >c : Symbol(c, Decl(es6ModuleLet.ts, 3, 3)) -export module m1 { +export namespace m1 { >m1 : Symbol(m1, Decl(es6ModuleLet.ts, 3, 25)) export let k = a; @@ -45,7 +45,7 @@ export module m1 { >p : Symbol(p, Decl(es6ModuleLet.ts, 8, 22)) >k : Symbol(k, Decl(es6ModuleLet.ts, 5, 14)) } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(es6ModuleLet.ts, 9, 1)) export let k = a; diff --git a/tests/baselines/reference/es6ModuleLet.types b/tests/baselines/reference/es6ModuleLet.types index 33ce5a23d2080..ebed57cf48754 100644 --- a/tests/baselines/reference/es6ModuleLet.types +++ b/tests/baselines/reference/es6ModuleLet.types @@ -33,7 +33,7 @@ let c: string = b, d = c; >c : string > : ^^^^^^ -export module m1 { +export namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -73,7 +73,7 @@ export module m1 { >k : string > : ^^^^^^ } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/es6ModuleModuleDeclaration.js b/tests/baselines/reference/es6ModuleModuleDeclaration.js index 8831cf20aa1de..de23259648dcf 100644 --- a/tests/baselines/reference/es6ModuleModuleDeclaration.js +++ b/tests/baselines/reference/es6ModuleModuleDeclaration.js @@ -1,26 +1,26 @@ //// [tests/cases/compiler/es6ModuleModuleDeclaration.ts] //// //// [es6ModuleModuleDeclaration.ts] -export module m1 { +export namespace m1 { export var a = 10; var b = 10; - export module innerExportedModule { + export namespace innerExportedModule { export var k = 10; var l = 10; } - export module innerNonExportedModule { + export namespace innerNonExportedModule { export var x = 10; var y = 10; } } -module m2 { +namespace m2 { export var a = 10; var b = 10; - export module innerExportedModule { + export namespace innerExportedModule { export var k = 10; var l = 10; } - export module innerNonExportedModule { + export namespace innerNonExportedModule { export var x = 10; var y = 10; } diff --git a/tests/baselines/reference/es6ModuleModuleDeclaration.symbols b/tests/baselines/reference/es6ModuleModuleDeclaration.symbols index 7521b8f99d5d6..58cb9f3030af4 100644 --- a/tests/baselines/reference/es6ModuleModuleDeclaration.symbols +++ b/tests/baselines/reference/es6ModuleModuleDeclaration.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/es6ModuleModuleDeclaration.ts] //// === es6ModuleModuleDeclaration.ts === -export module m1 { +export namespace m1 { >m1 : Symbol(m1, Decl(es6ModuleModuleDeclaration.ts, 0, 0)) export var a = 10; @@ -10,7 +10,7 @@ export module m1 { var b = 10; >b : Symbol(b, Decl(es6ModuleModuleDeclaration.ts, 2, 7)) - export module innerExportedModule { + export namespace innerExportedModule { >innerExportedModule : Symbol(innerExportedModule, Decl(es6ModuleModuleDeclaration.ts, 2, 15)) export var k = 10; @@ -19,7 +19,7 @@ export module m1 { var l = 10; >l : Symbol(l, Decl(es6ModuleModuleDeclaration.ts, 5, 11)) } - export module innerNonExportedModule { + export namespace innerNonExportedModule { >innerNonExportedModule : Symbol(innerNonExportedModule, Decl(es6ModuleModuleDeclaration.ts, 6, 5)) export var x = 10; @@ -29,7 +29,7 @@ export module m1 { >y : Symbol(y, Decl(es6ModuleModuleDeclaration.ts, 9, 11)) } } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(es6ModuleModuleDeclaration.ts, 11, 1)) export var a = 10; @@ -38,7 +38,7 @@ module m2 { var b = 10; >b : Symbol(b, Decl(es6ModuleModuleDeclaration.ts, 14, 7)) - export module innerExportedModule { + export namespace innerExportedModule { >innerExportedModule : Symbol(innerExportedModule, Decl(es6ModuleModuleDeclaration.ts, 14, 15)) export var k = 10; @@ -47,7 +47,7 @@ module m2 { var l = 10; >l : Symbol(l, Decl(es6ModuleModuleDeclaration.ts, 17, 11)) } - export module innerNonExportedModule { + export namespace innerNonExportedModule { >innerNonExportedModule : Symbol(innerNonExportedModule, Decl(es6ModuleModuleDeclaration.ts, 18, 5)) export var x = 10; diff --git a/tests/baselines/reference/es6ModuleModuleDeclaration.types b/tests/baselines/reference/es6ModuleModuleDeclaration.types index f5e8227ad7b3e..6c8db1caf44f7 100644 --- a/tests/baselines/reference/es6ModuleModuleDeclaration.types +++ b/tests/baselines/reference/es6ModuleModuleDeclaration.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/es6ModuleModuleDeclaration.ts] //// === es6ModuleModuleDeclaration.ts === -export module m1 { +export namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -17,7 +17,7 @@ export module m1 { >10 : 10 > : ^^ - export module innerExportedModule { + export namespace innerExportedModule { >innerExportedModule : typeof innerExportedModule > : ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -33,7 +33,7 @@ export module m1 { >10 : 10 > : ^^ } - export module innerNonExportedModule { + export namespace innerNonExportedModule { >innerNonExportedModule : typeof innerNonExportedModule > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -50,7 +50,7 @@ export module m1 { > : ^^ } } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -66,7 +66,7 @@ module m2 { >10 : 10 > : ^^ - export module innerExportedModule { + export namespace innerExportedModule { >innerExportedModule : typeof innerExportedModule > : ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -82,7 +82,7 @@ module m2 { >10 : 10 > : ^^ } - export module innerNonExportedModule { + export namespace innerNonExportedModule { >innerNonExportedModule : typeof innerNonExportedModule > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/es6ModuleVariableStatement.js b/tests/baselines/reference/es6ModuleVariableStatement.js index 3e2c6de93aadb..e353a64f12165 100644 --- a/tests/baselines/reference/es6ModuleVariableStatement.js +++ b/tests/baselines/reference/es6ModuleVariableStatement.js @@ -5,13 +5,13 @@ export var a = "hello"; export var x: string = a, y = x; var b = y; var c: string = b, d = c; -export module m1 { +export namespace m1 { export var k = a; export var l: string = b, m = k; var n = m1.k; var o: string = n, p = k; } -module m2 { +namespace m2 { export var k = a; export var l: string = b, m = k; var n = m1.k; diff --git a/tests/baselines/reference/es6ModuleVariableStatement.symbols b/tests/baselines/reference/es6ModuleVariableStatement.symbols index 23b8b68f4d1b2..d17e41e5e1d46 100644 --- a/tests/baselines/reference/es6ModuleVariableStatement.symbols +++ b/tests/baselines/reference/es6ModuleVariableStatement.symbols @@ -20,7 +20,7 @@ var c: string = b, d = c; >d : Symbol(d, Decl(es6ModuleVariableStatement.ts, 3, 18)) >c : Symbol(c, Decl(es6ModuleVariableStatement.ts, 3, 3)) -export module m1 { +export namespace m1 { >m1 : Symbol(m1, Decl(es6ModuleVariableStatement.ts, 3, 25)) export var k = a; @@ -45,7 +45,7 @@ export module m1 { >p : Symbol(p, Decl(es6ModuleVariableStatement.ts, 8, 22)) >k : Symbol(k, Decl(es6ModuleVariableStatement.ts, 5, 14)) } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(es6ModuleVariableStatement.ts, 9, 1)) export var k = a; diff --git a/tests/baselines/reference/es6ModuleVariableStatement.types b/tests/baselines/reference/es6ModuleVariableStatement.types index b6ca6faf11bda..13e8b51e86d18 100644 --- a/tests/baselines/reference/es6ModuleVariableStatement.types +++ b/tests/baselines/reference/es6ModuleVariableStatement.types @@ -33,7 +33,7 @@ var c: string = b, d = c; >c : string > : ^^^^^^ -export module m1 { +export namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -73,7 +73,7 @@ export module m1 { >k : string > : ^^^^^^ } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/escapedIdentifiers.js b/tests/baselines/reference/escapedIdentifiers.js index f71cc68d88884..7e99741802583 100644 --- a/tests/baselines/reference/escapedIdentifiers.js +++ b/tests/baselines/reference/escapedIdentifiers.js @@ -22,10 +22,10 @@ b ++; \u0062 ++; // modules -module moduleType1 { +namespace moduleType1 { export var baz1: number; } -module moduleType\u0032 { +namespace moduleType\u0032 { export var baz2: number; } diff --git a/tests/baselines/reference/escapedIdentifiers.symbols b/tests/baselines/reference/escapedIdentifiers.symbols index e72d50330c3fb..3941cba3179d7 100644 --- a/tests/baselines/reference/escapedIdentifiers.symbols +++ b/tests/baselines/reference/escapedIdentifiers.symbols @@ -32,13 +32,13 @@ b ++; >\u0062 : Symbol(b, Decl(escapedIdentifiers.ts, 16, 3)) // modules -module moduleType1 { +namespace moduleType1 { >moduleType1 : Symbol(moduleType1, Decl(escapedIdentifiers.ts, 18, 10)) export var baz1: number; >baz1 : Symbol(baz1, Decl(escapedIdentifiers.ts, 22, 14)) } -module moduleType\u0032 { +namespace moduleType\u0032 { >moduleType\u0032 : Symbol(moduleType\u0032, Decl(escapedIdentifiers.ts, 23, 1)) export var baz2: number; diff --git a/tests/baselines/reference/escapedIdentifiers.types b/tests/baselines/reference/escapedIdentifiers.types index 21c84c42c55d3..05321572a4704 100644 --- a/tests/baselines/reference/escapedIdentifiers.types +++ b/tests/baselines/reference/escapedIdentifiers.types @@ -50,7 +50,7 @@ b ++; > : ^^^^^^ // modules -module moduleType1 { +namespace moduleType1 { >moduleType1 : typeof moduleType1 > : ^^^^^^^^^^^^^^^^^^ @@ -58,7 +58,7 @@ module moduleType1 { >baz1 : number > : ^^^^^^ } -module moduleType\u0032 { +namespace moduleType\u0032 { >moduleType\u0032 : typeof moduleType\u0032 > : ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js index ca0a6abf55b67..c7ed8df444c53 100644 --- a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js +++ b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js @@ -17,7 +17,7 @@ class D{ function F(x: string): number { return 42; } -module M { +namespace M { export class A { name: string; } diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.symbols b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.symbols index ddf590046a0ac..5ec76f88f2e7c 100644 --- a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.symbols +++ b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.symbols @@ -40,11 +40,11 @@ function F(x: string): number { return 42; } >F : Symbol(F, Decl(everyTypeWithAnnotationAndInitializer.ts, 12, 1)) >x : Symbol(x, Decl(everyTypeWithAnnotationAndInitializer.ts, 14, 11)) -module M { +namespace M { >M : Symbol(M, Decl(everyTypeWithAnnotationAndInitializer.ts, 14, 44)) export class A { ->A : Symbol(A, Decl(everyTypeWithAnnotationAndInitializer.ts, 16, 10)) +>A : Symbol(A, Decl(everyTypeWithAnnotationAndInitializer.ts, 16, 13)) name: string; >name : Symbol(A.name, Decl(everyTypeWithAnnotationAndInitializer.ts, 17, 20)) @@ -133,10 +133,10 @@ var aModule: typeof M = M; var aClassInModule: M.A = new M.A(); >aClassInModule : Symbol(aClassInModule, Decl(everyTypeWithAnnotationAndInitializer.ts, 44, 3)) >M : Symbol(M, Decl(everyTypeWithAnnotationAndInitializer.ts, 14, 44)) ->A : Symbol(M.A, Decl(everyTypeWithAnnotationAndInitializer.ts, 16, 10)) ->M.A : Symbol(M.A, Decl(everyTypeWithAnnotationAndInitializer.ts, 16, 10)) +>A : Symbol(M.A, Decl(everyTypeWithAnnotationAndInitializer.ts, 16, 13)) +>M.A : Symbol(M.A, Decl(everyTypeWithAnnotationAndInitializer.ts, 16, 13)) >M : Symbol(M, Decl(everyTypeWithAnnotationAndInitializer.ts, 14, 44)) ->A : Symbol(M.A, Decl(everyTypeWithAnnotationAndInitializer.ts, 16, 10)) +>A : Symbol(M.A, Decl(everyTypeWithAnnotationAndInitializer.ts, 16, 13)) var aFunctionInModule: typeof M.F2 = (x) => 'this is a string'; >aFunctionInModule : Symbol(aFunctionInModule, Decl(everyTypeWithAnnotationAndInitializer.ts, 45, 3)) diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types index 85fd6c3f36b3c..d281e554c576b 100644 --- a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types +++ b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types @@ -41,7 +41,7 @@ function F(x: string): number { return 42; } >42 : 42 > : ^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt index c5e9a1bf5f484..c956e3ab7b9e5 100644 --- a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt +++ b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt @@ -42,7 +42,7 @@ everyTypeWithAnnotationAndInvalidInitializer.ts(52,5): error TS2322: Type '(x: n function F(x: string): number { return 42; } function F2(x: number): boolean { return x < 42; } - module M { + namespace M { export class A { name: string; } @@ -50,7 +50,7 @@ everyTypeWithAnnotationAndInvalidInitializer.ts(52,5): error TS2322: Type '(x: n export function F2(x: number): string { return x.toString(); } } - module N { + namespace N { export class A { id: number; } diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js index 1df63910fcd2a..22ae6327328ff 100644 --- a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js +++ b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js @@ -18,7 +18,7 @@ class D{ function F(x: string): number { return 42; } function F2(x: number): boolean { return x < 42; } -module M { +namespace M { export class A { name: string; } @@ -26,7 +26,7 @@ module M { export function F2(x: number): string { return x.toString(); } } -module N { +namespace N { export class A { id: number; } diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.symbols b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.symbols index b77b910ebf76c..a4ec0551a19a2 100644 --- a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.symbols +++ b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.symbols @@ -45,11 +45,11 @@ function F2(x: number): boolean { return x < 42; } >x : Symbol(x, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 15, 12)) >x : Symbol(x, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 15, 12)) -module M { +namespace M { >M : Symbol(M, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 15, 50)) export class A { ->A : Symbol(A, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 17, 10)) +>A : Symbol(A, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 17, 13)) name: string; >name : Symbol(A.name, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 18, 20)) @@ -63,11 +63,11 @@ module M { >toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --)) } -module N { +namespace N { >N : Symbol(N, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 23, 1)) export class A { ->A : Symbol(A, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 25, 10)) +>A : Symbol(A, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 25, 13)) id: number; >id : Symbol(A.id, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 26, 20)) @@ -142,10 +142,10 @@ var aModule: typeof M = N; var aClassInModule: M.A = new N.A(); >aClassInModule : Symbol(aClassInModule, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 50, 3)) >M : Symbol(M, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 15, 50)) ->A : Symbol(M.A, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 17, 10)) ->N.A : Symbol(N.A, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 25, 10)) +>A : Symbol(M.A, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 17, 13)) +>N.A : Symbol(N.A, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 25, 13)) >N : Symbol(N, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 23, 1)) ->A : Symbol(N.A, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 25, 10)) +>A : Symbol(N.A, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 25, 13)) var aFunctionInModule: typeof M.F2 = F2; >aFunctionInModule : Symbol(aFunctionInModule, Decl(everyTypeWithAnnotationAndInvalidInitializer.ts, 51, 3)) diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.types b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.types index 5bd5b847f8c3e..ce217559731e1 100644 --- a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.types +++ b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.types @@ -53,7 +53,7 @@ function F2(x: number): boolean { return x < 42; } >42 : 42 > : ^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -81,7 +81,7 @@ module M { > : ^ ^^^ ^^^^^ } -module N { +namespace N { >N : typeof N > : ^^^^^^^^ diff --git a/tests/baselines/reference/everyTypeWithInitializer.js b/tests/baselines/reference/everyTypeWithInitializer.js index 43b9081cf0775..a840c78a3664c 100644 --- a/tests/baselines/reference/everyTypeWithInitializer.js +++ b/tests/baselines/reference/everyTypeWithInitializer.js @@ -17,7 +17,7 @@ class D{ function F(x: string): number { return 42; } -module M { +namespace M { export class A { name: string; } diff --git a/tests/baselines/reference/everyTypeWithInitializer.symbols b/tests/baselines/reference/everyTypeWithInitializer.symbols index 0c6ac478f144c..e8666eb310538 100644 --- a/tests/baselines/reference/everyTypeWithInitializer.symbols +++ b/tests/baselines/reference/everyTypeWithInitializer.symbols @@ -40,11 +40,11 @@ function F(x: string): number { return 42; } >F : Symbol(F, Decl(everyTypeWithInitializer.ts, 12, 1)) >x : Symbol(x, Decl(everyTypeWithInitializer.ts, 14, 11)) -module M { +namespace M { >M : Symbol(M, Decl(everyTypeWithInitializer.ts, 14, 44)) export class A { ->A : Symbol(A, Decl(everyTypeWithInitializer.ts, 16, 10)) +>A : Symbol(A, Decl(everyTypeWithInitializer.ts, 16, 13)) name: string; >name : Symbol(A.name, Decl(everyTypeWithInitializer.ts, 17, 20)) @@ -110,9 +110,9 @@ var aModule = M; var aClassInModule = new M.A(); >aClassInModule : Symbol(aClassInModule, Decl(everyTypeWithInitializer.ts, 42, 3)) ->M.A : Symbol(M.A, Decl(everyTypeWithInitializer.ts, 16, 10)) +>M.A : Symbol(M.A, Decl(everyTypeWithInitializer.ts, 16, 13)) >M : Symbol(M, Decl(everyTypeWithInitializer.ts, 14, 44)) ->A : Symbol(M.A, Decl(everyTypeWithInitializer.ts, 16, 10)) +>A : Symbol(M.A, Decl(everyTypeWithInitializer.ts, 16, 13)) var aFunctionInModule = M.F2; >aFunctionInModule : Symbol(aFunctionInModule, Decl(everyTypeWithInitializer.ts, 43, 3)) diff --git a/tests/baselines/reference/everyTypeWithInitializer.types b/tests/baselines/reference/everyTypeWithInitializer.types index acf32aa08f5c3..62135e11f5b78 100644 --- a/tests/baselines/reference/everyTypeWithInitializer.types +++ b/tests/baselines/reference/everyTypeWithInitializer.types @@ -41,7 +41,7 @@ function F(x: string): number { return 42; } >42 : 42 > : ^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/exportAlreadySeen.errors.txt b/tests/baselines/reference/exportAlreadySeen.errors.txt index a34f14a8f7f27..efa398fe4eb64 100644 --- a/tests/baselines/reference/exportAlreadySeen.errors.txt +++ b/tests/baselines/reference/exportAlreadySeen.errors.txt @@ -11,7 +11,7 @@ exportAlreadySeen.ts(17,16): error TS1030: 'export' modifier already seen. ==== exportAlreadySeen.ts (10 errors) ==== - module M { + namespace M { export export var x = 1; ~~~~~~ !!! error TS1030: 'export' modifier already seen. @@ -19,7 +19,7 @@ exportAlreadySeen.ts(17,16): error TS1030: 'export' modifier already seen. ~~~~~~ !!! error TS1030: 'export' modifier already seen. - export export module N { + export export namespace N { ~~~~~~ !!! error TS1030: 'export' modifier already seen. export export class C { } @@ -31,7 +31,7 @@ exportAlreadySeen.ts(17,16): error TS1030: 'export' modifier already seen. } } - declare module A { + declare namespace A { export export var x; ~~~~~~ !!! error TS1030: 'export' modifier already seen. @@ -39,7 +39,7 @@ exportAlreadySeen.ts(17,16): error TS1030: 'export' modifier already seen. ~~~~~~ !!! error TS1030: 'export' modifier already seen. - export export module N { + export export namespace N { ~~~~~~ !!! error TS1030: 'export' modifier already seen. export export class C { } diff --git a/tests/baselines/reference/exportAlreadySeen.js b/tests/baselines/reference/exportAlreadySeen.js index d6475476761c8..a3f186dca8fad 100644 --- a/tests/baselines/reference/exportAlreadySeen.js +++ b/tests/baselines/reference/exportAlreadySeen.js @@ -1,21 +1,21 @@ //// [tests/cases/compiler/exportAlreadySeen.ts] //// //// [exportAlreadySeen.ts] -module M { +namespace M { export export var x = 1; export export function f() { } - export export module N { + export export namespace N { export export class C { } export export interface I { } } } -declare module A { +declare namespace A { export export var x; export export function f() - export export module N { + export export namespace N { export export class C { } export export interface I { } } diff --git a/tests/baselines/reference/exportAlreadySeen.symbols b/tests/baselines/reference/exportAlreadySeen.symbols index ec48133ec08c8..966939fa0d242 100644 --- a/tests/baselines/reference/exportAlreadySeen.symbols +++ b/tests/baselines/reference/exportAlreadySeen.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportAlreadySeen.ts] //// === exportAlreadySeen.ts === -module M { +namespace M { >M : Symbol(M, Decl(exportAlreadySeen.ts, 0, 0)) export export var x = 1; @@ -10,18 +10,18 @@ module M { export export function f() { } >f : Symbol(f, Decl(exportAlreadySeen.ts, 1, 28)) - export export module N { + export export namespace N { >N : Symbol(N, Decl(exportAlreadySeen.ts, 2, 34)) export export class C { } ->C : Symbol(C, Decl(exportAlreadySeen.ts, 4, 28)) +>C : Symbol(C, Decl(exportAlreadySeen.ts, 4, 31)) export export interface I { } >I : Symbol(I, Decl(exportAlreadySeen.ts, 5, 33)) } } -declare module A { +declare namespace A { >A : Symbol(A, Decl(exportAlreadySeen.ts, 8, 1)) export export var x; @@ -30,11 +30,11 @@ declare module A { export export function f() >f : Symbol(f, Decl(exportAlreadySeen.ts, 11, 24)) - export export module N { + export export namespace N { >N : Symbol(N, Decl(exportAlreadySeen.ts, 12, 30)) export export class C { } ->C : Symbol(C, Decl(exportAlreadySeen.ts, 14, 28)) +>C : Symbol(C, Decl(exportAlreadySeen.ts, 14, 31)) export export interface I { } >I : Symbol(I, Decl(exportAlreadySeen.ts, 15, 33)) diff --git a/tests/baselines/reference/exportAlreadySeen.types b/tests/baselines/reference/exportAlreadySeen.types index e16dd4b7fd37a..0f27bf306fb2a 100644 --- a/tests/baselines/reference/exportAlreadySeen.types +++ b/tests/baselines/reference/exportAlreadySeen.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportAlreadySeen.ts] //// === exportAlreadySeen.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -15,7 +15,7 @@ module M { >f : () => void > : ^^^^^^^^^^ - export export module N { + export export namespace N { >N : typeof N > : ^^^^^^^^ @@ -27,7 +27,7 @@ module M { } } -declare module A { +declare namespace A { >A : typeof A > : ^^^^^^^^ @@ -39,7 +39,7 @@ declare module A { >f : () => any > : ^^^^^^^^^ - export export module N { + export export namespace N { >N : typeof N > : ^^^^^^^^ diff --git a/tests/baselines/reference/exportAssignClassAndModule.js b/tests/baselines/reference/exportAssignClassAndModule.js index af9a2f43ed118..0cb717a2075aa 100644 --- a/tests/baselines/reference/exportAssignClassAndModule.js +++ b/tests/baselines/reference/exportAssignClassAndModule.js @@ -4,7 +4,7 @@ class Foo { x: Foo.Bar; } -module Foo { +namespace Foo { export interface Bar { } } diff --git a/tests/baselines/reference/exportAssignClassAndModule.symbols b/tests/baselines/reference/exportAssignClassAndModule.symbols index 38aeebc126854..f7a34a1fe04da 100644 --- a/tests/baselines/reference/exportAssignClassAndModule.symbols +++ b/tests/baselines/reference/exportAssignClassAndModule.symbols @@ -8,7 +8,7 @@ import Foo = require('./exportAssignClassAndModule_0'); var z: Foo.Bar; >z : Symbol(z, Decl(exportAssignClassAndModule_1.ts, 3, 3)) >Foo : Symbol(Foo, Decl(exportAssignClassAndModule_1.ts, 0, 0)) ->Bar : Symbol(Foo.Bar, Decl(exportAssignClassAndModule_0.ts, 3, 12)) +>Bar : Symbol(Foo.Bar, Decl(exportAssignClassAndModule_0.ts, 3, 15)) var zz: Foo; >zz : Symbol(zz, Decl(exportAssignClassAndModule_1.ts, 4, 3)) @@ -26,13 +26,13 @@ class Foo { x: Foo.Bar; >x : Symbol(Foo.x, Decl(exportAssignClassAndModule_0.ts, 0, 11)) >Foo : Symbol(Foo, Decl(exportAssignClassAndModule_0.ts, 0, 0), Decl(exportAssignClassAndModule_0.ts, 2, 1)) ->Bar : Symbol(Foo.Bar, Decl(exportAssignClassAndModule_0.ts, 3, 12)) +>Bar : Symbol(Foo.Bar, Decl(exportAssignClassAndModule_0.ts, 3, 15)) } -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(exportAssignClassAndModule_0.ts, 0, 0), Decl(exportAssignClassAndModule_0.ts, 2, 1)) export interface Bar { ->Bar : Symbol(Bar, Decl(exportAssignClassAndModule_0.ts, 3, 12)) +>Bar : Symbol(Bar, Decl(exportAssignClassAndModule_0.ts, 3, 15)) } } export = Foo; diff --git a/tests/baselines/reference/exportAssignClassAndModule.types b/tests/baselines/reference/exportAssignClassAndModule.types index 1b9deaca605cd..455a785296dde 100644 --- a/tests/baselines/reference/exportAssignClassAndModule.types +++ b/tests/baselines/reference/exportAssignClassAndModule.types @@ -35,7 +35,7 @@ class Foo { >Foo : any > : ^^^ } -module Foo { +namespace Foo { export interface Bar { } } diff --git a/tests/baselines/reference/exportAssignValueAndType.js b/tests/baselines/reference/exportAssignValueAndType.js index 782be1785a864..50b1dff946f4c 100644 --- a/tests/baselines/reference/exportAssignValueAndType.js +++ b/tests/baselines/reference/exportAssignValueAndType.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportAssignValueAndType.ts] //// //// [exportAssignValueAndType.ts] -declare module http { +declare namespace http { export interface Server { openPort: number; } } diff --git a/tests/baselines/reference/exportAssignValueAndType.symbols b/tests/baselines/reference/exportAssignValueAndType.symbols index c3e9056c4e805..640bf81552ebd 100644 --- a/tests/baselines/reference/exportAssignValueAndType.symbols +++ b/tests/baselines/reference/exportAssignValueAndType.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/exportAssignValueAndType.ts] //// === exportAssignValueAndType.ts === -declare module http { +declare namespace http { >http : Symbol(http, Decl(exportAssignValueAndType.ts, 0, 0)) export interface Server { openPort: number; } ->Server : Symbol(Server, Decl(exportAssignValueAndType.ts, 0, 21)) +>Server : Symbol(Server, Decl(exportAssignValueAndType.ts, 0, 24)) >openPort : Symbol(Server.openPort, Decl(exportAssignValueAndType.ts, 1, 26)) } @@ -14,7 +14,7 @@ interface server { (): http.Server; >http : Symbol(http, Decl(exportAssignValueAndType.ts, 0, 0)) ->Server : Symbol(http.Server, Decl(exportAssignValueAndType.ts, 0, 21)) +>Server : Symbol(http.Server, Decl(exportAssignValueAndType.ts, 0, 24)) startTime: Date; >startTime : Symbol(server.startTime, Decl(exportAssignValueAndType.ts, 5, 20)) diff --git a/tests/baselines/reference/exportAssignValueAndType.types b/tests/baselines/reference/exportAssignValueAndType.types index c4a463915d2e4..f244215b561d7 100644 --- a/tests/baselines/reference/exportAssignValueAndType.types +++ b/tests/baselines/reference/exportAssignValueAndType.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportAssignValueAndType.ts] //// === exportAssignValueAndType.ts === -declare module http { +declare namespace http { export interface Server { openPort: number; } >openPort : number > : ^^^^^^ diff --git a/tests/baselines/reference/exportAssignmentCircularModules.js b/tests/baselines/reference/exportAssignmentCircularModules.js index 696c746f10441..d9392a910069a 100644 --- a/tests/baselines/reference/exportAssignmentCircularModules.js +++ b/tests/baselines/reference/exportAssignmentCircularModules.js @@ -2,21 +2,21 @@ //// [foo_0.ts] import foo1 = require('./foo_1'); -module Foo { +namespace Foo { export var x = foo1.x; } export = Foo; //// [foo_1.ts] import foo2 = require("./foo_2"); -module Foo { +namespace Foo { export var x = foo2.x; } export = Foo; //// [foo_2.ts] import foo0 = require("./foo_0"); -module Foo { +namespace Foo { export var x = foo0.x; } export = Foo; diff --git a/tests/baselines/reference/exportAssignmentCircularModules.symbols b/tests/baselines/reference/exportAssignmentCircularModules.symbols index 454c1f97665fb..a1827af48de18 100644 --- a/tests/baselines/reference/exportAssignmentCircularModules.symbols +++ b/tests/baselines/reference/exportAssignmentCircularModules.symbols @@ -4,7 +4,7 @@ import foo0 = require("./foo_0"); >foo0 : Symbol(foo0, Decl(foo_2.ts, 0, 0)) -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(foo_2.ts, 0, 33)) export var x = foo0.x; @@ -20,7 +20,7 @@ export = Foo; import foo1 = require('./foo_1'); >foo1 : Symbol(foo1, Decl(foo_0.ts, 0, 0)) -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(foo_0.ts, 0, 33)) export var x = foo1.x; @@ -36,7 +36,7 @@ export = Foo; import foo2 = require("./foo_2"); >foo2 : Symbol(foo2, Decl(foo_1.ts, 0, 0)) -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(foo_1.ts, 0, 33)) export var x = foo2.x; diff --git a/tests/baselines/reference/exportAssignmentCircularModules.types b/tests/baselines/reference/exportAssignmentCircularModules.types index 7756674cf27ec..151ac1b4bd314 100644 --- a/tests/baselines/reference/exportAssignmentCircularModules.types +++ b/tests/baselines/reference/exportAssignmentCircularModules.types @@ -5,7 +5,7 @@ import foo0 = require("./foo_0"); >foo0 : typeof foo0 > : ^^^^^^^^^^^ -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ @@ -26,7 +26,7 @@ import foo1 = require('./foo_1'); >foo1 : typeof foo1 > : ^^^^^^^^^^^ -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ @@ -47,7 +47,7 @@ import foo2 = require("./foo_2"); >foo2 : typeof foo2 > : ^^^^^^^^^^^ -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/exportAssignmentError.js b/tests/baselines/reference/exportAssignmentError.js index 69b0d40cb6865..59251c47a3da2 100644 --- a/tests/baselines/reference/exportAssignmentError.js +++ b/tests/baselines/reference/exportAssignmentError.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportAssignmentError.ts] //// //// [exportEqualsModule_A.ts] -module M { +namespace M { export var x; } diff --git a/tests/baselines/reference/exportAssignmentError.symbols b/tests/baselines/reference/exportAssignmentError.symbols index 46d4f8f356977..ff333e602f627 100644 --- a/tests/baselines/reference/exportAssignmentError.symbols +++ b/tests/baselines/reference/exportAssignmentError.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportAssignmentError.ts] //// === exportEqualsModule_A.ts === -module M { +namespace M { >M : Symbol(M, Decl(exportEqualsModule_A.ts, 0, 0)) export var x; diff --git a/tests/baselines/reference/exportAssignmentError.types b/tests/baselines/reference/exportAssignmentError.types index dc19391c09d90..4d8c3914486fc 100644 --- a/tests/baselines/reference/exportAssignmentError.types +++ b/tests/baselines/reference/exportAssignmentError.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportAssignmentError.ts] //// === exportEqualsModule_A.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/exportAssignmentInternalModule.js b/tests/baselines/reference/exportAssignmentInternalModule.js index d7bdb367a3774..4bf3ffe72b05c 100644 --- a/tests/baselines/reference/exportAssignmentInternalModule.js +++ b/tests/baselines/reference/exportAssignmentInternalModule.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportAssignmentInternalModule.ts] //// //// [exportAssignmentInternalModule_A.ts] -module M { +namespace M { export var x; } diff --git a/tests/baselines/reference/exportAssignmentInternalModule.symbols b/tests/baselines/reference/exportAssignmentInternalModule.symbols index d6755520c6ae0..22882f764d832 100644 --- a/tests/baselines/reference/exportAssignmentInternalModule.symbols +++ b/tests/baselines/reference/exportAssignmentInternalModule.symbols @@ -11,7 +11,7 @@ var n: number = modM.x; >x : Symbol(modM.x, Decl(exportAssignmentInternalModule_A.ts, 1, 11)) === exportAssignmentInternalModule_A.ts === -module M { +namespace M { >M : Symbol(M, Decl(exportAssignmentInternalModule_A.ts, 0, 0)) export var x; diff --git a/tests/baselines/reference/exportAssignmentInternalModule.types b/tests/baselines/reference/exportAssignmentInternalModule.types index 8485df8d8a41b..4252f9a9762e9 100644 --- a/tests/baselines/reference/exportAssignmentInternalModule.types +++ b/tests/baselines/reference/exportAssignmentInternalModule.types @@ -15,7 +15,7 @@ var n: number = modM.x; > : ^^^ === exportAssignmentInternalModule_A.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/exportAssignmentMergedModule.js b/tests/baselines/reference/exportAssignmentMergedModule.js index 7b6144c9074ed..d75eab1dedf35 100644 --- a/tests/baselines/reference/exportAssignmentMergedModule.js +++ b/tests/baselines/reference/exportAssignmentMergedModule.js @@ -1,17 +1,17 @@ //// [tests/cases/conformance/externalModules/exportAssignmentMergedModule.ts] //// //// [foo_0.ts] -module Foo { +namespace Foo { export function a(){ return 5; } export var b = true; } -module Foo { +namespace Foo { export function c(a: number){ return a; } - export module Test { + export namespace Test { export var answer = 42; } } diff --git a/tests/baselines/reference/exportAssignmentMergedModule.symbols b/tests/baselines/reference/exportAssignmentMergedModule.symbols index 087346e37818c..4c0e33e2f3e87 100644 --- a/tests/baselines/reference/exportAssignmentMergedModule.symbols +++ b/tests/baselines/reference/exportAssignmentMergedModule.symbols @@ -6,9 +6,9 @@ import foo = require("./foo_0"); var a: number = foo.a(); >a : Symbol(a, Decl(foo_1.ts, 1, 3)) ->foo.a : Symbol(foo.a, Decl(foo_0.ts, 0, 12)) +>foo.a : Symbol(foo.a, Decl(foo_0.ts, 0, 15)) >foo : Symbol(foo, Decl(foo_1.ts, 0, 0)) ->a : Symbol(foo.a, Decl(foo_0.ts, 0, 12)) +>a : Symbol(foo.a, Decl(foo_0.ts, 0, 15)) if(!!foo.b){ >foo.b : Symbol(foo.b, Decl(foo_0.ts, 4, 11)) @@ -21,33 +21,33 @@ if(!!foo.b){ >foo : Symbol(foo, Decl(foo_1.ts, 0, 0)) >Test : Symbol(foo.Test, Decl(foo_0.ts, 9, 2)) >answer : Symbol(foo.Test.answer, Decl(foo_0.ts, 11, 12)) ->foo.c : Symbol(foo.c, Decl(foo_0.ts, 6, 12)) +>foo.c : Symbol(foo.c, Decl(foo_0.ts, 6, 15)) >foo : Symbol(foo, Decl(foo_1.ts, 0, 0)) ->c : Symbol(foo.c, Decl(foo_0.ts, 6, 12)) +>c : Symbol(foo.c, Decl(foo_0.ts, 6, 15)) } === foo_0.ts === -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(foo_0.ts, 0, 0), Decl(foo_0.ts, 5, 1)) export function a(){ ->a : Symbol(a, Decl(foo_0.ts, 0, 12)) +>a : Symbol(a, Decl(foo_0.ts, 0, 15)) return 5; } export var b = true; >b : Symbol(b, Decl(foo_0.ts, 4, 11)) } -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(foo_0.ts, 0, 0), Decl(foo_0.ts, 5, 1)) export function c(a: number){ ->c : Symbol(c, Decl(foo_0.ts, 6, 12)) +>c : Symbol(c, Decl(foo_0.ts, 6, 15)) >a : Symbol(a, Decl(foo_0.ts, 7, 19)) return a; >a : Symbol(a, Decl(foo_0.ts, 7, 19)) } - export module Test { + export namespace Test { >Test : Symbol(Test, Decl(foo_0.ts, 9, 2)) export var answer = 42; diff --git a/tests/baselines/reference/exportAssignmentMergedModule.types b/tests/baselines/reference/exportAssignmentMergedModule.types index 49bdd866b003d..0f95f8c3f7cf4 100644 --- a/tests/baselines/reference/exportAssignmentMergedModule.types +++ b/tests/baselines/reference/exportAssignmentMergedModule.types @@ -54,7 +54,7 @@ if(!!foo.b){ > : ^^ } === foo_0.ts === -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ @@ -72,7 +72,7 @@ module Foo { >true : true > : ^^^^ } -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ @@ -86,7 +86,7 @@ module Foo { >a : number > : ^^^^^^ } - export module Test { + export namespace Test { >Test : typeof Test > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/exportAssignmentTopLevelClodule.js b/tests/baselines/reference/exportAssignmentTopLevelClodule.js index 3b184283b02f1..8e0b0cc2fd728 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelClodule.js +++ b/tests/baselines/reference/exportAssignmentTopLevelClodule.js @@ -4,7 +4,7 @@ class Foo { test = "test"; } -module Foo { +namespace Foo { export var answer = 42; } export = Foo; diff --git a/tests/baselines/reference/exportAssignmentTopLevelClodule.symbols b/tests/baselines/reference/exportAssignmentTopLevelClodule.symbols index 3405c5a65cc73..e270edb857366 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelClodule.symbols +++ b/tests/baselines/reference/exportAssignmentTopLevelClodule.symbols @@ -21,7 +21,7 @@ class Foo { test = "test"; >test : Symbol(Foo.test, Decl(foo_0.ts, 0, 11)) } -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(foo_0.ts, 0, 0), Decl(foo_0.ts, 2, 1)) export var answer = 42; diff --git a/tests/baselines/reference/exportAssignmentTopLevelClodule.types b/tests/baselines/reference/exportAssignmentTopLevelClodule.types index 4aba5315ee66c..5dd70ddeb5d09 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelClodule.types +++ b/tests/baselines/reference/exportAssignmentTopLevelClodule.types @@ -37,7 +37,7 @@ class Foo { >"test" : "test" > : ^^^^^^ } -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js index 8a6d50840a93a..47ae434243732 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js +++ b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js @@ -4,7 +4,7 @@ enum foo { red, green, blue } -module foo { +namespace foo { export var answer = 42; } export = foo; diff --git a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.symbols b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.symbols index ad69dcbda8aae..9c52258532e2f 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.symbols +++ b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.symbols @@ -30,7 +30,7 @@ enum foo { >green : Symbol(foo.green, Decl(foo_0.ts, 1, 5)) >blue : Symbol(foo.blue, Decl(foo_0.ts, 1, 12)) } -module foo { +namespace foo { >foo : Symbol(foo, Decl(foo_0.ts, 0, 0), Decl(foo_0.ts, 2, 1)) export var answer = 42; diff --git a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.types b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.types index 04c212a97ccb3..d47fdc0727ab2 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.types +++ b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.types @@ -47,7 +47,7 @@ enum foo { >blue : foo.blue > : ^^^^^^^^ } -module foo { +namespace foo { >foo : typeof foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/exportAssignmentTopLevelFundule.js b/tests/baselines/reference/exportAssignmentTopLevelFundule.js index ea3407bacb170..3c22d8456f10f 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelFundule.js +++ b/tests/baselines/reference/exportAssignmentTopLevelFundule.js @@ -4,7 +4,7 @@ function foo() { return "test"; } -module foo { +namespace foo { export var answer = 42; } export = foo; diff --git a/tests/baselines/reference/exportAssignmentTopLevelFundule.symbols b/tests/baselines/reference/exportAssignmentTopLevelFundule.symbols index b2d1f57168f28..ff32937a6a268 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelFundule.symbols +++ b/tests/baselines/reference/exportAssignmentTopLevelFundule.symbols @@ -20,7 +20,7 @@ function foo() { return "test"; } -module foo { +namespace foo { >foo : Symbol(foo, Decl(foo_0.ts, 0, 0), Decl(foo_0.ts, 2, 1)) export var answer = 42; diff --git a/tests/baselines/reference/exportAssignmentTopLevelFundule.types b/tests/baselines/reference/exportAssignmentTopLevelFundule.types index 6ffb45dc1d4fc..11174b3d3d9dc 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelFundule.types +++ b/tests/baselines/reference/exportAssignmentTopLevelFundule.types @@ -35,7 +35,7 @@ function foo() { >"test" : "test" > : ^^^^^^ } -module foo { +namespace foo { >foo : typeof foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js index 8a804bb03a93f..9134918499708 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js +++ b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/externalModules/exportAssignmentTopLevelIdentifier.ts] //// //// [foo_0.ts] -module Foo { +namespace Foo { export var answer = 42; } export = Foo; diff --git a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.symbols b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.symbols index 07274736002c0..e7dfb0f255bc2 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.symbols +++ b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.symbols @@ -12,7 +12,7 @@ if(foo.answer === 42){ } === foo_0.ts === -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(foo_0.ts, 0, 0)) export var answer = 42; diff --git a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.types b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.types index f3c9f222f2ff3..3d3d9b78db6b4 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.types +++ b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.types @@ -20,7 +20,7 @@ if(foo.answer === 42){ } === foo_0.ts === -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.js b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.js index 0d6d098fcfe51..fe7b266117cc2 100644 --- a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.js +++ b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportAssignmentWithImportStatementPrivacyError.ts] //// //// [exportAssignmentWithImportStatementPrivacyError.ts] -module m2 { +namespace m2 { export interface connectModule { (res, req, next): void; } @@ -12,7 +12,7 @@ module m2 { } -module M { +namespace M { export var server: { (): m2.connectExport; test1: m2.connectModule; diff --git a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.symbols b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.symbols index 170d641d6929b..324d72049a1f8 100644 --- a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.symbols +++ b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/exportAssignmentWithImportStatementPrivacyError.ts] //// === exportAssignmentWithImportStatementPrivacyError.ts === -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 0, 0)) export interface connectModule { ->connectModule : Symbol(connectModule, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 0, 11)) +>connectModule : Symbol(connectModule, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 0, 14)) (res, req, next): void; >res : Symbol(res, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 2, 9)) @@ -18,7 +18,7 @@ module m2 { use: (mod: connectModule) => connectExport; >use : Symbol(connectExport.use, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 4, 36)) >mod : Symbol(mod, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 5, 14)) ->connectModule : Symbol(connectModule, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 0, 11)) +>connectModule : Symbol(connectModule, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 0, 14)) >connectExport : Symbol(connectExport, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 3, 5)) listen: (port: number) => void; @@ -28,7 +28,7 @@ module m2 { } -module M { +namespace M { >M : Symbol(M, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 9, 1)) export var server: { @@ -41,12 +41,12 @@ module M { test1: m2.connectModule; >test1 : Symbol(test1, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 13, 29)) >m2 : Symbol(m2, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 0, 0)) ->connectModule : Symbol(m2.connectModule, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 0, 11)) +>connectModule : Symbol(m2.connectModule, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 0, 14)) test2(): m2.connectModule; >test2 : Symbol(test2, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 14, 32)) >m2 : Symbol(m2, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 0, 0)) ->connectModule : Symbol(m2.connectModule, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 0, 11)) +>connectModule : Symbol(m2.connectModule, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 0, 14)) }; } diff --git a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.types b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.types index 508a4f38e5dbf..b435a095a4ca4 100644 --- a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.types +++ b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportAssignmentWithImportStatementPrivacyError.ts] //// === exportAssignmentWithImportStatementPrivacyError.ts === -module m2 { +namespace m2 { export interface connectModule { (res, req, next): void; >res : any @@ -24,7 +24,7 @@ module m2 { } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/exportCodeGen.js b/tests/baselines/reference/exportCodeGen.js index 5efbbc9e4a1a9..0b5c01b6fa1a1 100644 --- a/tests/baselines/reference/exportCodeGen.js +++ b/tests/baselines/reference/exportCodeGen.js @@ -3,7 +3,7 @@ //// [exportCodeGen.ts] // should replace all refs to 'x' in the body, // with fully qualified -module A { +namespace A { export var x = 12; function lt12() { return x < 12; @@ -11,7 +11,7 @@ module A { } // should not fully qualify 'x' -module B { +namespace B { var x = 12; function lt12() { return x < 12; @@ -19,38 +19,38 @@ module B { } // not copied, since not exported -module C { +namespace C { function no() { return false; } } // copies, since exported -module D { +namespace D { export function yes() { return true; } } // validate all exportable statements -module E { +namespace E { export enum Color { Red } export function fn() { } export interface I { id: number } export class C { name: string } - export module M { + export namespace M { export var x = 42; } } // validate all exportable statements, // which are not exported -module F { +namespace F { enum Color { Red } function fn() { } interface I { id: number } class C { name: string } - module M { + namespace M { var x = 42; } } diff --git a/tests/baselines/reference/exportCodeGen.symbols b/tests/baselines/reference/exportCodeGen.symbols index b0543614f10e5..500f47e3a34f2 100644 --- a/tests/baselines/reference/exportCodeGen.symbols +++ b/tests/baselines/reference/exportCodeGen.symbols @@ -3,7 +3,7 @@ === exportCodeGen.ts === // should replace all refs to 'x' in the body, // with fully qualified -module A { +namespace A { >A : Symbol(A, Decl(exportCodeGen.ts, 0, 0)) export var x = 12; @@ -18,7 +18,7 @@ module A { } // should not fully qualify 'x' -module B { +namespace B { >B : Symbol(B, Decl(exportCodeGen.ts, 7, 1)) var x = 12; @@ -33,33 +33,33 @@ module B { } // not copied, since not exported -module C { +namespace C { >C : Symbol(C, Decl(exportCodeGen.ts, 15, 1)) function no() { ->no : Symbol(no, Decl(exportCodeGen.ts, 18, 10)) +>no : Symbol(no, Decl(exportCodeGen.ts, 18, 13)) return false; } } // copies, since exported -module D { +namespace D { >D : Symbol(D, Decl(exportCodeGen.ts, 22, 1)) export function yes() { ->yes : Symbol(yes, Decl(exportCodeGen.ts, 25, 10)) +>yes : Symbol(yes, Decl(exportCodeGen.ts, 25, 13)) return true; } } // validate all exportable statements -module E { +namespace E { >E : Symbol(E, Decl(exportCodeGen.ts, 29, 1)) export enum Color { Red } ->Color : Symbol(Color, Decl(exportCodeGen.ts, 32, 10)) +>Color : Symbol(Color, Decl(exportCodeGen.ts, 32, 13)) >Red : Symbol(Color.Red, Decl(exportCodeGen.ts, 33, 23)) export function fn() { } @@ -73,7 +73,7 @@ module E { >C : Symbol(C, Decl(exportCodeGen.ts, 35, 37)) >name : Symbol(C.name, Decl(exportCodeGen.ts, 36, 20)) - export module M { + export namespace M { >M : Symbol(M, Decl(exportCodeGen.ts, 36, 35)) export var x = 42; @@ -83,11 +83,11 @@ module E { // validate all exportable statements, // which are not exported -module F { +namespace F { >F : Symbol(F, Decl(exportCodeGen.ts, 40, 1)) enum Color { Red } ->Color : Symbol(Color, Decl(exportCodeGen.ts, 44, 10)) +>Color : Symbol(Color, Decl(exportCodeGen.ts, 44, 13)) >Red : Symbol(Color.Red, Decl(exportCodeGen.ts, 45, 16)) function fn() { } @@ -101,7 +101,7 @@ module F { >C : Symbol(C, Decl(exportCodeGen.ts, 47, 30)) >name : Symbol(C.name, Decl(exportCodeGen.ts, 48, 13)) - module M { + namespace M { >M : Symbol(M, Decl(exportCodeGen.ts, 48, 28)) var x = 42; diff --git a/tests/baselines/reference/exportCodeGen.types b/tests/baselines/reference/exportCodeGen.types index 09da842ab34cf..76069d47fe99d 100644 --- a/tests/baselines/reference/exportCodeGen.types +++ b/tests/baselines/reference/exportCodeGen.types @@ -3,7 +3,7 @@ === exportCodeGen.ts === // should replace all refs to 'x' in the body, // with fully qualified -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -28,7 +28,7 @@ module A { } // should not fully qualify 'x' -module B { +namespace B { >B : typeof B > : ^^^^^^^^ @@ -53,7 +53,7 @@ module B { } // not copied, since not exported -module C { +namespace C { >C : typeof C > : ^^^^^^^^ @@ -68,7 +68,7 @@ module C { } // copies, since exported -module D { +namespace D { >D : typeof D > : ^^^^^^^^ @@ -83,7 +83,7 @@ module D { } // validate all exportable statements -module E { +namespace E { >E : typeof E > : ^^^^^^^^ @@ -107,7 +107,7 @@ module E { >name : string > : ^^^^^^ - export module M { + export namespace M { >M : typeof M > : ^^^^^^^^ @@ -121,7 +121,7 @@ module E { // validate all exportable statements, // which are not exported -module F { +namespace F { >F : typeof F > : ^^^^^^^^ @@ -145,7 +145,7 @@ module F { >name : string > : ^^^^^^ - module M { + namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/exportDeclarationInInternalModule.errors.txt b/tests/baselines/reference/exportDeclarationInInternalModule.errors.txt index 5c998d1c9e044..e1c8e98fa481e 100644 --- a/tests/baselines/reference/exportDeclarationInInternalModule.errors.txt +++ b/tests/baselines/reference/exportDeclarationInInternalModule.errors.txt @@ -7,11 +7,11 @@ exportDeclarationInInternalModule.ts(13,19): error TS1141: String literal expect class Aaa extends Bbb { } - module Aaa { + namespace Aaa { export class SomeType { } } - module Bbb { + namespace Bbb { export class SomeType { } export * from Aaa; // this line causes the nullref diff --git a/tests/baselines/reference/exportDeclarationInInternalModule.js b/tests/baselines/reference/exportDeclarationInInternalModule.js index 700ed5d165545..3b2de7ae4131d 100644 --- a/tests/baselines/reference/exportDeclarationInInternalModule.js +++ b/tests/baselines/reference/exportDeclarationInInternalModule.js @@ -6,11 +6,11 @@ class Bbb { class Aaa extends Bbb { } -module Aaa { +namespace Aaa { export class SomeType { } } -module Bbb { +namespace Bbb { export class SomeType { } export * from Aaa; // this line causes the nullref diff --git a/tests/baselines/reference/exportDeclarationInInternalModule.symbols b/tests/baselines/reference/exportDeclarationInInternalModule.symbols index 67dc98d1c95fd..2e214b9f6c28e 100644 --- a/tests/baselines/reference/exportDeclarationInInternalModule.symbols +++ b/tests/baselines/reference/exportDeclarationInInternalModule.symbols @@ -9,18 +9,18 @@ class Aaa extends Bbb { } >Aaa : Symbol(Aaa, Decl(exportDeclarationInInternalModule.ts, 1, 1), Decl(exportDeclarationInInternalModule.ts, 3, 25)) >Bbb : Symbol(Bbb, Decl(exportDeclarationInInternalModule.ts, 0, 0), Decl(exportDeclarationInInternalModule.ts, 7, 1)) -module Aaa { +namespace Aaa { >Aaa : Symbol(Aaa, Decl(exportDeclarationInInternalModule.ts, 1, 1), Decl(exportDeclarationInInternalModule.ts, 3, 25)) export class SomeType { } ->SomeType : Symbol(SomeType, Decl(exportDeclarationInInternalModule.ts, 5, 12)) +>SomeType : Symbol(SomeType, Decl(exportDeclarationInInternalModule.ts, 5, 15)) } -module Bbb { +namespace Bbb { >Bbb : Symbol(Bbb, Decl(exportDeclarationInInternalModule.ts, 0, 0), Decl(exportDeclarationInInternalModule.ts, 7, 1)) export class SomeType { } ->SomeType : Symbol(SomeType, Decl(exportDeclarationInInternalModule.ts, 9, 12)) +>SomeType : Symbol(SomeType, Decl(exportDeclarationInInternalModule.ts, 9, 15)) export * from Aaa; // this line causes the nullref } @@ -28,5 +28,5 @@ module Bbb { var a: Bbb.SomeType; >a : Symbol(a, Decl(exportDeclarationInInternalModule.ts, 15, 3)) >Bbb : Symbol(Bbb, Decl(exportDeclarationInInternalModule.ts, 0, 0), Decl(exportDeclarationInInternalModule.ts, 7, 1)) ->SomeType : Symbol(Bbb.SomeType, Decl(exportDeclarationInInternalModule.ts, 9, 12)) +>SomeType : Symbol(Bbb.SomeType, Decl(exportDeclarationInInternalModule.ts, 9, 15)) diff --git a/tests/baselines/reference/exportDeclarationInInternalModule.types b/tests/baselines/reference/exportDeclarationInInternalModule.types index 06824623e959a..7a419a2054980 100644 --- a/tests/baselines/reference/exportDeclarationInInternalModule.types +++ b/tests/baselines/reference/exportDeclarationInInternalModule.types @@ -12,7 +12,7 @@ class Aaa extends Bbb { } >Bbb : Bbb > : ^^^ -module Aaa { +namespace Aaa { >Aaa : typeof Aaa > : ^^^^^^^^^^ @@ -21,7 +21,7 @@ module Aaa { > : ^^^^^^^^ } -module Bbb { +namespace Bbb { >Bbb : typeof Bbb > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/exportDeclaredModule.js b/tests/baselines/reference/exportDeclaredModule.js index dc1398747076d..f5e76c6ea3ba4 100644 --- a/tests/baselines/reference/exportDeclaredModule.js +++ b/tests/baselines/reference/exportDeclaredModule.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/externalModules/exportDeclaredModule.ts] //// //// [foo1.ts] -declare module M1 { +declare namespace M1 { export var a: string; export function b(): number; } diff --git a/tests/baselines/reference/exportDeclaredModule.symbols b/tests/baselines/reference/exportDeclaredModule.symbols index 1e7266d952528..714936b4c86dd 100644 --- a/tests/baselines/reference/exportDeclaredModule.symbols +++ b/tests/baselines/reference/exportDeclaredModule.symbols @@ -11,7 +11,7 @@ var x: number = foo1.b(); >b : Symbol(foo1.b, Decl(foo1.ts, 1, 22)) === foo1.ts === -declare module M1 { +declare namespace M1 { >M1 : Symbol(M1, Decl(foo1.ts, 0, 0)) export var a: string; diff --git a/tests/baselines/reference/exportDeclaredModule.types b/tests/baselines/reference/exportDeclaredModule.types index 3c2c9607e713f..f44fb2dd01876 100644 --- a/tests/baselines/reference/exportDeclaredModule.types +++ b/tests/baselines/reference/exportDeclaredModule.types @@ -18,7 +18,7 @@ var x: number = foo1.b(); > : ^^^^^^ === foo1.ts === -declare module M1 { +declare namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/exportDefaultForNonInstantiatedModule.js b/tests/baselines/reference/exportDefaultForNonInstantiatedModule.js index c2066884ba41b..ef1f3c8b7e0c0 100644 --- a/tests/baselines/reference/exportDefaultForNonInstantiatedModule.js +++ b/tests/baselines/reference/exportDefaultForNonInstantiatedModule.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportDefaultForNonInstantiatedModule.ts] //// //// [exportDefaultForNonInstantiatedModule.ts] -module m { +namespace m { export interface foo { } } diff --git a/tests/baselines/reference/exportDefaultForNonInstantiatedModule.symbols b/tests/baselines/reference/exportDefaultForNonInstantiatedModule.symbols index 685b49c562a51..00ce9fe8f5aee 100644 --- a/tests/baselines/reference/exportDefaultForNonInstantiatedModule.symbols +++ b/tests/baselines/reference/exportDefaultForNonInstantiatedModule.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/exportDefaultForNonInstantiatedModule.ts] //// === exportDefaultForNonInstantiatedModule.ts === -module m { +namespace m { >m : Symbol(m, Decl(exportDefaultForNonInstantiatedModule.ts, 0, 0)) export interface foo { ->foo : Symbol(foo, Decl(exportDefaultForNonInstantiatedModule.ts, 0, 10)) +>foo : Symbol(foo, Decl(exportDefaultForNonInstantiatedModule.ts, 0, 13)) } } // Should not be emitted diff --git a/tests/baselines/reference/exportDefaultForNonInstantiatedModule.types b/tests/baselines/reference/exportDefaultForNonInstantiatedModule.types index b9dc15d8bbf14..89c377486db95 100644 --- a/tests/baselines/reference/exportDefaultForNonInstantiatedModule.types +++ b/tests/baselines/reference/exportDefaultForNonInstantiatedModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportDefaultForNonInstantiatedModule.ts] //// === exportDefaultForNonInstantiatedModule.ts === -module m { +namespace m { export interface foo { } } diff --git a/tests/baselines/reference/exportEqualErrorType.errors.txt b/tests/baselines/reference/exportEqualErrorType.errors.txt index 5215d665060f1..353d337102237 100644 --- a/tests/baselines/reference/exportEqualErrorType.errors.txt +++ b/tests/baselines/reference/exportEqualErrorType.errors.txt @@ -9,7 +9,7 @@ exportEqualErrorType_1.ts(3,23): error TS2339: Property 'static' does not exist !!! error TS2339: Property 'static' does not exist on type '{ (): connectExport; foo: Date; }'. ==== exportEqualErrorType_0.ts (0 errors) ==== - module server { + namespace server { export interface connectModule { (res, req, next): void; } diff --git a/tests/baselines/reference/exportEqualErrorType.js b/tests/baselines/reference/exportEqualErrorType.js index d94a01d5ee77e..a2b2bed5b4e7d 100644 --- a/tests/baselines/reference/exportEqualErrorType.js +++ b/tests/baselines/reference/exportEqualErrorType.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportEqualErrorType.ts] //// //// [exportEqualErrorType_0.ts] -module server { +namespace server { export interface connectModule { (res, req, next): void; } diff --git a/tests/baselines/reference/exportEqualErrorType.symbols b/tests/baselines/reference/exportEqualErrorType.symbols index fe9065915fc44..c7a1d74f819ac 100644 --- a/tests/baselines/reference/exportEqualErrorType.symbols +++ b/tests/baselines/reference/exportEqualErrorType.symbols @@ -12,11 +12,11 @@ connect().use(connect.static('foo')); // Error 1 The property 'static' doe >connect : Symbol(connect, Decl(exportEqualErrorType_1.ts, 0, 0)) === exportEqualErrorType_0.ts === -module server { +namespace server { >server : Symbol(server, Decl(exportEqualErrorType_0.ts, 0, 0), Decl(exportEqualErrorType_0.ts, 8, 3)) export interface connectModule { ->connectModule : Symbol(connectModule, Decl(exportEqualErrorType_0.ts, 0, 15)) +>connectModule : Symbol(connectModule, Decl(exportEqualErrorType_0.ts, 0, 18)) (res, req, next): void; >res : Symbol(res, Decl(exportEqualErrorType_0.ts, 2, 9)) @@ -29,7 +29,7 @@ module server { use: (mod: connectModule) => connectExport; >use : Symbol(connectExport.use, Decl(exportEqualErrorType_0.ts, 4, 36)) >mod : Symbol(mod, Decl(exportEqualErrorType_0.ts, 5, 14)) ->connectModule : Symbol(connectModule, Decl(exportEqualErrorType_0.ts, 0, 15)) +>connectModule : Symbol(connectModule, Decl(exportEqualErrorType_0.ts, 0, 18)) >connectExport : Symbol(connectExport, Decl(exportEqualErrorType_0.ts, 3, 5)) } } diff --git a/tests/baselines/reference/exportEqualErrorType.types b/tests/baselines/reference/exportEqualErrorType.types index 6b6008704b03e..721fe4fa0be5d 100644 --- a/tests/baselines/reference/exportEqualErrorType.types +++ b/tests/baselines/reference/exportEqualErrorType.types @@ -29,7 +29,7 @@ connect().use(connect.static('foo')); // Error 1 The property 'static' doe > : ^^^^^ === exportEqualErrorType_0.ts === -module server { +namespace server { export interface connectModule { (res, req, next): void; >res : any diff --git a/tests/baselines/reference/exportEqualMemberMissing.errors.txt b/tests/baselines/reference/exportEqualMemberMissing.errors.txt index df228c745a393..f255aaa4583e6 100644 --- a/tests/baselines/reference/exportEqualMemberMissing.errors.txt +++ b/tests/baselines/reference/exportEqualMemberMissing.errors.txt @@ -9,7 +9,7 @@ exportEqualMemberMissing_1.ts(3,23): error TS2339: Property 'static' does not ex !!! error TS2339: Property 'static' does not exist on type '{ (): connectExport; foo: Date; }'. ==== exportEqualMemberMissing_0.ts (0 errors) ==== - module server { + namespace server { export interface connectModule { (res, req, next): void; } diff --git a/tests/baselines/reference/exportEqualMemberMissing.js b/tests/baselines/reference/exportEqualMemberMissing.js index 9533cd0fc2329..47611dc052ec5 100644 --- a/tests/baselines/reference/exportEqualMemberMissing.js +++ b/tests/baselines/reference/exportEqualMemberMissing.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportEqualMemberMissing.ts] //// //// [exportEqualMemberMissing_0.ts] -module server { +namespace server { export interface connectModule { (res, req, next): void; } diff --git a/tests/baselines/reference/exportEqualMemberMissing.symbols b/tests/baselines/reference/exportEqualMemberMissing.symbols index 372c8d8b00ddc..8bdc11e7c2e25 100644 --- a/tests/baselines/reference/exportEqualMemberMissing.symbols +++ b/tests/baselines/reference/exportEqualMemberMissing.symbols @@ -12,11 +12,11 @@ connect().use(connect.static('foo')); // Error 1 The property 'static' does not >connect : Symbol(connect, Decl(exportEqualMemberMissing_1.ts, 0, 0)) === exportEqualMemberMissing_0.ts === -module server { +namespace server { >server : Symbol(server, Decl(exportEqualMemberMissing_0.ts, 0, 0), Decl(exportEqualMemberMissing_0.ts, 8, 3)) export interface connectModule { ->connectModule : Symbol(connectModule, Decl(exportEqualMemberMissing_0.ts, 0, 15)) +>connectModule : Symbol(connectModule, Decl(exportEqualMemberMissing_0.ts, 0, 18)) (res, req, next): void; >res : Symbol(res, Decl(exportEqualMemberMissing_0.ts, 2, 9)) @@ -29,7 +29,7 @@ module server { use: (mod: connectModule) => connectExport; >use : Symbol(connectExport.use, Decl(exportEqualMemberMissing_0.ts, 4, 36)) >mod : Symbol(mod, Decl(exportEqualMemberMissing_0.ts, 5, 14)) ->connectModule : Symbol(connectModule, Decl(exportEqualMemberMissing_0.ts, 0, 15)) +>connectModule : Symbol(connectModule, Decl(exportEqualMemberMissing_0.ts, 0, 18)) >connectExport : Symbol(connectExport, Decl(exportEqualMemberMissing_0.ts, 3, 5)) } } diff --git a/tests/baselines/reference/exportEqualMemberMissing.types b/tests/baselines/reference/exportEqualMemberMissing.types index da7e91f5cd637..23e1af6173f40 100644 --- a/tests/baselines/reference/exportEqualMemberMissing.types +++ b/tests/baselines/reference/exportEqualMemberMissing.types @@ -29,7 +29,7 @@ connect().use(connect.static('foo')); // Error 1 The property 'static' does not > : ^^^^^ === exportEqualMemberMissing_0.ts === -module server { +namespace server { export interface connectModule { (res, req, next): void; >res : any diff --git a/tests/baselines/reference/exportEqualNamespaces.js b/tests/baselines/reference/exportEqualNamespaces.js index 747db64f35f9d..77ef3252d8a86 100644 --- a/tests/baselines/reference/exportEqualNamespaces.js +++ b/tests/baselines/reference/exportEqualNamespaces.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportEqualNamespaces.ts] //// //// [exportEqualNamespaces.ts] -declare module server { +declare namespace server { interface Server extends Object { } } diff --git a/tests/baselines/reference/exportEqualNamespaces.symbols b/tests/baselines/reference/exportEqualNamespaces.symbols index 220a17f27a79b..3fd66c2136a1d 100644 --- a/tests/baselines/reference/exportEqualNamespaces.symbols +++ b/tests/baselines/reference/exportEqualNamespaces.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/exportEqualNamespaces.ts] //// === exportEqualNamespaces.ts === -declare module server { +declare namespace server { >server : Symbol(server, Decl(exportEqualNamespaces.ts, 0, 0), Decl(exportEqualNamespaces.ts, 2, 1), Decl(exportEqualNamespaces.ts, 10, 3)) interface Server extends Object { } ->Server : Symbol(Server, Decl(exportEqualNamespaces.ts, 0, 23)) +>Server : Symbol(Server, Decl(exportEqualNamespaces.ts, 0, 26)) >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) } @@ -14,7 +14,7 @@ interface server { (): server.Server; >server : Symbol(server, Decl(exportEqualNamespaces.ts, 0, 0), Decl(exportEqualNamespaces.ts, 2, 1), Decl(exportEqualNamespaces.ts, 10, 3)) ->Server : Symbol(server.Server, Decl(exportEqualNamespaces.ts, 0, 23)) +>Server : Symbol(server.Server, Decl(exportEqualNamespaces.ts, 0, 26)) startTime: Date; >startTime : Symbol(server.startTime, Decl(exportEqualNamespaces.ts, 5, 22)) diff --git a/tests/baselines/reference/exportEqualNamespaces.types b/tests/baselines/reference/exportEqualNamespaces.types index 89a0a73d56490..43fe90cec4e03 100644 --- a/tests/baselines/reference/exportEqualNamespaces.types +++ b/tests/baselines/reference/exportEqualNamespaces.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportEqualNamespaces.ts] //// === exportEqualNamespaces.ts === -declare module server { +declare namespace server { interface Server extends Object { } } diff --git a/tests/baselines/reference/exportImportAlias.js b/tests/baselines/reference/exportImportAlias.js index 9513878e8b1f3..ed961f150d466 100644 --- a/tests/baselines/reference/exportImportAlias.js +++ b/tests/baselines/reference/exportImportAlias.js @@ -3,20 +3,20 @@ //// [exportImportAlias.ts] // expect no errors here -module A { +namespace A { export var x = 'hello world' export class Point { constructor(public x: number, public y: number) { } } - export module B { + export namespace B { export interface Id { name: string; } } } -module C { +namespace C { export import a = A; } @@ -25,19 +25,19 @@ var b: { x: number; y: number; } = new C.a.Point(0, 0); var c: { name: string }; var c: C.a.B.Id; -module X { +namespace X { export function Y() { return 42; } - export module Y { + export namespace Y { export class Point { constructor(public x: number, public y: number) { } } } } -module Z { +namespace Z { // 'y' should be a fundule here export import y = X.Y; @@ -46,12 +46,12 @@ module Z { var m: number = Z.y(); var n: { x: number; y: number; } = new Z.y.Point(0, 0); -module K { +namespace K { export class L { constructor(public name: string) { } } - export module L { + export namespace L { export var y = 12; export interface Point { x: number; @@ -60,7 +60,7 @@ module K { } } -module M { +namespace M { export import D = K.L; } diff --git a/tests/baselines/reference/exportImportAlias.symbols b/tests/baselines/reference/exportImportAlias.symbols index 182ba8b5e4c63..3c4728285eaba 100644 --- a/tests/baselines/reference/exportImportAlias.symbols +++ b/tests/baselines/reference/exportImportAlias.symbols @@ -3,7 +3,7 @@ === exportImportAlias.ts === // expect no errors here -module A { +namespace A { >A : Symbol(A, Decl(exportImportAlias.ts, 0, 0)) export var x = 'hello world' @@ -16,11 +16,11 @@ module A { >x : Symbol(Point.x, Decl(exportImportAlias.ts, 6, 20)) >y : Symbol(Point.y, Decl(exportImportAlias.ts, 6, 37)) } - export module B { + export namespace B { >B : Symbol(B, Decl(exportImportAlias.ts, 7, 5)) export interface Id { ->Id : Symbol(Id, Decl(exportImportAlias.ts, 8, 21)) +>Id : Symbol(Id, Decl(exportImportAlias.ts, 8, 24)) name: string; >name : Symbol(Id.name, Decl(exportImportAlias.ts, 9, 29)) @@ -28,20 +28,20 @@ module A { } } -module C { +namespace C { >C : Symbol(C, Decl(exportImportAlias.ts, 13, 1)) export import a = A; ->a : Symbol(a, Decl(exportImportAlias.ts, 15, 10)) +>a : Symbol(a, Decl(exportImportAlias.ts, 15, 13)) >A : Symbol(a, Decl(exportImportAlias.ts, 0, 0)) } var a: string = C.a.x; >a : Symbol(a, Decl(exportImportAlias.ts, 19, 3)) >C.a.x : Symbol(A.x, Decl(exportImportAlias.ts, 4, 14)) ->C.a : Symbol(C.a, Decl(exportImportAlias.ts, 15, 10)) +>C.a : Symbol(C.a, Decl(exportImportAlias.ts, 15, 13)) >C : Symbol(C, Decl(exportImportAlias.ts, 13, 1)) ->a : Symbol(C.a, Decl(exportImportAlias.ts, 15, 10)) +>a : Symbol(C.a, Decl(exportImportAlias.ts, 15, 13)) >x : Symbol(A.x, Decl(exportImportAlias.ts, 4, 14)) var b: { x: number; y: number; } = new C.a.Point(0, 0); @@ -49,9 +49,9 @@ var b: { x: number; y: number; } = new C.a.Point(0, 0); >x : Symbol(x, Decl(exportImportAlias.ts, 20, 8)) >y : Symbol(y, Decl(exportImportAlias.ts, 20, 19)) >C.a.Point : Symbol(A.Point, Decl(exportImportAlias.ts, 4, 32)) ->C.a : Symbol(C.a, Decl(exportImportAlias.ts, 15, 10)) +>C.a : Symbol(C.a, Decl(exportImportAlias.ts, 15, 13)) >C : Symbol(C, Decl(exportImportAlias.ts, 13, 1)) ->a : Symbol(C.a, Decl(exportImportAlias.ts, 15, 10)) +>a : Symbol(C.a, Decl(exportImportAlias.ts, 15, 13)) >Point : Symbol(A.Point, Decl(exportImportAlias.ts, 4, 32)) var c: { name: string }; @@ -61,24 +61,24 @@ var c: { name: string }; var c: C.a.B.Id; >c : Symbol(c, Decl(exportImportAlias.ts, 21, 3), Decl(exportImportAlias.ts, 22, 3)) >C : Symbol(C, Decl(exportImportAlias.ts, 13, 1)) ->a : Symbol(C.a, Decl(exportImportAlias.ts, 15, 10)) +>a : Symbol(C.a, Decl(exportImportAlias.ts, 15, 13)) >B : Symbol(A.B, Decl(exportImportAlias.ts, 7, 5)) ->Id : Symbol(A.B.Id, Decl(exportImportAlias.ts, 8, 21)) +>Id : Symbol(A.B.Id, Decl(exportImportAlias.ts, 8, 24)) -module X { +namespace X { >X : Symbol(X, Decl(exportImportAlias.ts, 22, 16)) export function Y() { ->Y : Symbol(Y, Decl(exportImportAlias.ts, 24, 10), Decl(exportImportAlias.ts, 27, 5)) +>Y : Symbol(Y, Decl(exportImportAlias.ts, 24, 13), Decl(exportImportAlias.ts, 27, 5)) return 42; } - export module Y { ->Y : Symbol(Y, Decl(exportImportAlias.ts, 24, 10), Decl(exportImportAlias.ts, 27, 5)) + export namespace Y { +>Y : Symbol(Y, Decl(exportImportAlias.ts, 24, 13), Decl(exportImportAlias.ts, 27, 5)) export class Point { ->Point : Symbol(Point, Decl(exportImportAlias.ts, 29, 21)) +>Point : Symbol(Point, Decl(exportImportAlias.ts, 29, 24)) constructor(public x: number, public y: number) { } >x : Symbol(Point.x, Decl(exportImportAlias.ts, 31, 24)) @@ -87,44 +87,44 @@ module X { } } -module Z { +namespace Z { >Z : Symbol(Z, Decl(exportImportAlias.ts, 34, 1)) // 'y' should be a fundule here export import y = X.Y; ->y : Symbol(y, Decl(exportImportAlias.ts, 36, 10)) +>y : Symbol(y, Decl(exportImportAlias.ts, 36, 13)) >X : Symbol(X, Decl(exportImportAlias.ts, 22, 16)) ->Y : Symbol(y, Decl(exportImportAlias.ts, 24, 10), Decl(exportImportAlias.ts, 27, 5)) +>Y : Symbol(y, Decl(exportImportAlias.ts, 24, 13), Decl(exportImportAlias.ts, 27, 5)) } var m: number = Z.y(); >m : Symbol(m, Decl(exportImportAlias.ts, 42, 3)) ->Z.y : Symbol(Z.y, Decl(exportImportAlias.ts, 36, 10)) +>Z.y : Symbol(Z.y, Decl(exportImportAlias.ts, 36, 13)) >Z : Symbol(Z, Decl(exportImportAlias.ts, 34, 1)) ->y : Symbol(Z.y, Decl(exportImportAlias.ts, 36, 10)) +>y : Symbol(Z.y, Decl(exportImportAlias.ts, 36, 13)) var n: { x: number; y: number; } = new Z.y.Point(0, 0); >n : Symbol(n, Decl(exportImportAlias.ts, 43, 3)) >x : Symbol(x, Decl(exportImportAlias.ts, 43, 8)) >y : Symbol(y, Decl(exportImportAlias.ts, 43, 19)) ->Z.y.Point : Symbol(X.Y.Point, Decl(exportImportAlias.ts, 29, 21)) ->Z.y : Symbol(Z.y, Decl(exportImportAlias.ts, 36, 10)) +>Z.y.Point : Symbol(X.Y.Point, Decl(exportImportAlias.ts, 29, 24)) +>Z.y : Symbol(Z.y, Decl(exportImportAlias.ts, 36, 13)) >Z : Symbol(Z, Decl(exportImportAlias.ts, 34, 1)) ->y : Symbol(Z.y, Decl(exportImportAlias.ts, 36, 10)) ->Point : Symbol(X.Y.Point, Decl(exportImportAlias.ts, 29, 21)) +>y : Symbol(Z.y, Decl(exportImportAlias.ts, 36, 13)) +>Point : Symbol(X.Y.Point, Decl(exportImportAlias.ts, 29, 24)) -module K { +namespace K { >K : Symbol(K, Decl(exportImportAlias.ts, 43, 55)) export class L { ->L : Symbol(L, Decl(exportImportAlias.ts, 45, 10), Decl(exportImportAlias.ts, 48, 5)) +>L : Symbol(L, Decl(exportImportAlias.ts, 45, 13), Decl(exportImportAlias.ts, 48, 5)) constructor(public name: string) { } >name : Symbol(L.name, Decl(exportImportAlias.ts, 47, 20)) } - export module L { ->L : Symbol(L, Decl(exportImportAlias.ts, 45, 10), Decl(exportImportAlias.ts, 48, 5)) + export namespace L { +>L : Symbol(L, Decl(exportImportAlias.ts, 45, 13), Decl(exportImportAlias.ts, 48, 5)) export var y = 12; >y : Symbol(y, Decl(exportImportAlias.ts, 51, 18)) @@ -141,13 +141,13 @@ module K { } } -module M { +namespace M { >M : Symbol(M, Decl(exportImportAlias.ts, 57, 1)) export import D = K.L; ->D : Symbol(D, Decl(exportImportAlias.ts, 59, 10)) +>D : Symbol(D, Decl(exportImportAlias.ts, 59, 13)) >K : Symbol(K, Decl(exportImportAlias.ts, 43, 55)) ->L : Symbol(D, Decl(exportImportAlias.ts, 45, 10), Decl(exportImportAlias.ts, 48, 5)) +>L : Symbol(D, Decl(exportImportAlias.ts, 45, 13), Decl(exportImportAlias.ts, 48, 5)) } var o: { name: string }; @@ -156,9 +156,9 @@ var o: { name: string }; var o = new M.D('Hello'); >o : Symbol(o, Decl(exportImportAlias.ts, 63, 3), Decl(exportImportAlias.ts, 64, 3)) ->M.D : Symbol(M.D, Decl(exportImportAlias.ts, 59, 10)) +>M.D : Symbol(M.D, Decl(exportImportAlias.ts, 59, 13)) >M : Symbol(M, Decl(exportImportAlias.ts, 57, 1)) ->D : Symbol(M.D, Decl(exportImportAlias.ts, 59, 10)) +>D : Symbol(M.D, Decl(exportImportAlias.ts, 59, 13)) var p: { x: number; y: number; } >p : Symbol(p, Decl(exportImportAlias.ts, 66, 3), Decl(exportImportAlias.ts, 67, 3)) @@ -168,6 +168,6 @@ var p: { x: number; y: number; } var p: M.D.Point; >p : Symbol(p, Decl(exportImportAlias.ts, 66, 3), Decl(exportImportAlias.ts, 67, 3)) >M : Symbol(M, Decl(exportImportAlias.ts, 57, 1)) ->D : Symbol(M.D, Decl(exportImportAlias.ts, 59, 10)) +>D : Symbol(M.D, Decl(exportImportAlias.ts, 59, 13)) >Point : Symbol(K.L.Point, Decl(exportImportAlias.ts, 51, 26)) diff --git a/tests/baselines/reference/exportImportAlias.types b/tests/baselines/reference/exportImportAlias.types index 121ede99f535f..2cd1d94394ca7 100644 --- a/tests/baselines/reference/exportImportAlias.types +++ b/tests/baselines/reference/exportImportAlias.types @@ -3,7 +3,7 @@ === exportImportAlias.ts === // expect no errors here -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -23,7 +23,7 @@ module A { >y : number > : ^^^^^^ } - export module B { + export namespace B { export interface Id { name: string; >name : string @@ -32,7 +32,7 @@ module A { } } -module C { +namespace C { >C : typeof C > : ^^^^^^^^ @@ -97,7 +97,7 @@ var c: C.a.B.Id; >B : any > : ^^^ -module X { +namespace X { >X : typeof X > : ^^^^^^^^ @@ -110,7 +110,7 @@ module X { > : ^^ } - export module Y { + export namespace Y { >Y : typeof Y > : ^^^^^^^^ @@ -127,7 +127,7 @@ module X { } } -module Z { +namespace Z { >Z : typeof Z > : ^^^^^^^^ @@ -177,7 +177,7 @@ var n: { x: number; y: number; } = new Z.y.Point(0, 0); >0 : 0 > : ^ -module K { +namespace K { >K : typeof K > : ^^^^^^^^ @@ -190,7 +190,7 @@ module K { > : ^^^^^^ } - export module L { + export namespace L { >L : typeof L > : ^^^^^^^^ @@ -212,7 +212,7 @@ module K { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/exportImportAndClodule.js b/tests/baselines/reference/exportImportAndClodule.js index 119aa6b91cc8e..2505ae5572baa 100644 --- a/tests/baselines/reference/exportImportAndClodule.js +++ b/tests/baselines/reference/exportImportAndClodule.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/exportImportAndClodule.ts] //// //// [exportImportAndClodule.ts] -module K { +namespace K { export class L { constructor(public name: string) { } } - export module L { + export namespace L { export var y = 12; export interface Point { x: number; @@ -13,7 +13,7 @@ module K { } } } -module M { +namespace M { export import D = K.L; } var o: { name: string }; diff --git a/tests/baselines/reference/exportImportAndClodule.symbols b/tests/baselines/reference/exportImportAndClodule.symbols index bed38871915c4..6c5fa004ac8b6 100644 --- a/tests/baselines/reference/exportImportAndClodule.symbols +++ b/tests/baselines/reference/exportImportAndClodule.symbols @@ -1,17 +1,17 @@ //// [tests/cases/compiler/exportImportAndClodule.ts] //// === exportImportAndClodule.ts === -module K { +namespace K { >K : Symbol(K, Decl(exportImportAndClodule.ts, 0, 0)) export class L { ->L : Symbol(L, Decl(exportImportAndClodule.ts, 0, 10), Decl(exportImportAndClodule.ts, 3, 5)) +>L : Symbol(L, Decl(exportImportAndClodule.ts, 0, 13), Decl(exportImportAndClodule.ts, 3, 5)) constructor(public name: string) { } >name : Symbol(L.name, Decl(exportImportAndClodule.ts, 2, 20)) } - export module L { ->L : Symbol(L, Decl(exportImportAndClodule.ts, 0, 10), Decl(exportImportAndClodule.ts, 3, 5)) + export namespace L { +>L : Symbol(L, Decl(exportImportAndClodule.ts, 0, 13), Decl(exportImportAndClodule.ts, 3, 5)) export var y = 12; >y : Symbol(y, Decl(exportImportAndClodule.ts, 5, 18)) @@ -27,13 +27,13 @@ module K { } } } -module M { +namespace M { >M : Symbol(M, Decl(exportImportAndClodule.ts, 11, 1)) export import D = K.L; ->D : Symbol(D, Decl(exportImportAndClodule.ts, 12, 10)) +>D : Symbol(D, Decl(exportImportAndClodule.ts, 12, 13)) >K : Symbol(K, Decl(exportImportAndClodule.ts, 0, 0)) ->L : Symbol(D, Decl(exportImportAndClodule.ts, 0, 10), Decl(exportImportAndClodule.ts, 3, 5)) +>L : Symbol(D, Decl(exportImportAndClodule.ts, 0, 13), Decl(exportImportAndClodule.ts, 3, 5)) } var o: { name: string }; >o : Symbol(o, Decl(exportImportAndClodule.ts, 15, 3), Decl(exportImportAndClodule.ts, 16, 3)) @@ -41,9 +41,9 @@ var o: { name: string }; var o = new M.D('Hello'); >o : Symbol(o, Decl(exportImportAndClodule.ts, 15, 3), Decl(exportImportAndClodule.ts, 16, 3)) ->M.D : Symbol(M.D, Decl(exportImportAndClodule.ts, 12, 10)) +>M.D : Symbol(M.D, Decl(exportImportAndClodule.ts, 12, 13)) >M : Symbol(M, Decl(exportImportAndClodule.ts, 11, 1)) ->D : Symbol(M.D, Decl(exportImportAndClodule.ts, 12, 10)) +>D : Symbol(M.D, Decl(exportImportAndClodule.ts, 12, 13)) var p: { x: number; y: number; } >p : Symbol(p, Decl(exportImportAndClodule.ts, 17, 3), Decl(exportImportAndClodule.ts, 18, 3)) @@ -53,6 +53,6 @@ var p: { x: number; y: number; } var p: M.D.Point; >p : Symbol(p, Decl(exportImportAndClodule.ts, 17, 3), Decl(exportImportAndClodule.ts, 18, 3)) >M : Symbol(M, Decl(exportImportAndClodule.ts, 11, 1)) ->D : Symbol(M.D, Decl(exportImportAndClodule.ts, 12, 10)) +>D : Symbol(M.D, Decl(exportImportAndClodule.ts, 12, 13)) >Point : Symbol(K.L.Point, Decl(exportImportAndClodule.ts, 5, 26)) diff --git a/tests/baselines/reference/exportImportAndClodule.types b/tests/baselines/reference/exportImportAndClodule.types index d44492dc05e2b..011b1f449a71b 100644 --- a/tests/baselines/reference/exportImportAndClodule.types +++ b/tests/baselines/reference/exportImportAndClodule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportImportAndClodule.ts] //// === exportImportAndClodule.ts === -module K { +namespace K { >K : typeof K > : ^^^^^^^^ @@ -13,7 +13,7 @@ module K { >name : string > : ^^^^^^ } - export module L { + export namespace L { >L : typeof L > : ^^^^^^^^ @@ -34,7 +34,7 @@ module K { } } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.js b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.js index d73054a7df883..dd85d0aa44531 100644 --- a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.js +++ b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportImportCanSubstituteConstEnumForValue.ts] //// //// [exportImportCanSubstituteConstEnumForValue.ts] -module MsPortalFx.ViewModels.Dialogs { +namespace MsPortalFx.ViewModels.Dialogs { export const enum DialogResult { Abort, @@ -31,7 +31,7 @@ module MsPortalFx.ViewModels.Dialogs { } -module MsPortalFx.ViewModels { +namespace MsPortalFx.ViewModels { /** * For some reason javascript code is emitted for this re-exported const enum. diff --git a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.symbols b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.symbols index 461d76098d5de..c94e113918142 100644 --- a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.symbols +++ b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.symbols @@ -1,13 +1,13 @@ //// [tests/cases/compiler/exportImportCanSubstituteConstEnumForValue.ts] //// === exportImportCanSubstituteConstEnumForValue.ts === -module MsPortalFx.ViewModels.Dialogs { +namespace MsPortalFx.ViewModels.Dialogs { >MsPortalFx : Symbol(MsPortalFx, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 0), Decl(exportImportCanSubstituteConstEnumForValue.ts, 27, 1)) ->ViewModels : Symbol(ViewModels, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 18), Decl(exportImportCanSubstituteConstEnumForValue.ts, 30, 18)) ->Dialogs : Symbol(Dialogs, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 29)) +>ViewModels : Symbol(ViewModels, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 21), Decl(exportImportCanSubstituteConstEnumForValue.ts, 30, 21)) +>Dialogs : Symbol(Dialogs, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 32)) export const enum DialogResult { ->DialogResult : Symbol(DialogResult, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 38)) +>DialogResult : Symbol(DialogResult, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 41)) Abort, >Abort : Symbol(ReExportedEnum.Abort, Decl(exportImportCanSubstituteConstEnumForValue.ts, 2, 36)) @@ -37,9 +37,9 @@ module MsPortalFx.ViewModels.Dialogs { (result: MsPortalFx.ViewModels.Dialogs.DialogResult): void; >result : Symbol(result, Decl(exportImportCanSubstituteConstEnumForValue.ts, 13, 9)) >MsPortalFx : Symbol(MsPortalFx, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 0), Decl(exportImportCanSubstituteConstEnumForValue.ts, 27, 1)) ->ViewModels : Symbol(ViewModels, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 18), Decl(exportImportCanSubstituteConstEnumForValue.ts, 30, 18)) ->Dialogs : Symbol(Dialogs, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 29)) ->DialogResult : Symbol(DialogResult, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 38)) +>ViewModels : Symbol(ViewModels, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 21), Decl(exportImportCanSubstituteConstEnumForValue.ts, 30, 21)) +>Dialogs : Symbol(Dialogs, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 32)) +>DialogResult : Symbol(DialogResult, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 41)) } export function someExportedFunction() { @@ -70,24 +70,24 @@ module MsPortalFx.ViewModels.Dialogs { } -module MsPortalFx.ViewModels { +namespace MsPortalFx.ViewModels { >MsPortalFx : Symbol(MsPortalFx, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 0), Decl(exportImportCanSubstituteConstEnumForValue.ts, 27, 1)) ->ViewModels : Symbol(ViewModels, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 18), Decl(exportImportCanSubstituteConstEnumForValue.ts, 30, 18)) +>ViewModels : Symbol(ViewModels, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 21), Decl(exportImportCanSubstituteConstEnumForValue.ts, 30, 21)) /** * For some reason javascript code is emitted for this re-exported const enum. */ export import ReExportedEnum = Dialogs.DialogResult; ->ReExportedEnum : Symbol(ReExportedEnum, Decl(exportImportCanSubstituteConstEnumForValue.ts, 30, 30)) ->Dialogs : Symbol(Dialogs, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 29)) ->DialogResult : Symbol(ReExportedEnum, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 38)) +>ReExportedEnum : Symbol(ReExportedEnum, Decl(exportImportCanSubstituteConstEnumForValue.ts, 30, 33)) +>Dialogs : Symbol(Dialogs, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 32)) +>DialogResult : Symbol(ReExportedEnum, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 41)) /** * Not exported to show difference. No javascript is emmitted (as expected) */ import DialogButtons = Dialogs.MessageBoxButtons; >DialogButtons : Symbol(DialogButtons, Decl(exportImportCanSubstituteConstEnumForValue.ts, 35, 56)) ->Dialogs : Symbol(Dialogs, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 29)) +>Dialogs : Symbol(Dialogs, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 32)) >MessageBoxButtons : Symbol(DialogButtons, Decl(exportImportCanSubstituteConstEnumForValue.ts, 17, 5)) /** @@ -95,7 +95,7 @@ module MsPortalFx.ViewModels { */ export import Callback = Dialogs.DialogResultCallback; >Callback : Symbol(Callback, Decl(exportImportCanSubstituteConstEnumForValue.ts, 40, 53)) ->Dialogs : Symbol(Dialogs, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 29)) +>Dialogs : Symbol(Dialogs, Decl(exportImportCanSubstituteConstEnumForValue.ts, 0, 32)) >DialogResultCallback : Symbol(Callback, Decl(exportImportCanSubstituteConstEnumForValue.ts, 10, 5)) export class SomeUsagesOfTheseConsts { @@ -106,7 +106,7 @@ module MsPortalFx.ViewModels { const value1 = ReExportedEnum.Cancel; >value1 : Symbol(value1, Decl(exportImportCanSubstituteConstEnumForValue.ts, 50, 17)) >ReExportedEnum.Cancel : Symbol(ReExportedEnum.Cancel, Decl(exportImportCanSubstituteConstEnumForValue.ts, 3, 14)) ->ReExportedEnum : Symbol(ReExportedEnum, Decl(exportImportCanSubstituteConstEnumForValue.ts, 30, 30)) +>ReExportedEnum : Symbol(ReExportedEnum, Decl(exportImportCanSubstituteConstEnumForValue.ts, 30, 33)) >Cancel : Symbol(ReExportedEnum.Cancel, Decl(exportImportCanSubstituteConstEnumForValue.ts, 3, 14)) console.log(value1); diff --git a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.types b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.types index 12ca942191538..f1373fd2237e7 100644 --- a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.types +++ b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportImportCanSubstituteConstEnumForValue.ts] //// === exportImportCanSubstituteConstEnumForValue.ts === -module MsPortalFx.ViewModels.Dialogs { +namespace MsPortalFx.ViewModels.Dialogs { >MsPortalFx : typeof MsPortalFx > : ^^^^^^^^^^^^^^^^^ >ViewModels : typeof ViewModels @@ -90,7 +90,7 @@ module MsPortalFx.ViewModels.Dialogs { } -module MsPortalFx.ViewModels { +namespace MsPortalFx.ViewModels { >MsPortalFx : typeof MsPortalFx > : ^^^^^^^^^^^^^^^^^ >ViewModels : typeof ViewModels diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule.js b/tests/baselines/reference/exportImportNonInstantiatedModule.js index 7db74f428931d..d3bd41b545dff 100644 --- a/tests/baselines/reference/exportImportNonInstantiatedModule.js +++ b/tests/baselines/reference/exportImportNonInstantiatedModule.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/exportImportNonInstantiatedModule.ts] //// //// [exportImportNonInstantiatedModule.ts] -module A { +namespace A { export interface I { x: number } } -module B { +namespace B { export import A1 = A } diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule.symbols b/tests/baselines/reference/exportImportNonInstantiatedModule.symbols index fca478a551668..a250c5e74b23d 100644 --- a/tests/baselines/reference/exportImportNonInstantiatedModule.symbols +++ b/tests/baselines/reference/exportImportNonInstantiatedModule.symbols @@ -1,19 +1,19 @@ //// [tests/cases/compiler/exportImportNonInstantiatedModule.ts] //// === exportImportNonInstantiatedModule.ts === -module A { +namespace A { >A : Symbol(A, Decl(exportImportNonInstantiatedModule.ts, 0, 0)) export interface I { x: number } ->I : Symbol(I, Decl(exportImportNonInstantiatedModule.ts, 0, 10)) +>I : Symbol(I, Decl(exportImportNonInstantiatedModule.ts, 0, 13)) >x : Symbol(I.x, Decl(exportImportNonInstantiatedModule.ts, 1, 24)) } -module B { +namespace B { >B : Symbol(B, Decl(exportImportNonInstantiatedModule.ts, 2, 1)) export import A1 = A ->A1 : Symbol(A1, Decl(exportImportNonInstantiatedModule.ts, 4, 10)) +>A1 : Symbol(A1, Decl(exportImportNonInstantiatedModule.ts, 4, 13)) >A : Symbol(A1, Decl(exportImportNonInstantiatedModule.ts, 0, 0)) } @@ -21,7 +21,7 @@ module B { var x: B.A1.I = { x: 1 }; >x : Symbol(x, Decl(exportImportNonInstantiatedModule.ts, 9, 3)) >B : Symbol(B, Decl(exportImportNonInstantiatedModule.ts, 2, 1)) ->A1 : Symbol(B.A1, Decl(exportImportNonInstantiatedModule.ts, 4, 10)) ->I : Symbol(A.I, Decl(exportImportNonInstantiatedModule.ts, 0, 10)) +>A1 : Symbol(B.A1, Decl(exportImportNonInstantiatedModule.ts, 4, 13)) +>I : Symbol(A.I, Decl(exportImportNonInstantiatedModule.ts, 0, 13)) >x : Symbol(x, Decl(exportImportNonInstantiatedModule.ts, 9, 17)) diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule.types b/tests/baselines/reference/exportImportNonInstantiatedModule.types index e85469e47b979..14773d79643a3 100644 --- a/tests/baselines/reference/exportImportNonInstantiatedModule.types +++ b/tests/baselines/reference/exportImportNonInstantiatedModule.types @@ -1,13 +1,13 @@ //// [tests/cases/compiler/exportImportNonInstantiatedModule.ts] //// === exportImportNonInstantiatedModule.ts === -module A { +namespace A { export interface I { x: number } >x : number > : ^^^^^^ } -module B { +namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/exportNonInitializedVariablesAMD.errors.txt b/tests/baselines/reference/exportNonInitializedVariablesAMD.errors.txt index 6b757c89a9ea9..520ff7afd5b52 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesAMD.errors.txt +++ b/tests/baselines/reference/exportNonInitializedVariablesAMD.errors.txt @@ -30,7 +30,7 @@ exportNonInitializedVariablesAMD.ts(3,6): error TS1123: Variable declaration lis export let x, y, z; } - module C { + namespace C { export var a = 1, b, c = 2; export var x, y, z; } diff --git a/tests/baselines/reference/exportNonInitializedVariablesAMD.js b/tests/baselines/reference/exportNonInitializedVariablesAMD.js index 946fb84f34f07..4dc3fb7e89f2a 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesAMD.js +++ b/tests/baselines/reference/exportNonInitializedVariablesAMD.js @@ -18,7 +18,7 @@ namespace B { export let x, y, z; } -module C { +namespace C { export var a = 1, b, c = 2; export var x, y, z; } diff --git a/tests/baselines/reference/exportNonInitializedVariablesAMD.symbols b/tests/baselines/reference/exportNonInitializedVariablesAMD.symbols index fcadca7750e13..9cce89cf9762c 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesAMD.symbols +++ b/tests/baselines/reference/exportNonInitializedVariablesAMD.symbols @@ -42,7 +42,7 @@ namespace B { >z : Symbol(z, Decl(exportNonInitializedVariablesAMD.ts, 14, 20)) } -module C { +namespace C { >C : Symbol(C, Decl(exportNonInitializedVariablesAMD.ts, 15, 1)) export var a = 1, b, c = 2; diff --git a/tests/baselines/reference/exportNonInitializedVariablesAMD.types b/tests/baselines/reference/exportNonInitializedVariablesAMD.types index 9f6a7dff9697f..af72b6c842d51 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesAMD.types +++ b/tests/baselines/reference/exportNonInitializedVariablesAMD.types @@ -61,7 +61,7 @@ namespace B { > : ^^^ } -module C { +namespace C { >C : typeof C > : ^^^^^^^^ diff --git a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.errors.txt b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.errors.txt index bdaf0bed5877e..d8fd0921d324d 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.errors.txt +++ b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.errors.txt @@ -30,7 +30,7 @@ exportNonInitializedVariablesCommonJS.ts(3,6): error TS1123: Variable declaratio export let x, y, z; } - module C { + namespace C { export var a = 1, b, c = 2; export var x, y, z; } diff --git a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js index 58d02ba7b9316..6fd812b9c0122 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js +++ b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js @@ -18,7 +18,7 @@ namespace B { export let x, y, z; } -module C { +namespace C { export var a = 1, b, c = 2; export var x, y, z; } diff --git a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.symbols b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.symbols index 149fd6926bdd5..3128ba9e6f045 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.symbols +++ b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.symbols @@ -42,7 +42,7 @@ namespace B { >z : Symbol(z, Decl(exportNonInitializedVariablesCommonJS.ts, 14, 20)) } -module C { +namespace C { >C : Symbol(C, Decl(exportNonInitializedVariablesCommonJS.ts, 15, 1)) export var a = 1, b, c = 2; diff --git a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.types b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.types index e29f16772e1da..49c081b45bc62 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.types +++ b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.types @@ -61,7 +61,7 @@ namespace B { > : ^^^ } -module C { +namespace C { >C : typeof C > : ^^^^^^^^ diff --git a/tests/baselines/reference/exportNonInitializedVariablesES6.errors.txt b/tests/baselines/reference/exportNonInitializedVariablesES6.errors.txt index 69dbc8538bb77..dfaa138267039 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesES6.errors.txt +++ b/tests/baselines/reference/exportNonInitializedVariablesES6.errors.txt @@ -30,7 +30,7 @@ exportNonInitializedVariablesES6.ts(3,6): error TS1123: Variable declaration lis export let x, y, z; } - module C { + namespace C { export var a = 1, b, c = 2; export var x, y, z; } diff --git a/tests/baselines/reference/exportNonInitializedVariablesES6.js b/tests/baselines/reference/exportNonInitializedVariablesES6.js index 92a9fb75c6ad6..3eddc4eec2d29 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesES6.js +++ b/tests/baselines/reference/exportNonInitializedVariablesES6.js @@ -18,7 +18,7 @@ namespace B { export let x, y, z; } -module C { +namespace C { export var a = 1, b, c = 2; export var x, y, z; } diff --git a/tests/baselines/reference/exportNonInitializedVariablesES6.symbols b/tests/baselines/reference/exportNonInitializedVariablesES6.symbols index 921a52bccfb4e..4da487cb1fe17 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesES6.symbols +++ b/tests/baselines/reference/exportNonInitializedVariablesES6.symbols @@ -42,7 +42,7 @@ namespace B { >z : Symbol(z, Decl(exportNonInitializedVariablesES6.ts, 14, 20)) } -module C { +namespace C { >C : Symbol(C, Decl(exportNonInitializedVariablesES6.ts, 15, 1)) export var a = 1, b, c = 2; diff --git a/tests/baselines/reference/exportNonInitializedVariablesES6.types b/tests/baselines/reference/exportNonInitializedVariablesES6.types index a05d6cfac5968..01ec43926d715 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesES6.types +++ b/tests/baselines/reference/exportNonInitializedVariablesES6.types @@ -61,7 +61,7 @@ namespace B { > : ^^^ } -module C { +namespace C { >C : typeof C > : ^^^^^^^^ diff --git a/tests/baselines/reference/exportNonInitializedVariablesSystem.errors.txt b/tests/baselines/reference/exportNonInitializedVariablesSystem.errors.txt index 87936e80db087..76b499d5a09e3 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesSystem.errors.txt +++ b/tests/baselines/reference/exportNonInitializedVariablesSystem.errors.txt @@ -30,7 +30,7 @@ exportNonInitializedVariablesSystem.ts(3,6): error TS1123: Variable declaration export let x, y, z; } - module C { + namespace C { export var a = 1, b, c = 2; export var x, y, z; } diff --git a/tests/baselines/reference/exportNonInitializedVariablesSystem.js b/tests/baselines/reference/exportNonInitializedVariablesSystem.js index ed308b49a25f6..15ad485e443aa 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesSystem.js +++ b/tests/baselines/reference/exportNonInitializedVariablesSystem.js @@ -18,7 +18,7 @@ namespace B { export let x, y, z; } -module C { +namespace C { export var a = 1, b, c = 2; export var x, y, z; } diff --git a/tests/baselines/reference/exportNonInitializedVariablesSystem.symbols b/tests/baselines/reference/exportNonInitializedVariablesSystem.symbols index 091a984c05cdf..1e68b54366495 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesSystem.symbols +++ b/tests/baselines/reference/exportNonInitializedVariablesSystem.symbols @@ -42,7 +42,7 @@ namespace B { >z : Symbol(z, Decl(exportNonInitializedVariablesSystem.ts, 14, 20)) } -module C { +namespace C { >C : Symbol(C, Decl(exportNonInitializedVariablesSystem.ts, 15, 1)) export var a = 1, b, c = 2; diff --git a/tests/baselines/reference/exportNonInitializedVariablesSystem.types b/tests/baselines/reference/exportNonInitializedVariablesSystem.types index 2a127da4bfe9b..cd4289d164d13 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesSystem.types +++ b/tests/baselines/reference/exportNonInitializedVariablesSystem.types @@ -61,7 +61,7 @@ namespace B { > : ^^^ } -module C { +namespace C { >C : typeof C > : ^^^^^^^^ diff --git a/tests/baselines/reference/exportNonInitializedVariablesUMD.errors.txt b/tests/baselines/reference/exportNonInitializedVariablesUMD.errors.txt index d3139867a14d7..dfb9b25e27521 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesUMD.errors.txt +++ b/tests/baselines/reference/exportNonInitializedVariablesUMD.errors.txt @@ -30,7 +30,7 @@ exportNonInitializedVariablesUMD.ts(3,6): error TS1123: Variable declaration lis export let x, y, z; } - module C { + namespace C { export var a = 1, b, c = 2; export var x, y, z; } diff --git a/tests/baselines/reference/exportNonInitializedVariablesUMD.js b/tests/baselines/reference/exportNonInitializedVariablesUMD.js index c711aba2b3e35..c4f990a306408 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesUMD.js +++ b/tests/baselines/reference/exportNonInitializedVariablesUMD.js @@ -18,7 +18,7 @@ namespace B { export let x, y, z; } -module C { +namespace C { export var a = 1, b, c = 2; export var x, y, z; } diff --git a/tests/baselines/reference/exportNonInitializedVariablesUMD.symbols b/tests/baselines/reference/exportNonInitializedVariablesUMD.symbols index ba9ae3689276d..5cfb18ca858a7 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesUMD.symbols +++ b/tests/baselines/reference/exportNonInitializedVariablesUMD.symbols @@ -42,7 +42,7 @@ namespace B { >z : Symbol(z, Decl(exportNonInitializedVariablesUMD.ts, 14, 20)) } -module C { +namespace C { >C : Symbol(C, Decl(exportNonInitializedVariablesUMD.ts, 15, 1)) export var a = 1, b, c = 2; diff --git a/tests/baselines/reference/exportNonInitializedVariablesUMD.types b/tests/baselines/reference/exportNonInitializedVariablesUMD.types index 13e6a1204fadf..bcea0e089ca36 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesUMD.types +++ b/tests/baselines/reference/exportNonInitializedVariablesUMD.types @@ -61,7 +61,7 @@ namespace B { > : ^^^ } -module C { +namespace C { >C : typeof C > : ^^^^^^^^ diff --git a/tests/baselines/reference/exportPrivateType.js b/tests/baselines/reference/exportPrivateType.js index cd6c22812b589..665caf9d28b73 100644 --- a/tests/baselines/reference/exportPrivateType.js +++ b/tests/baselines/reference/exportPrivateType.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportPrivateType.ts] //// //// [exportPrivateType.ts] -module foo { +namespace foo { class C1 { x: string; y: C1; diff --git a/tests/baselines/reference/exportPrivateType.symbols b/tests/baselines/reference/exportPrivateType.symbols index f0ac5faaca07d..c4e4abf1223e1 100644 --- a/tests/baselines/reference/exportPrivateType.symbols +++ b/tests/baselines/reference/exportPrivateType.symbols @@ -1,18 +1,18 @@ //// [tests/cases/compiler/exportPrivateType.ts] //// === exportPrivateType.ts === -module foo { +namespace foo { >foo : Symbol(foo, Decl(exportPrivateType.ts, 0, 0)) class C1 { ->C1 : Symbol(C1, Decl(exportPrivateType.ts, 0, 12)) +>C1 : Symbol(C1, Decl(exportPrivateType.ts, 0, 15)) x: string; >x : Symbol(C1.x, Decl(exportPrivateType.ts, 1, 14)) y: C1; >y : Symbol(C1.y, Decl(exportPrivateType.ts, 2, 18)) ->C1 : Symbol(C1, Decl(exportPrivateType.ts, 0, 12)) +>C1 : Symbol(C1, Decl(exportPrivateType.ts, 0, 15)) } class C2 { @@ -48,7 +48,7 @@ module foo { // None of the types are exported, so per section 10.3, should all be errors export var e: C1; >e : Symbol(e, Decl(exportPrivateType.ts, 21, 14)) ->C1 : Symbol(C1, Decl(exportPrivateType.ts, 0, 12)) +>C1 : Symbol(C1, Decl(exportPrivateType.ts, 0, 15)) export var f: I1; >f : Symbol(f, Decl(exportPrivateType.ts, 22, 14)) diff --git a/tests/baselines/reference/exportPrivateType.types b/tests/baselines/reference/exportPrivateType.types index 274b4c4604c5d..dc50bd1441366 100644 --- a/tests/baselines/reference/exportPrivateType.types +++ b/tests/baselines/reference/exportPrivateType.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportPrivateType.ts] //// === exportPrivateType.ts === -module foo { +namespace foo { >foo : typeof foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.js b/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.js index c944a3c07cfb1..0647cbc006222 100644 --- a/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.js +++ b/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.js @@ -2,7 +2,7 @@ //// [exportSpecifierAndExportedMemberDeclaration.ts] declare module "m2" { - export module X { + export namespace X { interface I { } } function Y(); diff --git a/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.symbols b/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.symbols index 4ba169df7be9d..ddd08bf3e7cbf 100644 --- a/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.symbols +++ b/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.symbols @@ -4,11 +4,11 @@ declare module "m2" { >"m2" : Symbol("m2", Decl(exportSpecifierAndExportedMemberDeclaration.ts, 0, 0), Decl(exportSpecifierAndExportedMemberDeclaration.ts, 7, 1)) - export module X { + export namespace X { >X : Symbol(X, Decl(exportSpecifierAndExportedMemberDeclaration.ts, 0, 21), Decl(exportSpecifierAndExportedMemberDeclaration.ts, 5, 12)) interface I { } ->I : Symbol(I, Decl(exportSpecifierAndExportedMemberDeclaration.ts, 1, 21)) +>I : Symbol(I, Decl(exportSpecifierAndExportedMemberDeclaration.ts, 1, 24)) } function Y(); >Y : Symbol(Y, Decl(exportSpecifierAndExportedMemberDeclaration.ts, 3, 5)) @@ -20,7 +20,7 @@ declare module "m2" { function Z(): X.I; >Z : Symbol(Z, Decl(exportSpecifierAndExportedMemberDeclaration.ts, 5, 22)) >X : Symbol(X, Decl(exportSpecifierAndExportedMemberDeclaration.ts, 0, 21), Decl(exportSpecifierAndExportedMemberDeclaration.ts, 5, 12)) ->I : Symbol(X.I, Decl(exportSpecifierAndExportedMemberDeclaration.ts, 1, 21)) +>I : Symbol(X.I, Decl(exportSpecifierAndExportedMemberDeclaration.ts, 1, 24)) } declare module "m2" { @@ -29,5 +29,5 @@ declare module "m2" { function Z2(): X.I; >Z2 : Symbol(Z2, Decl(exportSpecifierAndExportedMemberDeclaration.ts, 9, 21)) >X : Symbol(X, Decl(exportSpecifierAndExportedMemberDeclaration.ts, 0, 21), Decl(exportSpecifierAndExportedMemberDeclaration.ts, 5, 12)) ->I : Symbol(X.I, Decl(exportSpecifierAndExportedMemberDeclaration.ts, 1, 21)) +>I : Symbol(X.I, Decl(exportSpecifierAndExportedMemberDeclaration.ts, 1, 24)) } diff --git a/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.types b/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.types index 4cedac37686b5..48c7b7936e9e5 100644 --- a/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.types +++ b/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.types @@ -5,7 +5,7 @@ declare module "m2" { >"m2" : typeof import("m2") > : ^^^^^^^^^^^^^^^^^^^ - export module X { + export namespace X { interface I { } } function Y(); diff --git a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.errors.txt b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.errors.txt index 7c8cdd2db914b..cdc6852aad02b 100644 --- a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.errors.txt +++ b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.errors.txt @@ -3,7 +3,7 @@ exportSpecifierAndLocalMemberDeclaration.ts(11,20): error TS2503: Cannot find na ==== exportSpecifierAndLocalMemberDeclaration.ts (1 errors) ==== declare module "m2" { - module X { + namespace X { interface I { } } function Y(); diff --git a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.js b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.js index 8350f6d82fe46..71a14cd5ec587 100644 --- a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.js +++ b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.js @@ -2,7 +2,7 @@ //// [exportSpecifierAndLocalMemberDeclaration.ts] declare module "m2" { - module X { + namespace X { interface I { } } function Y(); diff --git a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.symbols b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.symbols index 4fe3d8d4acc44..24333ceb80508 100644 --- a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.symbols +++ b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.symbols @@ -4,11 +4,11 @@ declare module "m2" { >"m2" : Symbol("m2", Decl(exportSpecifierAndLocalMemberDeclaration.ts, 0, 0), Decl(exportSpecifierAndLocalMemberDeclaration.ts, 7, 1)) - module X { + namespace X { >X : Symbol(X, Decl(exportSpecifierAndLocalMemberDeclaration.ts, 0, 21)) interface I { } ->I : Symbol(I, Decl(exportSpecifierAndLocalMemberDeclaration.ts, 1, 14)) +>I : Symbol(I, Decl(exportSpecifierAndLocalMemberDeclaration.ts, 1, 17)) } function Y(); >Y : Symbol(Y, Decl(exportSpecifierAndLocalMemberDeclaration.ts, 3, 5)) @@ -20,7 +20,7 @@ declare module "m2" { function Z(): X.I; >Z : Symbol(Z, Decl(exportSpecifierAndLocalMemberDeclaration.ts, 5, 22)) >X : Symbol(X, Decl(exportSpecifierAndLocalMemberDeclaration.ts, 0, 21)) ->I : Symbol(X.I, Decl(exportSpecifierAndLocalMemberDeclaration.ts, 1, 14)) +>I : Symbol(X.I, Decl(exportSpecifierAndLocalMemberDeclaration.ts, 1, 17)) } declare module "m2" { diff --git a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types index 45c953a6edaec..cc942fc19165e 100644 --- a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types +++ b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types @@ -5,7 +5,7 @@ declare module "m2" { >"m2" : typeof import("m2") > : ^^^^^^^^^^^^^^^^^^^ - module X { + namespace X { interface I { } } function Y(); diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.errors.txt b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.errors.txt index d243086c7540e..e9341b6172345 100644 --- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.errors.txt +++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.errors.txt @@ -2,7 +2,7 @@ exportSpecifierReferencingOuterDeclaration1.ts(3,14): error TS2661: Cannot expor ==== exportSpecifierReferencingOuterDeclaration1.ts (1 errors) ==== - declare module X { export interface bar { } } + declare namespace X { export interface bar { } } declare module "m" { export { X }; ~ diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.js b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.js index 9783b37586d2d..6743dac936567 100644 --- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.js +++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportSpecifierReferencingOuterDeclaration1.ts] //// //// [exportSpecifierReferencingOuterDeclaration1.ts] -declare module X { export interface bar { } } +declare namespace X { export interface bar { } } declare module "m" { export { X }; export function foo(): X.bar; diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.symbols b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.symbols index c0bf5723fc3e2..52fdb1301b8fb 100644 --- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.symbols +++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.symbols @@ -1,12 +1,12 @@ //// [tests/cases/compiler/exportSpecifierReferencingOuterDeclaration1.ts] //// === exportSpecifierReferencingOuterDeclaration1.ts === -declare module X { export interface bar { } } +declare namespace X { export interface bar { } } >X : Symbol(X, Decl(exportSpecifierReferencingOuterDeclaration1.ts, 0, 0)) ->bar : Symbol(bar, Decl(exportSpecifierReferencingOuterDeclaration1.ts, 0, 18)) +>bar : Symbol(bar, Decl(exportSpecifierReferencingOuterDeclaration1.ts, 0, 21)) declare module "m" { ->"m" : Symbol("m", Decl(exportSpecifierReferencingOuterDeclaration1.ts, 0, 45)) +>"m" : Symbol("m", Decl(exportSpecifierReferencingOuterDeclaration1.ts, 0, 48)) export { X }; >X : Symbol(X, Decl(exportSpecifierReferencingOuterDeclaration1.ts, 2, 12)) @@ -14,5 +14,5 @@ declare module "m" { export function foo(): X.bar; >foo : Symbol(foo, Decl(exportSpecifierReferencingOuterDeclaration1.ts, 2, 17)) >X : Symbol(X, Decl(exportSpecifierReferencingOuterDeclaration1.ts, 0, 0)) ->bar : Symbol(X.bar, Decl(exportSpecifierReferencingOuterDeclaration1.ts, 0, 18)) +>bar : Symbol(X.bar, Decl(exportSpecifierReferencingOuterDeclaration1.ts, 0, 21)) } diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.types b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.types index b5c3b3261e827..d4eb3b305a326 100644 --- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.types +++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportSpecifierReferencingOuterDeclaration1.ts] //// === exportSpecifierReferencingOuterDeclaration1.ts === -declare module X { export interface bar { } } +declare namespace X { export interface bar { } } declare module "m" { >"m" : typeof import("m") > : ^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.errors.txt b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.errors.txt index 3838a6a4dc54a..7f8702c07aa63 100644 --- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.errors.txt +++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.errors.txt @@ -2,7 +2,7 @@ exportSpecifierReferencingOuterDeclaration2_B.ts(1,10): error TS2661: Cannot exp ==== exportSpecifierReferencingOuterDeclaration2_A.ts (0 errors) ==== - declare module X { export interface bar { } } + declare namespace X { export interface bar { } } ==== exportSpecifierReferencingOuterDeclaration2_B.ts (1 errors) ==== export { X }; diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.js b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.js index bdb0e9e04bf80..9974c0efbe0c1 100644 --- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.js +++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2.ts] //// //// [exportSpecifierReferencingOuterDeclaration2_A.ts] -declare module X { export interface bar { } } +declare namespace X { export interface bar { } } //// [exportSpecifierReferencingOuterDeclaration2_B.ts] export { X }; diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.symbols b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.symbols index 1814d0ae6dd0a..f22ac0f52e926 100644 --- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.symbols +++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.symbols @@ -1,9 +1,9 @@ //// [tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2.ts] //// === exportSpecifierReferencingOuterDeclaration2_A.ts === -declare module X { export interface bar { } } +declare namespace X { export interface bar { } } >X : Symbol(X, Decl(exportSpecifierReferencingOuterDeclaration2_A.ts, 0, 0)) ->bar : Symbol(bar, Decl(exportSpecifierReferencingOuterDeclaration2_A.ts, 0, 18)) +>bar : Symbol(bar, Decl(exportSpecifierReferencingOuterDeclaration2_A.ts, 0, 21)) === exportSpecifierReferencingOuterDeclaration2_B.ts === export { X }; @@ -12,5 +12,5 @@ export { X }; export declare function foo(): X.bar; >foo : Symbol(foo, Decl(exportSpecifierReferencingOuterDeclaration2_B.ts, 0, 13)) >X : Symbol(X, Decl(exportSpecifierReferencingOuterDeclaration2_A.ts, 0, 0)) ->bar : Symbol(X.bar, Decl(exportSpecifierReferencingOuterDeclaration2_A.ts, 0, 18)) +>bar : Symbol(X.bar, Decl(exportSpecifierReferencingOuterDeclaration2_A.ts, 0, 21)) diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.types b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.types index c541ad4e0d418..4d7d0e85db4f8 100644 --- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.types +++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.types @@ -2,7 +2,7 @@ === exportSpecifierReferencingOuterDeclaration2_A.ts === -declare module X { export interface bar { } } +declare namespace X { export interface bar { } } === exportSpecifierReferencingOuterDeclaration2_B.ts === export { X }; diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.errors.txt b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.errors.txt index deefe8cb768ef..3869bb4224603 100644 --- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.errors.txt +++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.errors.txt @@ -2,9 +2,9 @@ exportSpecifierReferencingOuterDeclaration3.ts(6,30): error TS2694: Namespace 'X ==== exportSpecifierReferencingOuterDeclaration3.ts (1 errors) ==== - declare module X { export interface bar { } } + declare namespace X { export interface bar { } } declare module "m" { - module X { export interface foo { } } + namespace X { export interface foo { } } export { X }; export function foo(): X.foo; export function bar(): X.bar; // error diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.js b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.js index 6023e68be2995..a26ef1219151c 100644 --- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.js +++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.js @@ -1,9 +1,9 @@ //// [tests/cases/compiler/exportSpecifierReferencingOuterDeclaration3.ts] //// //// [exportSpecifierReferencingOuterDeclaration3.ts] -declare module X { export interface bar { } } +declare namespace X { export interface bar { } } declare module "m" { - module X { export interface foo { } } + namespace X { export interface foo { } } export { X }; export function foo(): X.foo; export function bar(): X.bar; // error diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.symbols b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.symbols index cf7a506348d59..9c77141c071f6 100644 --- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.symbols +++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.symbols @@ -1,16 +1,16 @@ //// [tests/cases/compiler/exportSpecifierReferencingOuterDeclaration3.ts] //// === exportSpecifierReferencingOuterDeclaration3.ts === -declare module X { export interface bar { } } +declare namespace X { export interface bar { } } >X : Symbol(X, Decl(exportSpecifierReferencingOuterDeclaration3.ts, 0, 0)) ->bar : Symbol(bar, Decl(exportSpecifierReferencingOuterDeclaration3.ts, 0, 18)) +>bar : Symbol(bar, Decl(exportSpecifierReferencingOuterDeclaration3.ts, 0, 21)) declare module "m" { ->"m" : Symbol("m", Decl(exportSpecifierReferencingOuterDeclaration3.ts, 0, 45)) +>"m" : Symbol("m", Decl(exportSpecifierReferencingOuterDeclaration3.ts, 0, 48)) - module X { export interface foo { } } + namespace X { export interface foo { } } >X : Symbol(X, Decl(exportSpecifierReferencingOuterDeclaration3.ts, 1, 20)) ->foo : Symbol(foo, Decl(exportSpecifierReferencingOuterDeclaration3.ts, 2, 14)) +>foo : Symbol(foo, Decl(exportSpecifierReferencingOuterDeclaration3.ts, 2, 17)) export { X }; >X : Symbol(X, Decl(exportSpecifierReferencingOuterDeclaration3.ts, 3, 12)) @@ -18,7 +18,7 @@ declare module "m" { export function foo(): X.foo; >foo : Symbol(foo, Decl(exportSpecifierReferencingOuterDeclaration3.ts, 3, 17)) >X : Symbol(X, Decl(exportSpecifierReferencingOuterDeclaration3.ts, 1, 20)) ->foo : Symbol(X.foo, Decl(exportSpecifierReferencingOuterDeclaration3.ts, 2, 14)) +>foo : Symbol(X.foo, Decl(exportSpecifierReferencingOuterDeclaration3.ts, 2, 17)) export function bar(): X.bar; // error >bar : Symbol(bar, Decl(exportSpecifierReferencingOuterDeclaration3.ts, 4, 33)) diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types index 7cfc7f29a1799..03f48ff9c1d41 100644 --- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types +++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types @@ -1,12 +1,12 @@ //// [tests/cases/compiler/exportSpecifierReferencingOuterDeclaration3.ts] //// === exportSpecifierReferencingOuterDeclaration3.ts === -declare module X { export interface bar { } } +declare namespace X { export interface bar { } } declare module "m" { >"m" : typeof import("m") > : ^^^^^^^^^^^^^^^^^^ - module X { export interface foo { } } + namespace X { export interface foo { } } export { X }; >X : any > : ^^^ diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.errors.txt b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.errors.txt index 15a7fa2ae9327..40916ef340502 100644 --- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.errors.txt +++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.errors.txt @@ -2,10 +2,10 @@ exportSpecifierReferencingOuterDeclaration2_B.ts(4,34): error TS2694: Namespace ==== exportSpecifierReferencingOuterDeclaration2_A.ts (0 errors) ==== - declare module X { export interface bar { } } + declare namespace X { export interface bar { } } ==== exportSpecifierReferencingOuterDeclaration2_B.ts (1 errors) ==== - declare module X { export interface foo { } } + declare namespace X { export interface foo { } } export { X }; export declare function foo(): X.foo; export declare function bar(): X.bar; // error diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js index 740bb41be73c8..80e9c2e6cbc6a 100644 --- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js +++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js @@ -1,10 +1,10 @@ //// [tests/cases/compiler/exportSpecifierReferencingOuterDeclaration4.ts] //// //// [exportSpecifierReferencingOuterDeclaration2_A.ts] -declare module X { export interface bar { } } +declare namespace X { export interface bar { } } //// [exportSpecifierReferencingOuterDeclaration2_B.ts] -declare module X { export interface foo { } } +declare namespace X { export interface foo { } } export { X }; export declare function foo(): X.foo; export declare function bar(): X.bar; // error diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.symbols b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.symbols index 89e4cd61f4e3d..e0be671a2d6e3 100644 --- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.symbols +++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.symbols @@ -1,14 +1,14 @@ //// [tests/cases/compiler/exportSpecifierReferencingOuterDeclaration4.ts] //// === exportSpecifierReferencingOuterDeclaration2_A.ts === -declare module X { export interface bar { } } +declare namespace X { export interface bar { } } >X : Symbol(X, Decl(exportSpecifierReferencingOuterDeclaration2_A.ts, 0, 0)) ->bar : Symbol(bar, Decl(exportSpecifierReferencingOuterDeclaration2_A.ts, 0, 18)) +>bar : Symbol(bar, Decl(exportSpecifierReferencingOuterDeclaration2_A.ts, 0, 21)) === exportSpecifierReferencingOuterDeclaration2_B.ts === -declare module X { export interface foo { } } +declare namespace X { export interface foo { } } >X : Symbol(X, Decl(exportSpecifierReferencingOuterDeclaration2_B.ts, 0, 0)) ->foo : Symbol(foo, Decl(exportSpecifierReferencingOuterDeclaration2_B.ts, 0, 18)) +>foo : Symbol(foo, Decl(exportSpecifierReferencingOuterDeclaration2_B.ts, 0, 21)) export { X }; >X : Symbol(X, Decl(exportSpecifierReferencingOuterDeclaration2_B.ts, 1, 8)) @@ -16,7 +16,7 @@ export { X }; export declare function foo(): X.foo; >foo : Symbol(foo, Decl(exportSpecifierReferencingOuterDeclaration2_B.ts, 1, 13)) >X : Symbol(X, Decl(exportSpecifierReferencingOuterDeclaration2_B.ts, 0, 0)) ->foo : Symbol(X.foo, Decl(exportSpecifierReferencingOuterDeclaration2_B.ts, 0, 18)) +>foo : Symbol(X.foo, Decl(exportSpecifierReferencingOuterDeclaration2_B.ts, 0, 21)) export declare function bar(): X.bar; // error >bar : Symbol(bar, Decl(exportSpecifierReferencingOuterDeclaration2_B.ts, 2, 37)) diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types index 6abf489b85771..a215d4127b0d2 100644 --- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types +++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types @@ -2,10 +2,10 @@ === exportSpecifierReferencingOuterDeclaration2_A.ts === -declare module X { export interface bar { } } +declare namespace X { export interface bar { } } === exportSpecifierReferencingOuterDeclaration2_B.ts === -declare module X { export interface foo { } } +declare namespace X { export interface foo { } } export { X }; >X : any > : ^^^ diff --git a/tests/baselines/reference/exportsAndImports1-amd.js b/tests/baselines/reference/exportsAndImports1-amd.js index 752885c6cc936..43dae772855ff 100644 --- a/tests/baselines/reference/exportsAndImports1-amd.js +++ b/tests/baselines/reference/exportsAndImports1-amd.js @@ -13,10 +13,10 @@ enum E { const enum D { A, B, C } -module M { +namespace M { export var x; } -module N { +namespace N { export interface I { } } diff --git a/tests/baselines/reference/exportsAndImports1-amd.symbols b/tests/baselines/reference/exportsAndImports1-amd.symbols index 8220191bef0de..ef950c548bcec 100644 --- a/tests/baselines/reference/exportsAndImports1-amd.symbols +++ b/tests/baselines/reference/exportsAndImports1-amd.symbols @@ -29,17 +29,17 @@ const enum D { >B : Symbol(D.B, Decl(t1.ts, 10, 6)) >C : Symbol(D.C, Decl(t1.ts, 10, 9)) } -module M { +namespace M { >M : Symbol(M, Decl(t1.ts, 11, 1)) export var x; >x : Symbol(x, Decl(t1.ts, 13, 14)) } -module N { +namespace N { >N : Symbol(N, Decl(t1.ts, 14, 1)) export interface I { ->I : Symbol(I, Decl(t1.ts, 15, 10)) +>I : Symbol(I, Decl(t1.ts, 15, 13)) } } type T = number; diff --git a/tests/baselines/reference/exportsAndImports1-amd.types b/tests/baselines/reference/exportsAndImports1-amd.types index 3edfb621fe651..9039c856cffd0 100644 --- a/tests/baselines/reference/exportsAndImports1-amd.types +++ b/tests/baselines/reference/exportsAndImports1-amd.types @@ -41,14 +41,14 @@ const enum D { >C : D.C > : ^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ export var x; >x : any } -module N { +namespace N { export interface I { } } diff --git a/tests/baselines/reference/exportsAndImports1-es6.js b/tests/baselines/reference/exportsAndImports1-es6.js index ac5b0421b1c2e..6dba5842103c5 100644 --- a/tests/baselines/reference/exportsAndImports1-es6.js +++ b/tests/baselines/reference/exportsAndImports1-es6.js @@ -13,10 +13,10 @@ enum E { const enum D { A, B, C } -module M { +namespace M { export var x; } -module N { +namespace N { export interface I { } } diff --git a/tests/baselines/reference/exportsAndImports1-es6.symbols b/tests/baselines/reference/exportsAndImports1-es6.symbols index 0f8e2329a92ca..1d297b12b89fd 100644 --- a/tests/baselines/reference/exportsAndImports1-es6.symbols +++ b/tests/baselines/reference/exportsAndImports1-es6.symbols @@ -29,17 +29,17 @@ const enum D { >B : Symbol(D.B, Decl(t1.ts, 10, 6)) >C : Symbol(D.C, Decl(t1.ts, 10, 9)) } -module M { +namespace M { >M : Symbol(M, Decl(t1.ts, 11, 1)) export var x; >x : Symbol(x, Decl(t1.ts, 13, 14)) } -module N { +namespace N { >N : Symbol(N, Decl(t1.ts, 14, 1)) export interface I { ->I : Symbol(I, Decl(t1.ts, 15, 10)) +>I : Symbol(I, Decl(t1.ts, 15, 13)) } } type T = number; diff --git a/tests/baselines/reference/exportsAndImports1-es6.types b/tests/baselines/reference/exportsAndImports1-es6.types index 2c73306443a96..fef201fcbfed7 100644 --- a/tests/baselines/reference/exportsAndImports1-es6.types +++ b/tests/baselines/reference/exportsAndImports1-es6.types @@ -41,14 +41,14 @@ const enum D { >C : D.C > : ^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ export var x; >x : any } -module N { +namespace N { export interface I { } } diff --git a/tests/baselines/reference/exportsAndImports1.js b/tests/baselines/reference/exportsAndImports1.js index 080433308cc4b..facbe0f4fed1f 100644 --- a/tests/baselines/reference/exportsAndImports1.js +++ b/tests/baselines/reference/exportsAndImports1.js @@ -13,10 +13,10 @@ enum E { const enum D { A, B, C } -module M { +namespace M { export var x; } -module N { +namespace N { export interface I { } } diff --git a/tests/baselines/reference/exportsAndImports1.symbols b/tests/baselines/reference/exportsAndImports1.symbols index 10aea7ed51733..493e56047de91 100644 --- a/tests/baselines/reference/exportsAndImports1.symbols +++ b/tests/baselines/reference/exportsAndImports1.symbols @@ -29,17 +29,17 @@ const enum D { >B : Symbol(D.B, Decl(t1.ts, 10, 6)) >C : Symbol(D.C, Decl(t1.ts, 10, 9)) } -module M { +namespace M { >M : Symbol(M, Decl(t1.ts, 11, 1)) export var x; >x : Symbol(x, Decl(t1.ts, 13, 14)) } -module N { +namespace N { >N : Symbol(N, Decl(t1.ts, 14, 1)) export interface I { ->I : Symbol(I, Decl(t1.ts, 15, 10)) +>I : Symbol(I, Decl(t1.ts, 15, 13)) } } type T = number; diff --git a/tests/baselines/reference/exportsAndImports1.types b/tests/baselines/reference/exportsAndImports1.types index 12d4e6297502c..89715c63752c9 100644 --- a/tests/baselines/reference/exportsAndImports1.types +++ b/tests/baselines/reference/exportsAndImports1.types @@ -41,14 +41,14 @@ const enum D { >C : D.C > : ^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ export var x; >x : any } -module N { +namespace N { export interface I { } } diff --git a/tests/baselines/reference/exportsAndImports3-amd.js b/tests/baselines/reference/exportsAndImports3-amd.js index 2c52509189182..67220af21ba46 100644 --- a/tests/baselines/reference/exportsAndImports3-amd.js +++ b/tests/baselines/reference/exportsAndImports3-amd.js @@ -13,10 +13,10 @@ export enum E { export const enum D { A, B, C } -export module M { +export namespace M { export var x; } -export module N { +export namespace N { export interface I { } } diff --git a/tests/baselines/reference/exportsAndImports3-amd.symbols b/tests/baselines/reference/exportsAndImports3-amd.symbols index 1df4dd05ecfc2..8f085ce0a22f6 100644 --- a/tests/baselines/reference/exportsAndImports3-amd.symbols +++ b/tests/baselines/reference/exportsAndImports3-amd.symbols @@ -29,17 +29,17 @@ export const enum D { >B : Symbol(D.B, Decl(t1.ts, 10, 6)) >C : Symbol(D.C, Decl(t1.ts, 10, 9)) } -export module M { +export namespace M { >M : Symbol(M, Decl(t1.ts, 11, 1)) export var x; >x : Symbol(x, Decl(t1.ts, 13, 14)) } -export module N { +export namespace N { >N : Symbol(N, Decl(t1.ts, 14, 1)) export interface I { ->I : Symbol(I, Decl(t1.ts, 15, 17)) +>I : Symbol(I, Decl(t1.ts, 15, 20)) } } export type T = number; diff --git a/tests/baselines/reference/exportsAndImports3-amd.types b/tests/baselines/reference/exportsAndImports3-amd.types index 2db1dd72527e5..4616001d45901 100644 --- a/tests/baselines/reference/exportsAndImports3-amd.types +++ b/tests/baselines/reference/exportsAndImports3-amd.types @@ -41,14 +41,14 @@ export const enum D { >C : D.C > : ^^^ } -export module M { +export namespace M { >M : typeof M > : ^^^^^^^^ export var x; >x : any } -export module N { +export namespace N { export interface I { } } diff --git a/tests/baselines/reference/exportsAndImports3-es6.js b/tests/baselines/reference/exportsAndImports3-es6.js index 50c7f861f7c07..ee065483914bb 100644 --- a/tests/baselines/reference/exportsAndImports3-es6.js +++ b/tests/baselines/reference/exportsAndImports3-es6.js @@ -13,10 +13,10 @@ export enum E { export const enum D { A, B, C } -export module M { +export namespace M { export var x; } -export module N { +export namespace N { export interface I { } } diff --git a/tests/baselines/reference/exportsAndImports3-es6.symbols b/tests/baselines/reference/exportsAndImports3-es6.symbols index c286e14bebe15..831d359fbb7bc 100644 --- a/tests/baselines/reference/exportsAndImports3-es6.symbols +++ b/tests/baselines/reference/exportsAndImports3-es6.symbols @@ -29,17 +29,17 @@ export const enum D { >B : Symbol(D.B, Decl(t1.ts, 10, 6)) >C : Symbol(D.C, Decl(t1.ts, 10, 9)) } -export module M { +export namespace M { >M : Symbol(M, Decl(t1.ts, 11, 1)) export var x; >x : Symbol(x, Decl(t1.ts, 13, 14)) } -export module N { +export namespace N { >N : Symbol(N, Decl(t1.ts, 14, 1)) export interface I { ->I : Symbol(I, Decl(t1.ts, 15, 17)) +>I : Symbol(I, Decl(t1.ts, 15, 20)) } } export type T = number; diff --git a/tests/baselines/reference/exportsAndImports3-es6.types b/tests/baselines/reference/exportsAndImports3-es6.types index 255d7190be20b..c370af6ebc959 100644 --- a/tests/baselines/reference/exportsAndImports3-es6.types +++ b/tests/baselines/reference/exportsAndImports3-es6.types @@ -41,14 +41,14 @@ export const enum D { >C : D.C > : ^^^ } -export module M { +export namespace M { >M : typeof M > : ^^^^^^^^ export var x; >x : any } -export module N { +export namespace N { export interface I { } } diff --git a/tests/baselines/reference/exportsAndImports3.js b/tests/baselines/reference/exportsAndImports3.js index eede925b22a68..b52418a35589d 100644 --- a/tests/baselines/reference/exportsAndImports3.js +++ b/tests/baselines/reference/exportsAndImports3.js @@ -13,10 +13,10 @@ export enum E { export const enum D { A, B, C } -export module M { +export namespace M { export var x; } -export module N { +export namespace N { export interface I { } } diff --git a/tests/baselines/reference/exportsAndImports3.symbols b/tests/baselines/reference/exportsAndImports3.symbols index 8b3723207a476..9bbf05f356770 100644 --- a/tests/baselines/reference/exportsAndImports3.symbols +++ b/tests/baselines/reference/exportsAndImports3.symbols @@ -29,17 +29,17 @@ export const enum D { >B : Symbol(D.B, Decl(t1.ts, 10, 6)) >C : Symbol(D.C, Decl(t1.ts, 10, 9)) } -export module M { +export namespace M { >M : Symbol(M, Decl(t1.ts, 11, 1)) export var x; >x : Symbol(x, Decl(t1.ts, 13, 14)) } -export module N { +export namespace N { >N : Symbol(N, Decl(t1.ts, 14, 1)) export interface I { ->I : Symbol(I, Decl(t1.ts, 15, 17)) +>I : Symbol(I, Decl(t1.ts, 15, 20)) } } export type T = number; diff --git a/tests/baselines/reference/exportsAndImports3.types b/tests/baselines/reference/exportsAndImports3.types index c228060b0bab8..6c2fed4ff6b84 100644 --- a/tests/baselines/reference/exportsAndImports3.types +++ b/tests/baselines/reference/exportsAndImports3.types @@ -41,14 +41,14 @@ export const enum D { >C : D.C > : ^^^ } -export module M { +export namespace M { >M : typeof M > : ^^^^^^^^ export var x; >x : any } -export module N { +export namespace N { export interface I { } } diff --git a/tests/baselines/reference/extBaseClass1.js b/tests/baselines/reference/extBaseClass1.js index ad32070d6e655..4f86d032ebe75 100644 --- a/tests/baselines/reference/extBaseClass1.js +++ b/tests/baselines/reference/extBaseClass1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/extBaseClass1.ts] //// //// [extBaseClass1.ts] -module M { +namespace M { export class B { public x=10; } @@ -10,12 +10,12 @@ module M { } } -module M { +namespace M { export class C2 extends B { } } -module N { +namespace N { export class C3 extends M.B { } } diff --git a/tests/baselines/reference/extBaseClass1.symbols b/tests/baselines/reference/extBaseClass1.symbols index b71ccce603b95..3c1b6102c95a4 100644 --- a/tests/baselines/reference/extBaseClass1.symbols +++ b/tests/baselines/reference/extBaseClass1.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/extBaseClass1.ts] //// === extBaseClass1.ts === -module M { +namespace M { >M : Symbol(M, Decl(extBaseClass1.ts, 0, 0), Decl(extBaseClass1.ts, 7, 1)) export class B { ->B : Symbol(B, Decl(extBaseClass1.ts, 0, 10)) +>B : Symbol(B, Decl(extBaseClass1.ts, 0, 13)) public x=10; >x : Symbol(B.x, Decl(extBaseClass1.ts, 1, 20)) @@ -13,27 +13,27 @@ module M { export class C extends B { >C : Symbol(C, Decl(extBaseClass1.ts, 3, 5)) ->B : Symbol(B, Decl(extBaseClass1.ts, 0, 10)) +>B : Symbol(B, Decl(extBaseClass1.ts, 0, 13)) } } -module M { +namespace M { >M : Symbol(M, Decl(extBaseClass1.ts, 0, 0), Decl(extBaseClass1.ts, 7, 1)) export class C2 extends B { ->C2 : Symbol(C2, Decl(extBaseClass1.ts, 9, 10)) ->B : Symbol(B, Decl(extBaseClass1.ts, 0, 10)) +>C2 : Symbol(C2, Decl(extBaseClass1.ts, 9, 13)) +>B : Symbol(B, Decl(extBaseClass1.ts, 0, 13)) } } -module N { +namespace N { >N : Symbol(N, Decl(extBaseClass1.ts, 12, 1)) export class C3 extends M.B { ->C3 : Symbol(C3, Decl(extBaseClass1.ts, 14, 10)) ->M.B : Symbol(M.B, Decl(extBaseClass1.ts, 0, 10)) +>C3 : Symbol(C3, Decl(extBaseClass1.ts, 14, 13)) +>M.B : Symbol(M.B, Decl(extBaseClass1.ts, 0, 13)) >M : Symbol(M, Decl(extBaseClass1.ts, 0, 0), Decl(extBaseClass1.ts, 7, 1)) ->B : Symbol(M.B, Decl(extBaseClass1.ts, 0, 10)) +>B : Symbol(M.B, Decl(extBaseClass1.ts, 0, 13)) } } diff --git a/tests/baselines/reference/extBaseClass1.types b/tests/baselines/reference/extBaseClass1.types index aeed2c78acb40..6f7e6b52a2ef2 100644 --- a/tests/baselines/reference/extBaseClass1.types +++ b/tests/baselines/reference/extBaseClass1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/extBaseClass1.ts] //// === extBaseClass1.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -24,7 +24,7 @@ module M { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -36,7 +36,7 @@ module M { } } -module N { +namespace N { >N : typeof N > : ^^^^^^^^ diff --git a/tests/baselines/reference/extBaseClass2.errors.txt b/tests/baselines/reference/extBaseClass2.errors.txt index 041ec321416c6..fa73e0d352967 100644 --- a/tests/baselines/reference/extBaseClass2.errors.txt +++ b/tests/baselines/reference/extBaseClass2.errors.txt @@ -3,14 +3,14 @@ extBaseClass2.ts(7,29): error TS2304: Cannot find name 'B'. ==== extBaseClass2.ts (2 errors) ==== - module N { + namespace N { export class C4 extends M.B { ~ !!! error TS2339: Property 'B' does not exist on type 'typeof M'. } } - module M { + namespace M { export class C5 extends B { ~ !!! error TS2304: Cannot find name 'B'. diff --git a/tests/baselines/reference/extBaseClass2.js b/tests/baselines/reference/extBaseClass2.js index 30bf5091018be..a1da070040b55 100644 --- a/tests/baselines/reference/extBaseClass2.js +++ b/tests/baselines/reference/extBaseClass2.js @@ -1,12 +1,12 @@ //// [tests/cases/compiler/extBaseClass2.ts] //// //// [extBaseClass2.ts] -module N { +namespace N { export class C4 extends M.B { } } -module M { +namespace M { export class C5 extends B { } } diff --git a/tests/baselines/reference/extBaseClass2.symbols b/tests/baselines/reference/extBaseClass2.symbols index 4fbda932610cc..c12692ba2c08c 100644 --- a/tests/baselines/reference/extBaseClass2.symbols +++ b/tests/baselines/reference/extBaseClass2.symbols @@ -1,20 +1,20 @@ //// [tests/cases/compiler/extBaseClass2.ts] //// === extBaseClass2.ts === -module N { +namespace N { >N : Symbol(N, Decl(extBaseClass2.ts, 0, 0)) export class C4 extends M.B { ->C4 : Symbol(C4, Decl(extBaseClass2.ts, 0, 10)) +>C4 : Symbol(C4, Decl(extBaseClass2.ts, 0, 13)) >M : Symbol(M, Decl(extBaseClass2.ts, 3, 1)) } } -module M { +namespace M { >M : Symbol(M, Decl(extBaseClass2.ts, 3, 1)) export class C5 extends B { ->C5 : Symbol(C5, Decl(extBaseClass2.ts, 5, 10)) +>C5 : Symbol(C5, Decl(extBaseClass2.ts, 5, 13)) } } diff --git a/tests/baselines/reference/extBaseClass2.types b/tests/baselines/reference/extBaseClass2.types index cf709bdc44564..dbdb3a51be83f 100644 --- a/tests/baselines/reference/extBaseClass2.types +++ b/tests/baselines/reference/extBaseClass2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/extBaseClass2.ts] //// === extBaseClass2.ts === -module N { +namespace N { >N : typeof N > : ^^^^^^^^ @@ -17,7 +17,7 @@ module N { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/extendArray.errors.txt b/tests/baselines/reference/extendArray.errors.txt index a989fcae00b96..b27c9c3e091cb 100644 --- a/tests/baselines/reference/extendArray.errors.txt +++ b/tests/baselines/reference/extendArray.errors.txt @@ -7,7 +7,7 @@ extendArray.ts(7,32): error TS2552: Cannot find name '_element'. Did you mean 'E a.forEach(function (v,i,a) {}); - declare module _Core { + declare namespace _Core { interface Array { collect(fn:(e:_element) => _element[]) : any[]; ~~~~~~~~ diff --git a/tests/baselines/reference/extendArray.js b/tests/baselines/reference/extendArray.js index d81963367a691..07176dcbf653c 100644 --- a/tests/baselines/reference/extendArray.js +++ b/tests/baselines/reference/extendArray.js @@ -5,7 +5,7 @@ var a = [1,2]; a.forEach(function (v,i,a) {}); -declare module _Core { +declare namespace _Core { interface Array { collect(fn:(e:_element) => _element[]) : any[]; } diff --git a/tests/baselines/reference/extendArray.symbols b/tests/baselines/reference/extendArray.symbols index eb0f05b921523..d55807cbd6dda 100644 --- a/tests/baselines/reference/extendArray.symbols +++ b/tests/baselines/reference/extendArray.symbols @@ -13,11 +13,11 @@ a.forEach(function (v,i,a) {}); >a : Symbol(a, Decl(extendArray.ts, 1, 24)) -declare module _Core { +declare namespace _Core { >_Core : Symbol(_Core, Decl(extendArray.ts, 1, 31)) interface Array { ->Array : Symbol(Array, Decl(extendArray.ts, 4, 22)) +>Array : Symbol(Array, Decl(extendArray.ts, 4, 25)) collect(fn:(e:_element) => _element[]) : any[]; >collect : Symbol(Array.collect, Decl(extendArray.ts, 5, 19)) diff --git a/tests/baselines/reference/extendArray.types b/tests/baselines/reference/extendArray.types index 0cc9fc76332e3..0258e2542e4cf 100644 --- a/tests/baselines/reference/extendArray.types +++ b/tests/baselines/reference/extendArray.types @@ -30,7 +30,7 @@ a.forEach(function (v,i,a) {}); > : ^^^^^^^^ -declare module _Core { +declare namespace _Core { interface Array { collect(fn:(e:_element) => _element[]) : any[]; >collect : (fn: (e: _element) => _element[]) => any[] diff --git a/tests/baselines/reference/extension.errors.txt b/tests/baselines/reference/extension.errors.txt index 9b1d5d7f597e6..bb8a3221dd52b 100644 --- a/tests/baselines/reference/extension.errors.txt +++ b/tests/baselines/reference/extension.errors.txt @@ -15,7 +15,7 @@ extension.ts(22,3): error TS2339: Property 'pe' does not exist on type 'C'. y; } - declare module M { + declare namespace M { export class C { ~ !!! error TS2300: Duplicate identifier 'C'. @@ -23,7 +23,7 @@ extension.ts(22,3): error TS2339: Property 'pe' does not exist on type 'C'. } } - declare module M { + declare namespace M { export extension class C { ~~~~~~ !!! error TS1128: Declaration or statement expected. diff --git a/tests/baselines/reference/extension.js b/tests/baselines/reference/extension.js index 0ab6c8d160c24..e4c7881afc629 100644 --- a/tests/baselines/reference/extension.js +++ b/tests/baselines/reference/extension.js @@ -9,13 +9,13 @@ interface I { y; } -declare module M { +declare namespace M { export class C { public p:number; } } -declare module M { +declare namespace M { export extension class C { public pe:string; } diff --git a/tests/baselines/reference/extension.symbols b/tests/baselines/reference/extension.symbols index 56ea60ee49272..7a565d5e6bf60 100644 --- a/tests/baselines/reference/extension.symbols +++ b/tests/baselines/reference/extension.symbols @@ -15,18 +15,18 @@ interface I { >y : Symbol(I.y, Decl(extension.ts, 4, 13)) } -declare module M { +declare namespace M { >M : Symbol(M, Decl(extension.ts, 6, 1), Decl(extension.ts, 12, 1)) export class C { ->C : Symbol(C, Decl(extension.ts, 8, 18)) +>C : Symbol(C, Decl(extension.ts, 8, 21)) public p:number; >p : Symbol(C.p, Decl(extension.ts, 9, 20)) } } -declare module M { +declare namespace M { >M : Symbol(M, Decl(extension.ts, 6, 1), Decl(extension.ts, 12, 1)) export extension class C { @@ -39,9 +39,9 @@ declare module M { var c=new M.C(); >c : Symbol(c, Decl(extension.ts, 20, 3)) ->M.C : Symbol(M.C, Decl(extension.ts, 8, 18)) +>M.C : Symbol(M.C, Decl(extension.ts, 8, 21)) >M : Symbol(M, Decl(extension.ts, 6, 1), Decl(extension.ts, 12, 1)) ->C : Symbol(M.C, Decl(extension.ts, 8, 18)) +>C : Symbol(M.C, Decl(extension.ts, 8, 21)) c.pe; >c : Symbol(c, Decl(extension.ts, 20, 3)) diff --git a/tests/baselines/reference/extension.types b/tests/baselines/reference/extension.types index caa37750e6c68..556e869ac6647 100644 --- a/tests/baselines/reference/extension.types +++ b/tests/baselines/reference/extension.types @@ -13,7 +13,7 @@ interface I { > : ^^^ } -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ @@ -27,7 +27,7 @@ declare module M { } } -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/externModuleClobber.js b/tests/baselines/reference/externModuleClobber.js index cfde9f462be94..4b470f430ec8b 100644 --- a/tests/baselines/reference/externModuleClobber.js +++ b/tests/baselines/reference/externModuleClobber.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/externModuleClobber.ts] //// //// [externModuleClobber.ts] -declare module EM { +declare namespace EM { export class Position { } export class EC { diff --git a/tests/baselines/reference/externModuleClobber.symbols b/tests/baselines/reference/externModuleClobber.symbols index 8d166a0104bfc..b373edac17266 100644 --- a/tests/baselines/reference/externModuleClobber.symbols +++ b/tests/baselines/reference/externModuleClobber.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/externModuleClobber.ts] //// === externModuleClobber.ts === -declare module EM { +declare namespace EM { >EM : Symbol(EM, Decl(externModuleClobber.ts, 0, 0)) export class Position { } ->Position : Symbol(Position, Decl(externModuleClobber.ts, 0, 19)) +>Position : Symbol(Position, Decl(externModuleClobber.ts, 0, 22)) export class EC { >EC : Symbol(EC, Decl(externModuleClobber.ts, 1, 26)) @@ -13,14 +13,14 @@ declare module EM { public getPosition() : EM.Position; >getPosition : Symbol(EC.getPosition, Decl(externModuleClobber.ts, 3, 18)) >EM : Symbol(EM, Decl(externModuleClobber.ts, 0, 0)) ->Position : Symbol(Position, Decl(externModuleClobber.ts, 0, 19)) +>Position : Symbol(Position, Decl(externModuleClobber.ts, 0, 22)) } } var x:EM.Position; >x : Symbol(x, Decl(externModuleClobber.ts, 8, 3)) >EM : Symbol(EM, Decl(externModuleClobber.ts, 0, 0)) ->Position : Symbol(EM.Position, Decl(externModuleClobber.ts, 0, 19)) +>Position : Symbol(EM.Position, Decl(externModuleClobber.ts, 0, 22)) var ec:EM.EC = new EM.EC(); >ec : Symbol(ec, Decl(externModuleClobber.ts, 9, 3)) diff --git a/tests/baselines/reference/externModuleClobber.types b/tests/baselines/reference/externModuleClobber.types index 331237e404fc2..900fe2e1d186f 100644 --- a/tests/baselines/reference/externModuleClobber.types +++ b/tests/baselines/reference/externModuleClobber.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/externModuleClobber.ts] //// === externModuleClobber.ts === -declare module EM { +declare namespace EM { >EM : typeof EM > : ^^^^^^^^^ diff --git a/tests/baselines/reference/externSyntax.errors.txt b/tests/baselines/reference/externSyntax.errors.txt index 561dcf62ecad8..77f2412e92e1d 100644 --- a/tests/baselines/reference/externSyntax.errors.txt +++ b/tests/baselines/reference/externSyntax.errors.txt @@ -3,7 +3,7 @@ externSyntax.ts(8,20): error TS1183: An implementation cannot be declared in amb ==== externSyntax.ts (1 errors) ==== declare var v; - declare module M { + declare namespace M { export class D { public p; } diff --git a/tests/baselines/reference/externSyntax.js b/tests/baselines/reference/externSyntax.js index 55221e687cf3d..e35cb9574e8ff 100644 --- a/tests/baselines/reference/externSyntax.js +++ b/tests/baselines/reference/externSyntax.js @@ -2,7 +2,7 @@ //// [externSyntax.ts] declare var v; -declare module M { +declare namespace M { export class D { public p; } diff --git a/tests/baselines/reference/externSyntax.symbols b/tests/baselines/reference/externSyntax.symbols index 051390ae80860..2419c3ecfeca6 100644 --- a/tests/baselines/reference/externSyntax.symbols +++ b/tests/baselines/reference/externSyntax.symbols @@ -4,11 +4,11 @@ declare var v; >v : Symbol(v, Decl(externSyntax.ts, 0, 11)) -declare module M { +declare namespace M { >M : Symbol(M, Decl(externSyntax.ts, 0, 14)) export class D { ->D : Symbol(D, Decl(externSyntax.ts, 1, 18)) +>D : Symbol(D, Decl(externSyntax.ts, 1, 21)) public p; >p : Symbol(D.p, Decl(externSyntax.ts, 2, 20)) diff --git a/tests/baselines/reference/externSyntax.types b/tests/baselines/reference/externSyntax.types index ceaa615ed293a..35f6040381571 100644 --- a/tests/baselines/reference/externSyntax.types +++ b/tests/baselines/reference/externSyntax.types @@ -5,7 +5,7 @@ declare var v; >v : any > : ^^^ -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/externalModuleResolution.js b/tests/baselines/reference/externalModuleResolution.js index 1e437ea1eb0a0..babf4aae86177 100644 --- a/tests/baselines/reference/externalModuleResolution.js +++ b/tests/baselines/reference/externalModuleResolution.js @@ -1,13 +1,13 @@ //// [tests/cases/compiler/externalModuleResolution.ts] //// //// [foo.d.ts] -declare module M1 { +declare namespace M1 { export var X:number; } export = M1 //// [foo.ts] -module M2 { +namespace M2 { export var Y = 1; } export = M2 diff --git a/tests/baselines/reference/externalModuleResolution.symbols b/tests/baselines/reference/externalModuleResolution.symbols index 893211af185e1..27645032542c5 100644 --- a/tests/baselines/reference/externalModuleResolution.symbols +++ b/tests/baselines/reference/externalModuleResolution.symbols @@ -10,7 +10,7 @@ x.Y // .ts should be picked >Y : Symbol(x.Y, Decl(foo.ts, 1, 14)) === foo.ts === -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(foo.ts, 0, 0)) export var Y = 1; diff --git a/tests/baselines/reference/externalModuleResolution.types b/tests/baselines/reference/externalModuleResolution.types index 9d37bd15acd40..38e9407430b80 100644 --- a/tests/baselines/reference/externalModuleResolution.types +++ b/tests/baselines/reference/externalModuleResolution.types @@ -14,7 +14,7 @@ x.Y // .ts should be picked > : ^^^^^^ === foo.ts === -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/externalModuleResolution2.js b/tests/baselines/reference/externalModuleResolution2.js index eb6b81a2ad27c..61d2330fe2604 100644 --- a/tests/baselines/reference/externalModuleResolution2.js +++ b/tests/baselines/reference/externalModuleResolution2.js @@ -1,13 +1,13 @@ //// [tests/cases/compiler/externalModuleResolution2.ts] //// //// [foo.ts] -module M2 { +namespace M2 { export var X = 1; } export = M2 //// [foo.d.ts] -declare module M1 { +declare namespace M1 { export var Y:number; } export = M1 diff --git a/tests/baselines/reference/externalModuleResolution2.symbols b/tests/baselines/reference/externalModuleResolution2.symbols index 35a938ec36043..d9e72754829b3 100644 --- a/tests/baselines/reference/externalModuleResolution2.symbols +++ b/tests/baselines/reference/externalModuleResolution2.symbols @@ -10,7 +10,7 @@ x.X // .ts should be picked >X : Symbol(x.X, Decl(foo.ts, 1, 14)) === foo.ts === -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(foo.ts, 0, 0)) export var X = 1; diff --git a/tests/baselines/reference/externalModuleResolution2.types b/tests/baselines/reference/externalModuleResolution2.types index e29ed94f2e780..a4b7d88a3427c 100644 --- a/tests/baselines/reference/externalModuleResolution2.types +++ b/tests/baselines/reference/externalModuleResolution2.types @@ -14,7 +14,7 @@ x.X // .ts should be picked > : ^^^^^^ === foo.ts === -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.js b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.js index 47b09ef9ace3d..f6a475ce699d0 100644 --- a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.js +++ b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.js @@ -2,7 +2,7 @@ //// [externalModuleWithoutCompilerFlag1.ts] // Not on line 0 because we want to verify the error is placed in the appropriate location. - export module M { + export namespace M { } //// [externalModuleWithoutCompilerFlag1.js] diff --git a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.symbols b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.symbols index 4e2d79f4fa9c5..7e17dc5da182d 100644 --- a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.symbols +++ b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.symbols @@ -2,6 +2,6 @@ === externalModuleWithoutCompilerFlag1.ts === // Not on line 0 because we want to verify the error is placed in the appropriate location. - export module M { + export namespace M { >M : Symbol(M, Decl(externalModuleWithoutCompilerFlag1.ts, 0, 0)) } diff --git a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.types b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.types index c6d1da659e536..fccd8e7fafa1e 100644 --- a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.types +++ b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.types @@ -3,5 +3,5 @@ === externalModuleWithoutCompilerFlag1.ts === // Not on line 0 because we want to verify the error is placed in the appropriate location. - export module M { + export namespace M { } diff --git a/tests/baselines/reference/fatArrowSelf.js b/tests/baselines/reference/fatArrowSelf.js index 911ac8126ac00..df7deca2e2345 100644 --- a/tests/baselines/reference/fatArrowSelf.js +++ b/tests/baselines/reference/fatArrowSelf.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/fatArrowSelf.ts] //// //// [fatArrowSelf.ts] -module Events { +namespace Events { export interface ListenerCallback { (value:any):void; } @@ -11,7 +11,7 @@ module Events { } } -module Consumer { +namespace Consumer { class EventEmitterConsummer { constructor (private emitter: Events.EventEmitter) { } diff --git a/tests/baselines/reference/fatArrowSelf.symbols b/tests/baselines/reference/fatArrowSelf.symbols index 663c5148c677d..7e864288d41a4 100644 --- a/tests/baselines/reference/fatArrowSelf.symbols +++ b/tests/baselines/reference/fatArrowSelf.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/fatArrowSelf.ts] //// === fatArrowSelf.ts === -module Events { +namespace Events { >Events : Symbol(Events, Decl(fatArrowSelf.ts, 0, 0)) export interface ListenerCallback { ->ListenerCallback : Symbol(ListenerCallback, Decl(fatArrowSelf.ts, 0, 15)) +>ListenerCallback : Symbol(ListenerCallback, Decl(fatArrowSelf.ts, 0, 18)) (value:any):void; >value : Symbol(value, Decl(fatArrowSelf.ts, 2, 9)) @@ -17,16 +17,16 @@ module Events { >addListener : Symbol(EventEmitter.addListener, Decl(fatArrowSelf.ts, 4, 31)) >type : Symbol(type, Decl(fatArrowSelf.ts, 5, 28)) >listener : Symbol(listener, Decl(fatArrowSelf.ts, 5, 40)) ->ListenerCallback : Symbol(ListenerCallback, Decl(fatArrowSelf.ts, 0, 15)) +>ListenerCallback : Symbol(ListenerCallback, Decl(fatArrowSelf.ts, 0, 18)) } } } -module Consumer { +namespace Consumer { >Consumer : Symbol(Consumer, Decl(fatArrowSelf.ts, 8, 1)) class EventEmitterConsummer { ->EventEmitterConsummer : Symbol(EventEmitterConsummer, Decl(fatArrowSelf.ts, 10, 17)) +>EventEmitterConsummer : Symbol(EventEmitterConsummer, Decl(fatArrowSelf.ts, 10, 20)) constructor (private emitter: Events.EventEmitter) { } >emitter : Symbol(EventEmitterConsummer.emitter, Decl(fatArrowSelf.ts, 12, 21)) @@ -39,14 +39,14 @@ module Consumer { this.emitter.addListener('change', (e) => { >this.emitter.addListener : Symbol(Events.EventEmitter.addListener, Decl(fatArrowSelf.ts, 4, 31)) >this.emitter : Symbol(EventEmitterConsummer.emitter, Decl(fatArrowSelf.ts, 12, 21)) ->this : Symbol(EventEmitterConsummer, Decl(fatArrowSelf.ts, 10, 17)) +>this : Symbol(EventEmitterConsummer, Decl(fatArrowSelf.ts, 10, 20)) >emitter : Symbol(EventEmitterConsummer.emitter, Decl(fatArrowSelf.ts, 12, 21)) >addListener : Symbol(Events.EventEmitter.addListener, Decl(fatArrowSelf.ts, 4, 31)) >e : Symbol(e, Decl(fatArrowSelf.ts, 15, 48)) this.changed(); >this.changed : Symbol(EventEmitterConsummer.changed, Decl(fatArrowSelf.ts, 18, 9)) ->this : Symbol(EventEmitterConsummer, Decl(fatArrowSelf.ts, 10, 17)) +>this : Symbol(EventEmitterConsummer, Decl(fatArrowSelf.ts, 10, 20)) >changed : Symbol(EventEmitterConsummer.changed, Decl(fatArrowSelf.ts, 18, 9)) }); diff --git a/tests/baselines/reference/fatArrowSelf.types b/tests/baselines/reference/fatArrowSelf.types index 3df444eebca09..64ba155837c42 100644 --- a/tests/baselines/reference/fatArrowSelf.types +++ b/tests/baselines/reference/fatArrowSelf.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/fatArrowSelf.ts] //// === fatArrowSelf.ts === -module Events { +namespace Events { >Events : typeof Events > : ^^^^^^^^^^^^^ @@ -24,7 +24,7 @@ module Events { } } -module Consumer { +namespace Consumer { >Consumer : typeof Consumer > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/for-inStatements.errors.txt b/tests/baselines/reference/for-inStatements.errors.txt index 530e47fd2f89c..c95618957c8f0 100644 --- a/tests/baselines/reference/for-inStatements.errors.txt +++ b/tests/baselines/reference/for-inStatements.errors.txt @@ -85,7 +85,7 @@ for-inStatements.ts(79,15): error TS2407: The right-hand side of a 'for...in' st for (var x in i[42]) { } - module M { + namespace M { export class X { name:string } diff --git a/tests/baselines/reference/for-inStatements.js b/tests/baselines/reference/for-inStatements.js index 7ecc4c81cab80..ae56b1816bad6 100644 --- a/tests/baselines/reference/for-inStatements.js +++ b/tests/baselines/reference/for-inStatements.js @@ -67,7 +67,7 @@ var i: I; for (var x in i[42]) { } -module M { +namespace M { export class X { name:string } diff --git a/tests/baselines/reference/for-inStatements.symbols b/tests/baselines/reference/for-inStatements.symbols index ae7498534c454..301d20e16f99c 100644 --- a/tests/baselines/reference/for-inStatements.symbols +++ b/tests/baselines/reference/for-inStatements.symbols @@ -194,11 +194,11 @@ for (var x in i[42]) { } >i : Symbol(i, Decl(for-inStatements.ts, 61, 3)) -module M { +namespace M { >M : Symbol(M, Decl(for-inStatements.ts, 63, 24)) export class X { ->X : Symbol(X, Decl(for-inStatements.ts, 66, 10)) +>X : Symbol(X, Decl(for-inStatements.ts, 66, 13)) >T : Symbol(T, Decl(for-inStatements.ts, 67, 19)) name:string @@ -212,9 +212,9 @@ for (var x in M) { } for (var x in M.X) { } >x : Symbol(x, Decl(for-inStatements.ts, 6, 8), Decl(for-inStatements.ts, 7, 8), Decl(for-inStatements.ts, 8, 8), Decl(for-inStatements.ts, 11, 8), Decl(for-inStatements.ts, 13, 8) ... and 14 more) ->M.X : Symbol(M.X, Decl(for-inStatements.ts, 66, 10)) +>M.X : Symbol(M.X, Decl(for-inStatements.ts, 66, 13)) >M : Symbol(M, Decl(for-inStatements.ts, 63, 24)) ->X : Symbol(M.X, Decl(for-inStatements.ts, 66, 10)) +>X : Symbol(M.X, Decl(for-inStatements.ts, 66, 13)) enum Color { Red, Blue } >Color : Symbol(Color, Decl(for-inStatements.ts, 73, 22)) diff --git a/tests/baselines/reference/for-inStatements.types b/tests/baselines/reference/for-inStatements.types index da400d9d5a23e..c17b6f315bad3 100644 --- a/tests/baselines/reference/for-inStatements.types +++ b/tests/baselines/reference/for-inStatements.types @@ -350,7 +350,7 @@ for (var x in i[42]) { } > : ^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/forInModule.js b/tests/baselines/reference/forInModule.js index 897dedf336aff..de658b57e6d58 100644 --- a/tests/baselines/reference/forInModule.js +++ b/tests/baselines/reference/forInModule.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/forInModule.ts] //// //// [forInModule.ts] -module Foo { +namespace Foo { for (var i = 0; i < 1; i++) { i+i; } diff --git a/tests/baselines/reference/forInModule.symbols b/tests/baselines/reference/forInModule.symbols index 13a9f2e989a0e..c881802d4e3fb 100644 --- a/tests/baselines/reference/forInModule.symbols +++ b/tests/baselines/reference/forInModule.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/forInModule.ts] //// === forInModule.ts === -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(forInModule.ts, 0, 0)) for (var i = 0; i < 1; i++) { diff --git a/tests/baselines/reference/forInModule.types b/tests/baselines/reference/forInModule.types index bdd14edf97bed..fb313e13603da 100644 --- a/tests/baselines/reference/forInModule.types +++ b/tests/baselines/reference/forInModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/forInModule.ts] //// === forInModule.ts === -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/forStatements.js b/tests/baselines/reference/forStatements.js index 33c90dba41d31..f8fea59fec9ca 100644 --- a/tests/baselines/reference/forStatements.js +++ b/tests/baselines/reference/forStatements.js @@ -17,7 +17,7 @@ class D{ function F(x: string): number { return 42; } -module M { +namespace M { export class A { name: string; } diff --git a/tests/baselines/reference/forStatements.symbols b/tests/baselines/reference/forStatements.symbols index c914a38b73356..2118568b8a3b7 100644 --- a/tests/baselines/reference/forStatements.symbols +++ b/tests/baselines/reference/forStatements.symbols @@ -40,11 +40,11 @@ function F(x: string): number { return 42; } >F : Symbol(F, Decl(forStatements.ts, 12, 1)) >x : Symbol(x, Decl(forStatements.ts, 14, 11)) -module M { +namespace M { >M : Symbol(M, Decl(forStatements.ts, 14, 44)) export class A { ->A : Symbol(A, Decl(forStatements.ts, 16, 10)) +>A : Symbol(A, Decl(forStatements.ts, 16, 13)) name: string; >name : Symbol(A.name, Decl(forStatements.ts, 17, 20)) @@ -133,10 +133,10 @@ for(var aModule: typeof M = M;;){} for(var aClassInModule: M.A = new M.A();;){} >aClassInModule : Symbol(aClassInModule, Decl(forStatements.ts, 44, 7)) >M : Symbol(M, Decl(forStatements.ts, 14, 44)) ->A : Symbol(M.A, Decl(forStatements.ts, 16, 10)) ->M.A : Symbol(M.A, Decl(forStatements.ts, 16, 10)) +>A : Symbol(M.A, Decl(forStatements.ts, 16, 13)) +>M.A : Symbol(M.A, Decl(forStatements.ts, 16, 13)) >M : Symbol(M, Decl(forStatements.ts, 14, 44)) ->A : Symbol(M.A, Decl(forStatements.ts, 16, 10)) +>A : Symbol(M.A, Decl(forStatements.ts, 16, 13)) for(var aFunctionInModule: typeof M.F2 = (x) => 'this is a string';;){} >aFunctionInModule : Symbol(aFunctionInModule, Decl(forStatements.ts, 45, 7)) diff --git a/tests/baselines/reference/forStatements.types b/tests/baselines/reference/forStatements.types index 2d9fdfc3b34bc..8bf35a5f58d10 100644 --- a/tests/baselines/reference/forStatements.types +++ b/tests/baselines/reference/forStatements.types @@ -41,7 +41,7 @@ function F(x: string): number { return 42; } >42 : 42 > : ^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/forStatementsMultipleInvalidDecl.errors.txt b/tests/baselines/reference/forStatementsMultipleInvalidDecl.errors.txt index 8eb8b69489c33..4c7971e61c89f 100644 --- a/tests/baselines/reference/forStatementsMultipleInvalidDecl.errors.txt +++ b/tests/baselines/reference/forStatementsMultipleInvalidDecl.errors.txt @@ -34,7 +34,7 @@ forStatementsMultipleInvalidDecl.ts(53,10): error TS2403: Subsequent variable de function F(x: string): number { return 42; } - module M { + namespace M { export class A { name: string; } diff --git a/tests/baselines/reference/forStatementsMultipleInvalidDecl.js b/tests/baselines/reference/forStatementsMultipleInvalidDecl.js index 4f20bcc7d0439..f9ffc3205377f 100644 --- a/tests/baselines/reference/forStatementsMultipleInvalidDecl.js +++ b/tests/baselines/reference/forStatementsMultipleInvalidDecl.js @@ -22,7 +22,7 @@ class D{ function F(x: string): number { return 42; } -module M { +namespace M { export class A { name: string; } diff --git a/tests/baselines/reference/forStatementsMultipleInvalidDecl.symbols b/tests/baselines/reference/forStatementsMultipleInvalidDecl.symbols index 815722b2a346d..c2a6bef62def9 100644 --- a/tests/baselines/reference/forStatementsMultipleInvalidDecl.symbols +++ b/tests/baselines/reference/forStatementsMultipleInvalidDecl.symbols @@ -51,11 +51,11 @@ function F(x: string): number { return 42; } >F : Symbol(F, Decl(forStatementsMultipleInvalidDecl.ts, 17, 1)) >x : Symbol(x, Decl(forStatementsMultipleInvalidDecl.ts, 19, 11)) -module M { +namespace M { >M : Symbol(M, Decl(forStatementsMultipleInvalidDecl.ts, 19, 44)) export class A { ->A : Symbol(A, Decl(forStatementsMultipleInvalidDecl.ts, 21, 10)) +>A : Symbol(A, Decl(forStatementsMultipleInvalidDecl.ts, 21, 13)) name: string; >name : Symbol(A.name, Decl(forStatementsMultipleInvalidDecl.ts, 22, 20)) @@ -138,7 +138,7 @@ for(var m: typeof M;;){} for( var m = M.A;;){} >m : Symbol(m, Decl(forStatementsMultipleInvalidDecl.ts, 51, 7), Decl(forStatementsMultipleInvalidDecl.ts, 52, 8)) ->M.A : Symbol(M.A, Decl(forStatementsMultipleInvalidDecl.ts, 21, 10)) +>M.A : Symbol(M.A, Decl(forStatementsMultipleInvalidDecl.ts, 21, 13)) >M : Symbol(M, Decl(forStatementsMultipleInvalidDecl.ts, 19, 44)) ->A : Symbol(M.A, Decl(forStatementsMultipleInvalidDecl.ts, 21, 10)) +>A : Symbol(M.A, Decl(forStatementsMultipleInvalidDecl.ts, 21, 13)) diff --git a/tests/baselines/reference/forStatementsMultipleInvalidDecl.types b/tests/baselines/reference/forStatementsMultipleInvalidDecl.types index 018d46d9e1f64..70b597b3dc3c0 100644 --- a/tests/baselines/reference/forStatementsMultipleInvalidDecl.types +++ b/tests/baselines/reference/forStatementsMultipleInvalidDecl.types @@ -56,7 +56,7 @@ function F(x: string): number { return 42; } >42 : 42 > : ^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/forgottenNew.errors.txt b/tests/baselines/reference/forgottenNew.errors.txt index aaa789b259c71..33c94e8ce2e62 100644 --- a/tests/baselines/reference/forgottenNew.errors.txt +++ b/tests/baselines/reference/forgottenNew.errors.txt @@ -2,7 +2,7 @@ forgottenNew.ts(5,14): error TS2348: Value of type 'typeof NullLogger' is not ca ==== forgottenNew.ts (1 errors) ==== - module Tools { + namespace Tools { export class NullLogger { } } diff --git a/tests/baselines/reference/forgottenNew.js b/tests/baselines/reference/forgottenNew.js index 6d7c411932b30..b7f93c0fa7c1b 100644 --- a/tests/baselines/reference/forgottenNew.js +++ b/tests/baselines/reference/forgottenNew.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/expressions/functionCalls/forgottenNew.ts] //// //// [forgottenNew.ts] -module Tools { +namespace Tools { export class NullLogger { } } diff --git a/tests/baselines/reference/forgottenNew.symbols b/tests/baselines/reference/forgottenNew.symbols index 4ddd8d1761a53..ec50ffa5d3149 100644 --- a/tests/baselines/reference/forgottenNew.symbols +++ b/tests/baselines/reference/forgottenNew.symbols @@ -1,16 +1,16 @@ //// [tests/cases/conformance/expressions/functionCalls/forgottenNew.ts] //// === forgottenNew.ts === -module Tools { +namespace Tools { >Tools : Symbol(Tools, Decl(forgottenNew.ts, 0, 0)) export class NullLogger { } ->NullLogger : Symbol(NullLogger, Decl(forgottenNew.ts, 0, 14)) +>NullLogger : Symbol(NullLogger, Decl(forgottenNew.ts, 0, 17)) } var logger = Tools.NullLogger(); >logger : Symbol(logger, Decl(forgottenNew.ts, 4, 3)) ->Tools.NullLogger : Symbol(Tools.NullLogger, Decl(forgottenNew.ts, 0, 14)) +>Tools.NullLogger : Symbol(Tools.NullLogger, Decl(forgottenNew.ts, 0, 17)) >Tools : Symbol(Tools, Decl(forgottenNew.ts, 0, 0)) ->NullLogger : Symbol(Tools.NullLogger, Decl(forgottenNew.ts, 0, 14)) +>NullLogger : Symbol(Tools.NullLogger, Decl(forgottenNew.ts, 0, 17)) diff --git a/tests/baselines/reference/forgottenNew.types b/tests/baselines/reference/forgottenNew.types index 22cb6f1e3422c..bfbcb4f132cb7 100644 --- a/tests/baselines/reference/forgottenNew.types +++ b/tests/baselines/reference/forgottenNew.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/expressions/functionCalls/forgottenNew.ts] //// === forgottenNew.ts === -module Tools { +namespace Tools { >Tools : typeof Tools > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/funClodule.errors.txt b/tests/baselines/reference/funClodule.errors.txt index 7bdb4d0311a0b..c2bdb9ac4f052 100644 --- a/tests/baselines/reference/funClodule.errors.txt +++ b/tests/baselines/reference/funClodule.errors.txt @@ -4,14 +4,14 @@ funClodule.ts(19,7): error TS2813: Class declaration cannot implement overload l ==== funClodule.ts (2 errors) ==== declare function foo(); - declare module foo { + declare namespace foo { export function x(): any; } declare class foo { } // Should error declare class foo2 { } - declare module foo2 { + declare namespace foo2 { export function x(): any; } declare function foo2(); // Should error @@ -21,7 +21,7 @@ funClodule.ts(19,7): error TS2813: Class declaration cannot implement overload l ~~~~ !!! error TS2814: Function with bodies can only merge with classes that are ambient. !!! related TS6506 funClodule.ts:19:7: Consider adding a 'declare' modifier to this class. - module foo3 { + namespace foo3 { export function x(): any { } } class foo3 { } // Should error diff --git a/tests/baselines/reference/funClodule.js b/tests/baselines/reference/funClodule.js index c5ed1dce8829d..4ec1a4543cc59 100644 --- a/tests/baselines/reference/funClodule.js +++ b/tests/baselines/reference/funClodule.js @@ -2,21 +2,21 @@ //// [funClodule.ts] declare function foo(); -declare module foo { +declare namespace foo { export function x(): any; } declare class foo { } // Should error declare class foo2 { } -declare module foo2 { +declare namespace foo2 { export function x(): any; } declare function foo2(); // Should error function foo3() { } -module foo3 { +namespace foo3 { export function x(): any { } } class foo3 { } // Should error diff --git a/tests/baselines/reference/funClodule.symbols b/tests/baselines/reference/funClodule.symbols index 3d5b751ec1d24..0009f3005db0c 100644 --- a/tests/baselines/reference/funClodule.symbols +++ b/tests/baselines/reference/funClodule.symbols @@ -4,11 +4,11 @@ declare function foo(); >foo : Symbol(foo, Decl(funClodule.ts, 0, 0), Decl(funClodule.ts, 0, 23), Decl(funClodule.ts, 3, 1)) -declare module foo { +declare namespace foo { >foo : Symbol(foo, Decl(funClodule.ts, 0, 0), Decl(funClodule.ts, 0, 23), Decl(funClodule.ts, 3, 1)) export function x(): any; ->x : Symbol(x, Decl(funClodule.ts, 1, 20)) +>x : Symbol(x, Decl(funClodule.ts, 1, 23)) } declare class foo { } // Should error >foo : Symbol(foo, Decl(funClodule.ts, 0, 0), Decl(funClodule.ts, 0, 23), Decl(funClodule.ts, 3, 1)) @@ -17,11 +17,11 @@ declare class foo { } // Should error declare class foo2 { } >foo2 : Symbol(foo2, Decl(funClodule.ts, 10, 1), Decl(funClodule.ts, 4, 21), Decl(funClodule.ts, 7, 22)) -declare module foo2 { +declare namespace foo2 { >foo2 : Symbol(foo2, Decl(funClodule.ts, 10, 1), Decl(funClodule.ts, 4, 21), Decl(funClodule.ts, 7, 22)) export function x(): any; ->x : Symbol(x, Decl(funClodule.ts, 8, 21)) +>x : Symbol(x, Decl(funClodule.ts, 8, 24)) } declare function foo2(); // Should error >foo2 : Symbol(foo2, Decl(funClodule.ts, 10, 1), Decl(funClodule.ts, 4, 21), Decl(funClodule.ts, 7, 22)) @@ -30,11 +30,11 @@ declare function foo2(); // Should error function foo3() { } >foo3 : Symbol(foo3, Decl(funClodule.ts, 11, 24), Decl(funClodule.ts, 14, 19), Decl(funClodule.ts, 17, 1)) -module foo3 { +namespace foo3 { >foo3 : Symbol(foo3, Decl(funClodule.ts, 11, 24), Decl(funClodule.ts, 14, 19), Decl(funClodule.ts, 17, 1)) export function x(): any { } ->x : Symbol(x, Decl(funClodule.ts, 15, 13)) +>x : Symbol(x, Decl(funClodule.ts, 15, 16)) } class foo3 { } // Should error >foo3 : Symbol(foo3, Decl(funClodule.ts, 11, 24), Decl(funClodule.ts, 14, 19), Decl(funClodule.ts, 17, 1)) diff --git a/tests/baselines/reference/funClodule.types b/tests/baselines/reference/funClodule.types index aab3057ba4b1c..5956501678935 100644 --- a/tests/baselines/reference/funClodule.types +++ b/tests/baselines/reference/funClodule.types @@ -5,7 +5,7 @@ declare function foo(); >foo : typeof foo > : ^^^^^^^^^^ -declare module foo { +declare namespace foo { >foo : typeof foo > : ^^^^^^^^^^ @@ -22,7 +22,7 @@ declare class foo2 { } >foo2 : foo2 > : ^^^^ -declare module foo2 { +declare namespace foo2 { >foo2 : typeof foo2 > : ^^^^^^^^^^^ @@ -39,7 +39,7 @@ function foo3() { } >foo3 : typeof foo3 > : ^^^^^^^^^^^ -module foo3 { +namespace foo3 { >foo3 : typeof foo3 > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/funcdecl.js b/tests/baselines/reference/funcdecl.js index 185f3b7d66e55..f42ffa5e4c5df 100644 --- a/tests/baselines/reference/funcdecl.js +++ b/tests/baselines/reference/funcdecl.js @@ -51,7 +51,7 @@ var withOverloadSignature = overload1; function f(n: () => void) { } -module m2 { +namespace m2 { export function foo(n: () => void ) { } diff --git a/tests/baselines/reference/funcdecl.symbols b/tests/baselines/reference/funcdecl.symbols index bc9b7afec3d06..fa48d4be7da09 100644 --- a/tests/baselines/reference/funcdecl.symbols +++ b/tests/baselines/reference/funcdecl.symbols @@ -114,20 +114,20 @@ function f(n: () => void) { } >f : Symbol(f, Decl(funcdecl.ts, 46, 38)) >n : Symbol(n, Decl(funcdecl.ts, 48, 11)) -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(funcdecl.ts, 48, 29)) export function foo(n: () => void ) { ->foo : Symbol(foo, Decl(funcdecl.ts, 50, 11)) +>foo : Symbol(foo, Decl(funcdecl.ts, 50, 14)) >n : Symbol(n, Decl(funcdecl.ts, 51, 24)) } } m2.foo(() => { ->m2.foo : Symbol(m2.foo, Decl(funcdecl.ts, 50, 11)) +>m2.foo : Symbol(m2.foo, Decl(funcdecl.ts, 50, 14)) >m2 : Symbol(m2, Decl(funcdecl.ts, 48, 29)) ->foo : Symbol(m2.foo, Decl(funcdecl.ts, 50, 11)) +>foo : Symbol(m2.foo, Decl(funcdecl.ts, 50, 14)) var b = 30; >b : Symbol(b, Decl(funcdecl.ts, 58, 7)) diff --git a/tests/baselines/reference/funcdecl.types b/tests/baselines/reference/funcdecl.types index 8e72055ce906e..10cd121cadca2 100644 --- a/tests/baselines/reference/funcdecl.types +++ b/tests/baselines/reference/funcdecl.types @@ -178,7 +178,7 @@ function f(n: () => void) { } >n : () => void > : ^^^^^^ -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/functionCall5.js b/tests/baselines/reference/functionCall5.js index d42651fcbc452..0912495d56181 100644 --- a/tests/baselines/reference/functionCall5.js +++ b/tests/baselines/reference/functionCall5.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/functionCall5.ts] //// //// [functionCall5.ts] -module m1 { export class c1 { public a; }} +namespace m1 { export class c1 { public a; }} function foo():m1.c1{return new m1.c1();}; var x = foo(); diff --git a/tests/baselines/reference/functionCall5.symbols b/tests/baselines/reference/functionCall5.symbols index 1f461ce409b22..8280e4b1731ba 100644 --- a/tests/baselines/reference/functionCall5.symbols +++ b/tests/baselines/reference/functionCall5.symbols @@ -1,20 +1,20 @@ //// [tests/cases/compiler/functionCall5.ts] //// === functionCall5.ts === -module m1 { export class c1 { public a; }} +namespace m1 { export class c1 { public a; }} >m1 : Symbol(m1, Decl(functionCall5.ts, 0, 0)) ->c1 : Symbol(c1, Decl(functionCall5.ts, 0, 11)) ->a : Symbol(c1.a, Decl(functionCall5.ts, 0, 29)) +>c1 : Symbol(c1, Decl(functionCall5.ts, 0, 14)) +>a : Symbol(c1.a, Decl(functionCall5.ts, 0, 32)) function foo():m1.c1{return new m1.c1();}; ->foo : Symbol(foo, Decl(functionCall5.ts, 0, 42)) +>foo : Symbol(foo, Decl(functionCall5.ts, 0, 45)) >m1 : Symbol(m1, Decl(functionCall5.ts, 0, 0)) ->c1 : Symbol(m1.c1, Decl(functionCall5.ts, 0, 11)) ->m1.c1 : Symbol(m1.c1, Decl(functionCall5.ts, 0, 11)) +>c1 : Symbol(m1.c1, Decl(functionCall5.ts, 0, 14)) +>m1.c1 : Symbol(m1.c1, Decl(functionCall5.ts, 0, 14)) >m1 : Symbol(m1, Decl(functionCall5.ts, 0, 0)) ->c1 : Symbol(m1.c1, Decl(functionCall5.ts, 0, 11)) +>c1 : Symbol(m1.c1, Decl(functionCall5.ts, 0, 14)) var x = foo(); >x : Symbol(x, Decl(functionCall5.ts, 2, 3)) ->foo : Symbol(foo, Decl(functionCall5.ts, 0, 42)) +>foo : Symbol(foo, Decl(functionCall5.ts, 0, 45)) diff --git a/tests/baselines/reference/functionCall5.types b/tests/baselines/reference/functionCall5.types index 0c9357f8a0786..2772fb0d5d8ed 100644 --- a/tests/baselines/reference/functionCall5.types +++ b/tests/baselines/reference/functionCall5.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/functionCall5.ts] //// === functionCall5.ts === -module m1 { export class c1 { public a; }} +namespace m1 { export class c1 { public a; }} >m1 : typeof m1 > : ^^^^^^^^^ >c1 : c1 diff --git a/tests/baselines/reference/functionCall7.errors.txt b/tests/baselines/reference/functionCall7.errors.txt index b1bfd014fd335..2d0742857a228 100644 --- a/tests/baselines/reference/functionCall7.errors.txt +++ b/tests/baselines/reference/functionCall7.errors.txt @@ -4,7 +4,7 @@ functionCall7.ts(7,1): error TS2554: Expected 1 arguments, but got 0. ==== functionCall7.ts (3 errors) ==== - module m1 { export class c1 { public a; }} + namespace m1 { export class c1 { public a; }} function foo(a:m1.c1){ a.a = 1; }; var myC = new m1.c1(); foo(myC); diff --git a/tests/baselines/reference/functionCall7.js b/tests/baselines/reference/functionCall7.js index ee9a8668f8f28..e986596fd6fb3 100644 --- a/tests/baselines/reference/functionCall7.js +++ b/tests/baselines/reference/functionCall7.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/functionCall7.ts] //// //// [functionCall7.ts] -module m1 { export class c1 { public a; }} +namespace m1 { export class c1 { public a; }} function foo(a:m1.c1){ a.a = 1; }; var myC = new m1.c1(); foo(myC); diff --git a/tests/baselines/reference/functionCall7.symbols b/tests/baselines/reference/functionCall7.symbols index 8531084b8e33a..1c2e37beb397c 100644 --- a/tests/baselines/reference/functionCall7.symbols +++ b/tests/baselines/reference/functionCall7.symbols @@ -1,38 +1,38 @@ //// [tests/cases/compiler/functionCall7.ts] //// === functionCall7.ts === -module m1 { export class c1 { public a; }} +namespace m1 { export class c1 { public a; }} >m1 : Symbol(m1, Decl(functionCall7.ts, 0, 0)) ->c1 : Symbol(c1, Decl(functionCall7.ts, 0, 11)) ->a : Symbol(c1.a, Decl(functionCall7.ts, 0, 29)) +>c1 : Symbol(c1, Decl(functionCall7.ts, 0, 14)) +>a : Symbol(c1.a, Decl(functionCall7.ts, 0, 32)) function foo(a:m1.c1){ a.a = 1; }; ->foo : Symbol(foo, Decl(functionCall7.ts, 0, 42)) +>foo : Symbol(foo, Decl(functionCall7.ts, 0, 45)) >a : Symbol(a, Decl(functionCall7.ts, 1, 13)) >m1 : Symbol(m1, Decl(functionCall7.ts, 0, 0)) ->c1 : Symbol(m1.c1, Decl(functionCall7.ts, 0, 11)) ->a.a : Symbol(m1.c1.a, Decl(functionCall7.ts, 0, 29)) +>c1 : Symbol(m1.c1, Decl(functionCall7.ts, 0, 14)) +>a.a : Symbol(m1.c1.a, Decl(functionCall7.ts, 0, 32)) >a : Symbol(a, Decl(functionCall7.ts, 1, 13)) ->a : Symbol(m1.c1.a, Decl(functionCall7.ts, 0, 29)) +>a : Symbol(m1.c1.a, Decl(functionCall7.ts, 0, 32)) var myC = new m1.c1(); >myC : Symbol(myC, Decl(functionCall7.ts, 2, 3)) ->m1.c1 : Symbol(m1.c1, Decl(functionCall7.ts, 0, 11)) +>m1.c1 : Symbol(m1.c1, Decl(functionCall7.ts, 0, 14)) >m1 : Symbol(m1, Decl(functionCall7.ts, 0, 0)) ->c1 : Symbol(m1.c1, Decl(functionCall7.ts, 0, 11)) +>c1 : Symbol(m1.c1, Decl(functionCall7.ts, 0, 14)) foo(myC); ->foo : Symbol(foo, Decl(functionCall7.ts, 0, 42)) +>foo : Symbol(foo, Decl(functionCall7.ts, 0, 45)) >myC : Symbol(myC, Decl(functionCall7.ts, 2, 3)) foo(myC, myC); ->foo : Symbol(foo, Decl(functionCall7.ts, 0, 42)) +>foo : Symbol(foo, Decl(functionCall7.ts, 0, 45)) >myC : Symbol(myC, Decl(functionCall7.ts, 2, 3)) >myC : Symbol(myC, Decl(functionCall7.ts, 2, 3)) foo(4); ->foo : Symbol(foo, Decl(functionCall7.ts, 0, 42)) +>foo : Symbol(foo, Decl(functionCall7.ts, 0, 45)) foo(); ->foo : Symbol(foo, Decl(functionCall7.ts, 0, 42)) +>foo : Symbol(foo, Decl(functionCall7.ts, 0, 45)) diff --git a/tests/baselines/reference/functionCall7.types b/tests/baselines/reference/functionCall7.types index b951ebfa6f421..951df5a24c1d9 100644 --- a/tests/baselines/reference/functionCall7.types +++ b/tests/baselines/reference/functionCall7.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/functionCall7.ts] //// === functionCall7.ts === -module m1 { export class c1 { public a; }} +namespace m1 { export class c1 { public a; }} >m1 : typeof m1 > : ^^^^^^^^^ >c1 : c1 diff --git a/tests/baselines/reference/functionInIfStatementInModule.js b/tests/baselines/reference/functionInIfStatementInModule.js index f5f25cc9cdb8c..6afcd6efe7c85 100644 --- a/tests/baselines/reference/functionInIfStatementInModule.js +++ b/tests/baselines/reference/functionInIfStatementInModule.js @@ -2,7 +2,7 @@ //// [functionInIfStatementInModule.ts] -module Midori +namespace Midori { if (false) { function Foo(src) diff --git a/tests/baselines/reference/functionInIfStatementInModule.symbols b/tests/baselines/reference/functionInIfStatementInModule.symbols index 96c71570b6914..923b9c0e1ca65 100644 --- a/tests/baselines/reference/functionInIfStatementInModule.symbols +++ b/tests/baselines/reference/functionInIfStatementInModule.symbols @@ -2,7 +2,7 @@ === functionInIfStatementInModule.ts === -module Midori +namespace Midori >Midori : Symbol(Midori, Decl(functionInIfStatementInModule.ts, 0, 0)) { if (false) { diff --git a/tests/baselines/reference/functionInIfStatementInModule.types b/tests/baselines/reference/functionInIfStatementInModule.types index 0c2ff67fcbeb0..9910aac2655c6 100644 --- a/tests/baselines/reference/functionInIfStatementInModule.types +++ b/tests/baselines/reference/functionInIfStatementInModule.types @@ -2,7 +2,7 @@ === functionInIfStatementInModule.ts === -module Midori +namespace Midori >Midori : typeof Midori > : ^^^^^^^^^^^^^ { diff --git a/tests/baselines/reference/functionMergedWithModule.js b/tests/baselines/reference/functionMergedWithModule.js index 3f9adf7339695..86e919532ad7d 100644 --- a/tests/baselines/reference/functionMergedWithModule.js +++ b/tests/baselines/reference/functionMergedWithModule.js @@ -5,12 +5,12 @@ function foo(title: string) { var x = 10; } -module foo.Bar { +namespace foo.Bar { export function f() { } } -module foo.Baz { +namespace foo.Baz { export function g() { Bar.f(); } diff --git a/tests/baselines/reference/functionMergedWithModule.symbols b/tests/baselines/reference/functionMergedWithModule.symbols index 7df77b96f6dc4..071a7a8c2acca 100644 --- a/tests/baselines/reference/functionMergedWithModule.symbols +++ b/tests/baselines/reference/functionMergedWithModule.symbols @@ -9,25 +9,25 @@ function foo(title: string) { >x : Symbol(x, Decl(functionMergedWithModule.ts, 1, 7)) } -module foo.Bar { +namespace foo.Bar { >foo : Symbol(foo, Decl(functionMergedWithModule.ts, 0, 0), Decl(functionMergedWithModule.ts, 2, 1), Decl(functionMergedWithModule.ts, 7, 1)) ->Bar : Symbol(Bar, Decl(functionMergedWithModule.ts, 4, 11)) +>Bar : Symbol(Bar, Decl(functionMergedWithModule.ts, 4, 14)) export function f() { ->f : Symbol(f, Decl(functionMergedWithModule.ts, 4, 16)) +>f : Symbol(f, Decl(functionMergedWithModule.ts, 4, 19)) } } -module foo.Baz { +namespace foo.Baz { >foo : Symbol(foo, Decl(functionMergedWithModule.ts, 0, 0), Decl(functionMergedWithModule.ts, 2, 1), Decl(functionMergedWithModule.ts, 7, 1)) ->Baz : Symbol(Baz, Decl(functionMergedWithModule.ts, 9, 11)) +>Baz : Symbol(Baz, Decl(functionMergedWithModule.ts, 9, 14)) export function g() { ->g : Symbol(g, Decl(functionMergedWithModule.ts, 9, 16)) +>g : Symbol(g, Decl(functionMergedWithModule.ts, 9, 19)) Bar.f(); ->Bar.f : Symbol(Bar.f, Decl(functionMergedWithModule.ts, 4, 16)) ->Bar : Symbol(Bar, Decl(functionMergedWithModule.ts, 4, 11)) ->f : Symbol(Bar.f, Decl(functionMergedWithModule.ts, 4, 16)) +>Bar.f : Symbol(Bar.f, Decl(functionMergedWithModule.ts, 4, 19)) +>Bar : Symbol(Bar, Decl(functionMergedWithModule.ts, 4, 14)) +>f : Symbol(Bar.f, Decl(functionMergedWithModule.ts, 4, 19)) } } diff --git a/tests/baselines/reference/functionMergedWithModule.types b/tests/baselines/reference/functionMergedWithModule.types index a74599b32e1ab..23389a91e53d8 100644 --- a/tests/baselines/reference/functionMergedWithModule.types +++ b/tests/baselines/reference/functionMergedWithModule.types @@ -14,7 +14,7 @@ function foo(title: string) { > : ^^ } -module foo.Bar { +namespace foo.Bar { >foo : typeof foo > : ^^^^^^^^^^ >Bar : typeof Bar @@ -26,7 +26,7 @@ module foo.Bar { } } -module foo.Baz { +namespace foo.Baz { >foo : typeof foo > : ^^^^^^^^^^ >Baz : typeof Baz diff --git a/tests/baselines/reference/functionNameConflicts.errors.txt b/tests/baselines/reference/functionNameConflicts.errors.txt index 47b5b1011ef0c..026f044f09e40 100644 --- a/tests/baselines/reference/functionNameConflicts.errors.txt +++ b/tests/baselines/reference/functionNameConflicts.errors.txt @@ -15,7 +15,7 @@ functionNameConflicts.ts(24,10): error TS2389: Function implementation name must //Function and variable of the same name in same declaration space //Function overload with different name from implementation signature - module M { + namespace M { function fn1() { } ~~~ !!! error TS2300: Duplicate identifier 'fn1'. diff --git a/tests/baselines/reference/functionNameConflicts.js b/tests/baselines/reference/functionNameConflicts.js index 101a8f58efb76..ad5f82edc0d90 100644 --- a/tests/baselines/reference/functionNameConflicts.js +++ b/tests/baselines/reference/functionNameConflicts.js @@ -4,7 +4,7 @@ //Function and variable of the same name in same declaration space //Function overload with different name from implementation signature -module M { +namespace M { function fn1() { } var fn1; diff --git a/tests/baselines/reference/functionNameConflicts.symbols b/tests/baselines/reference/functionNameConflicts.symbols index 13768a9575d1b..c7ab15dd141ad 100644 --- a/tests/baselines/reference/functionNameConflicts.symbols +++ b/tests/baselines/reference/functionNameConflicts.symbols @@ -4,11 +4,11 @@ //Function and variable of the same name in same declaration space //Function overload with different name from implementation signature -module M { +namespace M { >M : Symbol(M, Decl(functionNameConflicts.ts, 0, 0)) function fn1() { } ->fn1 : Symbol(fn1, Decl(functionNameConflicts.ts, 3, 10)) +>fn1 : Symbol(fn1, Decl(functionNameConflicts.ts, 3, 13)) var fn1; >fn1 : Symbol(fn1, Decl(functionNameConflicts.ts, 5, 7)) diff --git a/tests/baselines/reference/functionNameConflicts.types b/tests/baselines/reference/functionNameConflicts.types index f3a096f54380b..ed963d3477c11 100644 --- a/tests/baselines/reference/functionNameConflicts.types +++ b/tests/baselines/reference/functionNameConflicts.types @@ -4,7 +4,7 @@ //Function and variable of the same name in same declaration space //Function overload with different name from implementation signature -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/functionOverloadErrors.errors.txt b/tests/baselines/reference/functionOverloadErrors.errors.txt index 74e8f5bdc790d..3559824b4518a 100644 --- a/tests/baselines/reference/functionOverloadErrors.errors.txt +++ b/tests/baselines/reference/functionOverloadErrors.errors.txt @@ -91,7 +91,7 @@ functionOverloadErrors.ts(116,19): error TS2371: A parameter initializer is only } //Function overloads with differing export - module M { + namespace M { export function fn1(); ~~~ !!! error TS2383: Overload signatures must all be exported or non-exported. diff --git a/tests/baselines/reference/functionOverloadErrors.js b/tests/baselines/reference/functionOverloadErrors.js index 6d3cf19c180c3..029da652c80c9 100644 --- a/tests/baselines/reference/functionOverloadErrors.js +++ b/tests/baselines/reference/functionOverloadErrors.js @@ -74,7 +74,7 @@ class cls { } //Function overloads with differing export -module M { +namespace M { export function fn1(); function fn1(n: string); function fn1() { } diff --git a/tests/baselines/reference/functionOverloadErrors.symbols b/tests/baselines/reference/functionOverloadErrors.symbols index 94e74f716c325..c3f0eac64e0d2 100644 --- a/tests/baselines/reference/functionOverloadErrors.symbols +++ b/tests/baselines/reference/functionOverloadErrors.symbols @@ -185,18 +185,18 @@ class cls { } //Function overloads with differing export -module M { +namespace M { >M : Symbol(M, Decl(functionOverloadErrors.ts, 70, 1)) export function fn1(); ->fn1 : Symbol(fn1, Decl(functionOverloadErrors.ts, 73, 10)) +>fn1 : Symbol(fn1, Decl(functionOverloadErrors.ts, 73, 13)) function fn1(n: string); ->fn1 : Symbol(fn1, Decl(functionOverloadErrors.ts, 73, 10), Decl(functionOverloadErrors.ts, 74, 26), Decl(functionOverloadErrors.ts, 75, 28)) +>fn1 : Symbol(fn1, Decl(functionOverloadErrors.ts, 73, 13), Decl(functionOverloadErrors.ts, 74, 26), Decl(functionOverloadErrors.ts, 75, 28)) >n : Symbol(n, Decl(functionOverloadErrors.ts, 75, 17)) function fn1() { } ->fn1 : Symbol(fn1, Decl(functionOverloadErrors.ts, 73, 10), Decl(functionOverloadErrors.ts, 74, 26), Decl(functionOverloadErrors.ts, 75, 28)) +>fn1 : Symbol(fn1, Decl(functionOverloadErrors.ts, 73, 13), Decl(functionOverloadErrors.ts, 74, 26), Decl(functionOverloadErrors.ts, 75, 28)) function fn2(n: string); >fn2 : Symbol(fn2, Decl(functionOverloadErrors.ts, 76, 22), Decl(functionOverloadErrors.ts, 78, 28), Decl(functionOverloadErrors.ts, 79, 26)) diff --git a/tests/baselines/reference/functionOverloadErrors.types b/tests/baselines/reference/functionOverloadErrors.types index 464f54d4691c2..2e1105c49f7ea 100644 --- a/tests/baselines/reference/functionOverloadErrors.types +++ b/tests/baselines/reference/functionOverloadErrors.types @@ -220,7 +220,7 @@ class cls { } //Function overloads with differing export -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/functionTypeArgumentArrayAssignment.js b/tests/baselines/reference/functionTypeArgumentArrayAssignment.js index a380d6753f25a..ae70cd117da33 100644 --- a/tests/baselines/reference/functionTypeArgumentArrayAssignment.js +++ b/tests/baselines/reference/functionTypeArgumentArrayAssignment.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/functionTypeArgumentArrayAssignment.ts] //// //// [functionTypeArgumentArrayAssignment.ts] -module test { +namespace test { interface Array { foo: T; length: number; diff --git a/tests/baselines/reference/functionTypeArgumentArrayAssignment.symbols b/tests/baselines/reference/functionTypeArgumentArrayAssignment.symbols index 34e94f36f45f0..235cb0bed7338 100644 --- a/tests/baselines/reference/functionTypeArgumentArrayAssignment.symbols +++ b/tests/baselines/reference/functionTypeArgumentArrayAssignment.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/functionTypeArgumentArrayAssignment.ts] //// === functionTypeArgumentArrayAssignment.ts === -module test { +namespace test { >test : Symbol(test, Decl(functionTypeArgumentArrayAssignment.ts, 0, 0)) interface Array { ->Array : Symbol(Array, Decl(functionTypeArgumentArrayAssignment.ts, 0, 13)) +>Array : Symbol(Array, Decl(functionTypeArgumentArrayAssignment.ts, 0, 16)) >T : Symbol(T, Decl(functionTypeArgumentArrayAssignment.ts, 1, 20)) foo: T; diff --git a/tests/baselines/reference/functionTypeArgumentArrayAssignment.types b/tests/baselines/reference/functionTypeArgumentArrayAssignment.types index 6eca1ba35a4fc..11ec13d202471 100644 --- a/tests/baselines/reference/functionTypeArgumentArrayAssignment.types +++ b/tests/baselines/reference/functionTypeArgumentArrayAssignment.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/functionTypeArgumentArrayAssignment.ts] //// === functionTypeArgumentArrayAssignment.ts === -module test { +namespace test { >test : typeof test > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.js b/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.js index 317683f190e64..0d2790be87091 100644 --- a/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.js +++ b/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.js @@ -5,7 +5,7 @@ interface A { // interface before module declaration (): B.C; // uses defined below class in module } declare function B(): B.C; // function merged with module -declare module B { +declare namespace B { export class C { // class defined in module } } diff --git a/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.symbols b/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.symbols index 052c470d78c8f..c6a753442e6fe 100644 --- a/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.symbols +++ b/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.symbols @@ -6,22 +6,22 @@ interface A { // interface before module declaration (): B.C; // uses defined below class in module >B : Symbol(B, Decl(funduleExportedClassIsUsedBeforeDeclaration.ts, 2, 1), Decl(funduleExportedClassIsUsedBeforeDeclaration.ts, 3, 26)) ->C : Symbol(B.C, Decl(funduleExportedClassIsUsedBeforeDeclaration.ts, 4, 18)) +>C : Symbol(B.C, Decl(funduleExportedClassIsUsedBeforeDeclaration.ts, 4, 21)) } declare function B(): B.C; // function merged with module >B : Symbol(B, Decl(funduleExportedClassIsUsedBeforeDeclaration.ts, 2, 1), Decl(funduleExportedClassIsUsedBeforeDeclaration.ts, 3, 26)) >B : Symbol(B, Decl(funduleExportedClassIsUsedBeforeDeclaration.ts, 2, 1), Decl(funduleExportedClassIsUsedBeforeDeclaration.ts, 3, 26)) ->C : Symbol(B.C, Decl(funduleExportedClassIsUsedBeforeDeclaration.ts, 4, 18)) +>C : Symbol(B.C, Decl(funduleExportedClassIsUsedBeforeDeclaration.ts, 4, 21)) -declare module B { +declare namespace B { >B : Symbol(B, Decl(funduleExportedClassIsUsedBeforeDeclaration.ts, 2, 1), Decl(funduleExportedClassIsUsedBeforeDeclaration.ts, 3, 26)) export class C { // class defined in module ->C : Symbol(C, Decl(funduleExportedClassIsUsedBeforeDeclaration.ts, 4, 18)) +>C : Symbol(C, Decl(funduleExportedClassIsUsedBeforeDeclaration.ts, 4, 21)) } } new B.C(); ->B.C : Symbol(B.C, Decl(funduleExportedClassIsUsedBeforeDeclaration.ts, 4, 18)) +>B.C : Symbol(B.C, Decl(funduleExportedClassIsUsedBeforeDeclaration.ts, 4, 21)) >B : Symbol(B, Decl(funduleExportedClassIsUsedBeforeDeclaration.ts, 2, 1), Decl(funduleExportedClassIsUsedBeforeDeclaration.ts, 3, 26)) ->C : Symbol(B.C, Decl(funduleExportedClassIsUsedBeforeDeclaration.ts, 4, 18)) +>C : Symbol(B.C, Decl(funduleExportedClassIsUsedBeforeDeclaration.ts, 4, 21)) diff --git a/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.types b/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.types index f269dee96d615..cca88729e15fd 100644 --- a/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.types +++ b/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.types @@ -12,7 +12,7 @@ declare function B(): B.C; // function merged with module >B : any > : ^^^ -declare module B { +declare namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.js b/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.js index e0ee7dd20a6f4..fba189c67e1b5 100644 --- a/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.js +++ b/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.js @@ -4,7 +4,7 @@ function fn() { return fn.n; } -module fn { +namespace fn { export var n = 1; } diff --git a/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.symbols b/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.symbols index 72c56ba3f6602..4658c8a195300 100644 --- a/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.symbols +++ b/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.symbols @@ -9,7 +9,7 @@ function fn() { >fn : Symbol(fn, Decl(funduleOfFunctionWithoutReturnTypeAnnotation.ts, 0, 0), Decl(funduleOfFunctionWithoutReturnTypeAnnotation.ts, 2, 1)) >n : Symbol(fn.n, Decl(funduleOfFunctionWithoutReturnTypeAnnotation.ts, 4, 14)) } -module fn { +namespace fn { >fn : Symbol(fn, Decl(funduleOfFunctionWithoutReturnTypeAnnotation.ts, 0, 0), Decl(funduleOfFunctionWithoutReturnTypeAnnotation.ts, 2, 1)) export var n = 1; diff --git a/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.types b/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.types index a08c75a85fe56..46e9b99cd0bc8 100644 --- a/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.types +++ b/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.types @@ -13,7 +13,7 @@ function fn() { >n : number > : ^^^^^^ } -module fn { +namespace fn { >fn : typeof fn > : ^^^^^^^^^ diff --git a/tests/baselines/reference/funduleSplitAcrossFiles.errors.txt b/tests/baselines/reference/funduleSplitAcrossFiles.errors.txt index f4c5c1be2c31e..7d957d34e506f 100644 --- a/tests/baselines/reference/funduleSplitAcrossFiles.errors.txt +++ b/tests/baselines/reference/funduleSplitAcrossFiles.errors.txt @@ -1,12 +1,12 @@ -funduleSplitAcrossFiles_module.ts(1,8): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged. +funduleSplitAcrossFiles_module.ts(1,11): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged. ==== funduleSplitAcrossFiles_function.ts (0 errors) ==== function D() { } ==== funduleSplitAcrossFiles_module.ts (1 errors) ==== - module D { - ~ + namespace D { + ~ !!! error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged. export var y = "hi"; } diff --git a/tests/baselines/reference/funduleSplitAcrossFiles.js b/tests/baselines/reference/funduleSplitAcrossFiles.js index bb59338a6300d..2b13b938808ee 100644 --- a/tests/baselines/reference/funduleSplitAcrossFiles.js +++ b/tests/baselines/reference/funduleSplitAcrossFiles.js @@ -4,7 +4,7 @@ function D() { } //// [funduleSplitAcrossFiles_module.ts] -module D { +namespace D { export var y = "hi"; } D.y; diff --git a/tests/baselines/reference/funduleSplitAcrossFiles.symbols b/tests/baselines/reference/funduleSplitAcrossFiles.symbols index 12c9100a7686d..1e7c475b89159 100644 --- a/tests/baselines/reference/funduleSplitAcrossFiles.symbols +++ b/tests/baselines/reference/funduleSplitAcrossFiles.symbols @@ -5,7 +5,7 @@ function D() { } >D : Symbol(D, Decl(funduleSplitAcrossFiles_function.ts, 0, 0), Decl(funduleSplitAcrossFiles_module.ts, 0, 0)) === funduleSplitAcrossFiles_module.ts === -module D { +namespace D { >D : Symbol(D, Decl(funduleSplitAcrossFiles_function.ts, 0, 0), Decl(funduleSplitAcrossFiles_module.ts, 0, 0)) export var y = "hi"; diff --git a/tests/baselines/reference/funduleSplitAcrossFiles.types b/tests/baselines/reference/funduleSplitAcrossFiles.types index 0383724309eb8..09567208a431d 100644 --- a/tests/baselines/reference/funduleSplitAcrossFiles.types +++ b/tests/baselines/reference/funduleSplitAcrossFiles.types @@ -6,7 +6,7 @@ function D() { } > : ^^^^^^^^ === funduleSplitAcrossFiles_module.ts === -module D { +namespace D { >D : typeof D > : ^^^^^^^^ diff --git a/tests/baselines/reference/funduleUsedAcrossFileBoundary.js b/tests/baselines/reference/funduleUsedAcrossFileBoundary.js index ef06bdbc784f7..6b48ea1e67a63 100644 --- a/tests/baselines/reference/funduleUsedAcrossFileBoundary.js +++ b/tests/baselines/reference/funduleUsedAcrossFileBoundary.js @@ -2,7 +2,7 @@ //// [funduleUsedAcrossFileBoundary_file1.ts] declare function Q(value: T): string; -declare module Q { +declare namespace Q { interface Promise { foo: string; } diff --git a/tests/baselines/reference/funduleUsedAcrossFileBoundary.symbols b/tests/baselines/reference/funduleUsedAcrossFileBoundary.symbols index e20abc363faf0..f700c7e9f06d4 100644 --- a/tests/baselines/reference/funduleUsedAcrossFileBoundary.symbols +++ b/tests/baselines/reference/funduleUsedAcrossFileBoundary.symbols @@ -7,11 +7,11 @@ declare function Q(value: T): string; >value : Symbol(value, Decl(funduleUsedAcrossFileBoundary_file1.ts, 0, 22)) >T : Symbol(T, Decl(funduleUsedAcrossFileBoundary_file1.ts, 0, 19)) -declare module Q { +declare namespace Q { >Q : Symbol(Q, Decl(funduleUsedAcrossFileBoundary_file1.ts, 0, 0), Decl(funduleUsedAcrossFileBoundary_file1.ts, 0, 40)) interface Promise { ->Promise : Symbol(Promise, Decl(funduleUsedAcrossFileBoundary_file1.ts, 1, 18)) +>Promise : Symbol(Promise, Decl(funduleUsedAcrossFileBoundary_file1.ts, 1, 21)) >T : Symbol(T, Decl(funduleUsedAcrossFileBoundary_file1.ts, 2, 22)) foo: string; @@ -28,7 +28,7 @@ function promiseWithCancellation(promise: Q.Promise) { >T : Symbol(T, Decl(funduleUsedAcrossFileBoundary_file2.ts, 0, 33)) >promise : Symbol(promise, Decl(funduleUsedAcrossFileBoundary_file2.ts, 0, 36)) >Q : Symbol(Q, Decl(funduleUsedAcrossFileBoundary_file1.ts, 0, 0), Decl(funduleUsedAcrossFileBoundary_file1.ts, 0, 40)) ->Promise : Symbol(Q.Promise, Decl(funduleUsedAcrossFileBoundary_file1.ts, 1, 18)) +>Promise : Symbol(Q.Promise, Decl(funduleUsedAcrossFileBoundary_file1.ts, 1, 21)) >T : Symbol(T, Decl(funduleUsedAcrossFileBoundary_file2.ts, 0, 33)) var deferred = Q.defer(); // used to be an error diff --git a/tests/baselines/reference/funduleUsedAcrossFileBoundary.types b/tests/baselines/reference/funduleUsedAcrossFileBoundary.types index 63d812b843dee..a9565b478f7eb 100644 --- a/tests/baselines/reference/funduleUsedAcrossFileBoundary.types +++ b/tests/baselines/reference/funduleUsedAcrossFileBoundary.types @@ -7,7 +7,7 @@ declare function Q(value: T): string; >value : T > : ^ -declare module Q { +declare namespace Q { >Q : typeof Q > : ^^^^^^^^ diff --git a/tests/baselines/reference/fuzzy.errors.txt b/tests/baselines/reference/fuzzy.errors.txt index 36e42284cd660..d080afbb46e92 100644 --- a/tests/baselines/reference/fuzzy.errors.txt +++ b/tests/baselines/reference/fuzzy.errors.txt @@ -7,7 +7,7 @@ fuzzy.ts(25,20): error TS2352: Conversion of type '{ oneI: this; }' to type 'R' ==== fuzzy.ts (3 errors) ==== - module M { + namespace M { export interface I { works:()=>R; alsoWorks:()=>R; diff --git a/tests/baselines/reference/fuzzy.js b/tests/baselines/reference/fuzzy.js index c19eb60d29aec..6f0e0f83dc799 100644 --- a/tests/baselines/reference/fuzzy.js +++ b/tests/baselines/reference/fuzzy.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/fuzzy.ts] //// //// [fuzzy.ts] -module M { +namespace M { export interface I { works:()=>R; alsoWorks:()=>R; diff --git a/tests/baselines/reference/fuzzy.symbols b/tests/baselines/reference/fuzzy.symbols index 70700fb660fa4..a1e10c73961e0 100644 --- a/tests/baselines/reference/fuzzy.symbols +++ b/tests/baselines/reference/fuzzy.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/fuzzy.ts] //// === fuzzy.ts === -module M { +namespace M { >M : Symbol(M, Decl(fuzzy.ts, 0, 0)) export interface I { ->I : Symbol(I, Decl(fuzzy.ts, 0, 10)) +>I : Symbol(I, Decl(fuzzy.ts, 0, 13)) works:()=>R; >works : Symbol(I.works, Decl(fuzzy.ts, 1, 24)) @@ -28,12 +28,12 @@ module M { oneI:I; >oneI : Symbol(R.oneI, Decl(fuzzy.ts, 8, 24)) ->I : Symbol(I, Decl(fuzzy.ts, 0, 10)) +>I : Symbol(I, Decl(fuzzy.ts, 0, 13)) } export class C implements I { >C : Symbol(C, Decl(fuzzy.ts, 10, 5)) ->I : Symbol(I, Decl(fuzzy.ts, 0, 10)) +>I : Symbol(I, Decl(fuzzy.ts, 0, 13)) constructor(public x:number) { >x : Symbol(C.x, Decl(fuzzy.ts, 13, 20)) diff --git a/tests/baselines/reference/fuzzy.types b/tests/baselines/reference/fuzzy.types index 184c666e0c15a..7d9cb5665d172 100644 --- a/tests/baselines/reference/fuzzy.types +++ b/tests/baselines/reference/fuzzy.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/fuzzy.ts] //// === fuzzy.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/generatedContextualTyping.errors.txt b/tests/baselines/reference/generatedContextualTyping.errors.txt index a33af3a894608..a82eb3b967641 100644 --- a/tests/baselines/reference/generatedContextualTyping.errors.txt +++ b/tests/baselines/reference/generatedContextualTyping.errors.txt @@ -218,30 +218,30 @@ generatedContextualTyping.ts(282,28): error TS2872: This kind of expression is a var x178: () => {n: Base[]; } = function() { return { n: [d1, d2] }; }; var x179: () => (s: Base[]) => any = function() { return n => { var n: Base[]; return null; }; }; var x180: () => Genric = function() { return { func: n => { return [d1, d2]; } }; }; - module x181 { var t: () => Base[] = () => [d1, d2]; } - module x182 { var t: () => Base[] = function() { return [d1, d2] }; } - module x183 { var t: () => Base[] = function named() { return [d1, d2] }; } - module x184 { var t: { (): Base[]; } = () => [d1, d2]; } - module x185 { var t: { (): Base[]; } = function() { return [d1, d2] }; } - module x186 { var t: { (): Base[]; } = function named() { return [d1, d2] }; } - module x187 { var t: Base[] = [d1, d2]; } - module x188 { var t: Array = [d1, d2]; } - module x189 { var t: { [n: number]: Base; } = [d1, d2]; } - module x190 { var t: {n: Base[]; } = { n: [d1, d2] }; } - module x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } - module x192 { var t: Genric = { func: n => { return [d1, d2]; } }; } - module x193 { export var t: () => Base[] = () => [d1, d2]; } - module x194 { export var t: () => Base[] = function() { return [d1, d2] }; } - module x195 { export var t: () => Base[] = function named() { return [d1, d2] }; } - module x196 { export var t: { (): Base[]; } = () => [d1, d2]; } - module x197 { export var t: { (): Base[]; } = function() { return [d1, d2] }; } - module x198 { export var t: { (): Base[]; } = function named() { return [d1, d2] }; } - module x199 { export var t: Base[] = [d1, d2]; } - module x200 { export var t: Array = [d1, d2]; } - module x201 { export var t: { [n: number]: Base; } = [d1, d2]; } - module x202 { export var t: {n: Base[]; } = { n: [d1, d2] }; } - module x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } - module x204 { export var t: Genric = { func: n => { return [d1, d2]; } }; } + namespace x181 { var t: () => Base[] = () => [d1, d2]; } + namespace x182 { var t: () => Base[] = function() { return [d1, d2] }; } + namespace x183 { var t: () => Base[] = function named() { return [d1, d2] }; } + namespace x184 { var t: { (): Base[]; } = () => [d1, d2]; } + namespace x185 { var t: { (): Base[]; } = function() { return [d1, d2] }; } + namespace x186 { var t: { (): Base[]; } = function named() { return [d1, d2] }; } + namespace x187 { var t: Base[] = [d1, d2]; } + namespace x188 { var t: Array = [d1, d2]; } + namespace x189 { var t: { [n: number]: Base; } = [d1, d2]; } + namespace x190 { var t: {n: Base[]; } = { n: [d1, d2] }; } + namespace x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } + namespace x192 { var t: Genric = { func: n => { return [d1, d2]; } }; } + namespace x193 { export var t: () => Base[] = () => [d1, d2]; } + namespace x194 { export var t: () => Base[] = function() { return [d1, d2] }; } + namespace x195 { export var t: () => Base[] = function named() { return [d1, d2] }; } + namespace x196 { export var t: { (): Base[]; } = () => [d1, d2]; } + namespace x197 { export var t: { (): Base[]; } = function() { return [d1, d2] }; } + namespace x198 { export var t: { (): Base[]; } = function named() { return [d1, d2] }; } + namespace x199 { export var t: Base[] = [d1, d2]; } + namespace x200 { export var t: Array = [d1, d2]; } + namespace x201 { export var t: { [n: number]: Base; } = [d1, d2]; } + namespace x202 { export var t: {n: Base[]; } = { n: [d1, d2] }; } + namespace x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } + namespace x204 { export var t: Genric = { func: n => { return [d1, d2]; } }; } var x206 = <() => Base[]>function() { return [d1, d2] }; var x207 = <() => Base[]>function named() { return [d1, d2] }; var x209 = <{ (): Base[]; }>function() { return [d1, d2] }; diff --git a/tests/baselines/reference/generatedContextualTyping.js b/tests/baselines/reference/generatedContextualTyping.js index 245e75dc967ee..d7abfd0846057 100644 --- a/tests/baselines/reference/generatedContextualTyping.js +++ b/tests/baselines/reference/generatedContextualTyping.js @@ -186,30 +186,30 @@ var x177: () => { [n: number]: Base; } = function() { return [d1, d2]; }; var x178: () => {n: Base[]; } = function() { return { n: [d1, d2] }; }; var x179: () => (s: Base[]) => any = function() { return n => { var n: Base[]; return null; }; }; var x180: () => Genric = function() { return { func: n => { return [d1, d2]; } }; }; -module x181 { var t: () => Base[] = () => [d1, d2]; } -module x182 { var t: () => Base[] = function() { return [d1, d2] }; } -module x183 { var t: () => Base[] = function named() { return [d1, d2] }; } -module x184 { var t: { (): Base[]; } = () => [d1, d2]; } -module x185 { var t: { (): Base[]; } = function() { return [d1, d2] }; } -module x186 { var t: { (): Base[]; } = function named() { return [d1, d2] }; } -module x187 { var t: Base[] = [d1, d2]; } -module x188 { var t: Array = [d1, d2]; } -module x189 { var t: { [n: number]: Base; } = [d1, d2]; } -module x190 { var t: {n: Base[]; } = { n: [d1, d2] }; } -module x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } -module x192 { var t: Genric = { func: n => { return [d1, d2]; } }; } -module x193 { export var t: () => Base[] = () => [d1, d2]; } -module x194 { export var t: () => Base[] = function() { return [d1, d2] }; } -module x195 { export var t: () => Base[] = function named() { return [d1, d2] }; } -module x196 { export var t: { (): Base[]; } = () => [d1, d2]; } -module x197 { export var t: { (): Base[]; } = function() { return [d1, d2] }; } -module x198 { export var t: { (): Base[]; } = function named() { return [d1, d2] }; } -module x199 { export var t: Base[] = [d1, d2]; } -module x200 { export var t: Array = [d1, d2]; } -module x201 { export var t: { [n: number]: Base; } = [d1, d2]; } -module x202 { export var t: {n: Base[]; } = { n: [d1, d2] }; } -module x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } -module x204 { export var t: Genric = { func: n => { return [d1, d2]; } }; } +namespace x181 { var t: () => Base[] = () => [d1, d2]; } +namespace x182 { var t: () => Base[] = function() { return [d1, d2] }; } +namespace x183 { var t: () => Base[] = function named() { return [d1, d2] }; } +namespace x184 { var t: { (): Base[]; } = () => [d1, d2]; } +namespace x185 { var t: { (): Base[]; } = function() { return [d1, d2] }; } +namespace x186 { var t: { (): Base[]; } = function named() { return [d1, d2] }; } +namespace x187 { var t: Base[] = [d1, d2]; } +namespace x188 { var t: Array = [d1, d2]; } +namespace x189 { var t: { [n: number]: Base; } = [d1, d2]; } +namespace x190 { var t: {n: Base[]; } = { n: [d1, d2] }; } +namespace x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } +namespace x192 { var t: Genric = { func: n => { return [d1, d2]; } }; } +namespace x193 { export var t: () => Base[] = () => [d1, d2]; } +namespace x194 { export var t: () => Base[] = function() { return [d1, d2] }; } +namespace x195 { export var t: () => Base[] = function named() { return [d1, d2] }; } +namespace x196 { export var t: { (): Base[]; } = () => [d1, d2]; } +namespace x197 { export var t: { (): Base[]; } = function() { return [d1, d2] }; } +namespace x198 { export var t: { (): Base[]; } = function named() { return [d1, d2] }; } +namespace x199 { export var t: Base[] = [d1, d2]; } +namespace x200 { export var t: Array = [d1, d2]; } +namespace x201 { export var t: { [n: number]: Base; } = [d1, d2]; } +namespace x202 { export var t: {n: Base[]; } = { n: [d1, d2] }; } +namespace x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } +namespace x204 { export var t: Genric = { func: n => { return [d1, d2]; } }; } var x206 = <() => Base[]>function() { return [d1, d2] }; var x207 = <() => Base[]>function named() { return [d1, d2] }; var x209 = <{ (): Base[]; }>function() { return [d1, d2] }; diff --git a/tests/baselines/reference/generatedContextualTyping.symbols b/tests/baselines/reference/generatedContextualTyping.symbols index 3c093e771adab..5bbcae52e831c 100644 --- a/tests/baselines/reference/generatedContextualTyping.symbols +++ b/tests/baselines/reference/generatedContextualTyping.symbols @@ -1425,193 +1425,193 @@ var x180: () => Genric = function() { return { func: n => { return [d1, d2 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -module x181 { var t: () => Base[] = () => [d1, d2]; } +namespace x181 { var t: () => Base[] = () => [d1, d2]; } >x181 : Symbol(x181, Decl(generatedContextualTyping.ts, 184, 90)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 185, 17)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 185, 20)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -module x182 { var t: () => Base[] = function() { return [d1, d2] }; } ->x182 : Symbol(x182, Decl(generatedContextualTyping.ts, 185, 53)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 186, 17)) +namespace x182 { var t: () => Base[] = function() { return [d1, d2] }; } +>x182 : Symbol(x182, Decl(generatedContextualTyping.ts, 185, 56)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 186, 20)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -module x183 { var t: () => Base[] = function named() { return [d1, d2] }; } ->x183 : Symbol(x183, Decl(generatedContextualTyping.ts, 186, 69)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 187, 17)) +namespace x183 { var t: () => Base[] = function named() { return [d1, d2] }; } +>x183 : Symbol(x183, Decl(generatedContextualTyping.ts, 186, 72)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 187, 20)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) ->named : Symbol(named, Decl(generatedContextualTyping.ts, 187, 35)) +>named : Symbol(named, Decl(generatedContextualTyping.ts, 187, 38)) >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -module x184 { var t: { (): Base[]; } = () => [d1, d2]; } ->x184 : Symbol(x184, Decl(generatedContextualTyping.ts, 187, 75)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 188, 17)) +namespace x184 { var t: { (): Base[]; } = () => [d1, d2]; } +>x184 : Symbol(x184, Decl(generatedContextualTyping.ts, 187, 78)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 188, 20)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -module x185 { var t: { (): Base[]; } = function() { return [d1, d2] }; } ->x185 : Symbol(x185, Decl(generatedContextualTyping.ts, 188, 56)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 189, 17)) +namespace x185 { var t: { (): Base[]; } = function() { return [d1, d2] }; } +>x185 : Symbol(x185, Decl(generatedContextualTyping.ts, 188, 59)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 189, 20)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -module x186 { var t: { (): Base[]; } = function named() { return [d1, d2] }; } ->x186 : Symbol(x186, Decl(generatedContextualTyping.ts, 189, 72)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 190, 17)) +namespace x186 { var t: { (): Base[]; } = function named() { return [d1, d2] }; } +>x186 : Symbol(x186, Decl(generatedContextualTyping.ts, 189, 75)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 190, 20)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) ->named : Symbol(named, Decl(generatedContextualTyping.ts, 190, 38)) +>named : Symbol(named, Decl(generatedContextualTyping.ts, 190, 41)) >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -module x187 { var t: Base[] = [d1, d2]; } ->x187 : Symbol(x187, Decl(generatedContextualTyping.ts, 190, 78)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 191, 17)) +namespace x187 { var t: Base[] = [d1, d2]; } +>x187 : Symbol(x187, Decl(generatedContextualTyping.ts, 190, 81)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 191, 20)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -module x188 { var t: Array = [d1, d2]; } ->x188 : Symbol(x188, Decl(generatedContextualTyping.ts, 191, 41)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 192, 17)) +namespace x188 { var t: Array = [d1, d2]; } +>x188 : Symbol(x188, Decl(generatedContextualTyping.ts, 191, 44)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 192, 20)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -module x189 { var t: { [n: number]: Base; } = [d1, d2]; } ->x189 : Symbol(x189, Decl(generatedContextualTyping.ts, 192, 46)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 193, 17)) ->n : Symbol(n, Decl(generatedContextualTyping.ts, 193, 24)) +namespace x189 { var t: { [n: number]: Base; } = [d1, d2]; } +>x189 : Symbol(x189, Decl(generatedContextualTyping.ts, 192, 49)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 193, 20)) +>n : Symbol(n, Decl(generatedContextualTyping.ts, 193, 27)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -module x190 { var t: {n: Base[]; } = { n: [d1, d2] }; } ->x190 : Symbol(x190, Decl(generatedContextualTyping.ts, 193, 57)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 194, 17)) ->n : Symbol(n, Decl(generatedContextualTyping.ts, 194, 22)) +namespace x190 { var t: {n: Base[]; } = { n: [d1, d2] }; } +>x190 : Symbol(x190, Decl(generatedContextualTyping.ts, 193, 60)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 194, 20)) +>n : Symbol(n, Decl(generatedContextualTyping.ts, 194, 25)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) ->n : Symbol(n, Decl(generatedContextualTyping.ts, 194, 39)) +>n : Symbol(n, Decl(generatedContextualTyping.ts, 194, 42)) >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -module x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } ->x191 : Symbol(x191, Decl(generatedContextualTyping.ts, 194, 56)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 195, 17)) ->s : Symbol(s, Decl(generatedContextualTyping.ts, 195, 22)) +namespace x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } +>x191 : Symbol(x191, Decl(generatedContextualTyping.ts, 194, 59)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 195, 20)) +>s : Symbol(s, Decl(generatedContextualTyping.ts, 195, 25)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) ->n : Symbol(n, Decl(generatedContextualTyping.ts, 195, 41), Decl(generatedContextualTyping.ts, 195, 52)) ->n : Symbol(n, Decl(generatedContextualTyping.ts, 195, 41), Decl(generatedContextualTyping.ts, 195, 52)) +>n : Symbol(n, Decl(generatedContextualTyping.ts, 195, 44), Decl(generatedContextualTyping.ts, 195, 55)) +>n : Symbol(n, Decl(generatedContextualTyping.ts, 195, 44), Decl(generatedContextualTyping.ts, 195, 55)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -module x192 { var t: Genric = { func: n => { return [d1, d2]; } }; } ->x192 : Symbol(x192, Decl(generatedContextualTyping.ts, 195, 81)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 196, 17)) +namespace x192 { var t: Genric = { func: n => { return [d1, d2]; } }; } +>x192 : Symbol(x192, Decl(generatedContextualTyping.ts, 195, 84)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 196, 20)) >Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) ->func : Symbol(func, Decl(generatedContextualTyping.ts, 196, 37)) ->n : Symbol(n, Decl(generatedContextualTyping.ts, 196, 43)) +>func : Symbol(func, Decl(generatedContextualTyping.ts, 196, 40)) +>n : Symbol(n, Decl(generatedContextualTyping.ts, 196, 46)) >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -module x193 { export var t: () => Base[] = () => [d1, d2]; } ->x193 : Symbol(x193, Decl(generatedContextualTyping.ts, 196, 74)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 197, 24)) +namespace x193 { export var t: () => Base[] = () => [d1, d2]; } +>x193 : Symbol(x193, Decl(generatedContextualTyping.ts, 196, 77)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 197, 27)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -module x194 { export var t: () => Base[] = function() { return [d1, d2] }; } ->x194 : Symbol(x194, Decl(generatedContextualTyping.ts, 197, 60)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 198, 24)) +namespace x194 { export var t: () => Base[] = function() { return [d1, d2] }; } +>x194 : Symbol(x194, Decl(generatedContextualTyping.ts, 197, 63)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 198, 27)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -module x195 { export var t: () => Base[] = function named() { return [d1, d2] }; } ->x195 : Symbol(x195, Decl(generatedContextualTyping.ts, 198, 76)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 199, 24)) +namespace x195 { export var t: () => Base[] = function named() { return [d1, d2] }; } +>x195 : Symbol(x195, Decl(generatedContextualTyping.ts, 198, 79)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 199, 27)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) ->named : Symbol(named, Decl(generatedContextualTyping.ts, 199, 42)) +>named : Symbol(named, Decl(generatedContextualTyping.ts, 199, 45)) >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -module x196 { export var t: { (): Base[]; } = () => [d1, d2]; } ->x196 : Symbol(x196, Decl(generatedContextualTyping.ts, 199, 82)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 200, 24)) +namespace x196 { export var t: { (): Base[]; } = () => [d1, d2]; } +>x196 : Symbol(x196, Decl(generatedContextualTyping.ts, 199, 85)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 200, 27)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -module x197 { export var t: { (): Base[]; } = function() { return [d1, d2] }; } ->x197 : Symbol(x197, Decl(generatedContextualTyping.ts, 200, 63)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 201, 24)) +namespace x197 { export var t: { (): Base[]; } = function() { return [d1, d2] }; } +>x197 : Symbol(x197, Decl(generatedContextualTyping.ts, 200, 66)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 201, 27)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -module x198 { export var t: { (): Base[]; } = function named() { return [d1, d2] }; } ->x198 : Symbol(x198, Decl(generatedContextualTyping.ts, 201, 79)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 202, 24)) +namespace x198 { export var t: { (): Base[]; } = function named() { return [d1, d2] }; } +>x198 : Symbol(x198, Decl(generatedContextualTyping.ts, 201, 82)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 202, 27)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) ->named : Symbol(named, Decl(generatedContextualTyping.ts, 202, 45)) +>named : Symbol(named, Decl(generatedContextualTyping.ts, 202, 48)) >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -module x199 { export var t: Base[] = [d1, d2]; } ->x199 : Symbol(x199, Decl(generatedContextualTyping.ts, 202, 85)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 203, 24)) +namespace x199 { export var t: Base[] = [d1, d2]; } +>x199 : Symbol(x199, Decl(generatedContextualTyping.ts, 202, 88)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 203, 27)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -module x200 { export var t: Array = [d1, d2]; } ->x200 : Symbol(x200, Decl(generatedContextualTyping.ts, 203, 48)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 204, 24)) +namespace x200 { export var t: Array = [d1, d2]; } +>x200 : Symbol(x200, Decl(generatedContextualTyping.ts, 203, 51)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 204, 27)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -module x201 { export var t: { [n: number]: Base; } = [d1, d2]; } ->x201 : Symbol(x201, Decl(generatedContextualTyping.ts, 204, 53)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 205, 24)) ->n : Symbol(n, Decl(generatedContextualTyping.ts, 205, 31)) +namespace x201 { export var t: { [n: number]: Base; } = [d1, d2]; } +>x201 : Symbol(x201, Decl(generatedContextualTyping.ts, 204, 56)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 205, 27)) +>n : Symbol(n, Decl(generatedContextualTyping.ts, 205, 34)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -module x202 { export var t: {n: Base[]; } = { n: [d1, d2] }; } ->x202 : Symbol(x202, Decl(generatedContextualTyping.ts, 205, 64)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 206, 24)) ->n : Symbol(n, Decl(generatedContextualTyping.ts, 206, 29)) +namespace x202 { export var t: {n: Base[]; } = { n: [d1, d2] }; } +>x202 : Symbol(x202, Decl(generatedContextualTyping.ts, 205, 67)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 206, 27)) +>n : Symbol(n, Decl(generatedContextualTyping.ts, 206, 32)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) ->n : Symbol(n, Decl(generatedContextualTyping.ts, 206, 46)) +>n : Symbol(n, Decl(generatedContextualTyping.ts, 206, 49)) >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) -module x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } ->x203 : Symbol(x203, Decl(generatedContextualTyping.ts, 206, 63)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 207, 24)) ->s : Symbol(s, Decl(generatedContextualTyping.ts, 207, 29)) +namespace x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } +>x203 : Symbol(x203, Decl(generatedContextualTyping.ts, 206, 66)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 207, 27)) +>s : Symbol(s, Decl(generatedContextualTyping.ts, 207, 32)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) ->n : Symbol(n, Decl(generatedContextualTyping.ts, 207, 48), Decl(generatedContextualTyping.ts, 207, 59)) ->n : Symbol(n, Decl(generatedContextualTyping.ts, 207, 48), Decl(generatedContextualTyping.ts, 207, 59)) +>n : Symbol(n, Decl(generatedContextualTyping.ts, 207, 51), Decl(generatedContextualTyping.ts, 207, 62)) +>n : Symbol(n, Decl(generatedContextualTyping.ts, 207, 51), Decl(generatedContextualTyping.ts, 207, 62)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) -module x204 { export var t: Genric = { func: n => { return [d1, d2]; } }; } ->x204 : Symbol(x204, Decl(generatedContextualTyping.ts, 207, 88)) ->t : Symbol(t, Decl(generatedContextualTyping.ts, 208, 24)) +namespace x204 { export var t: Genric = { func: n => { return [d1, d2]; } }; } +>x204 : Symbol(x204, Decl(generatedContextualTyping.ts, 207, 91)) +>t : Symbol(t, Decl(generatedContextualTyping.ts, 208, 27)) >Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 2, 42)) >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0)) ->func : Symbol(func, Decl(generatedContextualTyping.ts, 208, 44)) ->n : Symbol(n, Decl(generatedContextualTyping.ts, 208, 50)) +>func : Symbol(func, Decl(generatedContextualTyping.ts, 208, 47)) +>n : Symbol(n, Decl(generatedContextualTyping.ts, 208, 53)) >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 4, 19)) >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 4, 40)) diff --git a/tests/baselines/reference/generatedContextualTyping.types b/tests/baselines/reference/generatedContextualTyping.types index bccb71ef3887d..cd80fc28cebf0 100644 --- a/tests/baselines/reference/generatedContextualTyping.types +++ b/tests/baselines/reference/generatedContextualTyping.types @@ -2750,7 +2750,7 @@ var x180: () => Genric = function() { return { func: n => { return [d1, d2 >d2 : Derived2 > : ^^^^^^^^ -module x181 { var t: () => Base[] = () => [d1, d2]; } +namespace x181 { var t: () => Base[] = () => [d1, d2]; } >x181 : typeof x181 > : ^^^^^^^^^^^ >t : () => Base[] @@ -2764,7 +2764,7 @@ module x181 { var t: () => Base[] = () => [d1, d2]; } >d2 : Derived2 > : ^^^^^^^^ -module x182 { var t: () => Base[] = function() { return [d1, d2] }; } +namespace x182 { var t: () => Base[] = function() { return [d1, d2] }; } >x182 : typeof x182 > : ^^^^^^^^^^^ >t : () => Base[] @@ -2778,7 +2778,7 @@ module x182 { var t: () => Base[] = function() { return [d1, d2] }; } >d2 : Derived2 > : ^^^^^^^^ -module x183 { var t: () => Base[] = function named() { return [d1, d2] }; } +namespace x183 { var t: () => Base[] = function named() { return [d1, d2] }; } >x183 : typeof x183 > : ^^^^^^^^^^^ >t : () => Base[] @@ -2794,7 +2794,7 @@ module x183 { var t: () => Base[] = function named() { return [d1, d2] }; } >d2 : Derived2 > : ^^^^^^^^ -module x184 { var t: { (): Base[]; } = () => [d1, d2]; } +namespace x184 { var t: { (): Base[]; } = () => [d1, d2]; } >x184 : typeof x184 > : ^^^^^^^^^^^ >t : () => Base[] @@ -2808,7 +2808,7 @@ module x184 { var t: { (): Base[]; } = () => [d1, d2]; } >d2 : Derived2 > : ^^^^^^^^ -module x185 { var t: { (): Base[]; } = function() { return [d1, d2] }; } +namespace x185 { var t: { (): Base[]; } = function() { return [d1, d2] }; } >x185 : typeof x185 > : ^^^^^^^^^^^ >t : () => Base[] @@ -2822,7 +2822,7 @@ module x185 { var t: { (): Base[]; } = function() { return [d1, d2] }; } >d2 : Derived2 > : ^^^^^^^^ -module x186 { var t: { (): Base[]; } = function named() { return [d1, d2] }; } +namespace x186 { var t: { (): Base[]; } = function named() { return [d1, d2] }; } >x186 : typeof x186 > : ^^^^^^^^^^^ >t : () => Base[] @@ -2838,7 +2838,7 @@ module x186 { var t: { (): Base[]; } = function named() { return [d1, d2] }; } >d2 : Derived2 > : ^^^^^^^^ -module x187 { var t: Base[] = [d1, d2]; } +namespace x187 { var t: Base[] = [d1, d2]; } >x187 : typeof x187 > : ^^^^^^^^^^^ >t : Base[] @@ -2850,7 +2850,7 @@ module x187 { var t: Base[] = [d1, d2]; } >d2 : Derived2 > : ^^^^^^^^ -module x188 { var t: Array = [d1, d2]; } +namespace x188 { var t: Array = [d1, d2]; } >x188 : typeof x188 > : ^^^^^^^^^^^ >t : Base[] @@ -2862,7 +2862,7 @@ module x188 { var t: Array = [d1, d2]; } >d2 : Derived2 > : ^^^^^^^^ -module x189 { var t: { [n: number]: Base; } = [d1, d2]; } +namespace x189 { var t: { [n: number]: Base; } = [d1, d2]; } >x189 : typeof x189 > : ^^^^^^^^^^^ >t : { [n: number]: Base; } @@ -2876,7 +2876,7 @@ module x189 { var t: { [n: number]: Base; } = [d1, d2]; } >d2 : Derived2 > : ^^^^^^^^ -module x190 { var t: {n: Base[]; } = { n: [d1, d2] }; } +namespace x190 { var t: {n: Base[]; } = { n: [d1, d2] }; } >x190 : typeof x190 > : ^^^^^^^^^^^ >t : { n: Base[]; } @@ -2894,7 +2894,7 @@ module x190 { var t: {n: Base[]; } = { n: [d1, d2] }; } >d2 : Derived2 > : ^^^^^^^^ -module x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } +namespace x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } >x191 : typeof x191 > : ^^^^^^^^^^^ >t : (s: Base[]) => any @@ -2908,7 +2908,7 @@ module x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; >n : Base[] > : ^^^^^^ -module x192 { var t: Genric = { func: n => { return [d1, d2]; } }; } +namespace x192 { var t: Genric = { func: n => { return [d1, d2]; } }; } >x192 : typeof x192 > : ^^^^^^^^^^^ >t : Genric @@ -2928,7 +2928,7 @@ module x192 { var t: Genric = { func: n => { return [d1, d2]; } }; } >d2 : Derived2 > : ^^^^^^^^ -module x193 { export var t: () => Base[] = () => [d1, d2]; } +namespace x193 { export var t: () => Base[] = () => [d1, d2]; } >x193 : typeof x193 > : ^^^^^^^^^^^ >t : () => Base[] @@ -2942,7 +2942,7 @@ module x193 { export var t: () => Base[] = () => [d1, d2]; } >d2 : Derived2 > : ^^^^^^^^ -module x194 { export var t: () => Base[] = function() { return [d1, d2] }; } +namespace x194 { export var t: () => Base[] = function() { return [d1, d2] }; } >x194 : typeof x194 > : ^^^^^^^^^^^ >t : () => Base[] @@ -2956,7 +2956,7 @@ module x194 { export var t: () => Base[] = function() { return [d1, d2] }; } >d2 : Derived2 > : ^^^^^^^^ -module x195 { export var t: () => Base[] = function named() { return [d1, d2] }; } +namespace x195 { export var t: () => Base[] = function named() { return [d1, d2] }; } >x195 : typeof x195 > : ^^^^^^^^^^^ >t : () => Base[] @@ -2972,7 +2972,7 @@ module x195 { export var t: () => Base[] = function named() { return [d1, d2] }; >d2 : Derived2 > : ^^^^^^^^ -module x196 { export var t: { (): Base[]; } = () => [d1, d2]; } +namespace x196 { export var t: { (): Base[]; } = () => [d1, d2]; } >x196 : typeof x196 > : ^^^^^^^^^^^ >t : () => Base[] @@ -2986,7 +2986,7 @@ module x196 { export var t: { (): Base[]; } = () => [d1, d2]; } >d2 : Derived2 > : ^^^^^^^^ -module x197 { export var t: { (): Base[]; } = function() { return [d1, d2] }; } +namespace x197 { export var t: { (): Base[]; } = function() { return [d1, d2] }; } >x197 : typeof x197 > : ^^^^^^^^^^^ >t : () => Base[] @@ -3000,7 +3000,7 @@ module x197 { export var t: { (): Base[]; } = function() { return [d1, d2] }; } >d2 : Derived2 > : ^^^^^^^^ -module x198 { export var t: { (): Base[]; } = function named() { return [d1, d2] }; } +namespace x198 { export var t: { (): Base[]; } = function named() { return [d1, d2] }; } >x198 : typeof x198 > : ^^^^^^^^^^^ >t : () => Base[] @@ -3016,7 +3016,7 @@ module x198 { export var t: { (): Base[]; } = function named() { return [d1, d2] >d2 : Derived2 > : ^^^^^^^^ -module x199 { export var t: Base[] = [d1, d2]; } +namespace x199 { export var t: Base[] = [d1, d2]; } >x199 : typeof x199 > : ^^^^^^^^^^^ >t : Base[] @@ -3028,7 +3028,7 @@ module x199 { export var t: Base[] = [d1, d2]; } >d2 : Derived2 > : ^^^^^^^^ -module x200 { export var t: Array = [d1, d2]; } +namespace x200 { export var t: Array = [d1, d2]; } >x200 : typeof x200 > : ^^^^^^^^^^^ >t : Base[] @@ -3040,7 +3040,7 @@ module x200 { export var t: Array = [d1, d2]; } >d2 : Derived2 > : ^^^^^^^^ -module x201 { export var t: { [n: number]: Base; } = [d1, d2]; } +namespace x201 { export var t: { [n: number]: Base; } = [d1, d2]; } >x201 : typeof x201 > : ^^^^^^^^^^^ >t : { [n: number]: Base; } @@ -3054,7 +3054,7 @@ module x201 { export var t: { [n: number]: Base; } = [d1, d2]; } >d2 : Derived2 > : ^^^^^^^^ -module x202 { export var t: {n: Base[]; } = { n: [d1, d2] }; } +namespace x202 { export var t: {n: Base[]; } = { n: [d1, d2] }; } >x202 : typeof x202 > : ^^^^^^^^^^^ >t : { n: Base[]; } @@ -3072,7 +3072,7 @@ module x202 { export var t: {n: Base[]; } = { n: [d1, d2] }; } >d2 : Derived2 > : ^^^^^^^^ -module x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } +namespace x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } >x203 : typeof x203 > : ^^^^^^^^^^^ >t : (s: Base[]) => any @@ -3086,7 +3086,7 @@ module x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return nu >n : Base[] > : ^^^^^^ -module x204 { export var t: Genric = { func: n => { return [d1, d2]; } }; } +namespace x204 { export var t: Genric = { func: n => { return [d1, d2]; } }; } >x204 : typeof x204 > : ^^^^^^^^^^^ >t : Genric diff --git a/tests/baselines/reference/generativeRecursionWithTypeOf.js b/tests/baselines/reference/generativeRecursionWithTypeOf.js index 55160fa5b2722..464e34b719cab 100644 --- a/tests/baselines/reference/generativeRecursionWithTypeOf.js +++ b/tests/baselines/reference/generativeRecursionWithTypeOf.js @@ -6,7 +6,7 @@ class C { type: T; } -module M { +namespace M { export function f(x: typeof C) { return new x(); } diff --git a/tests/baselines/reference/generativeRecursionWithTypeOf.symbols b/tests/baselines/reference/generativeRecursionWithTypeOf.symbols index 6525f8185a8dd..9e7d134246658 100644 --- a/tests/baselines/reference/generativeRecursionWithTypeOf.symbols +++ b/tests/baselines/reference/generativeRecursionWithTypeOf.symbols @@ -14,11 +14,11 @@ class C { >T : Symbol(T, Decl(generativeRecursionWithTypeOf.ts, 0, 8)) } -module M { +namespace M { >M : Symbol(M, Decl(generativeRecursionWithTypeOf.ts, 3, 1)) export function f(x: typeof C) { ->f : Symbol(f, Decl(generativeRecursionWithTypeOf.ts, 5, 10)) +>f : Symbol(f, Decl(generativeRecursionWithTypeOf.ts, 5, 13)) >x : Symbol(x, Decl(generativeRecursionWithTypeOf.ts, 6, 22)) >C : Symbol(C, Decl(generativeRecursionWithTypeOf.ts, 0, 0)) diff --git a/tests/baselines/reference/generativeRecursionWithTypeOf.types b/tests/baselines/reference/generativeRecursionWithTypeOf.types index 2a3e8769cec40..3fad55b587104 100644 --- a/tests/baselines/reference/generativeRecursionWithTypeOf.types +++ b/tests/baselines/reference/generativeRecursionWithTypeOf.types @@ -16,7 +16,7 @@ class C { > : ^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/generatorInAmbientContext2.errors.txt b/tests/baselines/reference/generatorInAmbientContext2.errors.txt index 19591506c91c5..1687dfd9d9aeb 100644 --- a/tests/baselines/reference/generatorInAmbientContext2.errors.txt +++ b/tests/baselines/reference/generatorInAmbientContext2.errors.txt @@ -2,7 +2,7 @@ generatorInAmbientContext2.ts(2,14): error TS1221: Generators are not allowed in ==== generatorInAmbientContext2.ts (1 errors) ==== - declare module M { + declare namespace M { function *generator(): any; ~ !!! error TS1221: Generators are not allowed in an ambient context. diff --git a/tests/baselines/reference/generatorInAmbientContext2.js b/tests/baselines/reference/generatorInAmbientContext2.js index 4af52337705b4..71a9afbd21289 100644 --- a/tests/baselines/reference/generatorInAmbientContext2.js +++ b/tests/baselines/reference/generatorInAmbientContext2.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext2.ts] //// //// [generatorInAmbientContext2.ts] -declare module M { +declare namespace M { function *generator(): any; } diff --git a/tests/baselines/reference/generatorInAmbientContext2.symbols b/tests/baselines/reference/generatorInAmbientContext2.symbols index ec084641f2967..411d896bb7c3a 100644 --- a/tests/baselines/reference/generatorInAmbientContext2.symbols +++ b/tests/baselines/reference/generatorInAmbientContext2.symbols @@ -1,9 +1,9 @@ //// [tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext2.ts] //// === generatorInAmbientContext2.ts === -declare module M { +declare namespace M { >M : Symbol(M, Decl(generatorInAmbientContext2.ts, 0, 0)) function *generator(): any; ->generator : Symbol(generator, Decl(generatorInAmbientContext2.ts, 0, 18)) +>generator : Symbol(generator, Decl(generatorInAmbientContext2.ts, 0, 21)) } diff --git a/tests/baselines/reference/generatorInAmbientContext2.types b/tests/baselines/reference/generatorInAmbientContext2.types index ce8da916a2d45..c8f8f6a8b3849 100644 --- a/tests/baselines/reference/generatorInAmbientContext2.types +++ b/tests/baselines/reference/generatorInAmbientContext2.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext2.ts] //// === generatorInAmbientContext2.ts === -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/generatorInAmbientContext4.d.errors.txt b/tests/baselines/reference/generatorInAmbientContext4.d.errors.txt index 8f8aa092f0636..7c8e7a5d9e922 100644 --- a/tests/baselines/reference/generatorInAmbientContext4.d.errors.txt +++ b/tests/baselines/reference/generatorInAmbientContext4.d.errors.txt @@ -2,7 +2,7 @@ generatorInAmbientContext4.d.ts(2,14): error TS1221: Generators are not allowed ==== generatorInAmbientContext4.d.ts (1 errors) ==== - declare module M { + declare namespace M { function *generator(): any; ~ !!! error TS1221: Generators are not allowed in an ambient context. diff --git a/tests/baselines/reference/generatorInAmbientContext4.d.symbols b/tests/baselines/reference/generatorInAmbientContext4.d.symbols index 81df37f205e23..dc6816619d37c 100644 --- a/tests/baselines/reference/generatorInAmbientContext4.d.symbols +++ b/tests/baselines/reference/generatorInAmbientContext4.d.symbols @@ -1,9 +1,9 @@ //// [tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext4.d.ts] //// === generatorInAmbientContext4.d.ts === -declare module M { +declare namespace M { >M : Symbol(M, Decl(generatorInAmbientContext4.d.ts, 0, 0)) function *generator(): any; ->generator : Symbol(generator, Decl(generatorInAmbientContext4.d.ts, 0, 18)) +>generator : Symbol(generator, Decl(generatorInAmbientContext4.d.ts, 0, 21)) } diff --git a/tests/baselines/reference/generatorInAmbientContext4.d.types b/tests/baselines/reference/generatorInAmbientContext4.d.types index 12be0cdaaf333..ff43c9ca982c9 100644 --- a/tests/baselines/reference/generatorInAmbientContext4.d.types +++ b/tests/baselines/reference/generatorInAmbientContext4.d.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext4.d.ts] //// === generatorInAmbientContext4.d.ts === -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/generatorInAmbientContext6.js b/tests/baselines/reference/generatorInAmbientContext6.js index f5530160882cf..7e2739c27fc7b 100644 --- a/tests/baselines/reference/generatorInAmbientContext6.js +++ b/tests/baselines/reference/generatorInAmbientContext6.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext6.ts] //// //// [generatorInAmbientContext6.ts] -module M { +namespace M { export function *generator(): any { } } diff --git a/tests/baselines/reference/generatorInAmbientContext6.symbols b/tests/baselines/reference/generatorInAmbientContext6.symbols index cfffc25102f56..a37a79b176c23 100644 --- a/tests/baselines/reference/generatorInAmbientContext6.symbols +++ b/tests/baselines/reference/generatorInAmbientContext6.symbols @@ -1,9 +1,9 @@ //// [tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext6.ts] //// === generatorInAmbientContext6.ts === -module M { +namespace M { >M : Symbol(M, Decl(generatorInAmbientContext6.ts, 0, 0)) export function *generator(): any { } ->generator : Symbol(generator, Decl(generatorInAmbientContext6.ts, 0, 10)) +>generator : Symbol(generator, Decl(generatorInAmbientContext6.ts, 0, 13)) } diff --git a/tests/baselines/reference/generatorInAmbientContext6.types b/tests/baselines/reference/generatorInAmbientContext6.types index 8394c99ffacc4..e239942e690ae 100644 --- a/tests/baselines/reference/generatorInAmbientContext6.types +++ b/tests/baselines/reference/generatorInAmbientContext6.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext6.ts] //// === generatorInAmbientContext6.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/generatorOverloads1.errors.txt b/tests/baselines/reference/generatorOverloads1.errors.txt index 5fd52f4cfb8d0..dcc6b9c0b3359 100644 --- a/tests/baselines/reference/generatorOverloads1.errors.txt +++ b/tests/baselines/reference/generatorOverloads1.errors.txt @@ -3,7 +3,7 @@ generatorOverloads1.ts(3,13): error TS1222: An overload signature cannot be decl ==== generatorOverloads1.ts (2 errors) ==== - module M { + namespace M { function* f(s: string): Iterable; ~ !!! error TS1222: An overload signature cannot be declared as a generator. diff --git a/tests/baselines/reference/generatorOverloads1.js b/tests/baselines/reference/generatorOverloads1.js index 07251e4afdb05..fd36f05e5148a 100644 --- a/tests/baselines/reference/generatorOverloads1.js +++ b/tests/baselines/reference/generatorOverloads1.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/yieldExpressions/generatorOverloads1.ts] //// //// [generatorOverloads1.ts] -module M { +namespace M { function* f(s: string): Iterable; function* f(s: number): Iterable; function* f(s: any): Iterable { } diff --git a/tests/baselines/reference/generatorOverloads1.symbols b/tests/baselines/reference/generatorOverloads1.symbols index c3924ebb7959c..e6cf63e88b27b 100644 --- a/tests/baselines/reference/generatorOverloads1.symbols +++ b/tests/baselines/reference/generatorOverloads1.symbols @@ -1,21 +1,21 @@ //// [tests/cases/conformance/es6/yieldExpressions/generatorOverloads1.ts] //// === generatorOverloads1.ts === -module M { +namespace M { >M : Symbol(M, Decl(generatorOverloads1.ts, 0, 0)) function* f(s: string): Iterable; ->f : Symbol(f, Decl(generatorOverloads1.ts, 0, 10), Decl(generatorOverloads1.ts, 1, 42), Decl(generatorOverloads1.ts, 2, 42)) +>f : Symbol(f, Decl(generatorOverloads1.ts, 0, 13), Decl(generatorOverloads1.ts, 1, 42), Decl(generatorOverloads1.ts, 2, 42)) >s : Symbol(s, Decl(generatorOverloads1.ts, 1, 16)) >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --)) function* f(s: number): Iterable; ->f : Symbol(f, Decl(generatorOverloads1.ts, 0, 10), Decl(generatorOverloads1.ts, 1, 42), Decl(generatorOverloads1.ts, 2, 42)) +>f : Symbol(f, Decl(generatorOverloads1.ts, 0, 13), Decl(generatorOverloads1.ts, 1, 42), Decl(generatorOverloads1.ts, 2, 42)) >s : Symbol(s, Decl(generatorOverloads1.ts, 2, 16)) >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --)) function* f(s: any): Iterable { } ->f : Symbol(f, Decl(generatorOverloads1.ts, 0, 10), Decl(generatorOverloads1.ts, 1, 42), Decl(generatorOverloads1.ts, 2, 42)) +>f : Symbol(f, Decl(generatorOverloads1.ts, 0, 13), Decl(generatorOverloads1.ts, 1, 42), Decl(generatorOverloads1.ts, 2, 42)) >s : Symbol(s, Decl(generatorOverloads1.ts, 3, 16)) >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --)) } diff --git a/tests/baselines/reference/generatorOverloads1.types b/tests/baselines/reference/generatorOverloads1.types index 735fbe0553252..fb7c49d746342 100644 --- a/tests/baselines/reference/generatorOverloads1.types +++ b/tests/baselines/reference/generatorOverloads1.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/yieldExpressions/generatorOverloads1.ts] //// === generatorOverloads1.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/generatorOverloads2.errors.txt b/tests/baselines/reference/generatorOverloads2.errors.txt index eb006a1bb48c0..14a24c352f119 100644 --- a/tests/baselines/reference/generatorOverloads2.errors.txt +++ b/tests/baselines/reference/generatorOverloads2.errors.txt @@ -4,7 +4,7 @@ generatorOverloads2.ts(4,13): error TS1221: Generators are not allowed in an amb ==== generatorOverloads2.ts (3 errors) ==== - declare module M { + declare namespace M { function* f(s: string): Iterable; ~ !!! error TS1221: Generators are not allowed in an ambient context. diff --git a/tests/baselines/reference/generatorOverloads2.js b/tests/baselines/reference/generatorOverloads2.js index 82d671c8d35e1..22fa83af7da18 100644 --- a/tests/baselines/reference/generatorOverloads2.js +++ b/tests/baselines/reference/generatorOverloads2.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/yieldExpressions/generatorOverloads2.ts] //// //// [generatorOverloads2.ts] -declare module M { +declare namespace M { function* f(s: string): Iterable; function* f(s: number): Iterable; function* f(s: any): Iterable; diff --git a/tests/baselines/reference/generatorOverloads2.symbols b/tests/baselines/reference/generatorOverloads2.symbols index 981853893cdf3..083b037355c9d 100644 --- a/tests/baselines/reference/generatorOverloads2.symbols +++ b/tests/baselines/reference/generatorOverloads2.symbols @@ -1,21 +1,21 @@ //// [tests/cases/conformance/es6/yieldExpressions/generatorOverloads2.ts] //// === generatorOverloads2.ts === -declare module M { +declare namespace M { >M : Symbol(M, Decl(generatorOverloads2.ts, 0, 0)) function* f(s: string): Iterable; ->f : Symbol(f, Decl(generatorOverloads2.ts, 0, 18), Decl(generatorOverloads2.ts, 1, 42), Decl(generatorOverloads2.ts, 2, 42)) +>f : Symbol(f, Decl(generatorOverloads2.ts, 0, 21), Decl(generatorOverloads2.ts, 1, 42), Decl(generatorOverloads2.ts, 2, 42)) >s : Symbol(s, Decl(generatorOverloads2.ts, 1, 16)) >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --)) function* f(s: number): Iterable; ->f : Symbol(f, Decl(generatorOverloads2.ts, 0, 18), Decl(generatorOverloads2.ts, 1, 42), Decl(generatorOverloads2.ts, 2, 42)) +>f : Symbol(f, Decl(generatorOverloads2.ts, 0, 21), Decl(generatorOverloads2.ts, 1, 42), Decl(generatorOverloads2.ts, 2, 42)) >s : Symbol(s, Decl(generatorOverloads2.ts, 2, 16)) >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --)) function* f(s: any): Iterable; ->f : Symbol(f, Decl(generatorOverloads2.ts, 0, 18), Decl(generatorOverloads2.ts, 1, 42), Decl(generatorOverloads2.ts, 2, 42)) +>f : Symbol(f, Decl(generatorOverloads2.ts, 0, 21), Decl(generatorOverloads2.ts, 1, 42), Decl(generatorOverloads2.ts, 2, 42)) >s : Symbol(s, Decl(generatorOverloads2.ts, 3, 16)) >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --)) } diff --git a/tests/baselines/reference/generatorOverloads2.types b/tests/baselines/reference/generatorOverloads2.types index a236c51e479cb..f5580847d4b6a 100644 --- a/tests/baselines/reference/generatorOverloads2.types +++ b/tests/baselines/reference/generatorOverloads2.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/yieldExpressions/generatorOverloads2.ts] //// === generatorOverloads2.ts === -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/generatorOverloads5.js b/tests/baselines/reference/generatorOverloads5.js index bf006572bceea..8195497e45b80 100644 --- a/tests/baselines/reference/generatorOverloads5.js +++ b/tests/baselines/reference/generatorOverloads5.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/yieldExpressions/generatorOverloads5.ts] //// //// [generatorOverloads5.ts] -module M { +namespace M { function f(s: string): Iterable; function f(s: number): Iterable; function* f(s: any): Iterable { } diff --git a/tests/baselines/reference/generatorOverloads5.symbols b/tests/baselines/reference/generatorOverloads5.symbols index 23bac16fdf8e8..61eb4e1a5b1d6 100644 --- a/tests/baselines/reference/generatorOverloads5.symbols +++ b/tests/baselines/reference/generatorOverloads5.symbols @@ -1,21 +1,21 @@ //// [tests/cases/conformance/es6/yieldExpressions/generatorOverloads5.ts] //// === generatorOverloads5.ts === -module M { +namespace M { >M : Symbol(M, Decl(generatorOverloads5.ts, 0, 0)) function f(s: string): Iterable; ->f : Symbol(f, Decl(generatorOverloads5.ts, 0, 10), Decl(generatorOverloads5.ts, 1, 41), Decl(generatorOverloads5.ts, 2, 41)) +>f : Symbol(f, Decl(generatorOverloads5.ts, 0, 13), Decl(generatorOverloads5.ts, 1, 41), Decl(generatorOverloads5.ts, 2, 41)) >s : Symbol(s, Decl(generatorOverloads5.ts, 1, 15)) >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --)) function f(s: number): Iterable; ->f : Symbol(f, Decl(generatorOverloads5.ts, 0, 10), Decl(generatorOverloads5.ts, 1, 41), Decl(generatorOverloads5.ts, 2, 41)) +>f : Symbol(f, Decl(generatorOverloads5.ts, 0, 13), Decl(generatorOverloads5.ts, 1, 41), Decl(generatorOverloads5.ts, 2, 41)) >s : Symbol(s, Decl(generatorOverloads5.ts, 2, 15)) >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --)) function* f(s: any): Iterable { } ->f : Symbol(f, Decl(generatorOverloads5.ts, 0, 10), Decl(generatorOverloads5.ts, 1, 41), Decl(generatorOverloads5.ts, 2, 41)) +>f : Symbol(f, Decl(generatorOverloads5.ts, 0, 13), Decl(generatorOverloads5.ts, 1, 41), Decl(generatorOverloads5.ts, 2, 41)) >s : Symbol(s, Decl(generatorOverloads5.ts, 3, 16)) >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --)) } diff --git a/tests/baselines/reference/generatorOverloads5.types b/tests/baselines/reference/generatorOverloads5.types index c8216bc974e14..311522cfa65aa 100644 --- a/tests/baselines/reference/generatorOverloads5.types +++ b/tests/baselines/reference/generatorOverloads5.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/yieldExpressions/generatorOverloads5.ts] //// === generatorOverloads5.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.errors.txt b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.errors.txt index ff20d7d6c5b26..0d1547037e9a8 100644 --- a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.errors.txt +++ b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.errors.txt @@ -21,7 +21,7 @@ genericAndNonGenericInterfaceWithTheSameName.ts(40,22): error TS2428: All declar bar: T; } - module M { + namespace M { interface A { ~ !!! error TS2428: All declarations of 'A' must have identical type parameters. @@ -35,19 +35,19 @@ genericAndNonGenericInterfaceWithTheSameName.ts(40,22): error TS2428: All declar } } - module M2 { + namespace M2 { interface A { foo: string; } } - module M2 { + namespace M2 { interface A { // ok, different declaration space than other M2 bar: T; } } - module M3 { + namespace M3 { export interface A { ~ !!! error TS2428: All declarations of 'A' must have identical type parameters. @@ -55,7 +55,7 @@ genericAndNonGenericInterfaceWithTheSameName.ts(40,22): error TS2428: All declar } } - module M3 { + namespace M3 { export interface A { // error ~ !!! error TS2428: All declarations of 'A' must have identical type parameters. diff --git a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.js b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.js index a48f87da9f103..d9773beb325f0 100644 --- a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.js +++ b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.js @@ -11,7 +11,7 @@ interface A { // error bar: T; } -module M { +namespace M { interface A { bar: T; } @@ -21,25 +21,25 @@ module M { } } -module M2 { +namespace M2 { interface A { foo: string; } } -module M2 { +namespace M2 { interface A { // ok, different declaration space than other M2 bar: T; } } -module M3 { +namespace M3 { export interface A { foo: string; } } -module M3 { +namespace M3 { export interface A { // error bar: T; } diff --git a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.symbols b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.symbols index 8376a81a73736..fcf68c8bbc317 100644 --- a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.symbols +++ b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.symbols @@ -19,11 +19,11 @@ interface A { // error >T : Symbol(T, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 6, 12)) } -module M { +namespace M { >M : Symbol(M, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 8, 1)) interface A { ->A : Symbol(A, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 10, 10), Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 13, 5)) +>A : Symbol(A, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 10, 13), Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 13, 5)) >T : Symbol(T, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 11, 16)) bar: T; @@ -32,29 +32,29 @@ module M { } interface A { // error ->A : Symbol(A, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 10, 10), Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 13, 5)) +>A : Symbol(A, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 10, 13), Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 13, 5)) foo: string; >foo : Symbol(A.foo, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 15, 17)) } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 18, 1), Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 24, 1)) interface A { ->A : Symbol(A, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 20, 11)) +>A : Symbol(A, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 20, 14)) foo: string; >foo : Symbol(A.foo, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 21, 17)) } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 18, 1), Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 24, 1)) interface A { // ok, different declaration space than other M2 ->A : Symbol(A, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 26, 11)) +>A : Symbol(A, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 26, 14)) >T : Symbol(T, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 27, 16)) bar: T; @@ -63,22 +63,22 @@ module M2 { } } -module M3 { +namespace M3 { >M3 : Symbol(M3, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 30, 1), Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 36, 1)) export interface A { ->A : Symbol(A, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 32, 11), Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 38, 11)) +>A : Symbol(A, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 32, 14), Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 38, 14)) foo: string; >foo : Symbol(A.foo, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 33, 24)) } } -module M3 { +namespace M3 { >M3 : Symbol(M3, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 30, 1), Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 36, 1)) export interface A { // error ->A : Symbol(A, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 32, 11), Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 38, 11)) +>A : Symbol(A, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 32, 14), Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 38, 14)) >T : Symbol(T, Decl(genericAndNonGenericInterfaceWithTheSameName.ts, 39, 23)) bar: T; diff --git a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.types b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.types index ad2e4fef904b9..153d2b00e0542 100644 --- a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.types +++ b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.types @@ -15,7 +15,7 @@ interface A { // error > : ^ } -module M { +namespace M { interface A { bar: T; >bar : T @@ -29,7 +29,7 @@ module M { } } -module M2 { +namespace M2 { interface A { foo: string; >foo : string @@ -37,7 +37,7 @@ module M2 { } } -module M2 { +namespace M2 { interface A { // ok, different declaration space than other M2 bar: T; >bar : T @@ -45,7 +45,7 @@ module M2 { } } -module M3 { +namespace M3 { export interface A { foo: string; >foo : string @@ -53,7 +53,7 @@ module M3 { } } -module M3 { +namespace M3 { export interface A { // error bar: T; >bar : T diff --git a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.js b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.js index b0d98e771f257..9914bbe9ef4bd 100644 --- a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.js +++ b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.js @@ -3,26 +3,26 @@ //// [genericAndNonGenericInterfaceWithTheSameName2.ts] // generic and non-generic interfaces with the same name do not merge -module M { +namespace M { interface A { bar: T; } } -module M2 { +namespace M2 { interface A { // ok foo: string; } } -module N { - module M { +namespace N { + namespace M { interface A { bar: T; } } - module M2 { + namespace M2 { interface A { // ok foo: string; } diff --git a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.symbols b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.symbols index 0d5790ed3f0c4..4fc3e199352d1 100644 --- a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.symbols +++ b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.symbols @@ -3,11 +3,11 @@ === genericAndNonGenericInterfaceWithTheSameName2.ts === // generic and non-generic interfaces with the same name do not merge -module M { +namespace M { >M : Symbol(M, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 0, 0)) interface A { ->A : Symbol(A, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 2, 10)) +>A : Symbol(A, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 2, 13)) >T : Symbol(T, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 3, 16)) bar: T; @@ -16,25 +16,25 @@ module M { } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 6, 1)) interface A { // ok ->A : Symbol(A, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 8, 11)) +>A : Symbol(A, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 8, 14)) foo: string; >foo : Symbol(A.foo, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 9, 17)) } } -module N { +namespace N { >N : Symbol(N, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 12, 1)) - module M { ->M : Symbol(M, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 14, 10)) + namespace M { +>M : Symbol(M, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 14, 13)) interface A { ->A : Symbol(A, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 15, 14)) +>A : Symbol(A, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 15, 17)) >T : Symbol(T, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 16, 20)) bar: T; @@ -43,11 +43,11 @@ module N { } } - module M2 { + namespace M2 { >M2 : Symbol(M2, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 19, 5)) interface A { // ok ->A : Symbol(A, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 21, 15)) +>A : Symbol(A, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 21, 18)) foo: string; >foo : Symbol(A.foo, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 22, 21)) diff --git a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.types b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.types index cadb670b7c4aa..4ada2e14288d6 100644 --- a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.types +++ b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.types @@ -3,7 +3,7 @@ === genericAndNonGenericInterfaceWithTheSameName2.ts === // generic and non-generic interfaces with the same name do not merge -module M { +namespace M { interface A { bar: T; >bar : T @@ -11,7 +11,7 @@ module M { } } -module M2 { +namespace M2 { interface A { // ok foo: string; >foo : string @@ -19,8 +19,8 @@ module M2 { } } -module N { - module M { +namespace N { + namespace M { interface A { bar: T; >bar : T @@ -28,7 +28,7 @@ module N { } } - module M2 { + namespace M2 { interface A { // ok foo: string; >foo : string diff --git a/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.errors.txt b/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.errors.txt index ea5c26f44a5f2..13e92615742b1 100644 --- a/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.errors.txt +++ b/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.errors.txt @@ -4,7 +4,7 @@ genericArgumentCallSigAssignmentCompat.ts(16,31): error TS2345: Argument of type ==== genericArgumentCallSigAssignmentCompat.ts (1 errors) ==== - module Underscore { + namespace Underscore { export interface Iterator { (value: T, index: any, list: any): U; } diff --git a/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.js b/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.js index 56bd39756d629..d15140fd18ac5 100644 --- a/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.js +++ b/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericArgumentCallSigAssignmentCompat.ts] //// //// [genericArgumentCallSigAssignmentCompat.ts] -module Underscore { +namespace Underscore { export interface Iterator { (value: T, index: any, list: any): U; } diff --git a/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.symbols b/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.symbols index 0fe839767b0de..668b094ff9c84 100644 --- a/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.symbols +++ b/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/genericArgumentCallSigAssignmentCompat.ts] //// === genericArgumentCallSigAssignmentCompat.ts === -module Underscore { +namespace Underscore { >Underscore : Symbol(Underscore, Decl(genericArgumentCallSigAssignmentCompat.ts, 0, 0)) export interface Iterator { ->Iterator : Symbol(Iterator, Decl(genericArgumentCallSigAssignmentCompat.ts, 0, 19)) +>Iterator : Symbol(Iterator, Decl(genericArgumentCallSigAssignmentCompat.ts, 0, 22)) >T : Symbol(T, Decl(genericArgumentCallSigAssignmentCompat.ts, 1, 30)) >U : Symbol(U, Decl(genericArgumentCallSigAssignmentCompat.ts, 1, 32)) @@ -26,7 +26,7 @@ module Underscore { >list : Symbol(list, Decl(genericArgumentCallSigAssignmentCompat.ts, 6, 15)) >T : Symbol(T, Decl(genericArgumentCallSigAssignmentCompat.ts, 6, 12)) >iterator : Symbol(iterator, Decl(genericArgumentCallSigAssignmentCompat.ts, 6, 25)) ->Iterator : Symbol(Iterator, Decl(genericArgumentCallSigAssignmentCompat.ts, 0, 19)) +>Iterator : Symbol(Iterator, Decl(genericArgumentCallSigAssignmentCompat.ts, 0, 22)) >T : Symbol(T, Decl(genericArgumentCallSigAssignmentCompat.ts, 6, 12)) >context : Symbol(context, Decl(genericArgumentCallSigAssignmentCompat.ts, 6, 58)) diff --git a/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.types b/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.types index 5628d1aacf8d2..ba50e231652b5 100644 --- a/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.types +++ b/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericArgumentCallSigAssignmentCompat.ts] //// === genericArgumentCallSigAssignmentCompat.ts === -module Underscore { +namespace Underscore { export interface Iterator { (value: T, index: any, list: any): U; >value : T diff --git a/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.errors.txt b/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.errors.txt index 653b071b3b4cc..01a2e085d3f9d 100644 --- a/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.errors.txt +++ b/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.errors.txt @@ -35,7 +35,7 @@ genericCallToOverloadedMethodWithOverloadedArguments.ts(84,38): error TS2769: No ==== genericCallToOverloadedMethodWithOverloadedArguments.ts (4 errors) ==== - module m1 { + namespace m1 { interface Promise { then(cb: (x: T) => Promise): Promise; } @@ -48,7 +48,7 @@ genericCallToOverloadedMethodWithOverloadedArguments.ts(84,38): error TS2769: No ////////////////////////////////////// - module m2 { + namespace m2 { interface Promise { then(cb: (x: T) => Promise): Promise; } @@ -66,7 +66,7 @@ genericCallToOverloadedMethodWithOverloadedArguments.ts(84,38): error TS2769: No ////////////////////////////////////// - module m3 { + namespace m3 { interface Promise { then(cb: (x: T) => Promise): Promise; then(cb: (x: T) => Promise, error?: (error: any) => Promise): Promise; @@ -80,7 +80,7 @@ genericCallToOverloadedMethodWithOverloadedArguments.ts(84,38): error TS2769: No ////////////////////////////////////// - module m4 { + namespace m4 { interface Promise { then(cb: (x: T) => Promise): Promise; then(cb: (x: T) => Promise, error?: (error: any) => Promise): Promise; @@ -105,7 +105,7 @@ genericCallToOverloadedMethodWithOverloadedArguments.ts(84,38): error TS2769: No ////////////////////////////////////// - module m5 { + namespace m5 { interface Promise { then(cb: (x: T) => Promise): Promise; then(cb: (x: T) => Promise, error?: (error: any) => Promise): Promise; @@ -135,7 +135,7 @@ genericCallToOverloadedMethodWithOverloadedArguments.ts(84,38): error TS2769: No ////////////////////////////////////// - module m6 { + namespace m6 { interface Promise { then(cb: (x: T) => Promise): Promise; then(cb: (x: T) => Promise, error?: (error: any) => Promise): Promise; diff --git a/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.js b/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.js index 84dbaf1956523..30eee28bcdeac 100644 --- a/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.js +++ b/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/typeInference/genericCallToOverloadedMethodWithOverloadedArguments.ts] //// //// [genericCallToOverloadedMethodWithOverloadedArguments.ts] -module m1 { +namespace m1 { interface Promise { then(cb: (x: T) => Promise): Promise; } @@ -14,7 +14,7 @@ module m1 { ////////////////////////////////////// -module m2 { +namespace m2 { interface Promise { then(cb: (x: T) => Promise): Promise; } @@ -28,7 +28,7 @@ module m2 { ////////////////////////////////////// -module m3 { +namespace m3 { interface Promise { then(cb: (x: T) => Promise): Promise; then(cb: (x: T) => Promise, error?: (error: any) => Promise): Promise; @@ -42,7 +42,7 @@ module m3 { ////////////////////////////////////// -module m4 { +namespace m4 { interface Promise { then(cb: (x: T) => Promise): Promise; then(cb: (x: T) => Promise, error?: (error: any) => Promise): Promise; @@ -57,7 +57,7 @@ module m4 { ////////////////////////////////////// -module m5 { +namespace m5 { interface Promise { then(cb: (x: T) => Promise): Promise; then(cb: (x: T) => Promise, error?: (error: any) => Promise): Promise; @@ -73,7 +73,7 @@ module m5 { ////////////////////////////////////// -module m6 { +namespace m6 { interface Promise { then(cb: (x: T) => Promise): Promise; then(cb: (x: T) => Promise, error?: (error: any) => Promise): Promise; diff --git a/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.symbols b/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.symbols index e82b6b31fa6b3..770090eff1a26 100644 --- a/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.symbols +++ b/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/types/typeRelationships/typeInference/genericCallToOverloadedMethodWithOverloadedArguments.ts] //// === genericCallToOverloadedMethodWithOverloadedArguments.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 0, 0)) interface Promise { ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 0, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 0, 14)) >T : Symbol(T, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 1, 22)) then(cb: (x: T) => Promise): Promise; @@ -14,20 +14,20 @@ module m1 { >cb : Symbol(cb, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 2, 16)) >x : Symbol(x, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 2, 21)) >T : Symbol(T, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 1, 22)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 0, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 0, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 2, 13)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 0, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 0, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 2, 13)) } declare function testFunction(n: number): Promise; >testFunction : Symbol(testFunction, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 3, 5)) >n : Symbol(n, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 5, 34)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 0, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 0, 14)) var numPromise: Promise; >numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 7, 7)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 0, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 0, 14)) var newPromise = numPromise.then(testFunction); >newPromise : Symbol(newPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 8, 7)) @@ -39,11 +39,11 @@ module m1 { ////////////////////////////////////// -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 9, 1)) interface Promise { ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 13, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 13, 14)) >T : Symbol(T, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 14, 22)) then(cb: (x: T) => Promise): Promise; @@ -52,25 +52,25 @@ module m2 { >cb : Symbol(cb, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 15, 16)) >x : Symbol(x, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 15, 21)) >T : Symbol(T, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 14, 22)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 13, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 13, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 15, 13)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 13, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 13, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 15, 13)) } declare function testFunction(n: number): Promise; >testFunction : Symbol(testFunction, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 16, 5), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 18, 62)) >n : Symbol(n, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 18, 34)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 13, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 13, 14)) declare function testFunction(s: string): Promise; >testFunction : Symbol(testFunction, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 16, 5), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 18, 62)) >s : Symbol(s, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 19, 34)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 13, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 13, 14)) var numPromise: Promise; >numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 21, 7)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 13, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 13, 14)) var newPromise = numPromise.then(testFunction); >newPromise : Symbol(newPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 22, 7)) @@ -82,11 +82,11 @@ module m2 { ////////////////////////////////////// -module m3 { +namespace m3 { >m3 : Symbol(m3, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 23, 1)) interface Promise { ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 27, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 27, 14)) >T : Symbol(T, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 28, 22)) then(cb: (x: T) => Promise): Promise; @@ -95,9 +95,9 @@ module m3 { >cb : Symbol(cb, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 29, 16)) >x : Symbol(x, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 29, 21)) >T : Symbol(T, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 28, 22)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 27, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 27, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 29, 13)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 27, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 27, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 29, 13)) then(cb: (x: T) => Promise, error?: (error: any) => Promise): Promise; @@ -106,24 +106,24 @@ module m3 { >cb : Symbol(cb, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 30, 16)) >x : Symbol(x, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 30, 21)) >T : Symbol(T, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 28, 22)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 27, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 27, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 30, 13)) >error : Symbol(error, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 30, 41)) >error : Symbol(error, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 30, 51)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 27, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 27, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 30, 13)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 27, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 27, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 30, 13)) } declare function testFunction(n: number): Promise; >testFunction : Symbol(testFunction, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 31, 5)) >n : Symbol(n, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 33, 34)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 27, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 27, 14)) var numPromise: Promise; >numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 35, 7)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 27, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 27, 14)) var newPromise = numPromise.then(testFunction); >newPromise : Symbol(newPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 36, 7)) @@ -135,11 +135,11 @@ module m3 { ////////////////////////////////////// -module m4 { +namespace m4 { >m4 : Symbol(m4, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 37, 1)) interface Promise { ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 41, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 41, 14)) >T : Symbol(T, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 42, 22)) then(cb: (x: T) => Promise): Promise; @@ -148,9 +148,9 @@ module m4 { >cb : Symbol(cb, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 43, 16)) >x : Symbol(x, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 43, 21)) >T : Symbol(T, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 42, 22)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 41, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 41, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 43, 13)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 41, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 41, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 43, 13)) then(cb: (x: T) => Promise, error?: (error: any) => Promise): Promise; @@ -159,29 +159,29 @@ module m4 { >cb : Symbol(cb, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 44, 16)) >x : Symbol(x, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 44, 21)) >T : Symbol(T, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 42, 22)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 41, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 41, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 44, 13)) >error : Symbol(error, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 44, 41)) >error : Symbol(error, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 44, 51)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 41, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 41, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 44, 13)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 41, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 41, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 44, 13)) } declare function testFunction(n: number): Promise; >testFunction : Symbol(testFunction, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 45, 5), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 47, 62)) >n : Symbol(n, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 47, 34)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 41, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 41, 14)) declare function testFunction(s: string): Promise; >testFunction : Symbol(testFunction, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 45, 5), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 47, 62)) >s : Symbol(s, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 48, 34)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 41, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 41, 14)) var numPromise: Promise; >numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 50, 7)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 41, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 41, 14)) var newPromise = numPromise.then(testFunction); >newPromise : Symbol(newPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 51, 7)) @@ -193,11 +193,11 @@ module m4 { ////////////////////////////////////// -module m5 { +namespace m5 { >m5 : Symbol(m5, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 52, 1)) interface Promise { ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 14)) >T : Symbol(T, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 57, 22)) then(cb: (x: T) => Promise): Promise; @@ -206,9 +206,9 @@ module m5 { >cb : Symbol(cb, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 58, 16)) >x : Symbol(x, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 58, 21)) >T : Symbol(T, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 57, 22)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 58, 13)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 58, 13)) then(cb: (x: T) => Promise, error?: (error: any) => Promise): Promise; @@ -217,13 +217,13 @@ module m5 { >cb : Symbol(cb, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 59, 16)) >x : Symbol(x, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 59, 21)) >T : Symbol(T, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 57, 22)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 59, 13)) >error : Symbol(error, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 59, 41)) >error : Symbol(error, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 59, 51)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 59, 13)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 59, 13)) then(cb: (x: T) => Promise, error?: (error: any) => U, progress?: (preservation: any) => void): Promise; @@ -232,30 +232,30 @@ module m5 { >cb : Symbol(cb, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 60, 16)) >x : Symbol(x, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 60, 21)) >T : Symbol(T, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 57, 22)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 60, 13)) >error : Symbol(error, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 60, 41)) >error : Symbol(error, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 60, 51)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 60, 13)) >progress : Symbol(progress, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 60, 68)) >preservation : Symbol(preservation, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 60, 81)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 60, 13)) } declare function testFunction(n: number): Promise; >testFunction : Symbol(testFunction, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 61, 5), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 63, 62)) >n : Symbol(n, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 63, 34)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 14)) declare function testFunction(s: string): Promise; >testFunction : Symbol(testFunction, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 61, 5), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 63, 62)) >s : Symbol(s, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 64, 34)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 14)) var numPromise: Promise; >numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 66, 7)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 56, 14)) var newPromise = numPromise.then(testFunction); >newPromise : Symbol(newPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 67, 7)) @@ -267,11 +267,11 @@ module m5 { ////////////////////////////////////// -module m6 { +namespace m6 { >m6 : Symbol(m6, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 68, 1)) interface Promise { ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 72, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 72, 14)) >T : Symbol(T, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 73, 22)) then(cb: (x: T) => Promise): Promise; @@ -280,9 +280,9 @@ module m6 { >cb : Symbol(cb, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 74, 16)) >x : Symbol(x, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 74, 21)) >T : Symbol(T, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 73, 22)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 72, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 72, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 74, 13)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 72, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 72, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 74, 13)) then(cb: (x: T) => Promise, error?: (error: any) => Promise): Promise; @@ -291,34 +291,34 @@ module m6 { >cb : Symbol(cb, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 75, 16)) >x : Symbol(x, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 75, 21)) >T : Symbol(T, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 73, 22)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 72, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 72, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 75, 13)) >error : Symbol(error, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 75, 41)) >error : Symbol(error, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 75, 51)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 72, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 72, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 75, 13)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 72, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 72, 14)) >U : Symbol(U, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 75, 13)) } declare function testFunction(n: number): Promise; >testFunction : Symbol(testFunction, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 76, 5), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 78, 62), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 79, 62)) >n : Symbol(n, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 78, 34)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 72, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 72, 14)) declare function testFunction(s: string): Promise; >testFunction : Symbol(testFunction, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 76, 5), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 78, 62), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 79, 62)) >s : Symbol(s, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 79, 34)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 72, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 72, 14)) declare function testFunction(b: boolean): Promise; >testFunction : Symbol(testFunction, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 76, 5), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 78, 62), Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 79, 62)) >b : Symbol(b, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 80, 34)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 72, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 72, 14)) var numPromise: Promise; >numPromise : Symbol(numPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 82, 7)) ->Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 72, 11)) +>Promise : Symbol(Promise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 72, 14)) var newPromise = numPromise.then(testFunction); >newPromise : Symbol(newPromise, Decl(genericCallToOverloadedMethodWithOverloadedArguments.ts, 83, 7)) diff --git a/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.types b/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.types index 8ae53fb5a90bd..d1658fdc1895f 100644 --- a/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.types +++ b/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/typeInference/genericCallToOverloadedMethodWithOverloadedArguments.ts] //// === genericCallToOverloadedMethodWithOverloadedArguments.ts === -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -42,7 +42,7 @@ module m1 { ////////////////////////////////////// -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -89,7 +89,7 @@ module m2 { ////////////////////////////////////// -module m3 { +namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ @@ -142,7 +142,7 @@ module m3 { ////////////////////////////////////// -module m4 { +namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ @@ -201,7 +201,7 @@ module m4 { ////////////////////////////////////// -module m5 { +namespace m5 { >m5 : typeof m5 > : ^^^^^^^^^ @@ -276,7 +276,7 @@ module m5 { ////////////////////////////////////// -module m6 { +namespace m6 { >m6 : typeof m6 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.errors.txt b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.errors.txt index 6a958e04b9cf0..bc374e7e856c5 100644 --- a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.errors.txt +++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.errors.txt @@ -26,7 +26,7 @@ genericCallWithGenericSignatureArguments2.ts(67,57): error TS2304: Cannot find n // When a function expression is inferentially typed (section 4.9.3) and a type assigned to a parameter in that expression references type parameters for which inferences are being made, // the corresponding inferred type arguments to become fixed and no further candidate inferences are made for them. - module onlyT { + namespace onlyT { function foo(a: (x: T) => T, b: (x: T) => T) { var r: (x: T) => T; return r; @@ -80,7 +80,7 @@ genericCallWithGenericSignatureArguments2.ts(67,57): error TS2304: Cannot find n !!! related TS6502 genericCallWithGenericSignatureArguments2.ts:32:47: The expected type comes from the return type of this signature. } - module TU { + namespace TU { function foo(a: (x: T) => T, b: (x: U) => U) { var r: (x: T) => T; return r; diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.js b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.js index 497602a17d19b..ab99f367c8c16 100644 --- a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.js +++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.js @@ -4,7 +4,7 @@ // When a function expression is inferentially typed (section 4.9.3) and a type assigned to a parameter in that expression references type parameters for which inferences are being made, // the corresponding inferred type arguments to become fixed and no further candidate inferences are made for them. -module onlyT { +namespace onlyT { function foo(a: (x: T) => T, b: (x: T) => T) { var r: (x: T) => T; return r; @@ -40,7 +40,7 @@ module onlyT { var r7 = foo3(E.A, (x) => E.A, (x) => F.A); // error } -module TU { +namespace TU { function foo(a: (x: T) => T, b: (x: U) => U) { var r: (x: T) => T; return r; diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.symbols b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.symbols index 13dc4f102d623..1b216681a4e3a 100644 --- a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.symbols +++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.symbols @@ -4,11 +4,11 @@ // When a function expression is inferentially typed (section 4.9.3) and a type assigned to a parameter in that expression references type parameters for which inferences are being made, // the corresponding inferred type arguments to become fixed and no further candidate inferences are made for them. -module onlyT { +namespace onlyT { >onlyT : Symbol(onlyT, Decl(genericCallWithGenericSignatureArguments2.ts, 0, 0)) function foo(a: (x: T) => T, b: (x: T) => T) { ->foo : Symbol(foo, Decl(genericCallWithGenericSignatureArguments2.ts, 3, 14)) +>foo : Symbol(foo, Decl(genericCallWithGenericSignatureArguments2.ts, 3, 17)) >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments2.ts, 4, 17)) >a : Symbol(a, Decl(genericCallWithGenericSignatureArguments2.ts, 4, 20)) >x : Symbol(x, Decl(genericCallWithGenericSignatureArguments2.ts, 4, 24)) @@ -32,7 +32,7 @@ module onlyT { var r1: (x: {}) => {} = foo((x: number) => 1, (x: string) => ''); >r1 : Symbol(r1, Decl(genericCallWithGenericSignatureArguments2.ts, 9, 7)) >x : Symbol(x, Decl(genericCallWithGenericSignatureArguments2.ts, 9, 13)) ->foo : Symbol(foo, Decl(genericCallWithGenericSignatureArguments2.ts, 3, 14)) +>foo : Symbol(foo, Decl(genericCallWithGenericSignatureArguments2.ts, 3, 17)) >x : Symbol(x, Decl(genericCallWithGenericSignatureArguments2.ts, 9, 33)) >x : Symbol(x, Decl(genericCallWithGenericSignatureArguments2.ts, 9, 51)) @@ -45,7 +45,7 @@ module onlyT { var r7 = foo((a: T) => a, (b: T) => b); // T => T >r7 : Symbol(r7, Decl(genericCallWithGenericSignatureArguments2.ts, 12, 11)) ->foo : Symbol(foo, Decl(genericCallWithGenericSignatureArguments2.ts, 3, 14)) +>foo : Symbol(foo, Decl(genericCallWithGenericSignatureArguments2.ts, 3, 17)) >a : Symbol(a, Decl(genericCallWithGenericSignatureArguments2.ts, 12, 22)) >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments2.ts, 11, 20)) >a : Symbol(a, Decl(genericCallWithGenericSignatureArguments2.ts, 12, 22)) @@ -161,11 +161,11 @@ module onlyT { >A : Symbol(F.A, Decl(genericCallWithGenericSignatureArguments2.ts, 29, 12)) } -module TU { +namespace TU { >TU : Symbol(TU, Decl(genericCallWithGenericSignatureArguments2.ts, 37, 1)) function foo(a: (x: T) => T, b: (x: U) => U) { ->foo : Symbol(foo, Decl(genericCallWithGenericSignatureArguments2.ts, 39, 11)) +>foo : Symbol(foo, Decl(genericCallWithGenericSignatureArguments2.ts, 39, 14)) >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments2.ts, 40, 17)) >U : Symbol(U, Decl(genericCallWithGenericSignatureArguments2.ts, 40, 19)) >a : Symbol(a, Decl(genericCallWithGenericSignatureArguments2.ts, 40, 23)) @@ -190,7 +190,7 @@ module TU { var r1: (x: {}) => {} = foo((x: number) => 1, (x: string) => ''); >r1 : Symbol(r1, Decl(genericCallWithGenericSignatureArguments2.ts, 45, 7)) >x : Symbol(x, Decl(genericCallWithGenericSignatureArguments2.ts, 45, 13)) ->foo : Symbol(foo, Decl(genericCallWithGenericSignatureArguments2.ts, 39, 11)) +>foo : Symbol(foo, Decl(genericCallWithGenericSignatureArguments2.ts, 39, 14)) >x : Symbol(x, Decl(genericCallWithGenericSignatureArguments2.ts, 45, 33)) >x : Symbol(x, Decl(genericCallWithGenericSignatureArguments2.ts, 45, 51)) @@ -203,7 +203,7 @@ module TU { var r7 = foo((a: T) => a, (b: T) => b); >r7 : Symbol(r7, Decl(genericCallWithGenericSignatureArguments2.ts, 48, 11)) ->foo : Symbol(foo, Decl(genericCallWithGenericSignatureArguments2.ts, 39, 11)) +>foo : Symbol(foo, Decl(genericCallWithGenericSignatureArguments2.ts, 39, 14)) >a : Symbol(a, Decl(genericCallWithGenericSignatureArguments2.ts, 48, 22)) >T : Symbol(T, Decl(genericCallWithGenericSignatureArguments2.ts, 47, 20)) >a : Symbol(a, Decl(genericCallWithGenericSignatureArguments2.ts, 48, 22)) diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types index 09fe11a54013c..0f43a3ff048d1 100644 --- a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types +++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types @@ -4,7 +4,7 @@ // When a function expression is inferentially typed (section 4.9.3) and a type assigned to a parameter in that expression references type parameters for which inferences are being made, // the corresponding inferred type arguments to become fixed and no further candidate inferences are made for them. -module onlyT { +namespace onlyT { >onlyT : typeof onlyT > : ^^^^^^^^^^^^ @@ -245,7 +245,7 @@ module onlyT { > : ^ } -module TU { +namespace TU { >TU : typeof TU > : ^^^^^^^^^ diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.js b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.js index 71c913566809b..35f5932a3c2b3 100644 --- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.js +++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.js @@ -4,7 +4,7 @@ // Function typed arguments with multiple signatures must be passed an implementation that matches all of them // Inferences are made quadratic-pairwise to and from these overload sets -module NonGenericParameter { +namespace NonGenericParameter { var a: { new(x: boolean): boolean; new(x: string): string; @@ -19,7 +19,7 @@ module NonGenericParameter { var r2 = foo4(b); } -module GenericParameter { +namespace GenericParameter { function foo5(cb: { new(x: T): string; new(x: number): T }) { return cb; } diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.symbols b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.symbols index 5b8926b678005..3d48e1cef4cfc 100644 --- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.symbols +++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.symbols @@ -4,7 +4,7 @@ // Function typed arguments with multiple signatures must be passed an implementation that matches all of them // Inferences are made quadratic-pairwise to and from these overload sets -module NonGenericParameter { +namespace NonGenericParameter { >NonGenericParameter : Symbol(NonGenericParameter, Decl(genericCallWithOverloadedConstructorTypedArguments.ts, 0, 0)) var a: { @@ -44,11 +44,11 @@ module NonGenericParameter { >b : Symbol(b, Decl(genericCallWithOverloadedConstructorTypedArguments.ts, 14, 7)) } -module GenericParameter { +namespace GenericParameter { >GenericParameter : Symbol(GenericParameter, Decl(genericCallWithOverloadedConstructorTypedArguments.ts, 16, 1)) function foo5(cb: { new(x: T): string; new(x: number): T }) { ->foo5 : Symbol(foo5, Decl(genericCallWithOverloadedConstructorTypedArguments.ts, 18, 25)) +>foo5 : Symbol(foo5, Decl(genericCallWithOverloadedConstructorTypedArguments.ts, 18, 28)) >T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments.ts, 19, 18)) >cb : Symbol(cb, Decl(genericCallWithOverloadedConstructorTypedArguments.ts, 19, 21)) >x : Symbol(x, Decl(genericCallWithOverloadedConstructorTypedArguments.ts, 19, 31)) @@ -71,7 +71,7 @@ module GenericParameter { } var r5 = foo5(a); // new{} => string; new(x:number) => {} >r5 : Symbol(r5, Decl(genericCallWithOverloadedConstructorTypedArguments.ts, 27, 7)) ->foo5 : Symbol(foo5, Decl(genericCallWithOverloadedConstructorTypedArguments.ts, 18, 25)) +>foo5 : Symbol(foo5, Decl(genericCallWithOverloadedConstructorTypedArguments.ts, 18, 28)) >a : Symbol(a, Decl(genericCallWithOverloadedConstructorTypedArguments.ts, 23, 7)) var b: { new(x: T): string; new(x: number): T; } @@ -85,7 +85,7 @@ module GenericParameter { var r7 = foo5(b); // new any => string; new(x:number) => any >r7 : Symbol(r7, Decl(genericCallWithOverloadedConstructorTypedArguments.ts, 29, 7)) ->foo5 : Symbol(foo5, Decl(genericCallWithOverloadedConstructorTypedArguments.ts, 18, 25)) +>foo5 : Symbol(foo5, Decl(genericCallWithOverloadedConstructorTypedArguments.ts, 18, 28)) >b : Symbol(b, Decl(genericCallWithOverloadedConstructorTypedArguments.ts, 28, 7)) function foo6(cb: { new(x: T): string; new(x: T, y?: T): string }) { diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types index 0575cf67290aa..411b78f1969fd 100644 --- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types +++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types @@ -4,7 +4,7 @@ // Function typed arguments with multiple signatures must be passed an implementation that matches all of them // Inferences are made quadratic-pairwise to and from these overload sets -module NonGenericParameter { +namespace NonGenericParameter { >NonGenericParameter : typeof NonGenericParameter > : ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -63,7 +63,7 @@ module NonGenericParameter { > : ^^^^^ ^^ ^^ ^^^^^ } -module GenericParameter { +namespace GenericParameter { >GenericParameter : typeof GenericParameter > : ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.errors.txt b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.errors.txt index 37ba19c5696f7..e9c57cf7182dc 100644 --- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.errors.txt +++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.errors.txt @@ -6,7 +6,7 @@ genericCallWithOverloadedConstructorTypedArguments2.ts(31,20): error TS2345: Arg // Function typed arguments with multiple signatures must be passed an implementation that matches all of them // Inferences are made quadratic-pairwise to and from these overload sets - module NonGenericParameter { + namespace NonGenericParameter { var a: { new(x: boolean): boolean; new(x: string): string; @@ -20,7 +20,7 @@ genericCallWithOverloadedConstructorTypedArguments2.ts(31,20): error TS2345: Arg var r3 = foo4(b); // ok } - module GenericParameter { + namespace GenericParameter { function foo5(cb: { new(x: T): string; new(x: number): T }) { return cb; } diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.js b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.js index cfde33bfbbb3a..98349b629a1c4 100644 --- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.js +++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.js @@ -4,7 +4,7 @@ // Function typed arguments with multiple signatures must be passed an implementation that matches all of them // Inferences are made quadratic-pairwise to and from these overload sets -module NonGenericParameter { +namespace NonGenericParameter { var a: { new(x: boolean): boolean; new(x: string): string; @@ -18,7 +18,7 @@ module NonGenericParameter { var r3 = foo4(b); // ok } -module GenericParameter { +namespace GenericParameter { function foo5(cb: { new(x: T): string; new(x: number): T }) { return cb; } diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.symbols b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.symbols index a27cd017ff866..f4d567818c6d6 100644 --- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.symbols +++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.symbols @@ -4,7 +4,7 @@ // Function typed arguments with multiple signatures must be passed an implementation that matches all of them // Inferences are made quadratic-pairwise to and from these overload sets -module NonGenericParameter { +namespace NonGenericParameter { >NonGenericParameter : Symbol(NonGenericParameter, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 0, 0)) var a: { @@ -40,11 +40,11 @@ module NonGenericParameter { >b : Symbol(b, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 13, 7)) } -module GenericParameter { +namespace GenericParameter { >GenericParameter : Symbol(GenericParameter, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 15, 1)) function foo5(cb: { new(x: T): string; new(x: number): T }) { ->foo5 : Symbol(foo5, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 17, 25)) +>foo5 : Symbol(foo5, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 17, 28)) >T : Symbol(T, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 18, 18)) >cb : Symbol(cb, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 18, 21)) >x : Symbol(x, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 18, 31)) @@ -65,7 +65,7 @@ module GenericParameter { var r6 = foo5(a); // ok >r6 : Symbol(r6, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 23, 7)) ->foo5 : Symbol(foo5, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 17, 25)) +>foo5 : Symbol(foo5, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 17, 28)) >a : Symbol(a, Decl(genericCallWithOverloadedConstructorTypedArguments2.ts, 22, 7)) function foo6(cb: { new(x: T): string; new(x: T, y?: T): string }) { diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.types b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.types index 64199177e33c8..c4a4c4d3a8ad4 100644 --- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.types +++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.types @@ -4,7 +4,7 @@ // Function typed arguments with multiple signatures must be passed an implementation that matches all of them // Inferences are made quadratic-pairwise to and from these overload sets -module NonGenericParameter { +namespace NonGenericParameter { >NonGenericParameter : typeof NonGenericParameter > : ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -51,7 +51,7 @@ module NonGenericParameter { > : ^^^^^ ^^ ^^ ^^ ^^^^^ } -module GenericParameter { +namespace GenericParameter { >GenericParameter : typeof GenericParameter > : ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.js b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.js index beb55fc820e91..54a5a7f87b80c 100644 --- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.js +++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.js @@ -4,7 +4,7 @@ // Function typed arguments with multiple signatures must be passed an implementation that matches all of them // Inferences are made quadratic-pairwise to and from these overload sets -module NonGenericParameter { +namespace NonGenericParameter { var a: { (x: boolean): boolean; (x: string): string; @@ -19,7 +19,7 @@ module NonGenericParameter { var r4 = foo4(x => x); } -module GenericParameter { +namespace GenericParameter { function foo5(cb: { (x: T): string; (x: number): T }) { return cb; } diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.symbols b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.symbols index a0999fd16cbe6..47d2c2ae938bb 100644 --- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.symbols +++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.symbols @@ -4,7 +4,7 @@ // Function typed arguments with multiple signatures must be passed an implementation that matches all of them // Inferences are made quadratic-pairwise to and from these overload sets -module NonGenericParameter { +namespace NonGenericParameter { >NonGenericParameter : Symbol(NonGenericParameter, Decl(genericCallWithOverloadedFunctionTypedArguments.ts, 0, 0)) var a: { @@ -46,11 +46,11 @@ module NonGenericParameter { >x : Symbol(x, Decl(genericCallWithOverloadedFunctionTypedArguments.ts, 15, 18)) } -module GenericParameter { +namespace GenericParameter { >GenericParameter : Symbol(GenericParameter, Decl(genericCallWithOverloadedFunctionTypedArguments.ts, 16, 1)) function foo5(cb: { (x: T): string; (x: number): T }) { ->foo5 : Symbol(foo5, Decl(genericCallWithOverloadedFunctionTypedArguments.ts, 18, 25)) +>foo5 : Symbol(foo5, Decl(genericCallWithOverloadedFunctionTypedArguments.ts, 18, 28)) >T : Symbol(T, Decl(genericCallWithOverloadedFunctionTypedArguments.ts, 19, 18)) >cb : Symbol(cb, Decl(genericCallWithOverloadedFunctionTypedArguments.ts, 19, 21)) >x : Symbol(x, Decl(genericCallWithOverloadedFunctionTypedArguments.ts, 19, 28)) @@ -64,7 +64,7 @@ module GenericParameter { var r5 = foo5(x => x); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed]. T is any >r5 : Symbol(r5, Decl(genericCallWithOverloadedFunctionTypedArguments.ts, 23, 7)) ->foo5 : Symbol(foo5, Decl(genericCallWithOverloadedFunctionTypedArguments.ts, 18, 25)) +>foo5 : Symbol(foo5, Decl(genericCallWithOverloadedFunctionTypedArguments.ts, 18, 28)) >x : Symbol(x, Decl(genericCallWithOverloadedFunctionTypedArguments.ts, 23, 18)) >x : Symbol(x, Decl(genericCallWithOverloadedFunctionTypedArguments.ts, 23, 18)) @@ -79,7 +79,7 @@ module GenericParameter { var r7 = foo5(a); // any => string (+1 overload) >r7 : Symbol(r7, Decl(genericCallWithOverloadedFunctionTypedArguments.ts, 25, 7)) ->foo5 : Symbol(foo5, Decl(genericCallWithOverloadedFunctionTypedArguments.ts, 18, 25)) +>foo5 : Symbol(foo5, Decl(genericCallWithOverloadedFunctionTypedArguments.ts, 18, 28)) >a : Symbol(a, Decl(genericCallWithOverloadedFunctionTypedArguments.ts, 24, 7), Decl(genericCallWithOverloadedFunctionTypedArguments.ts, 41, 7)) function foo6(cb: { (x: T): string; (x: T, y?: T): string }) { diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types index 896f081b5c833..a8c73c8634eaf 100644 --- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types +++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types @@ -4,7 +4,7 @@ // Function typed arguments with multiple signatures must be passed an implementation that matches all of them // Inferences are made quadratic-pairwise to and from these overload sets -module NonGenericParameter { +namespace NonGenericParameter { >NonGenericParameter : typeof NonGenericParameter > : ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -71,7 +71,7 @@ module NonGenericParameter { >x : any } -module GenericParameter { +namespace GenericParameter { >GenericParameter : typeof GenericParameter > : ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.errors.txt b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.errors.txt index 505bc85e1fc52..e7a8d29e35dab 100644 --- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.errors.txt +++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.errors.txt @@ -6,7 +6,7 @@ genericCallWithOverloadedFunctionTypedArguments2.ts(28,20): error TS2345: Argume // Function typed arguments with multiple signatures must be passed an implementation that matches all of them // Inferences are made quadratic-pairwise to and from these overload sets - module NonGenericParameter { + namespace NonGenericParameter { var a: { (x: boolean): boolean; (x: string): string; @@ -19,7 +19,7 @@ genericCallWithOverloadedFunctionTypedArguments2.ts(28,20): error TS2345: Argume var r3 = foo4((x: T) => { var r: U; return r }); // ok } - module GenericParameter { + namespace GenericParameter { function foo5(cb: { (x: T): string; (x: number): T }) { return cb; } diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.js b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.js index 50bed5940494a..9a133c9fb3bd8 100644 --- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.js +++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.js @@ -4,7 +4,7 @@ // Function typed arguments with multiple signatures must be passed an implementation that matches all of them // Inferences are made quadratic-pairwise to and from these overload sets -module NonGenericParameter { +namespace NonGenericParameter { var a: { (x: boolean): boolean; (x: string): string; @@ -17,7 +17,7 @@ module NonGenericParameter { var r3 = foo4((x: T) => { var r: U; return r }); // ok } -module GenericParameter { +namespace GenericParameter { function foo5(cb: { (x: T): string; (x: number): T }) { return cb; } diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.symbols b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.symbols index dd26ad84b8a7d..10d9154a97e1b 100644 --- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.symbols +++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.symbols @@ -4,7 +4,7 @@ // Function typed arguments with multiple signatures must be passed an implementation that matches all of them // Inferences are made quadratic-pairwise to and from these overload sets -module NonGenericParameter { +namespace NonGenericParameter { >NonGenericParameter : Symbol(NonGenericParameter, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 0, 0)) var a: { @@ -38,11 +38,11 @@ module NonGenericParameter { >r : Symbol(r, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 13, 39)) } -module GenericParameter { +namespace GenericParameter { >GenericParameter : Symbol(GenericParameter, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 14, 1)) function foo5(cb: { (x: T): string; (x: number): T }) { ->foo5 : Symbol(foo5, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 16, 25)) +>foo5 : Symbol(foo5, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 16, 28)) >T : Symbol(T, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 17, 18)) >cb : Symbol(cb, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 17, 21)) >x : Symbol(x, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 17, 28)) @@ -56,7 +56,7 @@ module GenericParameter { var r6 = foo5((x: T) => x); // ok >r6 : Symbol(r6, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 21, 7)) ->foo5 : Symbol(foo5, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 16, 25)) +>foo5 : Symbol(foo5, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 16, 28)) >T : Symbol(T, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 21, 19)) >x : Symbol(x, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 21, 22)) >T : Symbol(T, Decl(genericCallWithOverloadedFunctionTypedArguments2.ts, 21, 19)) diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.types b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.types index fd7a6cb4dec0a..72dc867a3b49a 100644 --- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.types +++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.types @@ -4,7 +4,7 @@ // Function typed arguments with multiple signatures must be passed an implementation that matches all of them // Inferences are made quadratic-pairwise to and from these overload sets -module NonGenericParameter { +namespace NonGenericParameter { >NonGenericParameter : typeof NonGenericParameter > : ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -51,7 +51,7 @@ module NonGenericParameter { > : ^ } -module GenericParameter { +namespace GenericParameter { >GenericParameter : typeof GenericParameter > : ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/genericCallbacksAndClassHierarchy.js b/tests/baselines/reference/genericCallbacksAndClassHierarchy.js index c93da41f0c536..48722e8b7714d 100644 --- a/tests/baselines/reference/genericCallbacksAndClassHierarchy.js +++ b/tests/baselines/reference/genericCallbacksAndClassHierarchy.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericCallbacksAndClassHierarchy.ts] //// //// [genericCallbacksAndClassHierarchy.ts] -module M { +namespace M { export interface I { subscribe(callback: (newValue: T) => void ): any; } diff --git a/tests/baselines/reference/genericCallbacksAndClassHierarchy.symbols b/tests/baselines/reference/genericCallbacksAndClassHierarchy.symbols index 69711de27e69e..047b0dc82191b 100644 --- a/tests/baselines/reference/genericCallbacksAndClassHierarchy.symbols +++ b/tests/baselines/reference/genericCallbacksAndClassHierarchy.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/genericCallbacksAndClassHierarchy.ts] //// === genericCallbacksAndClassHierarchy.ts === -module M { +namespace M { >M : Symbol(M, Decl(genericCallbacksAndClassHierarchy.ts, 0, 0)) export interface I { ->I : Symbol(I, Decl(genericCallbacksAndClassHierarchy.ts, 0, 10)) +>I : Symbol(I, Decl(genericCallbacksAndClassHierarchy.ts, 0, 13)) >T : Symbol(T, Decl(genericCallbacksAndClassHierarchy.ts, 1, 23)) subscribe(callback: (newValue: T) => void ): any; @@ -20,7 +20,7 @@ module M { public value: I; >value : Symbol(C1.value, Decl(genericCallbacksAndClassHierarchy.ts, 4, 24)) ->I : Symbol(I, Decl(genericCallbacksAndClassHierarchy.ts, 0, 10)) +>I : Symbol(I, Decl(genericCallbacksAndClassHierarchy.ts, 0, 13)) >T : Symbol(T, Decl(genericCallbacksAndClassHierarchy.ts, 4, 20)) } export class A { @@ -55,7 +55,7 @@ module M { var v: I> = viewModel.value; >v : Symbol(v, Decl(genericCallbacksAndClassHierarchy.ts, 15, 15)) ->I : Symbol(I, Decl(genericCallbacksAndClassHierarchy.ts, 0, 10)) +>I : Symbol(I, Decl(genericCallbacksAndClassHierarchy.ts, 0, 13)) >A : Symbol(A, Decl(genericCallbacksAndClassHierarchy.ts, 6, 5)) >T : Symbol(T, Decl(genericCallbacksAndClassHierarchy.ts, 11, 19)) >viewModel.value : Symbol(C1.value, Decl(genericCallbacksAndClassHierarchy.ts, 4, 24)) diff --git a/tests/baselines/reference/genericCallbacksAndClassHierarchy.types b/tests/baselines/reference/genericCallbacksAndClassHierarchy.types index cc050bcb3c488..da6c5cd69e64f 100644 --- a/tests/baselines/reference/genericCallbacksAndClassHierarchy.types +++ b/tests/baselines/reference/genericCallbacksAndClassHierarchy.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericCallbacksAndClassHierarchy.ts] //// === genericCallbacksAndClassHierarchy.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js index 7f7a3796a4b06..988f2f940767d 100644 --- a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js +++ b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js @@ -1,10 +1,10 @@ //// [tests/cases/compiler/genericClassImplementingGenericInterfaceFromAnotherModule.ts] //// //// [genericClassImplementingGenericInterfaceFromAnotherModule.ts] -module foo { +namespace foo { export interface IFoo { } } -module bar { +namespace bar { export class Foo implements foo.IFoo { } } diff --git a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.symbols b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.symbols index 948ab07d1575e..51221c8323000 100644 --- a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.symbols +++ b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.symbols @@ -1,22 +1,22 @@ //// [tests/cases/compiler/genericClassImplementingGenericInterfaceFromAnotherModule.ts] //// === genericClassImplementingGenericInterfaceFromAnotherModule.ts === -module foo { +namespace foo { >foo : Symbol(foo, Decl(genericClassImplementingGenericInterfaceFromAnotherModule.ts, 0, 0)) export interface IFoo { } ->IFoo : Symbol(IFoo, Decl(genericClassImplementingGenericInterfaceFromAnotherModule.ts, 0, 12)) +>IFoo : Symbol(IFoo, Decl(genericClassImplementingGenericInterfaceFromAnotherModule.ts, 0, 15)) >T : Symbol(T, Decl(genericClassImplementingGenericInterfaceFromAnotherModule.ts, 1, 26)) } -module bar { +namespace bar { >bar : Symbol(bar, Decl(genericClassImplementingGenericInterfaceFromAnotherModule.ts, 2, 1)) export class Foo implements foo.IFoo { } ->Foo : Symbol(Foo, Decl(genericClassImplementingGenericInterfaceFromAnotherModule.ts, 3, 12)) +>Foo : Symbol(Foo, Decl(genericClassImplementingGenericInterfaceFromAnotherModule.ts, 3, 15)) >T : Symbol(T, Decl(genericClassImplementingGenericInterfaceFromAnotherModule.ts, 4, 21)) ->foo.IFoo : Symbol(foo.IFoo, Decl(genericClassImplementingGenericInterfaceFromAnotherModule.ts, 0, 12)) +>foo.IFoo : Symbol(foo.IFoo, Decl(genericClassImplementingGenericInterfaceFromAnotherModule.ts, 0, 15)) >foo : Symbol(foo, Decl(genericClassImplementingGenericInterfaceFromAnotherModule.ts, 0, 0)) ->IFoo : Symbol(foo.IFoo, Decl(genericClassImplementingGenericInterfaceFromAnotherModule.ts, 0, 12)) +>IFoo : Symbol(foo.IFoo, Decl(genericClassImplementingGenericInterfaceFromAnotherModule.ts, 0, 15)) >T : Symbol(T, Decl(genericClassImplementingGenericInterfaceFromAnotherModule.ts, 4, 21)) } diff --git a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.types b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.types index c6951f986de8a..2a449f896b29c 100644 --- a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.types +++ b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.types @@ -1,10 +1,10 @@ //// [tests/cases/compiler/genericClassImplementingGenericInterfaceFromAnotherModule.ts] //// === genericClassImplementingGenericInterfaceFromAnotherModule.ts === -module foo { +namespace foo { export interface IFoo { } } -module bar { +namespace bar { >bar : typeof bar > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js index 7dfe12ed733c8..f115c8c2d3f30 100644 --- a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js +++ b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js @@ -36,11 +36,11 @@ interface KnockoutObservableArrayStatic { (value?: T[]): KnockoutObservableArray; } -declare module ko { +declare namespace ko { export var observableArray: KnockoutObservableArrayStatic; } -module Portal.Controls.Validators { +namespace Portal.Controls.Validators { export class Validator { private _subscription; @@ -53,7 +53,7 @@ module Portal.Controls.Validators { } } -module PortalFx.ViewModels.Controls.Validators { +namespace PortalFx.ViewModels.Controls.Validators { export class Validator extends Portal.Controls.Validators.Validator { diff --git a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.symbols b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.symbols index 4bdd8ab6c511d..c9c641dc08d39 100644 --- a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.symbols +++ b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.symbols @@ -138,7 +138,7 @@ interface KnockoutObservableArrayStatic { >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 32, 5)) } -declare module ko { +declare namespace ko { >ko : Symbol(ko, Decl(genericClassPropertyInheritanceSpecialization.ts, 33, 1)) export var observableArray: KnockoutObservableArrayStatic; @@ -146,13 +146,13 @@ declare module ko { >KnockoutObservableArrayStatic : Symbol(KnockoutObservableArrayStatic, Decl(genericClassPropertyInheritanceSpecialization.ts, 27, 1)) } -module Portal.Controls.Validators { +namespace Portal.Controls.Validators { >Portal : Symbol(Portal, Decl(genericClassPropertyInheritanceSpecialization.ts, 37, 1)) ->Controls : Symbol(Controls, Decl(genericClassPropertyInheritanceSpecialization.ts, 39, 14)) ->Validators : Symbol(Validators, Decl(genericClassPropertyInheritanceSpecialization.ts, 39, 23)) +>Controls : Symbol(Controls, Decl(genericClassPropertyInheritanceSpecialization.ts, 39, 17)) +>Validators : Symbol(Validators, Decl(genericClassPropertyInheritanceSpecialization.ts, 39, 26)) export class Validator { ->Validator : Symbol(Validator, Decl(genericClassPropertyInheritanceSpecialization.ts, 39, 35)) +>Validator : Symbol(Validator, Decl(genericClassPropertyInheritanceSpecialization.ts, 39, 38)) >TValue : Symbol(TValue, Decl(genericClassPropertyInheritanceSpecialization.ts, 41, 27)) private _subscription; @@ -184,29 +184,29 @@ module Portal.Controls.Validators { } } -module PortalFx.ViewModels.Controls.Validators { +namespace PortalFx.ViewModels.Controls.Validators { >PortalFx : Symbol(PortalFx, Decl(genericClassPropertyInheritanceSpecialization.ts, 50, 1)) ->ViewModels : Symbol(ViewModels, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 16)) ->Controls : Symbol(Controls, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 27)) ->Validators : Symbol(Validators, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 36)) +>ViewModels : Symbol(ViewModels, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 19)) +>Controls : Symbol(Controls, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 30)) +>Validators : Symbol(Validators, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 39)) export class Validator extends Portal.Controls.Validators.Validator { ->Validator : Symbol(Validator, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 48)) +>Validator : Symbol(Validator, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 51)) >TValue : Symbol(TValue, Decl(genericClassPropertyInheritanceSpecialization.ts, 54, 27)) ->Portal.Controls.Validators.Validator : Symbol(Portal.Controls.Validators.Validator, Decl(genericClassPropertyInheritanceSpecialization.ts, 39, 35)) ->Portal.Controls.Validators : Symbol(Portal.Controls.Validators, Decl(genericClassPropertyInheritanceSpecialization.ts, 39, 23)) ->Portal.Controls : Symbol(Portal.Controls, Decl(genericClassPropertyInheritanceSpecialization.ts, 39, 14)) +>Portal.Controls.Validators.Validator : Symbol(Portal.Controls.Validators.Validator, Decl(genericClassPropertyInheritanceSpecialization.ts, 39, 38)) +>Portal.Controls.Validators : Symbol(Portal.Controls.Validators, Decl(genericClassPropertyInheritanceSpecialization.ts, 39, 26)) +>Portal.Controls : Symbol(Portal.Controls, Decl(genericClassPropertyInheritanceSpecialization.ts, 39, 17)) >Portal : Symbol(Portal, Decl(genericClassPropertyInheritanceSpecialization.ts, 37, 1)) ->Controls : Symbol(Portal.Controls, Decl(genericClassPropertyInheritanceSpecialization.ts, 39, 14)) ->Validators : Symbol(Portal.Controls.Validators, Decl(genericClassPropertyInheritanceSpecialization.ts, 39, 23)) ->Validator : Symbol(Portal.Controls.Validators.Validator, Decl(genericClassPropertyInheritanceSpecialization.ts, 39, 35)) +>Controls : Symbol(Portal.Controls, Decl(genericClassPropertyInheritanceSpecialization.ts, 39, 17)) +>Validators : Symbol(Portal.Controls.Validators, Decl(genericClassPropertyInheritanceSpecialization.ts, 39, 26)) +>Validator : Symbol(Portal.Controls.Validators.Validator, Decl(genericClassPropertyInheritanceSpecialization.ts, 39, 38)) >TValue : Symbol(TValue, Decl(genericClassPropertyInheritanceSpecialization.ts, 54, 27)) constructor(message?: string) { >message : Symbol(message, Decl(genericClassPropertyInheritanceSpecialization.ts, 56, 20)) super(message); ->super : Symbol(Portal.Controls.Validators.Validator, Decl(genericClassPropertyInheritanceSpecialization.ts, 39, 35)) +>super : Symbol(Portal.Controls.Validators.Validator, Decl(genericClassPropertyInheritanceSpecialization.ts, 39, 38)) >message : Symbol(message, Decl(genericClassPropertyInheritanceSpecialization.ts, 56, 20)) } } @@ -221,10 +221,10 @@ interface Contract { >validators : Symbol(Contract.validators, Decl(genericClassPropertyInheritanceSpecialization.ts, 63, 28)) >KnockoutObservableArray : Symbol(KnockoutObservableArray, Decl(genericClassPropertyInheritanceSpecialization.ts, 10, 1)) >PortalFx : Symbol(PortalFx, Decl(genericClassPropertyInheritanceSpecialization.ts, 50, 1)) ->ViewModels : Symbol(PortalFx.ViewModels, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 16)) ->Controls : Symbol(PortalFx.ViewModels.Controls, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 27)) ->Validators : Symbol(PortalFx.ViewModels.Controls.Validators, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 36)) ->Validator : Symbol(PortalFx.ViewModels.Controls.Validators.Validator, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 48)) +>ViewModels : Symbol(PortalFx.ViewModels, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 19)) +>Controls : Symbol(PortalFx.ViewModels.Controls, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 30)) +>Validators : Symbol(PortalFx.ViewModels.Controls.Validators, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 39)) +>Validator : Symbol(PortalFx.ViewModels.Controls.Validators.Validator, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 51)) >TValue : Symbol(TValue, Decl(genericClassPropertyInheritanceSpecialization.ts, 63, 19)) } @@ -239,19 +239,19 @@ class ViewModel implements Contract { >validators : Symbol(ViewModel.validators, Decl(genericClassPropertyInheritanceSpecialization.ts, 69, 53)) >KnockoutObservableArray : Symbol(KnockoutObservableArray, Decl(genericClassPropertyInheritanceSpecialization.ts, 10, 1)) >PortalFx : Symbol(PortalFx, Decl(genericClassPropertyInheritanceSpecialization.ts, 50, 1)) ->ViewModels : Symbol(PortalFx.ViewModels, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 16)) ->Controls : Symbol(PortalFx.ViewModels.Controls, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 27)) ->Validators : Symbol(PortalFx.ViewModels.Controls.Validators, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 36)) ->Validator : Symbol(PortalFx.ViewModels.Controls.Validators.Validator, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 48)) +>ViewModels : Symbol(PortalFx.ViewModels, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 19)) +>Controls : Symbol(PortalFx.ViewModels.Controls, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 30)) +>Validators : Symbol(PortalFx.ViewModels.Controls.Validators, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 39)) +>Validator : Symbol(PortalFx.ViewModels.Controls.Validators.Validator, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 51)) >TValue : Symbol(TValue, Decl(genericClassPropertyInheritanceSpecialization.ts, 69, 16)) >ko.observableArray : Symbol(ko.observableArray, Decl(genericClassPropertyInheritanceSpecialization.ts, 36, 14)) >ko : Symbol(ko, Decl(genericClassPropertyInheritanceSpecialization.ts, 33, 1)) >observableArray : Symbol(ko.observableArray, Decl(genericClassPropertyInheritanceSpecialization.ts, 36, 14)) >PortalFx : Symbol(PortalFx, Decl(genericClassPropertyInheritanceSpecialization.ts, 50, 1)) ->ViewModels : Symbol(PortalFx.ViewModels, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 16)) ->Controls : Symbol(PortalFx.ViewModels.Controls, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 27)) ->Validators : Symbol(PortalFx.ViewModels.Controls.Validators, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 36)) ->Validator : Symbol(PortalFx.ViewModels.Controls.Validators.Validator, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 48)) +>ViewModels : Symbol(PortalFx.ViewModels, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 19)) +>Controls : Symbol(PortalFx.ViewModels.Controls, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 30)) +>Validators : Symbol(PortalFx.ViewModels.Controls.Validators, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 39)) +>Validator : Symbol(PortalFx.ViewModels.Controls.Validators.Validator, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 51)) >TValue : Symbol(TValue, Decl(genericClassPropertyInheritanceSpecialization.ts, 69, 16)) } diff --git a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types index 8df471267cb64..da77f23883d61 100644 --- a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types +++ b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types @@ -134,7 +134,7 @@ interface KnockoutObservableArrayStatic { > : ^^^ } -declare module ko { +declare namespace ko { >ko : typeof ko > : ^^^^^^^^^ @@ -143,7 +143,7 @@ declare module ko { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module Portal.Controls.Validators { +namespace Portal.Controls.Validators { >Portal : typeof Portal > : ^^^^^^^^^^^^^ >Controls : typeof Controls @@ -188,7 +188,7 @@ module Portal.Controls.Validators { } } -module PortalFx.ViewModels.Controls.Validators { +namespace PortalFx.ViewModels.Controls.Validators { >PortalFx : typeof PortalFx > : ^^^^^^^^^^^^^^^ >ViewModels : typeof ViewModels diff --git a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.errors.txt b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.errors.txt index a9961dcb2d9ce..a28da68692005 100644 --- a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.errors.txt +++ b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.errors.txt @@ -18,7 +18,7 @@ genericClassWithFunctionTypedMemberArguments.ts(62,30): error TS2345: Argument o // Generic functions used as arguments for function typed parameters are not used to make inferences from // Using function arguments, no errors expected - module ImmediatelyFix { + namespace ImmediatelyFix { class C { foo(x: (a: T) => T) { return x(null); @@ -41,7 +41,7 @@ genericClassWithFunctionTypedMemberArguments.ts(62,30): error TS2345: Argument o var r3a = c2.foo(x => 1); // number } - module WithCandidates { + namespace WithCandidates { class C { foo2(x: T, cb: (a: T) => U) { return cb(x); diff --git a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js index 70c664926bc6d..158303f002566 100644 --- a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js +++ b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js @@ -4,7 +4,7 @@ // Generic functions used as arguments for function typed parameters are not used to make inferences from // Using function arguments, no errors expected -module ImmediatelyFix { +namespace ImmediatelyFix { class C { foo(x: (a: T) => T) { return x(null); @@ -27,7 +27,7 @@ module ImmediatelyFix { var r3a = c2.foo(x => 1); // number } -module WithCandidates { +namespace WithCandidates { class C { foo2(x: T, cb: (a: T) => U) { return cb(x); diff --git a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.symbols b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.symbols index 0d3ed0d6fcad1..d3bcbed99dbd2 100644 --- a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.symbols +++ b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.symbols @@ -4,11 +4,11 @@ // Generic functions used as arguments for function typed parameters are not used to make inferences from // Using function arguments, no errors expected -module ImmediatelyFix { +namespace ImmediatelyFix { >ImmediatelyFix : Symbol(ImmediatelyFix, Decl(genericClassWithFunctionTypedMemberArguments.ts, 0, 0)) class C { ->C : Symbol(C, Decl(genericClassWithFunctionTypedMemberArguments.ts, 3, 23)) +>C : Symbol(C, Decl(genericClassWithFunctionTypedMemberArguments.ts, 3, 26)) >T : Symbol(T, Decl(genericClassWithFunctionTypedMemberArguments.ts, 4, 12)) foo(x: (a: T) => T) { @@ -26,7 +26,7 @@ module ImmediatelyFix { var c = new C(); >c : Symbol(c, Decl(genericClassWithFunctionTypedMemberArguments.ts, 10, 7)) ->C : Symbol(C, Decl(genericClassWithFunctionTypedMemberArguments.ts, 3, 23)) +>C : Symbol(C, Decl(genericClassWithFunctionTypedMemberArguments.ts, 3, 26)) var r = c.foo((x: U) => ''); // {} >r : Symbol(r, Decl(genericClassWithFunctionTypedMemberArguments.ts, 11, 7)) @@ -90,11 +90,11 @@ module ImmediatelyFix { >x : Symbol(x, Decl(genericClassWithFunctionTypedMemberArguments.ts, 23, 21)) } -module WithCandidates { +namespace WithCandidates { >WithCandidates : Symbol(WithCandidates, Decl(genericClassWithFunctionTypedMemberArguments.ts, 24, 1)) class C { ->C : Symbol(C, Decl(genericClassWithFunctionTypedMemberArguments.ts, 26, 23)) +>C : Symbol(C, Decl(genericClassWithFunctionTypedMemberArguments.ts, 26, 26)) >T : Symbol(T, Decl(genericClassWithFunctionTypedMemberArguments.ts, 27, 12)) foo2(x: T, cb: (a: T) => U) { @@ -116,7 +116,7 @@ module WithCandidates { var c: C; >c : Symbol(c, Decl(genericClassWithFunctionTypedMemberArguments.ts, 33, 7)) ->C : Symbol(C, Decl(genericClassWithFunctionTypedMemberArguments.ts, 26, 23)) +>C : Symbol(C, Decl(genericClassWithFunctionTypedMemberArguments.ts, 26, 26)) var r4 = c.foo2(1, function (a: Z) { return '' }); // string, contextual signature instantiation is applied to generic functions >r4 : Symbol(r4, Decl(genericClassWithFunctionTypedMemberArguments.ts, 34, 7)) diff --git a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types index 0b5546dadc22d..7e21c8f182cc6 100644 --- a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types +++ b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types @@ -4,7 +4,7 @@ // Generic functions used as arguments for function typed parameters are not used to make inferences from // Using function arguments, no errors expected -module ImmediatelyFix { +namespace ImmediatelyFix { >ImmediatelyFix : typeof ImmediatelyFix > : ^^^^^^^^^^^^^^^^^^^^^ @@ -155,7 +155,7 @@ module ImmediatelyFix { > : ^ } -module WithCandidates { +namespace WithCandidates { >WithCandidates : typeof WithCandidates > : ^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.js b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.js index e02ef41876fb0..373c9c1627ab6 100644 --- a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.js +++ b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.js @@ -17,7 +17,7 @@ class X { x: T; } -module Class { +namespace Class { class G { foo(t: X, t2: X) { var x: T; @@ -42,7 +42,7 @@ module Class { var r2 = g2.foo2(c1, c1); } -module Interface { +namespace Interface { interface G { foo(t: X, t2: X): T; } diff --git a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.symbols b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.symbols index d716ffb6e0dcd..0e1a77be675b2 100644 --- a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.symbols +++ b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.symbols @@ -30,11 +30,11 @@ class X { >T : Symbol(T, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 12, 8)) } -module Class { +namespace Class { >Class : Symbol(Class, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 14, 1)) class G { ->G : Symbol(G, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 16, 14)) +>G : Symbol(G, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 16, 17)) >T : Symbol(T, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 17, 12)) >x : Symbol(x, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 17, 23)) @@ -70,7 +70,7 @@ module Class { var g: G<{ x: string; y: string }>; >g : Symbol(g, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 26, 7)) ->G : Symbol(G, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 16, 14)) +>G : Symbol(G, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 16, 17)) >x : Symbol(x, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 26, 14)) >y : Symbol(y, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 26, 25)) @@ -136,11 +136,11 @@ module Class { >c1 : Symbol(c1, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 24, 7)) } -module Interface { +namespace Interface { >Interface : Symbol(Interface, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 39, 1)) interface G { ->G : Symbol(G, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 41, 18)) +>G : Symbol(G, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 41, 21)) >T : Symbol(T, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 42, 16)) >x : Symbol(x, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 42, 27)) @@ -169,7 +169,7 @@ module Interface { var g: G<{ x: string; y: string }>; >g : Symbol(g, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 48, 7)) ->G : Symbol(G, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 41, 18)) +>G : Symbol(G, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 41, 21)) >x : Symbol(x, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 48, 14)) >y : Symbol(y, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 48, 25)) diff --git a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types index 084e222e2bc57..ce8c43fe25e41 100644 --- a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types +++ b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types @@ -35,7 +35,7 @@ class X { > : ^ } -module Class { +namespace Class { >Class : typeof Class > : ^^^^^^^^^^^^ @@ -179,7 +179,7 @@ module Class { > : ^^^^ } -module Interface { +namespace Interface { >Interface : typeof Interface > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/genericClassWithStaticFactory.js b/tests/baselines/reference/genericClassWithStaticFactory.js index be02ec8bca7a9..faa033b25bb08 100644 --- a/tests/baselines/reference/genericClassWithStaticFactory.js +++ b/tests/baselines/reference/genericClassWithStaticFactory.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericClassWithStaticFactory.ts] //// //// [genericClassWithStaticFactory.ts] -module Editor { +namespace Editor { export class List { public next: List; diff --git a/tests/baselines/reference/genericClassWithStaticFactory.symbols b/tests/baselines/reference/genericClassWithStaticFactory.symbols index 266323e165169..9b0f32e8690f4 100644 --- a/tests/baselines/reference/genericClassWithStaticFactory.symbols +++ b/tests/baselines/reference/genericClassWithStaticFactory.symbols @@ -1,21 +1,21 @@ //// [tests/cases/compiler/genericClassWithStaticFactory.ts] //// === genericClassWithStaticFactory.ts === -module Editor { +namespace Editor { >Editor : Symbol(Editor, Decl(genericClassWithStaticFactory.ts, 0, 0)) export class List { ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22)) public next: List; >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22)) public prev: List; >prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22)) private listFactory: ListFactory; @@ -30,7 +30,7 @@ module Editor { this.listFactory = new ListFactory(); >this.listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29)) >ListFactory : Symbol(ListFactory, Decl(genericClassWithStaticFactory.ts, 106, 5)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22)) @@ -41,14 +41,14 @@ module Editor { >add : Symbol(List.add, Decl(genericClassWithStaticFactory.ts, 10, 9)) >data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 12, 19)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22)) ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22)) var entry = this.listFactory.MakeEntry(data); >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 13, 15)) >this.listFactory.MakeEntry : Symbol(ListFactory.MakeEntry, Decl(genericClassWithStaticFactory.ts, 115, 9)) >this.listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29)) >MakeEntry : Symbol(ListFactory.MakeEntry, Decl(genericClassWithStaticFactory.ts, 115, 9)) >data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 12, 19)) @@ -56,7 +56,7 @@ module Editor { this.prev.next = entry; >this.prev.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) >this.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 13, 15)) @@ -65,19 +65,19 @@ module Editor { >entry.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 13, 15)) >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) entry.prev = this.prev; >entry.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 13, 15)) >prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) >this.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) this.prev = entry; >this.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 13, 15)) @@ -90,7 +90,7 @@ module Editor { var entry: List; >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 23, 15)) ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22)) var i: number; @@ -99,7 +99,7 @@ module Editor { entry = this.next; >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 23, 15)) >this.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) for (i = 0; !(entry.isHead); i++) { @@ -125,9 +125,9 @@ module Editor { return (this.next == this); >this.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) } public first(): T { @@ -136,13 +136,13 @@ module Editor { if (this.isEmpty()) >this.isEmpty : Symbol(List.isEmpty, Decl(genericClassWithStaticFactory.ts, 32, 9)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >isEmpty : Symbol(List.isEmpty, Decl(genericClassWithStaticFactory.ts, 32, 9)) { return this.next.data; >this.next.data : Symbol(List.data, Decl(genericClassWithStaticFactory.ts, 7, 43)) >this.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) >data : Symbol(List.data, Decl(genericClassWithStaticFactory.ts, 7, 43)) } @@ -154,7 +154,7 @@ module Editor { public pushEntry(entry: List): void { >pushEntry : Symbol(List.pushEntry, Decl(genericClassWithStaticFactory.ts, 46, 9)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 48, 25)) ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22)) entry.isHead = false; @@ -167,18 +167,18 @@ module Editor { >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 48, 25)) >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) >this.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) entry.prev = this; >entry.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 48, 25)) >prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) this.next = entry; >this.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 48, 25)) @@ -200,7 +200,7 @@ module Editor { >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 57, 15)) >this.listFactory.MakeEntry : Symbol(ListFactory.MakeEntry, Decl(genericClassWithStaticFactory.ts, 115, 9)) >this.listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29)) >MakeEntry : Symbol(ListFactory.MakeEntry, Decl(genericClassWithStaticFactory.ts, 115, 9)) >data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 56, 20)) @@ -221,18 +221,18 @@ module Editor { >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 57, 15)) >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) >this.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) entry.prev = this; >entry.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 57, 15)) >prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) this.next = entry; >this.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 57, 15)) @@ -248,15 +248,15 @@ module Editor { public popEntry(head: List): List { >popEntry : Symbol(List.popEntry, Decl(genericClassWithStaticFactory.ts, 64, 9)) >head : Symbol(head, Decl(genericClassWithStaticFactory.ts, 66, 24)) ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22)) ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22)) if (this.next.isHead) { >this.next.isHead : Symbol(List.isHead, Decl(genericClassWithStaticFactory.ts, 7, 20)) >this.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) >isHead : Symbol(List.isHead, Decl(genericClassWithStaticFactory.ts, 7, 20)) @@ -266,11 +266,11 @@ module Editor { return this.listFactory.RemoveEntry(this.next); >this.listFactory.RemoveEntry : Symbol(ListFactory.RemoveEntry, Decl(genericClassWithStaticFactory.ts, 122, 9)) >this.listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29)) >RemoveEntry : Symbol(ListFactory.RemoveEntry, Decl(genericClassWithStaticFactory.ts, 122, 9)) >this.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) } } @@ -278,9 +278,9 @@ module Editor { public insertEntry(entry: List): List { >insertEntry : Symbol(List.insertEntry, Decl(genericClassWithStaticFactory.ts, 73, 9)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 75, 27)) ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22)) ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22)) entry.isHead = false; @@ -291,7 +291,7 @@ module Editor { this.prev.next = entry; >this.prev.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) >this.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 75, 27)) @@ -300,19 +300,19 @@ module Editor { >entry.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 75, 27)) >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) entry.prev = this.prev; >entry.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 75, 27)) >prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) >this.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) this.prev = entry; >this.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 75, 27)) @@ -324,16 +324,16 @@ module Editor { >insertAfter : Symbol(List.insertAfter, Decl(genericClassWithStaticFactory.ts, 82, 9)) >data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 84, 27)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22)) ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22)) var entry: List = this.listFactory.MakeEntry(data); >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 85, 15)) ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22)) >this.listFactory.MakeEntry : Symbol(ListFactory.MakeEntry, Decl(genericClassWithStaticFactory.ts, 115, 9)) >this.listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29)) >MakeEntry : Symbol(ListFactory.MakeEntry, Decl(genericClassWithStaticFactory.ts, 115, 9)) >data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 84, 27)) @@ -343,18 +343,18 @@ module Editor { >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 85, 15)) >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) >this.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) entry.prev = this; >entry.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 85, 15)) >prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) this.next = entry; >this.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 85, 15)) @@ -373,15 +373,15 @@ module Editor { public insertEntryBefore(entry: List): List { >insertEntryBefore : Symbol(List.insertEntryBefore, Decl(genericClassWithStaticFactory.ts, 91, 9)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 93, 33)) ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22)) ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22)) this.prev.next = entry; >this.prev.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) >this.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 93, 33)) @@ -390,19 +390,19 @@ module Editor { >entry.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 93, 33)) >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) entry.prev = this.prev; >entry.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 93, 33)) >prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) >this.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) this.prev = entry; >this.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 93, 33)) @@ -414,21 +414,21 @@ module Editor { >insertBefore : Symbol(List.insertBefore, Decl(genericClassWithStaticFactory.ts, 100, 9)) >data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 102, 28)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22)) ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22)) var entry = this.listFactory.MakeEntry(data); >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 103, 15)) >this.listFactory.MakeEntry : Symbol(ListFactory.MakeEntry, Decl(genericClassWithStaticFactory.ts, 115, 9)) >this.listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29)) >MakeEntry : Symbol(ListFactory.MakeEntry, Decl(genericClassWithStaticFactory.ts, 115, 9)) >data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 102, 28)) return this.insertEntryBefore(entry); >this.insertEntryBefore : Symbol(List.insertEntryBefore, Decl(genericClassWithStaticFactory.ts, 91, 9)) ->this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >insertEntryBefore : Symbol(List.insertEntryBefore, Decl(genericClassWithStaticFactory.ts, 91, 9)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 103, 15)) } @@ -441,14 +441,14 @@ module Editor { public MakeHead(): List { >MakeHead : Symbol(ListFactory.MakeHead, Decl(genericClassWithStaticFactory.ts, 108, 33)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 110, 24)) ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 110, 24)) var entry: List = new List(true, null); >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 111, 15)) ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 110, 24)) ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 110, 24)) entry.prev = entry; @@ -472,14 +472,14 @@ module Editor { >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 117, 25)) >data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 117, 28)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 117, 25)) ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 117, 25)) var entry: List = new List(false, data); >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 118, 15)) ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 117, 25)) ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 117, 25)) >data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 117, 28)) @@ -503,9 +503,9 @@ module Editor { >RemoveEntry : Symbol(ListFactory.RemoveEntry, Decl(genericClassWithStaticFactory.ts, 122, 9)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 124, 27)) >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 124, 30)) ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 124, 27)) ->List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15)) +>List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 18)) >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 124, 27)) if (entry == null) { diff --git a/tests/baselines/reference/genericClassWithStaticFactory.types b/tests/baselines/reference/genericClassWithStaticFactory.types index 9267d7f88a1f5..f2dfe74ca0327 100644 --- a/tests/baselines/reference/genericClassWithStaticFactory.types +++ b/tests/baselines/reference/genericClassWithStaticFactory.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericClassWithStaticFactory.ts] //// === genericClassWithStaticFactory.ts === -module Editor { +namespace Editor { >Editor : typeof Editor > : ^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/genericClassesInModule.js b/tests/baselines/reference/genericClassesInModule.js index b83314b5e74f4..fc806adc032cb 100644 --- a/tests/baselines/reference/genericClassesInModule.js +++ b/tests/baselines/reference/genericClassesInModule.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericClassesInModule.ts] //// //// [genericClassesInModule.ts] -module Foo { +namespace Foo { export class B{ } diff --git a/tests/baselines/reference/genericClassesInModule.symbols b/tests/baselines/reference/genericClassesInModule.symbols index ed931467030fb..652dcb7ba100e 100644 --- a/tests/baselines/reference/genericClassesInModule.symbols +++ b/tests/baselines/reference/genericClassesInModule.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/genericClassesInModule.ts] //// === genericClassesInModule.ts === -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(genericClassesInModule.ts, 0, 0)) export class B{ } ->B : Symbol(B, Decl(genericClassesInModule.ts, 0, 12)) +>B : Symbol(B, Decl(genericClassesInModule.ts, 0, 15)) >T : Symbol(T, Decl(genericClassesInModule.ts, 2, 19)) export class A { } @@ -14,9 +14,9 @@ module Foo { var a = new Foo.B(); >a : Symbol(a, Decl(genericClassesInModule.ts, 7, 3)) ->Foo.B : Symbol(Foo.B, Decl(genericClassesInModule.ts, 0, 12)) +>Foo.B : Symbol(Foo.B, Decl(genericClassesInModule.ts, 0, 15)) >Foo : Symbol(Foo, Decl(genericClassesInModule.ts, 0, 0)) ->B : Symbol(Foo.B, Decl(genericClassesInModule.ts, 0, 12)) +>B : Symbol(Foo.B, Decl(genericClassesInModule.ts, 0, 15)) >Foo : Symbol(Foo, Decl(genericClassesInModule.ts, 0, 0)) >A : Symbol(Foo.A, Decl(genericClassesInModule.ts, 2, 24)) diff --git a/tests/baselines/reference/genericClassesInModule.types b/tests/baselines/reference/genericClassesInModule.types index 182301a639479..65df477c59e1b 100644 --- a/tests/baselines/reference/genericClassesInModule.types +++ b/tests/baselines/reference/genericClassesInModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericClassesInModule.ts] //// === genericClassesInModule.ts === -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/genericClassesRedeclaration.errors.txt b/tests/baselines/reference/genericClassesRedeclaration.errors.txt index 4e51674e9c595..587de8daea47c 100644 --- a/tests/baselines/reference/genericClassesRedeclaration.errors.txt +++ b/tests/baselines/reference/genericClassesRedeclaration.errors.txt @@ -7,7 +7,7 @@ genericClassesRedeclaration.ts(68,11): error TS2300: Duplicate identifier 'Ident ==== genericClassesRedeclaration.ts (6 errors) ==== - declare module TypeScript { + declare namespace TypeScript { interface IIndexable { [s: string]: T; ~~~~~~~~~~~~~~~ @@ -52,7 +52,7 @@ genericClassesRedeclaration.ts(68,11): error TS2300: Duplicate identifier 'Ident } } - declare module TypeScript { + declare namespace TypeScript { interface IIndexable { [s: string]: T; ~~~~~~~~~~~~~~~ diff --git a/tests/baselines/reference/genericClassesRedeclaration.js b/tests/baselines/reference/genericClassesRedeclaration.js index 5ac720b706d96..3363ce635b1e1 100644 --- a/tests/baselines/reference/genericClassesRedeclaration.js +++ b/tests/baselines/reference/genericClassesRedeclaration.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericClassesRedeclaration.ts] //// //// [genericClassesRedeclaration.ts] -declare module TypeScript { +declare namespace TypeScript { interface IIndexable { [s: string]: T; } @@ -40,7 +40,7 @@ declare module TypeScript { } } -declare module TypeScript { +declare namespace TypeScript { interface IIndexable { [s: string]: T; } diff --git a/tests/baselines/reference/genericClassesRedeclaration.symbols b/tests/baselines/reference/genericClassesRedeclaration.symbols index 1681eca383c77..35802c86b0551 100644 --- a/tests/baselines/reference/genericClassesRedeclaration.symbols +++ b/tests/baselines/reference/genericClassesRedeclaration.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/genericClassesRedeclaration.ts] //// === genericClassesRedeclaration.ts === -declare module TypeScript { +declare namespace TypeScript { >TypeScript : Symbol(TypeScript, Decl(genericClassesRedeclaration.ts, 0, 0), Decl(genericClassesRedeclaration.ts, 37, 1)) interface IIndexable { ->IIndexable : Symbol(IIndexable, Decl(genericClassesRedeclaration.ts, 0, 27), Decl(genericClassesRedeclaration.ts, 39, 27)) +>IIndexable : Symbol(IIndexable, Decl(genericClassesRedeclaration.ts, 0, 30), Decl(genericClassesRedeclaration.ts, 39, 30)) >T : Symbol(T, Decl(genericClassesRedeclaration.ts, 1, 25), Decl(genericClassesRedeclaration.ts, 40, 25)) [s: string]: T; @@ -15,7 +15,7 @@ declare module TypeScript { function createIntrinsicsObject(): IIndexable; >createIntrinsicsObject : Symbol(createIntrinsicsObject, Decl(genericClassesRedeclaration.ts, 3, 5), Decl(genericClassesRedeclaration.ts, 42, 5)) >T : Symbol(T, Decl(genericClassesRedeclaration.ts, 4, 36)) ->IIndexable : Symbol(IIndexable, Decl(genericClassesRedeclaration.ts, 0, 27), Decl(genericClassesRedeclaration.ts, 39, 27)) +>IIndexable : Symbol(IIndexable, Decl(genericClassesRedeclaration.ts, 0, 30), Decl(genericClassesRedeclaration.ts, 39, 30)) >T : Symbol(T, Decl(genericClassesRedeclaration.ts, 4, 36)) interface IHashTable { @@ -192,11 +192,11 @@ declare module TypeScript { } } -declare module TypeScript { +declare namespace TypeScript { >TypeScript : Symbol(TypeScript, Decl(genericClassesRedeclaration.ts, 0, 0), Decl(genericClassesRedeclaration.ts, 37, 1)) interface IIndexable { ->IIndexable : Symbol(IIndexable, Decl(genericClassesRedeclaration.ts, 0, 27), Decl(genericClassesRedeclaration.ts, 39, 27)) +>IIndexable : Symbol(IIndexable, Decl(genericClassesRedeclaration.ts, 0, 30), Decl(genericClassesRedeclaration.ts, 39, 30)) >T : Symbol(T, Decl(genericClassesRedeclaration.ts, 1, 25), Decl(genericClassesRedeclaration.ts, 40, 25)) [s: string]: T; @@ -206,7 +206,7 @@ declare module TypeScript { function createIntrinsicsObject(): IIndexable; >createIntrinsicsObject : Symbol(createIntrinsicsObject, Decl(genericClassesRedeclaration.ts, 3, 5), Decl(genericClassesRedeclaration.ts, 42, 5)) >T : Symbol(T, Decl(genericClassesRedeclaration.ts, 43, 36)) ->IIndexable : Symbol(IIndexable, Decl(genericClassesRedeclaration.ts, 0, 27), Decl(genericClassesRedeclaration.ts, 39, 27)) +>IIndexable : Symbol(IIndexable, Decl(genericClassesRedeclaration.ts, 0, 30), Decl(genericClassesRedeclaration.ts, 39, 30)) >T : Symbol(T, Decl(genericClassesRedeclaration.ts, 43, 36)) interface IHashTable { diff --git a/tests/baselines/reference/genericClassesRedeclaration.types b/tests/baselines/reference/genericClassesRedeclaration.types index f3d0a7a65fad4..e489b17aa0806 100644 --- a/tests/baselines/reference/genericClassesRedeclaration.types +++ b/tests/baselines/reference/genericClassesRedeclaration.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericClassesRedeclaration.ts] //// === genericClassesRedeclaration.ts === -declare module TypeScript { +declare namespace TypeScript { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ @@ -253,7 +253,7 @@ declare module TypeScript { } } -declare module TypeScript { +declare namespace TypeScript { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/genericCloduleInModule.js b/tests/baselines/reference/genericCloduleInModule.js index 7d5e3df69b6c0..71de86526917e 100644 --- a/tests/baselines/reference/genericCloduleInModule.js +++ b/tests/baselines/reference/genericCloduleInModule.js @@ -1,12 +1,12 @@ //// [tests/cases/compiler/genericCloduleInModule.ts] //// //// [genericCloduleInModule.ts] -module A { +namespace A { export class B { foo() { } static bar() { } } - export module B { + export namespace B { export var x = 1; } } diff --git a/tests/baselines/reference/genericCloduleInModule.symbols b/tests/baselines/reference/genericCloduleInModule.symbols index eb9aa1bcfe968..b64253d271c9a 100644 --- a/tests/baselines/reference/genericCloduleInModule.symbols +++ b/tests/baselines/reference/genericCloduleInModule.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/genericCloduleInModule.ts] //// === genericCloduleInModule.ts === -module A { +namespace A { >A : Symbol(A, Decl(genericCloduleInModule.ts, 0, 0)) export class B { ->B : Symbol(B, Decl(genericCloduleInModule.ts, 0, 10), Decl(genericCloduleInModule.ts, 4, 5)) +>B : Symbol(B, Decl(genericCloduleInModule.ts, 0, 13), Decl(genericCloduleInModule.ts, 4, 5)) >T : Symbol(T, Decl(genericCloduleInModule.ts, 1, 19)) foo() { } @@ -14,8 +14,8 @@ module A { static bar() { } >bar : Symbol(B.bar, Decl(genericCloduleInModule.ts, 2, 17)) } - export module B { ->B : Symbol(B, Decl(genericCloduleInModule.ts, 0, 10), Decl(genericCloduleInModule.ts, 4, 5)) + export namespace B { +>B : Symbol(B, Decl(genericCloduleInModule.ts, 0, 13), Decl(genericCloduleInModule.ts, 4, 5)) export var x = 1; >x : Symbol(x, Decl(genericCloduleInModule.ts, 6, 18)) @@ -25,7 +25,7 @@ module A { var b: A.B; >b : Symbol(b, Decl(genericCloduleInModule.ts, 10, 3)) >A : Symbol(A, Decl(genericCloduleInModule.ts, 0, 0)) ->B : Symbol(A.B, Decl(genericCloduleInModule.ts, 0, 10), Decl(genericCloduleInModule.ts, 4, 5)) +>B : Symbol(A.B, Decl(genericCloduleInModule.ts, 0, 13), Decl(genericCloduleInModule.ts, 4, 5)) b.foo(); >b.foo : Symbol(A.B.foo, Decl(genericCloduleInModule.ts, 1, 23)) diff --git a/tests/baselines/reference/genericCloduleInModule.types b/tests/baselines/reference/genericCloduleInModule.types index 12ef556e1837a..493aa990dc1dd 100644 --- a/tests/baselines/reference/genericCloduleInModule.types +++ b/tests/baselines/reference/genericCloduleInModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericCloduleInModule.ts] //// === genericCloduleInModule.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -17,7 +17,7 @@ module A { >bar : () => void > : ^^^^^^^^^^ } - export module B { + export namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/genericCloduleInModule2.errors.txt b/tests/baselines/reference/genericCloduleInModule2.errors.txt index 193c59fc01b88..a522143ac7211 100644 --- a/tests/baselines/reference/genericCloduleInModule2.errors.txt +++ b/tests/baselines/reference/genericCloduleInModule2.errors.txt @@ -2,15 +2,15 @@ genericCloduleInModule2.ts(14,8): error TS2314: Generic type 'B' requires 1 t ==== genericCloduleInModule2.ts (1 errors) ==== - module A { + namespace A { export class B { foo() { } static bar() { } } } - module A { - export module B { + namespace A { + export namespace B { export var x = 1; } } diff --git a/tests/baselines/reference/genericCloduleInModule2.js b/tests/baselines/reference/genericCloduleInModule2.js index 9d91a78f7e487..0848bd1ca5b66 100644 --- a/tests/baselines/reference/genericCloduleInModule2.js +++ b/tests/baselines/reference/genericCloduleInModule2.js @@ -1,15 +1,15 @@ //// [tests/cases/compiler/genericCloduleInModule2.ts] //// //// [genericCloduleInModule2.ts] -module A { +namespace A { export class B { foo() { } static bar() { } } } -module A { - export module B { +namespace A { + export namespace B { export var x = 1; } } diff --git a/tests/baselines/reference/genericCloduleInModule2.symbols b/tests/baselines/reference/genericCloduleInModule2.symbols index c45d4fdc915f1..194bc0e25773c 100644 --- a/tests/baselines/reference/genericCloduleInModule2.symbols +++ b/tests/baselines/reference/genericCloduleInModule2.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/genericCloduleInModule2.ts] //// === genericCloduleInModule2.ts === -module A { +namespace A { >A : Symbol(A, Decl(genericCloduleInModule2.ts, 0, 0), Decl(genericCloduleInModule2.ts, 5, 1)) export class B { ->B : Symbol(B, Decl(genericCloduleInModule2.ts, 0, 10), Decl(genericCloduleInModule2.ts, 7, 10)) +>B : Symbol(B, Decl(genericCloduleInModule2.ts, 0, 13), Decl(genericCloduleInModule2.ts, 7, 13)) >T : Symbol(T, Decl(genericCloduleInModule2.ts, 1, 19)) foo() { } @@ -16,11 +16,11 @@ module A { } } -module A { +namespace A { >A : Symbol(A, Decl(genericCloduleInModule2.ts, 0, 0), Decl(genericCloduleInModule2.ts, 5, 1)) - export module B { ->B : Symbol(B, Decl(genericCloduleInModule2.ts, 0, 10), Decl(genericCloduleInModule2.ts, 7, 10)) + export namespace B { +>B : Symbol(B, Decl(genericCloduleInModule2.ts, 0, 13), Decl(genericCloduleInModule2.ts, 7, 13)) export var x = 1; >x : Symbol(x, Decl(genericCloduleInModule2.ts, 9, 18)) @@ -30,7 +30,7 @@ module A { var b: A.B; >b : Symbol(b, Decl(genericCloduleInModule2.ts, 13, 3)) >A : Symbol(A, Decl(genericCloduleInModule2.ts, 0, 0), Decl(genericCloduleInModule2.ts, 5, 1)) ->B : Symbol(A.B, Decl(genericCloduleInModule2.ts, 0, 10), Decl(genericCloduleInModule2.ts, 7, 10)) +>B : Symbol(A.B, Decl(genericCloduleInModule2.ts, 0, 13), Decl(genericCloduleInModule2.ts, 7, 13)) b.foo(); >b : Symbol(b, Decl(genericCloduleInModule2.ts, 13, 3)) diff --git a/tests/baselines/reference/genericCloduleInModule2.types b/tests/baselines/reference/genericCloduleInModule2.types index ec9d015fbc895..cf0926f1628f2 100644 --- a/tests/baselines/reference/genericCloduleInModule2.types +++ b/tests/baselines/reference/genericCloduleInModule2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericCloduleInModule2.ts] //// === genericCloduleInModule2.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -19,11 +19,11 @@ module A { } } -module A { +namespace A { >A : typeof A > : ^^^^^^^^ - export module B { + export namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js index 7a7d6617f536a..81b922fd87d0c 100644 --- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js +++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes.ts] //// //// [genericConstraintOnExtendedBuiltinTypes.ts] -declare module EndGate { +declare namespace EndGate { export interface ICloneable { Clone(): any; } @@ -9,7 +9,7 @@ declare module EndGate { interface Number extends EndGate.ICloneable { } -module EndGate.Tweening { +namespace EndGate.Tweening { export class Tween{ private _from: T; @@ -20,7 +20,7 @@ module EndGate.Tweening { } } -module EndGate.Tweening { +namespace EndGate.Tweening { export class NumberTween extends Tween{ constructor(from: number) { super(from); diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.symbols b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.symbols index 60f49547501fd..417a82b44befb 100644 --- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.symbols +++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes.ts] //// === genericConstraintOnExtendedBuiltinTypes.ts === -declare module EndGate { +declare namespace EndGate { >EndGate : Symbol(EndGate, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 0, 0), Decl(genericConstraintOnExtendedBuiltinTypes.ts, 6, 47), Decl(genericConstraintOnExtendedBuiltinTypes.ts, 17, 1)) export interface ICloneable { ->ICloneable : Symbol(ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 0, 24)) +>ICloneable : Symbol(ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 0, 27)) Clone(): any; >Clone : Symbol(ICloneable.Clone, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 1, 33)) @@ -14,18 +14,18 @@ declare module EndGate { interface Number extends EndGate.ICloneable { } >Number : Symbol(Number, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(genericConstraintOnExtendedBuiltinTypes.ts, 4, 1)) ->EndGate.ICloneable : Symbol(EndGate.ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 0, 24)) +>EndGate.ICloneable : Symbol(EndGate.ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 0, 27)) >EndGate : Symbol(EndGate, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 0, 0), Decl(genericConstraintOnExtendedBuiltinTypes.ts, 6, 47), Decl(genericConstraintOnExtendedBuiltinTypes.ts, 17, 1)) ->ICloneable : Symbol(EndGate.ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 0, 24)) +>ICloneable : Symbol(EndGate.ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 0, 27)) -module EndGate.Tweening { +namespace EndGate.Tweening { >EndGate : Symbol(EndGate, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 0, 0), Decl(genericConstraintOnExtendedBuiltinTypes.ts, 6, 47), Decl(genericConstraintOnExtendedBuiltinTypes.ts, 17, 1)) ->Tweening : Symbol(Tweening, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 8, 15), Decl(genericConstraintOnExtendedBuiltinTypes.ts, 19, 15)) +>Tweening : Symbol(Tweening, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 8, 18), Decl(genericConstraintOnExtendedBuiltinTypes.ts, 19, 18)) export class Tween{ ->Tween : Symbol(Tween, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 8, 25)) +>Tween : Symbol(Tween, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 8, 28)) >T : Symbol(T, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 9, 23)) ->ICloneable : Symbol(ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 0, 24)) +>ICloneable : Symbol(ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 0, 27)) private _from: T; >_from : Symbol(Tween._from, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 9, 45)) @@ -38,7 +38,7 @@ module EndGate.Tweening { this._from = from.Clone(); >this._from : Symbol(Tween._from, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 9, 45)) ->this : Symbol(Tween, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 8, 25)) +>this : Symbol(Tween, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 8, 28)) >_from : Symbol(Tween._from, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 9, 45)) >from.Clone : Symbol(ICloneable.Clone, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 1, 33)) >from : Symbol(from, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 13, 20)) @@ -47,19 +47,19 @@ module EndGate.Tweening { } } -module EndGate.Tweening { +namespace EndGate.Tweening { >EndGate : Symbol(EndGate, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 0, 0), Decl(genericConstraintOnExtendedBuiltinTypes.ts, 6, 47), Decl(genericConstraintOnExtendedBuiltinTypes.ts, 17, 1)) ->Tweening : Symbol(Tweening, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 8, 15), Decl(genericConstraintOnExtendedBuiltinTypes.ts, 19, 15)) +>Tweening : Symbol(Tweening, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 8, 18), Decl(genericConstraintOnExtendedBuiltinTypes.ts, 19, 18)) export class NumberTween extends Tween{ ->NumberTween : Symbol(NumberTween, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 19, 25)) ->Tween : Symbol(Tween, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 8, 25)) +>NumberTween : Symbol(NumberTween, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 19, 28)) +>Tween : Symbol(Tween, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 8, 28)) constructor(from: number) { >from : Symbol(from, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 21, 20)) super(from); ->super : Symbol(Tween, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 8, 25)) +>super : Symbol(Tween, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 8, 28)) >from : Symbol(from, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 21, 20)) } } diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types index f1f9a77a6dbf5..fdf0e7abe4a69 100644 --- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types +++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes.ts] //// === genericConstraintOnExtendedBuiltinTypes.ts === -declare module EndGate { +declare namespace EndGate { export interface ICloneable { Clone(): any; >Clone : () => any @@ -13,7 +13,7 @@ interface Number extends EndGate.ICloneable { } >EndGate : typeof EndGate > : ^^^^^^^^^^^^^^ -module EndGate.Tweening { +namespace EndGate.Tweening { >EndGate : typeof EndGate > : ^^^^^^^^^^^^^^ >Tweening : typeof Tweening @@ -51,7 +51,7 @@ module EndGate.Tweening { } } -module EndGate.Tweening { +namespace EndGate.Tweening { >EndGate : typeof EndGate > : ^^^^^^^^^^^^^^ >Tweening : typeof Tweening diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js index 10a972bae61a0..b2ff736c6ef5a 100644 --- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js +++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes2.ts] //// //// [genericConstraintOnExtendedBuiltinTypes2.ts] -module EndGate { +namespace EndGate { export interface ICloneable { Clone(): any; } @@ -9,7 +9,7 @@ module EndGate { interface Number extends EndGate.ICloneable { } -module EndGate.Tweening { +namespace EndGate.Tweening { export class Tween{ private _from: T; @@ -19,7 +19,7 @@ module EndGate.Tweening { } } -module EndGate.Tweening { +namespace EndGate.Tweening { export class NumberTween extends Tween{ constructor(from: number) { super(from); diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.symbols b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.symbols index fb2b9c9b096e6..ec3340babe276 100644 --- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.symbols +++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes2.ts] //// === genericConstraintOnExtendedBuiltinTypes2.ts === -module EndGate { +namespace EndGate { >EndGate : Symbol(EndGate, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 0, 0), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 6, 47), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 16, 1)) export interface ICloneable { ->ICloneable : Symbol(ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 0, 16)) +>ICloneable : Symbol(ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 0, 19)) Clone(): any; >Clone : Symbol(ICloneable.Clone, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 1, 33)) @@ -14,18 +14,18 @@ module EndGate { interface Number extends EndGate.ICloneable { } >Number : Symbol(Number, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 4, 1)) ->EndGate.ICloneable : Symbol(EndGate.ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 0, 16)) +>EndGate.ICloneable : Symbol(EndGate.ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 0, 19)) >EndGate : Symbol(EndGate, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 0, 0), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 6, 47), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 16, 1)) ->ICloneable : Symbol(EndGate.ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 0, 16)) +>ICloneable : Symbol(EndGate.ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 0, 19)) -module EndGate.Tweening { +namespace EndGate.Tweening { >EndGate : Symbol(EndGate, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 0, 0), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 6, 47), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 16, 1)) ->Tweening : Symbol(Tweening, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 8, 15), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 18, 15)) +>Tweening : Symbol(Tweening, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 8, 18), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 18, 18)) export class Tween{ ->Tween : Symbol(Tween, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 8, 25)) +>Tween : Symbol(Tween, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 8, 28)) >T : Symbol(T, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 9, 23)) ->ICloneable : Symbol(ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 0, 16)) +>ICloneable : Symbol(ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 0, 19)) private _from: T; >_from : Symbol(Tween._from, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 9, 45)) @@ -37,7 +37,7 @@ module EndGate.Tweening { this._from = from.Clone(); >this._from : Symbol(Tween._from, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 9, 45)) ->this : Symbol(Tween, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 8, 25)) +>this : Symbol(Tween, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 8, 28)) >_from : Symbol(Tween._from, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 9, 45)) >from.Clone : Symbol(ICloneable.Clone, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 1, 33)) >from : Symbol(from, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 12, 20)) @@ -46,20 +46,20 @@ module EndGate.Tweening { } } -module EndGate.Tweening { +namespace EndGate.Tweening { >EndGate : Symbol(EndGate, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 0, 0), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 6, 47), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 16, 1)) ->Tweening : Symbol(Tweening, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 8, 15), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 18, 15)) +>Tweening : Symbol(Tweening, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 8, 18), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 18, 18)) export class NumberTween extends Tween{ ->NumberTween : Symbol(NumberTween, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 18, 25)) ->Tween : Symbol(Tween, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 8, 25)) +>NumberTween : Symbol(NumberTween, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 18, 28)) +>Tween : Symbol(Tween, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 8, 28)) >Number : Symbol(Number, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 4, 1)) constructor(from: number) { >from : Symbol(from, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 20, 20)) super(from); ->super : Symbol(Tween, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 8, 25)) +>super : Symbol(Tween, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 8, 28)) >from : Symbol(from, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 20, 20)) } } diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types index 9c3d23ce7348c..eeca50fe0ecb5 100644 --- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types +++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes2.ts] //// === genericConstraintOnExtendedBuiltinTypes2.ts === -module EndGate { +namespace EndGate { export interface ICloneable { Clone(): any; >Clone : () => any @@ -13,7 +13,7 @@ interface Number extends EndGate.ICloneable { } >EndGate : typeof EndGate > : ^^^^^^^^^^^^^^ -module EndGate.Tweening { +namespace EndGate.Tweening { >EndGate : typeof EndGate > : ^^^^^^^^^^^^^^ >Tweening : typeof Tweening @@ -50,7 +50,7 @@ module EndGate.Tweening { } } -module EndGate.Tweening { +namespace EndGate.Tweening { >EndGate : typeof EndGate > : ^^^^^^^^^^^^^^ >Tweening : typeof Tweening diff --git a/tests/baselines/reference/genericFunduleInModule.errors.txt b/tests/baselines/reference/genericFunduleInModule.errors.txt index 4faa622a4b5c7..1ea5c8564b406 100644 --- a/tests/baselines/reference/genericFunduleInModule.errors.txt +++ b/tests/baselines/reference/genericFunduleInModule.errors.txt @@ -2,9 +2,9 @@ genericFunduleInModule.ts(8,8): error TS2749: 'A.B' refers to a value, but is be ==== genericFunduleInModule.ts (1 errors) ==== - module A { + namespace A { export function B(x: T) { return x; } - export module B { + export namespace B { export var x = 1; } } diff --git a/tests/baselines/reference/genericFunduleInModule.js b/tests/baselines/reference/genericFunduleInModule.js index 19a5eeb3541ba..de0139911bcec 100644 --- a/tests/baselines/reference/genericFunduleInModule.js +++ b/tests/baselines/reference/genericFunduleInModule.js @@ -1,9 +1,9 @@ //// [tests/cases/compiler/genericFunduleInModule.ts] //// //// [genericFunduleInModule.ts] -module A { +namespace A { export function B(x: T) { return x; } - export module B { + export namespace B { export var x = 1; } } diff --git a/tests/baselines/reference/genericFunduleInModule.symbols b/tests/baselines/reference/genericFunduleInModule.symbols index c48ca960f73d6..d0fd028d3ee80 100644 --- a/tests/baselines/reference/genericFunduleInModule.symbols +++ b/tests/baselines/reference/genericFunduleInModule.symbols @@ -1,18 +1,18 @@ //// [tests/cases/compiler/genericFunduleInModule.ts] //// === genericFunduleInModule.ts === -module A { +namespace A { >A : Symbol(A, Decl(genericFunduleInModule.ts, 0, 0)) export function B(x: T) { return x; } ->B : Symbol(B, Decl(genericFunduleInModule.ts, 0, 10), Decl(genericFunduleInModule.ts, 1, 44)) +>B : Symbol(B, Decl(genericFunduleInModule.ts, 0, 13), Decl(genericFunduleInModule.ts, 1, 44)) >T : Symbol(T, Decl(genericFunduleInModule.ts, 1, 22)) >x : Symbol(x, Decl(genericFunduleInModule.ts, 1, 25)) >T : Symbol(T, Decl(genericFunduleInModule.ts, 1, 22)) >x : Symbol(x, Decl(genericFunduleInModule.ts, 1, 25)) - export module B { ->B : Symbol(B, Decl(genericFunduleInModule.ts, 0, 10), Decl(genericFunduleInModule.ts, 1, 44)) + export namespace B { +>B : Symbol(B, Decl(genericFunduleInModule.ts, 0, 13), Decl(genericFunduleInModule.ts, 1, 44)) export var x = 1; >x : Symbol(x, Decl(genericFunduleInModule.ts, 3, 18)) @@ -25,7 +25,7 @@ var b: A.B; >B : Symbol(A.B) A.B(1); ->A.B : Symbol(A.B, Decl(genericFunduleInModule.ts, 0, 10), Decl(genericFunduleInModule.ts, 1, 44)) +>A.B : Symbol(A.B, Decl(genericFunduleInModule.ts, 0, 13), Decl(genericFunduleInModule.ts, 1, 44)) >A : Symbol(A, Decl(genericFunduleInModule.ts, 0, 0)) ->B : Symbol(A.B, Decl(genericFunduleInModule.ts, 0, 10), Decl(genericFunduleInModule.ts, 1, 44)) +>B : Symbol(A.B, Decl(genericFunduleInModule.ts, 0, 13), Decl(genericFunduleInModule.ts, 1, 44)) diff --git a/tests/baselines/reference/genericFunduleInModule.types b/tests/baselines/reference/genericFunduleInModule.types index d242e60bb09ab..cb5a6c4afad13 100644 --- a/tests/baselines/reference/genericFunduleInModule.types +++ b/tests/baselines/reference/genericFunduleInModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericFunduleInModule.ts] //// === genericFunduleInModule.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -13,7 +13,7 @@ module A { >x : T > : ^ - export module B { + export namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/genericFunduleInModule2.errors.txt b/tests/baselines/reference/genericFunduleInModule2.errors.txt index a980c90918392..44b4fc78cebe4 100644 --- a/tests/baselines/reference/genericFunduleInModule2.errors.txt +++ b/tests/baselines/reference/genericFunduleInModule2.errors.txt @@ -2,12 +2,12 @@ genericFunduleInModule2.ts(11,8): error TS2749: 'A.B' refers to a value, but is ==== genericFunduleInModule2.ts (1 errors) ==== - module A { + namespace A { export function B(x: T) { return x; } } - module A { - export module B { + namespace A { + export namespace B { export var x = 1; } } diff --git a/tests/baselines/reference/genericFunduleInModule2.js b/tests/baselines/reference/genericFunduleInModule2.js index d615dbc3d0329..78085bd88eb30 100644 --- a/tests/baselines/reference/genericFunduleInModule2.js +++ b/tests/baselines/reference/genericFunduleInModule2.js @@ -1,12 +1,12 @@ //// [tests/cases/compiler/genericFunduleInModule2.ts] //// //// [genericFunduleInModule2.ts] -module A { +namespace A { export function B(x: T) { return x; } } -module A { - export module B { +namespace A { + export namespace B { export var x = 1; } } diff --git a/tests/baselines/reference/genericFunduleInModule2.symbols b/tests/baselines/reference/genericFunduleInModule2.symbols index 906279addbe4c..506dd798f87ce 100644 --- a/tests/baselines/reference/genericFunduleInModule2.symbols +++ b/tests/baselines/reference/genericFunduleInModule2.symbols @@ -1,22 +1,22 @@ //// [tests/cases/compiler/genericFunduleInModule2.ts] //// === genericFunduleInModule2.ts === -module A { +namespace A { >A : Symbol(A, Decl(genericFunduleInModule2.ts, 0, 0), Decl(genericFunduleInModule2.ts, 2, 1)) export function B(x: T) { return x; } ->B : Symbol(B, Decl(genericFunduleInModule2.ts, 0, 10), Decl(genericFunduleInModule2.ts, 4, 10)) +>B : Symbol(B, Decl(genericFunduleInModule2.ts, 0, 13), Decl(genericFunduleInModule2.ts, 4, 13)) >T : Symbol(T, Decl(genericFunduleInModule2.ts, 1, 22)) >x : Symbol(x, Decl(genericFunduleInModule2.ts, 1, 25)) >T : Symbol(T, Decl(genericFunduleInModule2.ts, 1, 22)) >x : Symbol(x, Decl(genericFunduleInModule2.ts, 1, 25)) } -module A { +namespace A { >A : Symbol(A, Decl(genericFunduleInModule2.ts, 0, 0), Decl(genericFunduleInModule2.ts, 2, 1)) - export module B { ->B : Symbol(B, Decl(genericFunduleInModule2.ts, 0, 10), Decl(genericFunduleInModule2.ts, 4, 10)) + export namespace B { +>B : Symbol(B, Decl(genericFunduleInModule2.ts, 0, 13), Decl(genericFunduleInModule2.ts, 4, 13)) export var x = 1; >x : Symbol(x, Decl(genericFunduleInModule2.ts, 6, 18)) @@ -29,7 +29,7 @@ var b: A.B; >B : Symbol(A.B) A.B(1); ->A.B : Symbol(A.B, Decl(genericFunduleInModule2.ts, 0, 10), Decl(genericFunduleInModule2.ts, 4, 10)) +>A.B : Symbol(A.B, Decl(genericFunduleInModule2.ts, 0, 13), Decl(genericFunduleInModule2.ts, 4, 13)) >A : Symbol(A, Decl(genericFunduleInModule2.ts, 0, 0), Decl(genericFunduleInModule2.ts, 2, 1)) ->B : Symbol(A.B, Decl(genericFunduleInModule2.ts, 0, 10), Decl(genericFunduleInModule2.ts, 4, 10)) +>B : Symbol(A.B, Decl(genericFunduleInModule2.ts, 0, 13), Decl(genericFunduleInModule2.ts, 4, 13)) diff --git a/tests/baselines/reference/genericFunduleInModule2.types b/tests/baselines/reference/genericFunduleInModule2.types index 183a291971c08..8975ba71e2210 100644 --- a/tests/baselines/reference/genericFunduleInModule2.types +++ b/tests/baselines/reference/genericFunduleInModule2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericFunduleInModule2.ts] //// === genericFunduleInModule2.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -14,11 +14,11 @@ module A { > : ^ } -module A { +namespace A { >A : typeof A > : ^^^^^^^^ - export module B { + export namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/genericInference2.js b/tests/baselines/reference/genericInference2.js index 7f2b4b5cd0162..382cd97bca8e0 100644 --- a/tests/baselines/reference/genericInference2.js +++ b/tests/baselines/reference/genericInference2.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericInference2.ts] //// //// [genericInference2.ts] - declare module ko { + declare namespace ko { export interface Observable { (): T; (value: T): any; diff --git a/tests/baselines/reference/genericInference2.symbols b/tests/baselines/reference/genericInference2.symbols index 04b81f754a293..cdbdc5673004b 100644 --- a/tests/baselines/reference/genericInference2.symbols +++ b/tests/baselines/reference/genericInference2.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/genericInference2.ts] //// === genericInference2.ts === - declare module ko { + declare namespace ko { >ko : Symbol(ko, Decl(genericInference2.ts, 0, 0)) export interface Observable { ->Observable : Symbol(Observable, Decl(genericInference2.ts, 0, 23)) +>Observable : Symbol(Observable, Decl(genericInference2.ts, 0, 26)) >T : Symbol(T, Decl(genericInference2.ts, 1, 35)) (): T; @@ -30,7 +30,7 @@ >T : Symbol(T, Decl(genericInference2.ts, 8, 34)) >value : Symbol(value, Decl(genericInference2.ts, 8, 37)) >T : Symbol(T, Decl(genericInference2.ts, 8, 34)) ->Observable : Symbol(Observable, Decl(genericInference2.ts, 0, 23)) +>Observable : Symbol(Observable, Decl(genericInference2.ts, 0, 26)) >T : Symbol(T, Decl(genericInference2.ts, 8, 34)) } var o = { diff --git a/tests/baselines/reference/genericInference2.types b/tests/baselines/reference/genericInference2.types index 58986441db6ff..065baa62b2027 100644 --- a/tests/baselines/reference/genericInference2.types +++ b/tests/baselines/reference/genericInference2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericInference2.ts] //// === genericInference2.ts === - declare module ko { + declare namespace ko { >ko : typeof ko > : ^^^^^^^^^ diff --git a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.errors.txt b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.errors.txt index f8106b2154c97..57123560b9d79 100644 --- a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.errors.txt +++ b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.errors.txt @@ -4,7 +4,7 @@ genericMergedDeclarationUsingTypeParameter.ts(4,14): error TS2304: Cannot find n ==== genericMergedDeclarationUsingTypeParameter.ts (2 errors) ==== function foo(y: T, z: U) { return y; } - module foo { + namespace foo { export var x: T; ~ !!! error TS2304: Cannot find name 'T'. diff --git a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.js b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.js index a10afb2473336..78af72d0955c2 100644 --- a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.js +++ b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.js @@ -2,7 +2,7 @@ //// [genericMergedDeclarationUsingTypeParameter.ts] function foo(y: T, z: U) { return y; } -module foo { +namespace foo { export var x: T; var y = 1; } diff --git a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.symbols b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.symbols index 64b0416e38a1b..028bb35878db2 100644 --- a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.symbols +++ b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.symbols @@ -12,7 +12,7 @@ function foo(y: T, z: U) { return y; } >U : Symbol(U, Decl(genericMergedDeclarationUsingTypeParameter.ts, 0, 25)) >y : Symbol(y, Decl(genericMergedDeclarationUsingTypeParameter.ts, 0, 29)) -module foo { +namespace foo { >foo : Symbol(foo, Decl(genericMergedDeclarationUsingTypeParameter.ts, 0, 0), Decl(genericMergedDeclarationUsingTypeParameter.ts, 0, 54)) export var x: T; diff --git a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.types b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.types index dc751b4023924..26f8a30b26041 100644 --- a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.types +++ b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.types @@ -11,7 +11,7 @@ function foo(y: T, z: U) { return y; } >y : T > : ^ -module foo { +namespace foo { >foo : typeof foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.errors.txt b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.errors.txt index a1bd58f15c938..321d03d8810d1 100644 --- a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.errors.txt +++ b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.errors.txt @@ -4,7 +4,7 @@ genericMergedDeclarationUsingTypeParameter2.ts(4,14): error TS2304: Cannot find ==== genericMergedDeclarationUsingTypeParameter2.ts (2 errors) ==== class foo { constructor(x: T) { } } - module foo { + namespace foo { export var x: T; ~ !!! error TS2304: Cannot find name 'T'. diff --git a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.js b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.js index 44e4f166d9d79..b74a09dc26eba 100644 --- a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.js +++ b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.js @@ -2,7 +2,7 @@ //// [genericMergedDeclarationUsingTypeParameter2.ts] class foo { constructor(x: T) { } } -module foo { +namespace foo { export var x: T; var y = 1; } diff --git a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.symbols b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.symbols index 6a0ed83fb5f92..4780bdf50e825 100644 --- a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.symbols +++ b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.symbols @@ -7,7 +7,7 @@ class foo { constructor(x: T) { } } >x : Symbol(x, Decl(genericMergedDeclarationUsingTypeParameter2.ts, 0, 27)) >T : Symbol(T, Decl(genericMergedDeclarationUsingTypeParameter2.ts, 0, 10)) -module foo { +namespace foo { >foo : Symbol(foo, Decl(genericMergedDeclarationUsingTypeParameter2.ts, 0, 0), Decl(genericMergedDeclarationUsingTypeParameter2.ts, 0, 38)) export var x: T; diff --git a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.types b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.types index 33af29090ea3f..0b12ab5055d2d 100644 --- a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.types +++ b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.types @@ -7,7 +7,7 @@ class foo { constructor(x: T) { } } >x : T > : ^ -module foo { +namespace foo { >foo : typeof foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/genericOfACloduleType1.js b/tests/baselines/reference/genericOfACloduleType1.js index 85b46dee62296..09840362816f6 100644 --- a/tests/baselines/reference/genericOfACloduleType1.js +++ b/tests/baselines/reference/genericOfACloduleType1.js @@ -2,9 +2,9 @@ //// [genericOfACloduleType1.ts] class G{ bar(x: T) { return x; } } -module M { +namespace M { export class C { foo() { } } - export module C { + export namespace C { export class X { } } diff --git a/tests/baselines/reference/genericOfACloduleType1.symbols b/tests/baselines/reference/genericOfACloduleType1.symbols index 6008cf398c8a1..0491363dd645d 100644 --- a/tests/baselines/reference/genericOfACloduleType1.symbols +++ b/tests/baselines/reference/genericOfACloduleType1.symbols @@ -9,25 +9,25 @@ class G{ bar(x: T) { return x; } } >T : Symbol(T, Decl(genericOfACloduleType1.ts, 0, 8)) >x : Symbol(x, Decl(genericOfACloduleType1.ts, 0, 16)) -module M { +namespace M { >M : Symbol(M, Decl(genericOfACloduleType1.ts, 0, 37)) export class C { foo() { } } ->C : Symbol(C, Decl(genericOfACloduleType1.ts, 1, 10), Decl(genericOfACloduleType1.ts, 2, 32)) +>C : Symbol(C, Decl(genericOfACloduleType1.ts, 1, 13), Decl(genericOfACloduleType1.ts, 2, 32)) >foo : Symbol(C.foo, Decl(genericOfACloduleType1.ts, 2, 20)) - export module C { ->C : Symbol(C, Decl(genericOfACloduleType1.ts, 1, 10), Decl(genericOfACloduleType1.ts, 2, 32)) + export namespace C { +>C : Symbol(C, Decl(genericOfACloduleType1.ts, 1, 13), Decl(genericOfACloduleType1.ts, 2, 32)) export class X { ->X : Symbol(X, Decl(genericOfACloduleType1.ts, 3, 21)) +>X : Symbol(X, Decl(genericOfACloduleType1.ts, 3, 24)) } } var g1 = new G(); >g1 : Symbol(g1, Decl(genericOfACloduleType1.ts, 8, 7)) >G : Symbol(G, Decl(genericOfACloduleType1.ts, 0, 0)) ->C : Symbol(C, Decl(genericOfACloduleType1.ts, 1, 10), Decl(genericOfACloduleType1.ts, 2, 32)) +>C : Symbol(C, Decl(genericOfACloduleType1.ts, 1, 13), Decl(genericOfACloduleType1.ts, 2, 32)) g1.bar(null).foo(); >g1.bar(null).foo : Symbol(C.foo, Decl(genericOfACloduleType1.ts, 2, 20)) @@ -40,5 +40,5 @@ var g2 = new G() // was: error Type reference cannot refer to container 'M. >g2 : Symbol(g2, Decl(genericOfACloduleType1.ts, 11, 3)) >G : Symbol(G, Decl(genericOfACloduleType1.ts, 0, 0)) >M : Symbol(M, Decl(genericOfACloduleType1.ts, 0, 37)) ->C : Symbol(M.C, Decl(genericOfACloduleType1.ts, 1, 10), Decl(genericOfACloduleType1.ts, 2, 32)) +>C : Symbol(M.C, Decl(genericOfACloduleType1.ts, 1, 13), Decl(genericOfACloduleType1.ts, 2, 32)) diff --git a/tests/baselines/reference/genericOfACloduleType1.types b/tests/baselines/reference/genericOfACloduleType1.types index 48815e196a863..d87e4a906fc34 100644 --- a/tests/baselines/reference/genericOfACloduleType1.types +++ b/tests/baselines/reference/genericOfACloduleType1.types @@ -11,7 +11,7 @@ class G{ bar(x: T) { return x; } } >x : T > : ^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -21,7 +21,7 @@ module M { >foo : () => void > : ^^^^^^^^^^ - export module C { + export namespace C { >C : typeof C > : ^^^^^^^^ diff --git a/tests/baselines/reference/genericOfACloduleType2.js b/tests/baselines/reference/genericOfACloduleType2.js index 2d41091e41924..e35d8e95ef6d0 100644 --- a/tests/baselines/reference/genericOfACloduleType2.js +++ b/tests/baselines/reference/genericOfACloduleType2.js @@ -2,9 +2,9 @@ //// [genericOfACloduleType2.ts] class G{ bar(x: T) { return x; } } -module M { +namespace M { export class C { foo() { } } - export module C { + export namespace C { export class X { } } @@ -13,7 +13,7 @@ module M { g1.bar(null).foo(); // no error } -module N { +namespace N { var g2 = new G() } diff --git a/tests/baselines/reference/genericOfACloduleType2.symbols b/tests/baselines/reference/genericOfACloduleType2.symbols index 9e34e5f3fb260..40073df3de203 100644 --- a/tests/baselines/reference/genericOfACloduleType2.symbols +++ b/tests/baselines/reference/genericOfACloduleType2.symbols @@ -9,25 +9,25 @@ class G{ bar(x: T) { return x; } } >T : Symbol(T, Decl(genericOfACloduleType2.ts, 0, 8)) >x : Symbol(x, Decl(genericOfACloduleType2.ts, 0, 16)) -module M { +namespace M { >M : Symbol(M, Decl(genericOfACloduleType2.ts, 0, 37)) export class C { foo() { } } ->C : Symbol(C, Decl(genericOfACloduleType2.ts, 1, 10), Decl(genericOfACloduleType2.ts, 2, 32)) +>C : Symbol(C, Decl(genericOfACloduleType2.ts, 1, 13), Decl(genericOfACloduleType2.ts, 2, 32)) >foo : Symbol(C.foo, Decl(genericOfACloduleType2.ts, 2, 20)) - export module C { ->C : Symbol(C, Decl(genericOfACloduleType2.ts, 1, 10), Decl(genericOfACloduleType2.ts, 2, 32)) + export namespace C { +>C : Symbol(C, Decl(genericOfACloduleType2.ts, 1, 13), Decl(genericOfACloduleType2.ts, 2, 32)) export class X { ->X : Symbol(X, Decl(genericOfACloduleType2.ts, 3, 21)) +>X : Symbol(X, Decl(genericOfACloduleType2.ts, 3, 24)) } } var g1 = new G(); >g1 : Symbol(g1, Decl(genericOfACloduleType2.ts, 8, 7)) >G : Symbol(G, Decl(genericOfACloduleType2.ts, 0, 0)) ->C : Symbol(C, Decl(genericOfACloduleType2.ts, 1, 10), Decl(genericOfACloduleType2.ts, 2, 32)) +>C : Symbol(C, Decl(genericOfACloduleType2.ts, 1, 13), Decl(genericOfACloduleType2.ts, 2, 32)) g1.bar(null).foo(); // no error >g1.bar(null).foo : Symbol(C.foo, Decl(genericOfACloduleType2.ts, 2, 20)) @@ -37,12 +37,12 @@ module M { >foo : Symbol(C.foo, Decl(genericOfACloduleType2.ts, 2, 20)) } -module N { +namespace N { >N : Symbol(N, Decl(genericOfACloduleType2.ts, 10, 1)) var g2 = new G() >g2 : Symbol(g2, Decl(genericOfACloduleType2.ts, 13, 7)) >G : Symbol(G, Decl(genericOfACloduleType2.ts, 0, 0)) >M : Symbol(M, Decl(genericOfACloduleType2.ts, 0, 37)) ->C : Symbol(M.C, Decl(genericOfACloduleType2.ts, 1, 10), Decl(genericOfACloduleType2.ts, 2, 32)) +>C : Symbol(M.C, Decl(genericOfACloduleType2.ts, 1, 13), Decl(genericOfACloduleType2.ts, 2, 32)) } diff --git a/tests/baselines/reference/genericOfACloduleType2.types b/tests/baselines/reference/genericOfACloduleType2.types index c39881974898d..ddf7fa6864590 100644 --- a/tests/baselines/reference/genericOfACloduleType2.types +++ b/tests/baselines/reference/genericOfACloduleType2.types @@ -11,7 +11,7 @@ class G{ bar(x: T) { return x; } } >x : T > : ^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -21,7 +21,7 @@ module M { >foo : () => void > : ^^^^^^^^^^ - export module C { + export namespace C { >C : typeof C > : ^^^^^^^^ @@ -56,7 +56,7 @@ module M { > : ^^^^^^^^^^ } -module N { +namespace N { >N : typeof N > : ^^^^^^^^ diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.errors.txt b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.errors.txt index 2f06b05362e9c..2e2efb0b33045 100644 --- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.errors.txt +++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.errors.txt @@ -2,7 +2,7 @@ genericRecursiveImplicitConstructorErrors1.ts(9,49): error TS2314: Generic type ==== genericRecursiveImplicitConstructorErrors1.ts (1 errors) ==== - export declare module TypeScript { + export declare namespace TypeScript { class PullSymbol { } class PullSignatureSymbol extends PullSymbol { public addSpecialization(signature: PullSignatureSymbol, typeArguments: PullTypeSymbol[]): void; diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.js b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.js index 30b74fd2c43d3..a073eb6601e2d 100644 --- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.js +++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericRecursiveImplicitConstructorErrors1.ts] //// //// [genericRecursiveImplicitConstructorErrors1.ts] -export declare module TypeScript { +export declare namespace TypeScript { class PullSymbol { } class PullSignatureSymbol extends PullSymbol { public addSpecialization(signature: PullSignatureSymbol, typeArguments: PullTypeSymbol[]): void; diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.symbols b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.symbols index 9e0bc487f01a4..d556094b61859 100644 --- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.symbols +++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.symbols @@ -1,18 +1,18 @@ //// [tests/cases/compiler/genericRecursiveImplicitConstructorErrors1.ts] //// === genericRecursiveImplicitConstructorErrors1.ts === -export declare module TypeScript { +export declare namespace TypeScript { >TypeScript : Symbol(TypeScript, Decl(genericRecursiveImplicitConstructorErrors1.ts, 0, 0)) class PullSymbol { } ->PullSymbol : Symbol(PullSymbol, Decl(genericRecursiveImplicitConstructorErrors1.ts, 0, 34)) +>PullSymbol : Symbol(PullSymbol, Decl(genericRecursiveImplicitConstructorErrors1.ts, 0, 37)) class PullSignatureSymbol extends PullSymbol { >PullSignatureSymbol : Symbol(PullSignatureSymbol, Decl(genericRecursiveImplicitConstructorErrors1.ts, 1, 22)) >A : Symbol(A, Decl(genericRecursiveImplicitConstructorErrors1.ts, 2, 29)) >B : Symbol(B, Decl(genericRecursiveImplicitConstructorErrors1.ts, 2, 31)) >C : Symbol(C, Decl(genericRecursiveImplicitConstructorErrors1.ts, 2, 33)) ->PullSymbol : Symbol(PullSymbol, Decl(genericRecursiveImplicitConstructorErrors1.ts, 0, 34)) +>PullSymbol : Symbol(PullSymbol, Decl(genericRecursiveImplicitConstructorErrors1.ts, 0, 37)) public addSpecialization(signature: PullSignatureSymbol, typeArguments: PullTypeSymbol[]): void; >addSpecialization : Symbol(PullSignatureSymbol.addSpecialization, Decl(genericRecursiveImplicitConstructorErrors1.ts, 2, 56)) @@ -32,7 +32,7 @@ export declare module TypeScript { >A : Symbol(A, Decl(genericRecursiveImplicitConstructorErrors1.ts, 5, 24)) >B : Symbol(B, Decl(genericRecursiveImplicitConstructorErrors1.ts, 5, 26)) >C : Symbol(C, Decl(genericRecursiveImplicitConstructorErrors1.ts, 5, 28)) ->PullSymbol : Symbol(PullSymbol, Decl(genericRecursiveImplicitConstructorErrors1.ts, 0, 34)) +>PullSymbol : Symbol(PullSymbol, Decl(genericRecursiveImplicitConstructorErrors1.ts, 0, 37)) public findTypeParameter(name: string): PullTypeParameterSymbol; >findTypeParameter : Symbol(PullTypeSymbol.findTypeParameter, Decl(genericRecursiveImplicitConstructorErrors1.ts, 5, 51)) diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.types b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.types index aae626c4291c1..ad24213170ec1 100644 --- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.types +++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericRecursiveImplicitConstructorErrors1.ts] //// === genericRecursiveImplicitConstructorErrors1.ts === -export declare module TypeScript { +export declare namespace TypeScript { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js index 6dc42e72ce09a..4c4a8a910335f 100644 --- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js +++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericRecursiveImplicitConstructorErrors2.ts] //// //// [genericRecursiveImplicitConstructorErrors2.ts] -module TypeScript2 { +namespace TypeScript2 { export interface DeclKind { }; export interface PullTypesymbol { }; export interface SymbolLinkKind { }; diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.symbols b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.symbols index 7aeb5ccb446c7..ae47d9807e984 100644 --- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.symbols +++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/genericRecursiveImplicitConstructorErrors2.ts] //// === genericRecursiveImplicitConstructorErrors2.ts === -module TypeScript2 { +namespace TypeScript2 { >TypeScript2 : Symbol(TypeScript2, Decl(genericRecursiveImplicitConstructorErrors2.ts, 0, 0)) export interface DeclKind { }; ->DeclKind : Symbol(DeclKind, Decl(genericRecursiveImplicitConstructorErrors2.ts, 0, 20)) +>DeclKind : Symbol(DeclKind, Decl(genericRecursiveImplicitConstructorErrors2.ts, 0, 23)) export interface PullTypesymbol { }; >PullTypesymbol : Symbol(PullTypesymbol, Decl(genericRecursiveImplicitConstructorErrors2.ts, 1, 32)) @@ -29,7 +29,7 @@ module TypeScript2 { constructor (name: string, declKind: DeclKind) { >name : Symbol(name, Decl(genericRecursiveImplicitConstructorErrors2.ts, 10, 17)) >declKind : Symbol(declKind, Decl(genericRecursiveImplicitConstructorErrors2.ts, 10, 30)) ->DeclKind : Symbol(DeclKind, Decl(genericRecursiveImplicitConstructorErrors2.ts, 0, 20)) +>DeclKind : Symbol(DeclKind, Decl(genericRecursiveImplicitConstructorErrors2.ts, 0, 23)) } // link methods diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.types b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.types index 179d76d99acbb..cb75043afa980 100644 --- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.types +++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericRecursiveImplicitConstructorErrors2.ts] //// === genericRecursiveImplicitConstructorErrors2.ts === -module TypeScript2 { +namespace TypeScript2 { >TypeScript2 : typeof TypeScript2 > : ^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.errors.txt b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.errors.txt index 0a3d27451fda0..206d07180f09f 100644 --- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.errors.txt +++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.errors.txt @@ -8,7 +8,7 @@ genericRecursiveImplicitConstructorErrors3.ts(19,22): error TS2339: Property 'is ==== genericRecursiveImplicitConstructorErrors3.ts (7 errors) ==== - module TypeScript { + namespace TypeScript { export class MemberName { static create(arg1: any, arg2?: any, arg3?: any): MemberName { ~~~~~~~~~~ @@ -17,7 +17,7 @@ genericRecursiveImplicitConstructorErrors3.ts(19,22): error TS2339: Property 'is } } - module TypeScript { + namespace TypeScript { export class PullSymbol { public type: PullTypeSymbol = null; ~~~~~~~~~~~~~~ diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js index f10a8f97f1643..3203b826c25d9 100644 --- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js +++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js @@ -1,14 +1,14 @@ //// [tests/cases/compiler/genericRecursiveImplicitConstructorErrors3.ts] //// //// [genericRecursiveImplicitConstructorErrors3.ts] -module TypeScript { +namespace TypeScript { export class MemberName { static create(arg1: any, arg2?: any, arg3?: any): MemberName { } } } -module TypeScript { +namespace TypeScript { export class PullSymbol { public type: PullTypeSymbol = null; } diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.symbols b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.symbols index afb84b36fd2bd..970f62952381e 100644 --- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.symbols +++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/genericRecursiveImplicitConstructorErrors3.ts] //// === genericRecursiveImplicitConstructorErrors3.ts === -module TypeScript { +namespace TypeScript { >TypeScript : Symbol(TypeScript, Decl(genericRecursiveImplicitConstructorErrors3.ts, 0, 0), Decl(genericRecursiveImplicitConstructorErrors3.ts, 5, 1)) export class MemberName { ->MemberName : Symbol(MemberName, Decl(genericRecursiveImplicitConstructorErrors3.ts, 0, 19)) +>MemberName : Symbol(MemberName, Decl(genericRecursiveImplicitConstructorErrors3.ts, 0, 22)) >A : Symbol(A, Decl(genericRecursiveImplicitConstructorErrors3.ts, 1, 29)) >B : Symbol(B, Decl(genericRecursiveImplicitConstructorErrors3.ts, 1, 31)) >C : Symbol(C, Decl(genericRecursiveImplicitConstructorErrors3.ts, 1, 33)) @@ -18,16 +18,16 @@ module TypeScript { >arg1 : Symbol(arg1, Decl(genericRecursiveImplicitConstructorErrors3.ts, 2, 29)) >arg2 : Symbol(arg2, Decl(genericRecursiveImplicitConstructorErrors3.ts, 2, 39)) >arg3 : Symbol(arg3, Decl(genericRecursiveImplicitConstructorErrors3.ts, 2, 51)) ->MemberName : Symbol(MemberName, Decl(genericRecursiveImplicitConstructorErrors3.ts, 0, 19)) +>MemberName : Symbol(MemberName, Decl(genericRecursiveImplicitConstructorErrors3.ts, 0, 22)) } } } -module TypeScript { +namespace TypeScript { >TypeScript : Symbol(TypeScript, Decl(genericRecursiveImplicitConstructorErrors3.ts, 0, 0), Decl(genericRecursiveImplicitConstructorErrors3.ts, 5, 1)) export class PullSymbol { ->PullSymbol : Symbol(PullSymbol, Decl(genericRecursiveImplicitConstructorErrors3.ts, 7, 19)) +>PullSymbol : Symbol(PullSymbol, Decl(genericRecursiveImplicitConstructorErrors3.ts, 7, 22)) >A : Symbol(A, Decl(genericRecursiveImplicitConstructorErrors3.ts, 8, 29)) >B : Symbol(B, Decl(genericRecursiveImplicitConstructorErrors3.ts, 8, 31)) >C : Symbol(C, Decl(genericRecursiveImplicitConstructorErrors3.ts, 8, 33)) @@ -41,7 +41,7 @@ module TypeScript { >A : Symbol(A, Decl(genericRecursiveImplicitConstructorErrors3.ts, 11, 33)) >B : Symbol(B, Decl(genericRecursiveImplicitConstructorErrors3.ts, 11, 35)) >C : Symbol(C, Decl(genericRecursiveImplicitConstructorErrors3.ts, 11, 37)) ->PullSymbol : Symbol(PullSymbol, Decl(genericRecursiveImplicitConstructorErrors3.ts, 7, 19)) +>PullSymbol : Symbol(PullSymbol, Decl(genericRecursiveImplicitConstructorErrors3.ts, 7, 22)) private _elementType: PullTypeSymbol = null; >_elementType : Symbol(PullTypeSymbol._elementType, Decl(genericRecursiveImplicitConstructorErrors3.ts, 11, 59)) @@ -53,7 +53,7 @@ module TypeScript { >B : Symbol(B, Decl(genericRecursiveImplicitConstructorErrors3.ts, 13, 26)) >C : Symbol(C, Decl(genericRecursiveImplicitConstructorErrors3.ts, 13, 28)) >scopeSymbol : Symbol(scopeSymbol, Decl(genericRecursiveImplicitConstructorErrors3.ts, 13, 31)) ->PullSymbol : Symbol(PullSymbol, Decl(genericRecursiveImplicitConstructorErrors3.ts, 7, 19)) +>PullSymbol : Symbol(PullSymbol, Decl(genericRecursiveImplicitConstructorErrors3.ts, 7, 22)) >useConstraintInName : Symbol(useConstraintInName, Decl(genericRecursiveImplicitConstructorErrors3.ts, 13, 56)) var s = this.getScopedNameEx(scopeSymbol, useConstraintInName).toString(); @@ -73,7 +73,7 @@ module TypeScript { >B : Symbol(B, Decl(genericRecursiveImplicitConstructorErrors3.ts, 17, 33)) >C : Symbol(C, Decl(genericRecursiveImplicitConstructorErrors3.ts, 17, 35)) >scopeSymbol : Symbol(scopeSymbol, Decl(genericRecursiveImplicitConstructorErrors3.ts, 17, 38)) ->PullSymbol : Symbol(PullSymbol, Decl(genericRecursiveImplicitConstructorErrors3.ts, 7, 19)) +>PullSymbol : Symbol(PullSymbol, Decl(genericRecursiveImplicitConstructorErrors3.ts, 7, 22)) >useConstraintInName : Symbol(useConstraintInName, Decl(genericRecursiveImplicitConstructorErrors3.ts, 17, 63)) >getPrettyTypeName : Symbol(getPrettyTypeName, Decl(genericRecursiveImplicitConstructorErrors3.ts, 17, 94)) >getTypeParamMarkerInfo : Symbol(getTypeParamMarkerInfo, Decl(genericRecursiveImplicitConstructorErrors3.ts, 17, 123)) @@ -112,7 +112,7 @@ module TypeScript { return MemberName.create(elementMemberName, "", "[]"); >MemberName.create : Symbol(MemberName.create, Decl(genericRecursiveImplicitConstructorErrors3.ts, 1, 36)) ->MemberName : Symbol(MemberName, Decl(genericRecursiveImplicitConstructorErrors3.ts, 0, 19)) +>MemberName : Symbol(MemberName, Decl(genericRecursiveImplicitConstructorErrors3.ts, 0, 22)) >create : Symbol(MemberName.create, Decl(genericRecursiveImplicitConstructorErrors3.ts, 1, 36)) >elementMemberName : Symbol(elementMemberName, Decl(genericRecursiveImplicitConstructorErrors3.ts, 19, 19)) } diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types index 74f654b1a760e..41d4d69e565ca 100644 --- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types +++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericRecursiveImplicitConstructorErrors3.ts] //// === genericRecursiveImplicitConstructorErrors3.ts === -module TypeScript { +namespace TypeScript { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ @@ -22,7 +22,7 @@ module TypeScript { } } -module TypeScript { +namespace TypeScript { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/genericSetterInClassType.js b/tests/baselines/reference/genericSetterInClassType.js index 3e7328bd719bb..398821cb4ccb5 100644 --- a/tests/baselines/reference/genericSetterInClassType.js +++ b/tests/baselines/reference/genericSetterInClassType.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/classes/members/classTypes/genericSetterInClassType.ts] //// //// [genericSetterInClassType.ts] -module Generic { +namespace Generic { class C { get y(): T { return 1 as never; diff --git a/tests/baselines/reference/genericSetterInClassType.symbols b/tests/baselines/reference/genericSetterInClassType.symbols index bea676ef805ce..4332709013aa8 100644 --- a/tests/baselines/reference/genericSetterInClassType.symbols +++ b/tests/baselines/reference/genericSetterInClassType.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/classes/members/classTypes/genericSetterInClassType.ts] //// === genericSetterInClassType.ts === -module Generic { +namespace Generic { >Generic : Symbol(Generic, Decl(genericSetterInClassType.ts, 0, 0)) class C { ->C : Symbol(C, Decl(genericSetterInClassType.ts, 0, 16)) +>C : Symbol(C, Decl(genericSetterInClassType.ts, 0, 19)) >T : Symbol(T, Decl(genericSetterInClassType.ts, 1, 12)) get y(): T { @@ -21,7 +21,7 @@ module Generic { var c = new C(); >c : Symbol(c, Decl(genericSetterInClassType.ts, 8, 7)) ->C : Symbol(C, Decl(genericSetterInClassType.ts, 0, 16)) +>C : Symbol(C, Decl(genericSetterInClassType.ts, 0, 19)) c.y = c.y; >c.y : Symbol(C.y, Decl(genericSetterInClassType.ts, 1, 16), Decl(genericSetterInClassType.ts, 4, 9)) diff --git a/tests/baselines/reference/genericSetterInClassType.types b/tests/baselines/reference/genericSetterInClassType.types index e44c81a85ae3f..51ced95f58da2 100644 --- a/tests/baselines/reference/genericSetterInClassType.types +++ b/tests/baselines/reference/genericSetterInClassType.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/classes/members/classTypes/genericSetterInClassType.ts] //// === genericSetterInClassType.ts === -module Generic { +namespace Generic { >Generic : typeof Generic > : ^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/genericTypeArgumentInference1.errors.txt b/tests/baselines/reference/genericTypeArgumentInference1.errors.txt index 56a9dee32a153..ce6e6b330e8b5 100644 --- a/tests/baselines/reference/genericTypeArgumentInference1.errors.txt +++ b/tests/baselines/reference/genericTypeArgumentInference1.errors.txt @@ -4,7 +4,7 @@ genericTypeArgumentInference1.ts(12,39): error TS2345: Argument of type '(val ==== genericTypeArgumentInference1.ts (1 errors) ==== - module Underscore { + namespace Underscore { export interface Iterator { (value: T, index: any, list: any): U; } diff --git a/tests/baselines/reference/genericTypeArgumentInference1.js b/tests/baselines/reference/genericTypeArgumentInference1.js index d6eb3c4bf7dee..1077eafbb5f34 100644 --- a/tests/baselines/reference/genericTypeArgumentInference1.js +++ b/tests/baselines/reference/genericTypeArgumentInference1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericTypeArgumentInference1.ts] //// //// [genericTypeArgumentInference1.ts] -module Underscore { +namespace Underscore { export interface Iterator { (value: T, index: any, list: any): U; } diff --git a/tests/baselines/reference/genericTypeArgumentInference1.symbols b/tests/baselines/reference/genericTypeArgumentInference1.symbols index 418211438478b..3a3b1ea7c1498 100644 --- a/tests/baselines/reference/genericTypeArgumentInference1.symbols +++ b/tests/baselines/reference/genericTypeArgumentInference1.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/genericTypeArgumentInference1.ts] //// === genericTypeArgumentInference1.ts === -module Underscore { +namespace Underscore { >Underscore : Symbol(Underscore, Decl(genericTypeArgumentInference1.ts, 0, 0)) export interface Iterator { ->Iterator : Symbol(Iterator, Decl(genericTypeArgumentInference1.ts, 0, 19)) +>Iterator : Symbol(Iterator, Decl(genericTypeArgumentInference1.ts, 0, 22)) >T : Symbol(T, Decl(genericTypeArgumentInference1.ts, 1, 30)) >U : Symbol(U, Decl(genericTypeArgumentInference1.ts, 1, 32)) @@ -25,7 +25,7 @@ module Underscore { >list : Symbol(list, Decl(genericTypeArgumentInference1.ts, 5, 15)) >T : Symbol(T, Decl(genericTypeArgumentInference1.ts, 5, 12)) >iterator : Symbol(iterator, Decl(genericTypeArgumentInference1.ts, 5, 25)) ->Iterator : Symbol(Iterator, Decl(genericTypeArgumentInference1.ts, 0, 19)) +>Iterator : Symbol(Iterator, Decl(genericTypeArgumentInference1.ts, 0, 22)) >T : Symbol(T, Decl(genericTypeArgumentInference1.ts, 5, 12)) >context : Symbol(context, Decl(genericTypeArgumentInference1.ts, 5, 58)) >T : Symbol(T, Decl(genericTypeArgumentInference1.ts, 5, 12)) diff --git a/tests/baselines/reference/genericTypeArgumentInference1.types b/tests/baselines/reference/genericTypeArgumentInference1.types index ad6c98f795b4b..d2a23659f856b 100644 --- a/tests/baselines/reference/genericTypeArgumentInference1.types +++ b/tests/baselines/reference/genericTypeArgumentInference1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/genericTypeArgumentInference1.ts] //// === genericTypeArgumentInference1.ts === -module Underscore { +namespace Underscore { export interface Iterator { (value: T, index: any, list: any): U; >value : T diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.errors.txt b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.errors.txt index d82ba34a3b0c2..e469f82fd48a6 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.errors.txt +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.errors.txt @@ -52,7 +52,7 @@ genericTypeReferenceWithoutTypeArgument.d.ts(26,30): error TS2314: Generic type ~ !!! error TS2314: Generic type 'C' requires 1 type argument(s). - declare module M { + declare namespace M { export class E { foo: T } } diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.symbols b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.symbols index edf2112792bed..b27ef67d4f035 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.symbols +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.symbols @@ -44,11 +44,11 @@ declare class D extends C {} >D : Symbol(D, Decl(genericTypeReferenceWithoutTypeArgument.d.ts, 13, 28)) >C : Symbol(C, Decl(genericTypeReferenceWithoutTypeArgument.d.ts, 0, 0)) -declare module M { +declare namespace M { >M : Symbol(M, Decl(genericTypeReferenceWithoutTypeArgument.d.ts, 15, 28)) export class E { foo: T } ->E : Symbol(E, Decl(genericTypeReferenceWithoutTypeArgument.d.ts, 17, 18)) +>E : Symbol(E, Decl(genericTypeReferenceWithoutTypeArgument.d.ts, 17, 21)) >T : Symbol(T, Decl(genericTypeReferenceWithoutTypeArgument.d.ts, 18, 19)) >foo : Symbol(E.foo, Decl(genericTypeReferenceWithoutTypeArgument.d.ts, 18, 23)) >T : Symbol(T, Decl(genericTypeReferenceWithoutTypeArgument.d.ts, 18, 19)) @@ -62,7 +62,7 @@ declare class D3 { } >D3 : Symbol(D3, Decl(genericTypeReferenceWithoutTypeArgument.d.ts, 21, 32)) >T : Symbol(T, Decl(genericTypeReferenceWithoutTypeArgument.d.ts, 22, 17)) >M : Symbol(M, Decl(genericTypeReferenceWithoutTypeArgument.d.ts, 15, 28)) ->E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument.d.ts, 17, 18)) +>E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument.d.ts, 17, 21)) declare function h(x: T); >h : Symbol(h, Decl(genericTypeReferenceWithoutTypeArgument.d.ts, 22, 35)) @@ -75,7 +75,7 @@ declare function i(x: T); >i : Symbol(i, Decl(genericTypeReferenceWithoutTypeArgument.d.ts, 24, 38)) >T : Symbol(T, Decl(genericTypeReferenceWithoutTypeArgument.d.ts, 25, 19)) >M : Symbol(M, Decl(genericTypeReferenceWithoutTypeArgument.d.ts, 15, 28)) ->E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument.d.ts, 17, 18)) +>E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument.d.ts, 17, 21)) >x : Symbol(x, Decl(genericTypeReferenceWithoutTypeArgument.d.ts, 25, 34)) >T : Symbol(T, Decl(genericTypeReferenceWithoutTypeArgument.d.ts, 25, 19)) diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types index 7d12f8b399ff6..2c7c1ae3c6715 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types @@ -47,7 +47,7 @@ declare class D extends C {} >C : typeof C > : ^^^^^^^^ -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.errors.txt b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.errors.txt index 1125aaa67c1c2..83bf794500e93 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.errors.txt +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.errors.txt @@ -83,7 +83,7 @@ genericTypeReferenceWithoutTypeArgument.ts(37,10): error TS2314: Generic type 'E ~ !!! error TS2314: Generic type 'C' requires 1 type argument(s). - module M { + namespace M { export class E { foo: T } } diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js index 959a775516468..00a5a280fa3ae 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js @@ -25,7 +25,7 @@ class D extends C { interface I extends C {} -module M { +namespace M { export class E { foo: T } } diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.symbols b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.symbols index 94ed7c1fe47d3..d6d318eea2393 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.symbols +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.symbols @@ -70,11 +70,11 @@ interface I extends C {} >I : Symbol(I, Decl(genericTypeReferenceWithoutTypeArgument.ts, 20, 1)) >C : Symbol(C, Decl(genericTypeReferenceWithoutTypeArgument.ts, 0, 0)) -module M { +namespace M { >M : Symbol(M, Decl(genericTypeReferenceWithoutTypeArgument.ts, 22, 24)) export class E { foo: T } ->E : Symbol(E, Decl(genericTypeReferenceWithoutTypeArgument.ts, 24, 10)) +>E : Symbol(E, Decl(genericTypeReferenceWithoutTypeArgument.ts, 24, 13)) >T : Symbol(T, Decl(genericTypeReferenceWithoutTypeArgument.ts, 25, 19)) >foo : Symbol(E.foo, Decl(genericTypeReferenceWithoutTypeArgument.ts, 25, 23)) >T : Symbol(T, Decl(genericTypeReferenceWithoutTypeArgument.ts, 25, 19)) @@ -82,21 +82,21 @@ module M { class D2 extends M.E { } >D2 : Symbol(D2, Decl(genericTypeReferenceWithoutTypeArgument.ts, 26, 1)) ->M.E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument.ts, 24, 10)) +>M.E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument.ts, 24, 13)) >M : Symbol(M, Decl(genericTypeReferenceWithoutTypeArgument.ts, 22, 24)) ->E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument.ts, 24, 10)) +>E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument.ts, 24, 13)) class D3 { } >D3 : Symbol(D3, Decl(genericTypeReferenceWithoutTypeArgument.ts, 28, 24)) >T : Symbol(T, Decl(genericTypeReferenceWithoutTypeArgument.ts, 29, 9)) >M : Symbol(M, Decl(genericTypeReferenceWithoutTypeArgument.ts, 22, 24)) ->E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument.ts, 24, 10)) +>E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument.ts, 24, 13)) interface I2 extends M.E { } >I2 : Symbol(I2, Decl(genericTypeReferenceWithoutTypeArgument.ts, 29, 27)) ->M.E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument.ts, 24, 10)) +>M.E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument.ts, 24, 13)) >M : Symbol(M, Decl(genericTypeReferenceWithoutTypeArgument.ts, 22, 24)) ->E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument.ts, 24, 10)) +>E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument.ts, 24, 13)) function h(x: T) { } >h : Symbol(h, Decl(genericTypeReferenceWithoutTypeArgument.ts, 30, 28)) @@ -109,7 +109,7 @@ function i(x: T) { } >i : Symbol(i, Decl(genericTypeReferenceWithoutTypeArgument.ts, 32, 33)) >T : Symbol(T, Decl(genericTypeReferenceWithoutTypeArgument.ts, 33, 11)) >M : Symbol(M, Decl(genericTypeReferenceWithoutTypeArgument.ts, 22, 24)) ->E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument.ts, 24, 10)) +>E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument.ts, 24, 13)) >x : Symbol(x, Decl(genericTypeReferenceWithoutTypeArgument.ts, 33, 26)) >T : Symbol(T, Decl(genericTypeReferenceWithoutTypeArgument.ts, 33, 11)) @@ -120,5 +120,5 @@ var j = null; var k = null; >k : Symbol(k, Decl(genericTypeReferenceWithoutTypeArgument.ts, 36, 3)) >M : Symbol(M, Decl(genericTypeReferenceWithoutTypeArgument.ts, 22, 24)) ->E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument.ts, 24, 10)) +>E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument.ts, 24, 13)) diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types index b289f43a0a8db..415e0b931afa2 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types @@ -80,7 +80,7 @@ class D extends C { interface I extends C {} -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.errors.txt b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.errors.txt index e4b96fa496736..7a76ee667ead4 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.errors.txt +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.errors.txt @@ -83,7 +83,7 @@ genericTypeReferenceWithoutTypeArgument2.ts(37,10): error TS2314: Generic type ' ~ !!! error TS2314: Generic type 'I' requires 1 type argument(s). - module M { + namespace M { export interface E { foo: T } } diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js index 3f54bff047d39..8b09d5bd6e038 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js @@ -25,7 +25,7 @@ class D extends I { interface U extends I {} -module M { +namespace M { export interface E { foo: T } } diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.symbols b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.symbols index 3680a9e34edd7..6de0f0aff2381 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.symbols +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.symbols @@ -69,11 +69,11 @@ interface U extends I {} >U : Symbol(U, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 20, 1)) >I : Symbol(I, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 0, 0)) -module M { +namespace M { >M : Symbol(M, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 22, 24)) export interface E { foo: T } ->E : Symbol(E, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 24, 10)) +>E : Symbol(E, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 24, 13)) >T : Symbol(T, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 25, 23)) >foo : Symbol(E.foo, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 25, 27)) >T : Symbol(T, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 25, 23)) @@ -87,7 +87,7 @@ interface D3 { } >D3 : Symbol(D3, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 28, 24)) >T : Symbol(T, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 29, 13)) >M : Symbol(M, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 22, 24)) ->E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 24, 10)) +>E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 24, 13)) interface I2 extends M.C { } >I2 : Symbol(I2, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 29, 31)) @@ -104,7 +104,7 @@ function i(x: T) { } >i : Symbol(i, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 32, 33)) >T : Symbol(T, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 33, 11)) >M : Symbol(M, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 22, 24)) ->E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 24, 10)) +>E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 24, 13)) >x : Symbol(x, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 33, 26)) >T : Symbol(T, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 33, 11)) @@ -115,5 +115,5 @@ var j = null; var k = null; >k : Symbol(k, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 36, 3)) >M : Symbol(M, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 22, 24)) ->E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 24, 10)) +>E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument2.ts, 24, 13)) diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types index 02c324df4a2ba..51ae4a51749ca 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types @@ -77,7 +77,7 @@ class D extends I { interface U extends I {} -module M { +namespace M { export interface E { foo: T } >foo : T > : ^ diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.errors.txt b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.errors.txt index 1a90e42b1ff76..ac3966d229ba9 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.errors.txt +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.errors.txt @@ -52,7 +52,7 @@ genericTypeReferenceWithoutTypeArgument3.ts(26,30): error TS2314: Generic type ' ~ !!! error TS2314: Generic type 'C' requires 1 type argument(s). - declare module M { + declare namespace M { export class E { foo: T } } diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.js b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.js index c8bf8a219d92c..6926d5f65b29e 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.js +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.js @@ -18,7 +18,7 @@ declare function f(x: C): C; declare class D extends C {} -declare module M { +declare namespace M { export class E { foo: T } } diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.symbols b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.symbols index a7dbb868b8629..cf299d6fefb55 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.symbols +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.symbols @@ -44,11 +44,11 @@ declare class D extends C {} >D : Symbol(D, Decl(genericTypeReferenceWithoutTypeArgument3.ts, 13, 28)) >C : Symbol(C, Decl(genericTypeReferenceWithoutTypeArgument3.ts, 0, 0)) -declare module M { +declare namespace M { >M : Symbol(M, Decl(genericTypeReferenceWithoutTypeArgument3.ts, 15, 28)) export class E { foo: T } ->E : Symbol(E, Decl(genericTypeReferenceWithoutTypeArgument3.ts, 17, 18)) +>E : Symbol(E, Decl(genericTypeReferenceWithoutTypeArgument3.ts, 17, 21)) >T : Symbol(T, Decl(genericTypeReferenceWithoutTypeArgument3.ts, 18, 19)) >foo : Symbol(E.foo, Decl(genericTypeReferenceWithoutTypeArgument3.ts, 18, 23)) >T : Symbol(T, Decl(genericTypeReferenceWithoutTypeArgument3.ts, 18, 19)) @@ -62,7 +62,7 @@ declare class D3 { } >D3 : Symbol(D3, Decl(genericTypeReferenceWithoutTypeArgument3.ts, 21, 32)) >T : Symbol(T, Decl(genericTypeReferenceWithoutTypeArgument3.ts, 22, 17)) >M : Symbol(M, Decl(genericTypeReferenceWithoutTypeArgument3.ts, 15, 28)) ->E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument3.ts, 17, 18)) +>E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument3.ts, 17, 21)) declare function h(x: T); >h : Symbol(h, Decl(genericTypeReferenceWithoutTypeArgument3.ts, 22, 35)) @@ -75,7 +75,7 @@ declare function i(x: T); >i : Symbol(i, Decl(genericTypeReferenceWithoutTypeArgument3.ts, 24, 38)) >T : Symbol(T, Decl(genericTypeReferenceWithoutTypeArgument3.ts, 25, 19)) >M : Symbol(M, Decl(genericTypeReferenceWithoutTypeArgument3.ts, 15, 28)) ->E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument3.ts, 17, 18)) +>E : Symbol(M.E, Decl(genericTypeReferenceWithoutTypeArgument3.ts, 17, 21)) >x : Symbol(x, Decl(genericTypeReferenceWithoutTypeArgument3.ts, 25, 34)) >T : Symbol(T, Decl(genericTypeReferenceWithoutTypeArgument3.ts, 25, 19)) diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types index 1b4e7fc2df006..923c3c7479550 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types @@ -47,7 +47,7 @@ declare class D extends C {} >C : typeof C > : ^^^^^^^^ -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.js b/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.js index 536a81756fccf..8c0cc56ffe55d 100644 --- a/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.js +++ b/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.js @@ -4,7 +4,7 @@ declare function _(value: Array): _; declare function _(value: T): _; -declare module _ { +declare namespace _ { export function each( //list: List, //iterator: ListIterator, @@ -19,7 +19,7 @@ declare class _ { each(iterator: _.ListIterator, context?: any): void; } -module MyModule { +namespace MyModule { export class MyClass { public get myGetter() { var obj:any = {}; diff --git a/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.symbols b/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.symbols index c3f3746403d3f..fce59c1342d25 100644 --- a/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.symbols +++ b/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.symbols @@ -18,11 +18,11 @@ declare function _(value: T): _; >_ : Symbol(_, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 0), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 45), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 1, 38), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 12, 1)) >T : Symbol(T, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 1, 19)) -declare module _ { +declare namespace _ { >_ : Symbol(_, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 0), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 45), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 1, 38), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 12, 1)) export function each( ->each : Symbol(each, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 3, 18)) +>each : Symbol(each, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 3, 21)) >T : Symbol(T, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 4, 25)) //list: List, @@ -58,11 +58,11 @@ declare class _ { >context : Symbol(context, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 15, 43)) } -module MyModule { +namespace MyModule { >MyModule : Symbol(MyModule, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 16, 1)) export class MyClass { ->MyClass : Symbol(MyClass, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 18, 17)) +>MyClass : Symbol(MyClass, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 18, 20)) public get myGetter() { >myGetter : Symbol(MyClass.myGetter, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 19, 26)) diff --git a/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.types b/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.types index fb5309c783291..f0b63fcee0c99 100644 --- a/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.types +++ b/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.types @@ -13,7 +13,7 @@ declare function _(value: T): _; >value : T > : ^ -declare module _ { +declare namespace _ { >_ : typeof _ > : ^^^^^^^^ @@ -51,7 +51,7 @@ declare class _ { >context : any } -module MyModule { +namespace MyModule { >MyModule : typeof MyModule > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/giant.errors.txt b/tests/baselines/reference/giant.errors.txt index 47c79a67ce938..248efb5e0f8a7 100644 --- a/tests/baselines/reference/giant.errors.txt +++ b/tests/baselines/reference/giant.errors.txt @@ -351,7 +351,7 @@ giant.ts(676,30): error TS1183: An implementation cannot be declared in ambient ~~ !!! error TS2386: Overload signatures must all be optional or required. } - module M { + namespace M { var V; function F() { }; class C { @@ -457,23 +457,23 @@ giant.ts(676,30): error TS1183: An implementation cannot be declared in ambient ~~ !!! error TS2386: Overload signatures must all be optional or required. } - module M { + namespace M { var V; function F() { }; class C { }; interface I { }; - module M { }; + namespace M { }; export var eV; export function eF() { }; export class eC { }; export interface eI { }; - export module eM { }; + export namespace eM { }; export declare var eaV; export declare function eaF() { }; ~ !!! error TS1183: An implementation cannot be declared in ambient contexts. export declare class eaC { }; - export declare module eaM { }; + export declare namespace eaM { }; } export var eV; export function eF() { }; @@ -580,23 +580,23 @@ giant.ts(676,30): error TS1183: An implementation cannot be declared in ambient ~~ !!! error TS2386: Overload signatures must all be optional or required. } - export module eM { + export namespace eM { var V; function F() { }; class C { }; interface I { }; - module M { }; + namespace M { }; export var eV; export function eF() { }; export class eC { }; export interface eI { }; - export module eM { }; + export namespace eM { }; export declare var eaV; export declare function eaF() { }; ~ !!! error TS1183: An implementation cannot be declared in ambient contexts. export declare class eaC { }; - export declare module eaM { }; + export declare namespace eaM { }; } export declare var eaV; export declare function eaF() { }; @@ -667,7 +667,7 @@ giant.ts(676,30): error TS1183: An implementation cannot be declared in ambient ~~~ !!! error TS2300: Duplicate identifier 'tgF'. } - export declare module eaM { + export declare namespace eaM { var V; function F() { }; ~ @@ -676,14 +676,14 @@ giant.ts(676,30): error TS1183: An implementation cannot be declared in ambient !!! error TS1036: Statements are not allowed in ambient contexts. class C { } interface I { } - module M { } + namespace M { } export var eV; export function eF() { }; ~ !!! error TS1183: An implementation cannot be declared in ambient contexts. export class eC { } export interface eI { } - export module eM { } + export namespace eM { } } } export var eV; @@ -791,7 +791,7 @@ giant.ts(676,30): error TS1183: An implementation cannot be declared in ambient ~~ !!! error TS2386: Overload signatures must all be optional or required. } - export module eM { + export namespace eM { var V; function F() { }; class C { @@ -897,23 +897,23 @@ giant.ts(676,30): error TS1183: An implementation cannot be declared in ambient ~~ !!! error TS2386: Overload signatures must all be optional or required. } - module M { + namespace M { var V; function F() { }; class C { }; interface I { }; - module M { }; + namespace M { }; export var eV; export function eF() { }; export class eC { }; export interface eI { }; - export module eM { }; + export namespace eM { }; export declare var eaV; export declare function eaF() { }; ~ !!! error TS1183: An implementation cannot be declared in ambient contexts. export declare class eaC { }; - export declare module eaM { }; + export declare namespace eaM { }; } export var eV; export function eF() { }; @@ -1020,23 +1020,23 @@ giant.ts(676,30): error TS1183: An implementation cannot be declared in ambient ~~ !!! error TS2386: Overload signatures must all be optional or required. } - export module eM { + export namespace eM { var V; function F() { }; class C { }; interface I { }; - module M { }; + namespace M { }; export var eV; export function eF() { }; export class eC { }; export interface eI { }; - export module eM { }; + export namespace eM { }; export declare var eaV; export declare function eaF() { }; ~ !!! error TS1183: An implementation cannot be declared in ambient contexts. export declare class eaC { }; - export declare module eaM { }; + export declare namespace eaM { }; } export declare var eaV; export declare function eaF() { }; @@ -1107,7 +1107,7 @@ giant.ts(676,30): error TS1183: An implementation cannot be declared in ambient ~~~ !!! error TS2300: Duplicate identifier 'tgF'. } - export declare module eaM { + export declare namespace eaM { var V; function F() { }; ~ @@ -1116,14 +1116,14 @@ giant.ts(676,30): error TS1183: An implementation cannot be declared in ambient !!! error TS1036: Statements are not allowed in ambient contexts. class C { } interface I { } - module M { } + namespace M { } export var eV; export function eF() { }; ~ !!! error TS1183: An implementation cannot be declared in ambient contexts. export class eC { } export interface eI { } - export module eM { } + export namespace eM { } } } export declare var eaV; @@ -1195,7 +1195,7 @@ giant.ts(676,30): error TS1183: An implementation cannot be declared in ambient ~~~ !!! error TS2300: Duplicate identifier 'tgF'. } - export declare module eaM { + export declare namespace eaM { var V; function F() { }; ~ @@ -1261,7 +1261,7 @@ giant.ts(676,30): error TS1183: An implementation cannot be declared in ambient ~~ !!! error TS2386: Overload signatures must all be optional or required. } - module M { + namespace M { var V; function F() { }; ~ @@ -1270,14 +1270,14 @@ giant.ts(676,30): error TS1183: An implementation cannot be declared in ambient !!! error TS1036: Statements are not allowed in ambient contexts. class C { } interface I { } - module M { } + namespace M { } export var eV; export function eF() { }; ~ !!! error TS1183: An implementation cannot be declared in ambient contexts. export class eC { } export interface eI { } - export module eM { } + export namespace eM { } export declare var eaV ~~~~~~~ !!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. @@ -1289,7 +1289,7 @@ giant.ts(676,30): error TS1183: An implementation cannot be declared in ambient export declare class eaC { } ~~~~~~~ !!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. - export declare module eaM { } + export declare namespace eaM { } ~~~~~~~ !!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. } @@ -1357,7 +1357,7 @@ giant.ts(676,30): error TS1183: An implementation cannot be declared in ambient ~~ !!! error TS2386: Overload signatures must all be optional or required. } - export module eM { + export namespace eM { var V; function F() { }; ~ @@ -1365,13 +1365,13 @@ giant.ts(676,30): error TS1183: An implementation cannot be declared in ambient ~ !!! error TS1036: Statements are not allowed in ambient contexts. class C { } - module M { } + namespace M { } export var eV; export function eF() { }; ~ !!! error TS1183: An implementation cannot be declared in ambient contexts. export class eC { } export interface eI { } - export module eM { } + export namespace eM { } } } \ No newline at end of file diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js index be21e16431402..793991a83e987 100644 --- a/tests/baselines/reference/giant.js +++ b/tests/baselines/reference/giant.js @@ -78,7 +78,7 @@ interface I { p7(pa1, pa2): void; p7? (pa1, pa2): void; } -module M { +namespace M { var V; function F() { }; class C { @@ -142,21 +142,21 @@ module M { p7(pa1, pa2): void; p7? (pa1, pa2): void; } - module M { + namespace M { var V; function F() { }; class C { }; interface I { }; - module M { }; + namespace M { }; export var eV; export function eF() { }; export class eC { }; export interface eI { }; - export module eM { }; + export namespace eM { }; export declare var eaV; export declare function eaF() { }; export declare class eaC { }; - export declare module eaM { }; + export declare namespace eaM { }; } export var eV; export function eF() { }; @@ -221,21 +221,21 @@ module M { p7(pa1, pa2): void; p7? (pa1, pa2): void; } - export module eM { + export namespace eM { var V; function F() { }; class C { }; interface I { }; - module M { }; + namespace M { }; export var eV; export function eF() { }; export class eC { }; export interface eI { }; - export module eM { }; + export namespace eM { }; export declare var eaV; export declare function eaF() { }; export declare class eaC { }; - export declare module eaM { }; + export declare namespace eaM { }; } export declare var eaV; export declare function eaF() { }; @@ -260,17 +260,17 @@ module M { static tgF() { } static get tgF() } - export declare module eaM { + export declare namespace eaM { var V; function F() { }; class C { } interface I { } - module M { } + namespace M { } export var eV; export function eF() { }; export class eC { } export interface eI { } - export module eM { } + export namespace eM { } } } export var eV; @@ -336,7 +336,7 @@ export interface eI { p7(pa1, pa2): void; p7? (pa1, pa2): void; } -export module eM { +export namespace eM { var V; function F() { }; class C { @@ -400,21 +400,21 @@ export module eM { p7(pa1, pa2): void; p7? (pa1, pa2): void; } - module M { + namespace M { var V; function F() { }; class C { }; interface I { }; - module M { }; + namespace M { }; export var eV; export function eF() { }; export class eC { }; export interface eI { }; - export module eM { }; + export namespace eM { }; export declare var eaV; export declare function eaF() { }; export declare class eaC { }; - export declare module eaM { }; + export declare namespace eaM { }; } export var eV; export function eF() { }; @@ -479,21 +479,21 @@ export module eM { p7(pa1, pa2): void; p7? (pa1, pa2): void; } - export module eM { + export namespace eM { var V; function F() { }; class C { }; interface I { }; - module M { }; + namespace M { }; export var eV; export function eF() { }; export class eC { }; export interface eI { }; - export module eM { }; + export namespace eM { }; export declare var eaV; export declare function eaF() { }; export declare class eaC { }; - export declare module eaM { }; + export declare namespace eaM { }; } export declare var eaV; export declare function eaF() { }; @@ -518,17 +518,17 @@ export module eM { static tgF() { } static get tgF() } - export declare module eaM { + export declare namespace eaM { var V; function F() { }; class C { } interface I { } - module M { } + namespace M { } export var eV; export function eF() { }; export class eC { } export interface eI { } - export module eM { } + export namespace eM { } } } export declare var eaV; @@ -554,7 +554,7 @@ export declare class eaC { static tgF() { } static get tgF() } -export declare module eaM { +export declare namespace eaM { var V; function F() { }; class C { @@ -604,21 +604,21 @@ export declare module eaM { p7(pa1, pa2): void; p7? (pa1, pa2): void; } - module M { + namespace M { var V; function F() { }; class C { } interface I { } - module M { } + namespace M { } export var eV; export function eF() { }; export class eC { } export interface eI { } - export module eM { } + export namespace eM { } export declare var eaV export declare function eaF() { }; export declare class eaC { } - export declare module eaM { } + export declare namespace eaM { } } export var eV; export function eF() { }; @@ -670,16 +670,16 @@ export declare module eaM { p7(pa1, pa2): void; p7? (pa1, pa2): void; } - export module eM { + export namespace eM { var V; function F() { }; class C { } - module M { } + namespace M { } export var eV; export function eF() { }; export class eC { } export interface eI { } - export module eM { } + export namespace eM { } } } diff --git a/tests/baselines/reference/giant.symbols b/tests/baselines/reference/giant.symbols index 0c7d9c2b21256..8bc1ae897506a 100644 --- a/tests/baselines/reference/giant.symbols +++ b/tests/baselines/reference/giant.symbols @@ -182,7 +182,7 @@ interface I { >pa1 : Symbol(pa1, Decl(giant.ts, 75, 9)) >pa2 : Symbol(pa2, Decl(giant.ts, 75, 13)) } -module M { +namespace M { >M : Symbol(M, Decl(giant.ts, 76, 1)) var V; @@ -350,7 +350,7 @@ module M { >pa1 : Symbol(pa1, Decl(giant.ts, 139, 13)) >pa2 : Symbol(pa2, Decl(giant.ts, 139, 17)) } - module M { + namespace M { >M : Symbol(M, Decl(giant.ts, 140, 5)) var V; @@ -365,7 +365,7 @@ module M { interface I { }; >I : Symbol(I, Decl(giant.ts, 144, 20)) - module M { }; + namespace M { }; >M : Symbol(M, Decl(giant.ts, 145, 24)) export var eV; @@ -380,7 +380,7 @@ module M { export interface eI { }; >eI : Symbol(eI, Decl(giant.ts, 149, 28)) - export module eM { }; + export namespace eM { }; >eM : Symbol(eM, Decl(giant.ts, 150, 32)) export declare var eaV; @@ -392,7 +392,7 @@ module M { export declare class eaC { }; >eaC : Symbol(eaC, Decl(giant.ts, 153, 42)) - export declare module eaM { }; + export declare namespace eaM { }; >eaM : Symbol(eaM, Decl(giant.ts, 154, 37)) } export var eV; @@ -560,7 +560,7 @@ module M { >pa1 : Symbol(pa1, Decl(giant.ts, 218, 13)) >pa2 : Symbol(pa2, Decl(giant.ts, 218, 17)) } - export module eM { + export namespace eM { >eM : Symbol(eM, Decl(giant.ts, 219, 5)) var V; @@ -575,7 +575,7 @@ module M { interface I { }; >I : Symbol(I, Decl(giant.ts, 223, 20)) - module M { }; + namespace M { }; >M : Symbol(M, Decl(giant.ts, 224, 24)) export var eV; @@ -590,7 +590,7 @@ module M { export interface eI { }; >eI : Symbol(eI, Decl(giant.ts, 228, 28)) - export module eM { }; + export namespace eM { }; >eM : Symbol(eM, Decl(giant.ts, 229, 32)) export declare var eaV; @@ -602,7 +602,7 @@ module M { export declare class eaC { }; >eaC : Symbol(eaC, Decl(giant.ts, 232, 42)) - export declare module eaM { }; + export declare namespace eaM { }; >eaM : Symbol(eaM, Decl(giant.ts, 233, 37)) } export declare var eaV; @@ -675,7 +675,7 @@ module M { static get tgF() >tgF : Symbol(eaC.tgF, Decl(giant.ts, 256, 24)) } - export declare module eaM { + export declare namespace eaM { >eaM : Symbol(eaM, Decl(giant.ts, 258, 5)) var V; @@ -690,7 +690,7 @@ module M { interface I { } >I : Symbol(I, Decl(giant.ts, 262, 19)) - module M { } + namespace M { } >M : Symbol(M, Decl(giant.ts, 263, 23)) export var eV; @@ -705,7 +705,7 @@ module M { export interface eI { } >eI : Symbol(eI, Decl(giant.ts, 267, 27)) - export module eM { } + export namespace eM { } >eM : Symbol(eM, Decl(giant.ts, 268, 31)) } } @@ -874,7 +874,7 @@ export interface eI { >pa1 : Symbol(pa1, Decl(giant.ts, 333, 9)) >pa2 : Symbol(pa2, Decl(giant.ts, 333, 13)) } -export module eM { +export namespace eM { >eM : Symbol(eM, Decl(giant.ts, 334, 1)) var V; @@ -1042,7 +1042,7 @@ export module eM { >pa1 : Symbol(pa1, Decl(giant.ts, 397, 13)) >pa2 : Symbol(pa2, Decl(giant.ts, 397, 17)) } - module M { + namespace M { >M : Symbol(M, Decl(giant.ts, 398, 5)) var V; @@ -1057,7 +1057,7 @@ export module eM { interface I { }; >I : Symbol(I, Decl(giant.ts, 402, 20)) - module M { }; + namespace M { }; >M : Symbol(M, Decl(giant.ts, 403, 24)) export var eV; @@ -1072,7 +1072,7 @@ export module eM { export interface eI { }; >eI : Symbol(eI, Decl(giant.ts, 407, 28)) - export module eM { }; + export namespace eM { }; >eM : Symbol(eM, Decl(giant.ts, 408, 32)) export declare var eaV; @@ -1084,7 +1084,7 @@ export module eM { export declare class eaC { }; >eaC : Symbol(eaC, Decl(giant.ts, 411, 42)) - export declare module eaM { }; + export declare namespace eaM { }; >eaM : Symbol(eaM, Decl(giant.ts, 412, 37)) } export var eV; @@ -1252,7 +1252,7 @@ export module eM { >pa1 : Symbol(pa1, Decl(giant.ts, 476, 13)) >pa2 : Symbol(pa2, Decl(giant.ts, 476, 17)) } - export module eM { + export namespace eM { >eM : Symbol(eM, Decl(giant.ts, 477, 5)) var V; @@ -1267,7 +1267,7 @@ export module eM { interface I { }; >I : Symbol(I, Decl(giant.ts, 481, 20)) - module M { }; + namespace M { }; >M : Symbol(M, Decl(giant.ts, 482, 24)) export var eV; @@ -1282,7 +1282,7 @@ export module eM { export interface eI { }; >eI : Symbol(eI, Decl(giant.ts, 486, 28)) - export module eM { }; + export namespace eM { }; >eM : Symbol(eM, Decl(giant.ts, 487, 32)) export declare var eaV; @@ -1294,7 +1294,7 @@ export module eM { export declare class eaC { }; >eaC : Symbol(eaC, Decl(giant.ts, 490, 42)) - export declare module eaM { }; + export declare namespace eaM { }; >eaM : Symbol(eaM, Decl(giant.ts, 491, 37)) } export declare var eaV; @@ -1367,7 +1367,7 @@ export module eM { static get tgF() >tgF : Symbol(eaC.tgF, Decl(giant.ts, 514, 24)) } - export declare module eaM { + export declare namespace eaM { >eaM : Symbol(eaM, Decl(giant.ts, 516, 5)) var V; @@ -1382,7 +1382,7 @@ export module eM { interface I { } >I : Symbol(I, Decl(giant.ts, 520, 19)) - module M { } + namespace M { } >M : Symbol(M, Decl(giant.ts, 521, 23)) export var eV; @@ -1397,7 +1397,7 @@ export module eM { export interface eI { } >eI : Symbol(eI, Decl(giant.ts, 525, 27)) - export module eM { } + export namespace eM { } >eM : Symbol(eM, Decl(giant.ts, 526, 31)) } } @@ -1471,7 +1471,7 @@ export declare class eaC { static get tgF() >tgF : Symbol(eaC.tgF, Decl(giant.ts, 550, 20)) } -export declare module eaM { +export declare namespace eaM { >eaM : Symbol(eaM, Decl(giant.ts, 552, 1)) var V; @@ -1591,7 +1591,7 @@ export declare module eaM { >pa1 : Symbol(pa1, Decl(giant.ts, 601, 13)) >pa2 : Symbol(pa2, Decl(giant.ts, 601, 17)) } - module M { + namespace M { >M : Symbol(M, Decl(giant.ts, 602, 5)) var V; @@ -1606,7 +1606,7 @@ export declare module eaM { interface I { } >I : Symbol(I, Decl(giant.ts, 606, 19)) - module M { } + namespace M { } >M : Symbol(M, Decl(giant.ts, 607, 23)) export var eV; @@ -1621,7 +1621,7 @@ export declare module eaM { export interface eI { } >eI : Symbol(eI, Decl(giant.ts, 611, 27)) - export module eM { } + export namespace eM { } >eM : Symbol(eM, Decl(giant.ts, 612, 31)) export declare var eaV @@ -1633,7 +1633,7 @@ export declare module eaM { export declare class eaC { } >eaC : Symbol(eaC, Decl(giant.ts, 615, 42)) - export declare module eaM { } + export declare namespace eaM { } >eaM : Symbol(eaM, Decl(giant.ts, 616, 36)) } export var eV; @@ -1756,7 +1756,7 @@ export declare module eaM { >pa1 : Symbol(pa1, Decl(giant.ts, 667, 13)) >pa2 : Symbol(pa2, Decl(giant.ts, 667, 17)) } - export module eM { + export namespace eM { >eM : Symbol(eM, Decl(giant.ts, 668, 5)) var V; @@ -1768,7 +1768,7 @@ export declare module eaM { class C { } >C : Symbol(C, Decl(giant.ts, 671, 25)) - module M { } + namespace M { } >M : Symbol(M, Decl(giant.ts, 672, 19)) export var eV; @@ -1783,7 +1783,7 @@ export declare module eaM { export interface eI { } >eI : Symbol(eI, Decl(giant.ts, 676, 27)) - export module eM { } + export namespace eM { } >eM : Symbol(eM, Decl(giant.ts, 677, 31)) } } diff --git a/tests/baselines/reference/giant.types b/tests/baselines/reference/giant.types index edfd082b45060..38c60c4962da6 100644 --- a/tests/baselines/reference/giant.types +++ b/tests/baselines/reference/giant.types @@ -244,7 +244,7 @@ interface I { >pa2 : any > : ^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -472,7 +472,7 @@ module M { >pa2 : any > : ^^^ } - module M { + namespace M { >M : typeof M > : ^^^^^^^^ @@ -489,7 +489,7 @@ module M { > : ^ interface I { }; - module M { }; + namespace M { }; export var eV; >eV : any > : ^^^ @@ -503,7 +503,7 @@ module M { > : ^^ export interface eI { }; - export module eM { }; + export namespace eM { }; export declare var eaV; >eaV : any > : ^^^ @@ -516,7 +516,7 @@ module M { >eaC : eaC > : ^^^ - export declare module eaM { }; + export declare namespace eaM { }; } export var eV; >eV : any @@ -742,7 +742,7 @@ module M { >pa2 : any > : ^^^ } - export module eM { + export namespace eM { >eM : typeof eM > : ^^^^^^^^^ @@ -759,7 +759,7 @@ module M { > : ^ interface I { }; - module M { }; + namespace M { }; export var eV; >eV : any > : ^^^ @@ -773,7 +773,7 @@ module M { > : ^^ export interface eI { }; - export module eM { }; + export namespace eM { }; export declare var eaV; >eaV : any > : ^^^ @@ -786,7 +786,7 @@ module M { >eaC : eaC > : ^^^ - export declare module eaM { }; + export declare namespace eaM { }; } export declare var eaV; >eaV : any @@ -885,7 +885,7 @@ module M { >tgF : any > : ^^^ } - export declare module eaM { + export declare namespace eaM { >eaM : typeof eaM > : ^^^^^^^^^^ @@ -902,7 +902,7 @@ module M { > : ^ interface I { } - module M { } + namespace M { } export var eV; >eV : any > : ^^^ @@ -916,7 +916,7 @@ module M { > : ^^ export interface eI { } - export module eM { } + export namespace eM { } } } export var eV; @@ -1143,7 +1143,7 @@ export interface eI { >pa2 : any > : ^^^ } -export module eM { +export namespace eM { >eM : typeof import("giant").eM > : ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1371,7 +1371,7 @@ export module eM { >pa2 : any > : ^^^ } - module M { + namespace M { >M : typeof M > : ^^^^^^^^ @@ -1388,7 +1388,7 @@ export module eM { > : ^ interface I { }; - module M { }; + namespace M { }; export var eV; >eV : any > : ^^^ @@ -1402,7 +1402,7 @@ export module eM { > : ^^ export interface eI { }; - export module eM { }; + export namespace eM { }; export declare var eaV; >eaV : any > : ^^^ @@ -1415,7 +1415,7 @@ export module eM { >eaC : eaC > : ^^^ - export declare module eaM { }; + export declare namespace eaM { }; } export var eV; >eV : any @@ -1641,7 +1641,7 @@ export module eM { >pa2 : any > : ^^^ } - export module eM { + export namespace eM { >eM : typeof eM > : ^^^^^^^^^ @@ -1658,7 +1658,7 @@ export module eM { > : ^ interface I { }; - module M { }; + namespace M { }; export var eV; >eV : any > : ^^^ @@ -1672,7 +1672,7 @@ export module eM { > : ^^ export interface eI { }; - export module eM { }; + export namespace eM { }; export declare var eaV; >eaV : any > : ^^^ @@ -1685,7 +1685,7 @@ export module eM { >eaC : eaC > : ^^^ - export declare module eaM { }; + export declare namespace eaM { }; } export declare var eaV; >eaV : any @@ -1784,7 +1784,7 @@ export module eM { >tgF : any > : ^^^ } - export declare module eaM { + export declare namespace eaM { >eaM : typeof eaM > : ^^^^^^^^^^ @@ -1801,7 +1801,7 @@ export module eM { > : ^ interface I { } - module M { } + namespace M { } export var eV; >eV : any > : ^^^ @@ -1815,7 +1815,7 @@ export module eM { > : ^^ export interface eI { } - export module eM { } + export namespace eM { } } } export declare var eaV; @@ -1915,7 +1915,7 @@ export declare class eaC { >tgF : any > : ^^^ } -export declare module eaM { +export declare namespace eaM { >eaM : typeof eaM > : ^^^^^^^^^^ @@ -2075,7 +2075,7 @@ export declare module eaM { >pa2 : any > : ^^^ } - module M { + namespace M { >M : typeof M > : ^^^^^^^^ @@ -2092,7 +2092,7 @@ export declare module eaM { > : ^ interface I { } - module M { } + namespace M { } export var eV; >eV : any > : ^^^ @@ -2106,7 +2106,7 @@ export declare module eaM { > : ^^ export interface eI { } - export module eM { } + export namespace eM { } export declare var eaV >eaV : any > : ^^^ @@ -2119,7 +2119,7 @@ export declare module eaM { >eaC : eaC > : ^^^ - export declare module eaM { } + export declare namespace eaM { } } export var eV; >eV : any @@ -2281,7 +2281,7 @@ export declare module eaM { >pa2 : any > : ^^^ } - export module eM { + export namespace eM { >eM : typeof eM > : ^^^^^^^^^ @@ -2297,7 +2297,7 @@ export declare module eaM { >C : C > : ^ - module M { } + namespace M { } export var eV; >eV : any > : ^^^ @@ -2311,6 +2311,6 @@ export declare module eaM { > : ^^ export interface eI { } - export module eM { } + export namespace eM { } } } diff --git a/tests/baselines/reference/global.js b/tests/baselines/reference/global.js index 77f3d21e74ae1..ce7dded330e85 100644 --- a/tests/baselines/reference/global.js +++ b/tests/baselines/reference/global.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/global.ts] //// //// [global.ts] -module M { +namespace M { export function f(y:number) { return x+y; } diff --git a/tests/baselines/reference/global.symbols b/tests/baselines/reference/global.symbols index 660a92f84d591..1cfdade946ce1 100644 --- a/tests/baselines/reference/global.symbols +++ b/tests/baselines/reference/global.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/global.ts] //// === global.ts === -module M { +namespace M { >M : Symbol(M, Decl(global.ts, 0, 0)) export function f(y:number) { ->f : Symbol(f, Decl(global.ts, 0, 10)) +>f : Symbol(f, Decl(global.ts, 0, 13)) >y : Symbol(y, Decl(global.ts, 1, 22)) return x+y; @@ -18,8 +18,8 @@ var x=10; >x : Symbol(x, Decl(global.ts, 6, 3)) M.f(3); ->M.f : Symbol(M.f, Decl(global.ts, 0, 10)) +>M.f : Symbol(M.f, Decl(global.ts, 0, 13)) >M : Symbol(M, Decl(global.ts, 0, 0)) ->f : Symbol(M.f, Decl(global.ts, 0, 10)) +>f : Symbol(M.f, Decl(global.ts, 0, 13)) diff --git a/tests/baselines/reference/global.types b/tests/baselines/reference/global.types index 1cc7fc64e7797..09908e94cb93c 100644 --- a/tests/baselines/reference/global.types +++ b/tests/baselines/reference/global.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/global.ts] //// === global.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/heterogeneousArrayLiterals.js b/tests/baselines/reference/heterogeneousArrayLiterals.js index 87ac78e3e6525..bb96e96961bb4 100644 --- a/tests/baselines/reference/heterogeneousArrayLiterals.js +++ b/tests/baselines/reference/heterogeneousArrayLiterals.js @@ -28,7 +28,7 @@ var base: Base; var derived: Derived; var derived2: Derived2; -module Derived { +namespace Derived { var h = [{ foo: base, basear: derived }, { foo: base }]; // {foo: Base}[] var i = [{ foo: base, basear: derived }, { foo: derived }]; // {foo: Derived}[] @@ -42,7 +42,7 @@ module Derived { var q = [[() => derived2], [() => derived]]; // {}[] } -module WithContextualType { +namespace WithContextualType { // no errors var a: Base[] = [derived, derived2]; var b: Derived[] = [null]; diff --git a/tests/baselines/reference/heterogeneousArrayLiterals.symbols b/tests/baselines/reference/heterogeneousArrayLiterals.symbols index 7e715302ec5ca..67cc5891f1861 100644 --- a/tests/baselines/reference/heterogeneousArrayLiterals.symbols +++ b/tests/baselines/reference/heterogeneousArrayLiterals.symbols @@ -78,7 +78,7 @@ var derived2: Derived2; >derived2 : Symbol(derived2, Decl(heterogeneousArrayLiterals.ts, 25, 3)) >Derived2 : Symbol(Derived2, Decl(heterogeneousArrayLiterals.ts, 21, 43)) -module Derived { +namespace Derived { >Derived : Symbol(Derived, Decl(heterogeneousArrayLiterals.ts, 20, 27), Decl(heterogeneousArrayLiterals.ts, 25, 23)) var h = [{ foo: base, basear: derived }, { foo: base }]; // {foo: Base}[] @@ -139,7 +139,7 @@ module Derived { >derived : Symbol(derived, Decl(heterogeneousArrayLiterals.ts, 24, 3)) } -module WithContextualType { +namespace WithContextualType { >WithContextualType : Symbol(WithContextualType, Decl(heterogeneousArrayLiterals.ts, 39, 1)) // no errors diff --git a/tests/baselines/reference/heterogeneousArrayLiterals.types b/tests/baselines/reference/heterogeneousArrayLiterals.types index 19a6ae7003bb7..055a2161fcaa7 100644 --- a/tests/baselines/reference/heterogeneousArrayLiterals.types +++ b/tests/baselines/reference/heterogeneousArrayLiterals.types @@ -229,7 +229,7 @@ var derived2: Derived2; >derived2 : Derived2 > : ^^^^^^^^ -module Derived { +namespace Derived { >Derived : typeof Derived > : ^^^^^^^^^^^^^^ @@ -392,7 +392,7 @@ module Derived { > : ^^^^^^^ } -module WithContextualType { +namespace WithContextualType { >WithContextualType : typeof WithContextualType > : ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/ifDoWhileStatements.errors.txt b/tests/baselines/reference/ifDoWhileStatements.errors.txt index c103478b4e640..23c7a846f6d3d 100644 --- a/tests/baselines/reference/ifDoWhileStatements.errors.txt +++ b/tests/baselines/reference/ifDoWhileStatements.errors.txt @@ -53,7 +53,7 @@ ifDoWhileStatements.ts(86,13): error TS2872: This kind of expression is always t function F(x: string): number { return 42; } function F2(x: number): boolean { return x < 42; } - module M { + namespace M { export class A { name: string; } @@ -61,7 +61,7 @@ ifDoWhileStatements.ts(86,13): error TS2872: This kind of expression is always t export function F2(x: number): string { return x.toString(); } } - module N { + namespace N { export class A { id: number; } diff --git a/tests/baselines/reference/ifDoWhileStatements.js b/tests/baselines/reference/ifDoWhileStatements.js index 5e4b91d7ec8bc..f12feeea5b1ce 100644 --- a/tests/baselines/reference/ifDoWhileStatements.js +++ b/tests/baselines/reference/ifDoWhileStatements.js @@ -23,7 +23,7 @@ class D{ function F(x: string): number { return 42; } function F2(x: number): boolean { return x < 42; } -module M { +namespace M { export class A { name: string; } @@ -31,7 +31,7 @@ module M { export function F2(x: number): string { return x.toString(); } } -module N { +namespace N { export class A { id: number; } diff --git a/tests/baselines/reference/ifDoWhileStatements.symbols b/tests/baselines/reference/ifDoWhileStatements.symbols index 81f54f0fcfd9f..e56e655441e0b 100644 --- a/tests/baselines/reference/ifDoWhileStatements.symbols +++ b/tests/baselines/reference/ifDoWhileStatements.symbols @@ -56,11 +56,11 @@ function F2(x: number): boolean { return x < 42; } >x : Symbol(x, Decl(ifDoWhileStatements.ts, 20, 12)) >x : Symbol(x, Decl(ifDoWhileStatements.ts, 20, 12)) -module M { +namespace M { >M : Symbol(M, Decl(ifDoWhileStatements.ts, 20, 50)) export class A { ->A : Symbol(A, Decl(ifDoWhileStatements.ts, 22, 10)) +>A : Symbol(A, Decl(ifDoWhileStatements.ts, 22, 13)) name: string; >name : Symbol(A.name, Decl(ifDoWhileStatements.ts, 23, 20)) @@ -74,11 +74,11 @@ module M { >toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --)) } -module N { +namespace N { >N : Symbol(N, Decl(ifDoWhileStatements.ts, 28, 1)) export class A { ->A : Symbol(A, Decl(ifDoWhileStatements.ts, 30, 10)) +>A : Symbol(A, Decl(ifDoWhileStatements.ts, 30, 13)) id: number; >id : Symbol(A.id, Decl(ifDoWhileStatements.ts, 31, 20)) diff --git a/tests/baselines/reference/ifDoWhileStatements.types b/tests/baselines/reference/ifDoWhileStatements.types index 7a7cf04fa2bfd..7b4ff1d040b22 100644 --- a/tests/baselines/reference/ifDoWhileStatements.types +++ b/tests/baselines/reference/ifDoWhileStatements.types @@ -68,7 +68,7 @@ function F2(x: number): boolean { return x < 42; } >42 : 42 > : ^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -96,7 +96,7 @@ module M { > : ^ ^^^ ^^^^^ } -module N { +namespace N { >N : typeof N > : ^^^^^^^^ diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt index 4645f6966b440..8d22f82f4c6f8 100644 --- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt +++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt @@ -64,7 +64,7 @@ implementingAnInterfaceExtendingClassWithPrivates2.ts(81,11): error TS2420: Clas } // another level of indirection - module M { + namespace M { class Foo { private x: string; } @@ -108,7 +108,7 @@ implementingAnInterfaceExtendingClassWithPrivates2.ts(81,11): error TS2420: Clas } // two levels of privates - module M2 { + namespace M2 { class Foo { private x: string; } diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js index 8b1409323dbe8..6151047203698 100644 --- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js +++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js @@ -24,7 +24,7 @@ class Bar3 extends Foo implements I { // error } // another level of indirection -module M { +namespace M { class Foo { private x: string; } @@ -54,7 +54,7 @@ module M { } // two levels of privates -module M2 { +namespace M2 { class Foo { private x: string; } diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.symbols b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.symbols index d75d7d60c260d..b1f4ba83a713e 100644 --- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.symbols +++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.symbols @@ -50,11 +50,11 @@ class Bar3 extends Foo implements I { // error } // another level of indirection -module M { +namespace M { >M : Symbol(M, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 20, 1)) class Foo { ->Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 23, 10)) +>Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 23, 13)) private x: string; >x : Symbol(Foo.x, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 24, 15)) @@ -62,7 +62,7 @@ module M { class Baz extends Foo { >Baz : Symbol(Baz, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 26, 5)) ->Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 23, 10)) +>Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 23, 13)) z: number; >z : Symbol(Baz.z, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 28, 27)) @@ -78,7 +78,7 @@ module M { class Bar extends Foo implements I { // ok >Bar : Symbol(Bar, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 34, 5)) ->Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 23, 10)) +>Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 23, 13)) >I : Symbol(I, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 30, 5)) y: number; @@ -90,7 +90,7 @@ module M { class Bar2 extends Foo implements I { // error >Bar2 : Symbol(Bar2, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 39, 5)) ->Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 23, 10)) +>Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 23, 13)) >I : Symbol(I, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 30, 5)) x: string; @@ -102,7 +102,7 @@ module M { class Bar3 extends Foo implements I { // error >Bar3 : Symbol(Bar3, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 44, 5)) ->Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 23, 10)) +>Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 23, 13)) >I : Symbol(I, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 30, 5)) private x: string; @@ -114,11 +114,11 @@ module M { } // two levels of privates -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 50, 1)) class Foo { ->Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 53, 11)) +>Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 53, 14)) private x: string; >x : Symbol(Foo.x, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 54, 15)) @@ -126,7 +126,7 @@ module M2 { class Baz extends Foo { >Baz : Symbol(Baz, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 56, 5)) ->Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 53, 11)) +>Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 53, 14)) private y: number; >y : Symbol(Baz.y, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 58, 27)) @@ -142,7 +142,7 @@ module M2 { class Bar extends Foo implements I { // error >Bar : Symbol(Bar, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 64, 5)) ->Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 53, 11)) +>Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 53, 14)) >I : Symbol(I, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 60, 5)) z: number; @@ -171,7 +171,7 @@ module M2 { class Bar2 extends Foo implements I { // error >Bar2 : Symbol(Bar2, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 73, 17)) ->Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 53, 11)) +>Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 53, 14)) >I : Symbol(I, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 60, 5)) x: string; @@ -183,7 +183,7 @@ module M2 { class Bar3 extends Foo implements I { // error >Bar3 : Symbol(Bar3, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 78, 5)) ->Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 53, 11)) +>Foo : Symbol(Foo, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 53, 14)) >I : Symbol(I, Decl(implementingAnInterfaceExtendingClassWithPrivates2.ts, 60, 5)) private x: string; diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.types b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.types index cd12a9e999d29..087f521da0958 100644 --- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.types +++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.types @@ -58,7 +58,7 @@ class Bar3 extends Foo implements I { // error } // another level of indirection -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -135,7 +135,7 @@ module M { } // two levels of privates -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/implicitAnyAmbients.errors.txt b/tests/baselines/reference/implicitAnyAmbients.errors.txt index 009472aac29c8..c8af1f253a77e 100644 --- a/tests/baselines/reference/implicitAnyAmbients.errors.txt +++ b/tests/baselines/reference/implicitAnyAmbients.errors.txt @@ -10,7 +10,7 @@ implicitAnyAmbients.ts(22,13): error TS7005: Variable 'y' implicitly has an 'any ==== implicitAnyAmbients.ts (9 errors) ==== - declare module m { + declare namespace m { var x; // error ~ !!! error TS7005: Variable 'x' implicitly has an 'any' type. @@ -46,7 +46,7 @@ implicitAnyAmbients.ts(22,13): error TS7005: Variable 'y' implicitly has an 'any foo3(x: any): any; } - module n { + namespace n { var y; // error ~ !!! error TS7005: Variable 'y' implicitly has an 'any' type. diff --git a/tests/baselines/reference/implicitAnyAmbients.js b/tests/baselines/reference/implicitAnyAmbients.js index 2951389166948..70c34cdcf2e9e 100644 --- a/tests/baselines/reference/implicitAnyAmbients.js +++ b/tests/baselines/reference/implicitAnyAmbients.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/implicitAnyAmbients.ts] //// //// [implicitAnyAmbients.ts] -declare module m { +declare namespace m { var x; // error var y: any; @@ -21,7 +21,7 @@ declare module m { foo3(x: any): any; } - module n { + namespace n { var y; // error } diff --git a/tests/baselines/reference/implicitAnyAmbients.symbols b/tests/baselines/reference/implicitAnyAmbients.symbols index f8fbb6be6849a..c6c14f9f18fcb 100644 --- a/tests/baselines/reference/implicitAnyAmbients.symbols +++ b/tests/baselines/reference/implicitAnyAmbients.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/implicitAnyAmbients.ts] //// === implicitAnyAmbients.ts === -declare module m { +declare namespace m { >m : Symbol(m, Decl(implicitAnyAmbients.ts, 0, 0)) var x; // error @@ -52,7 +52,7 @@ declare module m { >x : Symbol(x, Decl(implicitAnyAmbients.ts, 17, 13)) } - module n { + namespace n { >n : Symbol(n, Decl(implicitAnyAmbients.ts, 18, 5)) var y; // error diff --git a/tests/baselines/reference/implicitAnyAmbients.types b/tests/baselines/reference/implicitAnyAmbients.types index 1f381d97db8c8..cc8ba116b7db1 100644 --- a/tests/baselines/reference/implicitAnyAmbients.types +++ b/tests/baselines/reference/implicitAnyAmbients.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/implicitAnyAmbients.ts] //// === implicitAnyAmbients.ts === -declare module m { +declare namespace m { >m : typeof m > : ^^^^^^^^ @@ -70,7 +70,7 @@ declare module m { > : ^^^ } - module n { + namespace n { >n : typeof n > : ^^^^^^^^ diff --git a/tests/baselines/reference/implicitAnyInAmbientDeclaration.errors.txt b/tests/baselines/reference/implicitAnyInAmbientDeclaration.errors.txt index 25bf7f3416a2d..a5044abfaff59 100644 --- a/tests/baselines/reference/implicitAnyInAmbientDeclaration.errors.txt +++ b/tests/baselines/reference/implicitAnyInAmbientDeclaration.errors.txt @@ -4,7 +4,7 @@ implicitAnyInAmbientDeclaration.ts(6,31): error TS7006: Parameter 'x' implicitly ==== implicitAnyInAmbientDeclaration.ts (3 errors) ==== - module Test { + namespace Test { declare class C { public publicMember; // this should be an error ~~~~~~~~~~~~ diff --git a/tests/baselines/reference/implicitAnyInAmbientDeclaration.js b/tests/baselines/reference/implicitAnyInAmbientDeclaration.js index f8e3d8d2b1d63..b03e847dd7cc7 100644 --- a/tests/baselines/reference/implicitAnyInAmbientDeclaration.js +++ b/tests/baselines/reference/implicitAnyInAmbientDeclaration.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/implicitAnyInAmbientDeclaration.ts] //// //// [implicitAnyInAmbientDeclaration.ts] -module Test { +namespace Test { declare class C { public publicMember; // this should be an error private privateMember; // this should not be an error diff --git a/tests/baselines/reference/implicitAnyInAmbientDeclaration.symbols b/tests/baselines/reference/implicitAnyInAmbientDeclaration.symbols index c8590d861de98..1c560aae73a8d 100644 --- a/tests/baselines/reference/implicitAnyInAmbientDeclaration.symbols +++ b/tests/baselines/reference/implicitAnyInAmbientDeclaration.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/implicitAnyInAmbientDeclaration.ts] //// === implicitAnyInAmbientDeclaration.ts === -module Test { +namespace Test { >Test : Symbol(Test, Decl(implicitAnyInAmbientDeclaration.ts, 0, 0)) declare class C { ->C : Symbol(C, Decl(implicitAnyInAmbientDeclaration.ts, 0, 13)) +>C : Symbol(C, Decl(implicitAnyInAmbientDeclaration.ts, 0, 16)) public publicMember; // this should be an error >publicMember : Symbol(C.publicMember, Decl(implicitAnyInAmbientDeclaration.ts, 1, 21)) diff --git a/tests/baselines/reference/implicitAnyInAmbientDeclaration.types b/tests/baselines/reference/implicitAnyInAmbientDeclaration.types index 0bd4e212222f6..d760bc1a92193 100644 --- a/tests/baselines/reference/implicitAnyInAmbientDeclaration.types +++ b/tests/baselines/reference/implicitAnyInAmbientDeclaration.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/implicitAnyInAmbientDeclaration.ts] //// === implicitAnyInAmbientDeclaration.ts === -module Test { +namespace Test { >Test : typeof Test > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js index 41ba9130f8322..a7657bf82216c 100644 --- a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js +++ b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js @@ -1,13 +1,13 @@ //// [tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule.ts] //// //// [importAliasAnExternalModuleInsideAnInternalModule_file0.ts] -export module m { +export namespace m { export function foo() { } } //// [importAliasAnExternalModuleInsideAnInternalModule_file1.ts] import r = require('./importAliasAnExternalModuleInsideAnInternalModule_file0'); -module m_private { +namespace m_private { //import r2 = require('m'); // would be error export import C = r; // no error C.m.foo(); diff --git a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.symbols b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.symbols index 361e03cb7c046..62f35d059030f 100644 --- a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.symbols +++ b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.symbols @@ -4,27 +4,27 @@ import r = require('./importAliasAnExternalModuleInsideAnInternalModule_file0'); >r : Symbol(r, Decl(importAliasAnExternalModuleInsideAnInternalModule_file1.ts, 0, 0)) -module m_private { +namespace m_private { >m_private : Symbol(m_private, Decl(importAliasAnExternalModuleInsideAnInternalModule_file1.ts, 0, 80)) //import r2 = require('m'); // would be error export import C = r; // no error ->C : Symbol(C, Decl(importAliasAnExternalModuleInsideAnInternalModule_file1.ts, 1, 18)) +>C : Symbol(C, Decl(importAliasAnExternalModuleInsideAnInternalModule_file1.ts, 1, 21)) >r : Symbol(r, Decl(importAliasAnExternalModuleInsideAnInternalModule_file1.ts, 0, 0)) C.m.foo(); ->C.m.foo : Symbol(C.m.foo, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 17)) +>C.m.foo : Symbol(C.m.foo, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 20)) >C.m : Symbol(C.m, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 0)) ->C : Symbol(C, Decl(importAliasAnExternalModuleInsideAnInternalModule_file1.ts, 1, 18)) +>C : Symbol(C, Decl(importAliasAnExternalModuleInsideAnInternalModule_file1.ts, 1, 21)) >m : Symbol(C.m, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 0)) ->foo : Symbol(C.m.foo, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 17)) +>foo : Symbol(C.m.foo, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 20)) } === importAliasAnExternalModuleInsideAnInternalModule_file0.ts === -export module m { +export namespace m { >m : Symbol(m, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 0)) export function foo() { } ->foo : Symbol(foo, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 17)) +>foo : Symbol(foo, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 20)) } diff --git a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.types b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.types index 7b71f9c2d80e6..a8f3ea97d2fa9 100644 --- a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.types +++ b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.types @@ -5,7 +5,7 @@ import r = require('./importAliasAnExternalModuleInsideAnInternalModule_file0'); >r : typeof r > : ^^^^^^^^ -module m_private { +namespace m_private { >m_private : typeof m_private > : ^^^^^^^^^^^^^^^^ @@ -32,7 +32,7 @@ module m_private { } === importAliasAnExternalModuleInsideAnInternalModule_file0.ts === -export module m { +export namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/importAliasIdentifiers.js b/tests/baselines/reference/importAliasIdentifiers.js index 8bee1d6b0112c..52626ba4460bf 100644 --- a/tests/baselines/reference/importAliasIdentifiers.js +++ b/tests/baselines/reference/importAliasIdentifiers.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/importDeclarations/importAliasIdentifiers.ts] //// //// [importAliasIdentifiers.ts] -module moduleA { +namespace moduleA { export class Point { constructor(public x: number, public y: number) { } } @@ -17,7 +17,7 @@ class clodule { name: string; } -module clodule { +namespace clodule { export interface Point { x: number; y: number; } @@ -35,7 +35,7 @@ function fundule() { return { x: 0, y: 0 }; } -module fundule { +namespace fundule { export interface Point { x: number; y: number; } diff --git a/tests/baselines/reference/importAliasIdentifiers.symbols b/tests/baselines/reference/importAliasIdentifiers.symbols index c7a953f1da4cc..6a688ca8dda08 100644 --- a/tests/baselines/reference/importAliasIdentifiers.symbols +++ b/tests/baselines/reference/importAliasIdentifiers.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/importDeclarations/importAliasIdentifiers.ts] //// === importAliasIdentifiers.ts === -module moduleA { +namespace moduleA { >moduleA : Symbol(moduleA, Decl(importAliasIdentifiers.ts, 0, 0)) export class Point { ->Point : Symbol(Point, Decl(importAliasIdentifiers.ts, 0, 16)) +>Point : Symbol(Point, Decl(importAliasIdentifiers.ts, 0, 19)) constructor(public x: number, public y: number) { } >x : Symbol(Point.x, Decl(importAliasIdentifiers.ts, 2, 20)) @@ -20,12 +20,12 @@ import alias = moduleA; var p: alias.Point; >p : Symbol(p, Decl(importAliasIdentifiers.ts, 8, 3), Decl(importAliasIdentifiers.ts, 9, 3), Decl(importAliasIdentifiers.ts, 10, 3), Decl(importAliasIdentifiers.ts, 25, 3), Decl(importAliasIdentifiers.ts, 26, 3) ... and 4 more) >alias : Symbol(alias, Decl(importAliasIdentifiers.ts, 4, 1)) ->Point : Symbol(alias.Point, Decl(importAliasIdentifiers.ts, 0, 16)) +>Point : Symbol(alias.Point, Decl(importAliasIdentifiers.ts, 0, 19)) var p: moduleA.Point; >p : Symbol(p, Decl(importAliasIdentifiers.ts, 8, 3), Decl(importAliasIdentifiers.ts, 9, 3), Decl(importAliasIdentifiers.ts, 10, 3), Decl(importAliasIdentifiers.ts, 25, 3), Decl(importAliasIdentifiers.ts, 26, 3) ... and 4 more) >moduleA : Symbol(moduleA, Decl(importAliasIdentifiers.ts, 0, 0)) ->Point : Symbol(alias.Point, Decl(importAliasIdentifiers.ts, 0, 16)) +>Point : Symbol(alias.Point, Decl(importAliasIdentifiers.ts, 0, 19)) var p: { x: number; y: number; }; >p : Symbol(p, Decl(importAliasIdentifiers.ts, 8, 3), Decl(importAliasIdentifiers.ts, 9, 3), Decl(importAliasIdentifiers.ts, 10, 3), Decl(importAliasIdentifiers.ts, 25, 3), Decl(importAliasIdentifiers.ts, 26, 3) ... and 4 more) @@ -39,19 +39,19 @@ class clodule { >name : Symbol(clodule.name, Decl(importAliasIdentifiers.ts, 12, 15)) } -module clodule { +namespace clodule { >clodule : Symbol(clodule, Decl(importAliasIdentifiers.ts, 10, 33), Decl(importAliasIdentifiers.ts, 14, 1)) export interface Point { ->Point : Symbol(Point, Decl(importAliasIdentifiers.ts, 16, 16)) +>Point : Symbol(Point, Decl(importAliasIdentifiers.ts, 16, 19)) x: number; y: number; >x : Symbol(Point.x, Decl(importAliasIdentifiers.ts, 17, 28)) >y : Symbol(Point.y, Decl(importAliasIdentifiers.ts, 18, 18)) } var Point: Point = { x: 0, y: 0 }; ->Point : Symbol(Point, Decl(importAliasIdentifiers.ts, 16, 16), Decl(importAliasIdentifiers.ts, 20, 7)) ->Point : Symbol(Point, Decl(importAliasIdentifiers.ts, 16, 16)) +>Point : Symbol(Point, Decl(importAliasIdentifiers.ts, 16, 19), Decl(importAliasIdentifiers.ts, 20, 7)) +>Point : Symbol(Point, Decl(importAliasIdentifiers.ts, 16, 19)) >x : Symbol(x, Decl(importAliasIdentifiers.ts, 20, 24)) >y : Symbol(y, Decl(importAliasIdentifiers.ts, 20, 30)) } @@ -63,12 +63,12 @@ import clolias = clodule; var p: clolias.Point; >p : Symbol(p, Decl(importAliasIdentifiers.ts, 8, 3), Decl(importAliasIdentifiers.ts, 9, 3), Decl(importAliasIdentifiers.ts, 10, 3), Decl(importAliasIdentifiers.ts, 25, 3), Decl(importAliasIdentifiers.ts, 26, 3) ... and 4 more) >clolias : Symbol(clolias, Decl(importAliasIdentifiers.ts, 21, 1)) ->Point : Symbol(clolias.Point, Decl(importAliasIdentifiers.ts, 16, 16)) +>Point : Symbol(clolias.Point, Decl(importAliasIdentifiers.ts, 16, 19)) var p: clodule.Point; >p : Symbol(p, Decl(importAliasIdentifiers.ts, 8, 3), Decl(importAliasIdentifiers.ts, 9, 3), Decl(importAliasIdentifiers.ts, 10, 3), Decl(importAliasIdentifiers.ts, 25, 3), Decl(importAliasIdentifiers.ts, 26, 3) ... and 4 more) >clodule : Symbol(clodule, Decl(importAliasIdentifiers.ts, 10, 33), Decl(importAliasIdentifiers.ts, 14, 1)) ->Point : Symbol(clolias.Point, Decl(importAliasIdentifiers.ts, 16, 16)) +>Point : Symbol(clolias.Point, Decl(importAliasIdentifiers.ts, 16, 19)) var p: { x: number; y: number; }; >p : Symbol(p, Decl(importAliasIdentifiers.ts, 8, 3), Decl(importAliasIdentifiers.ts, 9, 3), Decl(importAliasIdentifiers.ts, 10, 3), Decl(importAliasIdentifiers.ts, 25, 3), Decl(importAliasIdentifiers.ts, 26, 3) ... and 4 more) @@ -84,19 +84,19 @@ function fundule() { >y : Symbol(y, Decl(importAliasIdentifiers.ts, 31, 18)) } -module fundule { +namespace fundule { >fundule : Symbol(fundule, Decl(importAliasIdentifiers.ts, 27, 33), Decl(importAliasIdentifiers.ts, 32, 1)) export interface Point { ->Point : Symbol(Point, Decl(importAliasIdentifiers.ts, 34, 16)) +>Point : Symbol(Point, Decl(importAliasIdentifiers.ts, 34, 19)) x: number; y: number; >x : Symbol(Point.x, Decl(importAliasIdentifiers.ts, 35, 28)) >y : Symbol(Point.y, Decl(importAliasIdentifiers.ts, 36, 18)) } var Point: Point = { x: 0, y: 0 }; ->Point : Symbol(Point, Decl(importAliasIdentifiers.ts, 34, 16), Decl(importAliasIdentifiers.ts, 38, 7)) ->Point : Symbol(Point, Decl(importAliasIdentifiers.ts, 34, 16)) +>Point : Symbol(Point, Decl(importAliasIdentifiers.ts, 34, 19), Decl(importAliasIdentifiers.ts, 38, 7)) +>Point : Symbol(Point, Decl(importAliasIdentifiers.ts, 34, 19)) >x : Symbol(x, Decl(importAliasIdentifiers.ts, 38, 24)) >y : Symbol(y, Decl(importAliasIdentifiers.ts, 38, 30)) } @@ -108,12 +108,12 @@ import funlias = fundule; var p: funlias.Point; >p : Symbol(p, Decl(importAliasIdentifiers.ts, 8, 3), Decl(importAliasIdentifiers.ts, 9, 3), Decl(importAliasIdentifiers.ts, 10, 3), Decl(importAliasIdentifiers.ts, 25, 3), Decl(importAliasIdentifiers.ts, 26, 3) ... and 4 more) >funlias : Symbol(funlias, Decl(importAliasIdentifiers.ts, 39, 1)) ->Point : Symbol(funlias.Point, Decl(importAliasIdentifiers.ts, 34, 16)) +>Point : Symbol(funlias.Point, Decl(importAliasIdentifiers.ts, 34, 19)) var p: fundule.Point; >p : Symbol(p, Decl(importAliasIdentifiers.ts, 8, 3), Decl(importAliasIdentifiers.ts, 9, 3), Decl(importAliasIdentifiers.ts, 10, 3), Decl(importAliasIdentifiers.ts, 25, 3), Decl(importAliasIdentifiers.ts, 26, 3) ... and 4 more) >fundule : Symbol(fundule, Decl(importAliasIdentifiers.ts, 27, 33), Decl(importAliasIdentifiers.ts, 32, 1)) ->Point : Symbol(funlias.Point, Decl(importAliasIdentifiers.ts, 34, 16)) +>Point : Symbol(funlias.Point, Decl(importAliasIdentifiers.ts, 34, 19)) var p: { x: number; y: number; }; >p : Symbol(p, Decl(importAliasIdentifiers.ts, 8, 3), Decl(importAliasIdentifiers.ts, 9, 3), Decl(importAliasIdentifiers.ts, 10, 3), Decl(importAliasIdentifiers.ts, 25, 3), Decl(importAliasIdentifiers.ts, 26, 3) ... and 4 more) diff --git a/tests/baselines/reference/importAliasIdentifiers.types b/tests/baselines/reference/importAliasIdentifiers.types index 0204cf9246d60..43ec9be4a5849 100644 --- a/tests/baselines/reference/importAliasIdentifiers.types +++ b/tests/baselines/reference/importAliasIdentifiers.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/importDeclarations/importAliasIdentifiers.ts] //// === importAliasIdentifiers.ts === -module moduleA { +namespace moduleA { >moduleA : typeof moduleA > : ^^^^^^^^^^^^^^ @@ -52,7 +52,7 @@ class clodule { > : ^^^^^^ } -module clodule { +namespace clodule { >clodule : typeof clodule > : ^^^^^^^^^^^^^^ @@ -122,7 +122,7 @@ function fundule() { > : ^ } -module fundule { +namespace fundule { >fundule : typeof fundule > : ^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/importAliasWithDottedName.js b/tests/baselines/reference/importAliasWithDottedName.js index 50e600dbe0b72..00b0f34eca20a 100644 --- a/tests/baselines/reference/importAliasWithDottedName.js +++ b/tests/baselines/reference/importAliasWithDottedName.js @@ -1,14 +1,14 @@ //// [tests/cases/compiler/importAliasWithDottedName.ts] //// //// [importAliasWithDottedName.ts] -module M { +namespace M { export var x = 1; - export module N { + export namespace N { export var y = 2; } } -module A { +namespace A { import N = M.N; var r = N.y; var r2 = M.N.y; diff --git a/tests/baselines/reference/importAliasWithDottedName.symbols b/tests/baselines/reference/importAliasWithDottedName.symbols index e469345580411..2b46c831c1050 100644 --- a/tests/baselines/reference/importAliasWithDottedName.symbols +++ b/tests/baselines/reference/importAliasWithDottedName.symbols @@ -1,13 +1,13 @@ //// [tests/cases/compiler/importAliasWithDottedName.ts] //// === importAliasWithDottedName.ts === -module M { +namespace M { >M : Symbol(M, Decl(importAliasWithDottedName.ts, 0, 0)) export var x = 1; >x : Symbol(x, Decl(importAliasWithDottedName.ts, 1, 14)) - export module N { + export namespace N { >N : Symbol(N, Decl(importAliasWithDottedName.ts, 1, 21)) export var y = 2; @@ -15,18 +15,18 @@ module M { } } -module A { +namespace A { >A : Symbol(A, Decl(importAliasWithDottedName.ts, 5, 1)) import N = M.N; ->N : Symbol(N, Decl(importAliasWithDottedName.ts, 7, 10)) +>N : Symbol(N, Decl(importAliasWithDottedName.ts, 7, 13)) >M : Symbol(M, Decl(importAliasWithDottedName.ts, 0, 0)) >N : Symbol(N, Decl(importAliasWithDottedName.ts, 1, 21)) var r = N.y; >r : Symbol(r, Decl(importAliasWithDottedName.ts, 9, 7)) >N.y : Symbol(N.y, Decl(importAliasWithDottedName.ts, 3, 18)) ->N : Symbol(N, Decl(importAliasWithDottedName.ts, 7, 10)) +>N : Symbol(N, Decl(importAliasWithDottedName.ts, 7, 13)) >y : Symbol(N.y, Decl(importAliasWithDottedName.ts, 3, 18)) var r2 = M.N.y; diff --git a/tests/baselines/reference/importAliasWithDottedName.types b/tests/baselines/reference/importAliasWithDottedName.types index 4444d17e95fff..2aa5c228d5746 100644 --- a/tests/baselines/reference/importAliasWithDottedName.types +++ b/tests/baselines/reference/importAliasWithDottedName.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importAliasWithDottedName.ts] //// === importAliasWithDottedName.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -11,7 +11,7 @@ module M { >1 : 1 > : ^ - export module N { + export namespace N { >N : typeof N > : ^^^^^^^^ @@ -23,7 +23,7 @@ module M { } } -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/importAnImport.errors.txt b/tests/baselines/reference/importAnImport.errors.txt index 4d825215ae691..df4c60f111d93 100644 --- a/tests/baselines/reference/importAnImport.errors.txt +++ b/tests/baselines/reference/importAnImport.errors.txt @@ -2,11 +2,11 @@ importAnImport.ts(6,23): error TS2694: Namespace 'c.a.b' has no exported member ==== importAnImport.ts (1 errors) ==== - module c.a.b { + namespace c.a.b { import ma = a; } - module m0 { + namespace m0 { import m8 = c.a.b.ma; ~~ !!! error TS2694: Namespace 'c.a.b' has no exported member 'ma'. diff --git a/tests/baselines/reference/importAnImport.js b/tests/baselines/reference/importAnImport.js index 09340e89d8c99..176741fc03130 100644 --- a/tests/baselines/reference/importAnImport.js +++ b/tests/baselines/reference/importAnImport.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/importAnImport.ts] //// //// [importAnImport.ts] -module c.a.b { +namespace c.a.b { import ma = a; } -module m0 { +namespace m0 { import m8 = c.a.b.ma; } diff --git a/tests/baselines/reference/importAnImport.symbols b/tests/baselines/reference/importAnImport.symbols index 7685c053ed756..ed629967ae5a4 100644 --- a/tests/baselines/reference/importAnImport.symbols +++ b/tests/baselines/reference/importAnImport.symbols @@ -1,22 +1,22 @@ //// [tests/cases/compiler/importAnImport.ts] //// === importAnImport.ts === -module c.a.b { +namespace c.a.b { >c : Symbol(c, Decl(importAnImport.ts, 0, 0)) ->a : Symbol(a, Decl(importAnImport.ts, 0, 9)) ->b : Symbol(ma.b, Decl(importAnImport.ts, 0, 11)) +>a : Symbol(a, Decl(importAnImport.ts, 0, 12)) +>b : Symbol(ma.b, Decl(importAnImport.ts, 0, 14)) import ma = a; ->ma : Symbol(ma, Decl(importAnImport.ts, 0, 14)) ->a : Symbol(ma, Decl(importAnImport.ts, 0, 9)) +>ma : Symbol(ma, Decl(importAnImport.ts, 0, 17)) +>a : Symbol(ma, Decl(importAnImport.ts, 0, 12)) } -module m0 { +namespace m0 { >m0 : Symbol(m0, Decl(importAnImport.ts, 2, 1)) import m8 = c.a.b.ma; ->m8 : Symbol(m8, Decl(importAnImport.ts, 4, 11)) +>m8 : Symbol(m8, Decl(importAnImport.ts, 4, 14)) >c : Symbol(c, Decl(importAnImport.ts, 0, 0)) ->a : Symbol(c.a, Decl(importAnImport.ts, 0, 9)) ->b : Symbol(c.a.b, Decl(importAnImport.ts, 0, 11)) +>a : Symbol(c.a, Decl(importAnImport.ts, 0, 12)) +>b : Symbol(c.a.b, Decl(importAnImport.ts, 0, 14)) } diff --git a/tests/baselines/reference/importAnImport.types b/tests/baselines/reference/importAnImport.types index 8af148c84a13b..a6dbcf0e6457c 100644 --- a/tests/baselines/reference/importAnImport.types +++ b/tests/baselines/reference/importAnImport.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importAnImport.ts] //// === importAnImport.ts === -module c.a.b { +namespace c.a.b { import ma = a; >ma : any > : ^^^ @@ -9,7 +9,7 @@ module c.a.b { > : ^^^ } -module m0 { +namespace m0 { import m8 = c.a.b.ma; >m8 : any > : ^^^ diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict1.errors.txt b/tests/baselines/reference/importAndVariableDeclarationConflict1.errors.txt index 574ac8736d17e..beae948499670 100644 --- a/tests/baselines/reference/importAndVariableDeclarationConflict1.errors.txt +++ b/tests/baselines/reference/importAndVariableDeclarationConflict1.errors.txt @@ -2,7 +2,7 @@ importAndVariableDeclarationConflict1.ts(5,1): error TS2440: Import declaration ==== importAndVariableDeclarationConflict1.ts (1 errors) ==== - module m { + namespace m { export var m = ''; } diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict1.js b/tests/baselines/reference/importAndVariableDeclarationConflict1.js index 8d10b64084fad..8a27b173a8c10 100644 --- a/tests/baselines/reference/importAndVariableDeclarationConflict1.js +++ b/tests/baselines/reference/importAndVariableDeclarationConflict1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importAndVariableDeclarationConflict1.ts] //// //// [importAndVariableDeclarationConflict1.ts] -module m { +namespace m { export var m = ''; } diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict1.symbols b/tests/baselines/reference/importAndVariableDeclarationConflict1.symbols index 523da5202b28a..542b713e88cca 100644 --- a/tests/baselines/reference/importAndVariableDeclarationConflict1.symbols +++ b/tests/baselines/reference/importAndVariableDeclarationConflict1.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importAndVariableDeclarationConflict1.ts] //// === importAndVariableDeclarationConflict1.ts === -module m { +namespace m { >m : Symbol(m, Decl(importAndVariableDeclarationConflict1.ts, 0, 0)) export var m = ''; diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict1.types b/tests/baselines/reference/importAndVariableDeclarationConflict1.types index fad0bbfefb124..f4ddc84fa1822 100644 --- a/tests/baselines/reference/importAndVariableDeclarationConflict1.types +++ b/tests/baselines/reference/importAndVariableDeclarationConflict1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importAndVariableDeclarationConflict1.ts] //// === importAndVariableDeclarationConflict1.ts === -module m { +namespace m { >m : typeof globalThis.m > : ^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict2.js b/tests/baselines/reference/importAndVariableDeclarationConflict2.js index fb7c68684a52c..2edea93bbbcf3 100644 --- a/tests/baselines/reference/importAndVariableDeclarationConflict2.js +++ b/tests/baselines/reference/importAndVariableDeclarationConflict2.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importAndVariableDeclarationConflict2.ts] //// //// [importAndVariableDeclarationConflict2.ts] -module m { +namespace m { export var m = ''; } diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict2.symbols b/tests/baselines/reference/importAndVariableDeclarationConflict2.symbols index 0dc212fd06629..73f89385fe99a 100644 --- a/tests/baselines/reference/importAndVariableDeclarationConflict2.symbols +++ b/tests/baselines/reference/importAndVariableDeclarationConflict2.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importAndVariableDeclarationConflict2.ts] //// === importAndVariableDeclarationConflict2.ts === -module m { +namespace m { >m : Symbol(m, Decl(importAndVariableDeclarationConflict2.ts, 0, 0)) export var m = ''; diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict2.types b/tests/baselines/reference/importAndVariableDeclarationConflict2.types index d588c94796864..17f8deb109f16 100644 --- a/tests/baselines/reference/importAndVariableDeclarationConflict2.types +++ b/tests/baselines/reference/importAndVariableDeclarationConflict2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importAndVariableDeclarationConflict2.ts] //// === importAndVariableDeclarationConflict2.ts === -module m { +namespace m { >m : typeof globalThis.m > : ^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict3.errors.txt b/tests/baselines/reference/importAndVariableDeclarationConflict3.errors.txt index 9a1eba6ab3230..c3030a9acc013 100644 --- a/tests/baselines/reference/importAndVariableDeclarationConflict3.errors.txt +++ b/tests/baselines/reference/importAndVariableDeclarationConflict3.errors.txt @@ -3,7 +3,7 @@ importAndVariableDeclarationConflict3.ts(6,8): error TS2300: Duplicate identifie ==== importAndVariableDeclarationConflict3.ts (2 errors) ==== - module m { + namespace m { export var m = ''; } diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict3.js b/tests/baselines/reference/importAndVariableDeclarationConflict3.js index 6f48077d6877a..5a610b145f257 100644 --- a/tests/baselines/reference/importAndVariableDeclarationConflict3.js +++ b/tests/baselines/reference/importAndVariableDeclarationConflict3.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importAndVariableDeclarationConflict3.ts] //// //// [importAndVariableDeclarationConflict3.ts] -module m { +namespace m { export var m = ''; } diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict3.symbols b/tests/baselines/reference/importAndVariableDeclarationConflict3.symbols index c47dbcbb459a1..b93e3adc5f7ea 100644 --- a/tests/baselines/reference/importAndVariableDeclarationConflict3.symbols +++ b/tests/baselines/reference/importAndVariableDeclarationConflict3.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importAndVariableDeclarationConflict3.ts] //// === importAndVariableDeclarationConflict3.ts === -module m { +namespace m { >m : Symbol(m, Decl(importAndVariableDeclarationConflict3.ts, 0, 0)) export var m = ''; diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict3.types b/tests/baselines/reference/importAndVariableDeclarationConflict3.types index ee9975cd2dca6..556124f8ba30a 100644 --- a/tests/baselines/reference/importAndVariableDeclarationConflict3.types +++ b/tests/baselines/reference/importAndVariableDeclarationConflict3.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importAndVariableDeclarationConflict3.ts] //// === importAndVariableDeclarationConflict3.ts === -module m { +namespace m { >m : typeof globalThis.m > : ^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict4.errors.txt b/tests/baselines/reference/importAndVariableDeclarationConflict4.errors.txt index 9cb984693824f..da3ac923df8bd 100644 --- a/tests/baselines/reference/importAndVariableDeclarationConflict4.errors.txt +++ b/tests/baselines/reference/importAndVariableDeclarationConflict4.errors.txt @@ -2,7 +2,7 @@ importAndVariableDeclarationConflict4.ts(6,1): error TS2440: Import declaration ==== importAndVariableDeclarationConflict4.ts (1 errors) ==== - module m { + namespace m { export var m = ''; } diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict4.js b/tests/baselines/reference/importAndVariableDeclarationConflict4.js index 0467a55891b2a..7be0293b28902 100644 --- a/tests/baselines/reference/importAndVariableDeclarationConflict4.js +++ b/tests/baselines/reference/importAndVariableDeclarationConflict4.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importAndVariableDeclarationConflict4.ts] //// //// [importAndVariableDeclarationConflict4.ts] -module m { +namespace m { export var m = ''; } diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict4.symbols b/tests/baselines/reference/importAndVariableDeclarationConflict4.symbols index 2701a60eacf31..43db850158f24 100644 --- a/tests/baselines/reference/importAndVariableDeclarationConflict4.symbols +++ b/tests/baselines/reference/importAndVariableDeclarationConflict4.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importAndVariableDeclarationConflict4.ts] //// === importAndVariableDeclarationConflict4.ts === -module m { +namespace m { >m : Symbol(m, Decl(importAndVariableDeclarationConflict4.ts, 0, 0)) export var m = ''; diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict4.types b/tests/baselines/reference/importAndVariableDeclarationConflict4.types index 7cd7af4d09ceb..19e779f9cda7f 100644 --- a/tests/baselines/reference/importAndVariableDeclarationConflict4.types +++ b/tests/baselines/reference/importAndVariableDeclarationConflict4.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importAndVariableDeclarationConflict4.ts] //// === importAndVariableDeclarationConflict4.ts === -module m { +namespace m { >m : typeof globalThis.m > : ^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/importDecl.js b/tests/baselines/reference/importDecl.js index f14a53fa15140..952ac40154ebd 100644 --- a/tests/baselines/reference/importDecl.js +++ b/tests/baselines/reference/importDecl.js @@ -43,7 +43,7 @@ export var x4 = m4.x; export var d4 = m4.d; export var f4 = m4.foo(); -export module m1 { +export namespace m1 { export var x2 = m4.x; export var d2 = m4.d; export var f2 = m4.foo(); @@ -64,7 +64,7 @@ export var useFncOnly_m4_f4 = fncOnly_m4.foo(); // only used privately no need to emit import private_m4 = require("./importDecl_require3"); -export module usePrivate_m4_m1 { +export namespace usePrivate_m4_m1 { var x3 = private_m4.x; var d3 = private_m4.d; var f3 = private_m4.foo(); diff --git a/tests/baselines/reference/importDecl.symbols b/tests/baselines/reference/importDecl.symbols index af601eade8b07..82a5a42a77e2c 100644 --- a/tests/baselines/reference/importDecl.symbols +++ b/tests/baselines/reference/importDecl.symbols @@ -27,7 +27,7 @@ export var f4 = m4.foo(); >m4 : Symbol(m4, Decl(importDecl_1.ts, 0, 0)) >foo : Symbol(m4.foo, Decl(importDecl_require.ts, 3, 16)) -export module m1 { +export namespace m1 { >m1 : Symbol(m1, Decl(importDecl_1.ts, 8, 25)) export var x2 = m4.x; @@ -97,7 +97,7 @@ export var useFncOnly_m4_f4 = fncOnly_m4.foo(); import private_m4 = require("./importDecl_require3"); >private_m4 : Symbol(private_m4, Decl(importDecl_1.ts, 27, 47)) -export module usePrivate_m4_m1 { +export namespace usePrivate_m4_m1 { >usePrivate_m4_m1 : Symbol(usePrivate_m4_m1, Decl(importDecl_1.ts, 30, 53)) var x3 = private_m4.x; diff --git a/tests/baselines/reference/importDecl.types b/tests/baselines/reference/importDecl.types index 118f58ccd51e4..99876e4cfed83 100644 --- a/tests/baselines/reference/importDecl.types +++ b/tests/baselines/reference/importDecl.types @@ -42,7 +42,7 @@ export var f4 = m4.foo(); >foo : () => m4.d > : ^^^^^^^^^^ -export module m1 { +export namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -160,7 +160,7 @@ import private_m4 = require("./importDecl_require3"); >private_m4 : typeof private_m4 > : ^^^^^^^^^^^^^^^^^ -export module usePrivate_m4_m1 { +export namespace usePrivate_m4_m1 { >usePrivate_m4_m1 : typeof usePrivate_m4_m1 > : ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/importDeclWithClassModifiers.errors.txt b/tests/baselines/reference/importDeclWithClassModifiers.errors.txt index 0bfcbbd5ac606..12e30795fff58 100644 --- a/tests/baselines/reference/importDeclWithClassModifiers.errors.txt +++ b/tests/baselines/reference/importDeclWithClassModifiers.errors.txt @@ -10,7 +10,7 @@ importDeclWithClassModifiers.ts(7,28): error TS2694: Namespace 'x' has no export ==== importDeclWithClassModifiers.ts (9 errors) ==== - module x { + namespace x { interface c { } } diff --git a/tests/baselines/reference/importDeclWithClassModifiers.js b/tests/baselines/reference/importDeclWithClassModifiers.js index 0ac2479e3ed3d..d4c7e390ee746 100644 --- a/tests/baselines/reference/importDeclWithClassModifiers.js +++ b/tests/baselines/reference/importDeclWithClassModifiers.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importDeclWithClassModifiers.ts] //// //// [importDeclWithClassModifiers.ts] -module x { +namespace x { interface c { } } diff --git a/tests/baselines/reference/importDeclWithClassModifiers.symbols b/tests/baselines/reference/importDeclWithClassModifiers.symbols index afc0084ffeda6..4defa696fbda4 100644 --- a/tests/baselines/reference/importDeclWithClassModifiers.symbols +++ b/tests/baselines/reference/importDeclWithClassModifiers.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/importDeclWithClassModifiers.ts] //// === importDeclWithClassModifiers.ts === -module x { +namespace x { >x : Symbol(x, Decl(importDeclWithClassModifiers.ts, 0, 0)) interface c { ->c : Symbol(c, Decl(importDeclWithClassModifiers.ts, 0, 10)) +>c : Symbol(c, Decl(importDeclWithClassModifiers.ts, 0, 13)) } } export public import a = x.c; diff --git a/tests/baselines/reference/importDeclWithClassModifiers.types b/tests/baselines/reference/importDeclWithClassModifiers.types index 04fd882d591d6..48e980cd29f79 100644 --- a/tests/baselines/reference/importDeclWithClassModifiers.types +++ b/tests/baselines/reference/importDeclWithClassModifiers.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importDeclWithClassModifiers.ts] //// === importDeclWithClassModifiers.ts === -module x { +namespace x { interface c { } } diff --git a/tests/baselines/reference/importDeclWithDeclareModifier.errors.txt b/tests/baselines/reference/importDeclWithDeclareModifier.errors.txt index eb9308554d6c8..1209a7c728227 100644 --- a/tests/baselines/reference/importDeclWithDeclareModifier.errors.txt +++ b/tests/baselines/reference/importDeclWithDeclareModifier.errors.txt @@ -3,7 +3,7 @@ importDeclWithDeclareModifier.ts(5,29): error TS2694: Namespace 'x' has no expor ==== importDeclWithDeclareModifier.ts (2 errors) ==== - module x { + namespace x { interface c { } } diff --git a/tests/baselines/reference/importDeclWithDeclareModifier.js b/tests/baselines/reference/importDeclWithDeclareModifier.js index 6abdc61fb9584..abf629b700918 100644 --- a/tests/baselines/reference/importDeclWithDeclareModifier.js +++ b/tests/baselines/reference/importDeclWithDeclareModifier.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importDeclWithDeclareModifier.ts] //// //// [importDeclWithDeclareModifier.ts] -module x { +namespace x { interface c { } } diff --git a/tests/baselines/reference/importDeclWithDeclareModifier.symbols b/tests/baselines/reference/importDeclWithDeclareModifier.symbols index 7a83e14d4025d..f2d61e3f4edfa 100644 --- a/tests/baselines/reference/importDeclWithDeclareModifier.symbols +++ b/tests/baselines/reference/importDeclWithDeclareModifier.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/importDeclWithDeclareModifier.ts] //// === importDeclWithDeclareModifier.ts === -module x { +namespace x { >x : Symbol(x, Decl(importDeclWithDeclareModifier.ts, 0, 0)) interface c { ->c : Symbol(c, Decl(importDeclWithDeclareModifier.ts, 0, 10)) +>c : Symbol(c, Decl(importDeclWithDeclareModifier.ts, 0, 13)) } } declare export import a = x.c; diff --git a/tests/baselines/reference/importDeclWithDeclareModifier.types b/tests/baselines/reference/importDeclWithDeclareModifier.types index e3c3ec2a729d0..f75673bae3ed8 100644 --- a/tests/baselines/reference/importDeclWithDeclareModifier.types +++ b/tests/baselines/reference/importDeclWithDeclareModifier.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importDeclWithDeclareModifier.ts] //// === importDeclWithDeclareModifier.ts === -module x { +namespace x { interface c { } } diff --git a/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.errors.txt b/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.errors.txt index b1b5a0c638871..f48bdd1c6649c 100644 --- a/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.errors.txt +++ b/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.errors.txt @@ -3,7 +3,7 @@ importDeclWithDeclareModifierInAmbientContext.ts(6,5): error TS1038: A 'declare' ==== importDeclWithDeclareModifierInAmbientContext.ts (1 errors) ==== declare module "m" { - module x { + namespace x { interface c { } } diff --git a/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.js b/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.js index 82997e3c4f2ab..78e8e8afd9268 100644 --- a/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.js +++ b/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.js @@ -2,7 +2,7 @@ //// [importDeclWithDeclareModifierInAmbientContext.ts] declare module "m" { - module x { + namespace x { interface c { } } diff --git a/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.symbols b/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.symbols index 7a6cf62195771..937e3b0be1c64 100644 --- a/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.symbols +++ b/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.symbols @@ -4,17 +4,17 @@ declare module "m" { >"m" : Symbol("m", Decl(importDeclWithDeclareModifierInAmbientContext.ts, 0, 0)) - module x { + namespace x { >x : Symbol(x, Decl(importDeclWithDeclareModifierInAmbientContext.ts, 0, 20)) interface c { ->c : Symbol(c, Decl(importDeclWithDeclareModifierInAmbientContext.ts, 1, 14)) +>c : Symbol(c, Decl(importDeclWithDeclareModifierInAmbientContext.ts, 1, 17)) } } declare export import a = x.c; >a : Symbol(a, Decl(importDeclWithDeclareModifierInAmbientContext.ts, 4, 5)) >x : Symbol(x, Decl(importDeclWithDeclareModifierInAmbientContext.ts, 0, 20)) ->c : Symbol(a, Decl(importDeclWithDeclareModifierInAmbientContext.ts, 1, 14)) +>c : Symbol(a, Decl(importDeclWithDeclareModifierInAmbientContext.ts, 1, 17)) var b: a; >b : Symbol(b, Decl(importDeclWithDeclareModifierInAmbientContext.ts, 6, 7)) diff --git a/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.types b/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.types index a8023e42cca99..f405b973b679c 100644 --- a/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.types +++ b/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.types @@ -5,7 +5,7 @@ declare module "m" { >"m" : typeof import("m") > : ^^^^^^^^^^^^^^^^^^ - module x { + namespace x { interface c { } } diff --git a/tests/baselines/reference/importDeclWithExportModifier.errors.txt b/tests/baselines/reference/importDeclWithExportModifier.errors.txt index e419c438c0413..8da059494431f 100644 --- a/tests/baselines/reference/importDeclWithExportModifier.errors.txt +++ b/tests/baselines/reference/importDeclWithExportModifier.errors.txt @@ -3,7 +3,7 @@ importDeclWithExportModifier.ts(5,21): error TS2694: Namespace 'x' has no export ==== importDeclWithExportModifier.ts (2 errors) ==== - module x { + namespace x { interface c { } } diff --git a/tests/baselines/reference/importDeclWithExportModifier.js b/tests/baselines/reference/importDeclWithExportModifier.js index 4366f6e3e9ce0..c2bec7001b218 100644 --- a/tests/baselines/reference/importDeclWithExportModifier.js +++ b/tests/baselines/reference/importDeclWithExportModifier.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importDeclWithExportModifier.ts] //// //// [importDeclWithExportModifier.ts] -module x { +namespace x { interface c { } } diff --git a/tests/baselines/reference/importDeclWithExportModifier.symbols b/tests/baselines/reference/importDeclWithExportModifier.symbols index 771df2b072434..4a640c83b1667 100644 --- a/tests/baselines/reference/importDeclWithExportModifier.symbols +++ b/tests/baselines/reference/importDeclWithExportModifier.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/importDeclWithExportModifier.ts] //// === importDeclWithExportModifier.ts === -module x { +namespace x { >x : Symbol(x, Decl(importDeclWithExportModifier.ts, 0, 0)) interface c { ->c : Symbol(c, Decl(importDeclWithExportModifier.ts, 0, 10)) +>c : Symbol(c, Decl(importDeclWithExportModifier.ts, 0, 13)) } } export import a = x.c; diff --git a/tests/baselines/reference/importDeclWithExportModifier.types b/tests/baselines/reference/importDeclWithExportModifier.types index 53b7c11e1200f..52a3a8c346055 100644 --- a/tests/baselines/reference/importDeclWithExportModifier.types +++ b/tests/baselines/reference/importDeclWithExportModifier.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importDeclWithExportModifier.ts] //// === importDeclWithExportModifier.ts === -module x { +namespace x { interface c { } } diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.errors.txt b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.errors.txt index 173d467902e3b..d4420d401f29a 100644 --- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.errors.txt +++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.errors.txt @@ -4,7 +4,7 @@ importDeclWithExportModifierAndExportAssignment.ts(6,1): error TS2309: An export ==== importDeclWithExportModifierAndExportAssignment.ts (3 errors) ==== - module x { + namespace x { interface c { } } diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js index 143e18fe2b525..f1dd0aebe890f 100644 --- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js +++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importDeclWithExportModifierAndExportAssignment.ts] //// //// [importDeclWithExportModifierAndExportAssignment.ts] -module x { +namespace x { interface c { } } diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.symbols b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.symbols index bbd7af6fa6598..e19bd9b860450 100644 --- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.symbols +++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/importDeclWithExportModifierAndExportAssignment.ts] //// === importDeclWithExportModifierAndExportAssignment.ts === -module x { +namespace x { >x : Symbol(x, Decl(importDeclWithExportModifierAndExportAssignment.ts, 0, 0)) interface c { ->c : Symbol(c, Decl(importDeclWithExportModifierAndExportAssignment.ts, 0, 10)) +>c : Symbol(c, Decl(importDeclWithExportModifierAndExportAssignment.ts, 0, 13)) } } export import a = x.c; diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.types b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.types index e825087118a77..c04e1bcd6e134 100644 --- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.types +++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importDeclWithExportModifierAndExportAssignment.ts] //// === importDeclWithExportModifierAndExportAssignment.ts === -module x { +namespace x { interface c { } } diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.errors.txt b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.errors.txt index 62cde19a93336..d8b40562175c9 100644 --- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.errors.txt +++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.errors.txt @@ -3,7 +3,7 @@ importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts(7,5): error T ==== importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts (1 errors) ==== declare module "m" { - module x { + namespace x { interface c { } } diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.js b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.js index d8df861def700..eb8c785efd79d 100644 --- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.js +++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.js @@ -2,7 +2,7 @@ //// [importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts] declare module "m" { - module x { + namespace x { interface c { } } diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.symbols b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.symbols index a932be2e6556a..0785b37363628 100644 --- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.symbols +++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.symbols @@ -4,17 +4,17 @@ declare module "m" { >"m" : Symbol("m", Decl(importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts, 0, 0)) - module x { + namespace x { >x : Symbol(x, Decl(importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts, 0, 20)) interface c { ->c : Symbol(c, Decl(importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts, 1, 14)) +>c : Symbol(c, Decl(importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts, 1, 17)) } } export import a = x.c; >a : Symbol(a, Decl(importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts, 4, 5)) >x : Symbol(x, Decl(importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts, 0, 20)) ->c : Symbol(a, Decl(importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts, 1, 14)) +>c : Symbol(a, Decl(importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts, 1, 17)) export = x; >x : Symbol(x, Decl(importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts, 0, 20)) diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.types b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.types index 272c43a78c14f..1d4b35ccc28ec 100644 --- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.types +++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.types @@ -5,7 +5,7 @@ declare module "m" { >"m" : typeof import("m") > : ^^^^^^^^^^^^^^^^^^ - module x { + namespace x { interface c { } } diff --git a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.js b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.js index b6ffef3fd753a..cfa076bf7c71f 100644 --- a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.js +++ b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.js @@ -2,7 +2,7 @@ //// [importDeclWithExportModifierInAmbientContext.ts] declare module "m" { - module x { + namespace x { interface c { } } diff --git a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.symbols b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.symbols index 4be395391b2cb..6cc25ea6fafb4 100644 --- a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.symbols +++ b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.symbols @@ -4,17 +4,17 @@ declare module "m" { >"m" : Symbol("m", Decl(importDeclWithExportModifierInAmbientContext.ts, 0, 0)) - module x { + namespace x { >x : Symbol(x, Decl(importDeclWithExportModifierInAmbientContext.ts, 0, 20)) interface c { ->c : Symbol(c, Decl(importDeclWithExportModifierInAmbientContext.ts, 1, 14)) +>c : Symbol(c, Decl(importDeclWithExportModifierInAmbientContext.ts, 1, 17)) } } export import a = x.c; >a : Symbol(a, Decl(importDeclWithExportModifierInAmbientContext.ts, 4, 5)) >x : Symbol(x, Decl(importDeclWithExportModifierInAmbientContext.ts, 0, 20)) ->c : Symbol(a, Decl(importDeclWithExportModifierInAmbientContext.ts, 1, 14)) +>c : Symbol(a, Decl(importDeclWithExportModifierInAmbientContext.ts, 1, 17)) var b: a; >b : Symbol(b, Decl(importDeclWithExportModifierInAmbientContext.ts, 6, 7)) diff --git a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types index 86a37033605c2..2c9d059d6bbb7 100644 --- a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types +++ b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types @@ -5,7 +5,7 @@ declare module "m" { >"m" : typeof import("m") > : ^^^^^^^^^^^^^^^^^^ - module x { + namespace x { interface c { } } diff --git a/tests/baselines/reference/importDeclarationInModuleDeclaration1.errors.txt b/tests/baselines/reference/importDeclarationInModuleDeclaration1.errors.txt index 5599c200332fe..6c83b73a0ef4b 100644 --- a/tests/baselines/reference/importDeclarationInModuleDeclaration1.errors.txt +++ b/tests/baselines/reference/importDeclarationInModuleDeclaration1.errors.txt @@ -2,7 +2,7 @@ importDeclarationInModuleDeclaration1.ts(2,25): error TS1147: Import declaration ==== importDeclarationInModuleDeclaration1.ts (1 errors) ==== - module m2 { + namespace m2 { import m3 = require("use_glo_M1_public"); ~~~~~~~~~~~~~~~~~~~ !!! error TS1147: Import declarations in a namespace cannot reference a module. diff --git a/tests/baselines/reference/importDeclarationInModuleDeclaration1.js b/tests/baselines/reference/importDeclarationInModuleDeclaration1.js index 7adef9ef3f8f2..4eeb39cb03c50 100644 --- a/tests/baselines/reference/importDeclarationInModuleDeclaration1.js +++ b/tests/baselines/reference/importDeclarationInModuleDeclaration1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importDeclarationInModuleDeclaration1.ts] //// //// [importDeclarationInModuleDeclaration1.ts] -module m2 { +namespace m2 { import m3 = require("use_glo_M1_public"); } diff --git a/tests/baselines/reference/importDeclarationInModuleDeclaration1.symbols b/tests/baselines/reference/importDeclarationInModuleDeclaration1.symbols index 9c812528c2b5f..c851642d1b0ed 100644 --- a/tests/baselines/reference/importDeclarationInModuleDeclaration1.symbols +++ b/tests/baselines/reference/importDeclarationInModuleDeclaration1.symbols @@ -1,9 +1,9 @@ //// [tests/cases/compiler/importDeclarationInModuleDeclaration1.ts] //// === importDeclarationInModuleDeclaration1.ts === -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(importDeclarationInModuleDeclaration1.ts, 0, 0)) import m3 = require("use_glo_M1_public"); ->m3 : Symbol(m3, Decl(importDeclarationInModuleDeclaration1.ts, 0, 11)) +>m3 : Symbol(m3, Decl(importDeclarationInModuleDeclaration1.ts, 0, 14)) } diff --git a/tests/baselines/reference/importDeclarationInModuleDeclaration1.types b/tests/baselines/reference/importDeclarationInModuleDeclaration1.types index f67890c23fac2..6b3c62b0d9105 100644 --- a/tests/baselines/reference/importDeclarationInModuleDeclaration1.types +++ b/tests/baselines/reference/importDeclarationInModuleDeclaration1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importDeclarationInModuleDeclaration1.ts] //// === importDeclarationInModuleDeclaration1.ts === -module m2 { +namespace m2 { import m3 = require("use_glo_M1_public"); >m3 : any > : ^^^ diff --git a/tests/baselines/reference/importInTypePosition.js b/tests/baselines/reference/importInTypePosition.js index 8bb96b4ec2f5b..b680cfc74dc17 100644 --- a/tests/baselines/reference/importInTypePosition.js +++ b/tests/baselines/reference/importInTypePosition.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importInTypePosition.ts] //// //// [importInTypePosition.ts] -module A { +namespace A { export class Point { constructor(public x: number, public y: number) { } } @@ -9,12 +9,12 @@ module A { } // no code gen expected -module B { +namespace B { import a = A; //Error generates 'var = ;' } // no code gen expected -module C { +namespace C { import a = A; //Error generates 'var = ;' var m: typeof a; diff --git a/tests/baselines/reference/importInTypePosition.symbols b/tests/baselines/reference/importInTypePosition.symbols index f23a874df0900..0926d2fdbabb1 100644 --- a/tests/baselines/reference/importInTypePosition.symbols +++ b/tests/baselines/reference/importInTypePosition.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/importInTypePosition.ts] //// === importInTypePosition.ts === -module A { +namespace A { >A : Symbol(A, Decl(importInTypePosition.ts, 0, 0)) export class Point { ->Point : Symbol(Point, Decl(importInTypePosition.ts, 0, 10)) +>Point : Symbol(Point, Decl(importInTypePosition.ts, 0, 13)) constructor(public x: number, public y: number) { } >x : Symbol(Point.x, Decl(importInTypePosition.ts, 2, 20)) @@ -13,33 +13,33 @@ module A { } export var Origin = new Point(0, 0); >Origin : Symbol(Origin, Decl(importInTypePosition.ts, 4, 14)) ->Point : Symbol(Point, Decl(importInTypePosition.ts, 0, 10)) +>Point : Symbol(Point, Decl(importInTypePosition.ts, 0, 13)) } // no code gen expected -module B { +namespace B { >B : Symbol(B, Decl(importInTypePosition.ts, 5, 1)) import a = A; //Error generates 'var = ;' ->a : Symbol(a, Decl(importInTypePosition.ts, 8, 10)) +>a : Symbol(a, Decl(importInTypePosition.ts, 8, 13)) >A : Symbol(a, Decl(importInTypePosition.ts, 0, 0)) } // no code gen expected -module C { +namespace C { >C : Symbol(C, Decl(importInTypePosition.ts, 11, 1)) import a = A; //Error generates 'var = ;' ->a : Symbol(a, Decl(importInTypePosition.ts, 13, 10)) +>a : Symbol(a, Decl(importInTypePosition.ts, 13, 13)) >A : Symbol(a, Decl(importInTypePosition.ts, 0, 0)) var m: typeof a; >m : Symbol(m, Decl(importInTypePosition.ts, 16, 7)) ->a : Symbol(a, Decl(importInTypePosition.ts, 13, 10)) +>a : Symbol(a, Decl(importInTypePosition.ts, 13, 13)) var p: a.Point; >p : Symbol(p, Decl(importInTypePosition.ts, 17, 7), Decl(importInTypePosition.ts, 18, 7)) ->a : Symbol(a, Decl(importInTypePosition.ts, 13, 10)) ->Point : Symbol(a.Point, Decl(importInTypePosition.ts, 0, 10)) +>a : Symbol(a, Decl(importInTypePosition.ts, 13, 13)) +>Point : Symbol(a.Point, Decl(importInTypePosition.ts, 0, 13)) var p = { x: 0, y: 0 }; >p : Symbol(p, Decl(importInTypePosition.ts, 17, 7), Decl(importInTypePosition.ts, 18, 7)) diff --git a/tests/baselines/reference/importInTypePosition.types b/tests/baselines/reference/importInTypePosition.types index 91b04b343f2b4..61c4e226a1376 100644 --- a/tests/baselines/reference/importInTypePosition.types +++ b/tests/baselines/reference/importInTypePosition.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importInTypePosition.ts] //// === importInTypePosition.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -29,7 +29,7 @@ module A { } // no code gen expected -module B { +namespace B { import a = A; //Error generates 'var = ;' >a : typeof a @@ -38,7 +38,7 @@ module B { > : ^^^^^^^^ } // no code gen expected -module C { +namespace C { >C : typeof C > : ^^^^^^^^ diff --git a/tests/baselines/reference/importInsideModule.errors.txt b/tests/baselines/reference/importInsideModule.errors.txt index 6eef346a362fc..55981bf40600b 100644 --- a/tests/baselines/reference/importInsideModule.errors.txt +++ b/tests/baselines/reference/importInsideModule.errors.txt @@ -3,7 +3,7 @@ importInsideModule_file2.ts(2,26): error TS2307: Cannot find module 'importInsid ==== importInsideModule_file2.ts (2 errors) ==== - export module myModule { + export namespace myModule { import foo = require("importInsideModule_file1"); ~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS1147: Import declarations in a namespace cannot reference a module. diff --git a/tests/baselines/reference/importInsideModule.js b/tests/baselines/reference/importInsideModule.js index 17718c4e43021..46fb9461139cb 100644 --- a/tests/baselines/reference/importInsideModule.js +++ b/tests/baselines/reference/importInsideModule.js @@ -4,7 +4,7 @@ export var x = 1; //// [importInsideModule_file2.ts] -export module myModule { +export namespace myModule { import foo = require("importInsideModule_file1"); var a = foo.x; } diff --git a/tests/baselines/reference/importInsideModule.symbols b/tests/baselines/reference/importInsideModule.symbols index db4c35b6c97eb..7301c87a0c324 100644 --- a/tests/baselines/reference/importInsideModule.symbols +++ b/tests/baselines/reference/importInsideModule.symbols @@ -1,13 +1,13 @@ //// [tests/cases/compiler/importInsideModule.ts] //// === importInsideModule_file2.ts === -export module myModule { +export namespace myModule { >myModule : Symbol(myModule, Decl(importInsideModule_file2.ts, 0, 0)) import foo = require("importInsideModule_file1"); ->foo : Symbol(foo, Decl(importInsideModule_file2.ts, 0, 24)) +>foo : Symbol(foo, Decl(importInsideModule_file2.ts, 0, 27)) var a = foo.x; >a : Symbol(a, Decl(importInsideModule_file2.ts, 2, 7)) ->foo : Symbol(foo, Decl(importInsideModule_file2.ts, 0, 24)) +>foo : Symbol(foo, Decl(importInsideModule_file2.ts, 0, 27)) } diff --git a/tests/baselines/reference/importInsideModule.types b/tests/baselines/reference/importInsideModule.types index 6c6ffe6e175e0..c24b6215fc999 100644 --- a/tests/baselines/reference/importInsideModule.types +++ b/tests/baselines/reference/importInsideModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importInsideModule.ts] //// === importInsideModule_file2.ts === -export module myModule { +export namespace myModule { >myModule : typeof myModule > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/importNonExternalModule.errors.txt b/tests/baselines/reference/importNonExternalModule.errors.txt index 1cb0df9bfbfd5..1e6a62f49feb2 100644 --- a/tests/baselines/reference/importNonExternalModule.errors.txt +++ b/tests/baselines/reference/importNonExternalModule.errors.txt @@ -11,7 +11,7 @@ foo_1.ts(1,22): error TS2306: File 'foo_0.ts' is not a module. } ==== foo_0.ts (0 errors) ==== - module foo { + namespace foo { export var answer = 42; } \ No newline at end of file diff --git a/tests/baselines/reference/importNonExternalModule.js b/tests/baselines/reference/importNonExternalModule.js index a79371922ac59..d06f18002980a 100644 --- a/tests/baselines/reference/importNonExternalModule.js +++ b/tests/baselines/reference/importNonExternalModule.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/externalModules/importNonExternalModule.ts] //// //// [foo_0.ts] -module foo { +namespace foo { export var answer = 42; } diff --git a/tests/baselines/reference/importNonExternalModule.symbols b/tests/baselines/reference/importNonExternalModule.symbols index a0d7544d2d5e6..28cd06595d818 100644 --- a/tests/baselines/reference/importNonExternalModule.symbols +++ b/tests/baselines/reference/importNonExternalModule.symbols @@ -11,7 +11,7 @@ if(foo.answer === 42){ } === foo_0.ts === -module foo { +namespace foo { >foo : Symbol(foo, Decl(foo_0.ts, 0, 0)) export var answer = 42; diff --git a/tests/baselines/reference/importNonExternalModule.types b/tests/baselines/reference/importNonExternalModule.types index ff5913429ef1c..99e2055ec7fc6 100644 --- a/tests/baselines/reference/importNonExternalModule.types +++ b/tests/baselines/reference/importNonExternalModule.types @@ -21,7 +21,7 @@ if(foo.answer === 42){ } === foo_0.ts === -module foo { +namespace foo { >foo : typeof foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/importOnAliasedIdentifiers.js b/tests/baselines/reference/importOnAliasedIdentifiers.js index c828467b3f9fb..4cdc5614dfead 100644 --- a/tests/baselines/reference/importOnAliasedIdentifiers.js +++ b/tests/baselines/reference/importOnAliasedIdentifiers.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/importOnAliasedIdentifiers.ts] //// //// [importOnAliasedIdentifiers.ts] -module A { +namespace A { export interface X { s: string } export var X: X; } -module B { +namespace B { interface A { n: number } import Y = A; // Alias only for module A import Z = A.X; // Alias for both type and member A.X diff --git a/tests/baselines/reference/importOnAliasedIdentifiers.symbols b/tests/baselines/reference/importOnAliasedIdentifiers.symbols index 32d8cfeb5b43f..448b70b1ebec6 100644 --- a/tests/baselines/reference/importOnAliasedIdentifiers.symbols +++ b/tests/baselines/reference/importOnAliasedIdentifiers.symbols @@ -1,22 +1,22 @@ //// [tests/cases/compiler/importOnAliasedIdentifiers.ts] //// === importOnAliasedIdentifiers.ts === -module A { +namespace A { >A : Symbol(A, Decl(importOnAliasedIdentifiers.ts, 0, 0)) export interface X { s: string } ->X : Symbol(X, Decl(importOnAliasedIdentifiers.ts, 0, 10), Decl(importOnAliasedIdentifiers.ts, 2, 14)) +>X : Symbol(X, Decl(importOnAliasedIdentifiers.ts, 0, 13), Decl(importOnAliasedIdentifiers.ts, 2, 14)) >s : Symbol(X.s, Decl(importOnAliasedIdentifiers.ts, 1, 24)) export var X: X; ->X : Symbol(X, Decl(importOnAliasedIdentifiers.ts, 0, 10), Decl(importOnAliasedIdentifiers.ts, 2, 14)) ->X : Symbol(X, Decl(importOnAliasedIdentifiers.ts, 0, 10), Decl(importOnAliasedIdentifiers.ts, 2, 14)) +>X : Symbol(X, Decl(importOnAliasedIdentifiers.ts, 0, 13), Decl(importOnAliasedIdentifiers.ts, 2, 14)) +>X : Symbol(X, Decl(importOnAliasedIdentifiers.ts, 0, 13), Decl(importOnAliasedIdentifiers.ts, 2, 14)) } -module B { +namespace B { >B : Symbol(B, Decl(importOnAliasedIdentifiers.ts, 3, 1)) interface A { n: number } ->A : Symbol(A, Decl(importOnAliasedIdentifiers.ts, 4, 10)) +>A : Symbol(A, Decl(importOnAliasedIdentifiers.ts, 4, 13)) >n : Symbol(A.n, Decl(importOnAliasedIdentifiers.ts, 5, 17)) import Y = A; // Alias only for module A @@ -26,7 +26,7 @@ module B { import Z = A.X; // Alias for both type and member A.X >Z : Symbol(Z, Decl(importOnAliasedIdentifiers.ts, 6, 17)) >A : Symbol(Y, Decl(importOnAliasedIdentifiers.ts, 0, 0)) ->X : Symbol(Y.X, Decl(importOnAliasedIdentifiers.ts, 0, 10), Decl(importOnAliasedIdentifiers.ts, 2, 14)) +>X : Symbol(Y.X, Decl(importOnAliasedIdentifiers.ts, 0, 13), Decl(importOnAliasedIdentifiers.ts, 2, 14)) var v: Z = Z; >v : Symbol(v, Decl(importOnAliasedIdentifiers.ts, 8, 7)) diff --git a/tests/baselines/reference/importOnAliasedIdentifiers.types b/tests/baselines/reference/importOnAliasedIdentifiers.types index c3267a038ae9d..67de804a6b8f1 100644 --- a/tests/baselines/reference/importOnAliasedIdentifiers.types +++ b/tests/baselines/reference/importOnAliasedIdentifiers.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/importOnAliasedIdentifiers.ts] //// === importOnAliasedIdentifiers.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -13,7 +13,7 @@ module A { >X : X > : ^ } -module B { +namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/importStatements.js b/tests/baselines/reference/importStatements.js index 11e38a52f4bfc..ea66544ee7014 100644 --- a/tests/baselines/reference/importStatements.js +++ b/tests/baselines/reference/importStatements.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/codeGeneration/importStatements.ts] //// //// [importStatements.ts] -module A { +namespace A { export class Point { constructor(public x: number, public y: number) { } } @@ -10,12 +10,12 @@ module A { } // no code gen expected -module B { +namespace B { import a = A; //Error generates 'var = ;' } // no code gen expected -module C { +namespace C { import a = A; //Error generates 'var = ;' var m: typeof a; var p: a.Point; @@ -23,13 +23,13 @@ module C { } // code gen expected -module D { +namespace D { import a = A; var p = new a.Point(1, 1); } -module E { +namespace E { import a = A; export function xDist(x: a.Point) { return (a.Origin.x - x.x); diff --git a/tests/baselines/reference/importStatements.symbols b/tests/baselines/reference/importStatements.symbols index b6072b3d9ff7c..bbd42d2221d59 100644 --- a/tests/baselines/reference/importStatements.symbols +++ b/tests/baselines/reference/importStatements.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/codeGeneration/importStatements.ts] //// === importStatements.ts === -module A { +namespace A { >A : Symbol(A, Decl(importStatements.ts, 0, 0)) export class Point { ->Point : Symbol(Point, Decl(importStatements.ts, 0, 10)) +>Point : Symbol(Point, Decl(importStatements.ts, 0, 13)) constructor(public x: number, public y: number) { } >x : Symbol(Point.x, Decl(importStatements.ts, 2, 20)) @@ -14,34 +14,34 @@ module A { export var Origin = new Point(0, 0); >Origin : Symbol(Origin, Decl(importStatements.ts, 5, 14)) ->Point : Symbol(Point, Decl(importStatements.ts, 0, 10)) +>Point : Symbol(Point, Decl(importStatements.ts, 0, 13)) } // no code gen expected -module B { +namespace B { >B : Symbol(B, Decl(importStatements.ts, 6, 1)) import a = A; //Error generates 'var = ;' ->a : Symbol(a, Decl(importStatements.ts, 9, 10)) +>a : Symbol(a, Decl(importStatements.ts, 9, 13)) >A : Symbol(a, Decl(importStatements.ts, 0, 0)) } // no code gen expected -module C { +namespace C { >C : Symbol(C, Decl(importStatements.ts, 11, 1)) import a = A; //Error generates 'var = ;' ->a : Symbol(a, Decl(importStatements.ts, 14, 10)) +>a : Symbol(a, Decl(importStatements.ts, 14, 13)) >A : Symbol(a, Decl(importStatements.ts, 0, 0)) var m: typeof a; >m : Symbol(m, Decl(importStatements.ts, 16, 7)) ->a : Symbol(a, Decl(importStatements.ts, 14, 10)) +>a : Symbol(a, Decl(importStatements.ts, 14, 13)) var p: a.Point; >p : Symbol(p, Decl(importStatements.ts, 17, 7), Decl(importStatements.ts, 18, 7)) ->a : Symbol(a, Decl(importStatements.ts, 14, 10)) ->Point : Symbol(a.Point, Decl(importStatements.ts, 0, 10)) +>a : Symbol(a, Decl(importStatements.ts, 14, 13)) +>Point : Symbol(a.Point, Decl(importStatements.ts, 0, 13)) var p = {x:0, y:0 }; >p : Symbol(p, Decl(importStatements.ts, 17, 7), Decl(importStatements.ts, 18, 7)) @@ -50,37 +50,37 @@ module C { } // code gen expected -module D { +namespace D { >D : Symbol(D, Decl(importStatements.ts, 19, 1)) import a = A; ->a : Symbol(a, Decl(importStatements.ts, 22, 10)) +>a : Symbol(a, Decl(importStatements.ts, 22, 13)) >A : Symbol(a, Decl(importStatements.ts, 0, 0)) var p = new a.Point(1, 1); >p : Symbol(p, Decl(importStatements.ts, 25, 7)) ->a.Point : Symbol(a.Point, Decl(importStatements.ts, 0, 10)) ->a : Symbol(a, Decl(importStatements.ts, 22, 10)) ->Point : Symbol(a.Point, Decl(importStatements.ts, 0, 10)) +>a.Point : Symbol(a.Point, Decl(importStatements.ts, 0, 13)) +>a : Symbol(a, Decl(importStatements.ts, 22, 13)) +>Point : Symbol(a.Point, Decl(importStatements.ts, 0, 13)) } -module E { +namespace E { >E : Symbol(E, Decl(importStatements.ts, 26, 1)) import a = A; ->a : Symbol(a, Decl(importStatements.ts, 28, 10)) +>a : Symbol(a, Decl(importStatements.ts, 28, 13)) >A : Symbol(a, Decl(importStatements.ts, 0, 0)) export function xDist(x: a.Point) { >xDist : Symbol(xDist, Decl(importStatements.ts, 29, 17)) >x : Symbol(x, Decl(importStatements.ts, 30, 26)) ->a : Symbol(a, Decl(importStatements.ts, 28, 10)) ->Point : Symbol(a.Point, Decl(importStatements.ts, 0, 10)) +>a : Symbol(a, Decl(importStatements.ts, 28, 13)) +>Point : Symbol(a.Point, Decl(importStatements.ts, 0, 13)) return (a.Origin.x - x.x); >a.Origin.x : Symbol(a.Point.x, Decl(importStatements.ts, 2, 20)) >a.Origin : Symbol(a.Origin, Decl(importStatements.ts, 5, 14)) ->a : Symbol(a, Decl(importStatements.ts, 28, 10)) +>a : Symbol(a, Decl(importStatements.ts, 28, 13)) >Origin : Symbol(a.Origin, Decl(importStatements.ts, 5, 14)) >x : Symbol(a.Point.x, Decl(importStatements.ts, 2, 20)) >x.x : Symbol(a.Point.x, Decl(importStatements.ts, 2, 20)) diff --git a/tests/baselines/reference/importStatements.types b/tests/baselines/reference/importStatements.types index 5dd8a5af3e15c..489dd683148a5 100644 --- a/tests/baselines/reference/importStatements.types +++ b/tests/baselines/reference/importStatements.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/codeGeneration/importStatements.ts] //// === importStatements.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -30,7 +30,7 @@ module A { } // no code gen expected -module B { +namespace B { import a = A; //Error generates 'var = ;' >a : typeof a > : ^^^^^^^^ @@ -39,7 +39,7 @@ module B { } // no code gen expected -module C { +namespace C { >C : typeof C > : ^^^^^^^^ @@ -77,7 +77,7 @@ module C { } // code gen expected -module D { +namespace D { >D : typeof D > : ^^^^^^^^ @@ -104,7 +104,7 @@ module D { > : ^ } -module E { +namespace E { >E : typeof E > : ^^^^^^^^ diff --git a/tests/baselines/reference/importStatementsInterfaces.errors.txt b/tests/baselines/reference/importStatementsInterfaces.errors.txt index d2c449abf1ec7..c660e910ce9e3 100644 --- a/tests/baselines/reference/importStatementsInterfaces.errors.txt +++ b/tests/baselines/reference/importStatementsInterfaces.errors.txt @@ -2,13 +2,13 @@ importStatementsInterfaces.ts(23,19): error TS2708: Cannot use namespace 'a' as ==== importStatementsInterfaces.ts (1 errors) ==== - module A { + namespace A { export interface Point { x: number; y: number; } - export module inA { + export namespace inA { export interface Point3D extends Point { z: number; } @@ -16,12 +16,12 @@ importStatementsInterfaces.ts(23,19): error TS2708: Cannot use namespace 'a' as } // no code gen expected - module B { + namespace B { import a = A; } // no code gen expected - module C { + namespace C { import a = A; import b = a.inA; var m: typeof a; @@ -32,14 +32,14 @@ importStatementsInterfaces.ts(23,19): error TS2708: Cannot use namespace 'a' as } // no code gen expected - module D { + namespace D { import a = A; var p : a.Point; } // no code gen expected - module E { + namespace E { import a = A.inA; export function xDist(x: a.Point3D) { return 0 - x.x; diff --git a/tests/baselines/reference/importStatementsInterfaces.js b/tests/baselines/reference/importStatementsInterfaces.js index 030737302d33c..b1320ca6909ba 100644 --- a/tests/baselines/reference/importStatementsInterfaces.js +++ b/tests/baselines/reference/importStatementsInterfaces.js @@ -1,13 +1,13 @@ //// [tests/cases/conformance/internalModules/codeGeneration/importStatementsInterfaces.ts] //// //// [importStatementsInterfaces.ts] -module A { +namespace A { export interface Point { x: number; y: number; } - export module inA { + export namespace inA { export interface Point3D extends Point { z: number; } @@ -15,12 +15,12 @@ module A { } // no code gen expected -module B { +namespace B { import a = A; } // no code gen expected -module C { +namespace C { import a = A; import b = a.inA; var m: typeof a; @@ -29,14 +29,14 @@ module C { } // no code gen expected -module D { +namespace D { import a = A; var p : a.Point; } // no code gen expected -module E { +namespace E { import a = A.inA; export function xDist(x: a.Point3D) { return 0 - x.x; diff --git a/tests/baselines/reference/importStatementsInterfaces.symbols b/tests/baselines/reference/importStatementsInterfaces.symbols index 8950c1a249876..8aaf6bd6e753b 100644 --- a/tests/baselines/reference/importStatementsInterfaces.symbols +++ b/tests/baselines/reference/importStatementsInterfaces.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/codeGeneration/importStatementsInterfaces.ts] //// === importStatementsInterfaces.ts === -module A { +namespace A { >A : Symbol(A, Decl(importStatementsInterfaces.ts, 0, 0)) export interface Point { ->Point : Symbol(Point, Decl(importStatementsInterfaces.ts, 0, 10)) +>Point : Symbol(Point, Decl(importStatementsInterfaces.ts, 0, 13)) x: number; >x : Symbol(Point.x, Decl(importStatementsInterfaces.ts, 1, 28)) @@ -14,12 +14,12 @@ module A { >y : Symbol(Point.y, Decl(importStatementsInterfaces.ts, 2, 18)) } - export module inA { + export namespace inA { >inA : Symbol(inA, Decl(importStatementsInterfaces.ts, 4, 5)) export interface Point3D extends Point { ->Point3D : Symbol(Point3D, Decl(importStatementsInterfaces.ts, 6, 23)) ->Point : Symbol(Point, Decl(importStatementsInterfaces.ts, 0, 10)) +>Point3D : Symbol(Point3D, Decl(importStatementsInterfaces.ts, 6, 26)) +>Point : Symbol(Point, Decl(importStatementsInterfaces.ts, 0, 13)) z: number; >z : Symbol(Point3D.z, Decl(importStatementsInterfaces.ts, 7, 48)) @@ -28,25 +28,25 @@ module A { } // no code gen expected -module B { +namespace B { >B : Symbol(B, Decl(importStatementsInterfaces.ts, 11, 1)) import a = A; ->a : Symbol(a, Decl(importStatementsInterfaces.ts, 14, 10)) +>a : Symbol(a, Decl(importStatementsInterfaces.ts, 14, 13)) >A : Symbol(a, Decl(importStatementsInterfaces.ts, 0, 0)) } // no code gen expected -module C { +namespace C { >C : Symbol(C, Decl(importStatementsInterfaces.ts, 16, 1)) import a = A; ->a : Symbol(a, Decl(importStatementsInterfaces.ts, 19, 10)) +>a : Symbol(a, Decl(importStatementsInterfaces.ts, 19, 13)) >A : Symbol(a, Decl(importStatementsInterfaces.ts, 0, 0)) import b = a.inA; >b : Symbol(b, Decl(importStatementsInterfaces.ts, 20, 17)) ->a : Symbol(a, Decl(importStatementsInterfaces.ts, 19, 10)) +>a : Symbol(a, Decl(importStatementsInterfaces.ts, 19, 13)) >inA : Symbol(a.inA, Decl(importStatementsInterfaces.ts, 4, 5)) var m: typeof a; @@ -55,7 +55,7 @@ module C { var p: b.Point3D; >p : Symbol(p, Decl(importStatementsInterfaces.ts, 23, 7), Decl(importStatementsInterfaces.ts, 24, 7)) >b : Symbol(b, Decl(importStatementsInterfaces.ts, 20, 17)) ->Point3D : Symbol(b.Point3D, Decl(importStatementsInterfaces.ts, 6, 23)) +>Point3D : Symbol(b.Point3D, Decl(importStatementsInterfaces.ts, 6, 26)) var p = {x:0, y:0, z: 0 }; >p : Symbol(p, Decl(importStatementsInterfaces.ts, 23, 7), Decl(importStatementsInterfaces.ts, 24, 7)) @@ -65,33 +65,33 @@ module C { } // no code gen expected -module D { +namespace D { >D : Symbol(D, Decl(importStatementsInterfaces.ts, 25, 1)) import a = A; ->a : Symbol(a, Decl(importStatementsInterfaces.ts, 28, 10)) +>a : Symbol(a, Decl(importStatementsInterfaces.ts, 28, 13)) >A : Symbol(a, Decl(importStatementsInterfaces.ts, 0, 0)) var p : a.Point; >p : Symbol(p, Decl(importStatementsInterfaces.ts, 31, 7)) ->a : Symbol(a, Decl(importStatementsInterfaces.ts, 28, 10)) ->Point : Symbol(a.Point, Decl(importStatementsInterfaces.ts, 0, 10)) +>a : Symbol(a, Decl(importStatementsInterfaces.ts, 28, 13)) +>Point : Symbol(a.Point, Decl(importStatementsInterfaces.ts, 0, 13)) } // no code gen expected -module E { +namespace E { >E : Symbol(E, Decl(importStatementsInterfaces.ts, 32, 1)) import a = A.inA; ->a : Symbol(a, Decl(importStatementsInterfaces.ts, 35, 10)) +>a : Symbol(a, Decl(importStatementsInterfaces.ts, 35, 13)) >A : Symbol(A, Decl(importStatementsInterfaces.ts, 0, 0)) >inA : Symbol(a, Decl(importStatementsInterfaces.ts, 4, 5)) export function xDist(x: a.Point3D) { >xDist : Symbol(xDist, Decl(importStatementsInterfaces.ts, 36, 21)) >x : Symbol(x, Decl(importStatementsInterfaces.ts, 37, 26)) ->a : Symbol(a, Decl(importStatementsInterfaces.ts, 35, 10)) ->Point3D : Symbol(a.Point3D, Decl(importStatementsInterfaces.ts, 6, 23)) +>a : Symbol(a, Decl(importStatementsInterfaces.ts, 35, 13)) +>Point3D : Symbol(a.Point3D, Decl(importStatementsInterfaces.ts, 6, 26)) return 0 - x.x; >x.x : Symbol(A.Point.x, Decl(importStatementsInterfaces.ts, 1, 28)) diff --git a/tests/baselines/reference/importStatementsInterfaces.types b/tests/baselines/reference/importStatementsInterfaces.types index 07efd1b59852b..411f73201cca9 100644 --- a/tests/baselines/reference/importStatementsInterfaces.types +++ b/tests/baselines/reference/importStatementsInterfaces.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/codeGeneration/importStatementsInterfaces.ts] //// === importStatementsInterfaces.ts === -module A { +namespace A { export interface Point { x: number; >x : number @@ -12,7 +12,7 @@ module A { > : ^^^^^^ } - export module inA { + export namespace inA { export interface Point3D extends Point { z: number; >z : number @@ -22,7 +22,7 @@ module A { } // no code gen expected -module B { +namespace B { import a = A; >a : any > : ^^^ @@ -31,7 +31,7 @@ module B { } // no code gen expected -module C { +namespace C { >C : typeof C > : ^^^^^^^^ @@ -81,7 +81,7 @@ module C { } // no code gen expected -module D { +namespace D { >D : typeof D > : ^^^^^^^^ @@ -99,7 +99,7 @@ module D { } // no code gen expected -module E { +namespace E { >E : typeof E > : ^^^^^^^^ diff --git a/tests/baselines/reference/import_reference-exported-alias.js b/tests/baselines/reference/import_reference-exported-alias.js index f6ecff55a2400..3d9a6d18b2b28 100644 --- a/tests/baselines/reference/import_reference-exported-alias.js +++ b/tests/baselines/reference/import_reference-exported-alias.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/import_reference-exported-alias.ts] //// //// [file1.ts] -module App { - export module Services { +namespace App { + export namespace Services { export class UserServices { public getUserName(): string { return "Bill Gates"; diff --git a/tests/baselines/reference/import_reference-exported-alias.symbols b/tests/baselines/reference/import_reference-exported-alias.symbols index ddc823b994f56..0c209ef8329b1 100644 --- a/tests/baselines/reference/import_reference-exported-alias.symbols +++ b/tests/baselines/reference/import_reference-exported-alias.symbols @@ -7,12 +7,12 @@ import appJs = require("file1"); import Services = appJs.Services; >Services : Symbol(Services, Decl(file2.ts, 0, 32)) >appJs : Symbol(appJs, Decl(file2.ts, 0, 0)) ->Services : Symbol(appJs.Services, Decl(file1.ts, 0, 12)) +>Services : Symbol(appJs.Services, Decl(file1.ts, 0, 15)) import UserServices = Services.UserServices; >UserServices : Symbol(UserServices, Decl(file2.ts, 1, 33)) >Services : Symbol(Services, Decl(file2.ts, 0, 32)) ->UserServices : Symbol(Services.UserServices, Decl(file1.ts, 1, 28)) +>UserServices : Symbol(Services.UserServices, Decl(file1.ts, 1, 31)) var x = new UserServices().getUserName(); >x : Symbol(x, Decl(file2.ts, 3, 3)) @@ -21,14 +21,14 @@ var x = new UserServices().getUserName(); >getUserName : Symbol(Services.UserServices.getUserName, Decl(file1.ts, 2, 35)) === file1.ts === -module App { +namespace App { >App : Symbol(App, Decl(file1.ts, 0, 0)) - export module Services { ->Services : Symbol(Services, Decl(file1.ts, 0, 12)) + export namespace Services { +>Services : Symbol(Services, Decl(file1.ts, 0, 15)) export class UserServices { ->UserServices : Symbol(UserServices, Decl(file1.ts, 1, 28)) +>UserServices : Symbol(UserServices, Decl(file1.ts, 1, 31)) public getUserName(): string { >getUserName : Symbol(UserServices.getUserName, Decl(file1.ts, 2, 35)) diff --git a/tests/baselines/reference/import_reference-exported-alias.types b/tests/baselines/reference/import_reference-exported-alias.types index d2d317989b72a..f50bbe039f347 100644 --- a/tests/baselines/reference/import_reference-exported-alias.types +++ b/tests/baselines/reference/import_reference-exported-alias.types @@ -36,11 +36,11 @@ var x = new UserServices().getUserName(); > : ^^^^^^ === file1.ts === -module App { +namespace App { >App : typeof App > : ^^^^^^^^^^ - export module Services { + export namespace Services { >Services : typeof Services > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/import_reference-to-type-alias.js b/tests/baselines/reference/import_reference-to-type-alias.js index e35159bd0378e..c536a1341cfe1 100644 --- a/tests/baselines/reference/import_reference-to-type-alias.js +++ b/tests/baselines/reference/import_reference-to-type-alias.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/import_reference-to-type-alias.ts] //// //// [file1.ts] -export module App { - export module Services { +export namespace App { + export namespace Services { export class UserServices { public getUserName(): string { return "Bill Gates"; diff --git a/tests/baselines/reference/import_reference-to-type-alias.symbols b/tests/baselines/reference/import_reference-to-type-alias.symbols index 46a11701a3809..77c89c48ce03b 100644 --- a/tests/baselines/reference/import_reference-to-type-alias.symbols +++ b/tests/baselines/reference/import_reference-to-type-alias.symbols @@ -8,25 +8,25 @@ import Services = appJs.App.Services; >Services : Symbol(Services, Decl(file2.ts, 0, 32)) >appJs : Symbol(appJs, Decl(file2.ts, 0, 0)) >App : Symbol(appJs.App, Decl(file1.ts, 0, 0)) ->Services : Symbol(Services, Decl(file1.ts, 0, 19)) +>Services : Symbol(Services, Decl(file1.ts, 0, 22)) var x = new Services.UserServices().getUserName(); >x : Symbol(x, Decl(file2.ts, 2, 3)) >new Services.UserServices().getUserName : Symbol(Services.UserServices.getUserName, Decl(file1.ts, 2, 35)) ->Services.UserServices : Symbol(Services.UserServices, Decl(file1.ts, 1, 28)) +>Services.UserServices : Symbol(Services.UserServices, Decl(file1.ts, 1, 31)) >Services : Symbol(Services, Decl(file2.ts, 0, 32)) ->UserServices : Symbol(Services.UserServices, Decl(file1.ts, 1, 28)) +>UserServices : Symbol(Services.UserServices, Decl(file1.ts, 1, 31)) >getUserName : Symbol(Services.UserServices.getUserName, Decl(file1.ts, 2, 35)) === file1.ts === -export module App { +export namespace App { >App : Symbol(App, Decl(file1.ts, 0, 0)) - export module Services { ->Services : Symbol(Services, Decl(file1.ts, 0, 19)) + export namespace Services { +>Services : Symbol(Services, Decl(file1.ts, 0, 22)) export class UserServices { ->UserServices : Symbol(UserServices, Decl(file1.ts, 1, 28)) +>UserServices : Symbol(UserServices, Decl(file1.ts, 1, 31)) public getUserName(): string { >getUserName : Symbol(UserServices.getUserName, Decl(file1.ts, 2, 35)) diff --git a/tests/baselines/reference/import_reference-to-type-alias.types b/tests/baselines/reference/import_reference-to-type-alias.types index 0ee619113d5f1..bf144b154ae72 100644 --- a/tests/baselines/reference/import_reference-to-type-alias.types +++ b/tests/baselines/reference/import_reference-to-type-alias.types @@ -34,11 +34,11 @@ var x = new Services.UserServices().getUserName(); > : ^^^^^^ === file1.ts === -export module App { +export namespace App { >App : typeof App > : ^^^^^^^^^^ - export module Services { + export namespace Services { >Services : typeof Services > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/importedAliasesInTypePositions.errors.txt b/tests/baselines/reference/importedAliasesInTypePositions.errors.txt new file mode 100644 index 0000000000000..c8ad223d4e3d8 --- /dev/null +++ b/tests/baselines/reference/importedAliasesInTypePositions.errors.txt @@ -0,0 +1,31 @@ +file1.ts(1,8): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +file1.ts(1,25): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +file1.ts(1,32): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +file1.ts(1,36): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== file2.ts (0 errors) ==== + import RT_ALIAS = require("file1"); + import ReferredTo = RT_ALIAS.elaborate.nested.mod.name.ReferredTo; + + export namespace ImportingModule { + class UsesReferredType { + constructor(private referred: ReferredTo) { } + } + } +==== file1.ts (4 errors) ==== + export module elaborate.nested.mod.name { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export class ReferredTo { + doSomething(): void { + } + } + } + \ No newline at end of file diff --git a/tests/baselines/reference/importedAliasesInTypePositions.js b/tests/baselines/reference/importedAliasesInTypePositions.js index be1e73d2f4e1a..85640076be79b 100644 --- a/tests/baselines/reference/importedAliasesInTypePositions.js +++ b/tests/baselines/reference/importedAliasesInTypePositions.js @@ -12,7 +12,7 @@ export module elaborate.nested.mod.name { import RT_ALIAS = require("file1"); import ReferredTo = RT_ALIAS.elaborate.nested.mod.name.ReferredTo; -export module ImportingModule { +export namespace ImportingModule { class UsesReferredType { constructor(private referred: ReferredTo) { } } diff --git a/tests/baselines/reference/importedAliasesInTypePositions.symbols b/tests/baselines/reference/importedAliasesInTypePositions.symbols index 380ab750a8d18..51c0d128102f6 100644 --- a/tests/baselines/reference/importedAliasesInTypePositions.symbols +++ b/tests/baselines/reference/importedAliasesInTypePositions.symbols @@ -13,11 +13,11 @@ import ReferredTo = RT_ALIAS.elaborate.nested.mod.name.ReferredTo; >name : Symbol(RT_ALIAS.elaborate.nested.mod.name, Decl(file1.ts, 0, 35)) >ReferredTo : Symbol(ReferredTo, Decl(file1.ts, 0, 41)) -export module ImportingModule { +export namespace ImportingModule { >ImportingModule : Symbol(ImportingModule, Decl(file2.ts, 1, 66)) class UsesReferredType { ->UsesReferredType : Symbol(UsesReferredType, Decl(file2.ts, 3, 31)) +>UsesReferredType : Symbol(UsesReferredType, Decl(file2.ts, 3, 34)) constructor(private referred: ReferredTo) { } >referred : Symbol(UsesReferredType.referred, Decl(file2.ts, 5, 20)) diff --git a/tests/baselines/reference/importedAliasesInTypePositions.types b/tests/baselines/reference/importedAliasesInTypePositions.types index 447f29f2f07fe..9fd155211aecc 100644 --- a/tests/baselines/reference/importedAliasesInTypePositions.types +++ b/tests/baselines/reference/importedAliasesInTypePositions.types @@ -21,7 +21,7 @@ import ReferredTo = RT_ALIAS.elaborate.nested.mod.name.ReferredTo; >ReferredTo : ReferredTo > : ^^^^^^^^^^ -export module ImportingModule { +export namespace ImportingModule { >ImportingModule : typeof ImportingModule > : ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/importedModuleAddToGlobal.errors.txt b/tests/baselines/reference/importedModuleAddToGlobal.errors.txt index a32d53424e407..37e65602a93be 100644 --- a/tests/baselines/reference/importedModuleAddToGlobal.errors.txt +++ b/tests/baselines/reference/importedModuleAddToGlobal.errors.txt @@ -4,20 +4,20 @@ importedModuleAddToGlobal.ts(15,23): error TS2833: Cannot find namespace 'b'. Di ==== importedModuleAddToGlobal.ts (1 errors) ==== // Binding for an import statement in a typeref position is being added to the global scope // Shouldn't compile b.B is not defined in C - module A { + namespace A { import b = B; import c = C; } - module B { + namespace B { import a = A; export class B { } } - module C { + namespace C { import a = A; function hello(): b.B { return null; } ~ !!! error TS2833: Cannot find namespace 'b'. Did you mean 'B'? -!!! related TS2728 importedModuleAddToGlobal.ts:8:8: 'B' is declared here. +!!! related TS2728 importedModuleAddToGlobal.ts:8:11: 'B' is declared here. } \ No newline at end of file diff --git a/tests/baselines/reference/importedModuleAddToGlobal.js b/tests/baselines/reference/importedModuleAddToGlobal.js index c24bf67c94760..3cc0fc33f8bf1 100644 --- a/tests/baselines/reference/importedModuleAddToGlobal.js +++ b/tests/baselines/reference/importedModuleAddToGlobal.js @@ -3,17 +3,17 @@ //// [importedModuleAddToGlobal.ts] // Binding for an import statement in a typeref position is being added to the global scope // Shouldn't compile b.B is not defined in C -module A { +namespace A { import b = B; import c = C; } -module B { +namespace B { import a = A; export class B { } } -module C { +namespace C { import a = A; function hello(): b.B { return null; } } diff --git a/tests/baselines/reference/importedModuleAddToGlobal.symbols b/tests/baselines/reference/importedModuleAddToGlobal.symbols index f69c46d10711b..def1d433b54d3 100644 --- a/tests/baselines/reference/importedModuleAddToGlobal.symbols +++ b/tests/baselines/reference/importedModuleAddToGlobal.symbols @@ -3,11 +3,11 @@ === importedModuleAddToGlobal.ts === // Binding for an import statement in a typeref position is being added to the global scope // Shouldn't compile b.B is not defined in C -module A { +namespace A { >A : Symbol(A, Decl(importedModuleAddToGlobal.ts, 0, 0)) import b = B; ->b : Symbol(b, Decl(importedModuleAddToGlobal.ts, 2, 10)) +>b : Symbol(b, Decl(importedModuleAddToGlobal.ts, 2, 13)) >B : Symbol(b, Decl(importedModuleAddToGlobal.ts, 5, 1)) import c = C; @@ -15,22 +15,22 @@ module A { >C : Symbol(c, Decl(importedModuleAddToGlobal.ts, 10, 1)) } -module B { +namespace B { >B : Symbol(B, Decl(importedModuleAddToGlobal.ts, 5, 1)) import a = A; ->a : Symbol(a, Decl(importedModuleAddToGlobal.ts, 7, 10)) +>a : Symbol(a, Decl(importedModuleAddToGlobal.ts, 7, 13)) >A : Symbol(a, Decl(importedModuleAddToGlobal.ts, 0, 0)) export class B { } >B : Symbol(B, Decl(importedModuleAddToGlobal.ts, 8, 17)) } -module C { +namespace C { >C : Symbol(C, Decl(importedModuleAddToGlobal.ts, 10, 1)) import a = A; ->a : Symbol(a, Decl(importedModuleAddToGlobal.ts, 12, 10)) +>a : Symbol(a, Decl(importedModuleAddToGlobal.ts, 12, 13)) >A : Symbol(a, Decl(importedModuleAddToGlobal.ts, 0, 0)) function hello(): b.B { return null; } diff --git a/tests/baselines/reference/importedModuleAddToGlobal.types b/tests/baselines/reference/importedModuleAddToGlobal.types index f935bc74710e4..f8e3a82d5633d 100644 --- a/tests/baselines/reference/importedModuleAddToGlobal.types +++ b/tests/baselines/reference/importedModuleAddToGlobal.types @@ -3,7 +3,7 @@ === importedModuleAddToGlobal.ts === // Binding for an import statement in a typeref position is being added to the global scope // Shouldn't compile b.B is not defined in C -module A { +namespace A { import b = B; >b : typeof b > : ^^^^^^^^ @@ -17,7 +17,7 @@ module A { > : ^^^^^^^^ } -module B { +namespace B { >B : typeof globalThis.B > : ^^^^^^^^^^^^^^^^^^^ @@ -32,7 +32,7 @@ module B { > : ^ } -module C { +namespace C { >C : typeof C > : ^^^^^^^^ diff --git a/tests/baselines/reference/importedModuleClassNameClash.js b/tests/baselines/reference/importedModuleClassNameClash.js index e4d8ed3bc072b..c00d21540678d 100644 --- a/tests/baselines/reference/importedModuleClassNameClash.js +++ b/tests/baselines/reference/importedModuleClassNameClash.js @@ -3,7 +3,7 @@ //// [importedModuleClassNameClash.ts] import foo = m1; -export module m1 { } +export namespace m1 { } class foo { } diff --git a/tests/baselines/reference/importedModuleClassNameClash.symbols b/tests/baselines/reference/importedModuleClassNameClash.symbols index b6c1630e5e779..651d73786fbe6 100644 --- a/tests/baselines/reference/importedModuleClassNameClash.symbols +++ b/tests/baselines/reference/importedModuleClassNameClash.symbols @@ -2,12 +2,12 @@ === importedModuleClassNameClash.ts === import foo = m1; ->foo : Symbol(foo, Decl(importedModuleClassNameClash.ts, 0, 0), Decl(importedModuleClassNameClash.ts, 2, 20)) +>foo : Symbol(foo, Decl(importedModuleClassNameClash.ts, 0, 0), Decl(importedModuleClassNameClash.ts, 2, 23)) >m1 : Symbol(foo, Decl(importedModuleClassNameClash.ts, 0, 16)) -export module m1 { } +export namespace m1 { } >m1 : Symbol(foo, Decl(importedModuleClassNameClash.ts, 0, 16)) class foo { } ->foo : Symbol(foo, Decl(importedModuleClassNameClash.ts, 0, 0), Decl(importedModuleClassNameClash.ts, 2, 20)) +>foo : Symbol(foo, Decl(importedModuleClassNameClash.ts, 0, 0), Decl(importedModuleClassNameClash.ts, 2, 23)) diff --git a/tests/baselines/reference/importedModuleClassNameClash.types b/tests/baselines/reference/importedModuleClassNameClash.types index f37fab285be1d..5c51eb681617f 100644 --- a/tests/baselines/reference/importedModuleClassNameClash.types +++ b/tests/baselines/reference/importedModuleClassNameClash.types @@ -6,7 +6,7 @@ import foo = m1; > : ^^^^^^^^^^ >m1 : error -export module m1 { } +export namespace m1 { } class foo { } >foo : foo diff --git a/tests/baselines/reference/incompatibleExports1.errors.txt b/tests/baselines/reference/incompatibleExports1.errors.txt index f890ae46cc295..7d18b6f21aa00 100644 --- a/tests/baselines/reference/incompatibleExports1.errors.txt +++ b/tests/baselines/reference/incompatibleExports1.errors.txt @@ -12,11 +12,11 @@ incompatibleExports1.ts(16,5): error TS2309: An export assignment cannot be used } declare module "baz" { - export module a { + export namespace a { export var b: number; } - module c { + namespace c { export var c: string; } diff --git a/tests/baselines/reference/incompatibleExports1.js b/tests/baselines/reference/incompatibleExports1.js index ea907be634d51..765077fb459eb 100644 --- a/tests/baselines/reference/incompatibleExports1.js +++ b/tests/baselines/reference/incompatibleExports1.js @@ -8,11 +8,11 @@ declare module "foo" { } declare module "baz" { - export module a { + export namespace a { export var b: number; } - module c { + namespace c { export var c: string; } diff --git a/tests/baselines/reference/incompatibleExports1.symbols b/tests/baselines/reference/incompatibleExports1.symbols index 65fcc50a780f9..9e3a580ba4130 100644 --- a/tests/baselines/reference/incompatibleExports1.symbols +++ b/tests/baselines/reference/incompatibleExports1.symbols @@ -20,14 +20,14 @@ declare module "foo" { declare module "baz" { >"baz" : Symbol("baz", Decl(incompatibleExports1.ts, 4, 1)) - export module a { + export namespace a { >a : Symbol(a, Decl(incompatibleExports1.ts, 6, 22)) export var b: number; >b : Symbol(b, Decl(incompatibleExports1.ts, 8, 18)) } - module c { + namespace c { >c : Symbol(c, Decl(incompatibleExports1.ts, 9, 5)) export var c: string; diff --git a/tests/baselines/reference/incompatibleExports1.types b/tests/baselines/reference/incompatibleExports1.types index 197084d6dc9d3..fda258087846c 100644 --- a/tests/baselines/reference/incompatibleExports1.types +++ b/tests/baselines/reference/incompatibleExports1.types @@ -22,7 +22,7 @@ declare module "baz" { >"baz" : typeof import("baz") > : ^^^^^^^^^^^^^^^^^^^^ - export module a { + export namespace a { >a : typeof a > : ^^^^^^^^ @@ -31,7 +31,7 @@ declare module "baz" { > : ^^^^^^ } - module c { + namespace c { >c : typeof import("baz") > : ^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherType.js b/tests/baselines/reference/incrementOperatorWithAnyOtherType.js index dc67db9ab47c9..c7f03708c9a7b 100644 --- a/tests/baselines/reference/incrementOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/incrementOperatorWithAnyOtherType.js @@ -10,7 +10,7 @@ var obj = {x:1,y:null}; class A { public a: any; } -module M { +namespace M { export var n: any; } var objA = new A(); diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherType.symbols b/tests/baselines/reference/incrementOperatorWithAnyOtherType.symbols index 4eb9405001aca..2b9553aeef498 100644 --- a/tests/baselines/reference/incrementOperatorWithAnyOtherType.symbols +++ b/tests/baselines/reference/incrementOperatorWithAnyOtherType.symbols @@ -23,7 +23,7 @@ class A { public a: any; >a : Symbol(A.a, Decl(incrementOperatorWithAnyOtherType.ts, 6, 9)) } -module M { +namespace M { >M : Symbol(M, Decl(incrementOperatorWithAnyOtherType.ts, 8, 1)) export var n: any; diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherType.types b/tests/baselines/reference/incrementOperatorWithAnyOtherType.types index d71b8b164396a..8724dcb0de128 100644 --- a/tests/baselines/reference/incrementOperatorWithAnyOtherType.types +++ b/tests/baselines/reference/incrementOperatorWithAnyOtherType.types @@ -38,7 +38,7 @@ class A { public a: any; >a : any } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.errors.txt b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.errors.txt index 5992663378457..8bd403848a43c 100644 --- a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.errors.txt +++ b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.errors.txt @@ -65,7 +65,7 @@ incrementOperatorWithAnyOtherTypeInvalidOperations.ts(69,12): error TS1109: Expr return a; } } - module M { + namespace M { export var n: any; } var objA = new A(); diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js index a8be0623883fb..ce1fd88c81a92 100644 --- a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js +++ b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js @@ -18,7 +18,7 @@ class A { return a; } } -module M { +namespace M { export var n: any; } var objA = new A(); diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.symbols b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.symbols index 4f4a42b114232..1b82da655a090 100644 --- a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.symbols +++ b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.symbols @@ -41,7 +41,7 @@ class A { >a : Symbol(a, Decl(incrementOperatorWithAnyOtherTypeInvalidOperations.ts, 13, 11)) } } -module M { +namespace M { >M : Symbol(M, Decl(incrementOperatorWithAnyOtherTypeInvalidOperations.ts, 16, 1)) export var n: any; diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.types b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.types index 03e41340c7ee1..fa4e72b53982d 100644 --- a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.types +++ b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.types @@ -67,7 +67,7 @@ class A { > : ^^^ } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/incrementOperatorWithNumberType.js b/tests/baselines/reference/incrementOperatorWithNumberType.js index 693211013e049..ea52e517add85 100644 --- a/tests/baselines/reference/incrementOperatorWithNumberType.js +++ b/tests/baselines/reference/incrementOperatorWithNumberType.js @@ -8,7 +8,7 @@ var NUMBER1: number[] = [1, 2]; class A { public a: number; } -module M { +namespace M { export var n: number; } diff --git a/tests/baselines/reference/incrementOperatorWithNumberType.symbols b/tests/baselines/reference/incrementOperatorWithNumberType.symbols index fcff3e5c8e5ab..f15caead7e395 100644 --- a/tests/baselines/reference/incrementOperatorWithNumberType.symbols +++ b/tests/baselines/reference/incrementOperatorWithNumberType.symbols @@ -14,7 +14,7 @@ class A { public a: number; >a : Symbol(A.a, Decl(incrementOperatorWithNumberType.ts, 4, 9)) } -module M { +namespace M { >M : Symbol(M, Decl(incrementOperatorWithNumberType.ts, 6, 1)) export var n: number; diff --git a/tests/baselines/reference/incrementOperatorWithNumberType.types b/tests/baselines/reference/incrementOperatorWithNumberType.types index 0adfbb7fb9d97..761a3b087d280 100644 --- a/tests/baselines/reference/incrementOperatorWithNumberType.types +++ b/tests/baselines/reference/incrementOperatorWithNumberType.types @@ -24,7 +24,7 @@ class A { >a : number > : ^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.errors.txt b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.errors.txt index 0b96118b62cf0..589c5ef11b2ea 100644 --- a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.errors.txt +++ b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.errors.txt @@ -31,7 +31,7 @@ incrementOperatorWithNumberTypeInvalidOperations.ts(46,1): error TS2357: The ope public a: number; static foo() { return 1; } } - module M { + namespace M { export var n: number; } diff --git a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js index 690afd099ee80..e9f69783d5c76 100644 --- a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js +++ b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js @@ -11,7 +11,7 @@ class A { public a: number; static foo() { return 1; } } -module M { +namespace M { export var n: number; } diff --git a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.symbols b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.symbols index a8c86f75db68a..267b32bfccdf0 100644 --- a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.symbols +++ b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.symbols @@ -20,7 +20,7 @@ class A { static foo() { return 1; } >foo : Symbol(A.foo, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 7, 21)) } -module M { +namespace M { >M : Symbol(M, Decl(incrementOperatorWithNumberTypeInvalidOperations.ts, 9, 1)) export var n: number; diff --git a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.types b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.types index 299a8e780b006..11d273f909122 100644 --- a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.types +++ b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.types @@ -36,7 +36,7 @@ class A { >1 : 1 > : ^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.errors.txt b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.errors.txt index d4dd02cbb079f..9d8b72b35da29 100644 --- a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.errors.txt +++ b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.errors.txt @@ -39,7 +39,7 @@ incrementOperatorWithUnsupportedBooleanType.ts(54,11): error TS2356: An arithmet public a: boolean; static foo() { return true; } } - module M { + namespace M { export var n: boolean; } diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js index bec86882e62d4..2b9df4f9d0906 100644 --- a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js +++ b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js @@ -10,7 +10,7 @@ class A { public a: boolean; static foo() { return true; } } -module M { +namespace M { export var n: boolean; } diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.symbols b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.symbols index 9da21cc8bcb67..dc5fd80c7f433 100644 --- a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.symbols +++ b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.symbols @@ -17,7 +17,7 @@ class A { static foo() { return true; } >foo : Symbol(A.foo, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 6, 22)) } -module M { +namespace M { >M : Symbol(M, Decl(incrementOperatorWithUnsupportedBooleanType.ts, 8, 1)) export var n: boolean; diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.types b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.types index dddb7b2114d85..791de200216f3 100644 --- a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.types +++ b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.types @@ -26,7 +26,7 @@ class A { >true : true > : ^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.errors.txt b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.errors.txt index 315c8a46200f4..5e4aae9d0932d 100644 --- a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.errors.txt +++ b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.errors.txt @@ -50,7 +50,7 @@ incrementOperatorWithUnsupportedStringType.ts(65,11): error TS2356: An arithmeti public a: string; static foo() { return ""; } } - module M { + namespace M { export var n: string; } diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js index 0c646f46344f3..97750fb3cf86d 100644 --- a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js +++ b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js @@ -11,7 +11,7 @@ class A { public a: string; static foo() { return ""; } } -module M { +namespace M { export var n: string; } diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.symbols b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.symbols index de5a91a4d0848..82fd057ea1c80 100644 --- a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.symbols +++ b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.symbols @@ -20,7 +20,7 @@ class A { static foo() { return ""; } >foo : Symbol(A.foo, Decl(incrementOperatorWithUnsupportedStringType.ts, 7, 21)) } -module M { +namespace M { >M : Symbol(M, Decl(incrementOperatorWithUnsupportedStringType.ts, 9, 1)) export var n: string; diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.types b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.types index c5396240487f1..6a148ce475c96 100644 --- a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.types +++ b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.types @@ -36,7 +36,7 @@ class A { >"" : "" > : ^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/indexIntoEnum.js b/tests/baselines/reference/indexIntoEnum.js index b86dba826642a..d3b226f3efb58 100644 --- a/tests/baselines/reference/indexIntoEnum.js +++ b/tests/baselines/reference/indexIntoEnum.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/indexIntoEnum.ts] //// //// [indexIntoEnum.ts] -module M { +namespace M { enum E { } diff --git a/tests/baselines/reference/indexIntoEnum.symbols b/tests/baselines/reference/indexIntoEnum.symbols index 52f901fc02fcc..7e212ea907d02 100644 --- a/tests/baselines/reference/indexIntoEnum.symbols +++ b/tests/baselines/reference/indexIntoEnum.symbols @@ -1,13 +1,13 @@ //// [tests/cases/compiler/indexIntoEnum.ts] //// === indexIntoEnum.ts === -module M { +namespace M { >M : Symbol(M, Decl(indexIntoEnum.ts, 0, 0)) enum E { } ->E : Symbol(E, Decl(indexIntoEnum.ts, 0, 10)) +>E : Symbol(E, Decl(indexIntoEnum.ts, 0, 13)) var x = E[0]; >x : Symbol(x, Decl(indexIntoEnum.ts, 4, 7)) ->E : Symbol(E, Decl(indexIntoEnum.ts, 0, 10)) +>E : Symbol(E, Decl(indexIntoEnum.ts, 0, 13)) } diff --git a/tests/baselines/reference/indexIntoEnum.types b/tests/baselines/reference/indexIntoEnum.types index e07f5c5be2ca4..fa8bedf3b888d 100644 --- a/tests/baselines/reference/indexIntoEnum.types +++ b/tests/baselines/reference/indexIntoEnum.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/indexIntoEnum.ts] //// === indexIntoEnum.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js index 1e341c6c18380..79cfcdf721c17 100644 --- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js +++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/inheritanceOfGenericConstructorMethod2.ts] //// //// [inheritanceOfGenericConstructorMethod2.ts] -module M { +namespace M { export class C1 { } export class C2 { } } -module N { +namespace N { export class D1 extends M.C1 { } export class D2 extends M.C2 { } } diff --git a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.symbols b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.symbols index cb5ab879b94c7..a746da5b1f998 100644 --- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.symbols +++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.symbols @@ -1,24 +1,24 @@ //// [tests/cases/compiler/inheritanceOfGenericConstructorMethod2.ts] //// === inheritanceOfGenericConstructorMethod2.ts === -module M { +namespace M { >M : Symbol(M, Decl(inheritanceOfGenericConstructorMethod2.ts, 0, 0)) export class C1 { } ->C1 : Symbol(C1, Decl(inheritanceOfGenericConstructorMethod2.ts, 0, 10)) +>C1 : Symbol(C1, Decl(inheritanceOfGenericConstructorMethod2.ts, 0, 13)) export class C2 { } >C2 : Symbol(C2, Decl(inheritanceOfGenericConstructorMethod2.ts, 1, 22)) >T : Symbol(T, Decl(inheritanceOfGenericConstructorMethod2.ts, 2, 19)) } -module N { +namespace N { >N : Symbol(N, Decl(inheritanceOfGenericConstructorMethod2.ts, 3, 1)) export class D1 extends M.C1 { } ->D1 : Symbol(D1, Decl(inheritanceOfGenericConstructorMethod2.ts, 4, 10)) ->M.C1 : Symbol(M.C1, Decl(inheritanceOfGenericConstructorMethod2.ts, 0, 10)) +>D1 : Symbol(D1, Decl(inheritanceOfGenericConstructorMethod2.ts, 4, 13)) +>M.C1 : Symbol(M.C1, Decl(inheritanceOfGenericConstructorMethod2.ts, 0, 13)) >M : Symbol(M, Decl(inheritanceOfGenericConstructorMethod2.ts, 0, 0)) ->C1 : Symbol(M.C1, Decl(inheritanceOfGenericConstructorMethod2.ts, 0, 10)) +>C1 : Symbol(M.C1, Decl(inheritanceOfGenericConstructorMethod2.ts, 0, 13)) export class D2 extends M.C2 { } >D2 : Symbol(D2, Decl(inheritanceOfGenericConstructorMethod2.ts, 5, 35)) @@ -37,9 +37,9 @@ var c = new M.C2(); // no error var n = new N.D1(); // no error >n : Symbol(n, Decl(inheritanceOfGenericConstructorMethod2.ts, 10, 3)) ->N.D1 : Symbol(N.D1, Decl(inheritanceOfGenericConstructorMethod2.ts, 4, 10)) +>N.D1 : Symbol(N.D1, Decl(inheritanceOfGenericConstructorMethod2.ts, 4, 13)) >N : Symbol(N, Decl(inheritanceOfGenericConstructorMethod2.ts, 3, 1)) ->D1 : Symbol(N.D1, Decl(inheritanceOfGenericConstructorMethod2.ts, 4, 10)) +>D1 : Symbol(N.D1, Decl(inheritanceOfGenericConstructorMethod2.ts, 4, 13)) var n2 = new N.D2(); // error >n2 : Symbol(n2, Decl(inheritanceOfGenericConstructorMethod2.ts, 11, 3)) diff --git a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types index 5921d9640b9c1..f8a3ee3156642 100644 --- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types +++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/inheritanceOfGenericConstructorMethod2.ts] //// === inheritanceOfGenericConstructorMethod2.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -13,7 +13,7 @@ module M { >C2 : C2 > : ^^^^^ } -module N { +namespace N { >N : typeof N > : ^^^^^^^^ diff --git a/tests/baselines/reference/inheritedModuleMembersForClodule.errors.txt b/tests/baselines/reference/inheritedModuleMembersForClodule.errors.txt index a5bd20735e4e3..4e222f278f3a5 100644 --- a/tests/baselines/reference/inheritedModuleMembersForClodule.errors.txt +++ b/tests/baselines/reference/inheritedModuleMembersForClodule.errors.txt @@ -17,7 +17,7 @@ inheritedModuleMembersForClodule.ts(7,7): error TS2417: Class static side 'typeo !!! error TS2417: Type 'number' is not assignable to type 'string'. } - module D { + namespace D { export function foo(): number { return 0; }; diff --git a/tests/baselines/reference/inheritedModuleMembersForClodule.js b/tests/baselines/reference/inheritedModuleMembersForClodule.js index 51d17fa09af4a..c918ed1b2f901 100644 --- a/tests/baselines/reference/inheritedModuleMembersForClodule.js +++ b/tests/baselines/reference/inheritedModuleMembersForClodule.js @@ -10,7 +10,7 @@ class C { class D extends C { } -module D { +namespace D { export function foo(): number { return 0; }; diff --git a/tests/baselines/reference/inheritedModuleMembersForClodule.symbols b/tests/baselines/reference/inheritedModuleMembersForClodule.symbols index 03b8d9c6c3142..de30ad3d2f05c 100644 --- a/tests/baselines/reference/inheritedModuleMembersForClodule.symbols +++ b/tests/baselines/reference/inheritedModuleMembersForClodule.symbols @@ -16,11 +16,11 @@ class D extends C { >C : Symbol(C, Decl(inheritedModuleMembersForClodule.ts, 0, 0)) } -module D { +namespace D { >D : Symbol(D, Decl(inheritedModuleMembersForClodule.ts, 4, 1), Decl(inheritedModuleMembersForClodule.ts, 7, 1)) export function foo(): number { ->foo : Symbol(foo, Decl(inheritedModuleMembersForClodule.ts, 9, 10)) +>foo : Symbol(foo, Decl(inheritedModuleMembersForClodule.ts, 9, 13)) return 0; }; @@ -34,9 +34,9 @@ class E extends D { >bar : Symbol(E.bar, Decl(inheritedModuleMembersForClodule.ts, 15, 19)) return this.foo(); ->this.foo : Symbol(D.foo, Decl(inheritedModuleMembersForClodule.ts, 9, 10)) +>this.foo : Symbol(D.foo, Decl(inheritedModuleMembersForClodule.ts, 9, 13)) >this : Symbol(E, Decl(inheritedModuleMembersForClodule.ts, 13, 1)) ->foo : Symbol(D.foo, Decl(inheritedModuleMembersForClodule.ts, 9, 10)) +>foo : Symbol(D.foo, Decl(inheritedModuleMembersForClodule.ts, 9, 13)) } } diff --git a/tests/baselines/reference/inheritedModuleMembersForClodule.types b/tests/baselines/reference/inheritedModuleMembersForClodule.types index 08dad5b828d18..a663ac9c0eafb 100644 --- a/tests/baselines/reference/inheritedModuleMembersForClodule.types +++ b/tests/baselines/reference/inheritedModuleMembersForClodule.types @@ -22,7 +22,7 @@ class D extends C { > : ^ } -module D { +namespace D { >D : typeof D > : ^^^^^^^^ diff --git a/tests/baselines/reference/initializersInDeclarations.errors.txt b/tests/baselines/reference/initializersInDeclarations.errors.txt index e50542fa18c7a..4416302ea1372 100644 --- a/tests/baselines/reference/initializersInDeclarations.errors.txt +++ b/tests/baselines/reference/initializersInDeclarations.errors.txt @@ -31,7 +31,7 @@ file1.d.ts(17,18): error TS1039: Initializers are not allowed in ambient context ~~ !!! error TS1039: Initializers are not allowed in ambient contexts. - declare module M1 { + declare namespace M1 { while(true); ~~~~~ !!! error TS1036: Statements are not allowed in ambient contexts. diff --git a/tests/baselines/reference/initializersInDeclarations.symbols b/tests/baselines/reference/initializersInDeclarations.symbols index 044755ff6d38f..bd86cadef213b 100644 --- a/tests/baselines/reference/initializersInDeclarations.symbols +++ b/tests/baselines/reference/initializersInDeclarations.symbols @@ -25,7 +25,7 @@ declare var x = []; declare var y = {}; >y : Symbol(y, Decl(file1.d.ts, 11, 11)) -declare module M1 { +declare namespace M1 { >M1 : Symbol(M1, Decl(file1.d.ts, 11, 19)) while(true); diff --git a/tests/baselines/reference/initializersInDeclarations.types b/tests/baselines/reference/initializersInDeclarations.types index a12a37ea2e466..cb3130dee8f1a 100644 --- a/tests/baselines/reference/initializersInDeclarations.types +++ b/tests/baselines/reference/initializersInDeclarations.types @@ -41,7 +41,7 @@ declare var y = {}; >{} : {} > : ^^ -declare module M1 { +declare namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/innerAliases.errors.txt b/tests/baselines/reference/innerAliases.errors.txt index 5f525bf3d9680..3d1be51e5e8c0 100644 --- a/tests/baselines/reference/innerAliases.errors.txt +++ b/tests/baselines/reference/innerAliases.errors.txt @@ -3,20 +3,20 @@ innerAliases.ts(21,11): error TS2339: Property 'inner' does not exist on type 't ==== innerAliases.ts (2 errors) ==== - module A { - export module B { - export module C { + namespace A { + export namespace B { + export namespace C { export class Class1 {} } } } - module D { + namespace D { import inner = A.B.C; var c1 = new inner.Class1(); - export module E { + export namespace E { export class Class2 {} } } diff --git a/tests/baselines/reference/innerAliases.js b/tests/baselines/reference/innerAliases.js index 73d528367fa96..5dd3c2f7ac8c7 100644 --- a/tests/baselines/reference/innerAliases.js +++ b/tests/baselines/reference/innerAliases.js @@ -1,20 +1,20 @@ //// [tests/cases/compiler/innerAliases.ts] //// //// [innerAliases.ts] -module A { - export module B { - export module C { +namespace A { + export namespace B { + export namespace C { export class Class1 {} } } } -module D { +namespace D { import inner = A.B.C; var c1 = new inner.Class1(); - export module E { + export namespace E { export class Class2 {} } } diff --git a/tests/baselines/reference/innerAliases.symbols b/tests/baselines/reference/innerAliases.symbols index a0d6e72e045d8..4437fc6189308 100644 --- a/tests/baselines/reference/innerAliases.symbols +++ b/tests/baselines/reference/innerAliases.symbols @@ -1,41 +1,41 @@ //// [tests/cases/compiler/innerAliases.ts] //// === innerAliases.ts === -module A { +namespace A { >A : Symbol(A, Decl(innerAliases.ts, 0, 0)) - export module B { ->B : Symbol(B, Decl(innerAliases.ts, 0, 10)) + export namespace B { +>B : Symbol(B, Decl(innerAliases.ts, 0, 13)) - export module C { ->C : Symbol(C, Decl(innerAliases.ts, 1, 21)) + export namespace C { +>C : Symbol(C, Decl(innerAliases.ts, 1, 24)) export class Class1 {} ->Class1 : Symbol(Class1, Decl(innerAliases.ts, 2, 25)) +>Class1 : Symbol(Class1, Decl(innerAliases.ts, 2, 28)) } } } -module D { +namespace D { >D : Symbol(D, Decl(innerAliases.ts, 6, 1)) import inner = A.B.C; ->inner : Symbol(inner, Decl(innerAliases.ts, 8, 10)) +>inner : Symbol(inner, Decl(innerAliases.ts, 8, 13)) >A : Symbol(A, Decl(innerAliases.ts, 0, 0)) ->B : Symbol(A.B, Decl(innerAliases.ts, 0, 10)) ->C : Symbol(inner, Decl(innerAliases.ts, 1, 21)) +>B : Symbol(A.B, Decl(innerAliases.ts, 0, 13)) +>C : Symbol(inner, Decl(innerAliases.ts, 1, 24)) var c1 = new inner.Class1(); >c1 : Symbol(c1, Decl(innerAliases.ts, 11, 7)) ->inner.Class1 : Symbol(inner.Class1, Decl(innerAliases.ts, 2, 25)) ->inner : Symbol(inner, Decl(innerAliases.ts, 8, 10)) ->Class1 : Symbol(inner.Class1, Decl(innerAliases.ts, 2, 25)) +>inner.Class1 : Symbol(inner.Class1, Decl(innerAliases.ts, 2, 28)) +>inner : Symbol(inner, Decl(innerAliases.ts, 8, 13)) +>Class1 : Symbol(inner.Class1, Decl(innerAliases.ts, 2, 28)) - export module E { + export namespace E { >E : Symbol(E, Decl(innerAliases.ts, 11, 32)) export class Class2 {} ->Class2 : Symbol(Class2, Decl(innerAliases.ts, 13, 21)) +>Class2 : Symbol(Class2, Decl(innerAliases.ts, 13, 24)) } } diff --git a/tests/baselines/reference/innerAliases.types b/tests/baselines/reference/innerAliases.types index e4bf7128e5b33..09ff092df5cc6 100644 --- a/tests/baselines/reference/innerAliases.types +++ b/tests/baselines/reference/innerAliases.types @@ -1,15 +1,15 @@ //// [tests/cases/compiler/innerAliases.ts] //// === innerAliases.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ - export module B { + export namespace B { >B : typeof B > : ^^^^^^^^ - export module C { + export namespace C { >C : typeof C > : ^^^^^^^^ @@ -20,7 +20,7 @@ module A { } } -module D { +namespace D { >D : typeof D > : ^^^^^^^^ @@ -46,7 +46,7 @@ module D { >Class1 : typeof inner.Class1 > : ^^^^^^^^^^^^^^^^^^^ - export module E { + export namespace E { >E : typeof E > : ^^^^^^^^ diff --git a/tests/baselines/reference/innerAliases2.js b/tests/baselines/reference/innerAliases2.js index 138be9155c9ad..8a93d8debc664 100644 --- a/tests/baselines/reference/innerAliases2.js +++ b/tests/baselines/reference/innerAliases2.js @@ -1,14 +1,14 @@ //// [tests/cases/compiler/innerAliases2.ts] //// //// [innerAliases2.ts] -module _provider { +namespace _provider { export class UsefulClass { public foo() { } } } -module consumer { +namespace consumer { import provider = _provider; var g:provider.UsefulClass= null; diff --git a/tests/baselines/reference/innerAliases2.symbols b/tests/baselines/reference/innerAliases2.symbols index 4a0587266b430..e363910e46804 100644 --- a/tests/baselines/reference/innerAliases2.symbols +++ b/tests/baselines/reference/innerAliases2.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/innerAliases2.ts] //// === innerAliases2.ts === -module _provider { +namespace _provider { >_provider : Symbol(_provider, Decl(innerAliases2.ts, 0, 0)) export class UsefulClass { ->UsefulClass : Symbol(UsefulClass, Decl(innerAliases2.ts, 0, 18)) +>UsefulClass : Symbol(UsefulClass, Decl(innerAliases2.ts, 0, 21)) public foo() { >foo : Symbol(UsefulClass.foo, Decl(innerAliases2.ts, 1, 42)) @@ -13,30 +13,30 @@ module _provider { } } -module consumer { +namespace consumer { >consumer : Symbol(consumer, Decl(innerAliases2.ts, 5, 1)) import provider = _provider; ->provider : Symbol(provider, Decl(innerAliases2.ts, 7, 17)) +>provider : Symbol(provider, Decl(innerAliases2.ts, 7, 20)) >_provider : Symbol(provider, Decl(innerAliases2.ts, 0, 0)) var g:provider.UsefulClass= null; >g : Symbol(g, Decl(innerAliases2.ts, 10, 19)) ->provider : Symbol(provider, Decl(innerAliases2.ts, 7, 17)) ->UsefulClass : Symbol(provider.UsefulClass, Decl(innerAliases2.ts, 0, 18)) +>provider : Symbol(provider, Decl(innerAliases2.ts, 7, 20)) +>UsefulClass : Symbol(provider.UsefulClass, Decl(innerAliases2.ts, 0, 21)) function use():provider.UsefulClass { >use : Symbol(use, Decl(innerAliases2.ts, 10, 49)) ->provider : Symbol(provider, Decl(innerAliases2.ts, 7, 17)) ->UsefulClass : Symbol(provider.UsefulClass, Decl(innerAliases2.ts, 0, 18)) +>provider : Symbol(provider, Decl(innerAliases2.ts, 7, 20)) +>UsefulClass : Symbol(provider.UsefulClass, Decl(innerAliases2.ts, 0, 21)) var p2:provider.UsefulClass= new provider.UsefulClass(); >p2 : Symbol(p2, Decl(innerAliases2.ts, 13, 35)) ->provider : Symbol(provider, Decl(innerAliases2.ts, 7, 17)) ->UsefulClass : Symbol(provider.UsefulClass, Decl(innerAliases2.ts, 0, 18)) ->provider.UsefulClass : Symbol(provider.UsefulClass, Decl(innerAliases2.ts, 0, 18)) ->provider : Symbol(provider, Decl(innerAliases2.ts, 7, 17)) ->UsefulClass : Symbol(provider.UsefulClass, Decl(innerAliases2.ts, 0, 18)) +>provider : Symbol(provider, Decl(innerAliases2.ts, 7, 20)) +>UsefulClass : Symbol(provider.UsefulClass, Decl(innerAliases2.ts, 0, 21)) +>provider.UsefulClass : Symbol(provider.UsefulClass, Decl(innerAliases2.ts, 0, 21)) +>provider : Symbol(provider, Decl(innerAliases2.ts, 7, 20)) +>UsefulClass : Symbol(provider.UsefulClass, Decl(innerAliases2.ts, 0, 21)) return p2; >p2 : Symbol(p2, Decl(innerAliases2.ts, 13, 35)) diff --git a/tests/baselines/reference/innerAliases2.types b/tests/baselines/reference/innerAliases2.types index 210296ac6192a..0c2fad0248e7d 100644 --- a/tests/baselines/reference/innerAliases2.types +++ b/tests/baselines/reference/innerAliases2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/innerAliases2.ts] //// === innerAliases2.ts === -module _provider { +namespace _provider { >_provider : typeof _provider > : ^^^^^^^^^^^^^^^^ @@ -16,7 +16,7 @@ module _provider { } } -module consumer { +namespace consumer { >consumer : typeof consumer > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/innerBoundLambdaEmit.js b/tests/baselines/reference/innerBoundLambdaEmit.js index a4e3678211997..78813eeb3565c 100644 --- a/tests/baselines/reference/innerBoundLambdaEmit.js +++ b/tests/baselines/reference/innerBoundLambdaEmit.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/innerBoundLambdaEmit.ts] //// //// [innerBoundLambdaEmit.ts] -module M { +namespace M { export class Foo { } var bar = () => { }; diff --git a/tests/baselines/reference/innerBoundLambdaEmit.symbols b/tests/baselines/reference/innerBoundLambdaEmit.symbols index 272bfb58b1445..6c0a30b71b56e 100644 --- a/tests/baselines/reference/innerBoundLambdaEmit.symbols +++ b/tests/baselines/reference/innerBoundLambdaEmit.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/innerBoundLambdaEmit.ts] //// === innerBoundLambdaEmit.ts === -module M { +namespace M { >M : Symbol(M, Decl(innerBoundLambdaEmit.ts, 0, 0)) export class Foo { ->Foo : Symbol(Foo, Decl(innerBoundLambdaEmit.ts, 0, 10)) +>Foo : Symbol(Foo, Decl(innerBoundLambdaEmit.ts, 0, 13)) } var bar = () => { }; >bar : Symbol(bar, Decl(innerBoundLambdaEmit.ts, 3, 7)) @@ -17,6 +17,6 @@ interface Array { toFoo(): M.Foo >toFoo : Symbol(Array.toFoo, Decl(innerBoundLambdaEmit.ts, 5, 20)) >M : Symbol(M, Decl(innerBoundLambdaEmit.ts, 0, 0)) ->Foo : Symbol(M.Foo, Decl(innerBoundLambdaEmit.ts, 0, 10)) +>Foo : Symbol(M.Foo, Decl(innerBoundLambdaEmit.ts, 0, 13)) } diff --git a/tests/baselines/reference/innerBoundLambdaEmit.types b/tests/baselines/reference/innerBoundLambdaEmit.types index 02a261ca0345e..9e1ddc30045c7 100644 --- a/tests/baselines/reference/innerBoundLambdaEmit.types +++ b/tests/baselines/reference/innerBoundLambdaEmit.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/innerBoundLambdaEmit.ts] //// === innerBoundLambdaEmit.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/innerExtern.js b/tests/baselines/reference/innerExtern.js index f86aecde521df..de38c2a0c5a71 100644 --- a/tests/baselines/reference/innerExtern.js +++ b/tests/baselines/reference/innerExtern.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/innerExtern.ts] //// //// [innerExtern.ts] -module A { - export declare module BB { +namespace A { + export declare namespace BB { export var Elephant; } - export module B { + export namespace B { export class C { x = BB.Elephant.X; } diff --git a/tests/baselines/reference/innerExtern.symbols b/tests/baselines/reference/innerExtern.symbols index 440517ebf2ce7..e123805e41338 100644 --- a/tests/baselines/reference/innerExtern.symbols +++ b/tests/baselines/reference/innerExtern.symbols @@ -1,25 +1,25 @@ //// [tests/cases/compiler/innerExtern.ts] //// === innerExtern.ts === -module A { +namespace A { >A : Symbol(A, Decl(innerExtern.ts, 0, 0)) - export declare module BB { ->BB : Symbol(BB, Decl(innerExtern.ts, 0, 10)) + export declare namespace BB { +>BB : Symbol(BB, Decl(innerExtern.ts, 0, 13)) export var Elephant; >Elephant : Symbol(Elephant, Decl(innerExtern.ts, 2, 18)) } - export module B { + export namespace B { >B : Symbol(B, Decl(innerExtern.ts, 3, 5)) export class C { ->C : Symbol(C, Decl(innerExtern.ts, 4, 21)) +>C : Symbol(C, Decl(innerExtern.ts, 4, 24)) x = BB.Elephant.X; >x : Symbol(C.x, Decl(innerExtern.ts, 5, 24)) >BB.Elephant : Symbol(BB.Elephant, Decl(innerExtern.ts, 2, 18)) ->BB : Symbol(BB, Decl(innerExtern.ts, 0, 10)) +>BB : Symbol(BB, Decl(innerExtern.ts, 0, 13)) >Elephant : Symbol(BB.Elephant, Decl(innerExtern.ts, 2, 18)) } } diff --git a/tests/baselines/reference/innerExtern.types b/tests/baselines/reference/innerExtern.types index 8c6a857d3906d..d5bd84d636f9b 100644 --- a/tests/baselines/reference/innerExtern.types +++ b/tests/baselines/reference/innerExtern.types @@ -1,18 +1,18 @@ //// [tests/cases/compiler/innerExtern.ts] //// === innerExtern.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ - export declare module BB { + export declare namespace BB { >BB : typeof BB > : ^^^^^^^^^ export var Elephant; >Elephant : any } - export module B { + export namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/innerFunc.js b/tests/baselines/reference/innerFunc.js index 41116efabc662..db475fa7537ca 100644 --- a/tests/baselines/reference/innerFunc.js +++ b/tests/baselines/reference/innerFunc.js @@ -6,7 +6,7 @@ function salt() { return pepper(); } -module M { +namespace M { export function tungsten() { function oxygen() { return 6; }; return oxygen(); diff --git a/tests/baselines/reference/innerFunc.symbols b/tests/baselines/reference/innerFunc.symbols index c4c8f35117f9c..a0b5b9b7f44c7 100644 --- a/tests/baselines/reference/innerFunc.symbols +++ b/tests/baselines/reference/innerFunc.symbols @@ -11,11 +11,11 @@ function salt() { >pepper : Symbol(pepper, Decl(innerFunc.ts, 0, 17)) } -module M { +namespace M { >M : Symbol(M, Decl(innerFunc.ts, 3, 1)) export function tungsten() { ->tungsten : Symbol(tungsten, Decl(innerFunc.ts, 5, 10)) +>tungsten : Symbol(tungsten, Decl(innerFunc.ts, 5, 13)) function oxygen() { return 6; }; >oxygen : Symbol(oxygen, Decl(innerFunc.ts, 6, 32)) diff --git a/tests/baselines/reference/innerFunc.types b/tests/baselines/reference/innerFunc.types index 79444368923f2..ba5492a793290 100644 --- a/tests/baselines/reference/innerFunc.types +++ b/tests/baselines/reference/innerFunc.types @@ -18,7 +18,7 @@ function salt() { > : ^^^^^^^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/innerModExport1.errors.txt b/tests/baselines/reference/innerModExport1.errors.txt index 1aa62fd7d503a..6ff7e61c1650c 100644 --- a/tests/baselines/reference/innerModExport1.errors.txt +++ b/tests/baselines/reference/innerModExport1.errors.txt @@ -3,7 +3,7 @@ innerModExport1.ts(5,12): error TS1437: Namespace must be given a name. ==== innerModExport1.ts (2 errors) ==== - module Outer { + namespace Outer { // inner mod 1 var non_export_var: number; diff --git a/tests/baselines/reference/innerModExport1.js b/tests/baselines/reference/innerModExport1.js index 52ebf05d5b8f6..ff25d55c11924 100644 --- a/tests/baselines/reference/innerModExport1.js +++ b/tests/baselines/reference/innerModExport1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/innerModExport1.ts] //// //// [innerModExport1.ts] -module Outer { +namespace Outer { // inner mod 1 var non_export_var: number; diff --git a/tests/baselines/reference/innerModExport1.symbols b/tests/baselines/reference/innerModExport1.symbols index 395bd9f6cc11e..2c98ac82d7888 100644 --- a/tests/baselines/reference/innerModExport1.symbols +++ b/tests/baselines/reference/innerModExport1.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/innerModExport1.ts] //// === innerModExport1.ts === -module Outer { +namespace Outer { >Outer : Symbol(Outer, Decl(innerModExport1.ts, 0, 0)) // inner mod 1 diff --git a/tests/baselines/reference/innerModExport1.types b/tests/baselines/reference/innerModExport1.types index 79adf2835a47e..2ec5060600cd5 100644 --- a/tests/baselines/reference/innerModExport1.types +++ b/tests/baselines/reference/innerModExport1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/innerModExport1.ts] //// === innerModExport1.ts === -module Outer { +namespace Outer { >Outer : typeof Outer > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/innerModExport2.errors.txt b/tests/baselines/reference/innerModExport2.errors.txt index 8ee2da64c160c..1132230b92730 100644 --- a/tests/baselines/reference/innerModExport2.errors.txt +++ b/tests/baselines/reference/innerModExport2.errors.txt @@ -6,7 +6,7 @@ innerModExport2.ts(20,7): error TS2551: Property 'NonExportFunc' does not exist ==== innerModExport2.ts (5 errors) ==== - module Outer { + namespace Outer { // inner mod 1 var non_export_var: number; diff --git a/tests/baselines/reference/innerModExport2.js b/tests/baselines/reference/innerModExport2.js index 54acd327f2ea6..01565ab71bd41 100644 --- a/tests/baselines/reference/innerModExport2.js +++ b/tests/baselines/reference/innerModExport2.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/innerModExport2.ts] //// //// [innerModExport2.ts] -module Outer { +namespace Outer { // inner mod 1 var non_export_var: number; diff --git a/tests/baselines/reference/innerModExport2.symbols b/tests/baselines/reference/innerModExport2.symbols index 0c6e5fb712a46..af6dde3eb4a08 100644 --- a/tests/baselines/reference/innerModExport2.symbols +++ b/tests/baselines/reference/innerModExport2.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/innerModExport2.ts] //// === innerModExport2.ts === -module Outer { +namespace Outer { >Outer : Symbol(Outer, Decl(innerModExport2.ts, 0, 0)) // inner mod 1 diff --git a/tests/baselines/reference/innerModExport2.types b/tests/baselines/reference/innerModExport2.types index 07944ea7f3114..df57a578912b2 100644 --- a/tests/baselines/reference/innerModExport2.types +++ b/tests/baselines/reference/innerModExport2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/innerModExport2.ts] //// === innerModExport2.ts === -module Outer { +namespace Outer { >Outer : typeof Outer > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.errors.txt b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.errors.txt index c1be6890bb1a9..7610a2cf2cdd0 100644 --- a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.errors.txt +++ b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.errors.txt @@ -5,7 +5,7 @@ instancePropertiesInheritedIntoClassType.ts(41,16): error TS6234: This expressio ==== instancePropertiesInheritedIntoClassType.ts (2 errors) ==== - module NonGeneric { + namespace NonGeneric { class C { x: string; get y() { @@ -30,7 +30,7 @@ instancePropertiesInheritedIntoClassType.ts(41,16): error TS6234: This expressio } - module Generic { + namespace Generic { class C { x: T; get y() { diff --git a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js index 45d4595adb402..126c25722b1fb 100644 --- a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js +++ b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/classes/members/classTypes/instancePropertiesInheritedIntoClassType.ts] //// //// [instancePropertiesInheritedIntoClassType.ts] -module NonGeneric { +namespace NonGeneric { class C { x: string; get y() { @@ -23,7 +23,7 @@ module NonGeneric { } -module Generic { +namespace Generic { class C { x: T; get y() { diff --git a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.symbols b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.symbols index aa2724b639bce..25968ddc31a50 100644 --- a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.symbols +++ b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/classes/members/classTypes/instancePropertiesInheritedIntoClassType.ts] //// === instancePropertiesInheritedIntoClassType.ts === -module NonGeneric { +namespace NonGeneric { >NonGeneric : Symbol(NonGeneric, Decl(instancePropertiesInheritedIntoClassType.ts, 0, 0)) class C { ->C : Symbol(C, Decl(instancePropertiesInheritedIntoClassType.ts, 0, 19)) +>C : Symbol(C, Decl(instancePropertiesInheritedIntoClassType.ts, 0, 22)) x: string; >x : Symbol(C.x, Decl(instancePropertiesInheritedIntoClassType.ts, 1, 13)) @@ -21,7 +21,7 @@ module NonGeneric { fn() { return this; } >fn : Symbol(C.fn, Decl(instancePropertiesInheritedIntoClassType.ts, 6, 20)) ->this : Symbol(C, Decl(instancePropertiesInheritedIntoClassType.ts, 0, 19)) +>this : Symbol(C, Decl(instancePropertiesInheritedIntoClassType.ts, 0, 22)) constructor(public a: number, private b: number) { } >a : Symbol(C.a, Decl(instancePropertiesInheritedIntoClassType.ts, 8, 20)) @@ -30,7 +30,7 @@ module NonGeneric { class D extends C { e: string; } >D : Symbol(D, Decl(instancePropertiesInheritedIntoClassType.ts, 9, 5)) ->C : Symbol(C, Decl(instancePropertiesInheritedIntoClassType.ts, 0, 19)) +>C : Symbol(C, Decl(instancePropertiesInheritedIntoClassType.ts, 0, 22)) >e : Symbol(D.e, Decl(instancePropertiesInheritedIntoClassType.ts, 11, 23)) var d = new D(1, 2); @@ -68,11 +68,11 @@ module NonGeneric { } -module Generic { +namespace Generic { >Generic : Symbol(Generic, Decl(instancePropertiesInheritedIntoClassType.ts, 20, 1)) class C { ->C : Symbol(C, Decl(instancePropertiesInheritedIntoClassType.ts, 22, 16)) +>C : Symbol(C, Decl(instancePropertiesInheritedIntoClassType.ts, 22, 19)) >T : Symbol(T, Decl(instancePropertiesInheritedIntoClassType.ts, 23, 12)) >U : Symbol(U, Decl(instancePropertiesInheritedIntoClassType.ts, 23, 14)) @@ -92,7 +92,7 @@ module Generic { fn() { return this; } >fn : Symbol(C.fn, Decl(instancePropertiesInheritedIntoClassType.ts, 28, 23)) ->this : Symbol(C, Decl(instancePropertiesInheritedIntoClassType.ts, 22, 16)) +>this : Symbol(C, Decl(instancePropertiesInheritedIntoClassType.ts, 22, 19)) constructor(public a: T, private b: U) { } >a : Symbol(C.a, Decl(instancePropertiesInheritedIntoClassType.ts, 30, 20)) @@ -105,7 +105,7 @@ module Generic { >D : Symbol(D, Decl(instancePropertiesInheritedIntoClassType.ts, 31, 5)) >T : Symbol(T, Decl(instancePropertiesInheritedIntoClassType.ts, 33, 12)) >U : Symbol(U, Decl(instancePropertiesInheritedIntoClassType.ts, 33, 14)) ->C : Symbol(C, Decl(instancePropertiesInheritedIntoClassType.ts, 22, 16)) +>C : Symbol(C, Decl(instancePropertiesInheritedIntoClassType.ts, 22, 19)) >T : Symbol(T, Decl(instancePropertiesInheritedIntoClassType.ts, 33, 12)) >U : Symbol(U, Decl(instancePropertiesInheritedIntoClassType.ts, 33, 14)) >e : Symbol(D.e, Decl(instancePropertiesInheritedIntoClassType.ts, 33, 35)) diff --git a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.types b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.types index 328afd4d2ac05..1e16dfbc582d6 100644 --- a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.types +++ b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/classes/members/classTypes/instancePropertiesInheritedIntoClassType.ts] //// === instancePropertiesInheritedIntoClassType.ts === -module NonGeneric { +namespace NonGeneric { >NonGeneric : typeof NonGeneric > : ^^^^^^^^^^^^^^^^^ @@ -118,7 +118,7 @@ module NonGeneric { } -module Generic { +namespace Generic { >Generic : typeof Generic > : ^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/instancePropertyInClassType.errors.txt b/tests/baselines/reference/instancePropertyInClassType.errors.txt index b6f77f8d2e36f..76d02ef777d63 100644 --- a/tests/baselines/reference/instancePropertyInClassType.errors.txt +++ b/tests/baselines/reference/instancePropertyInClassType.errors.txt @@ -5,7 +5,7 @@ instancePropertyInClassType.ts(37,16): error TS6234: This expression is not call ==== instancePropertyInClassType.ts (2 errors) ==== - module NonGeneric { + namespace NonGeneric { class C { x: string; get y() { @@ -28,7 +28,7 @@ instancePropertyInClassType.ts(37,16): error TS6234: This expression is not call } - module Generic { + namespace Generic { class C { x: T; get y() { diff --git a/tests/baselines/reference/instancePropertyInClassType.js b/tests/baselines/reference/instancePropertyInClassType.js index f4baafa8a129d..729481d1fed22 100644 --- a/tests/baselines/reference/instancePropertyInClassType.js +++ b/tests/baselines/reference/instancePropertyInClassType.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/classes/members/classTypes/instancePropertyInClassType.ts] //// //// [instancePropertyInClassType.ts] -module NonGeneric { +namespace NonGeneric { class C { x: string; get y() { @@ -21,7 +21,7 @@ module NonGeneric { } -module Generic { +namespace Generic { class C { x: T; get y() { diff --git a/tests/baselines/reference/instancePropertyInClassType.symbols b/tests/baselines/reference/instancePropertyInClassType.symbols index dce07dba4d993..f72a93d457b21 100644 --- a/tests/baselines/reference/instancePropertyInClassType.symbols +++ b/tests/baselines/reference/instancePropertyInClassType.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/classes/members/classTypes/instancePropertyInClassType.ts] //// === instancePropertyInClassType.ts === -module NonGeneric { +namespace NonGeneric { >NonGeneric : Symbol(NonGeneric, Decl(instancePropertyInClassType.ts, 0, 0)) class C { ->C : Symbol(C, Decl(instancePropertyInClassType.ts, 0, 19)) +>C : Symbol(C, Decl(instancePropertyInClassType.ts, 0, 22)) x: string; >x : Symbol(C.x, Decl(instancePropertyInClassType.ts, 1, 13)) @@ -21,7 +21,7 @@ module NonGeneric { fn() { return this; } >fn : Symbol(C.fn, Decl(instancePropertyInClassType.ts, 6, 20)) ->this : Symbol(C, Decl(instancePropertyInClassType.ts, 0, 19)) +>this : Symbol(C, Decl(instancePropertyInClassType.ts, 0, 22)) constructor(public a: number, private b: number) { } >a : Symbol(C.a, Decl(instancePropertyInClassType.ts, 8, 20)) @@ -30,7 +30,7 @@ module NonGeneric { var c = new C(1, 2); >c : Symbol(c, Decl(instancePropertyInClassType.ts, 11, 7)) ->C : Symbol(C, Decl(instancePropertyInClassType.ts, 0, 19)) +>C : Symbol(C, Decl(instancePropertyInClassType.ts, 0, 22)) var r = c.fn(); >r : Symbol(r, Decl(instancePropertyInClassType.ts, 12, 7)) @@ -63,11 +63,11 @@ module NonGeneric { } -module Generic { +namespace Generic { >Generic : Symbol(Generic, Decl(instancePropertyInClassType.ts, 18, 1)) class C { ->C : Symbol(C, Decl(instancePropertyInClassType.ts, 20, 16)) +>C : Symbol(C, Decl(instancePropertyInClassType.ts, 20, 19)) >T : Symbol(T, Decl(instancePropertyInClassType.ts, 21, 12)) >U : Symbol(U, Decl(instancePropertyInClassType.ts, 21, 14)) @@ -87,7 +87,7 @@ module Generic { fn() { return this; } >fn : Symbol(C.fn, Decl(instancePropertyInClassType.ts, 26, 23)) ->this : Symbol(C, Decl(instancePropertyInClassType.ts, 20, 16)) +>this : Symbol(C, Decl(instancePropertyInClassType.ts, 20, 19)) constructor(public a: T, private b: U) { } >a : Symbol(C.a, Decl(instancePropertyInClassType.ts, 28, 20)) @@ -98,7 +98,7 @@ module Generic { var c = new C(1, ''); >c : Symbol(c, Decl(instancePropertyInClassType.ts, 31, 7)) ->C : Symbol(C, Decl(instancePropertyInClassType.ts, 20, 16)) +>C : Symbol(C, Decl(instancePropertyInClassType.ts, 20, 19)) var r = c.fn(); >r : Symbol(r, Decl(instancePropertyInClassType.ts, 32, 7)) diff --git a/tests/baselines/reference/instancePropertyInClassType.types b/tests/baselines/reference/instancePropertyInClassType.types index 5d8e998220b7e..8bfc0daafef22 100644 --- a/tests/baselines/reference/instancePropertyInClassType.types +++ b/tests/baselines/reference/instancePropertyInClassType.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/classes/members/classTypes/instancePropertyInClassType.ts] //// === instancePropertyInClassType.ts === -module NonGeneric { +namespace NonGeneric { >NonGeneric : typeof NonGeneric > : ^^^^^^^^^^^^^^^^^ @@ -110,7 +110,7 @@ module NonGeneric { } -module Generic { +namespace Generic { >Generic : typeof Generic > : ^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/instanceofOperator.errors.txt b/tests/baselines/reference/instanceofOperator.errors.txt index 76e501db77aef..b4a531b2b8eb6 100644 --- a/tests/baselines/reference/instanceofOperator.errors.txt +++ b/tests/baselines/reference/instanceofOperator.errors.txt @@ -1,3 +1,4 @@ +instanceofOperator.ts(6,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. instanceofOperator.ts(7,11): error TS2725: Class name cannot be 'Object' when targeting ES5 and above with module CommonJS. instanceofOperator.ts(12,5): error TS2358: The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter. instanceofOperator.ts(15,20): error TS2359: The right-hand side of an 'instanceof' expression must be either of type 'any', a class, function, or other type assignable to the 'Function' interface type, or an object type with a 'Symbol.hasInstance' method. @@ -6,13 +7,15 @@ instanceofOperator.ts(19,5): error TS2358: The left-hand side of an 'instanceof' instanceofOperator.ts(21,5): error TS2358: The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter. -==== instanceofOperator.ts (6 errors) ==== +==== instanceofOperator.ts (7 errors) ==== // Spec: // The instanceof operator requires the left operand to be of type Any or an object type, and the right // operand to be of type Any or a subtype of the ‘Function’ interface type. The result is always of the // Boolean primitive type. module test { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. class Object { } ~~~~~~ !!! error TS2725: Class name cannot be 'Object' when targeting ES5 and above with module CommonJS. diff --git a/tests/baselines/reference/instantiatedModule.js b/tests/baselines/reference/instantiatedModule.js index 08f123e5bd580..036ef21e28ecc 100644 --- a/tests/baselines/reference/instantiatedModule.js +++ b/tests/baselines/reference/instantiatedModule.js @@ -3,7 +3,7 @@ //// [instantiatedModule.ts] // adding the var makes this an instantiated module -module M { +namespace M { export interface Point { x: number; y: number } export var Point = 1; } @@ -21,7 +21,7 @@ var p1: M.Point; // making the point a class instead of an interface // makes this an instantiated mmodule -module M2 { +namespace M2 { export class Point { x: number; y: number; @@ -45,7 +45,7 @@ var p2: M2.Point; var p2 = new m2.Point(); var p2 = new M2.Point(); -module M3 { +namespace M3 { export enum Color { Blue, Red } } diff --git a/tests/baselines/reference/instantiatedModule.symbols b/tests/baselines/reference/instantiatedModule.symbols index b49b19ffb787f..1fec51df48ddd 100644 --- a/tests/baselines/reference/instantiatedModule.symbols +++ b/tests/baselines/reference/instantiatedModule.symbols @@ -3,16 +3,16 @@ === instantiatedModule.ts === // adding the var makes this an instantiated module -module M { +namespace M { >M : Symbol(M, Decl(instantiatedModule.ts, 0, 0)) export interface Point { x: number; y: number } ->Point : Symbol(Point, Decl(instantiatedModule.ts, 2, 10), Decl(instantiatedModule.ts, 4, 14)) +>Point : Symbol(Point, Decl(instantiatedModule.ts, 2, 13), Decl(instantiatedModule.ts, 4, 14)) >x : Symbol(Point.x, Decl(instantiatedModule.ts, 3, 28)) >y : Symbol(Point.y, Decl(instantiatedModule.ts, 3, 39)) export var Point = 1; ->Point : Symbol(Point, Decl(instantiatedModule.ts, 2, 10), Decl(instantiatedModule.ts, 4, 14)) +>Point : Symbol(Point, Decl(instantiatedModule.ts, 2, 13), Decl(instantiatedModule.ts, 4, 14)) } // primary expression @@ -29,15 +29,15 @@ var a1: number; var a1 = M.Point; >a1 : Symbol(a1, Decl(instantiatedModule.ts, 11, 3), Decl(instantiatedModule.ts, 12, 3), Decl(instantiatedModule.ts, 13, 3)) ->M.Point : Symbol(M.Point, Decl(instantiatedModule.ts, 2, 10), Decl(instantiatedModule.ts, 4, 14)) +>M.Point : Symbol(M.Point, Decl(instantiatedModule.ts, 2, 13), Decl(instantiatedModule.ts, 4, 14)) >M : Symbol(M, Decl(instantiatedModule.ts, 0, 0)) ->Point : Symbol(M.Point, Decl(instantiatedModule.ts, 2, 10), Decl(instantiatedModule.ts, 4, 14)) +>Point : Symbol(M.Point, Decl(instantiatedModule.ts, 2, 13), Decl(instantiatedModule.ts, 4, 14)) var a1 = m.Point; >a1 : Symbol(a1, Decl(instantiatedModule.ts, 11, 3), Decl(instantiatedModule.ts, 12, 3), Decl(instantiatedModule.ts, 13, 3)) ->m.Point : Symbol(M.Point, Decl(instantiatedModule.ts, 2, 10), Decl(instantiatedModule.ts, 4, 14)) +>m.Point : Symbol(M.Point, Decl(instantiatedModule.ts, 2, 13), Decl(instantiatedModule.ts, 4, 14)) >m : Symbol(m, Decl(instantiatedModule.ts, 8, 3), Decl(instantiatedModule.ts, 9, 3)) ->Point : Symbol(M.Point, Decl(instantiatedModule.ts, 2, 10), Decl(instantiatedModule.ts, 4, 14)) +>Point : Symbol(M.Point, Decl(instantiatedModule.ts, 2, 13), Decl(instantiatedModule.ts, 4, 14)) var p1: { x: number; y: number; } >p1 : Symbol(p1, Decl(instantiatedModule.ts, 15, 3), Decl(instantiatedModule.ts, 16, 3)) @@ -47,15 +47,15 @@ var p1: { x: number; y: number; } var p1: M.Point; >p1 : Symbol(p1, Decl(instantiatedModule.ts, 15, 3), Decl(instantiatedModule.ts, 16, 3)) >M : Symbol(M, Decl(instantiatedModule.ts, 0, 0)) ->Point : Symbol(M.Point, Decl(instantiatedModule.ts, 2, 10), Decl(instantiatedModule.ts, 4, 14)) +>Point : Symbol(M.Point, Decl(instantiatedModule.ts, 2, 13), Decl(instantiatedModule.ts, 4, 14)) // making the point a class instead of an interface // makes this an instantiated mmodule -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(instantiatedModule.ts, 16, 16)) export class Point { ->Point : Symbol(Point, Decl(instantiatedModule.ts, 20, 11)) +>Point : Symbol(Point, Decl(instantiatedModule.ts, 20, 14)) x: number; >x : Symbol(Point.x, Decl(instantiatedModule.ts, 21, 24)) @@ -65,7 +65,7 @@ module M2 { static Origin(): Point { >Origin : Symbol(Point.Origin, Decl(instantiatedModule.ts, 23, 18)) ->Point : Symbol(Point, Decl(instantiatedModule.ts, 20, 11)) +>Point : Symbol(Point, Decl(instantiatedModule.ts, 20, 14)) return { x: 0, y: 0 }; >x : Symbol(x, Decl(instantiatedModule.ts, 25, 20)) @@ -85,26 +85,26 @@ var m2 = M2; // static side of the class var a2: typeof M2.Point; >a2 : Symbol(a2, Decl(instantiatedModule.ts, 34, 3), Decl(instantiatedModule.ts, 35, 3), Decl(instantiatedModule.ts, 36, 3)) ->M2.Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 11)) +>M2.Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 14)) >M2 : Symbol(M2, Decl(instantiatedModule.ts, 16, 16)) ->Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 11)) +>Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 14)) var a2 = m2.Point; >a2 : Symbol(a2, Decl(instantiatedModule.ts, 34, 3), Decl(instantiatedModule.ts, 35, 3), Decl(instantiatedModule.ts, 36, 3)) ->m2.Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 11)) +>m2.Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 14)) >m2 : Symbol(m2, Decl(instantiatedModule.ts, 30, 3), Decl(instantiatedModule.ts, 31, 3)) ->Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 11)) +>Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 14)) var a2 = M2.Point; >a2 : Symbol(a2, Decl(instantiatedModule.ts, 34, 3), Decl(instantiatedModule.ts, 35, 3), Decl(instantiatedModule.ts, 36, 3)) ->M2.Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 11)) +>M2.Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 14)) >M2 : Symbol(M2, Decl(instantiatedModule.ts, 16, 16)) ->Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 11)) +>Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 14)) var o: M2.Point = a2.Origin(); >o : Symbol(o, Decl(instantiatedModule.ts, 37, 3)) >M2 : Symbol(M2, Decl(instantiatedModule.ts, 16, 16)) ->Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 11)) +>Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 14)) >a2.Origin : Symbol(M2.Point.Origin, Decl(instantiatedModule.ts, 23, 18)) >a2 : Symbol(a2, Decl(instantiatedModule.ts, 34, 3), Decl(instantiatedModule.ts, 35, 3), Decl(instantiatedModule.ts, 36, 3)) >Origin : Symbol(M2.Point.Origin, Decl(instantiatedModule.ts, 23, 18)) @@ -117,25 +117,25 @@ var p2: { x: number; y: number } var p2: M2.Point; >p2 : Symbol(p2, Decl(instantiatedModule.ts, 39, 3), Decl(instantiatedModule.ts, 40, 3), Decl(instantiatedModule.ts, 41, 3), Decl(instantiatedModule.ts, 42, 3)) >M2 : Symbol(M2, Decl(instantiatedModule.ts, 16, 16)) ->Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 11)) +>Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 14)) var p2 = new m2.Point(); >p2 : Symbol(p2, Decl(instantiatedModule.ts, 39, 3), Decl(instantiatedModule.ts, 40, 3), Decl(instantiatedModule.ts, 41, 3), Decl(instantiatedModule.ts, 42, 3)) ->m2.Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 11)) +>m2.Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 14)) >m2 : Symbol(m2, Decl(instantiatedModule.ts, 30, 3), Decl(instantiatedModule.ts, 31, 3)) ->Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 11)) +>Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 14)) var p2 = new M2.Point(); >p2 : Symbol(p2, Decl(instantiatedModule.ts, 39, 3), Decl(instantiatedModule.ts, 40, 3), Decl(instantiatedModule.ts, 41, 3), Decl(instantiatedModule.ts, 42, 3)) ->M2.Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 11)) +>M2.Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 14)) >M2 : Symbol(M2, Decl(instantiatedModule.ts, 16, 16)) ->Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 11)) +>Point : Symbol(M2.Point, Decl(instantiatedModule.ts, 20, 14)) -module M3 { +namespace M3 { >M3 : Symbol(M3, Decl(instantiatedModule.ts, 42, 24)) export enum Color { Blue, Red } ->Color : Symbol(Color, Decl(instantiatedModule.ts, 44, 11)) +>Color : Symbol(Color, Decl(instantiatedModule.ts, 44, 14)) >Blue : Symbol(Color.Blue, Decl(instantiatedModule.ts, 45, 23)) >Red : Symbol(Color.Red, Decl(instantiatedModule.ts, 45, 29)) } @@ -150,26 +150,26 @@ var m3 = M3; var a3: typeof M3.Color; >a3 : Symbol(a3, Decl(instantiatedModule.ts, 51, 3), Decl(instantiatedModule.ts, 52, 3), Decl(instantiatedModule.ts, 53, 3)) ->M3.Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 11)) +>M3.Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 14)) >M3 : Symbol(M3, Decl(instantiatedModule.ts, 42, 24)) ->Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 11)) +>Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 14)) var a3 = m3.Color; >a3 : Symbol(a3, Decl(instantiatedModule.ts, 51, 3), Decl(instantiatedModule.ts, 52, 3), Decl(instantiatedModule.ts, 53, 3)) ->m3.Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 11)) +>m3.Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 14)) >m3 : Symbol(m3, Decl(instantiatedModule.ts, 48, 3), Decl(instantiatedModule.ts, 49, 3)) ->Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 11)) +>Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 14)) var a3 = M3.Color; >a3 : Symbol(a3, Decl(instantiatedModule.ts, 51, 3), Decl(instantiatedModule.ts, 52, 3), Decl(instantiatedModule.ts, 53, 3)) ->M3.Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 11)) +>M3.Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 14)) >M3 : Symbol(M3, Decl(instantiatedModule.ts, 42, 24)) ->Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 11)) +>Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 14)) var blue: M3.Color = a3.Blue; >blue : Symbol(blue, Decl(instantiatedModule.ts, 54, 3)) >M3 : Symbol(M3, Decl(instantiatedModule.ts, 42, 24)) ->Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 11)) +>Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 14)) >a3.Blue : Symbol(M3.Color.Blue, Decl(instantiatedModule.ts, 45, 23)) >a3 : Symbol(a3, Decl(instantiatedModule.ts, 51, 3), Decl(instantiatedModule.ts, 52, 3), Decl(instantiatedModule.ts, 53, 3)) >Blue : Symbol(M3.Color.Blue, Decl(instantiatedModule.ts, 45, 23)) @@ -177,21 +177,21 @@ var blue: M3.Color = a3.Blue; var p3: M3.Color; >p3 : Symbol(p3, Decl(instantiatedModule.ts, 56, 3), Decl(instantiatedModule.ts, 57, 3), Decl(instantiatedModule.ts, 58, 3)) >M3 : Symbol(M3, Decl(instantiatedModule.ts, 42, 24)) ->Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 11)) +>Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 14)) var p3 = M3.Color.Red; >p3 : Symbol(p3, Decl(instantiatedModule.ts, 56, 3), Decl(instantiatedModule.ts, 57, 3), Decl(instantiatedModule.ts, 58, 3)) >M3.Color.Red : Symbol(M3.Color.Red, Decl(instantiatedModule.ts, 45, 29)) ->M3.Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 11)) +>M3.Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 14)) >M3 : Symbol(M3, Decl(instantiatedModule.ts, 42, 24)) ->Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 11)) +>Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 14)) >Red : Symbol(M3.Color.Red, Decl(instantiatedModule.ts, 45, 29)) var p3 = m3.Color.Blue; >p3 : Symbol(p3, Decl(instantiatedModule.ts, 56, 3), Decl(instantiatedModule.ts, 57, 3), Decl(instantiatedModule.ts, 58, 3)) >m3.Color.Blue : Symbol(M3.Color.Blue, Decl(instantiatedModule.ts, 45, 23)) ->m3.Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 11)) +>m3.Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 14)) >m3 : Symbol(m3, Decl(instantiatedModule.ts, 48, 3), Decl(instantiatedModule.ts, 49, 3)) ->Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 11)) +>Color : Symbol(M3.Color, Decl(instantiatedModule.ts, 44, 14)) >Blue : Symbol(M3.Color.Blue, Decl(instantiatedModule.ts, 45, 23)) diff --git a/tests/baselines/reference/instantiatedModule.types b/tests/baselines/reference/instantiatedModule.types index ac3ccdbe4841b..4bef11da0b8d7 100644 --- a/tests/baselines/reference/instantiatedModule.types +++ b/tests/baselines/reference/instantiatedModule.types @@ -3,7 +3,7 @@ === instantiatedModule.ts === // adding the var makes this an instantiated module -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -73,7 +73,7 @@ var p1: M.Point; // making the point a class instead of an interface // makes this an instantiated mmodule -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ @@ -203,7 +203,7 @@ var p2 = new M2.Point(); >Point : typeof M2.Point > : ^^^^^^^^^^^^^^^ -module M3 { +namespace M3 { >M3 : typeof M3 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/interMixingModulesInterfaces0.js b/tests/baselines/reference/interMixingModulesInterfaces0.js index 96a26827f6371..c937997365bc8 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces0.js +++ b/tests/baselines/reference/interMixingModulesInterfaces0.js @@ -1,9 +1,9 @@ //// [tests/cases/compiler/interMixingModulesInterfaces0.ts] //// //// [interMixingModulesInterfaces0.ts] -module A { +namespace A { - export module B { + export namespace B { export function createB(): B { return null; } diff --git a/tests/baselines/reference/interMixingModulesInterfaces0.symbols b/tests/baselines/reference/interMixingModulesInterfaces0.symbols index d2badc2e29ed7..bbf49d5870e48 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces0.symbols +++ b/tests/baselines/reference/interMixingModulesInterfaces0.symbols @@ -1,22 +1,22 @@ //// [tests/cases/compiler/interMixingModulesInterfaces0.ts] //// === interMixingModulesInterfaces0.ts === -module A { +namespace A { >A : Symbol(A, Decl(interMixingModulesInterfaces0.ts, 0, 0)) - export module B { ->B : Symbol(B, Decl(interMixingModulesInterfaces0.ts, 0, 10), Decl(interMixingModulesInterfaces0.ts, 6, 5)) + export namespace B { +>B : Symbol(B, Decl(interMixingModulesInterfaces0.ts, 0, 13), Decl(interMixingModulesInterfaces0.ts, 6, 5)) export function createB(): B { ->createB : Symbol(createB, Decl(interMixingModulesInterfaces0.ts, 2, 21)) ->B : Symbol(B, Decl(interMixingModulesInterfaces0.ts, 0, 10), Decl(interMixingModulesInterfaces0.ts, 6, 5)) +>createB : Symbol(createB, Decl(interMixingModulesInterfaces0.ts, 2, 24)) +>B : Symbol(B, Decl(interMixingModulesInterfaces0.ts, 0, 13), Decl(interMixingModulesInterfaces0.ts, 6, 5)) return null; } } export interface B { ->B : Symbol(B, Decl(interMixingModulesInterfaces0.ts, 0, 10), Decl(interMixingModulesInterfaces0.ts, 6, 5)) +>B : Symbol(B, Decl(interMixingModulesInterfaces0.ts, 0, 13), Decl(interMixingModulesInterfaces0.ts, 6, 5)) name: string; >name : Symbol(B.name, Decl(interMixingModulesInterfaces0.ts, 8, 24)) @@ -29,10 +29,10 @@ module A { var x: A.B = A.B.createB(); >x : Symbol(x, Decl(interMixingModulesInterfaces0.ts, 14, 3)) >A : Symbol(A, Decl(interMixingModulesInterfaces0.ts, 0, 0)) ->B : Symbol(A.B, Decl(interMixingModulesInterfaces0.ts, 0, 10), Decl(interMixingModulesInterfaces0.ts, 6, 5)) ->A.B.createB : Symbol(A.B.createB, Decl(interMixingModulesInterfaces0.ts, 2, 21)) ->A.B : Symbol(A.B, Decl(interMixingModulesInterfaces0.ts, 0, 10), Decl(interMixingModulesInterfaces0.ts, 6, 5)) +>B : Symbol(A.B, Decl(interMixingModulesInterfaces0.ts, 0, 13), Decl(interMixingModulesInterfaces0.ts, 6, 5)) +>A.B.createB : Symbol(A.B.createB, Decl(interMixingModulesInterfaces0.ts, 2, 24)) +>A.B : Symbol(A.B, Decl(interMixingModulesInterfaces0.ts, 0, 13), Decl(interMixingModulesInterfaces0.ts, 6, 5)) >A : Symbol(A, Decl(interMixingModulesInterfaces0.ts, 0, 0)) ->B : Symbol(A.B, Decl(interMixingModulesInterfaces0.ts, 0, 10), Decl(interMixingModulesInterfaces0.ts, 6, 5)) ->createB : Symbol(A.B.createB, Decl(interMixingModulesInterfaces0.ts, 2, 21)) +>B : Symbol(A.B, Decl(interMixingModulesInterfaces0.ts, 0, 13), Decl(interMixingModulesInterfaces0.ts, 6, 5)) +>createB : Symbol(A.B.createB, Decl(interMixingModulesInterfaces0.ts, 2, 24)) diff --git a/tests/baselines/reference/interMixingModulesInterfaces0.types b/tests/baselines/reference/interMixingModulesInterfaces0.types index 6371a0aff4a7a..f3dc6a665b450 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces0.types +++ b/tests/baselines/reference/interMixingModulesInterfaces0.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/interMixingModulesInterfaces0.ts] //// === interMixingModulesInterfaces0.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ - export module B { + export namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/interMixingModulesInterfaces1.js b/tests/baselines/reference/interMixingModulesInterfaces1.js index 133afec141c8a..0815134c074e1 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces1.js +++ b/tests/baselines/reference/interMixingModulesInterfaces1.js @@ -1,14 +1,14 @@ //// [tests/cases/compiler/interMixingModulesInterfaces1.ts] //// //// [interMixingModulesInterfaces1.ts] -module A { +namespace A { export interface B { name: string; value: number; } - export module B { + export namespace B { export function createB(): B { return null; } diff --git a/tests/baselines/reference/interMixingModulesInterfaces1.symbols b/tests/baselines/reference/interMixingModulesInterfaces1.symbols index 4dc0c5aea9b00..0be59454084d0 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces1.symbols +++ b/tests/baselines/reference/interMixingModulesInterfaces1.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/interMixingModulesInterfaces1.ts] //// === interMixingModulesInterfaces1.ts === -module A { +namespace A { >A : Symbol(A, Decl(interMixingModulesInterfaces1.ts, 0, 0)) export interface B { ->B : Symbol(B, Decl(interMixingModulesInterfaces1.ts, 0, 10), Decl(interMixingModulesInterfaces1.ts, 5, 5)) +>B : Symbol(B, Decl(interMixingModulesInterfaces1.ts, 0, 13), Decl(interMixingModulesInterfaces1.ts, 5, 5)) name: string; >name : Symbol(B.name, Decl(interMixingModulesInterfaces1.ts, 2, 24)) @@ -14,12 +14,12 @@ module A { >value : Symbol(B.value, Decl(interMixingModulesInterfaces1.ts, 3, 21)) } - export module B { ->B : Symbol(B, Decl(interMixingModulesInterfaces1.ts, 0, 10), Decl(interMixingModulesInterfaces1.ts, 5, 5)) + export namespace B { +>B : Symbol(B, Decl(interMixingModulesInterfaces1.ts, 0, 13), Decl(interMixingModulesInterfaces1.ts, 5, 5)) export function createB(): B { ->createB : Symbol(createB, Decl(interMixingModulesInterfaces1.ts, 7, 21)) ->B : Symbol(B, Decl(interMixingModulesInterfaces1.ts, 0, 10), Decl(interMixingModulesInterfaces1.ts, 5, 5)) +>createB : Symbol(createB, Decl(interMixingModulesInterfaces1.ts, 7, 24)) +>B : Symbol(B, Decl(interMixingModulesInterfaces1.ts, 0, 13), Decl(interMixingModulesInterfaces1.ts, 5, 5)) return null; } @@ -29,10 +29,10 @@ module A { var x: A.B = A.B.createB(); >x : Symbol(x, Decl(interMixingModulesInterfaces1.ts, 14, 3)) >A : Symbol(A, Decl(interMixingModulesInterfaces1.ts, 0, 0)) ->B : Symbol(A.B, Decl(interMixingModulesInterfaces1.ts, 0, 10), Decl(interMixingModulesInterfaces1.ts, 5, 5)) ->A.B.createB : Symbol(A.B.createB, Decl(interMixingModulesInterfaces1.ts, 7, 21)) ->A.B : Symbol(A.B, Decl(interMixingModulesInterfaces1.ts, 0, 10), Decl(interMixingModulesInterfaces1.ts, 5, 5)) +>B : Symbol(A.B, Decl(interMixingModulesInterfaces1.ts, 0, 13), Decl(interMixingModulesInterfaces1.ts, 5, 5)) +>A.B.createB : Symbol(A.B.createB, Decl(interMixingModulesInterfaces1.ts, 7, 24)) +>A.B : Symbol(A.B, Decl(interMixingModulesInterfaces1.ts, 0, 13), Decl(interMixingModulesInterfaces1.ts, 5, 5)) >A : Symbol(A, Decl(interMixingModulesInterfaces1.ts, 0, 0)) ->B : Symbol(A.B, Decl(interMixingModulesInterfaces1.ts, 0, 10), Decl(interMixingModulesInterfaces1.ts, 5, 5)) ->createB : Symbol(A.B.createB, Decl(interMixingModulesInterfaces1.ts, 7, 21)) +>B : Symbol(A.B, Decl(interMixingModulesInterfaces1.ts, 0, 13), Decl(interMixingModulesInterfaces1.ts, 5, 5)) +>createB : Symbol(A.B.createB, Decl(interMixingModulesInterfaces1.ts, 7, 24)) diff --git a/tests/baselines/reference/interMixingModulesInterfaces1.types b/tests/baselines/reference/interMixingModulesInterfaces1.types index 34f46e1644f7c..d63ebc3d7debd 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces1.types +++ b/tests/baselines/reference/interMixingModulesInterfaces1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/interMixingModulesInterfaces1.ts] //// === interMixingModulesInterfaces1.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -15,7 +15,7 @@ module A { > : ^^^^^^ } - export module B { + export namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/interMixingModulesInterfaces2.js b/tests/baselines/reference/interMixingModulesInterfaces2.js index 88e2a93c4e650..760501c527fa8 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces2.js +++ b/tests/baselines/reference/interMixingModulesInterfaces2.js @@ -1,14 +1,14 @@ //// [tests/cases/compiler/interMixingModulesInterfaces2.ts] //// //// [interMixingModulesInterfaces2.ts] -module A { +namespace A { export interface B { name: string; value: number; } - module B { + namespace B { export function createB(): B { return null; } diff --git a/tests/baselines/reference/interMixingModulesInterfaces2.symbols b/tests/baselines/reference/interMixingModulesInterfaces2.symbols index 17d13eabe8e67..509d3d9f9f4cb 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces2.symbols +++ b/tests/baselines/reference/interMixingModulesInterfaces2.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/interMixingModulesInterfaces2.ts] //// === interMixingModulesInterfaces2.ts === -module A { +namespace A { >A : Symbol(A, Decl(interMixingModulesInterfaces2.ts, 0, 0)) export interface B { ->B : Symbol(B, Decl(interMixingModulesInterfaces2.ts, 0, 10)) +>B : Symbol(B, Decl(interMixingModulesInterfaces2.ts, 0, 13)) name: string; >name : Symbol(A.B.name, Decl(interMixingModulesInterfaces2.ts, 2, 24)) @@ -14,12 +14,12 @@ module A { >value : Symbol(A.B.value, Decl(interMixingModulesInterfaces2.ts, 3, 21)) } - module B { ->B : Symbol(B, Decl(interMixingModulesInterfaces2.ts, 0, 10), Decl(interMixingModulesInterfaces2.ts, 5, 5)) + namespace B { +>B : Symbol(B, Decl(interMixingModulesInterfaces2.ts, 0, 13), Decl(interMixingModulesInterfaces2.ts, 5, 5)) export function createB(): B { ->createB : Symbol(createB, Decl(interMixingModulesInterfaces2.ts, 7, 14)) ->B : Symbol(B, Decl(interMixingModulesInterfaces2.ts, 0, 10)) +>createB : Symbol(createB, Decl(interMixingModulesInterfaces2.ts, 7, 17)) +>B : Symbol(B, Decl(interMixingModulesInterfaces2.ts, 0, 13)) return null; } @@ -29,5 +29,5 @@ module A { var x: A.B = null; >x : Symbol(x, Decl(interMixingModulesInterfaces2.ts, 14, 3)) >A : Symbol(A, Decl(interMixingModulesInterfaces2.ts, 0, 0)) ->B : Symbol(A.B, Decl(interMixingModulesInterfaces2.ts, 0, 10)) +>B : Symbol(A.B, Decl(interMixingModulesInterfaces2.ts, 0, 13)) diff --git a/tests/baselines/reference/interMixingModulesInterfaces2.types b/tests/baselines/reference/interMixingModulesInterfaces2.types index a31c66558526a..6f66384586257 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces2.types +++ b/tests/baselines/reference/interMixingModulesInterfaces2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/interMixingModulesInterfaces2.ts] //// === interMixingModulesInterfaces2.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -15,7 +15,7 @@ module A { > : ^^^^^^ } - module B { + namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/interMixingModulesInterfaces3.js b/tests/baselines/reference/interMixingModulesInterfaces3.js index 5121c2cb3bf0e..dd65229d406f1 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces3.js +++ b/tests/baselines/reference/interMixingModulesInterfaces3.js @@ -1,9 +1,9 @@ //// [tests/cases/compiler/interMixingModulesInterfaces3.ts] //// //// [interMixingModulesInterfaces3.ts] -module A { +namespace A { - module B { + namespace B { export function createB(): B { return null; } diff --git a/tests/baselines/reference/interMixingModulesInterfaces3.symbols b/tests/baselines/reference/interMixingModulesInterfaces3.symbols index cff762b4c5077..df6f97d7497bb 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces3.symbols +++ b/tests/baselines/reference/interMixingModulesInterfaces3.symbols @@ -1,14 +1,14 @@ //// [tests/cases/compiler/interMixingModulesInterfaces3.ts] //// === interMixingModulesInterfaces3.ts === -module A { +namespace A { >A : Symbol(A, Decl(interMixingModulesInterfaces3.ts, 0, 0)) - module B { ->B : Symbol(B, Decl(interMixingModulesInterfaces3.ts, 0, 10), Decl(interMixingModulesInterfaces3.ts, 6, 5)) + namespace B { +>B : Symbol(B, Decl(interMixingModulesInterfaces3.ts, 0, 13), Decl(interMixingModulesInterfaces3.ts, 6, 5)) export function createB(): B { ->createB : Symbol(createB, Decl(interMixingModulesInterfaces3.ts, 2, 14)) +>createB : Symbol(createB, Decl(interMixingModulesInterfaces3.ts, 2, 17)) >B : Symbol(B, Decl(interMixingModulesInterfaces3.ts, 6, 5)) return null; diff --git a/tests/baselines/reference/interMixingModulesInterfaces3.types b/tests/baselines/reference/interMixingModulesInterfaces3.types index a73fbefcfdeb8..322193cc11a20 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces3.types +++ b/tests/baselines/reference/interMixingModulesInterfaces3.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/interMixingModulesInterfaces3.ts] //// === interMixingModulesInterfaces3.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ - module B { + namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/interMixingModulesInterfaces4.js b/tests/baselines/reference/interMixingModulesInterfaces4.js index 49c77e39d2a3f..a13d76f68b5c1 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces4.js +++ b/tests/baselines/reference/interMixingModulesInterfaces4.js @@ -1,9 +1,9 @@ //// [tests/cases/compiler/interMixingModulesInterfaces4.ts] //// //// [interMixingModulesInterfaces4.ts] -module A { +namespace A { - export module B { + export namespace B { export function createB(): number { return null; } diff --git a/tests/baselines/reference/interMixingModulesInterfaces4.symbols b/tests/baselines/reference/interMixingModulesInterfaces4.symbols index 874b91845601e..d1c9be9001deb 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces4.symbols +++ b/tests/baselines/reference/interMixingModulesInterfaces4.symbols @@ -1,21 +1,21 @@ //// [tests/cases/compiler/interMixingModulesInterfaces4.ts] //// === interMixingModulesInterfaces4.ts === -module A { +namespace A { >A : Symbol(A, Decl(interMixingModulesInterfaces4.ts, 0, 0)) - export module B { ->B : Symbol(B, Decl(interMixingModulesInterfaces4.ts, 0, 10)) + export namespace B { +>B : Symbol(B, Decl(interMixingModulesInterfaces4.ts, 0, 13)) export function createB(): number { ->createB : Symbol(createB, Decl(interMixingModulesInterfaces4.ts, 2, 21)) +>createB : Symbol(createB, Decl(interMixingModulesInterfaces4.ts, 2, 24)) return null; } } interface B { ->B : Symbol(B, Decl(interMixingModulesInterfaces4.ts, 0, 10), Decl(interMixingModulesInterfaces4.ts, 6, 5)) +>B : Symbol(B, Decl(interMixingModulesInterfaces4.ts, 0, 13), Decl(interMixingModulesInterfaces4.ts, 6, 5)) name: string; >name : Symbol(B.name, Decl(interMixingModulesInterfaces4.ts, 8, 17)) @@ -27,9 +27,9 @@ module A { var x : number = A.B.createB(); >x : Symbol(x, Decl(interMixingModulesInterfaces4.ts, 14, 3)) ->A.B.createB : Symbol(A.B.createB, Decl(interMixingModulesInterfaces4.ts, 2, 21)) ->A.B : Symbol(A.B, Decl(interMixingModulesInterfaces4.ts, 0, 10)) +>A.B.createB : Symbol(A.B.createB, Decl(interMixingModulesInterfaces4.ts, 2, 24)) +>A.B : Symbol(A.B, Decl(interMixingModulesInterfaces4.ts, 0, 13)) >A : Symbol(A, Decl(interMixingModulesInterfaces4.ts, 0, 0)) ->B : Symbol(A.B, Decl(interMixingModulesInterfaces4.ts, 0, 10)) ->createB : Symbol(A.B.createB, Decl(interMixingModulesInterfaces4.ts, 2, 21)) +>B : Symbol(A.B, Decl(interMixingModulesInterfaces4.ts, 0, 13)) +>createB : Symbol(A.B.createB, Decl(interMixingModulesInterfaces4.ts, 2, 24)) diff --git a/tests/baselines/reference/interMixingModulesInterfaces4.types b/tests/baselines/reference/interMixingModulesInterfaces4.types index 48a23496ae57f..923189fa1422c 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces4.types +++ b/tests/baselines/reference/interMixingModulesInterfaces4.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/interMixingModulesInterfaces4.ts] //// === interMixingModulesInterfaces4.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ - export module B { + export namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/interMixingModulesInterfaces5.js b/tests/baselines/reference/interMixingModulesInterfaces5.js index 23bbfa8e69a14..d89243d8f3560 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces5.js +++ b/tests/baselines/reference/interMixingModulesInterfaces5.js @@ -1,14 +1,14 @@ //// [tests/cases/compiler/interMixingModulesInterfaces5.ts] //// //// [interMixingModulesInterfaces5.ts] -module A { +namespace A { interface B { name: string; value: number; } - export module B { + export namespace B { export function createB(): number { return null; } diff --git a/tests/baselines/reference/interMixingModulesInterfaces5.symbols b/tests/baselines/reference/interMixingModulesInterfaces5.symbols index 320d88f48022f..420659a297789 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces5.symbols +++ b/tests/baselines/reference/interMixingModulesInterfaces5.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/interMixingModulesInterfaces5.ts] //// === interMixingModulesInterfaces5.ts === -module A { +namespace A { >A : Symbol(A, Decl(interMixingModulesInterfaces5.ts, 0, 0)) interface B { ->B : Symbol(B, Decl(interMixingModulesInterfaces5.ts, 0, 10), Decl(interMixingModulesInterfaces5.ts, 5, 5)) +>B : Symbol(B, Decl(interMixingModulesInterfaces5.ts, 0, 13), Decl(interMixingModulesInterfaces5.ts, 5, 5)) name: string; >name : Symbol(B.name, Decl(interMixingModulesInterfaces5.ts, 2, 17)) @@ -14,11 +14,11 @@ module A { >value : Symbol(B.value, Decl(interMixingModulesInterfaces5.ts, 3, 21)) } - export module B { + export namespace B { >B : Symbol(B, Decl(interMixingModulesInterfaces5.ts, 5, 5)) export function createB(): number { ->createB : Symbol(createB, Decl(interMixingModulesInterfaces5.ts, 7, 21)) +>createB : Symbol(createB, Decl(interMixingModulesInterfaces5.ts, 7, 24)) return null; } @@ -27,9 +27,9 @@ module A { var x: number = A.B.createB(); >x : Symbol(x, Decl(interMixingModulesInterfaces5.ts, 14, 3)) ->A.B.createB : Symbol(A.B.createB, Decl(interMixingModulesInterfaces5.ts, 7, 21)) +>A.B.createB : Symbol(A.B.createB, Decl(interMixingModulesInterfaces5.ts, 7, 24)) >A.B : Symbol(A.B, Decl(interMixingModulesInterfaces5.ts, 5, 5)) >A : Symbol(A, Decl(interMixingModulesInterfaces5.ts, 0, 0)) >B : Symbol(A.B, Decl(interMixingModulesInterfaces5.ts, 5, 5)) ->createB : Symbol(A.B.createB, Decl(interMixingModulesInterfaces5.ts, 7, 21)) +>createB : Symbol(A.B.createB, Decl(interMixingModulesInterfaces5.ts, 7, 24)) diff --git a/tests/baselines/reference/interMixingModulesInterfaces5.types b/tests/baselines/reference/interMixingModulesInterfaces5.types index bbfc404c42fcf..f827ce8bababf 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces5.types +++ b/tests/baselines/reference/interMixingModulesInterfaces5.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/interMixingModulesInterfaces5.ts] //// === interMixingModulesInterfaces5.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -15,7 +15,7 @@ module A { > : ^^^^^^ } - export module B { + export namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/interfaceAssignmentCompat.errors.txt b/tests/baselines/reference/interfaceAssignmentCompat.errors.txt index 1b16cb3a0d4de..8f36e0c15d1c3 100644 --- a/tests/baselines/reference/interfaceAssignmentCompat.errors.txt +++ b/tests/baselines/reference/interfaceAssignmentCompat.errors.txt @@ -8,7 +8,7 @@ interfaceAssignmentCompat.ts(44,9): error TS2322: Type 'IEye[]' is not assignabl ==== interfaceAssignmentCompat.ts (4 errors) ==== - module M { + namespace M { export enum Color { Green, Blue, diff --git a/tests/baselines/reference/interfaceAssignmentCompat.js b/tests/baselines/reference/interfaceAssignmentCompat.js index 810c14646da50..115da0a4ea506 100644 --- a/tests/baselines/reference/interfaceAssignmentCompat.js +++ b/tests/baselines/reference/interfaceAssignmentCompat.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/interfaceAssignmentCompat.ts] //// //// [interfaceAssignmentCompat.ts] -module M { +namespace M { export enum Color { Green, Blue, diff --git a/tests/baselines/reference/interfaceAssignmentCompat.symbols b/tests/baselines/reference/interfaceAssignmentCompat.symbols index e35074410a385..ad125e1f398f4 100644 --- a/tests/baselines/reference/interfaceAssignmentCompat.symbols +++ b/tests/baselines/reference/interfaceAssignmentCompat.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/interfaceAssignmentCompat.ts] //// === interfaceAssignmentCompat.ts === -module M { +namespace M { >M : Symbol(M, Decl(interfaceAssignmentCompat.ts, 0, 0)) export enum Color { ->Color : Symbol(Color, Decl(interfaceAssignmentCompat.ts, 0, 10)) +>Color : Symbol(Color, Decl(interfaceAssignmentCompat.ts, 0, 13)) Green, >Green : Symbol(Color.Green, Decl(interfaceAssignmentCompat.ts, 1, 23)) @@ -77,21 +77,21 @@ module M { >x : Symbol(x, Decl(interfaceAssignmentCompat.ts, 24, 11)) >color : Symbol(color, Decl(interfaceAssignmentCompat.ts, 27, 14)) >Color.Brown : Symbol(Color.Brown, Decl(interfaceAssignmentCompat.ts, 3, 13)) ->Color : Symbol(Color, Decl(interfaceAssignmentCompat.ts, 0, 10)) +>Color : Symbol(Color, Decl(interfaceAssignmentCompat.ts, 0, 13)) >Brown : Symbol(Color.Brown, Decl(interfaceAssignmentCompat.ts, 3, 13)) x[1]={ color:Color.Blue }; >x : Symbol(x, Decl(interfaceAssignmentCompat.ts, 24, 11)) >color : Symbol(color, Decl(interfaceAssignmentCompat.ts, 28, 14)) >Color.Blue : Symbol(Color.Blue, Decl(interfaceAssignmentCompat.ts, 2, 14)) ->Color : Symbol(Color, Decl(interfaceAssignmentCompat.ts, 0, 10)) +>Color : Symbol(Color, Decl(interfaceAssignmentCompat.ts, 0, 13)) >Blue : Symbol(Color.Blue, Decl(interfaceAssignmentCompat.ts, 2, 14)) x[2]={ color:Color.Green }; >x : Symbol(x, Decl(interfaceAssignmentCompat.ts, 24, 11)) >color : Symbol(color, Decl(interfaceAssignmentCompat.ts, 29, 14)) >Color.Green : Symbol(Color.Green, Decl(interfaceAssignmentCompat.ts, 1, 23)) ->Color : Symbol(Color, Decl(interfaceAssignmentCompat.ts, 0, 10)) +>Color : Symbol(Color, Decl(interfaceAssignmentCompat.ts, 0, 13)) >Green : Symbol(Color.Green, Decl(interfaceAssignmentCompat.ts, 1, 23)) x=x.sort(CompareYeux); // parameter mismatch @@ -121,7 +121,7 @@ module M { result+=((Color._map[z[i].color])+"\r\n"); >result : Symbol(result, Decl(interfaceAssignmentCompat.ts, 25, 11)) ->Color : Symbol(Color, Decl(interfaceAssignmentCompat.ts, 0, 10)) +>Color : Symbol(Color, Decl(interfaceAssignmentCompat.ts, 0, 13)) >z[i].color : Symbol(IEye.color, Decl(interfaceAssignmentCompat.ts, 7, 27)) >z : Symbol(z, Decl(interfaceAssignmentCompat.ts, 33, 11)) >i : Symbol(i, Decl(interfaceAssignmentCompat.ts, 35, 16)) diff --git a/tests/baselines/reference/interfaceAssignmentCompat.types b/tests/baselines/reference/interfaceAssignmentCompat.types index f235305b6f434..b8365e95d7c0b 100644 --- a/tests/baselines/reference/interfaceAssignmentCompat.types +++ b/tests/baselines/reference/interfaceAssignmentCompat.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/interfaceAssignmentCompat.ts] //// === interfaceAssignmentCompat.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/interfaceDeclaration2.js b/tests/baselines/reference/interfaceDeclaration2.js index 09b889370f68c..ad7bf789552cb 100644 --- a/tests/baselines/reference/interfaceDeclaration2.js +++ b/tests/baselines/reference/interfaceDeclaration2.js @@ -2,7 +2,7 @@ //// [interfaceDeclaration2.ts] interface I1 { } -module I1 { } +namespace I1 { } interface I2 { } class I2 { } diff --git a/tests/baselines/reference/interfaceDeclaration2.symbols b/tests/baselines/reference/interfaceDeclaration2.symbols index 934566daeb7dc..de4d69406fb3e 100644 --- a/tests/baselines/reference/interfaceDeclaration2.symbols +++ b/tests/baselines/reference/interfaceDeclaration2.symbols @@ -4,14 +4,14 @@ interface I1 { } >I1 : Symbol(I1, Decl(interfaceDeclaration2.ts, 0, 0), Decl(interfaceDeclaration2.ts, 0, 16)) -module I1 { } +namespace I1 { } >I1 : Symbol(I1, Decl(interfaceDeclaration2.ts, 0, 0), Decl(interfaceDeclaration2.ts, 0, 16)) interface I2 { } ->I2 : Symbol(I2, Decl(interfaceDeclaration2.ts, 1, 13), Decl(interfaceDeclaration2.ts, 3, 16)) +>I2 : Symbol(I2, Decl(interfaceDeclaration2.ts, 1, 16), Decl(interfaceDeclaration2.ts, 3, 16)) class I2 { } ->I2 : Symbol(I2, Decl(interfaceDeclaration2.ts, 1, 13), Decl(interfaceDeclaration2.ts, 3, 16)) +>I2 : Symbol(I2, Decl(interfaceDeclaration2.ts, 1, 16), Decl(interfaceDeclaration2.ts, 3, 16)) interface I3 { } >I3 : Symbol(I3, Decl(interfaceDeclaration2.ts, 6, 16), Decl(interfaceDeclaration2.ts, 4, 12)) diff --git a/tests/baselines/reference/interfaceDeclaration2.types b/tests/baselines/reference/interfaceDeclaration2.types index 24c4ce6bf38c8..637bdf25f0768 100644 --- a/tests/baselines/reference/interfaceDeclaration2.types +++ b/tests/baselines/reference/interfaceDeclaration2.types @@ -2,7 +2,7 @@ === interfaceDeclaration2.ts === interface I1 { } -module I1 { } +namespace I1 { } interface I2 { } class I2 { } diff --git a/tests/baselines/reference/interfaceDeclaration3.errors.txt b/tests/baselines/reference/interfaceDeclaration3.errors.txt index 2c1cad0c9cf47..12296b53badb3 100644 --- a/tests/baselines/reference/interfaceDeclaration3.errors.txt +++ b/tests/baselines/reference/interfaceDeclaration3.errors.txt @@ -10,7 +10,7 @@ interfaceDeclaration3.ts(54,11): error TS2430: Interface 'I2' incorrectly extend ==== interfaceDeclaration3.ts (3 errors) ==== interface I1 { item:number; } - module M1 { + namespace M1 { interface I1 { item:string; } interface I2 { item:number; } class C1 implements I1 { @@ -35,10 +35,10 @@ interfaceDeclaration3.ts(54,11): error TS2430: Interface 'I2' incorrectly extend } } - export module M2 { + export namespace M2 { export interface I1 { item:string; } export interface I2 { item:string; } - export module M3 { + export namespace M3 { export interface I1 { item:string; } } class C1 implements I1 { diff --git a/tests/baselines/reference/interfaceDeclaration3.js b/tests/baselines/reference/interfaceDeclaration3.js index 64f2539f77535..0e9d8a0f2efe0 100644 --- a/tests/baselines/reference/interfaceDeclaration3.js +++ b/tests/baselines/reference/interfaceDeclaration3.js @@ -3,7 +3,7 @@ //// [interfaceDeclaration3.ts] interface I1 { item:number; } -module M1 { +namespace M1 { interface I1 { item:string; } interface I2 { item:number; } class C1 implements I1 { @@ -25,10 +25,10 @@ module M1 { } } -export module M2 { +export namespace M2 { export interface I1 { item:string; } export interface I2 { item:string; } - export module M3 { + export namespace M3 { export interface I1 { item:string; } } class C1 implements I1 { diff --git a/tests/baselines/reference/interfaceDeclaration3.symbols b/tests/baselines/reference/interfaceDeclaration3.symbols index 35e3dd71eaecb..c5e360ba0cde3 100644 --- a/tests/baselines/reference/interfaceDeclaration3.symbols +++ b/tests/baselines/reference/interfaceDeclaration3.symbols @@ -5,11 +5,11 @@ interface I1 { item:number; } >I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 0, 0)) >item : Symbol(I1.item, Decl(interfaceDeclaration3.ts, 0, 14)) -module M1 { +namespace M1 { >M1 : Symbol(M1, Decl(interfaceDeclaration3.ts, 0, 29)) interface I1 { item:string; } ->I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 2, 11)) +>I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 2, 14)) >item : Symbol(I1.item, Decl(interfaceDeclaration3.ts, 3, 18)) interface I2 { item:number; } @@ -18,14 +18,14 @@ module M1 { class C1 implements I1 { >C1 : Symbol(C1, Decl(interfaceDeclaration3.ts, 4, 33)) ->I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 2, 11)) +>I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 2, 14)) public item:number; >item : Symbol(C1.item, Decl(interfaceDeclaration3.ts, 5, 28)) } class C2 implements I1 { >C2 : Symbol(C2, Decl(interfaceDeclaration3.ts, 7, 5)) ->I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 2, 11)) +>I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 2, 14)) public item:string; >item : Symbol(C2.item, Decl(interfaceDeclaration3.ts, 8, 28)) @@ -40,9 +40,9 @@ module M1 { class C4 implements M2.I1 { >C4 : Symbol(C4, Decl(interfaceDeclaration3.ts, 13, 5)) ->M2.I1 : Symbol(M2.I1, Decl(interfaceDeclaration3.ts, 24, 18)) +>M2.I1 : Symbol(M2.I1, Decl(interfaceDeclaration3.ts, 24, 21)) >M2 : Symbol(M2, Decl(interfaceDeclaration3.ts, 22, 1)) ->I1 : Symbol(M2.I1, Decl(interfaceDeclaration3.ts, 24, 18)) +>I1 : Symbol(M2.I1, Decl(interfaceDeclaration3.ts, 24, 21)) public item:string; >item : Symbol(C4.item, Decl(interfaceDeclaration3.ts, 15, 31)) @@ -50,45 +50,45 @@ module M1 { class C5 implements M2.M3.I1 { >C5 : Symbol(C5, Decl(interfaceDeclaration3.ts, 17, 5)) ->M2.M3.I1 : Symbol(M2.M3.I1, Decl(interfaceDeclaration3.ts, 27, 22)) +>M2.M3.I1 : Symbol(M2.M3.I1, Decl(interfaceDeclaration3.ts, 27, 25)) >M2.M3 : Symbol(M2.M3, Decl(interfaceDeclaration3.ts, 26, 40)) >M2 : Symbol(M2, Decl(interfaceDeclaration3.ts, 22, 1)) >M3 : Symbol(M2.M3, Decl(interfaceDeclaration3.ts, 26, 40)) ->I1 : Symbol(M2.M3.I1, Decl(interfaceDeclaration3.ts, 27, 22)) +>I1 : Symbol(M2.M3.I1, Decl(interfaceDeclaration3.ts, 27, 25)) public item:string; >item : Symbol(C5.item, Decl(interfaceDeclaration3.ts, 19, 34)) } } -export module M2 { +export namespace M2 { >M2 : Symbol(M2, Decl(interfaceDeclaration3.ts, 22, 1)) export interface I1 { item:string; } ->I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 24, 18)) +>I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 24, 21)) >item : Symbol(I1.item, Decl(interfaceDeclaration3.ts, 25, 25)) export interface I2 { item:string; } >I2 : Symbol(I2, Decl(interfaceDeclaration3.ts, 25, 40)) >item : Symbol(I2.item, Decl(interfaceDeclaration3.ts, 26, 25)) - export module M3 { + export namespace M3 { >M3 : Symbol(M3, Decl(interfaceDeclaration3.ts, 26, 40)) export interface I1 { item:string; } ->I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 27, 22)) +>I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 27, 25)) >item : Symbol(I1.item, Decl(interfaceDeclaration3.ts, 28, 29)) } class C1 implements I1 { >C1 : Symbol(C1, Decl(interfaceDeclaration3.ts, 29, 5)) ->I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 24, 18)) +>I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 24, 21)) public item:number; >item : Symbol(C1.item, Decl(interfaceDeclaration3.ts, 30, 28)) } class C2 implements I1 { >C2 : Symbol(C2, Decl(interfaceDeclaration3.ts, 32, 5)) ->I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 24, 18)) +>I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 24, 21)) public item:string; >item : Symbol(C2.item, Decl(interfaceDeclaration3.ts, 33, 28)) @@ -112,9 +112,9 @@ class C1 implements I1 { class C2 implements M2.I1 { >C2 : Symbol(C2, Decl(interfaceDeclaration3.ts, 43, 1)) ->M2.I1 : Symbol(M2.I1, Decl(interfaceDeclaration3.ts, 24, 18)) +>M2.I1 : Symbol(M2.I1, Decl(interfaceDeclaration3.ts, 24, 21)) >M2 : Symbol(M2, Decl(interfaceDeclaration3.ts, 22, 1)) ->I1 : Symbol(M2.I1, Decl(interfaceDeclaration3.ts, 24, 18)) +>I1 : Symbol(M2.I1, Decl(interfaceDeclaration3.ts, 24, 21)) public item:string; >item : Symbol(C2.item, Decl(interfaceDeclaration3.ts, 45, 27)) @@ -122,11 +122,11 @@ class C2 implements M2.I1 { class C3 implements M2.M3.I1 { >C3 : Symbol(C3, Decl(interfaceDeclaration3.ts, 47, 1)) ->M2.M3.I1 : Symbol(M2.M3.I1, Decl(interfaceDeclaration3.ts, 27, 22)) +>M2.M3.I1 : Symbol(M2.M3.I1, Decl(interfaceDeclaration3.ts, 27, 25)) >M2.M3 : Symbol(M2.M3, Decl(interfaceDeclaration3.ts, 26, 40)) >M2 : Symbol(M2, Decl(interfaceDeclaration3.ts, 22, 1)) >M3 : Symbol(M2.M3, Decl(interfaceDeclaration3.ts, 26, 40)) ->I1 : Symbol(M2.M3.I1, Decl(interfaceDeclaration3.ts, 27, 22)) +>I1 : Symbol(M2.M3.I1, Decl(interfaceDeclaration3.ts, 27, 25)) public item:string; >item : Symbol(C3.item, Decl(interfaceDeclaration3.ts, 49, 30)) diff --git a/tests/baselines/reference/interfaceDeclaration3.types b/tests/baselines/reference/interfaceDeclaration3.types index 2345167513919..c62f72f36a4b0 100644 --- a/tests/baselines/reference/interfaceDeclaration3.types +++ b/tests/baselines/reference/interfaceDeclaration3.types @@ -5,7 +5,7 @@ interface I1 { item:number; } >item : number > : ^^^^^^ -module M1 { +namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ @@ -69,7 +69,7 @@ module M1 { } } -export module M2 { +export namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ @@ -81,7 +81,7 @@ export module M2 { >item : string > : ^^^^^^ - export module M3 { + export namespace M3 { export interface I1 { item:string; } >item : string > : ^^^^^^ diff --git a/tests/baselines/reference/interfaceDeclaration4.errors.txt b/tests/baselines/reference/interfaceDeclaration4.errors.txt index e19ccdeae1391..5c6d33ffd2d53 100644 --- a/tests/baselines/reference/interfaceDeclaration4.errors.txt +++ b/tests/baselines/reference/interfaceDeclaration4.errors.txt @@ -13,7 +13,7 @@ interfaceDeclaration4.ts(39,15): error TS2304: Cannot find name 'I1'. ==== interfaceDeclaration4.ts (6 errors) ==== // Import this module when test harness supports external modules. Also remove the internal module below. // import Foo = require("interfaceDeclaration5") - module Foo { + namespace Foo { export interface I1 { item: string; } export class C1 { } } diff --git a/tests/baselines/reference/interfaceDeclaration4.js b/tests/baselines/reference/interfaceDeclaration4.js index 0e4138086c58e..78ae453536c6c 100644 --- a/tests/baselines/reference/interfaceDeclaration4.js +++ b/tests/baselines/reference/interfaceDeclaration4.js @@ -3,7 +3,7 @@ //// [interfaceDeclaration4.ts] // Import this module when test harness supports external modules. Also remove the internal module below. // import Foo = require("interfaceDeclaration5") -module Foo { +namespace Foo { export interface I1 { item: string; } export class C1 { } } diff --git a/tests/baselines/reference/interfaceDeclaration4.symbols b/tests/baselines/reference/interfaceDeclaration4.symbols index 100e41040a9f8..bb24f07436daf 100644 --- a/tests/baselines/reference/interfaceDeclaration4.symbols +++ b/tests/baselines/reference/interfaceDeclaration4.symbols @@ -3,11 +3,11 @@ === interfaceDeclaration4.ts === // Import this module when test harness supports external modules. Also remove the internal module below. // import Foo = require("interfaceDeclaration5") -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(interfaceDeclaration4.ts, 0, 0), Decl(interfaceDeclaration4.ts, 35, 30)) export interface I1 { item: string; } ->I1 : Symbol(I1, Decl(interfaceDeclaration4.ts, 2, 12)) +>I1 : Symbol(I1, Decl(interfaceDeclaration4.ts, 2, 15)) >item : Symbol(I1.item, Decl(interfaceDeclaration4.ts, 3, 25)) export class C1 { } @@ -16,9 +16,9 @@ module Foo { class C1 implements Foo.I1 { >C1 : Symbol(C1, Decl(interfaceDeclaration4.ts, 5, 1)) ->Foo.I1 : Symbol(Foo.I1, Decl(interfaceDeclaration4.ts, 2, 12)) +>Foo.I1 : Symbol(Foo.I1, Decl(interfaceDeclaration4.ts, 2, 15)) >Foo : Symbol(Foo, Decl(interfaceDeclaration4.ts, 0, 0), Decl(interfaceDeclaration4.ts, 35, 30)) ->I1 : Symbol(Foo.I1, Decl(interfaceDeclaration4.ts, 2, 12)) +>I1 : Symbol(Foo.I1, Decl(interfaceDeclaration4.ts, 2, 15)) public item:string; >item : Symbol(C1.item, Decl(interfaceDeclaration4.ts, 7, 28)) @@ -27,9 +27,9 @@ class C1 implements Foo.I1 { // Allowed interface I2 extends Foo.I1 { >I2 : Symbol(I2, Decl(interfaceDeclaration4.ts, 9, 1)) ->Foo.I1 : Symbol(Foo.I1, Decl(interfaceDeclaration4.ts, 2, 12)) +>Foo.I1 : Symbol(Foo.I1, Decl(interfaceDeclaration4.ts, 2, 15)) >Foo : Symbol(Foo, Decl(interfaceDeclaration4.ts, 0, 0), Decl(interfaceDeclaration4.ts, 35, 30)) ->I1 : Symbol(Foo.I1, Decl(interfaceDeclaration4.ts, 2, 12)) +>I1 : Symbol(Foo.I1, Decl(interfaceDeclaration4.ts, 2, 15)) item:string; >item : Symbol(I2.item, Decl(interfaceDeclaration4.ts, 12, 29)) @@ -38,9 +38,9 @@ interface I2 extends Foo.I1 { // Negative Case interface I3 extends Foo.I1 { >I3 : Symbol(I3, Decl(interfaceDeclaration4.ts, 14, 1)) ->Foo.I1 : Symbol(Foo.I1, Decl(interfaceDeclaration4.ts, 2, 12)) +>Foo.I1 : Symbol(Foo.I1, Decl(interfaceDeclaration4.ts, 2, 15)) >Foo : Symbol(Foo, Decl(interfaceDeclaration4.ts, 0, 0), Decl(interfaceDeclaration4.ts, 35, 30)) ->I1 : Symbol(Foo.I1, Decl(interfaceDeclaration4.ts, 2, 12)) +>I1 : Symbol(Foo.I1, Decl(interfaceDeclaration4.ts, 2, 15)) item:number; >item : Symbol(I3.item, Decl(interfaceDeclaration4.ts, 17, 29)) @@ -48,9 +48,9 @@ interface I3 extends Foo.I1 { interface I4 extends Foo.I1 { >I4 : Symbol(I4, Decl(interfaceDeclaration4.ts, 19, 1)) ->Foo.I1 : Symbol(Foo.I1, Decl(interfaceDeclaration4.ts, 2, 12)) +>Foo.I1 : Symbol(Foo.I1, Decl(interfaceDeclaration4.ts, 2, 15)) >Foo : Symbol(Foo, Decl(interfaceDeclaration4.ts, 0, 0), Decl(interfaceDeclaration4.ts, 35, 30)) ->I1 : Symbol(Foo.I1, Decl(interfaceDeclaration4.ts, 2, 12)) +>I1 : Symbol(Foo.I1, Decl(interfaceDeclaration4.ts, 2, 15)) token:string; >token : Symbol(I4.token, Decl(interfaceDeclaration4.ts, 21, 29)) @@ -78,9 +78,9 @@ interface I6 extends Foo.C1 { } class C3 implements Foo.I1 { } >C3 : Symbol(C3, Decl(interfaceDeclaration4.ts, 33, 31)) ->Foo.I1 : Symbol(Foo.I1, Decl(interfaceDeclaration4.ts, 2, 12)) +>Foo.I1 : Symbol(Foo.I1, Decl(interfaceDeclaration4.ts, 2, 15)) >Foo : Symbol(Foo, Decl(interfaceDeclaration4.ts, 0, 0), Decl(interfaceDeclaration4.ts, 35, 30)) ->I1 : Symbol(Foo.I1, Decl(interfaceDeclaration4.ts, 2, 12)) +>I1 : Symbol(Foo.I1, Decl(interfaceDeclaration4.ts, 2, 15)) // Negative case interface Foo.I1 { } diff --git a/tests/baselines/reference/interfaceDeclaration4.types b/tests/baselines/reference/interfaceDeclaration4.types index 88e425ffa2b36..ec34eea731d68 100644 --- a/tests/baselines/reference/interfaceDeclaration4.types +++ b/tests/baselines/reference/interfaceDeclaration4.types @@ -3,7 +3,7 @@ === interfaceDeclaration4.ts === // Import this module when test harness supports external modules. Also remove the internal module below. // import Foo = require("interfaceDeclaration5") -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/interfaceInReopenedModule.js b/tests/baselines/reference/interfaceInReopenedModule.js index 3e32fccf15570..d0b65251a8d6c 100644 --- a/tests/baselines/reference/interfaceInReopenedModule.js +++ b/tests/baselines/reference/interfaceInReopenedModule.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/interfaceInReopenedModule.ts] //// //// [interfaceInReopenedModule.ts] -module m { +namespace m { } // In second instance of same module, exported interface is not visible -module m { +namespace m { interface f {} export class n { private n: f; diff --git a/tests/baselines/reference/interfaceInReopenedModule.symbols b/tests/baselines/reference/interfaceInReopenedModule.symbols index a6fa2c8879f2b..4bfd38351321f 100644 --- a/tests/baselines/reference/interfaceInReopenedModule.symbols +++ b/tests/baselines/reference/interfaceInReopenedModule.symbols @@ -1,23 +1,23 @@ //// [tests/cases/compiler/interfaceInReopenedModule.ts] //// === interfaceInReopenedModule.ts === -module m { +namespace m { >m : Symbol(m, Decl(interfaceInReopenedModule.ts, 0, 0), Decl(interfaceInReopenedModule.ts, 1, 1)) } // In second instance of same module, exported interface is not visible -module m { +namespace m { >m : Symbol(m, Decl(interfaceInReopenedModule.ts, 0, 0), Decl(interfaceInReopenedModule.ts, 1, 1)) interface f {} ->f : Symbol(f, Decl(interfaceInReopenedModule.ts, 4, 10)) +>f : Symbol(f, Decl(interfaceInReopenedModule.ts, 4, 13)) export class n { >n : Symbol(n, Decl(interfaceInReopenedModule.ts, 5, 18)) private n: f; >n : Symbol(n.n, Decl(interfaceInReopenedModule.ts, 6, 20)) ->f : Symbol(f, Decl(interfaceInReopenedModule.ts, 4, 10)) +>f : Symbol(f, Decl(interfaceInReopenedModule.ts, 4, 13)) } } diff --git a/tests/baselines/reference/interfaceInReopenedModule.types b/tests/baselines/reference/interfaceInReopenedModule.types index 08d662719041d..3d44ab76f8180 100644 --- a/tests/baselines/reference/interfaceInReopenedModule.types +++ b/tests/baselines/reference/interfaceInReopenedModule.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/interfaceInReopenedModule.ts] //// === interfaceInReopenedModule.ts === -module m { +namespace m { } // In second instance of same module, exported interface is not visible -module m { +namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/interfaceNameAsIdentifier.errors.txt b/tests/baselines/reference/interfaceNameAsIdentifier.errors.txt index 15cd072ad9638..196db4f55b54f 100644 --- a/tests/baselines/reference/interfaceNameAsIdentifier.errors.txt +++ b/tests/baselines/reference/interfaceNameAsIdentifier.errors.txt @@ -10,7 +10,7 @@ interfaceNameAsIdentifier.ts(12,1): error TS2708: Cannot use namespace 'm2' as a ~ !!! error TS2693: 'C' only refers to a type, but is being used as a value here. - module m2 { + namespace m2 { export interface C { (): void; } diff --git a/tests/baselines/reference/interfaceNameAsIdentifier.js b/tests/baselines/reference/interfaceNameAsIdentifier.js index 36e8cc1a7724d..d36f6f5b6b202 100644 --- a/tests/baselines/reference/interfaceNameAsIdentifier.js +++ b/tests/baselines/reference/interfaceNameAsIdentifier.js @@ -6,7 +6,7 @@ interface C { } C(); -module m2 { +namespace m2 { export interface C { (): void; } diff --git a/tests/baselines/reference/interfaceNameAsIdentifier.symbols b/tests/baselines/reference/interfaceNameAsIdentifier.symbols index 15f68a0c370fa..c6aa0bb19fd5f 100644 --- a/tests/baselines/reference/interfaceNameAsIdentifier.symbols +++ b/tests/baselines/reference/interfaceNameAsIdentifier.symbols @@ -8,11 +8,11 @@ interface C { } C(); -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(interfaceNameAsIdentifier.ts, 3, 4)) export interface C { ->C : Symbol(C, Decl(interfaceNameAsIdentifier.ts, 5, 11)) +>C : Symbol(C, Decl(interfaceNameAsIdentifier.ts, 5, 14)) (): void; } diff --git a/tests/baselines/reference/interfaceNameAsIdentifier.types b/tests/baselines/reference/interfaceNameAsIdentifier.types index 661f9d4a7f16c..fc52835a1ea75 100644 --- a/tests/baselines/reference/interfaceNameAsIdentifier.types +++ b/tests/baselines/reference/interfaceNameAsIdentifier.types @@ -10,7 +10,7 @@ C(); >C : any > : ^^^ -module m2 { +namespace m2 { export interface C { (): void; } diff --git a/tests/baselines/reference/interfacePropertiesWithSameName2.errors.txt b/tests/baselines/reference/interfacePropertiesWithSameName2.errors.txt index 2d20eda507329..07549d2f3b410 100644 --- a/tests/baselines/reference/interfacePropertiesWithSameName2.errors.txt +++ b/tests/baselines/reference/interfacePropertiesWithSameName2.errors.txt @@ -22,7 +22,7 @@ interfacePropertiesWithSameName2.ts(26,11): error TS2320: Interface 'MoverShaker } // Inside a module - declare module MoversAndShakers { + declare namespace MoversAndShakers { export class Mover { move(): void; getStatus(): { speed: number; }; diff --git a/tests/baselines/reference/interfacePropertiesWithSameName2.js b/tests/baselines/reference/interfacePropertiesWithSameName2.js index 80018b4bdbc73..632c0eba8176c 100644 --- a/tests/baselines/reference/interfacePropertiesWithSameName2.js +++ b/tests/baselines/reference/interfacePropertiesWithSameName2.js @@ -15,7 +15,7 @@ interface MoverShaker extends Mover, Shaker { } // Inside a module -declare module MoversAndShakers { +declare namespace MoversAndShakers { export class Mover { move(): void; getStatus(): { speed: number; }; diff --git a/tests/baselines/reference/interfacePropertiesWithSameName2.symbols b/tests/baselines/reference/interfacePropertiesWithSameName2.symbols index 811f9cab9267a..55d71c5fe1d2d 100644 --- a/tests/baselines/reference/interfacePropertiesWithSameName2.symbols +++ b/tests/baselines/reference/interfacePropertiesWithSameName2.symbols @@ -30,11 +30,11 @@ interface MoverShaker extends Mover, Shaker { } // Inside a module -declare module MoversAndShakers { +declare namespace MoversAndShakers { >MoversAndShakers : Symbol(MoversAndShakers, Decl(interfacePropertiesWithSameName2.ts, 11, 1)) export class Mover { ->Mover : Symbol(Mover, Decl(interfacePropertiesWithSameName2.ts, 14, 33)) +>Mover : Symbol(Mover, Decl(interfacePropertiesWithSameName2.ts, 14, 36)) move(): void; >move : Symbol(Mover.move, Decl(interfacePropertiesWithSameName2.ts, 15, 24)) @@ -57,18 +57,18 @@ declare module MoversAndShakers { interface MoverShaker2 extends MoversAndShakers.Mover, MoversAndShakers.Shaker { } // error >MoverShaker2 : Symbol(MoverShaker2, Decl(interfacePropertiesWithSameName2.ts, 23, 1)) ->MoversAndShakers.Mover : Symbol(MoversAndShakers.Mover, Decl(interfacePropertiesWithSameName2.ts, 14, 33)) +>MoversAndShakers.Mover : Symbol(MoversAndShakers.Mover, Decl(interfacePropertiesWithSameName2.ts, 14, 36)) >MoversAndShakers : Symbol(MoversAndShakers, Decl(interfacePropertiesWithSameName2.ts, 11, 1)) ->Mover : Symbol(MoversAndShakers.Mover, Decl(interfacePropertiesWithSameName2.ts, 14, 33)) +>Mover : Symbol(MoversAndShakers.Mover, Decl(interfacePropertiesWithSameName2.ts, 14, 36)) >MoversAndShakers.Shaker : Symbol(MoversAndShakers.Shaker, Decl(interfacePropertiesWithSameName2.ts, 18, 5)) >MoversAndShakers : Symbol(MoversAndShakers, Decl(interfacePropertiesWithSameName2.ts, 11, 1)) >Shaker : Symbol(MoversAndShakers.Shaker, Decl(interfacePropertiesWithSameName2.ts, 18, 5)) interface MoverShaker3 extends MoversAndShakers.Mover, MoversAndShakers.Shaker { >MoverShaker3 : Symbol(MoverShaker3, Decl(interfacePropertiesWithSameName2.ts, 25, 82)) ->MoversAndShakers.Mover : Symbol(MoversAndShakers.Mover, Decl(interfacePropertiesWithSameName2.ts, 14, 33)) +>MoversAndShakers.Mover : Symbol(MoversAndShakers.Mover, Decl(interfacePropertiesWithSameName2.ts, 14, 36)) >MoversAndShakers : Symbol(MoversAndShakers, Decl(interfacePropertiesWithSameName2.ts, 11, 1)) ->Mover : Symbol(MoversAndShakers.Mover, Decl(interfacePropertiesWithSameName2.ts, 14, 33)) +>Mover : Symbol(MoversAndShakers.Mover, Decl(interfacePropertiesWithSameName2.ts, 14, 36)) >MoversAndShakers.Shaker : Symbol(MoversAndShakers.Shaker, Decl(interfacePropertiesWithSameName2.ts, 18, 5)) >MoversAndShakers : Symbol(MoversAndShakers, Decl(interfacePropertiesWithSameName2.ts, 11, 1)) >Shaker : Symbol(MoversAndShakers.Shaker, Decl(interfacePropertiesWithSameName2.ts, 18, 5)) diff --git a/tests/baselines/reference/interfacePropertiesWithSameName2.types b/tests/baselines/reference/interfacePropertiesWithSameName2.types index 483dc77f99e7d..0620a7641f900 100644 --- a/tests/baselines/reference/interfacePropertiesWithSameName2.types +++ b/tests/baselines/reference/interfacePropertiesWithSameName2.types @@ -29,7 +29,7 @@ interface MoverShaker extends Mover, Shaker { } // Inside a module -declare module MoversAndShakers { +declare namespace MoversAndShakers { >MoversAndShakers : typeof MoversAndShakers > : ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/interfaceThatIndirectlyInheritsFromItself.errors.txt b/tests/baselines/reference/interfaceThatIndirectlyInheritsFromItself.errors.txt index 6115e058ab48f..a61e4790b82d1 100644 --- a/tests/baselines/reference/interfaceThatIndirectlyInheritsFromItself.errors.txt +++ b/tests/baselines/reference/interfaceThatIndirectlyInheritsFromItself.errors.txt @@ -25,7 +25,7 @@ interfaceThatIndirectlyInheritsFromItself.ts(22,15): error TS2310: Type 'Derived z: string; } - module Generic { + namespace Generic { interface Base extends Derived2 { // error ~~~~ !!! error TS2310: Type 'Base' recursively references itself as a base type. diff --git a/tests/baselines/reference/interfaceThatIndirectlyInheritsFromItself.js b/tests/baselines/reference/interfaceThatIndirectlyInheritsFromItself.js index f9e5276cacf80..f3bea8f11ca60 100644 --- a/tests/baselines/reference/interfaceThatIndirectlyInheritsFromItself.js +++ b/tests/baselines/reference/interfaceThatIndirectlyInheritsFromItself.js @@ -13,7 +13,7 @@ interface Derived2 extends Derived { z: string; } -module Generic { +namespace Generic { interface Base extends Derived2 { // error x: string; } diff --git a/tests/baselines/reference/interfaceThatIndirectlyInheritsFromItself.symbols b/tests/baselines/reference/interfaceThatIndirectlyInheritsFromItself.symbols index 2c67a40027199..c6a955cbaec07 100644 --- a/tests/baselines/reference/interfaceThatIndirectlyInheritsFromItself.symbols +++ b/tests/baselines/reference/interfaceThatIndirectlyInheritsFromItself.symbols @@ -25,11 +25,11 @@ interface Derived2 extends Derived { >z : Symbol(Derived2.z, Decl(interfaceThatIndirectlyInheritsFromItself.ts, 8, 36)) } -module Generic { +namespace Generic { >Generic : Symbol(Generic, Decl(interfaceThatIndirectlyInheritsFromItself.ts, 10, 1)) interface Base extends Derived2 { // error ->Base : Symbol(Base, Decl(interfaceThatIndirectlyInheritsFromItself.ts, 12, 16)) +>Base : Symbol(Base, Decl(interfaceThatIndirectlyInheritsFromItself.ts, 12, 19)) >T : Symbol(T, Decl(interfaceThatIndirectlyInheritsFromItself.ts, 13, 19)) >Derived2 : Symbol(Derived2, Decl(interfaceThatIndirectlyInheritsFromItself.ts, 19, 5)) >T : Symbol(T, Decl(interfaceThatIndirectlyInheritsFromItself.ts, 13, 19)) @@ -41,7 +41,7 @@ module Generic { interface Derived extends Base { >Derived : Symbol(Derived, Decl(interfaceThatIndirectlyInheritsFromItself.ts, 15, 5)) >T : Symbol(T, Decl(interfaceThatIndirectlyInheritsFromItself.ts, 17, 22)) ->Base : Symbol(Base, Decl(interfaceThatIndirectlyInheritsFromItself.ts, 12, 16)) +>Base : Symbol(Base, Decl(interfaceThatIndirectlyInheritsFromItself.ts, 12, 19)) >T : Symbol(T, Decl(interfaceThatIndirectlyInheritsFromItself.ts, 17, 22)) y: string; diff --git a/tests/baselines/reference/interfaceThatIndirectlyInheritsFromItself.types b/tests/baselines/reference/interfaceThatIndirectlyInheritsFromItself.types index 1176d1a95cb2c..55a542cbd41b2 100644 --- a/tests/baselines/reference/interfaceThatIndirectlyInheritsFromItself.types +++ b/tests/baselines/reference/interfaceThatIndirectlyInheritsFromItself.types @@ -19,7 +19,7 @@ interface Derived2 extends Derived { > : ^^^^^^ } -module Generic { +namespace Generic { interface Base extends Derived2 { // error x: string; >x : string diff --git a/tests/baselines/reference/interfaceWithMultipleBaseTypes.errors.txt b/tests/baselines/reference/interfaceWithMultipleBaseTypes.errors.txt index be02808aa9a7b..6a2d617bf41f1 100644 --- a/tests/baselines/reference/interfaceWithMultipleBaseTypes.errors.txt +++ b/tests/baselines/reference/interfaceWithMultipleBaseTypes.errors.txt @@ -48,7 +48,7 @@ interfaceWithMultipleBaseTypes.ts(60,15): error TS2430: Interface 'Derived5' } } - module Generic { + namespace Generic { interface Base1 { x: { a: T; diff --git a/tests/baselines/reference/interfaceWithMultipleBaseTypes.js b/tests/baselines/reference/interfaceWithMultipleBaseTypes.js index 6fcf11e04c942..304a5c393ce12 100644 --- a/tests/baselines/reference/interfaceWithMultipleBaseTypes.js +++ b/tests/baselines/reference/interfaceWithMultipleBaseTypes.js @@ -27,7 +27,7 @@ interface Derived2 extends Base1, Base2 { // error } } -module Generic { +namespace Generic { interface Base1 { x: { a: T; diff --git a/tests/baselines/reference/interfaceWithMultipleBaseTypes.symbols b/tests/baselines/reference/interfaceWithMultipleBaseTypes.symbols index 88c81f202bf10..a4ea08cb6f2fe 100644 --- a/tests/baselines/reference/interfaceWithMultipleBaseTypes.symbols +++ b/tests/baselines/reference/interfaceWithMultipleBaseTypes.symbols @@ -53,11 +53,11 @@ interface Derived2 extends Base1, Base2 { // error } } -module Generic { +namespace Generic { >Generic : Symbol(Generic, Decl(interfaceWithMultipleBaseTypes.ts, 24, 1)) interface Base1 { ->Base1 : Symbol(Base1, Decl(interfaceWithMultipleBaseTypes.ts, 26, 16)) +>Base1 : Symbol(Base1, Decl(interfaceWithMultipleBaseTypes.ts, 26, 19)) >T : Symbol(T, Decl(interfaceWithMultipleBaseTypes.ts, 27, 20)) x: { @@ -85,7 +85,7 @@ module Generic { interface Derived extends Base1, Base2 { >Derived : Symbol(Derived, Decl(interfaceWithMultipleBaseTypes.ts, 37, 5)) >T : Symbol(T, Decl(interfaceWithMultipleBaseTypes.ts, 39, 22)) ->Base1 : Symbol(Base1, Decl(interfaceWithMultipleBaseTypes.ts, 26, 16)) +>Base1 : Symbol(Base1, Decl(interfaceWithMultipleBaseTypes.ts, 26, 19)) >Base2 : Symbol(Base2, Decl(interfaceWithMultipleBaseTypes.ts, 31, 5)) x: { @@ -101,7 +101,7 @@ module Generic { >Derived2 : Symbol(Derived2, Decl(interfaceWithMultipleBaseTypes.ts, 43, 5)) >T : Symbol(T, Decl(interfaceWithMultipleBaseTypes.ts, 45, 23)) >U : Symbol(U, Decl(interfaceWithMultipleBaseTypes.ts, 45, 25)) ->Base1 : Symbol(Base1, Decl(interfaceWithMultipleBaseTypes.ts, 26, 16)) +>Base1 : Symbol(Base1, Decl(interfaceWithMultipleBaseTypes.ts, 26, 19)) >T : Symbol(T, Decl(interfaceWithMultipleBaseTypes.ts, 45, 23)) >Base2 : Symbol(Base2, Decl(interfaceWithMultipleBaseTypes.ts, 31, 5)) >U : Symbol(U, Decl(interfaceWithMultipleBaseTypes.ts, 45, 25)) @@ -120,13 +120,13 @@ module Generic { interface Derived3 extends Base1, Base2 { } // error >Derived3 : Symbol(Derived3, Decl(interfaceWithMultipleBaseTypes.ts, 49, 5)) >T : Symbol(T, Decl(interfaceWithMultipleBaseTypes.ts, 51, 23)) ->Base1 : Symbol(Base1, Decl(interfaceWithMultipleBaseTypes.ts, 26, 16)) +>Base1 : Symbol(Base1, Decl(interfaceWithMultipleBaseTypes.ts, 26, 19)) >Base2 : Symbol(Base2, Decl(interfaceWithMultipleBaseTypes.ts, 31, 5)) interface Derived4 extends Base1, Base2 { // error >Derived4 : Symbol(Derived4, Decl(interfaceWithMultipleBaseTypes.ts, 51, 66)) >T : Symbol(T, Decl(interfaceWithMultipleBaseTypes.ts, 53, 23)) ->Base1 : Symbol(Base1, Decl(interfaceWithMultipleBaseTypes.ts, 26, 16)) +>Base1 : Symbol(Base1, Decl(interfaceWithMultipleBaseTypes.ts, 26, 19)) >Base2 : Symbol(Base2, Decl(interfaceWithMultipleBaseTypes.ts, 31, 5)) x: { @@ -143,7 +143,7 @@ module Generic { interface Derived5 extends Base1, Base2 { // error >Derived5 : Symbol(Derived5, Decl(interfaceWithMultipleBaseTypes.ts, 57, 5)) >T : Symbol(T, Decl(interfaceWithMultipleBaseTypes.ts, 59, 23)) ->Base1 : Symbol(Base1, Decl(interfaceWithMultipleBaseTypes.ts, 26, 16)) +>Base1 : Symbol(Base1, Decl(interfaceWithMultipleBaseTypes.ts, 26, 19)) >T : Symbol(T, Decl(interfaceWithMultipleBaseTypes.ts, 59, 23)) >Base2 : Symbol(Base2, Decl(interfaceWithMultipleBaseTypes.ts, 31, 5)) >T : Symbol(T, Decl(interfaceWithMultipleBaseTypes.ts, 59, 23)) diff --git a/tests/baselines/reference/interfaceWithMultipleBaseTypes.types b/tests/baselines/reference/interfaceWithMultipleBaseTypes.types index 8a1bfb56f6095..99686372f6e4d 100644 --- a/tests/baselines/reference/interfaceWithMultipleBaseTypes.types +++ b/tests/baselines/reference/interfaceWithMultipleBaseTypes.types @@ -51,7 +51,7 @@ interface Derived2 extends Base1, Base2 { // error } } -module Generic { +namespace Generic { interface Base1 { x: { >x : { a: T; } diff --git a/tests/baselines/reference/interfaceWithPropertyOfEveryType.js b/tests/baselines/reference/interfaceWithPropertyOfEveryType.js index 3c6534a67690e..171a11026496f 100644 --- a/tests/baselines/reference/interfaceWithPropertyOfEveryType.js +++ b/tests/baselines/reference/interfaceWithPropertyOfEveryType.js @@ -3,7 +3,7 @@ //// [interfaceWithPropertyOfEveryType.ts] class C { foo: string; } function f1() { } -module M { +namespace M { export var y = 1; } enum E { A } diff --git a/tests/baselines/reference/interfaceWithPropertyOfEveryType.symbols b/tests/baselines/reference/interfaceWithPropertyOfEveryType.symbols index f9977c50c6569..ca2f9176bdabf 100644 --- a/tests/baselines/reference/interfaceWithPropertyOfEveryType.symbols +++ b/tests/baselines/reference/interfaceWithPropertyOfEveryType.symbols @@ -8,7 +8,7 @@ class C { foo: string; } function f1() { } >f1 : Symbol(f1, Decl(interfaceWithPropertyOfEveryType.ts, 0, 24)) -module M { +namespace M { >M : Symbol(M, Decl(interfaceWithPropertyOfEveryType.ts, 1, 17)) export var y = 1; diff --git a/tests/baselines/reference/interfaceWithPropertyOfEveryType.types b/tests/baselines/reference/interfaceWithPropertyOfEveryType.types index ebe5752bb6c6a..0f9957c4b1142 100644 --- a/tests/baselines/reference/interfaceWithPropertyOfEveryType.types +++ b/tests/baselines/reference/interfaceWithPropertyOfEveryType.types @@ -11,7 +11,7 @@ function f1() { } >f1 : () => void > : ^^^^^^^^^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasClass.js b/tests/baselines/reference/internalAliasClass.js index 2708737bba61f..e9e0607d06883 100644 --- a/tests/baselines/reference/internalAliasClass.js +++ b/tests/baselines/reference/internalAliasClass.js @@ -1,12 +1,12 @@ //// [tests/cases/compiler/internalAliasClass.ts] //// //// [internalAliasClass.ts] -module a { +namespace a { export class c { } } -module c { +namespace c { import b = a.c; export var x: b = new b(); } diff --git a/tests/baselines/reference/internalAliasClass.symbols b/tests/baselines/reference/internalAliasClass.symbols index aab7fb72d36d3..14487c45fef7d 100644 --- a/tests/baselines/reference/internalAliasClass.symbols +++ b/tests/baselines/reference/internalAliasClass.symbols @@ -1,24 +1,24 @@ //// [tests/cases/compiler/internalAliasClass.ts] //// === internalAliasClass.ts === -module a { +namespace a { >a : Symbol(a, Decl(internalAliasClass.ts, 0, 0)) export class c { ->c : Symbol(c, Decl(internalAliasClass.ts, 0, 10)) +>c : Symbol(c, Decl(internalAliasClass.ts, 0, 13)) } } -module c { +namespace c { >c : Symbol(c, Decl(internalAliasClass.ts, 3, 1)) import b = a.c; ->b : Symbol(b, Decl(internalAliasClass.ts, 5, 10)) +>b : Symbol(b, Decl(internalAliasClass.ts, 5, 13)) >a : Symbol(a, Decl(internalAliasClass.ts, 0, 0)) ->c : Symbol(b, Decl(internalAliasClass.ts, 0, 10)) +>c : Symbol(b, Decl(internalAliasClass.ts, 0, 13)) export var x: b = new b(); >x : Symbol(x, Decl(internalAliasClass.ts, 7, 14)) ->b : Symbol(b, Decl(internalAliasClass.ts, 5, 10)) ->b : Symbol(b, Decl(internalAliasClass.ts, 5, 10)) +>b : Symbol(b, Decl(internalAliasClass.ts, 5, 13)) +>b : Symbol(b, Decl(internalAliasClass.ts, 5, 13)) } diff --git a/tests/baselines/reference/internalAliasClass.types b/tests/baselines/reference/internalAliasClass.types index a10879936dd62..d4571a67b7011 100644 --- a/tests/baselines/reference/internalAliasClass.types +++ b/tests/baselines/reference/internalAliasClass.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasClass.ts] //// === internalAliasClass.ts === -module a { +namespace a { >a : typeof a > : ^^^^^^^^ @@ -11,7 +11,7 @@ module a { } } -module c { +namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js index 17b82cdfe6b61..d082e1b5e1097 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasClassInsideLocalModuleWithExport.ts] //// //// [internalAliasClassInsideLocalModuleWithExport.ts] -export module x { +export namespace x { export class c { foo(a: number) { return a; @@ -9,8 +9,8 @@ export module x { } } -export module m2 { - export module m3 { +export namespace m2 { + export namespace m3 { export import c = x.c; export var cProp = new c(); var cReturnVal = cProp.foo(10); diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.symbols b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.symbols index 50618350ff3fd..ae75d2aae3f7f 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.symbols +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasClassInsideLocalModuleWithExport.ts] //// === internalAliasClassInsideLocalModuleWithExport.ts === -export module x { +export namespace x { >x : Symbol(x, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 0, 0)) export class c { ->c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 0, 17)) +>c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 0, 20)) foo(a: number) { >foo : Symbol(c.foo, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 1, 20)) @@ -17,20 +17,20 @@ export module x { } } -export module m2 { +export namespace m2 { >m2 : Symbol(m2, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 6, 1)) - export module m3 { ->m3 : Symbol(m3, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 8, 18)) + export namespace m3 { +>m3 : Symbol(m3, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 8, 21)) export import c = x.c; ->c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 9, 22)) +>c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 9, 25)) >x : Symbol(x, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 0, 0)) ->c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 0, 17)) +>c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 0, 20)) export var cProp = new c(); >cProp : Symbol(cProp, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 11, 18)) ->c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 9, 22)) +>c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 9, 25)) var cReturnVal = cProp.foo(10); >cReturnVal : Symbol(cReturnVal, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 12, 11)) @@ -42,9 +42,9 @@ export module m2 { export var d = new m2.m3.c(); >d : Symbol(d, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 16, 10)) ->m2.m3.c : Symbol(m2.m3.c, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 9, 22)) ->m2.m3 : Symbol(m2.m3, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 8, 18)) +>m2.m3.c : Symbol(m2.m3.c, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 9, 25)) +>m2.m3 : Symbol(m2.m3, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 8, 21)) >m2 : Symbol(m2, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 6, 1)) ->m3 : Symbol(m2.m3, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 8, 18)) ->c : Symbol(m2.m3.c, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 9, 22)) +>m3 : Symbol(m2.m3, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 8, 21)) +>c : Symbol(m2.m3.c, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 9, 25)) diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.types index faca5b08b000d..3f2eef56bec41 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.types +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasClassInsideLocalModuleWithExport.ts] //// === internalAliasClassInsideLocalModuleWithExport.ts === -export module x { +export namespace x { >x : typeof x > : ^^^^^^^^ @@ -22,11 +22,11 @@ export module x { } } -export module m2 { +export namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ - export module m3 { + export namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js index fd0287a31a3ce..3f125cdd14557 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExport.ts] //// //// [internalAliasClassInsideLocalModuleWithoutExport.ts] -export module x { +export namespace x { export class c { foo(a: number) { return a; @@ -9,8 +9,8 @@ export module x { } } -export module m2 { - export module m3 { +export namespace m2 { + export namespace m3 { import c = x.c; export var cProp = new c(); var cReturnVal = cProp.foo(10); diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.symbols b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.symbols index 3da4653783013..cdf8ac6c8602e 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.symbols +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExport.ts] //// === internalAliasClassInsideLocalModuleWithoutExport.ts === -export module x { +export namespace x { >x : Symbol(x, Decl(internalAliasClassInsideLocalModuleWithoutExport.ts, 0, 0)) export class c { ->c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithoutExport.ts, 0, 17)) +>c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithoutExport.ts, 0, 20)) foo(a: number) { >foo : Symbol(c.foo, Decl(internalAliasClassInsideLocalModuleWithoutExport.ts, 1, 20)) @@ -17,20 +17,20 @@ export module x { } } -export module m2 { +export namespace m2 { >m2 : Symbol(m2, Decl(internalAliasClassInsideLocalModuleWithoutExport.ts, 6, 1)) - export module m3 { ->m3 : Symbol(m3, Decl(internalAliasClassInsideLocalModuleWithoutExport.ts, 8, 18)) + export namespace m3 { +>m3 : Symbol(m3, Decl(internalAliasClassInsideLocalModuleWithoutExport.ts, 8, 21)) import c = x.c; ->c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithoutExport.ts, 9, 22)) +>c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithoutExport.ts, 9, 25)) >x : Symbol(x, Decl(internalAliasClassInsideLocalModuleWithoutExport.ts, 0, 0)) ->c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithoutExport.ts, 0, 17)) +>c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithoutExport.ts, 0, 20)) export var cProp = new c(); >cProp : Symbol(cProp, Decl(internalAliasClassInsideLocalModuleWithoutExport.ts, 11, 18)) ->c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithoutExport.ts, 9, 22)) +>c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithoutExport.ts, 9, 25)) var cReturnVal = cProp.foo(10); >cReturnVal : Symbol(cReturnVal, Decl(internalAliasClassInsideLocalModuleWithoutExport.ts, 12, 11)) diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.types index 3dac0b8cea32f..a825153f55c22 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.types +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExport.ts] //// === internalAliasClassInsideLocalModuleWithoutExport.ts === -export module x { +export namespace x { >x : typeof x > : ^^^^^^^^ @@ -22,11 +22,11 @@ export module x { } } -export module m2 { +export namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ - export module m3 { + export namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.errors.txt b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.errors.txt index c2308deeee511..f350f76e8e988 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.errors.txt +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.errors.txt @@ -2,7 +2,7 @@ internalAliasClassInsideLocalModuleWithoutExportAccessError.ts(17,26): error TS2 ==== internalAliasClassInsideLocalModuleWithoutExportAccessError.ts (1 errors) ==== - export module x { + export namespace x { export class c { foo(a: number) { return a; @@ -10,8 +10,8 @@ internalAliasClassInsideLocalModuleWithoutExportAccessError.ts(17,26): error TS2 } } - export module m2 { - export module m3 { + export namespace m2 { + export namespace m3 { import c = x.c; export var cProp = new c(); var cReturnVal = cProp.foo(10); diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js index c71b4c2c88a7a..45e5bc64d89f1 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExportAccessError.ts] //// //// [internalAliasClassInsideLocalModuleWithoutExportAccessError.ts] -export module x { +export namespace x { export class c { foo(a: number) { return a; @@ -9,8 +9,8 @@ export module x { } } -export module m2 { - export module m3 { +export namespace m2 { + export namespace m3 { import c = x.c; export var cProp = new c(); var cReturnVal = cProp.foo(10); diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.symbols b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.symbols index 5cfa1a8a3961e..b76829932ef26 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.symbols +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExportAccessError.ts] //// === internalAliasClassInsideLocalModuleWithoutExportAccessError.ts === -export module x { +export namespace x { >x : Symbol(x, Decl(internalAliasClassInsideLocalModuleWithoutExportAccessError.ts, 0, 0)) export class c { ->c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithoutExportAccessError.ts, 0, 17)) +>c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithoutExportAccessError.ts, 0, 20)) foo(a: number) { >foo : Symbol(c.foo, Decl(internalAliasClassInsideLocalModuleWithoutExportAccessError.ts, 1, 20)) @@ -17,20 +17,20 @@ export module x { } } -export module m2 { +export namespace m2 { >m2 : Symbol(m2, Decl(internalAliasClassInsideLocalModuleWithoutExportAccessError.ts, 6, 1)) - export module m3 { ->m3 : Symbol(m3, Decl(internalAliasClassInsideLocalModuleWithoutExportAccessError.ts, 8, 18)) + export namespace m3 { +>m3 : Symbol(m3, Decl(internalAliasClassInsideLocalModuleWithoutExportAccessError.ts, 8, 21)) import c = x.c; ->c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithoutExportAccessError.ts, 9, 22)) +>c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithoutExportAccessError.ts, 9, 25)) >x : Symbol(x, Decl(internalAliasClassInsideLocalModuleWithoutExportAccessError.ts, 0, 0)) ->c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithoutExportAccessError.ts, 0, 17)) +>c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithoutExportAccessError.ts, 0, 20)) export var cProp = new c(); >cProp : Symbol(cProp, Decl(internalAliasClassInsideLocalModuleWithoutExportAccessError.ts, 11, 18)) ->c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithoutExportAccessError.ts, 9, 22)) +>c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithoutExportAccessError.ts, 9, 25)) var cReturnVal = cProp.foo(10); >cReturnVal : Symbol(cReturnVal, Decl(internalAliasClassInsideLocalModuleWithoutExportAccessError.ts, 12, 11)) @@ -42,7 +42,7 @@ export module m2 { export var d = new m2.m3.c(); >d : Symbol(d, Decl(internalAliasClassInsideLocalModuleWithoutExportAccessError.ts, 16, 10)) ->m2.m3 : Symbol(m2.m3, Decl(internalAliasClassInsideLocalModuleWithoutExportAccessError.ts, 8, 18)) +>m2.m3 : Symbol(m2.m3, Decl(internalAliasClassInsideLocalModuleWithoutExportAccessError.ts, 8, 21)) >m2 : Symbol(m2, Decl(internalAliasClassInsideLocalModuleWithoutExportAccessError.ts, 6, 1)) ->m3 : Symbol(m2.m3, Decl(internalAliasClassInsideLocalModuleWithoutExportAccessError.ts, 8, 18)) +>m3 : Symbol(m2.m3, Decl(internalAliasClassInsideLocalModuleWithoutExportAccessError.ts, 8, 21)) diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.types b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.types index fc0574857b2fd..4ec8bc12f89c0 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.types +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExportAccessError.ts] //// === internalAliasClassInsideLocalModuleWithoutExportAccessError.ts === -export module x { +export namespace x { >x : typeof x > : ^^^^^^^^ @@ -22,11 +22,11 @@ export module x { } } -export module m2 { +export namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ - export module m3 { + export namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js index b79bc7f0ec948..cc37023e37946 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithExport.ts] //// //// [internalAliasClassInsideTopLevelModuleWithExport.ts] -export module x { +export namespace x { export class c { foo(a: number) { return a; diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.symbols b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.symbols index 222d904c56cde..288812a59cd4f 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.symbols +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithExport.ts] //// === internalAliasClassInsideTopLevelModuleWithExport.ts === -export module x { +export namespace x { >x : Symbol(x, Decl(internalAliasClassInsideTopLevelModuleWithExport.ts, 0, 0)) export class c { ->c : Symbol(c, Decl(internalAliasClassInsideTopLevelModuleWithExport.ts, 0, 17)) +>c : Symbol(c, Decl(internalAliasClassInsideTopLevelModuleWithExport.ts, 0, 20)) foo(a: number) { >foo : Symbol(c.foo, Decl(internalAliasClassInsideTopLevelModuleWithExport.ts, 1, 20)) @@ -20,7 +20,7 @@ export module x { export import xc = x.c; >xc : Symbol(xc, Decl(internalAliasClassInsideTopLevelModuleWithExport.ts, 6, 1)) >x : Symbol(x, Decl(internalAliasClassInsideTopLevelModuleWithExport.ts, 0, 0)) ->c : Symbol(xc, Decl(internalAliasClassInsideTopLevelModuleWithExport.ts, 0, 17)) +>c : Symbol(xc, Decl(internalAliasClassInsideTopLevelModuleWithExport.ts, 0, 20)) export var cProp = new xc(); >cProp : Symbol(cProp, Decl(internalAliasClassInsideTopLevelModuleWithExport.ts, 9, 10)) diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.types index 8c862e5a4c488..1f2a295b8112c 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.types +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithExport.ts] //// === internalAliasClassInsideTopLevelModuleWithExport.ts === -export module x { +export namespace x { >x : typeof x > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js index 54f659a3e6f8a..1567b05fb19d1 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithoutExport.ts] //// //// [internalAliasClassInsideTopLevelModuleWithoutExport.ts] -export module x { +export namespace x { export class c { foo(a: number) { return a; diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.symbols b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.symbols index cd667da63a558..87f991b79c478 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.symbols +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithoutExport.ts] //// === internalAliasClassInsideTopLevelModuleWithoutExport.ts === -export module x { +export namespace x { >x : Symbol(x, Decl(internalAliasClassInsideTopLevelModuleWithoutExport.ts, 0, 0)) export class c { ->c : Symbol(c, Decl(internalAliasClassInsideTopLevelModuleWithoutExport.ts, 0, 17)) +>c : Symbol(c, Decl(internalAliasClassInsideTopLevelModuleWithoutExport.ts, 0, 20)) foo(a: number) { >foo : Symbol(c.foo, Decl(internalAliasClassInsideTopLevelModuleWithoutExport.ts, 1, 20)) @@ -20,7 +20,7 @@ export module x { import xc = x.c; >xc : Symbol(xc, Decl(internalAliasClassInsideTopLevelModuleWithoutExport.ts, 6, 1)) >x : Symbol(x, Decl(internalAliasClassInsideTopLevelModuleWithoutExport.ts, 0, 0)) ->c : Symbol(xc, Decl(internalAliasClassInsideTopLevelModuleWithoutExport.ts, 0, 17)) +>c : Symbol(xc, Decl(internalAliasClassInsideTopLevelModuleWithoutExport.ts, 0, 20)) export var cProp = new xc(); >cProp : Symbol(cProp, Decl(internalAliasClassInsideTopLevelModuleWithoutExport.ts, 9, 10)) diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.types index 4ca2c5b7c33c3..0e2cf12df05e3 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.types +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithoutExport.ts] //// === internalAliasClassInsideTopLevelModuleWithoutExport.ts === -export module x { +export namespace x { >x : typeof x > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasEnum.js b/tests/baselines/reference/internalAliasEnum.js index f6d641181f243..3dc513bda8dc7 100644 --- a/tests/baselines/reference/internalAliasEnum.js +++ b/tests/baselines/reference/internalAliasEnum.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasEnum.ts] //// //// [internalAliasEnum.ts] -module a { +namespace a { export enum weekend { Friday, Saturday, @@ -9,7 +9,7 @@ module a { } } -module c { +namespace c { import b = a.weekend; export var bVal: b = b.Sunday; } diff --git a/tests/baselines/reference/internalAliasEnum.symbols b/tests/baselines/reference/internalAliasEnum.symbols index 7ebd443be232c..4627995fe1d28 100644 --- a/tests/baselines/reference/internalAliasEnum.symbols +++ b/tests/baselines/reference/internalAliasEnum.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasEnum.ts] //// === internalAliasEnum.ts === -module a { +namespace a { >a : Symbol(a, Decl(internalAliasEnum.ts, 0, 0)) export enum weekend { ->weekend : Symbol(weekend, Decl(internalAliasEnum.ts, 0, 10)) +>weekend : Symbol(weekend, Decl(internalAliasEnum.ts, 0, 13)) Friday, >Friday : Symbol(weekend.Friday, Decl(internalAliasEnum.ts, 1, 25)) @@ -18,19 +18,19 @@ module a { } } -module c { +namespace c { >c : Symbol(c, Decl(internalAliasEnum.ts, 6, 1)) import b = a.weekend; ->b : Symbol(b, Decl(internalAliasEnum.ts, 8, 10)) +>b : Symbol(b, Decl(internalAliasEnum.ts, 8, 13)) >a : Symbol(a, Decl(internalAliasEnum.ts, 0, 0)) ->weekend : Symbol(b, Decl(internalAliasEnum.ts, 0, 10)) +>weekend : Symbol(b, Decl(internalAliasEnum.ts, 0, 13)) export var bVal: b = b.Sunday; >bVal : Symbol(bVal, Decl(internalAliasEnum.ts, 10, 14)) ->b : Symbol(b, Decl(internalAliasEnum.ts, 8, 10)) +>b : Symbol(b, Decl(internalAliasEnum.ts, 8, 13)) >b.Sunday : Symbol(b.Sunday, Decl(internalAliasEnum.ts, 3, 17)) ->b : Symbol(b, Decl(internalAliasEnum.ts, 8, 10)) +>b : Symbol(b, Decl(internalAliasEnum.ts, 8, 13)) >Sunday : Symbol(b.Sunday, Decl(internalAliasEnum.ts, 3, 17)) } diff --git a/tests/baselines/reference/internalAliasEnum.types b/tests/baselines/reference/internalAliasEnum.types index 78c0fa3dc9c38..046bafcb0f71b 100644 --- a/tests/baselines/reference/internalAliasEnum.types +++ b/tests/baselines/reference/internalAliasEnum.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasEnum.ts] //// === internalAliasEnum.ts === -module a { +namespace a { >a : typeof a > : ^^^^^^^^ @@ -23,7 +23,7 @@ module a { } } -module c { +namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js index 4c644fa52f6a0..7a72613725724 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasEnumInsideLocalModuleWithExport.ts] //// //// [internalAliasEnumInsideLocalModuleWithExport.ts] -export module a { +export namespace a { export enum weekend { Friday, Saturday, @@ -9,7 +9,7 @@ export module a { } } -export module c { +export namespace c { export import b = a.weekend; export var bVal: b = b.Sunday; } diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.symbols b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.symbols index ae6ccb94b802c..575e09f2ddaff 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.symbols +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasEnumInsideLocalModuleWithExport.ts] //// === internalAliasEnumInsideLocalModuleWithExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasEnumInsideLocalModuleWithExport.ts, 0, 0)) export enum weekend { ->weekend : Symbol(weekend, Decl(internalAliasEnumInsideLocalModuleWithExport.ts, 0, 17)) +>weekend : Symbol(weekend, Decl(internalAliasEnumInsideLocalModuleWithExport.ts, 0, 20)) Friday, >Friday : Symbol(weekend.Friday, Decl(internalAliasEnumInsideLocalModuleWithExport.ts, 1, 25)) @@ -18,19 +18,19 @@ export module a { } } -export module c { +export namespace c { >c : Symbol(c, Decl(internalAliasEnumInsideLocalModuleWithExport.ts, 6, 1)) export import b = a.weekend; ->b : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithExport.ts, 8, 17)) +>b : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithExport.ts, 8, 20)) >a : Symbol(a, Decl(internalAliasEnumInsideLocalModuleWithExport.ts, 0, 0)) ->weekend : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithExport.ts, 0, 17)) +>weekend : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithExport.ts, 0, 20)) export var bVal: b = b.Sunday; >bVal : Symbol(bVal, Decl(internalAliasEnumInsideLocalModuleWithExport.ts, 10, 14)) ->b : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithExport.ts, 8, 17)) +>b : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithExport.ts, 8, 20)) >b.Sunday : Symbol(b.Sunday, Decl(internalAliasEnumInsideLocalModuleWithExport.ts, 3, 17)) ->b : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithExport.ts, 8, 17)) +>b : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithExport.ts, 8, 20)) >Sunday : Symbol(b.Sunday, Decl(internalAliasEnumInsideLocalModuleWithExport.ts, 3, 17)) } diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.types index b668bd0fac14e..8cacad48037c9 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.types +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasEnumInsideLocalModuleWithExport.ts] //// === internalAliasEnumInsideLocalModuleWithExport.ts === -export module a { +export namespace a { >a : typeof a > : ^^^^^^^^ @@ -23,7 +23,7 @@ export module a { } } -export module c { +export namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js index f7c6897c5b712..bde0bd21c97ee 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExport.ts] //// //// [internalAliasEnumInsideLocalModuleWithoutExport.ts] -export module a { +export namespace a { export enum weekend { Friday, Saturday, @@ -9,7 +9,7 @@ export module a { } } -export module c { +export namespace c { import b = a.weekend; export var bVal: b = b.Sunday; } diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.symbols b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.symbols index 215e58566284b..a1d01ce4bade0 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.symbols +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExport.ts] //// === internalAliasEnumInsideLocalModuleWithoutExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasEnumInsideLocalModuleWithoutExport.ts, 0, 0)) export enum weekend { ->weekend : Symbol(weekend, Decl(internalAliasEnumInsideLocalModuleWithoutExport.ts, 0, 17)) +>weekend : Symbol(weekend, Decl(internalAliasEnumInsideLocalModuleWithoutExport.ts, 0, 20)) Friday, >Friday : Symbol(weekend.Friday, Decl(internalAliasEnumInsideLocalModuleWithoutExport.ts, 1, 25)) @@ -18,19 +18,19 @@ export module a { } } -export module c { +export namespace c { >c : Symbol(c, Decl(internalAliasEnumInsideLocalModuleWithoutExport.ts, 6, 1)) import b = a.weekend; ->b : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithoutExport.ts, 8, 17)) +>b : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithoutExport.ts, 8, 20)) >a : Symbol(a, Decl(internalAliasEnumInsideLocalModuleWithoutExport.ts, 0, 0)) ->weekend : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithoutExport.ts, 0, 17)) +>weekend : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithoutExport.ts, 0, 20)) export var bVal: b = b.Sunday; >bVal : Symbol(bVal, Decl(internalAliasEnumInsideLocalModuleWithoutExport.ts, 10, 14)) ->b : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithoutExport.ts, 8, 17)) +>b : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithoutExport.ts, 8, 20)) >b.Sunday : Symbol(b.Sunday, Decl(internalAliasEnumInsideLocalModuleWithoutExport.ts, 3, 17)) ->b : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithoutExport.ts, 8, 17)) +>b : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithoutExport.ts, 8, 20)) >Sunday : Symbol(b.Sunday, Decl(internalAliasEnumInsideLocalModuleWithoutExport.ts, 3, 17)) } diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.types index 088e81132f7c7..74f892845306f 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.types +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExport.ts] //// === internalAliasEnumInsideLocalModuleWithoutExport.ts === -export module a { +export namespace a { >a : typeof a > : ^^^^^^^^ @@ -23,7 +23,7 @@ export module a { } } -export module c { +export namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.errors.txt b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.errors.txt index bfb69ade57898..b6e68343728c9 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.errors.txt +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.errors.txt @@ -2,7 +2,7 @@ internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts(14,21): error TS23 ==== internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts (1 errors) ==== - export module a { + export namespace a { export enum weekend { Friday, Saturday, @@ -10,7 +10,7 @@ internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts(14,21): error TS23 } } - export module c { + export namespace c { import b = a.weekend; export var bVal: b = b.Sunday; } diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js index eeee1ae586ad8..52135e166b8b3 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts] //// //// [internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts] -export module a { +export namespace a { export enum weekend { Friday, Saturday, @@ -9,7 +9,7 @@ export module a { } } -export module c { +export namespace c { import b = a.weekend; export var bVal: b = b.Sunday; } diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.symbols b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.symbols index fb3f53b44b2e3..ab16730f5abba 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.symbols +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts] //// === internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts, 0, 0)) export enum weekend { ->weekend : Symbol(weekend, Decl(internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts, 0, 17)) +>weekend : Symbol(weekend, Decl(internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts, 0, 20)) Friday, >Friday : Symbol(weekend.Friday, Decl(internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts, 1, 25)) @@ -18,19 +18,19 @@ export module a { } } -export module c { +export namespace c { >c : Symbol(c, Decl(internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts, 6, 1)) import b = a.weekend; ->b : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts, 8, 17)) +>b : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts, 8, 20)) >a : Symbol(a, Decl(internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts, 0, 0)) ->weekend : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts, 0, 17)) +>weekend : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts, 0, 20)) export var bVal: b = b.Sunday; >bVal : Symbol(bVal, Decl(internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts, 10, 14)) ->b : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts, 8, 17)) +>b : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts, 8, 20)) >b.Sunday : Symbol(b.Sunday, Decl(internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts, 3, 17)) ->b : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts, 8, 17)) +>b : Symbol(b, Decl(internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts, 8, 20)) >Sunday : Symbol(b.Sunday, Decl(internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts, 3, 17)) } diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.types b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.types index 02458a9be1efb..390be719d4f8b 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.types +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts] //// === internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts === -export module a { +export namespace a { >a : typeof a > : ^^^^^^^^ @@ -23,7 +23,7 @@ export module a { } } -export module c { +export namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js index 1b98d32bd3262..abda7cd64c374 100644 --- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithExport.ts] //// //// [internalAliasEnumInsideTopLevelModuleWithExport.ts] -export module a { +export namespace a { export enum weekend { Friday, Saturday, diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.symbols b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.symbols index ccedcf01bf8d7..a39fc43562e5f 100644 --- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.symbols +++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithExport.ts] //// === internalAliasEnumInsideTopLevelModuleWithExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasEnumInsideTopLevelModuleWithExport.ts, 0, 0)) export enum weekend { ->weekend : Symbol(weekend, Decl(internalAliasEnumInsideTopLevelModuleWithExport.ts, 0, 17)) +>weekend : Symbol(weekend, Decl(internalAliasEnumInsideTopLevelModuleWithExport.ts, 0, 20)) Friday, >Friday : Symbol(b.Friday, Decl(internalAliasEnumInsideTopLevelModuleWithExport.ts, 1, 25)) @@ -21,7 +21,7 @@ export module a { export import b = a.weekend; >b : Symbol(b, Decl(internalAliasEnumInsideTopLevelModuleWithExport.ts, 6, 1)) >a : Symbol(a, Decl(internalAliasEnumInsideTopLevelModuleWithExport.ts, 0, 0)) ->weekend : Symbol(b, Decl(internalAliasEnumInsideTopLevelModuleWithExport.ts, 0, 17)) +>weekend : Symbol(b, Decl(internalAliasEnumInsideTopLevelModuleWithExport.ts, 0, 20)) export var bVal: b = b.Sunday; >bVal : Symbol(bVal, Decl(internalAliasEnumInsideTopLevelModuleWithExport.ts, 9, 10)) diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.types index 8e202e8f1f596..4bef557efba6a 100644 --- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.types +++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithExport.ts] //// === internalAliasEnumInsideTopLevelModuleWithExport.ts === -export module a { +export namespace a { >a : typeof a > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js index 173bc832fb815..489330bf598df 100644 --- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithoutExport.ts] //// //// [internalAliasEnumInsideTopLevelModuleWithoutExport.ts] -export module a { +export namespace a { export enum weekend { Friday, Saturday, diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.symbols b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.symbols index b4e8bbb11c280..d845fc6d67ad1 100644 --- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.symbols +++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithoutExport.ts] //// === internalAliasEnumInsideTopLevelModuleWithoutExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasEnumInsideTopLevelModuleWithoutExport.ts, 0, 0)) export enum weekend { ->weekend : Symbol(weekend, Decl(internalAliasEnumInsideTopLevelModuleWithoutExport.ts, 0, 17)) +>weekend : Symbol(weekend, Decl(internalAliasEnumInsideTopLevelModuleWithoutExport.ts, 0, 20)) Friday, >Friday : Symbol(b.Friday, Decl(internalAliasEnumInsideTopLevelModuleWithoutExport.ts, 1, 25)) @@ -21,7 +21,7 @@ export module a { import b = a.weekend; >b : Symbol(b, Decl(internalAliasEnumInsideTopLevelModuleWithoutExport.ts, 6, 1)) >a : Symbol(a, Decl(internalAliasEnumInsideTopLevelModuleWithoutExport.ts, 0, 0)) ->weekend : Symbol(b, Decl(internalAliasEnumInsideTopLevelModuleWithoutExport.ts, 0, 17)) +>weekend : Symbol(b, Decl(internalAliasEnumInsideTopLevelModuleWithoutExport.ts, 0, 20)) export var bVal: b = b.Sunday; >bVal : Symbol(bVal, Decl(internalAliasEnumInsideTopLevelModuleWithoutExport.ts, 9, 10)) diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.types index 2c0c9699d3041..2b1846292ad79 100644 --- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.types +++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithoutExport.ts] //// === internalAliasEnumInsideTopLevelModuleWithoutExport.ts === -export module a { +export namespace a { >a : typeof a > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasFunction.js b/tests/baselines/reference/internalAliasFunction.js index 987df6fe46fd1..2b1cbd6307703 100644 --- a/tests/baselines/reference/internalAliasFunction.js +++ b/tests/baselines/reference/internalAliasFunction.js @@ -1,13 +1,13 @@ //// [tests/cases/compiler/internalAliasFunction.ts] //// //// [internalAliasFunction.ts] -module a { +namespace a { export function foo(x: number) { return x; } } -module c { +namespace c { import b = a.foo; export var bVal = b(10); export var bVal2 = b; diff --git a/tests/baselines/reference/internalAliasFunction.symbols b/tests/baselines/reference/internalAliasFunction.symbols index 8f9ae5e861485..74b311c1a486f 100644 --- a/tests/baselines/reference/internalAliasFunction.symbols +++ b/tests/baselines/reference/internalAliasFunction.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasFunction.ts] //// === internalAliasFunction.ts === -module a { +namespace a { >a : Symbol(a, Decl(internalAliasFunction.ts, 0, 0)) export function foo(x: number) { ->foo : Symbol(foo, Decl(internalAliasFunction.ts, 0, 10)) +>foo : Symbol(foo, Decl(internalAliasFunction.ts, 0, 13)) >x : Symbol(x, Decl(internalAliasFunction.ts, 1, 24)) return x; @@ -13,20 +13,20 @@ module a { } } -module c { +namespace c { >c : Symbol(c, Decl(internalAliasFunction.ts, 4, 1)) import b = a.foo; ->b : Symbol(b, Decl(internalAliasFunction.ts, 6, 10)) +>b : Symbol(b, Decl(internalAliasFunction.ts, 6, 13)) >a : Symbol(a, Decl(internalAliasFunction.ts, 0, 0)) ->foo : Symbol(b, Decl(internalAliasFunction.ts, 0, 10)) +>foo : Symbol(b, Decl(internalAliasFunction.ts, 0, 13)) export var bVal = b(10); >bVal : Symbol(bVal, Decl(internalAliasFunction.ts, 8, 14)) ->b : Symbol(b, Decl(internalAliasFunction.ts, 6, 10)) +>b : Symbol(b, Decl(internalAliasFunction.ts, 6, 13)) export var bVal2 = b; >bVal2 : Symbol(bVal2, Decl(internalAliasFunction.ts, 9, 14)) ->b : Symbol(b, Decl(internalAliasFunction.ts, 6, 10)) +>b : Symbol(b, Decl(internalAliasFunction.ts, 6, 13)) } diff --git a/tests/baselines/reference/internalAliasFunction.types b/tests/baselines/reference/internalAliasFunction.types index af821d35dd8ba..ba72a07cab7fc 100644 --- a/tests/baselines/reference/internalAliasFunction.types +++ b/tests/baselines/reference/internalAliasFunction.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasFunction.ts] //// === internalAliasFunction.ts === -module a { +namespace a { >a : typeof a > : ^^^^^^^^ @@ -17,7 +17,7 @@ module a { } } -module c { +namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js index b0f4d96f6fbbf..a6650d34c55bc 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js @@ -1,13 +1,13 @@ //// [tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithExport.ts] //// //// [internalAliasFunctionInsideLocalModuleWithExport.ts] -export module a { +export namespace a { export function foo(x: number) { return x; } } -export module c { +export namespace c { export import b = a.foo; export var bVal = b(10); export var bVal2 = b; diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.symbols b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.symbols index a791abf9a2789..0db063168415d 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.symbols +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithExport.ts] //// === internalAliasFunctionInsideLocalModuleWithExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasFunctionInsideLocalModuleWithExport.ts, 0, 0)) export function foo(x: number) { ->foo : Symbol(foo, Decl(internalAliasFunctionInsideLocalModuleWithExport.ts, 0, 17)) +>foo : Symbol(foo, Decl(internalAliasFunctionInsideLocalModuleWithExport.ts, 0, 20)) >x : Symbol(x, Decl(internalAliasFunctionInsideLocalModuleWithExport.ts, 1, 24)) return x; @@ -13,20 +13,20 @@ export module a { } } -export module c { +export namespace c { >c : Symbol(c, Decl(internalAliasFunctionInsideLocalModuleWithExport.ts, 4, 1)) export import b = a.foo; ->b : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithExport.ts, 6, 17)) +>b : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithExport.ts, 6, 20)) >a : Symbol(a, Decl(internalAliasFunctionInsideLocalModuleWithExport.ts, 0, 0)) ->foo : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithExport.ts, 0, 17)) +>foo : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithExport.ts, 0, 20)) export var bVal = b(10); >bVal : Symbol(bVal, Decl(internalAliasFunctionInsideLocalModuleWithExport.ts, 8, 14)) ->b : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithExport.ts, 6, 17)) +>b : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithExport.ts, 6, 20)) export var bVal2 = b; >bVal2 : Symbol(bVal2, Decl(internalAliasFunctionInsideLocalModuleWithExport.ts, 9, 14)) ->b : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithExport.ts, 6, 17)) +>b : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithExport.ts, 6, 20)) } diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types index d9fa6fa682516..ffcd812510e44 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithExport.ts] //// === internalAliasFunctionInsideLocalModuleWithExport.ts === -export module a { +export namespace a { >a : typeof a > : ^^^^^^^^ @@ -17,7 +17,7 @@ export module a { } } -export module c { +export namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js index a825869db9c2d..2220e6a466a78 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js @@ -1,13 +1,13 @@ //// [tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExport.ts] //// //// [internalAliasFunctionInsideLocalModuleWithoutExport.ts] -export module a { +export namespace a { export function foo(x: number) { return x; } } -export module c { +export namespace c { import b = a.foo; var bVal = b(10); export var bVal2 = b; diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.symbols b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.symbols index ad137a0a685ea..beaa5999c6a7f 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.symbols +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExport.ts] //// === internalAliasFunctionInsideLocalModuleWithoutExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasFunctionInsideLocalModuleWithoutExport.ts, 0, 0)) export function foo(x: number) { ->foo : Symbol(foo, Decl(internalAliasFunctionInsideLocalModuleWithoutExport.ts, 0, 17)) +>foo : Symbol(foo, Decl(internalAliasFunctionInsideLocalModuleWithoutExport.ts, 0, 20)) >x : Symbol(x, Decl(internalAliasFunctionInsideLocalModuleWithoutExport.ts, 1, 24)) return x; @@ -13,20 +13,20 @@ export module a { } } -export module c { +export namespace c { >c : Symbol(c, Decl(internalAliasFunctionInsideLocalModuleWithoutExport.ts, 4, 1)) import b = a.foo; ->b : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithoutExport.ts, 6, 17)) +>b : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithoutExport.ts, 6, 20)) >a : Symbol(a, Decl(internalAliasFunctionInsideLocalModuleWithoutExport.ts, 0, 0)) ->foo : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithoutExport.ts, 0, 17)) +>foo : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithoutExport.ts, 0, 20)) var bVal = b(10); >bVal : Symbol(bVal, Decl(internalAliasFunctionInsideLocalModuleWithoutExport.ts, 8, 7)) ->b : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithoutExport.ts, 6, 17)) +>b : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithoutExport.ts, 6, 20)) export var bVal2 = b; >bVal2 : Symbol(bVal2, Decl(internalAliasFunctionInsideLocalModuleWithoutExport.ts, 9, 14)) ->b : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithoutExport.ts, 6, 17)) +>b : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithoutExport.ts, 6, 20)) } diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types index ca8f0309f7e4c..a8cbcb918847c 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExport.ts] //// === internalAliasFunctionInsideLocalModuleWithoutExport.ts === -export module a { +export namespace a { >a : typeof a > : ^^^^^^^^ @@ -17,7 +17,7 @@ export module a { } } -export module c { +export namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.errors.txt b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.errors.txt index e5aeb0fe3a841..247df15b61ff0 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.errors.txt +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.errors.txt @@ -2,13 +2,13 @@ internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts(12,11): error ==== internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts (1 errors) ==== - export module a { + export namespace a { export function foo(x: number) { return x; } } - export module c { + export namespace c { import b = a.foo; var bVal = b(10); export var bVal2 = b; diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js index 8c5a35063f9f1..3f2d5e95ce1d7 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js @@ -1,13 +1,13 @@ //// [tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts] //// //// [internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts] -export module a { +export namespace a { export function foo(x: number) { return x; } } -export module c { +export namespace c { import b = a.foo; var bVal = b(10); export var bVal2 = b; diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.symbols b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.symbols index bf3b07d1abf27..4028ad4932821 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.symbols +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts] //// === internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts, 0, 0)) export function foo(x: number) { ->foo : Symbol(foo, Decl(internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts, 0, 17)) +>foo : Symbol(foo, Decl(internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts, 0, 20)) >x : Symbol(x, Decl(internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts, 1, 24)) return x; @@ -13,21 +13,21 @@ export module a { } } -export module c { +export namespace c { >c : Symbol(c, Decl(internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts, 4, 1)) import b = a.foo; ->b : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts, 6, 17)) +>b : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts, 6, 20)) >a : Symbol(a, Decl(internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts, 0, 0)) ->foo : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts, 0, 17)) +>foo : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts, 0, 20)) var bVal = b(10); >bVal : Symbol(bVal, Decl(internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts, 8, 7)) ->b : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts, 6, 17)) +>b : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts, 6, 20)) export var bVal2 = b; >bVal2 : Symbol(bVal2, Decl(internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts, 9, 14)) ->b : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts, 6, 17)) +>b : Symbol(b, Decl(internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts, 6, 20)) } var d = c.b(11); >d : Symbol(d, Decl(internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts, 11, 3)) diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.types b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.types index a685078e74944..ace8e43e3c667 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.types +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts] //// === internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts === -export module a { +export namespace a { >a : typeof a > : ^^^^^^^^ @@ -17,7 +17,7 @@ export module a { } } -export module c { +export namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js index 45e89fddb8912..73be36b4a97c0 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithExport.ts] //// //// [internalAliasFunctionInsideTopLevelModuleWithExport.ts] -export module a { +export namespace a { export function foo(x: number) { return x; } diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.symbols b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.symbols index 253197491eb27..6ff1a42fe5ffa 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.symbols +++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithExport.ts] //// === internalAliasFunctionInsideTopLevelModuleWithExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasFunctionInsideTopLevelModuleWithExport.ts, 0, 0)) export function foo(x: number) { ->foo : Symbol(foo, Decl(internalAliasFunctionInsideTopLevelModuleWithExport.ts, 0, 17)) +>foo : Symbol(foo, Decl(internalAliasFunctionInsideTopLevelModuleWithExport.ts, 0, 20)) >x : Symbol(x, Decl(internalAliasFunctionInsideTopLevelModuleWithExport.ts, 1, 24)) return x; @@ -16,7 +16,7 @@ export module a { export import b = a.foo; >b : Symbol(b, Decl(internalAliasFunctionInsideTopLevelModuleWithExport.ts, 4, 1)) >a : Symbol(a, Decl(internalAliasFunctionInsideTopLevelModuleWithExport.ts, 0, 0)) ->foo : Symbol(b, Decl(internalAliasFunctionInsideTopLevelModuleWithExport.ts, 0, 17)) +>foo : Symbol(b, Decl(internalAliasFunctionInsideTopLevelModuleWithExport.ts, 0, 20)) export var bVal = b(10); >bVal : Symbol(bVal, Decl(internalAliasFunctionInsideTopLevelModuleWithExport.ts, 7, 10)) diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types index 4bd64b7cc6a04..7dddd92992766 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types +++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithExport.ts] //// === internalAliasFunctionInsideTopLevelModuleWithExport.ts === -export module a { +export namespace a { >a : typeof a > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js index d5168fd8a899a..696e6ab53c05e 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithoutExport.ts] //// //// [internalAliasFunctionInsideTopLevelModuleWithoutExport.ts] -export module a { +export namespace a { export function foo(x: number) { return x; } diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.symbols b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.symbols index 7f695ecc0167e..21cd469627fbc 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.symbols +++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithoutExport.ts] //// === internalAliasFunctionInsideTopLevelModuleWithoutExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasFunctionInsideTopLevelModuleWithoutExport.ts, 0, 0)) export function foo(x: number) { ->foo : Symbol(foo, Decl(internalAliasFunctionInsideTopLevelModuleWithoutExport.ts, 0, 17)) +>foo : Symbol(foo, Decl(internalAliasFunctionInsideTopLevelModuleWithoutExport.ts, 0, 20)) >x : Symbol(x, Decl(internalAliasFunctionInsideTopLevelModuleWithoutExport.ts, 1, 24)) return x; @@ -16,7 +16,7 @@ export module a { import b = a.foo; >b : Symbol(b, Decl(internalAliasFunctionInsideTopLevelModuleWithoutExport.ts, 4, 1)) >a : Symbol(a, Decl(internalAliasFunctionInsideTopLevelModuleWithoutExport.ts, 0, 0)) ->foo : Symbol(b, Decl(internalAliasFunctionInsideTopLevelModuleWithoutExport.ts, 0, 17)) +>foo : Symbol(b, Decl(internalAliasFunctionInsideTopLevelModuleWithoutExport.ts, 0, 20)) export var bVal = b(10); >bVal : Symbol(bVal, Decl(internalAliasFunctionInsideTopLevelModuleWithoutExport.ts, 7, 10)) diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types index cfeefa7fa1004..5961fcb8e9102 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types +++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithoutExport.ts] //// === internalAliasFunctionInsideTopLevelModuleWithoutExport.ts === -export module a { +export namespace a { >a : typeof a > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasInitializedModule.js b/tests/baselines/reference/internalAliasInitializedModule.js index eeeb1da2a0e5b..1efcc2ef44f8f 100644 --- a/tests/baselines/reference/internalAliasInitializedModule.js +++ b/tests/baselines/reference/internalAliasInitializedModule.js @@ -1,14 +1,14 @@ //// [tests/cases/compiler/internalAliasInitializedModule.ts] //// //// [internalAliasInitializedModule.ts] -module a { - export module b { +namespace a { + export namespace b { export class c { } } } -module c { +namespace c { import b = a.b; export var x: b.c = new b.c(); } diff --git a/tests/baselines/reference/internalAliasInitializedModule.symbols b/tests/baselines/reference/internalAliasInitializedModule.symbols index aa503c00f8f26..949f66d282fdc 100644 --- a/tests/baselines/reference/internalAliasInitializedModule.symbols +++ b/tests/baselines/reference/internalAliasInitializedModule.symbols @@ -1,31 +1,31 @@ //// [tests/cases/compiler/internalAliasInitializedModule.ts] //// === internalAliasInitializedModule.ts === -module a { +namespace a { >a : Symbol(a, Decl(internalAliasInitializedModule.ts, 0, 0)) - export module b { ->b : Symbol(b, Decl(internalAliasInitializedModule.ts, 0, 10)) + export namespace b { +>b : Symbol(b, Decl(internalAliasInitializedModule.ts, 0, 13)) export class c { ->c : Symbol(c, Decl(internalAliasInitializedModule.ts, 1, 21)) +>c : Symbol(c, Decl(internalAliasInitializedModule.ts, 1, 24)) } } } -module c { +namespace c { >c : Symbol(c, Decl(internalAliasInitializedModule.ts, 5, 1)) import b = a.b; ->b : Symbol(b, Decl(internalAliasInitializedModule.ts, 7, 10)) +>b : Symbol(b, Decl(internalAliasInitializedModule.ts, 7, 13)) >a : Symbol(a, Decl(internalAliasInitializedModule.ts, 0, 0)) ->b : Symbol(b, Decl(internalAliasInitializedModule.ts, 0, 10)) +>b : Symbol(b, Decl(internalAliasInitializedModule.ts, 0, 13)) export var x: b.c = new b.c(); >x : Symbol(x, Decl(internalAliasInitializedModule.ts, 9, 14)) ->b : Symbol(b, Decl(internalAliasInitializedModule.ts, 7, 10)) ->c : Symbol(b.c, Decl(internalAliasInitializedModule.ts, 1, 21)) ->b.c : Symbol(b.c, Decl(internalAliasInitializedModule.ts, 1, 21)) ->b : Symbol(b, Decl(internalAliasInitializedModule.ts, 7, 10)) ->c : Symbol(b.c, Decl(internalAliasInitializedModule.ts, 1, 21)) +>b : Symbol(b, Decl(internalAliasInitializedModule.ts, 7, 13)) +>c : Symbol(b.c, Decl(internalAliasInitializedModule.ts, 1, 24)) +>b.c : Symbol(b.c, Decl(internalAliasInitializedModule.ts, 1, 24)) +>b : Symbol(b, Decl(internalAliasInitializedModule.ts, 7, 13)) +>c : Symbol(b.c, Decl(internalAliasInitializedModule.ts, 1, 24)) } diff --git a/tests/baselines/reference/internalAliasInitializedModule.types b/tests/baselines/reference/internalAliasInitializedModule.types index 180c2da38832a..0e26947039d20 100644 --- a/tests/baselines/reference/internalAliasInitializedModule.types +++ b/tests/baselines/reference/internalAliasInitializedModule.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasInitializedModule.ts] //// === internalAliasInitializedModule.ts === -module a { +namespace a { >a : typeof a > : ^^^^^^^^ - export module b { + export namespace b { >b : typeof b > : ^^^^^^^^ @@ -16,7 +16,7 @@ module a { } } -module c { +namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js index ba3d0eb5e25c1..e7ff07b4f3761 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js @@ -1,14 +1,14 @@ //// [tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithExport.ts] //// //// [internalAliasInitializedModuleInsideLocalModuleWithExport.ts] -export module a { - export module b { +export namespace a { + export namespace b { export class c { } } } -export module c { +export namespace c { export import b = a.b; export var x: b.c = new b.c(); } diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.symbols b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.symbols index 979bc43814ee7..c895549af8c6c 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.symbols +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.symbols @@ -1,31 +1,31 @@ //// [tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithExport.ts] //// === internalAliasInitializedModuleInsideLocalModuleWithExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasInitializedModuleInsideLocalModuleWithExport.ts, 0, 0)) - export module b { ->b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithExport.ts, 0, 17)) + export namespace b { +>b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithExport.ts, 0, 20)) export class c { ->c : Symbol(c, Decl(internalAliasInitializedModuleInsideLocalModuleWithExport.ts, 1, 21)) +>c : Symbol(c, Decl(internalAliasInitializedModuleInsideLocalModuleWithExport.ts, 1, 24)) } } } -export module c { +export namespace c { >c : Symbol(c, Decl(internalAliasInitializedModuleInsideLocalModuleWithExport.ts, 5, 1)) export import b = a.b; ->b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithExport.ts, 7, 17)) +>b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithExport.ts, 7, 20)) >a : Symbol(a, Decl(internalAliasInitializedModuleInsideLocalModuleWithExport.ts, 0, 0)) ->b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithExport.ts, 0, 17)) +>b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithExport.ts, 0, 20)) export var x: b.c = new b.c(); >x : Symbol(x, Decl(internalAliasInitializedModuleInsideLocalModuleWithExport.ts, 9, 14)) ->b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithExport.ts, 7, 17)) ->c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideLocalModuleWithExport.ts, 1, 21)) ->b.c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideLocalModuleWithExport.ts, 1, 21)) ->b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithExport.ts, 7, 17)) ->c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideLocalModuleWithExport.ts, 1, 21)) +>b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithExport.ts, 7, 20)) +>c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideLocalModuleWithExport.ts, 1, 24)) +>b.c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideLocalModuleWithExport.ts, 1, 24)) +>b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithExport.ts, 7, 20)) +>c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideLocalModuleWithExport.ts, 1, 24)) } diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.types index d6107e05390e1..49ac72dc8fb27 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.types +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithExport.ts] //// === internalAliasInitializedModuleInsideLocalModuleWithExport.ts === -export module a { +export namespace a { >a : typeof a > : ^^^^^^^^ - export module b { + export namespace b { >b : typeof b > : ^^^^^^^^ @@ -16,7 +16,7 @@ export module a { } } -export module c { +export namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js index 2ac850a62c161..0fd351d939792 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js @@ -1,14 +1,14 @@ //// [tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts] //// //// [internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts] -export module a { - export module b { +export namespace a { + export namespace b { export class c { } } } -export module c { +export namespace c { import b = a.b; export var x: b.c = new b.c(); } diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.symbols b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.symbols index 4b7e43281bd8c..3a9564becef21 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.symbols +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.symbols @@ -1,31 +1,31 @@ //// [tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts] //// === internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts, 0, 0)) - export module b { ->b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts, 0, 17)) + export namespace b { +>b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts, 0, 20)) export class c { ->c : Symbol(c, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts, 1, 21)) +>c : Symbol(c, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts, 1, 24)) } } } -export module c { +export namespace c { >c : Symbol(c, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts, 5, 1)) import b = a.b; ->b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts, 7, 17)) +>b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts, 7, 20)) >a : Symbol(a, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts, 0, 0)) ->b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts, 0, 17)) +>b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts, 0, 20)) export var x: b.c = new b.c(); >x : Symbol(x, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts, 9, 14)) ->b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts, 7, 17)) ->c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts, 1, 21)) ->b.c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts, 1, 21)) ->b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts, 7, 17)) ->c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts, 1, 21)) +>b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts, 7, 20)) +>c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts, 1, 24)) +>b.c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts, 1, 24)) +>b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts, 7, 20)) +>c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts, 1, 24)) } diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.types index 4ee07b5767420..0f082a7f2a578 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.types +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts] //// === internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts === -export module a { +export namespace a { >a : typeof a > : ^^^^^^^^ - export module b { + export namespace b { >b : typeof b > : ^^^^^^^^ @@ -16,7 +16,7 @@ export module a { } } -export module c { +export namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt index 408c37a10fad3..45363b8b1a59b 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt @@ -2,14 +2,14 @@ internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts(13,22 ==== internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts (1 errors) ==== - export module a { - export module b { + export namespace a { + export namespace b { export class c { } } } - export module c { + export namespace c { import b = a.b; export var x: b.c = new b.c(); } diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js index c4074a91d9107..b9b2bfe7e2bb1 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js @@ -1,14 +1,14 @@ //// [tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts] //// //// [internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts] -export module a { - export module b { +export namespace a { + export namespace b { export class c { } } } -export module c { +export namespace c { import b = a.b; export var x: b.c = new b.c(); } diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.symbols b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.symbols index dc78ad8f0dbba..e2fafee6ac3bf 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.symbols +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.symbols @@ -1,33 +1,33 @@ //// [tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts] //// === internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 0, 0)) - export module b { ->b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 0, 17)) + export namespace b { +>b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 0, 20)) export class c { ->c : Symbol(c, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 1, 21)) +>c : Symbol(c, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 1, 24)) } } } -export module c { +export namespace c { >c : Symbol(c, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 5, 1)) import b = a.b; ->b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 7, 17)) +>b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 7, 20)) >a : Symbol(a, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 0, 0)) ->b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 0, 17)) +>b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 0, 20)) export var x: b.c = new b.c(); >x : Symbol(x, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 9, 14)) ->b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 7, 17)) ->c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 1, 21)) ->b.c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 1, 21)) ->b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 7, 17)) ->c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 1, 21)) +>b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 7, 20)) +>c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 1, 24)) +>b.c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 1, 24)) +>b : Symbol(b, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 7, 20)) +>c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 1, 24)) } export var d = new c.b.c(); diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.types b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.types index 2bc075af99b99..6247c0f98e800 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.types +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts] //// === internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts === -export module a { +export namespace a { >a : typeof a > : ^^^^^^^^ - export module b { + export namespace b { >b : typeof b > : ^^^^^^^^ @@ -16,7 +16,7 @@ export module a { } } -export module c { +export namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js index 88c659aac6a2e..eb331132d1a59 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts] //// //// [internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts] -export module a { - export module b { +export namespace a { + export namespace b { export class c { } } diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.symbols b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.symbols index 828b4aa004edb..4c1f31341e7f1 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.symbols +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.symbols @@ -1,14 +1,14 @@ //// [tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts] //// === internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts, 0, 0)) - export module b { ->b : Symbol(b, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts, 0, 17)) + export namespace b { +>b : Symbol(b, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts, 0, 20)) export class c { ->c : Symbol(c, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts, 1, 21)) +>c : Symbol(c, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts, 1, 24)) } } } @@ -16,13 +16,13 @@ export module a { export import b = a.b; >b : Symbol(b, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts, 5, 1)) >a : Symbol(a, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts, 0, 0)) ->b : Symbol(b, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts, 0, 17)) +>b : Symbol(b, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts, 0, 20)) export var x: b.c = new b.c(); >x : Symbol(x, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts, 8, 10)) >b : Symbol(b, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts, 5, 1)) ->c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts, 1, 21)) ->b.c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts, 1, 21)) +>c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts, 1, 24)) +>b.c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts, 1, 24)) >b : Symbol(b, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts, 5, 1)) ->c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts, 1, 21)) +>c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts, 1, 24)) diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.types index f446d800fad7e..6d280c1a29633 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.types +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts] //// === internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts === -export module a { +export namespace a { >a : typeof a > : ^^^^^^^^ - export module b { + export namespace b { >b : typeof b > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js index 36626c05a6e85..7449f602b77c3 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts] //// //// [internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts] -export module a { - export module b { +export namespace a { + export namespace b { export class c { } } diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.symbols b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.symbols index 8975d00c4935d..f68fe76b58d14 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.symbols +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.symbols @@ -1,14 +1,14 @@ //// [tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts] //// === internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts, 0, 0)) - export module b { ->b : Symbol(b, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts, 0, 17)) + export namespace b { +>b : Symbol(b, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts, 0, 20)) export class c { ->c : Symbol(c, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts, 1, 21)) +>c : Symbol(c, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts, 1, 24)) } } } @@ -16,13 +16,13 @@ export module a { import b = a.b; >b : Symbol(b, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts, 5, 1)) >a : Symbol(a, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts, 0, 0)) ->b : Symbol(b, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts, 0, 17)) +>b : Symbol(b, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts, 0, 20)) export var x: b.c = new b.c(); >x : Symbol(x, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts, 8, 10)) >b : Symbol(b, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts, 5, 1)) ->c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts, 1, 21)) ->b.c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts, 1, 21)) +>c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts, 1, 24)) +>b.c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts, 1, 24)) >b : Symbol(b, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts, 5, 1)) ->c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts, 1, 21)) +>c : Symbol(b.c, Decl(internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts, 1, 24)) diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.types index f37b960bcb821..ae442a3bb0aed 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.types +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts] //// === internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts === -export module a { +export namespace a { >a : typeof a > : ^^^^^^^^ - export module b { + export namespace b { >b : typeof b > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasInterface.js b/tests/baselines/reference/internalAliasInterface.js index f588ef54f289b..fc2cb41c54c19 100644 --- a/tests/baselines/reference/internalAliasInterface.js +++ b/tests/baselines/reference/internalAliasInterface.js @@ -1,12 +1,12 @@ //// [tests/cases/compiler/internalAliasInterface.ts] //// //// [internalAliasInterface.ts] -module a { +namespace a { export interface I { } } -module c { +namespace c { import b = a.I; export var x: b; } diff --git a/tests/baselines/reference/internalAliasInterface.symbols b/tests/baselines/reference/internalAliasInterface.symbols index 5b655587b0fbd..bf15c4f90e782 100644 --- a/tests/baselines/reference/internalAliasInterface.symbols +++ b/tests/baselines/reference/internalAliasInterface.symbols @@ -1,24 +1,24 @@ //// [tests/cases/compiler/internalAliasInterface.ts] //// === internalAliasInterface.ts === -module a { +namespace a { >a : Symbol(a, Decl(internalAliasInterface.ts, 0, 0)) export interface I { ->I : Symbol(I, Decl(internalAliasInterface.ts, 0, 10)) +>I : Symbol(I, Decl(internalAliasInterface.ts, 0, 13)) } } -module c { +namespace c { >c : Symbol(c, Decl(internalAliasInterface.ts, 3, 1)) import b = a.I; ->b : Symbol(b, Decl(internalAliasInterface.ts, 5, 10)) +>b : Symbol(b, Decl(internalAliasInterface.ts, 5, 13)) >a : Symbol(a, Decl(internalAliasInterface.ts, 0, 0)) ->I : Symbol(b, Decl(internalAliasInterface.ts, 0, 10)) +>I : Symbol(b, Decl(internalAliasInterface.ts, 0, 13)) export var x: b; >x : Symbol(x, Decl(internalAliasInterface.ts, 7, 14)) ->b : Symbol(b, Decl(internalAliasInterface.ts, 5, 10)) +>b : Symbol(b, Decl(internalAliasInterface.ts, 5, 13)) } diff --git a/tests/baselines/reference/internalAliasInterface.types b/tests/baselines/reference/internalAliasInterface.types index 6719a988d963a..0a7eb67838e94 100644 --- a/tests/baselines/reference/internalAliasInterface.types +++ b/tests/baselines/reference/internalAliasInterface.types @@ -1,12 +1,12 @@ //// [tests/cases/compiler/internalAliasInterface.ts] //// === internalAliasInterface.ts === -module a { +namespace a { export interface I { } } -module c { +namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js index 61170ea9f9613..cd0e983ba2aa7 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js @@ -1,12 +1,12 @@ //// [tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithExport.ts] //// //// [internalAliasInterfaceInsideLocalModuleWithExport.ts] -export module a { +export namespace a { export interface I { } } -export module c { +export namespace c { export import b = a.I; export var x: b; } diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.symbols b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.symbols index 370cd39fd5881..0e352925a2daa 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.symbols +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.symbols @@ -1,24 +1,24 @@ //// [tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithExport.ts] //// === internalAliasInterfaceInsideLocalModuleWithExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasInterfaceInsideLocalModuleWithExport.ts, 0, 0)) export interface I { ->I : Symbol(I, Decl(internalAliasInterfaceInsideLocalModuleWithExport.ts, 0, 17)) +>I : Symbol(I, Decl(internalAliasInterfaceInsideLocalModuleWithExport.ts, 0, 20)) } } -export module c { +export namespace c { >c : Symbol(c, Decl(internalAliasInterfaceInsideLocalModuleWithExport.ts, 3, 1)) export import b = a.I; ->b : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithExport.ts, 5, 17)) +>b : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithExport.ts, 5, 20)) >a : Symbol(a, Decl(internalAliasInterfaceInsideLocalModuleWithExport.ts, 0, 0)) ->I : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithExport.ts, 0, 17)) +>I : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithExport.ts, 0, 20)) export var x: b; >x : Symbol(x, Decl(internalAliasInterfaceInsideLocalModuleWithExport.ts, 7, 14)) ->b : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithExport.ts, 5, 17)) +>b : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithExport.ts, 5, 20)) } diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.types index 2e9a85c1edf58..ea3c08de2e051 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.types +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.types @@ -1,12 +1,12 @@ //// [tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithExport.ts] //// === internalAliasInterfaceInsideLocalModuleWithExport.ts === -export module a { +export namespace a { export interface I { } } -export module c { +export namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js index b15d9f561ee78..09676e6dfb760 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js @@ -1,12 +1,12 @@ //// [tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExport.ts] //// //// [internalAliasInterfaceInsideLocalModuleWithoutExport.ts] -export module a { +export namespace a { export interface I { } } -export module c { +export namespace c { import b = a.I; export var x: b; } diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.symbols b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.symbols index 9168103b271dd..160779c275a3e 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.symbols +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.symbols @@ -1,24 +1,24 @@ //// [tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExport.ts] //// === internalAliasInterfaceInsideLocalModuleWithoutExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasInterfaceInsideLocalModuleWithoutExport.ts, 0, 0)) export interface I { ->I : Symbol(I, Decl(internalAliasInterfaceInsideLocalModuleWithoutExport.ts, 0, 17)) +>I : Symbol(I, Decl(internalAliasInterfaceInsideLocalModuleWithoutExport.ts, 0, 20)) } } -export module c { +export namespace c { >c : Symbol(c, Decl(internalAliasInterfaceInsideLocalModuleWithoutExport.ts, 3, 1)) import b = a.I; ->b : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithoutExport.ts, 5, 17)) +>b : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithoutExport.ts, 5, 20)) >a : Symbol(a, Decl(internalAliasInterfaceInsideLocalModuleWithoutExport.ts, 0, 0)) ->I : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithoutExport.ts, 0, 17)) +>I : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithoutExport.ts, 0, 20)) export var x: b; >x : Symbol(x, Decl(internalAliasInterfaceInsideLocalModuleWithoutExport.ts, 7, 14)) ->b : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithoutExport.ts, 5, 17)) +>b : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithoutExport.ts, 5, 20)) } diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.types index 755b2d2e18c64..aa2db92167ed1 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.types +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.types @@ -1,12 +1,12 @@ //// [tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExport.ts] //// === internalAliasInterfaceInsideLocalModuleWithoutExport.ts === -export module a { +export namespace a { export interface I { } } -export module c { +export namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.errors.txt b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.errors.txt index 50f7568527293..4711a37c290ff 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.errors.txt +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.errors.txt @@ -2,12 +2,12 @@ internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts(11,10): error ==== internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts (1 errors) ==== - export module a { + export namespace a { export interface I { } } - export module c { + export namespace c { import b = a.I; export var x: b; } diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js index 2c79e4369a26b..cdc041a4a9660 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js @@ -1,12 +1,12 @@ //// [tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts] //// //// [internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts] -export module a { +export namespace a { export interface I { } } -export module c { +export namespace c { import b = a.I; export var x: b; } diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.symbols b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.symbols index a9f3433ee1530..84fa5c7383123 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.symbols +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.symbols @@ -1,25 +1,25 @@ //// [tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts] //// === internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 0, 0)) export interface I { ->I : Symbol(I, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 0, 17)) +>I : Symbol(I, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 0, 20)) } } -export module c { +export namespace c { >c : Symbol(c, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 3, 1)) import b = a.I; ->b : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 5, 17)) +>b : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 5, 20)) >a : Symbol(a, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 0, 0)) ->I : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 0, 17)) +>I : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 0, 20)) export var x: b; >x : Symbol(x, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 7, 14)) ->b : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 5, 17)) +>b : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 5, 20)) } var x: c.b; diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.types b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.types index 165ea92d0006b..c365befb3b791 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.types +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.types @@ -1,12 +1,12 @@ //// [tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts] //// === internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts === -export module a { +export namespace a { export interface I { } } -export module c { +export namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js index 3fdafa56c8856..b8e9b91e05b0b 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithExport.ts] //// //// [internalAliasInterfaceInsideTopLevelModuleWithExport.ts] -export module a { +export namespace a { export interface I { } } diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.symbols b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.symbols index 8a154681b3634..44152ec80a4ef 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.symbols +++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.symbols @@ -1,18 +1,18 @@ //// [tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithExport.ts] //// === internalAliasInterfaceInsideTopLevelModuleWithExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasInterfaceInsideTopLevelModuleWithExport.ts, 0, 0)) export interface I { ->I : Symbol(I, Decl(internalAliasInterfaceInsideTopLevelModuleWithExport.ts, 0, 17)) +>I : Symbol(I, Decl(internalAliasInterfaceInsideTopLevelModuleWithExport.ts, 0, 20)) } } export import b = a.I; >b : Symbol(b, Decl(internalAliasInterfaceInsideTopLevelModuleWithExport.ts, 3, 1)) >a : Symbol(a, Decl(internalAliasInterfaceInsideTopLevelModuleWithExport.ts, 0, 0)) ->I : Symbol(b, Decl(internalAliasInterfaceInsideTopLevelModuleWithExport.ts, 0, 17)) +>I : Symbol(b, Decl(internalAliasInterfaceInsideTopLevelModuleWithExport.ts, 0, 20)) export var x: b; >x : Symbol(x, Decl(internalAliasInterfaceInsideTopLevelModuleWithExport.ts, 6, 10)) diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.types index 4398b9618916f..cc3646b7faee9 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.types +++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithExport.ts] //// === internalAliasInterfaceInsideTopLevelModuleWithExport.ts === -export module a { +export namespace a { export interface I { } } diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js index 8fcab4bd9c318..fadc0cfd54c6a 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts] //// //// [internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts] -export module a { +export namespace a { export interface I { } } diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.symbols b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.symbols index e24c439638bc7..bc17a808d8582 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.symbols +++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.symbols @@ -1,18 +1,18 @@ //// [tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts] //// === internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts, 0, 0)) export interface I { ->I : Symbol(I, Decl(internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts, 0, 17)) +>I : Symbol(I, Decl(internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts, 0, 20)) } } import b = a.I; >b : Symbol(b, Decl(internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts, 3, 1)) >a : Symbol(a, Decl(internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts, 0, 0)) ->I : Symbol(b, Decl(internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts, 0, 17)) +>I : Symbol(b, Decl(internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts, 0, 20)) export var x: b; >x : Symbol(x, Decl(internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts, 6, 10)) diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.types index d33c8c4017888..a08cc8d56565e 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.types +++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts] //// === internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts === -export module a { +export namespace a { export interface I { } } diff --git a/tests/baselines/reference/internalAliasUninitializedModule.js b/tests/baselines/reference/internalAliasUninitializedModule.js index 90530093a910f..ec9e86912d673 100644 --- a/tests/baselines/reference/internalAliasUninitializedModule.js +++ b/tests/baselines/reference/internalAliasUninitializedModule.js @@ -1,15 +1,15 @@ //// [tests/cases/compiler/internalAliasUninitializedModule.ts] //// //// [internalAliasUninitializedModule.ts] -module a { - export module b { +namespace a { + export namespace b { export interface I { foo(); } } } -module c { +namespace c { import b = a.b; export var x: b.I; x.foo(); diff --git a/tests/baselines/reference/internalAliasUninitializedModule.symbols b/tests/baselines/reference/internalAliasUninitializedModule.symbols index a44a835f4267b..51bcdfe2a823f 100644 --- a/tests/baselines/reference/internalAliasUninitializedModule.symbols +++ b/tests/baselines/reference/internalAliasUninitializedModule.symbols @@ -1,14 +1,14 @@ //// [tests/cases/compiler/internalAliasUninitializedModule.ts] //// === internalAliasUninitializedModule.ts === -module a { +namespace a { >a : Symbol(a, Decl(internalAliasUninitializedModule.ts, 0, 0)) - export module b { ->b : Symbol(b, Decl(internalAliasUninitializedModule.ts, 0, 10)) + export namespace b { +>b : Symbol(b, Decl(internalAliasUninitializedModule.ts, 0, 13)) export interface I { ->I : Symbol(I, Decl(internalAliasUninitializedModule.ts, 1, 21)) +>I : Symbol(I, Decl(internalAliasUninitializedModule.ts, 1, 24)) foo(); >foo : Symbol(I.foo, Decl(internalAliasUninitializedModule.ts, 2, 28)) @@ -16,18 +16,18 @@ module a { } } -module c { +namespace c { >c : Symbol(c, Decl(internalAliasUninitializedModule.ts, 6, 1)) import b = a.b; ->b : Symbol(b, Decl(internalAliasUninitializedModule.ts, 8, 10)) +>b : Symbol(b, Decl(internalAliasUninitializedModule.ts, 8, 13)) >a : Symbol(a, Decl(internalAliasUninitializedModule.ts, 0, 0)) ->b : Symbol(b, Decl(internalAliasUninitializedModule.ts, 0, 10)) +>b : Symbol(b, Decl(internalAliasUninitializedModule.ts, 0, 13)) export var x: b.I; >x : Symbol(x, Decl(internalAliasUninitializedModule.ts, 10, 14)) ->b : Symbol(b, Decl(internalAliasUninitializedModule.ts, 8, 10)) ->I : Symbol(b.I, Decl(internalAliasUninitializedModule.ts, 1, 21)) +>b : Symbol(b, Decl(internalAliasUninitializedModule.ts, 8, 13)) +>I : Symbol(b.I, Decl(internalAliasUninitializedModule.ts, 1, 24)) x.foo(); >x.foo : Symbol(b.I.foo, Decl(internalAliasUninitializedModule.ts, 2, 28)) diff --git a/tests/baselines/reference/internalAliasUninitializedModule.types b/tests/baselines/reference/internalAliasUninitializedModule.types index 2949b717564bd..74ac5beef4863 100644 --- a/tests/baselines/reference/internalAliasUninitializedModule.types +++ b/tests/baselines/reference/internalAliasUninitializedModule.types @@ -1,8 +1,8 @@ //// [tests/cases/compiler/internalAliasUninitializedModule.ts] //// === internalAliasUninitializedModule.ts === -module a { - export module b { +namespace a { + export namespace b { export interface I { foo(); >foo : () => any @@ -11,7 +11,7 @@ module a { } } -module c { +namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js index 230ef7412569f..74e4e84205166 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js @@ -1,15 +1,15 @@ //// [tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithExport.ts] //// //// [internalAliasUninitializedModuleInsideLocalModuleWithExport.ts] -export module a { - export module b { +export namespace a { + export namespace b { export interface I { foo(); } } } -export module c { +export namespace c { export import b = a.b; export var x: b.I; x.foo(); diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.symbols b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.symbols index da3669a8697fe..2b36169fa0bc8 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.symbols +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.symbols @@ -1,14 +1,14 @@ //// [tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithExport.ts] //// === internalAliasUninitializedModuleInsideLocalModuleWithExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasUninitializedModuleInsideLocalModuleWithExport.ts, 0, 0)) - export module b { ->b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithExport.ts, 0, 17)) + export namespace b { +>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithExport.ts, 0, 20)) export interface I { ->I : Symbol(I, Decl(internalAliasUninitializedModuleInsideLocalModuleWithExport.ts, 1, 21)) +>I : Symbol(I, Decl(internalAliasUninitializedModuleInsideLocalModuleWithExport.ts, 1, 24)) foo(); >foo : Symbol(I.foo, Decl(internalAliasUninitializedModuleInsideLocalModuleWithExport.ts, 2, 28)) @@ -16,18 +16,18 @@ export module a { } } -export module c { +export namespace c { >c : Symbol(c, Decl(internalAliasUninitializedModuleInsideLocalModuleWithExport.ts, 6, 1)) export import b = a.b; ->b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithExport.ts, 8, 17)) +>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithExport.ts, 8, 20)) >a : Symbol(a, Decl(internalAliasUninitializedModuleInsideLocalModuleWithExport.ts, 0, 0)) ->b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithExport.ts, 0, 17)) +>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithExport.ts, 0, 20)) export var x: b.I; >x : Symbol(x, Decl(internalAliasUninitializedModuleInsideLocalModuleWithExport.ts, 10, 14)) ->b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithExport.ts, 8, 17)) ->I : Symbol(b.I, Decl(internalAliasUninitializedModuleInsideLocalModuleWithExport.ts, 1, 21)) +>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithExport.ts, 8, 20)) +>I : Symbol(b.I, Decl(internalAliasUninitializedModuleInsideLocalModuleWithExport.ts, 1, 24)) x.foo(); >x.foo : Symbol(b.I.foo, Decl(internalAliasUninitializedModuleInsideLocalModuleWithExport.ts, 2, 28)) diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.types index 42a3443b6984d..a94777fe8709f 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.types +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.types @@ -1,8 +1,8 @@ //// [tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithExport.ts] //// === internalAliasUninitializedModuleInsideLocalModuleWithExport.ts === -export module a { - export module b { +export namespace a { + export namespace b { export interface I { foo(); >foo : () => any @@ -11,7 +11,7 @@ export module a { } } -export module c { +export namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js index 87e8b3e9c1caf..2eaa0cbbe15e5 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js @@ -1,15 +1,15 @@ //// [tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts] //// //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts] -export module a { - export module b { +export namespace a { + export namespace b { export interface I { foo(); } } } -export module c { +export namespace c { import b = a.b; export var x: b.I; x.foo(); diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.symbols b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.symbols index a1aa543f42432..be474c5e37742 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.symbols +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.symbols @@ -1,14 +1,14 @@ //// [tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts] //// === internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts, 0, 0)) - export module b { ->b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts, 0, 17)) + export namespace b { +>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts, 0, 20)) export interface I { ->I : Symbol(I, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts, 1, 21)) +>I : Symbol(I, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts, 1, 24)) foo(); >foo : Symbol(I.foo, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts, 2, 28)) @@ -16,18 +16,18 @@ export module a { } } -export module c { +export namespace c { >c : Symbol(c, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts, 6, 1)) import b = a.b; ->b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts, 8, 17)) +>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts, 8, 20)) >a : Symbol(a, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts, 0, 0)) ->b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts, 0, 17)) +>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts, 0, 20)) export var x: b.I; >x : Symbol(x, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts, 10, 14)) ->b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts, 8, 17)) ->I : Symbol(b.I, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts, 1, 21)) +>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts, 8, 20)) +>I : Symbol(b.I, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts, 1, 24)) x.foo(); >x.foo : Symbol(b.I.foo, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts, 2, 28)) diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.types index 15e8889c9c901..fca88d86af73d 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.types +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.types @@ -1,8 +1,8 @@ //// [tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts] //// === internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts === -export module a { - export module b { +export namespace a { + export namespace b { export interface I { foo(); >foo : () => any @@ -11,7 +11,7 @@ export module a { } } -export module c { +export namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt index be07530d9d519..7a702689ed566 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt @@ -2,15 +2,15 @@ internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts(16, ==== internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts (1 errors) ==== - export module a { - export module b { + export namespace a { + export namespace b { export interface I { foo(); } } } - export module c { + export namespace c { import b = a.b; export var x: b.I; x.foo(); diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js index 966f2f1676c46..788ac8ef70e01 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js @@ -1,15 +1,15 @@ //// [tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts] //// //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts] -export module a { - export module b { +export namespace a { + export namespace b { export interface I { foo(); } } } -export module c { +export namespace c { import b = a.b; export var x: b.I; x.foo(); diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.symbols b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.symbols index ae635ed5ad243..2173f7455f860 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.symbols +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.symbols @@ -1,14 +1,14 @@ //// [tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts] //// === internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 0, 0)) - export module b { ->b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 0, 17)) + export namespace b { +>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 0, 20)) export interface I { ->I : Symbol(I, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 1, 21)) +>I : Symbol(I, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 1, 24)) foo(); >foo : Symbol(I.foo, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 2, 28)) @@ -16,18 +16,18 @@ export module a { } } -export module c { +export namespace c { >c : Symbol(c, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 6, 1)) import b = a.b; ->b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 8, 17)) +>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 8, 20)) >a : Symbol(a, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 0, 0)) ->b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 0, 17)) +>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 0, 20)) export var x: b.I; >x : Symbol(x, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 10, 14)) ->b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 8, 17)) ->I : Symbol(b.I, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 1, 21)) +>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 8, 20)) +>I : Symbol(b.I, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 1, 24)) x.foo(); >x.foo : Symbol(b.I.foo, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 2, 28)) diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.types b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.types index 80f13acba2db8..530a15c3eac31 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.types +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.types @@ -1,8 +1,8 @@ //// [tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts] //// === internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts === -export module a { - export module b { +export namespace a { + export namespace b { export interface I { foo(); >foo : () => any @@ -11,7 +11,7 @@ export module a { } } -export module c { +export namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js index 108365ce3f4fe..23009fc37829f 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts] //// //// [internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts] -export module a { - export module b { +export namespace a { + export namespace b { export interface I { foo(); } diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.symbols b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.symbols index 82d1f9ee7e56d..74ef9414cf71f 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.symbols +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.symbols @@ -1,14 +1,14 @@ //// [tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts] //// === internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts, 0, 0)) - export module b { ->b : Symbol(b, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts, 0, 17)) + export namespace b { +>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts, 0, 20)) export interface I { ->I : Symbol(I, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts, 1, 21)) +>I : Symbol(I, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts, 1, 24)) foo(); >foo : Symbol(I.foo, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts, 2, 28)) @@ -19,12 +19,12 @@ export module a { export import b = a.b; >b : Symbol(b, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts, 6, 1)) >a : Symbol(a, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts, 0, 0)) ->b : Symbol(b, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts, 0, 17)) +>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts, 0, 20)) export var x: b.I; >x : Symbol(x, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts, 9, 10)) >b : Symbol(b, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts, 6, 1)) ->I : Symbol(b.I, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts, 1, 21)) +>I : Symbol(b.I, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts, 1, 24)) x.foo(); >x.foo : Symbol(b.I.foo, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts, 2, 28)) diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.types index 847e487499192..fb26b65095e65 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.types +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.types @@ -1,8 +1,8 @@ //// [tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts] //// === internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts === -export module a { - export module b { +export namespace a { + export namespace b { export interface I { foo(); >foo : () => any diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js index 49f01fe526a6d..8cf1b21131130 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts] //// //// [internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts] -export module a { - export module b { +export namespace a { + export namespace b { export interface I { foo(); } diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.symbols b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.symbols index 6724ca2dde1cc..a2e4d68d8eebe 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.symbols +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.symbols @@ -1,14 +1,14 @@ //// [tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts] //// === internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts, 0, 0)) - export module b { ->b : Symbol(b, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts, 0, 17)) + export namespace b { +>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts, 0, 20)) export interface I { ->I : Symbol(I, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts, 1, 21)) +>I : Symbol(I, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts, 1, 24)) foo(); >foo : Symbol(I.foo, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts, 2, 28)) @@ -19,12 +19,12 @@ export module a { import b = a.b; >b : Symbol(b, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts, 6, 1)) >a : Symbol(a, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts, 0, 0)) ->b : Symbol(b, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts, 0, 17)) +>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts, 0, 20)) export var x: b.I; >x : Symbol(x, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts, 9, 10)) >b : Symbol(b, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts, 6, 1)) ->I : Symbol(b.I, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts, 1, 21)) +>I : Symbol(b.I, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts, 1, 24)) x.foo(); >x.foo : Symbol(b.I.foo, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts, 2, 28)) diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.types index 5f0d1537f6cd0..df59c07299d23 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.types +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.types @@ -1,8 +1,8 @@ //// [tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts] //// === internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts === -export module a { - export module b { +export namespace a { + export namespace b { export interface I { foo(); >foo : () => any diff --git a/tests/baselines/reference/internalAliasVar.js b/tests/baselines/reference/internalAliasVar.js index 6cc8293a4a0b4..3f45caa18645c 100644 --- a/tests/baselines/reference/internalAliasVar.js +++ b/tests/baselines/reference/internalAliasVar.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasVar.ts] //// //// [internalAliasVar.ts] -module a { +namespace a { export var x = 10; } -module c { +namespace c { import b = a.x; export var bVal = b; } diff --git a/tests/baselines/reference/internalAliasVar.symbols b/tests/baselines/reference/internalAliasVar.symbols index a1f80ebafa1a1..7dcfcec972b65 100644 --- a/tests/baselines/reference/internalAliasVar.symbols +++ b/tests/baselines/reference/internalAliasVar.symbols @@ -1,23 +1,23 @@ //// [tests/cases/compiler/internalAliasVar.ts] //// === internalAliasVar.ts === -module a { +namespace a { >a : Symbol(a, Decl(internalAliasVar.ts, 0, 0)) export var x = 10; >x : Symbol(x, Decl(internalAliasVar.ts, 1, 14)) } -module c { +namespace c { >c : Symbol(c, Decl(internalAliasVar.ts, 2, 1)) import b = a.x; ->b : Symbol(b, Decl(internalAliasVar.ts, 4, 10)) +>b : Symbol(b, Decl(internalAliasVar.ts, 4, 13)) >a : Symbol(a, Decl(internalAliasVar.ts, 0, 0)) >x : Symbol(b, Decl(internalAliasVar.ts, 1, 14)) export var bVal = b; >bVal : Symbol(bVal, Decl(internalAliasVar.ts, 6, 14)) ->b : Symbol(b, Decl(internalAliasVar.ts, 4, 10)) +>b : Symbol(b, Decl(internalAliasVar.ts, 4, 13)) } diff --git a/tests/baselines/reference/internalAliasVar.types b/tests/baselines/reference/internalAliasVar.types index 216c94c45e1b1..ec221cbd67c8e 100644 --- a/tests/baselines/reference/internalAliasVar.types +++ b/tests/baselines/reference/internalAliasVar.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasVar.ts] //// === internalAliasVar.ts === -module a { +namespace a { >a : typeof a > : ^^^^^^^^ @@ -12,7 +12,7 @@ module a { > : ^^ } -module c { +namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js index e650d13ee0171..5e47fc48ce624 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasVarInsideLocalModuleWithExport.ts] //// //// [internalAliasVarInsideLocalModuleWithExport.ts] -export module a { +export namespace a { export var x = 10; } -export module c { +export namespace c { export import b = a.x; export var bVal = b; } diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.symbols b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.symbols index e6bac0f87d297..d2bb636174e4d 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.symbols +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.symbols @@ -1,23 +1,23 @@ //// [tests/cases/compiler/internalAliasVarInsideLocalModuleWithExport.ts] //// === internalAliasVarInsideLocalModuleWithExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasVarInsideLocalModuleWithExport.ts, 0, 0)) export var x = 10; >x : Symbol(x, Decl(internalAliasVarInsideLocalModuleWithExport.ts, 1, 14)) } -export module c { +export namespace c { >c : Symbol(c, Decl(internalAliasVarInsideLocalModuleWithExport.ts, 2, 1)) export import b = a.x; ->b : Symbol(b, Decl(internalAliasVarInsideLocalModuleWithExport.ts, 4, 17)) +>b : Symbol(b, Decl(internalAliasVarInsideLocalModuleWithExport.ts, 4, 20)) >a : Symbol(a, Decl(internalAliasVarInsideLocalModuleWithExport.ts, 0, 0)) >x : Symbol(b, Decl(internalAliasVarInsideLocalModuleWithExport.ts, 1, 14)) export var bVal = b; >bVal : Symbol(bVal, Decl(internalAliasVarInsideLocalModuleWithExport.ts, 6, 14)) ->b : Symbol(b, Decl(internalAliasVarInsideLocalModuleWithExport.ts, 4, 17)) +>b : Symbol(b, Decl(internalAliasVarInsideLocalModuleWithExport.ts, 4, 20)) } diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.types index fa888d0491fb1..b0d6ae2b91ca1 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.types +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasVarInsideLocalModuleWithExport.ts] //// === internalAliasVarInsideLocalModuleWithExport.ts === -export module a { +export namespace a { >a : typeof a > : ^^^^^^^^ @@ -12,7 +12,7 @@ export module a { > : ^^ } -export module c { +export namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js index d6b1b108a15d2..007a3dbd78a5d 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExport.ts] //// //// [internalAliasVarInsideLocalModuleWithoutExport.ts] -export module a { +export namespace a { export var x = 10; } -export module c { +export namespace c { import b = a.x; export var bVal = b; } diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.symbols b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.symbols index 16cff238bba25..c7aee70f940ee 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.symbols +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.symbols @@ -1,23 +1,23 @@ //// [tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExport.ts] //// === internalAliasVarInsideLocalModuleWithoutExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasVarInsideLocalModuleWithoutExport.ts, 0, 0)) export var x = 10; >x : Symbol(x, Decl(internalAliasVarInsideLocalModuleWithoutExport.ts, 1, 14)) } -export module c { +export namespace c { >c : Symbol(c, Decl(internalAliasVarInsideLocalModuleWithoutExport.ts, 2, 1)) import b = a.x; ->b : Symbol(b, Decl(internalAliasVarInsideLocalModuleWithoutExport.ts, 4, 17)) +>b : Symbol(b, Decl(internalAliasVarInsideLocalModuleWithoutExport.ts, 4, 20)) >a : Symbol(a, Decl(internalAliasVarInsideLocalModuleWithoutExport.ts, 0, 0)) >x : Symbol(b, Decl(internalAliasVarInsideLocalModuleWithoutExport.ts, 1, 14)) export var bVal = b; >bVal : Symbol(bVal, Decl(internalAliasVarInsideLocalModuleWithoutExport.ts, 6, 14)) ->b : Symbol(b, Decl(internalAliasVarInsideLocalModuleWithoutExport.ts, 4, 17)) +>b : Symbol(b, Decl(internalAliasVarInsideLocalModuleWithoutExport.ts, 4, 20)) } diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.types index 5f2b63383b72b..92d81ccc5bb92 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.types +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExport.ts] //// === internalAliasVarInsideLocalModuleWithoutExport.ts === -export module a { +export namespace a { >a : typeof a > : ^^^^^^^^ @@ -12,7 +12,7 @@ export module a { > : ^^ } -export module c { +export namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.errors.txt b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.errors.txt index dd54dd8123a75..dc9bbcf97977b 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.errors.txt +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.errors.txt @@ -2,11 +2,11 @@ internalAliasVarInsideLocalModuleWithoutExportAccessError.ts(10,18): error TS233 ==== internalAliasVarInsideLocalModuleWithoutExportAccessError.ts (1 errors) ==== - export module a { + export namespace a { export var x = 10; } - export module c { + export namespace c { import b = a.x; export var bVal = b; } diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js index c306ede11a57c..4fa123fc2da13 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExportAccessError.ts] //// //// [internalAliasVarInsideLocalModuleWithoutExportAccessError.ts] -export module a { +export namespace a { export var x = 10; } -export module c { +export namespace c { import b = a.x; export var bVal = b; } diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.symbols b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.symbols index e84c85b8cd8f4..cbf3875c6400c 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.symbols +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.symbols @@ -1,24 +1,24 @@ //// [tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExportAccessError.ts] //// === internalAliasVarInsideLocalModuleWithoutExportAccessError.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasVarInsideLocalModuleWithoutExportAccessError.ts, 0, 0)) export var x = 10; >x : Symbol(x, Decl(internalAliasVarInsideLocalModuleWithoutExportAccessError.ts, 1, 14)) } -export module c { +export namespace c { >c : Symbol(c, Decl(internalAliasVarInsideLocalModuleWithoutExportAccessError.ts, 2, 1)) import b = a.x; ->b : Symbol(b, Decl(internalAliasVarInsideLocalModuleWithoutExportAccessError.ts, 4, 17)) +>b : Symbol(b, Decl(internalAliasVarInsideLocalModuleWithoutExportAccessError.ts, 4, 20)) >a : Symbol(a, Decl(internalAliasVarInsideLocalModuleWithoutExportAccessError.ts, 0, 0)) >x : Symbol(b, Decl(internalAliasVarInsideLocalModuleWithoutExportAccessError.ts, 1, 14)) export var bVal = b; >bVal : Symbol(bVal, Decl(internalAliasVarInsideLocalModuleWithoutExportAccessError.ts, 6, 14)) ->b : Symbol(b, Decl(internalAliasVarInsideLocalModuleWithoutExportAccessError.ts, 4, 17)) +>b : Symbol(b, Decl(internalAliasVarInsideLocalModuleWithoutExportAccessError.ts, 4, 20)) } export var z = c.b; diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.types b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.types index 3a955a78b9269..630a6b4202220 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.types +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExportAccessError.ts] //// === internalAliasVarInsideLocalModuleWithoutExportAccessError.ts === -export module a { +export namespace a { >a : typeof a > : ^^^^^^^^ @@ -12,7 +12,7 @@ export module a { > : ^^ } -export module c { +export namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js index 7641cfd1bc64e..dc32de7086171 100644 --- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithExport.ts] //// //// [internalAliasVarInsideTopLevelModuleWithExport.ts] -export module a { +export namespace a { export var x = 10; } diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.symbols b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.symbols index 2c557e33e1026..c0b982d8be4e5 100644 --- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.symbols +++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithExport.ts] //// === internalAliasVarInsideTopLevelModuleWithExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasVarInsideTopLevelModuleWithExport.ts, 0, 0)) export var x = 10; diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.types index ca65427dc78fe..38a32cb37c754 100644 --- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.types +++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithExport.ts] //// === internalAliasVarInsideTopLevelModuleWithExport.ts === -export module a { +export namespace a { >a : typeof a > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js index 3076eff77a7c3..7c8658b530254 100644 --- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithoutExport.ts] //// //// [internalAliasVarInsideTopLevelModuleWithoutExport.ts] -export module a { +export namespace a { export var x = 10; } diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.symbols b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.symbols index 945cdb215993a..95d1fc23c9394 100644 --- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.symbols +++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithoutExport.ts] //// === internalAliasVarInsideTopLevelModuleWithoutExport.ts === -export module a { +export namespace a { >a : Symbol(a, Decl(internalAliasVarInsideTopLevelModuleWithoutExport.ts, 0, 0)) export var x = 10; diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.types index 4f4da4c9ad769..625a7702a6de8 100644 --- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.types +++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithoutExport.ts] //// === internalAliasVarInsideTopLevelModuleWithoutExport.ts === -export module a { +export namespace a { >a : typeof a > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalAliasWithDottedNameEmit.js b/tests/baselines/reference/internalAliasWithDottedNameEmit.js index 186b0267edbe3..2f4c67e2dbdbf 100644 --- a/tests/baselines/reference/internalAliasWithDottedNameEmit.js +++ b/tests/baselines/reference/internalAliasWithDottedNameEmit.js @@ -1,10 +1,10 @@ //// [tests/cases/compiler/internalAliasWithDottedNameEmit.ts] //// //// [internalAliasWithDottedNameEmit.ts] -module a.b.c { +namespace a.b.c { export var d; } -module a.e.f { +namespace a.e.f { import g = b.c; } diff --git a/tests/baselines/reference/internalAliasWithDottedNameEmit.symbols b/tests/baselines/reference/internalAliasWithDottedNameEmit.symbols index fe7efd3065ac2..9d8e99848abbb 100644 --- a/tests/baselines/reference/internalAliasWithDottedNameEmit.symbols +++ b/tests/baselines/reference/internalAliasWithDottedNameEmit.symbols @@ -1,22 +1,22 @@ //// [tests/cases/compiler/internalAliasWithDottedNameEmit.ts] //// === internalAliasWithDottedNameEmit.ts === -module a.b.c { +namespace a.b.c { >a : Symbol(a, Decl(internalAliasWithDottedNameEmit.ts, 0, 0), Decl(internalAliasWithDottedNameEmit.ts, 2, 1)) ->b : Symbol(b, Decl(internalAliasWithDottedNameEmit.ts, 0, 9)) ->c : Symbol(c, Decl(internalAliasWithDottedNameEmit.ts, 0, 11)) +>b : Symbol(b, Decl(internalAliasWithDottedNameEmit.ts, 0, 12)) +>c : Symbol(c, Decl(internalAliasWithDottedNameEmit.ts, 0, 14)) export var d; >d : Symbol(d, Decl(internalAliasWithDottedNameEmit.ts, 1, 16)) } -module a.e.f { +namespace a.e.f { >a : Symbol(a, Decl(internalAliasWithDottedNameEmit.ts, 0, 0), Decl(internalAliasWithDottedNameEmit.ts, 2, 1)) ->e : Symbol(e, Decl(internalAliasWithDottedNameEmit.ts, 3, 9)) ->f : Symbol(f, Decl(internalAliasWithDottedNameEmit.ts, 3, 11)) +>e : Symbol(e, Decl(internalAliasWithDottedNameEmit.ts, 3, 12)) +>f : Symbol(f, Decl(internalAliasWithDottedNameEmit.ts, 3, 14)) import g = b.c; ->g : Symbol(g, Decl(internalAliasWithDottedNameEmit.ts, 3, 14)) ->b : Symbol(b, Decl(internalAliasWithDottedNameEmit.ts, 0, 9)) ->c : Symbol(g, Decl(internalAliasWithDottedNameEmit.ts, 0, 11)) +>g : Symbol(g, Decl(internalAliasWithDottedNameEmit.ts, 3, 17)) +>b : Symbol(b, Decl(internalAliasWithDottedNameEmit.ts, 0, 12)) +>c : Symbol(g, Decl(internalAliasWithDottedNameEmit.ts, 0, 14)) } diff --git a/tests/baselines/reference/internalAliasWithDottedNameEmit.types b/tests/baselines/reference/internalAliasWithDottedNameEmit.types index ba127ab9a87e8..04c9d8f15567c 100644 --- a/tests/baselines/reference/internalAliasWithDottedNameEmit.types +++ b/tests/baselines/reference/internalAliasWithDottedNameEmit.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalAliasWithDottedNameEmit.ts] //// === internalAliasWithDottedNameEmit.ts === -module a.b.c { +namespace a.b.c { >a : typeof a > : ^^^^^^^^ >b : typeof b @@ -12,7 +12,7 @@ module a.b.c { export var d; >d : any } -module a.e.f { +namespace a.e.f { import g = b.c; >g : typeof g > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.errors.txt b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.errors.txt index 48e3e5e593a4a..2bbd7fc3797eb 100644 --- a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.errors.txt +++ b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.errors.txt @@ -5,12 +5,12 @@ internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.ts(11,16): class A { aProp: string; } - module A { + namespace A { export interface X { s: string } export var a = 10; } - module B { + namespace B { var A = 1; import Y = A; ~ diff --git a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.js b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.js index 92e66d9a7eb5f..49fe44d3b1acc 100644 --- a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.js +++ b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.js @@ -4,12 +4,12 @@ class A { aProp: string; } -module A { +namespace A { export interface X { s: string } export var a = 10; } -module B { +namespace B { var A = 1; import Y = A; } diff --git a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.symbols b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.symbols index ea5f8ed472813..d85fc816c2e5c 100644 --- a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.symbols +++ b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.symbols @@ -7,18 +7,18 @@ class A { aProp: string; >aProp : Symbol(A.aProp, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.ts, 0, 9)) } -module A { +namespace A { >A : Symbol(A, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.ts, 0, 0), Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.ts, 2, 1)) export interface X { s: string } ->X : Symbol(X, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.ts, 3, 10)) +>X : Symbol(X, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.ts, 3, 13)) >s : Symbol(X.s, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.ts, 4, 24)) export var a = 10; >a : Symbol(a, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.ts, 5, 14)) } -module B { +namespace B { >B : Symbol(B, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.ts, 6, 1)) var A = 1; diff --git a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.types b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.types index 3a133ece0040f..96d086647d78a 100644 --- a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.types +++ b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.types @@ -9,7 +9,7 @@ class A { >aProp : string > : ^^^^^^ } -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -24,7 +24,7 @@ module A { > : ^^ } -module B { +namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js index d959616b7ce8a..88e5f6d1ba663 100644 --- a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js +++ b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js @@ -4,12 +4,12 @@ class A { aProp: string; } -module A { +namespace A { export interface X { s: string } export var a = 10; } -module B { +namespace B { import Y = A; } diff --git a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.symbols b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.symbols index bac3eda8df631..54e1da4fcdf57 100644 --- a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.symbols +++ b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.symbols @@ -7,22 +7,22 @@ class A { aProp: string; >aProp : Symbol(A.aProp, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 0, 9)) } -module A { +namespace A { >A : Symbol(A, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 0, 0), Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 2, 1)) export interface X { s: string } ->X : Symbol(X, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 3, 10)) +>X : Symbol(X, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 3, 13)) >s : Symbol(X.s, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 4, 24)) export var a = 10; >a : Symbol(a, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 5, 14)) } -module B { +namespace B { >B : Symbol(B, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 6, 1)) import Y = A; ->Y : Symbol(Y, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 8, 10)) +>Y : Symbol(Y, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 8, 13)) >A : Symbol(Y, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 0, 0), Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 2, 1)) } diff --git a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types index 11e9b701aa094..1f465a3d50ea9 100644 --- a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types +++ b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types @@ -9,7 +9,7 @@ class A { >aProp : string > : ^^^^^^ } -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -24,7 +24,7 @@ module A { > : ^^ } -module B { +namespace B { import Y = A; >Y : typeof Y > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.errors.txt b/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.errors.txt index 4d5964a227041..eb1b85ed945b2 100644 --- a/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.errors.txt +++ b/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.errors.txt @@ -2,12 +2,12 @@ internalImportInstantiatedModuleNotReferencingInstance.ts(8,16): error TS2437: M ==== internalImportInstantiatedModuleNotReferencingInstance.ts (1 errors) ==== - module A { + namespace A { export interface X { s: string } export var a = 10; } - module B { + namespace B { var A = 1; import Y = A; ~ diff --git a/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.js b/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.js index 76a9e6a3e8b04..8965f41daece9 100644 --- a/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.js +++ b/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.js @@ -1,12 +1,12 @@ //// [tests/cases/compiler/internalImportInstantiatedModuleNotReferencingInstance.ts] //// //// [internalImportInstantiatedModuleNotReferencingInstance.ts] -module A { +namespace A { export interface X { s: string } export var a = 10; } -module B { +namespace B { var A = 1; import Y = A; } diff --git a/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.symbols b/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.symbols index 5241cc2855804..59cb3636cf569 100644 --- a/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.symbols +++ b/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.symbols @@ -1,18 +1,18 @@ //// [tests/cases/compiler/internalImportInstantiatedModuleNotReferencingInstance.ts] //// === internalImportInstantiatedModuleNotReferencingInstance.ts === -module A { +namespace A { >A : Symbol(A, Decl(internalImportInstantiatedModuleNotReferencingInstance.ts, 0, 0)) export interface X { s: string } ->X : Symbol(X, Decl(internalImportInstantiatedModuleNotReferencingInstance.ts, 0, 10)) +>X : Symbol(X, Decl(internalImportInstantiatedModuleNotReferencingInstance.ts, 0, 13)) >s : Symbol(X.s, Decl(internalImportInstantiatedModuleNotReferencingInstance.ts, 1, 24)) export var a = 10; >a : Symbol(a, Decl(internalImportInstantiatedModuleNotReferencingInstance.ts, 2, 14)) } -module B { +namespace B { >B : Symbol(B, Decl(internalImportInstantiatedModuleNotReferencingInstance.ts, 3, 1)) var A = 1; diff --git a/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.types b/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.types index 283e0c87a430c..654e1e8b798a7 100644 --- a/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.types +++ b/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/internalImportInstantiatedModuleNotReferencingInstance.ts] //// === internalImportInstantiatedModuleNotReferencingInstance.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -16,7 +16,7 @@ module A { > : ^^ } -module B { +namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.errors.txt b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.errors.txt index 1f0885c8f9a30..01137ba0fce99 100644 --- a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.errors.txt +++ b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.errors.txt @@ -5,11 +5,11 @@ internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.ts(10,16 class A { aProp: string; } - module A { + namespace A { export interface X { s: string } } - module B { + namespace B { var A = 1; import Y = A; ~ diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.js b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.js index ae8706a9b8297..892ea1e1be138 100644 --- a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.js +++ b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.js @@ -4,11 +4,11 @@ class A { aProp: string; } -module A { +namespace A { export interface X { s: string } } -module B { +namespace B { var A = 1; import Y = A; } diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.symbols b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.symbols index 3b055e9e9dbaf..d23af3863eafb 100644 --- a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.symbols +++ b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.symbols @@ -7,15 +7,15 @@ class A { aProp: string; >aProp : Symbol(A.aProp, Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.ts, 0, 9)) } -module A { +namespace A { >A : Symbol(A, Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.ts, 0, 0), Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.ts, 2, 1)) export interface X { s: string } ->X : Symbol(X, Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.ts, 3, 10)) +>X : Symbol(X, Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.ts, 3, 13)) >s : Symbol(X.s, Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.ts, 4, 24)) } -module B { +namespace B { >B : Symbol(B, Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.ts, 5, 1)) var A = 1; diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.types b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.types index 52bce6196c978..4598302d19be1 100644 --- a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.types +++ b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.types @@ -9,13 +9,13 @@ class A { >aProp : string > : ^^^^^^ } -module A { +namespace A { export interface X { s: string } >s : string > : ^^^^^^ } -module B { +namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js index d92162bbff701..32f4c2a2e164a 100644 --- a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js +++ b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js @@ -4,11 +4,11 @@ class A { aProp: string; } -module A { +namespace A { export interface X { s: string } } -module B { +namespace B { import Y = A; } diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.symbols b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.symbols index 1009fed03d242..7106230a9d31f 100644 --- a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.symbols +++ b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.symbols @@ -7,19 +7,19 @@ class A { aProp: string; >aProp : Symbol(A.aProp, Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 0, 9)) } -module A { +namespace A { >A : Symbol(A, Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 0, 0), Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 2, 1)) export interface X { s: string } ->X : Symbol(X, Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 3, 10)) +>X : Symbol(X, Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 3, 13)) >s : Symbol(X.s, Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 4, 24)) } -module B { +namespace B { >B : Symbol(B, Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 5, 1)) import Y = A; ->Y : Symbol(Y, Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 7, 10)) +>Y : Symbol(Y, Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 7, 13)) >A : Symbol(Y, Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 0, 0), Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 2, 1)) } diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types index fb5fe4c366cc1..736a1bac0ba7c 100644 --- a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types +++ b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types @@ -9,13 +9,13 @@ class A { >aProp : string > : ^^^^^^ } -module A { +namespace A { export interface X { s: string } >s : string > : ^^^^^^ } -module B { +namespace B { import Y = A; >Y : typeof Y > : ^^^^^^^^ diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.js b/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.js index 98e3cd51800ba..698403174e021 100644 --- a/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.js +++ b/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.ts] //// //// [internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.ts] -module A { +namespace A { export interface X { s: string } } -module B { +namespace B { var A = 1; import Y = A; } diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.symbols b/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.symbols index de45fbfc150ea..956d9631b6885 100644 --- a/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.symbols +++ b/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.symbols @@ -1,15 +1,15 @@ //// [tests/cases/compiler/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.ts] //// === internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.ts === -module A { +namespace A { >A : Symbol(A, Decl(internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.ts, 0, 0)) export interface X { s: string } ->X : Symbol(X, Decl(internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.ts, 0, 10)) +>X : Symbol(X, Decl(internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.ts, 0, 13)) >s : Symbol(X.s, Decl(internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.ts, 1, 24)) } -module B { +namespace B { >B : Symbol(B, Decl(internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.ts, 2, 1)) var A = 1; diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.types b/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.types index f130a5f0f94f2..8b0b97b2cd4ab 100644 --- a/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.types +++ b/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.types @@ -1,13 +1,13 @@ //// [tests/cases/compiler/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.ts] //// === internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.ts === -module A { +namespace A { export interface X { s: string } >s : string > : ^^^^^^ } -module B { +namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/intrinsics.errors.txt b/tests/baselines/reference/intrinsics.errors.txt index 59c337081a22c..545052fa23fe3 100644 --- a/tests/baselines/reference/intrinsics.errors.txt +++ b/tests/baselines/reference/intrinsics.errors.txt @@ -7,7 +7,7 @@ intrinsics.ts(10,1): error TS2304: Cannot find name '__proto__'. ~~~~~~~~~~~~~~ !!! error TS2749: 'hasOwnProperty' refers to a value, but is being used as a type here. Did you mean 'typeof hasOwnProperty'? - module m1 { + namespace m1 { export var __proto__; interface __proto__ {} diff --git a/tests/baselines/reference/intrinsics.js b/tests/baselines/reference/intrinsics.js index 2248881325fac..9a2ed1a6358f7 100644 --- a/tests/baselines/reference/intrinsics.js +++ b/tests/baselines/reference/intrinsics.js @@ -3,7 +3,7 @@ //// [intrinsics.ts] var hasOwnProperty: hasOwnProperty; // Error -module m1 { +namespace m1 { export var __proto__; interface __proto__ {} diff --git a/tests/baselines/reference/intrinsics.symbols b/tests/baselines/reference/intrinsics.symbols index 57badd4a6de4a..3ef123b2b23a7 100644 --- a/tests/baselines/reference/intrinsics.symbols +++ b/tests/baselines/reference/intrinsics.symbols @@ -5,7 +5,7 @@ var hasOwnProperty: hasOwnProperty; // Error >hasOwnProperty : Symbol(hasOwnProperty, Decl(intrinsics.ts, 0, 3)) >hasOwnProperty : Symbol(hasOwnProperty) -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(intrinsics.ts, 0, 35)) export var __proto__; diff --git a/tests/baselines/reference/intrinsics.types b/tests/baselines/reference/intrinsics.types index d7ef28546cae5..d1a736b0d53e7 100644 --- a/tests/baselines/reference/intrinsics.types +++ b/tests/baselines/reference/intrinsics.types @@ -5,7 +5,7 @@ var hasOwnProperty: hasOwnProperty; // Error >hasOwnProperty : hasOwnProperty > : ^^^^^^^^^^^^^^ -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/invalidAssignmentsToVoid.errors.txt b/tests/baselines/reference/invalidAssignmentsToVoid.errors.txt index 64c5dd8499730..5fc31d83ae4fa 100644 --- a/tests/baselines/reference/invalidAssignmentsToVoid.errors.txt +++ b/tests/baselines/reference/invalidAssignmentsToVoid.errors.txt @@ -40,7 +40,7 @@ invalidAssignmentsToVoid.ts(22,5): error TS2322: Type '(a: T) => void' is not ~ !!! error TS2322: Type 'I' is not assignable to type 'void'. - module M { export var x = 1; } + namespace M { export var x = 1; } x = M; ~ !!! error TS2322: Type 'typeof M' is not assignable to type 'void'. diff --git a/tests/baselines/reference/invalidAssignmentsToVoid.js b/tests/baselines/reference/invalidAssignmentsToVoid.js index 82713c25a1fc2..29a324850a39b 100644 --- a/tests/baselines/reference/invalidAssignmentsToVoid.js +++ b/tests/baselines/reference/invalidAssignmentsToVoid.js @@ -16,7 +16,7 @@ interface I { foo: string; } var i: I; x = i; -module M { export var x = 1; } +namespace M { export var x = 1; } x = M; function f(a: T) { diff --git a/tests/baselines/reference/invalidAssignmentsToVoid.symbols b/tests/baselines/reference/invalidAssignmentsToVoid.symbols index 2be27f2fce093..26724370a4cf4 100644 --- a/tests/baselines/reference/invalidAssignmentsToVoid.symbols +++ b/tests/baselines/reference/invalidAssignmentsToVoid.symbols @@ -44,9 +44,9 @@ x = i; >x : Symbol(x, Decl(invalidAssignmentsToVoid.ts, 0, 3)) >i : Symbol(i, Decl(invalidAssignmentsToVoid.ts, 12, 3)) -module M { export var x = 1; } +namespace M { export var x = 1; } >M : Symbol(M, Decl(invalidAssignmentsToVoid.ts, 13, 6)) ->x : Symbol(x, Decl(invalidAssignmentsToVoid.ts, 15, 21)) +>x : Symbol(x, Decl(invalidAssignmentsToVoid.ts, 15, 24)) x = M; >x : Symbol(x, Decl(invalidAssignmentsToVoid.ts, 0, 3)) diff --git a/tests/baselines/reference/invalidAssignmentsToVoid.types b/tests/baselines/reference/invalidAssignmentsToVoid.types index 0798a52ae1360..63730d9da3767 100644 --- a/tests/baselines/reference/invalidAssignmentsToVoid.types +++ b/tests/baselines/reference/invalidAssignmentsToVoid.types @@ -79,7 +79,7 @@ x = i; >i : I > : ^ -module M { export var x = 1; } +namespace M { export var x = 1; } >M : typeof M > : ^^^^^^^^ >x : number diff --git a/tests/baselines/reference/invalidBooleanAssignments.errors.txt b/tests/baselines/reference/invalidBooleanAssignments.errors.txt index 15f46942c2b1f..523f9dccccb70 100644 --- a/tests/baselines/reference/invalidBooleanAssignments.errors.txt +++ b/tests/baselines/reference/invalidBooleanAssignments.errors.txt @@ -45,7 +45,7 @@ invalidBooleanAssignments.ts(26,1): error TS2630: Cannot assign to 'i' because i !!! error TS2322: Type 'boolean' is not assignable to type '() => string'. var h2: { toString(): string } = x; // no error - module M { export var a = 1; } + namespace M { export var a = 1; } M = x; ~ !!! error TS2631: Cannot assign to 'M' because it is a namespace. diff --git a/tests/baselines/reference/invalidBooleanAssignments.js b/tests/baselines/reference/invalidBooleanAssignments.js index 0e7d782558b78..69b54a3ff5dcc 100644 --- a/tests/baselines/reference/invalidBooleanAssignments.js +++ b/tests/baselines/reference/invalidBooleanAssignments.js @@ -20,7 +20,7 @@ var g: I = x; var h: { (): string } = x; var h2: { toString(): string } = x; // no error -module M { export var a = 1; } +namespace M { export var a = 1; } M = x; function i(a: T) { diff --git a/tests/baselines/reference/invalidBooleanAssignments.symbols b/tests/baselines/reference/invalidBooleanAssignments.symbols index 5372f0e3bcf0b..bc4984f879c9d 100644 --- a/tests/baselines/reference/invalidBooleanAssignments.symbols +++ b/tests/baselines/reference/invalidBooleanAssignments.symbols @@ -57,9 +57,9 @@ var h2: { toString(): string } = x; // no error >toString : Symbol(toString, Decl(invalidBooleanAssignments.ts, 17, 9)) >x : Symbol(x, Decl(invalidBooleanAssignments.ts, 0, 3)) -module M { export var a = 1; } +namespace M { export var a = 1; } >M : Symbol(M, Decl(invalidBooleanAssignments.ts, 17, 35)) ->a : Symbol(a, Decl(invalidBooleanAssignments.ts, 19, 21)) +>a : Symbol(a, Decl(invalidBooleanAssignments.ts, 19, 24)) M = x; >M : Symbol(M, Decl(invalidBooleanAssignments.ts, 17, 35)) diff --git a/tests/baselines/reference/invalidBooleanAssignments.types b/tests/baselines/reference/invalidBooleanAssignments.types index 3063ae15cd718..20f979b88fcce 100644 --- a/tests/baselines/reference/invalidBooleanAssignments.types +++ b/tests/baselines/reference/invalidBooleanAssignments.types @@ -81,7 +81,7 @@ var h2: { toString(): string } = x; // no error >x : true > : ^^^^ -module M { export var a = 1; } +namespace M { export var a = 1; } >M : typeof M > : ^^^^^^^^ >a : number diff --git a/tests/baselines/reference/invalidInstantiatedModule.errors.txt b/tests/baselines/reference/invalidInstantiatedModule.errors.txt index 539dbba4c8305..5ac430195b139 100644 --- a/tests/baselines/reference/invalidInstantiatedModule.errors.txt +++ b/tests/baselines/reference/invalidInstantiatedModule.errors.txt @@ -4,7 +4,7 @@ invalidInstantiatedModule.ts(12,8): error TS2833: Cannot find namespace 'm'. Did ==== invalidInstantiatedModule.ts (3 errors) ==== - module M { + namespace M { export class Point { x: number; y: number } ~~~~~ !!! error TS2300: Duplicate identifier 'Point'. @@ -13,7 +13,7 @@ invalidInstantiatedModule.ts(12,8): error TS2833: Cannot find namespace 'm'. Did !!! error TS2300: Duplicate identifier 'Point'. } - module M2 { + namespace M2 { export interface Point { x: number; y: number } export var Point = 1; } @@ -22,7 +22,7 @@ invalidInstantiatedModule.ts(12,8): error TS2833: Cannot find namespace 'm'. Did var p: m.Point; // Error ~ !!! error TS2833: Cannot find namespace 'm'. Did you mean 'M'? -!!! related TS2728 invalidInstantiatedModule.ts:1:8: 'M' is declared here. +!!! related TS2728 invalidInstantiatedModule.ts:1:11: 'M' is declared here. \ No newline at end of file diff --git a/tests/baselines/reference/invalidInstantiatedModule.js b/tests/baselines/reference/invalidInstantiatedModule.js index 8588c8db7f4ad..10cf9e58ae978 100644 --- a/tests/baselines/reference/invalidInstantiatedModule.js +++ b/tests/baselines/reference/invalidInstantiatedModule.js @@ -1,12 +1,12 @@ //// [tests/cases/conformance/internalModules/moduleDeclarations/invalidInstantiatedModule.ts] //// //// [invalidInstantiatedModule.ts] -module M { +namespace M { export class Point { x: number; y: number } export var Point = 1; // Error } -module M2 { +namespace M2 { export interface Point { x: number; y: number } export var Point = 1; } diff --git a/tests/baselines/reference/invalidInstantiatedModule.symbols b/tests/baselines/reference/invalidInstantiatedModule.symbols index ea4ff0e824fe6..eff05824bfe5f 100644 --- a/tests/baselines/reference/invalidInstantiatedModule.symbols +++ b/tests/baselines/reference/invalidInstantiatedModule.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/moduleDeclarations/invalidInstantiatedModule.ts] //// === invalidInstantiatedModule.ts === -module M { +namespace M { >M : Symbol(M, Decl(invalidInstantiatedModule.ts, 0, 0)) export class Point { x: number; y: number } ->Point : Symbol(Point, Decl(invalidInstantiatedModule.ts, 0, 10)) +>Point : Symbol(Point, Decl(invalidInstantiatedModule.ts, 0, 13)) >x : Symbol(Point.x, Decl(invalidInstantiatedModule.ts, 1, 24)) >y : Symbol(Point.y, Decl(invalidInstantiatedModule.ts, 1, 35)) @@ -13,16 +13,16 @@ module M { >Point : Symbol(Point, Decl(invalidInstantiatedModule.ts, 2, 14)) } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(invalidInstantiatedModule.ts, 3, 1)) export interface Point { x: number; y: number } ->Point : Symbol(Point, Decl(invalidInstantiatedModule.ts, 5, 11), Decl(invalidInstantiatedModule.ts, 7, 14)) +>Point : Symbol(Point, Decl(invalidInstantiatedModule.ts, 5, 14), Decl(invalidInstantiatedModule.ts, 7, 14)) >x : Symbol(Point.x, Decl(invalidInstantiatedModule.ts, 6, 28)) >y : Symbol(Point.y, Decl(invalidInstantiatedModule.ts, 6, 39)) export var Point = 1; ->Point : Symbol(Point, Decl(invalidInstantiatedModule.ts, 5, 11), Decl(invalidInstantiatedModule.ts, 7, 14)) +>Point : Symbol(Point, Decl(invalidInstantiatedModule.ts, 5, 14), Decl(invalidInstantiatedModule.ts, 7, 14)) } var m = M2; diff --git a/tests/baselines/reference/invalidInstantiatedModule.types b/tests/baselines/reference/invalidInstantiatedModule.types index e14878079dd64..e06951d16193a 100644 --- a/tests/baselines/reference/invalidInstantiatedModule.types +++ b/tests/baselines/reference/invalidInstantiatedModule.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/moduleDeclarations/invalidInstantiatedModule.ts] //// === invalidInstantiatedModule.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -20,7 +20,7 @@ module M { > : ^ } -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.errors.txt b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.errors.txt index 689e6cf633e7b..ba5113807003c 100644 --- a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.errors.txt +++ b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.errors.txt @@ -4,6 +4,7 @@ invalidModuleWithStatementsOfEveryKind.ts(12,5): error TS1044: 'public' modifier invalidModuleWithStatementsOfEveryKind.ts(13,5): error TS1044: 'public' modifier cannot appear on a module or namespace element. invalidModuleWithStatementsOfEveryKind.ts(15,5): error TS1044: 'public' modifier cannot appear on a module or namespace element. invalidModuleWithStatementsOfEveryKind.ts(19,5): error TS1044: 'public' modifier cannot appear on a module or namespace element. +invalidModuleWithStatementsOfEveryKind.ts(19,12): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. invalidModuleWithStatementsOfEveryKind.ts(25,5): error TS1044: 'public' modifier cannot appear on a module or namespace element. invalidModuleWithStatementsOfEveryKind.ts(29,5): error TS1044: 'private' modifier cannot appear on a module or namespace element. invalidModuleWithStatementsOfEveryKind.ts(31,5): error TS1044: 'private' modifier cannot appear on a module or namespace element. @@ -11,6 +12,7 @@ invalidModuleWithStatementsOfEveryKind.ts(37,5): error TS1044: 'private' modifie invalidModuleWithStatementsOfEveryKind.ts(38,5): error TS1044: 'private' modifier cannot appear on a module or namespace element. invalidModuleWithStatementsOfEveryKind.ts(40,5): error TS1044: 'private' modifier cannot appear on a module or namespace element. invalidModuleWithStatementsOfEveryKind.ts(44,5): error TS1044: 'private' modifier cannot appear on a module or namespace element. +invalidModuleWithStatementsOfEveryKind.ts(44,13): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. invalidModuleWithStatementsOfEveryKind.ts(50,5): error TS1044: 'private' modifier cannot appear on a module or namespace element. invalidModuleWithStatementsOfEveryKind.ts(55,5): error TS1044: 'static' modifier cannot appear on a module or namespace element. invalidModuleWithStatementsOfEveryKind.ts(57,5): error TS1044: 'static' modifier cannot appear on a module or namespace element. @@ -18,13 +20,14 @@ invalidModuleWithStatementsOfEveryKind.ts(63,5): error TS1044: 'static' modifier invalidModuleWithStatementsOfEveryKind.ts(64,5): error TS1044: 'static' modifier cannot appear on a module or namespace element. invalidModuleWithStatementsOfEveryKind.ts(66,5): error TS1044: 'static' modifier cannot appear on a module or namespace element. invalidModuleWithStatementsOfEveryKind.ts(70,5): error TS1044: 'static' modifier cannot appear on a module or namespace element. +invalidModuleWithStatementsOfEveryKind.ts(70,12): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. invalidModuleWithStatementsOfEveryKind.ts(76,5): error TS1044: 'static' modifier cannot appear on a module or namespace element. -==== invalidModuleWithStatementsOfEveryKind.ts (21 errors) ==== +==== invalidModuleWithStatementsOfEveryKind.ts (24 errors) ==== // All of these should be an error - module Y { + namespace Y { public class A { s: string } ~~~~~~ !!! error TS1044: 'public' modifier cannot appear on a module or namespace element. @@ -36,7 +39,7 @@ invalidModuleWithStatementsOfEveryKind.ts(76,5): error TS1044: 'static' modifier } } - module Y2 { + namespace Y2 { public class AA { s: T } ~~~~~~ !!! error TS1044: 'public' modifier cannot appear on a module or namespace element. @@ -49,21 +52,23 @@ invalidModuleWithStatementsOfEveryKind.ts(76,5): error TS1044: 'static' modifier !!! error TS1044: 'public' modifier cannot appear on a module or namespace element. } - module Y3 { + namespace Y3 { public module Module { ~~~~~~ !!! error TS1044: 'public' modifier cannot appear on a module or namespace element. + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. class A { s: string } } } - module Y4 { + namespace Y4 { public enum Color { Blue, Red } ~~~~~~ !!! error TS1044: 'public' modifier cannot appear on a module or namespace element. } - module YY { + namespace YY { private class A { s: string } ~~~~~~~ !!! error TS1044: 'private' modifier cannot appear on a module or namespace element. @@ -75,7 +80,7 @@ invalidModuleWithStatementsOfEveryKind.ts(76,5): error TS1044: 'static' modifier } } - module YY2 { + namespace YY2 { private class AA { s: T } ~~~~~~~ !!! error TS1044: 'private' modifier cannot appear on a module or namespace element. @@ -88,22 +93,24 @@ invalidModuleWithStatementsOfEveryKind.ts(76,5): error TS1044: 'static' modifier !!! error TS1044: 'private' modifier cannot appear on a module or namespace element. } - module YY3 { + namespace YY3 { private module Module { ~~~~~~~ !!! error TS1044: 'private' modifier cannot appear on a module or namespace element. + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. class A { s: string } } } - module YY4 { + namespace YY4 { private enum Color { Blue, Red } ~~~~~~~ !!! error TS1044: 'private' modifier cannot appear on a module or namespace element. } - module YYY { + namespace YYY { static class A { s: string } ~~~~~~ !!! error TS1044: 'static' modifier cannot appear on a module or namespace element. @@ -115,7 +122,7 @@ invalidModuleWithStatementsOfEveryKind.ts(76,5): error TS1044: 'static' modifier } } - module YYY2 { + namespace YYY2 { static class AA { s: T } ~~~~~~ !!! error TS1044: 'static' modifier cannot appear on a module or namespace element. @@ -128,15 +135,17 @@ invalidModuleWithStatementsOfEveryKind.ts(76,5): error TS1044: 'static' modifier !!! error TS1044: 'static' modifier cannot appear on a module or namespace element. } - module YYY3 { + namespace YYY3 { static module Module { ~~~~~~ !!! error TS1044: 'static' modifier cannot appear on a module or namespace element. + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. class A { s: string } } } - module YYY4 { + namespace YYY4 { static enum Color { Blue, Red } ~~~~~~ !!! error TS1044: 'static' modifier cannot appear on a module or namespace element. diff --git a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js index 015be3b1cfcda..27f42a71b828f 100644 --- a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js +++ b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js @@ -3,7 +3,7 @@ //// [invalidModuleWithStatementsOfEveryKind.ts] // All of these should be an error -module Y { +namespace Y { public class A { s: string } public class BB extends A { @@ -11,24 +11,24 @@ module Y { } } -module Y2 { +namespace Y2 { public class AA { s: T } public interface I { id: number } public class B extends AA implements I { id: number } } -module Y3 { +namespace Y3 { public module Module { class A { s: string } } } -module Y4 { +namespace Y4 { public enum Color { Blue, Red } } -module YY { +namespace YY { private class A { s: string } private class BB extends A { @@ -36,25 +36,25 @@ module YY { } } -module YY2 { +namespace YY2 { private class AA { s: T } private interface I { id: number } private class B extends AA implements I { id: number } } -module YY3 { +namespace YY3 { private module Module { class A { s: string } } } -module YY4 { +namespace YY4 { private enum Color { Blue, Red } } -module YYY { +namespace YYY { static class A { s: string } static class BB extends A { @@ -62,20 +62,20 @@ module YYY { } } -module YYY2 { +namespace YYY2 { static class AA { s: T } static interface I { id: number } static class B extends AA implements I { id: number } } -module YYY3 { +namespace YYY3 { static module Module { class A { s: string } } } -module YYY4 { +namespace YYY4 { static enum Color { Blue, Red } } diff --git a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.symbols b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.symbols index 1e1b43f36adf7..52936e322f2d6 100644 --- a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.symbols +++ b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.symbols @@ -3,28 +3,28 @@ === invalidModuleWithStatementsOfEveryKind.ts === // All of these should be an error -module Y { +namespace Y { >Y : Symbol(Y, Decl(invalidModuleWithStatementsOfEveryKind.ts, 0, 0)) public class A { s: string } ->A : Symbol(A, Decl(invalidModuleWithStatementsOfEveryKind.ts, 2, 10)) +>A : Symbol(A, Decl(invalidModuleWithStatementsOfEveryKind.ts, 2, 13)) >s : Symbol(A.s, Decl(invalidModuleWithStatementsOfEveryKind.ts, 3, 20)) public class BB extends A { >BB : Symbol(BB, Decl(invalidModuleWithStatementsOfEveryKind.ts, 3, 32)) >T : Symbol(T, Decl(invalidModuleWithStatementsOfEveryKind.ts, 5, 20)) ->A : Symbol(A, Decl(invalidModuleWithStatementsOfEveryKind.ts, 2, 10)) +>A : Symbol(A, Decl(invalidModuleWithStatementsOfEveryKind.ts, 2, 13)) id: number; >id : Symbol(BB.id, Decl(invalidModuleWithStatementsOfEveryKind.ts, 5, 34)) } } -module Y2 { +namespace Y2 { >Y2 : Symbol(Y2, Decl(invalidModuleWithStatementsOfEveryKind.ts, 8, 1)) public class AA { s: T } ->AA : Symbol(AA, Decl(invalidModuleWithStatementsOfEveryKind.ts, 10, 11)) +>AA : Symbol(AA, Decl(invalidModuleWithStatementsOfEveryKind.ts, 10, 14)) >T : Symbol(T, Decl(invalidModuleWithStatementsOfEveryKind.ts, 11, 20)) >s : Symbol(AA.s, Decl(invalidModuleWithStatementsOfEveryKind.ts, 11, 24)) >T : Symbol(T, Decl(invalidModuleWithStatementsOfEveryKind.ts, 11, 20)) @@ -35,16 +35,16 @@ module Y2 { public class B extends AA implements I { id: number } >B : Symbol(B, Decl(invalidModuleWithStatementsOfEveryKind.ts, 12, 37)) ->AA : Symbol(AA, Decl(invalidModuleWithStatementsOfEveryKind.ts, 10, 11)) +>AA : Symbol(AA, Decl(invalidModuleWithStatementsOfEveryKind.ts, 10, 14)) >I : Symbol(I, Decl(invalidModuleWithStatementsOfEveryKind.ts, 11, 31)) >id : Symbol(B.id, Decl(invalidModuleWithStatementsOfEveryKind.ts, 14, 52)) } -module Y3 { +namespace Y3 { >Y3 : Symbol(Y3, Decl(invalidModuleWithStatementsOfEveryKind.ts, 15, 1)) public module Module { ->Module : Symbol(Module, Decl(invalidModuleWithStatementsOfEveryKind.ts, 17, 11)) +>Module : Symbol(Module, Decl(invalidModuleWithStatementsOfEveryKind.ts, 17, 14)) class A { s: string } >A : Symbol(A, Decl(invalidModuleWithStatementsOfEveryKind.ts, 18, 26)) @@ -52,37 +52,37 @@ module Y3 { } } -module Y4 { +namespace Y4 { >Y4 : Symbol(Y4, Decl(invalidModuleWithStatementsOfEveryKind.ts, 21, 1)) public enum Color { Blue, Red } ->Color : Symbol(Color, Decl(invalidModuleWithStatementsOfEveryKind.ts, 23, 11)) +>Color : Symbol(Color, Decl(invalidModuleWithStatementsOfEveryKind.ts, 23, 14)) >Blue : Symbol(Color.Blue, Decl(invalidModuleWithStatementsOfEveryKind.ts, 24, 23)) >Red : Symbol(Color.Red, Decl(invalidModuleWithStatementsOfEveryKind.ts, 24, 29)) } -module YY { +namespace YY { >YY : Symbol(YY, Decl(invalidModuleWithStatementsOfEveryKind.ts, 25, 1)) private class A { s: string } ->A : Symbol(A, Decl(invalidModuleWithStatementsOfEveryKind.ts, 27, 11)) +>A : Symbol(A, Decl(invalidModuleWithStatementsOfEveryKind.ts, 27, 14)) >s : Symbol(A.s, Decl(invalidModuleWithStatementsOfEveryKind.ts, 28, 21)) private class BB extends A { >BB : Symbol(BB, Decl(invalidModuleWithStatementsOfEveryKind.ts, 28, 33)) >T : Symbol(T, Decl(invalidModuleWithStatementsOfEveryKind.ts, 30, 21)) ->A : Symbol(A, Decl(invalidModuleWithStatementsOfEveryKind.ts, 27, 11)) +>A : Symbol(A, Decl(invalidModuleWithStatementsOfEveryKind.ts, 27, 14)) id: number; >id : Symbol(BB.id, Decl(invalidModuleWithStatementsOfEveryKind.ts, 30, 35)) } } -module YY2 { +namespace YY2 { >YY2 : Symbol(YY2, Decl(invalidModuleWithStatementsOfEveryKind.ts, 33, 1)) private class AA { s: T } ->AA : Symbol(AA, Decl(invalidModuleWithStatementsOfEveryKind.ts, 35, 12)) +>AA : Symbol(AA, Decl(invalidModuleWithStatementsOfEveryKind.ts, 35, 15)) >T : Symbol(T, Decl(invalidModuleWithStatementsOfEveryKind.ts, 36, 21)) >s : Symbol(AA.s, Decl(invalidModuleWithStatementsOfEveryKind.ts, 36, 25)) >T : Symbol(T, Decl(invalidModuleWithStatementsOfEveryKind.ts, 36, 21)) @@ -93,16 +93,16 @@ module YY2 { private class B extends AA implements I { id: number } >B : Symbol(B, Decl(invalidModuleWithStatementsOfEveryKind.ts, 37, 38)) ->AA : Symbol(AA, Decl(invalidModuleWithStatementsOfEveryKind.ts, 35, 12)) +>AA : Symbol(AA, Decl(invalidModuleWithStatementsOfEveryKind.ts, 35, 15)) >I : Symbol(I, Decl(invalidModuleWithStatementsOfEveryKind.ts, 36, 32)) >id : Symbol(B.id, Decl(invalidModuleWithStatementsOfEveryKind.ts, 39, 53)) } -module YY3 { +namespace YY3 { >YY3 : Symbol(YY3, Decl(invalidModuleWithStatementsOfEveryKind.ts, 40, 1)) private module Module { ->Module : Symbol(Module, Decl(invalidModuleWithStatementsOfEveryKind.ts, 42, 12)) +>Module : Symbol(Module, Decl(invalidModuleWithStatementsOfEveryKind.ts, 42, 15)) class A { s: string } >A : Symbol(A, Decl(invalidModuleWithStatementsOfEveryKind.ts, 43, 27)) @@ -110,38 +110,38 @@ module YY3 { } } -module YY4 { +namespace YY4 { >YY4 : Symbol(YY4, Decl(invalidModuleWithStatementsOfEveryKind.ts, 46, 1)) private enum Color { Blue, Red } ->Color : Symbol(Color, Decl(invalidModuleWithStatementsOfEveryKind.ts, 48, 12)) +>Color : Symbol(Color, Decl(invalidModuleWithStatementsOfEveryKind.ts, 48, 15)) >Blue : Symbol(Color.Blue, Decl(invalidModuleWithStatementsOfEveryKind.ts, 49, 24)) >Red : Symbol(Color.Red, Decl(invalidModuleWithStatementsOfEveryKind.ts, 49, 30)) } -module YYY { +namespace YYY { >YYY : Symbol(YYY, Decl(invalidModuleWithStatementsOfEveryKind.ts, 50, 1)) static class A { s: string } ->A : Symbol(A, Decl(invalidModuleWithStatementsOfEveryKind.ts, 53, 12)) +>A : Symbol(A, Decl(invalidModuleWithStatementsOfEveryKind.ts, 53, 15)) >s : Symbol(A.s, Decl(invalidModuleWithStatementsOfEveryKind.ts, 54, 20)) static class BB extends A { >BB : Symbol(BB, Decl(invalidModuleWithStatementsOfEveryKind.ts, 54, 32)) >T : Symbol(T, Decl(invalidModuleWithStatementsOfEveryKind.ts, 56, 20)) ->A : Symbol(A, Decl(invalidModuleWithStatementsOfEveryKind.ts, 53, 12)) +>A : Symbol(A, Decl(invalidModuleWithStatementsOfEveryKind.ts, 53, 15)) id: number; >id : Symbol(BB.id, Decl(invalidModuleWithStatementsOfEveryKind.ts, 56, 34)) } } -module YYY2 { +namespace YYY2 { >YYY2 : Symbol(YYY2, Decl(invalidModuleWithStatementsOfEveryKind.ts, 59, 1)) static class AA { s: T } ->AA : Symbol(AA, Decl(invalidModuleWithStatementsOfEveryKind.ts, 61, 13)) +>AA : Symbol(AA, Decl(invalidModuleWithStatementsOfEveryKind.ts, 61, 16)) >T : Symbol(T, Decl(invalidModuleWithStatementsOfEveryKind.ts, 62, 20)) >s : Symbol(AA.s, Decl(invalidModuleWithStatementsOfEveryKind.ts, 62, 24)) >T : Symbol(T, Decl(invalidModuleWithStatementsOfEveryKind.ts, 62, 20)) @@ -152,16 +152,16 @@ module YYY2 { static class B extends AA implements I { id: number } >B : Symbol(B, Decl(invalidModuleWithStatementsOfEveryKind.ts, 63, 37)) ->AA : Symbol(AA, Decl(invalidModuleWithStatementsOfEveryKind.ts, 61, 13)) +>AA : Symbol(AA, Decl(invalidModuleWithStatementsOfEveryKind.ts, 61, 16)) >I : Symbol(I, Decl(invalidModuleWithStatementsOfEveryKind.ts, 62, 31)) >id : Symbol(B.id, Decl(invalidModuleWithStatementsOfEveryKind.ts, 65, 52)) } -module YYY3 { +namespace YYY3 { >YYY3 : Symbol(YYY3, Decl(invalidModuleWithStatementsOfEveryKind.ts, 66, 1)) static module Module { ->Module : Symbol(Module, Decl(invalidModuleWithStatementsOfEveryKind.ts, 68, 13)) +>Module : Symbol(Module, Decl(invalidModuleWithStatementsOfEveryKind.ts, 68, 16)) class A { s: string } >A : Symbol(A, Decl(invalidModuleWithStatementsOfEveryKind.ts, 69, 26)) @@ -169,11 +169,11 @@ module YYY3 { } } -module YYY4 { +namespace YYY4 { >YYY4 : Symbol(YYY4, Decl(invalidModuleWithStatementsOfEveryKind.ts, 72, 1)) static enum Color { Blue, Red } ->Color : Symbol(Color, Decl(invalidModuleWithStatementsOfEveryKind.ts, 74, 13)) +>Color : Symbol(Color, Decl(invalidModuleWithStatementsOfEveryKind.ts, 74, 16)) >Blue : Symbol(Color.Blue, Decl(invalidModuleWithStatementsOfEveryKind.ts, 75, 23)) >Red : Symbol(Color.Red, Decl(invalidModuleWithStatementsOfEveryKind.ts, 75, 29)) } diff --git a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.types b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.types index 0e42e04932a80..90b1928b2f687 100644 --- a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.types +++ b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.types @@ -3,7 +3,7 @@ === invalidModuleWithStatementsOfEveryKind.ts === // All of these should be an error -module Y { +namespace Y { >Y : typeof Y > : ^^^^^^^^ @@ -25,7 +25,7 @@ module Y { } } -module Y2 { +namespace Y2 { >Y2 : typeof Y2 > : ^^^^^^^^^ @@ -48,7 +48,7 @@ module Y2 { > : ^^^^^^ } -module Y3 { +namespace Y3 { >Y3 : typeof Y3 > : ^^^^^^^^^ @@ -64,7 +64,7 @@ module Y3 { } } -module Y4 { +namespace Y4 { >Y4 : typeof Y4 > : ^^^^^^^^^ @@ -77,7 +77,7 @@ module Y4 { > : ^^^^^^^^^ } -module YY { +namespace YY { >YY : typeof YY > : ^^^^^^^^^ @@ -99,7 +99,7 @@ module YY { } } -module YY2 { +namespace YY2 { >YY2 : typeof YY2 > : ^^^^^^^^^^ @@ -122,7 +122,7 @@ module YY2 { > : ^^^^^^ } -module YY3 { +namespace YY3 { >YY3 : typeof YY3 > : ^^^^^^^^^^ @@ -138,7 +138,7 @@ module YY3 { } } -module YY4 { +namespace YY4 { >YY4 : typeof YY4 > : ^^^^^^^^^^ @@ -152,7 +152,7 @@ module YY4 { } -module YYY { +namespace YYY { >YYY : typeof YYY > : ^^^^^^^^^^ @@ -174,7 +174,7 @@ module YYY { } } -module YYY2 { +namespace YYY2 { >YYY2 : typeof YYY2 > : ^^^^^^^^^^^ @@ -197,7 +197,7 @@ module YYY2 { > : ^^^^^^ } -module YYY3 { +namespace YYY3 { >YYY3 : typeof YYY3 > : ^^^^^^^^^^^ @@ -213,7 +213,7 @@ module YYY3 { } } -module YYY4 { +namespace YYY4 { >YYY4 : typeof YYY4 > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/invalidModuleWithVarStatements.errors.txt b/tests/baselines/reference/invalidModuleWithVarStatements.errors.txt index 938bd07b5f310..d0db067bf1c1e 100644 --- a/tests/baselines/reference/invalidModuleWithVarStatements.errors.txt +++ b/tests/baselines/reference/invalidModuleWithVarStatements.errors.txt @@ -9,38 +9,38 @@ invalidModuleWithVarStatements.ts(25,5): error TS1044: 'private' modifier cannot ==== invalidModuleWithVarStatements.ts (6 errors) ==== // All of these should be an error - module Y { + namespace Y { public var x: number = 0; ~~~~~~ !!! error TS1044: 'public' modifier cannot appear on a module or namespace element. } - module Y2 { + namespace Y2 { public function fn(x: string) { } ~~~~~~ !!! error TS1044: 'public' modifier cannot appear on a module or namespace element. } - module Y4 { + namespace Y4 { static var x: number = 0; ~~~~~~ !!! error TS1044: 'static' modifier cannot appear on a module or namespace element. } - module YY { + namespace YY { static function fn(x: string) { } ~~~~~~ !!! error TS1044: 'static' modifier cannot appear on a module or namespace element. } - module YY2 { + namespace YY2 { private var x: number = 0; ~~~~~~~ !!! error TS1044: 'private' modifier cannot appear on a module or namespace element. } - module YY3 { + namespace YY3 { private function fn(x: string) { } ~~~~~~~ !!! error TS1044: 'private' modifier cannot appear on a module or namespace element. diff --git a/tests/baselines/reference/invalidModuleWithVarStatements.js b/tests/baselines/reference/invalidModuleWithVarStatements.js index 9635934d04345..857acf58bdb06 100644 --- a/tests/baselines/reference/invalidModuleWithVarStatements.js +++ b/tests/baselines/reference/invalidModuleWithVarStatements.js @@ -3,28 +3,28 @@ //// [invalidModuleWithVarStatements.ts] // All of these should be an error -module Y { +namespace Y { public var x: number = 0; } -module Y2 { +namespace Y2 { public function fn(x: string) { } } -module Y4 { +namespace Y4 { static var x: number = 0; } -module YY { +namespace YY { static function fn(x: string) { } } -module YY2 { +namespace YY2 { private var x: number = 0; } -module YY3 { +namespace YY3 { private function fn(x: string) { } } diff --git a/tests/baselines/reference/invalidModuleWithVarStatements.symbols b/tests/baselines/reference/invalidModuleWithVarStatements.symbols index e647f7f3dbc05..b5c568ec0db05 100644 --- a/tests/baselines/reference/invalidModuleWithVarStatements.symbols +++ b/tests/baselines/reference/invalidModuleWithVarStatements.symbols @@ -3,37 +3,37 @@ === invalidModuleWithVarStatements.ts === // All of these should be an error -module Y { +namespace Y { >Y : Symbol(Y, Decl(invalidModuleWithVarStatements.ts, 0, 0)) public var x: number = 0; >x : Symbol(x, Decl(invalidModuleWithVarStatements.ts, 3, 14)) } -module Y2 { +namespace Y2 { >Y2 : Symbol(Y2, Decl(invalidModuleWithVarStatements.ts, 4, 1)) public function fn(x: string) { } ->fn : Symbol(fn, Decl(invalidModuleWithVarStatements.ts, 6, 11)) +>fn : Symbol(fn, Decl(invalidModuleWithVarStatements.ts, 6, 14)) >x : Symbol(x, Decl(invalidModuleWithVarStatements.ts, 7, 23)) } -module Y4 { +namespace Y4 { >Y4 : Symbol(Y4, Decl(invalidModuleWithVarStatements.ts, 8, 1)) static var x: number = 0; >x : Symbol(x, Decl(invalidModuleWithVarStatements.ts, 11, 14)) } -module YY { +namespace YY { >YY : Symbol(YY, Decl(invalidModuleWithVarStatements.ts, 12, 1)) static function fn(x: string) { } ->fn : Symbol(fn, Decl(invalidModuleWithVarStatements.ts, 14, 11)) +>fn : Symbol(fn, Decl(invalidModuleWithVarStatements.ts, 14, 14)) >x : Symbol(x, Decl(invalidModuleWithVarStatements.ts, 15, 23)) } -module YY2 { +namespace YY2 { >YY2 : Symbol(YY2, Decl(invalidModuleWithVarStatements.ts, 16, 1)) private var x: number = 0; @@ -41,11 +41,11 @@ module YY2 { } -module YY3 { +namespace YY3 { >YY3 : Symbol(YY3, Decl(invalidModuleWithVarStatements.ts, 20, 1)) private function fn(x: string) { } ->fn : Symbol(fn, Decl(invalidModuleWithVarStatements.ts, 23, 12)) +>fn : Symbol(fn, Decl(invalidModuleWithVarStatements.ts, 23, 15)) >x : Symbol(x, Decl(invalidModuleWithVarStatements.ts, 24, 24)) } diff --git a/tests/baselines/reference/invalidModuleWithVarStatements.types b/tests/baselines/reference/invalidModuleWithVarStatements.types index 69b2289918f8d..09bee992f6f0f 100644 --- a/tests/baselines/reference/invalidModuleWithVarStatements.types +++ b/tests/baselines/reference/invalidModuleWithVarStatements.types @@ -3,7 +3,7 @@ === invalidModuleWithVarStatements.ts === // All of these should be an error -module Y { +namespace Y { >Y : typeof Y > : ^^^^^^^^ @@ -14,7 +14,7 @@ module Y { > : ^ } -module Y2 { +namespace Y2 { >Y2 : typeof Y2 > : ^^^^^^^^^ @@ -25,7 +25,7 @@ module Y2 { > : ^^^^^^ } -module Y4 { +namespace Y4 { >Y4 : typeof Y4 > : ^^^^^^^^^ @@ -36,7 +36,7 @@ module Y4 { > : ^ } -module YY { +namespace YY { >YY : typeof YY > : ^^^^^^^^^ @@ -47,7 +47,7 @@ module YY { > : ^^^^^^ } -module YY2 { +namespace YY2 { >YY2 : typeof YY2 > : ^^^^^^^^^^ @@ -59,7 +59,7 @@ module YY2 { } -module YY3 { +namespace YY3 { >YY3 : typeof YY3 > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/invalidMultipleVariableDeclarations.errors.txt b/tests/baselines/reference/invalidMultipleVariableDeclarations.errors.txt index d7854a8b3e1c7..f1473fe3712a2 100644 --- a/tests/baselines/reference/invalidMultipleVariableDeclarations.errors.txt +++ b/tests/baselines/reference/invalidMultipleVariableDeclarations.errors.txt @@ -34,7 +34,7 @@ invalidMultipleVariableDeclarations.ts(53,5): error TS2403: Subsequent variable function F(x: string): number { return 42; } - module M { + namespace M { export class A { name: string; } diff --git a/tests/baselines/reference/invalidMultipleVariableDeclarations.js b/tests/baselines/reference/invalidMultipleVariableDeclarations.js index 708a74c5afe17..c62b01b926f42 100644 --- a/tests/baselines/reference/invalidMultipleVariableDeclarations.js +++ b/tests/baselines/reference/invalidMultipleVariableDeclarations.js @@ -22,7 +22,7 @@ class D{ function F(x: string): number { return 42; } -module M { +namespace M { export class A { name: string; } diff --git a/tests/baselines/reference/invalidMultipleVariableDeclarations.symbols b/tests/baselines/reference/invalidMultipleVariableDeclarations.symbols index 40657f9ea7e8a..773e07a319761 100644 --- a/tests/baselines/reference/invalidMultipleVariableDeclarations.symbols +++ b/tests/baselines/reference/invalidMultipleVariableDeclarations.symbols @@ -51,11 +51,11 @@ function F(x: string): number { return 42; } >F : Symbol(F, Decl(invalidMultipleVariableDeclarations.ts, 17, 1)) >x : Symbol(x, Decl(invalidMultipleVariableDeclarations.ts, 19, 11)) -module M { +namespace M { >M : Symbol(M, Decl(invalidMultipleVariableDeclarations.ts, 19, 44)) export class A { ->A : Symbol(A, Decl(invalidMultipleVariableDeclarations.ts, 21, 10)) +>A : Symbol(A, Decl(invalidMultipleVariableDeclarations.ts, 21, 13)) name: string; >name : Symbol(A.name, Decl(invalidMultipleVariableDeclarations.ts, 22, 20)) @@ -138,7 +138,7 @@ var m: typeof M; var m = M.A; >m : Symbol(m, Decl(invalidMultipleVariableDeclarations.ts, 51, 3), Decl(invalidMultipleVariableDeclarations.ts, 52, 3)) ->M.A : Symbol(M.A, Decl(invalidMultipleVariableDeclarations.ts, 21, 10)) +>M.A : Symbol(M.A, Decl(invalidMultipleVariableDeclarations.ts, 21, 13)) >M : Symbol(M, Decl(invalidMultipleVariableDeclarations.ts, 19, 44)) ->A : Symbol(M.A, Decl(invalidMultipleVariableDeclarations.ts, 21, 10)) +>A : Symbol(M.A, Decl(invalidMultipleVariableDeclarations.ts, 21, 13)) diff --git a/tests/baselines/reference/invalidMultipleVariableDeclarations.types b/tests/baselines/reference/invalidMultipleVariableDeclarations.types index cfd5df0fbf49d..5a52e4dcdac98 100644 --- a/tests/baselines/reference/invalidMultipleVariableDeclarations.types +++ b/tests/baselines/reference/invalidMultipleVariableDeclarations.types @@ -56,7 +56,7 @@ function F(x: string): number { return 42; } >42 : 42 > : ^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/invalidNestedModules.errors.txt b/tests/baselines/reference/invalidNestedModules.errors.txt index 112c2a706cfe3..f0fdb6c1d2acd 100644 --- a/tests/baselines/reference/invalidNestedModules.errors.txt +++ b/tests/baselines/reference/invalidNestedModules.errors.txt @@ -1,10 +1,21 @@ +invalidNestedModules.ts(1,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +invalidNestedModules.ts(1,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +invalidNestedModules.ts(1,12): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. invalidNestedModules.ts(1,12): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. +invalidNestedModules.ts(16,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +invalidNestedModules.ts(16,11): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. invalidNestedModules.ts(17,18): error TS2300: Duplicate identifier 'Point'. invalidNestedModules.ts(24,20): error TS2300: Duplicate identifier 'Point'. -==== invalidNestedModules.ts (3 errors) ==== +==== invalidNestedModules.ts (8 errors) ==== module A.B.C { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. ~ !!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. export class Point { @@ -13,8 +24,8 @@ invalidNestedModules.ts(24,20): error TS2300: Duplicate identifier 'Point'. } } - module A { - export module B { + namespace A { + export namespace B { export class C { // Error name: string; } @@ -22,6 +33,10 @@ invalidNestedModules.ts(24,20): error TS2300: Duplicate identifier 'Point'. } module M2.X { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. export class Point { ~~~~~ !!! error TS2300: Duplicate identifier 'Point'. @@ -29,8 +44,8 @@ invalidNestedModules.ts(24,20): error TS2300: Duplicate identifier 'Point'. } } - module M2 { - export module X { + namespace M2 { + export namespace X { export var Point: number; // Error ~~~~~ !!! error TS2300: Duplicate identifier 'Point'. diff --git a/tests/baselines/reference/invalidNestedModules.js b/tests/baselines/reference/invalidNestedModules.js index cb762a591104b..4c366aac82d5f 100644 --- a/tests/baselines/reference/invalidNestedModules.js +++ b/tests/baselines/reference/invalidNestedModules.js @@ -8,8 +8,8 @@ module A.B.C { } } -module A { - export module B { +namespace A { + export namespace B { export class C { // Error name: string; } @@ -22,8 +22,8 @@ module M2.X { } } -module M2 { - export module X { +namespace M2 { + export namespace X { export var Point: number; // Error } } diff --git a/tests/baselines/reference/invalidNestedModules.symbols b/tests/baselines/reference/invalidNestedModules.symbols index a0bed0ae6d30b..ec4a4e477e676 100644 --- a/tests/baselines/reference/invalidNestedModules.symbols +++ b/tests/baselines/reference/invalidNestedModules.symbols @@ -3,8 +3,8 @@ === invalidNestedModules.ts === module A.B.C { >A : Symbol(A, Decl(invalidNestedModules.ts, 0, 0), Decl(invalidNestedModules.ts, 5, 1)) ->B : Symbol(B, Decl(invalidNestedModules.ts, 0, 9), Decl(invalidNestedModules.ts, 7, 10)) ->C : Symbol(C, Decl(invalidNestedModules.ts, 0, 11), Decl(invalidNestedModules.ts, 8, 21)) +>B : Symbol(B, Decl(invalidNestedModules.ts, 0, 9), Decl(invalidNestedModules.ts, 7, 13)) +>C : Symbol(C, Decl(invalidNestedModules.ts, 0, 11), Decl(invalidNestedModules.ts, 8, 24)) export class Point { >Point : Symbol(Point, Decl(invalidNestedModules.ts, 0, 14)) @@ -17,14 +17,14 @@ module A.B.C { } } -module A { +namespace A { >A : Symbol(A, Decl(invalidNestedModules.ts, 0, 0), Decl(invalidNestedModules.ts, 5, 1)) - export module B { ->B : Symbol(B, Decl(invalidNestedModules.ts, 0, 9), Decl(invalidNestedModules.ts, 7, 10)) + export namespace B { +>B : Symbol(B, Decl(invalidNestedModules.ts, 0, 9), Decl(invalidNestedModules.ts, 7, 13)) export class C { // Error ->C : Symbol(C, Decl(invalidNestedModules.ts, 0, 11), Decl(invalidNestedModules.ts, 8, 21)) +>C : Symbol(C, Decl(invalidNestedModules.ts, 0, 11), Decl(invalidNestedModules.ts, 8, 24)) name: string; >name : Symbol(C.name, Decl(invalidNestedModules.ts, 9, 24)) @@ -34,7 +34,7 @@ module A { module M2.X { >M2 : Symbol(M2, Decl(invalidNestedModules.ts, 13, 1), Decl(invalidNestedModules.ts, 19, 1)) ->X : Symbol(X, Decl(invalidNestedModules.ts, 15, 10), Decl(invalidNestedModules.ts, 21, 11)) +>X : Symbol(X, Decl(invalidNestedModules.ts, 15, 10), Decl(invalidNestedModules.ts, 21, 14)) export class Point { >Point : Symbol(Point, Decl(invalidNestedModules.ts, 15, 13)) @@ -45,11 +45,11 @@ module M2.X { } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(invalidNestedModules.ts, 13, 1), Decl(invalidNestedModules.ts, 19, 1)) - export module X { ->X : Symbol(X, Decl(invalidNestedModules.ts, 15, 10), Decl(invalidNestedModules.ts, 21, 11)) + export namespace X { +>X : Symbol(X, Decl(invalidNestedModules.ts, 15, 10), Decl(invalidNestedModules.ts, 21, 14)) export var Point: number; // Error >Point : Symbol(Point, Decl(invalidNestedModules.ts, 23, 18)) diff --git a/tests/baselines/reference/invalidNestedModules.types b/tests/baselines/reference/invalidNestedModules.types index 4187abe2a25e3..9935e37247abb 100644 --- a/tests/baselines/reference/invalidNestedModules.types +++ b/tests/baselines/reference/invalidNestedModules.types @@ -23,11 +23,11 @@ module A.B.C { } } -module A { +namespace A { >A : typeof A > : ^^^^^^^^ - export module B { + export namespace B { >B : typeof B > : ^^^^^^^^ @@ -60,11 +60,11 @@ module M2.X { } } -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ - export module X { + export namespace X { >X : typeof X > : ^^^^^^^^ diff --git a/tests/baselines/reference/invalidNumberAssignments.errors.txt b/tests/baselines/reference/invalidNumberAssignments.errors.txt index fb57c501bccf7..f50c8dfe2af34 100644 --- a/tests/baselines/reference/invalidNumberAssignments.errors.txt +++ b/tests/baselines/reference/invalidNumberAssignments.errors.txt @@ -42,7 +42,7 @@ invalidNumberAssignments.ts(23,1): error TS2630: Cannot assign to 'i' because it ~~ !!! error TS2322: Type 'number' is not assignable to type '{ 0: number; }'. - module M { export var x = 1; } + namespace M { export var x = 1; } M = x; ~ !!! error TS2631: Cannot assign to 'M' because it is a namespace. diff --git a/tests/baselines/reference/invalidNumberAssignments.js b/tests/baselines/reference/invalidNumberAssignments.js index 5ea7ee3db126f..4addea23ca00b 100644 --- a/tests/baselines/reference/invalidNumberAssignments.js +++ b/tests/baselines/reference/invalidNumberAssignments.js @@ -17,7 +17,7 @@ var f: I = x; var g: { baz: string } = 1; var g2: { 0: number } = 1; -module M { export var x = 1; } +namespace M { export var x = 1; } M = x; function i(a: T) { diff --git a/tests/baselines/reference/invalidNumberAssignments.symbols b/tests/baselines/reference/invalidNumberAssignments.symbols index 8938387b7ca5d..20f93f644e604 100644 --- a/tests/baselines/reference/invalidNumberAssignments.symbols +++ b/tests/baselines/reference/invalidNumberAssignments.symbols @@ -47,9 +47,9 @@ var g2: { 0: number } = 1; >g2 : Symbol(g2, Decl(invalidNumberAssignments.ts, 14, 3)) >0 : Symbol(0, Decl(invalidNumberAssignments.ts, 14, 9)) -module M { export var x = 1; } +namespace M { export var x = 1; } >M : Symbol(M, Decl(invalidNumberAssignments.ts, 14, 26)) ->x : Symbol(x, Decl(invalidNumberAssignments.ts, 16, 21)) +>x : Symbol(x, Decl(invalidNumberAssignments.ts, 16, 24)) M = x; >M : Symbol(M, Decl(invalidNumberAssignments.ts, 14, 26)) diff --git a/tests/baselines/reference/invalidNumberAssignments.types b/tests/baselines/reference/invalidNumberAssignments.types index ca5f9729de819..e5239671796d1 100644 --- a/tests/baselines/reference/invalidNumberAssignments.types +++ b/tests/baselines/reference/invalidNumberAssignments.types @@ -71,7 +71,7 @@ var g2: { 0: number } = 1; >1 : 1 > : ^ -module M { export var x = 1; } +namespace M { export var x = 1; } >M : typeof M > : ^^^^^^^^ >x : number diff --git a/tests/baselines/reference/invalidStringAssignments.errors.txt b/tests/baselines/reference/invalidStringAssignments.errors.txt index a7800011cddb4..7ec0053b73fd8 100644 --- a/tests/baselines/reference/invalidStringAssignments.errors.txt +++ b/tests/baselines/reference/invalidStringAssignments.errors.txt @@ -43,7 +43,7 @@ invalidStringAssignments.ts(26,5): error TS2322: Type 'string' is not assignable ~~ !!! error TS2322: Type 'number' is not assignable to type '{ 0: number; }'. - module M { export var x = 1; } + namespace M { export var x = 1; } M = x; ~ !!! error TS2631: Cannot assign to 'M' because it is a namespace. diff --git a/tests/baselines/reference/invalidStringAssignments.js b/tests/baselines/reference/invalidStringAssignments.js index 2b33e12533495..17158f7363eb3 100644 --- a/tests/baselines/reference/invalidStringAssignments.js +++ b/tests/baselines/reference/invalidStringAssignments.js @@ -17,7 +17,7 @@ var f: I = x; var g: { baz: string } = 1; var g2: { 0: number } = 1; -module M { export var x = 1; } +namespace M { export var x = 1; } M = x; function i(a: T) { diff --git a/tests/baselines/reference/invalidStringAssignments.symbols b/tests/baselines/reference/invalidStringAssignments.symbols index 65757b9ba002d..25bd57e96a44a 100644 --- a/tests/baselines/reference/invalidStringAssignments.symbols +++ b/tests/baselines/reference/invalidStringAssignments.symbols @@ -47,9 +47,9 @@ var g2: { 0: number } = 1; >g2 : Symbol(g2, Decl(invalidStringAssignments.ts, 14, 3)) >0 : Symbol(0, Decl(invalidStringAssignments.ts, 14, 9)) -module M { export var x = 1; } +namespace M { export var x = 1; } >M : Symbol(M, Decl(invalidStringAssignments.ts, 14, 26)) ->x : Symbol(x, Decl(invalidStringAssignments.ts, 16, 21)) +>x : Symbol(x, Decl(invalidStringAssignments.ts, 16, 24)) M = x; >M : Symbol(M, Decl(invalidStringAssignments.ts, 14, 26)) diff --git a/tests/baselines/reference/invalidStringAssignments.types b/tests/baselines/reference/invalidStringAssignments.types index 5ee092d745ef6..51a6cfe4a44fb 100644 --- a/tests/baselines/reference/invalidStringAssignments.types +++ b/tests/baselines/reference/invalidStringAssignments.types @@ -71,7 +71,7 @@ var g2: { 0: number } = 1; >1 : 1 > : ^ -module M { export var x = 1; } +namespace M { export var x = 1; } >M : typeof M > : ^^^^^^^^ >x : number diff --git a/tests/baselines/reference/invalidUndefinedAssignments.errors.txt b/tests/baselines/reference/invalidUndefinedAssignments.errors.txt index b095878feebb7..2e35cb9547119 100644 --- a/tests/baselines/reference/invalidUndefinedAssignments.errors.txt +++ b/tests/baselines/reference/invalidUndefinedAssignments.errors.txt @@ -30,7 +30,7 @@ invalidUndefinedAssignments.ts(21,1): error TS2630: Cannot assign to 'i' because ~ !!! error TS2693: 'I' only refers to a type, but is being used as a value here. - module M { export var x = 1; } + namespace M { export var x = 1; } M = x; ~ !!! error TS2631: Cannot assign to 'M' because it is a namespace. diff --git a/tests/baselines/reference/invalidUndefinedAssignments.js b/tests/baselines/reference/invalidUndefinedAssignments.js index 140abfc80f81c..c073f001463f1 100644 --- a/tests/baselines/reference/invalidUndefinedAssignments.js +++ b/tests/baselines/reference/invalidUndefinedAssignments.js @@ -16,7 +16,7 @@ var g: I; g = x; I = x; -module M { export var x = 1; } +namespace M { export var x = 1; } M = x; function i(a: T) { } diff --git a/tests/baselines/reference/invalidUndefinedAssignments.symbols b/tests/baselines/reference/invalidUndefinedAssignments.symbols index 9aec8364a8b2a..dfe3dcc77e3b9 100644 --- a/tests/baselines/reference/invalidUndefinedAssignments.symbols +++ b/tests/baselines/reference/invalidUndefinedAssignments.symbols @@ -46,9 +46,9 @@ g = x; I = x; >x : Symbol(x, Decl(invalidUndefinedAssignments.ts, 0, 3)) -module M { export var x = 1; } +namespace M { export var x = 1; } >M : Symbol(M, Decl(invalidUndefinedAssignments.ts, 13, 6)) ->x : Symbol(x, Decl(invalidUndefinedAssignments.ts, 15, 21)) +>x : Symbol(x, Decl(invalidUndefinedAssignments.ts, 15, 24)) M = x; >M : Symbol(M, Decl(invalidUndefinedAssignments.ts, 13, 6)) diff --git a/tests/baselines/reference/invalidUndefinedAssignments.types b/tests/baselines/reference/invalidUndefinedAssignments.types index 0799484e33198..5d5e6dd51d913 100644 --- a/tests/baselines/reference/invalidUndefinedAssignments.types +++ b/tests/baselines/reference/invalidUndefinedAssignments.types @@ -75,7 +75,7 @@ I = x; >x : any > : ^^^ -module M { export var x = 1; } +namespace M { export var x = 1; } >M : typeof M > : ^^^^^^^^ >x : number diff --git a/tests/baselines/reference/invalidUndefinedValues.js b/tests/baselines/reference/invalidUndefinedValues.js index 7cde6abeb8279..c044f4a076a0f 100644 --- a/tests/baselines/reference/invalidUndefinedValues.js +++ b/tests/baselines/reference/invalidUndefinedValues.js @@ -19,7 +19,7 @@ interface I { foo: string } var c: I; x = c; -module M { export var x = 1; } +namespace M { export var x = 1; } x = M; x = { f() { } } diff --git a/tests/baselines/reference/invalidUndefinedValues.symbols b/tests/baselines/reference/invalidUndefinedValues.symbols index 37797c931e241..cbdd2a7ce3d83 100644 --- a/tests/baselines/reference/invalidUndefinedValues.symbols +++ b/tests/baselines/reference/invalidUndefinedValues.symbols @@ -52,9 +52,9 @@ x = c; >x : Symbol(x, Decl(invalidUndefinedValues.ts, 0, 3)) >c : Symbol(c, Decl(invalidUndefinedValues.ts, 15, 3)) -module M { export var x = 1; } +namespace M { export var x = 1; } >M : Symbol(M, Decl(invalidUndefinedValues.ts, 16, 6)) ->x : Symbol(x, Decl(invalidUndefinedValues.ts, 18, 21)) +>x : Symbol(x, Decl(invalidUndefinedValues.ts, 18, 24)) x = M; >x : Symbol(x, Decl(invalidUndefinedValues.ts, 0, 3)) diff --git a/tests/baselines/reference/invalidUndefinedValues.types b/tests/baselines/reference/invalidUndefinedValues.types index d87d4a6668827..f3c3ca4a2a54c 100644 --- a/tests/baselines/reference/invalidUndefinedValues.types +++ b/tests/baselines/reference/invalidUndefinedValues.types @@ -82,7 +82,7 @@ x = c; >c : I > : ^ -module M { export var x = 1; } +namespace M { export var x = 1; } >M : typeof M > : ^^^^^^^^ >x : number diff --git a/tests/baselines/reference/invalidVoidAssignments.errors.txt b/tests/baselines/reference/invalidVoidAssignments.errors.txt index dee819985c8d5..18f7256b59262 100644 --- a/tests/baselines/reference/invalidVoidAssignments.errors.txt +++ b/tests/baselines/reference/invalidVoidAssignments.errors.txt @@ -45,7 +45,7 @@ invalidVoidAssignments.ts(29,1): error TS2322: Type '{ f(): void; }' is not assi ~~ !!! error TS2322: Type 'number' is not assignable to type '{ 0: number; }'. - module M { export var x = 1; } + namespace M { export var x = 1; } M = x; ~ !!! error TS2631: Cannot assign to 'M' because it is a namespace. diff --git a/tests/baselines/reference/invalidVoidAssignments.js b/tests/baselines/reference/invalidVoidAssignments.js index b46d03361d0ce..1bf4364349952 100644 --- a/tests/baselines/reference/invalidVoidAssignments.js +++ b/tests/baselines/reference/invalidVoidAssignments.js @@ -17,7 +17,7 @@ var f: I = x; var g: { baz: string } = 1; var g2: { 0: number } = 1; -module M { export var x = 1; } +namespace M { export var x = 1; } M = x; function i(a: T) { diff --git a/tests/baselines/reference/invalidVoidAssignments.symbols b/tests/baselines/reference/invalidVoidAssignments.symbols index d8bef458820dd..34e134492bc21 100644 --- a/tests/baselines/reference/invalidVoidAssignments.symbols +++ b/tests/baselines/reference/invalidVoidAssignments.symbols @@ -47,9 +47,9 @@ var g2: { 0: number } = 1; >g2 : Symbol(g2, Decl(invalidVoidAssignments.ts, 14, 3)) >0 : Symbol(0, Decl(invalidVoidAssignments.ts, 14, 9)) -module M { export var x = 1; } +namespace M { export var x = 1; } >M : Symbol(M, Decl(invalidVoidAssignments.ts, 14, 26)) ->x : Symbol(x, Decl(invalidVoidAssignments.ts, 16, 21)) +>x : Symbol(x, Decl(invalidVoidAssignments.ts, 16, 24)) M = x; >M : Symbol(M, Decl(invalidVoidAssignments.ts, 14, 26)) diff --git a/tests/baselines/reference/invalidVoidAssignments.types b/tests/baselines/reference/invalidVoidAssignments.types index 7967ebed09317..425a9dbefa808 100644 --- a/tests/baselines/reference/invalidVoidAssignments.types +++ b/tests/baselines/reference/invalidVoidAssignments.types @@ -69,7 +69,7 @@ var g2: { 0: number } = 1; >1 : 1 > : ^ -module M { export var x = 1; } +namespace M { export var x = 1; } >M : typeof M > : ^^^^^^^^ >x : number diff --git a/tests/baselines/reference/invalidVoidValues.errors.txt b/tests/baselines/reference/invalidVoidValues.errors.txt index 4b6127fe2ec23..53a20d362a6ba 100644 --- a/tests/baselines/reference/invalidVoidValues.errors.txt +++ b/tests/baselines/reference/invalidVoidValues.errors.txt @@ -47,7 +47,7 @@ invalidVoidValues.ts(26,5): error TS2322: Type '(a: T) => void' is not assign ~ !!! error TS2322: Type '{ f(): void; }' is not assignable to type 'void'. - module M { export var x = 1; } + namespace M { export var x = 1; } x = M; ~ !!! error TS2322: Type 'typeof M' is not assignable to type 'void'. diff --git a/tests/baselines/reference/invalidVoidValues.js b/tests/baselines/reference/invalidVoidValues.js index 7a547c5a6afa0..4b1a9ccad0b62 100644 --- a/tests/baselines/reference/invalidVoidValues.js +++ b/tests/baselines/reference/invalidVoidValues.js @@ -20,7 +20,7 @@ x = b; x = { f() {} } -module M { export var x = 1; } +namespace M { export var x = 1; } x = M; function f(a: T) { diff --git a/tests/baselines/reference/invalidVoidValues.symbols b/tests/baselines/reference/invalidVoidValues.symbols index b3c0d2655d9b6..de16e867cdf98 100644 --- a/tests/baselines/reference/invalidVoidValues.symbols +++ b/tests/baselines/reference/invalidVoidValues.symbols @@ -55,9 +55,9 @@ x = { f() {} } >x : Symbol(x, Decl(invalidVoidValues.ts, 0, 3)) >f : Symbol(f, Decl(invalidVoidValues.ts, 17, 5)) -module M { export var x = 1; } +namespace M { export var x = 1; } >M : Symbol(M, Decl(invalidVoidValues.ts, 17, 14)) ->x : Symbol(x, Decl(invalidVoidValues.ts, 19, 21)) +>x : Symbol(x, Decl(invalidVoidValues.ts, 19, 24)) x = M; >x : Symbol(x, Decl(invalidVoidValues.ts, 0, 3)) diff --git a/tests/baselines/reference/invalidVoidValues.types b/tests/baselines/reference/invalidVoidValues.types index a9eef384adb16..ad12d6a458659 100644 --- a/tests/baselines/reference/invalidVoidValues.types +++ b/tests/baselines/reference/invalidVoidValues.types @@ -99,7 +99,7 @@ x = { f() {} } >f : () => void > : ^^^^^^^^^^ -module M { export var x = 1; } +namespace M { export var x = 1; } >M : typeof M > : ^^^^^^^^ >x : number diff --git a/tests/baselines/reference/ipromise2.errors.txt b/tests/baselines/reference/ipromise2.errors.txt new file mode 100644 index 0000000000000..f2c39d2c3e00f --- /dev/null +++ b/tests/baselines/reference/ipromise2.errors.txt @@ -0,0 +1,30 @@ +ipromise2.ts(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +ipromise2.ts(1,24): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== ipromise2.ts (2 errors) ==== + declare module Windows.Foundation { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~~~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export interface IPromise { + then(success?: (value: T) => IPromise, error?: (error: any) => IPromise, progress?: (progress: any) => void ): Windows.Foundation.IPromise; + then(success?: (value: T) => IPromise, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise; + then(success?: (value: T) => U, error?: (error: any) => IPromise, progress?: (progress: any) => void ): Windows.Foundation.IPromise; + then(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise; + done(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void; + value: T; + } + } + + var p: Windows.Foundation.IPromise; + + var p2 = p.then(function (s) { + return 34; + } ); + + + var x: number = p2.value; + + \ No newline at end of file diff --git a/tests/baselines/reference/ipromise2.types b/tests/baselines/reference/ipromise2.types index c1aa41840d674..bb3ce72986b35 100644 --- a/tests/baselines/reference/ipromise2.types +++ b/tests/baselines/reference/ipromise2.types @@ -13,9 +13,11 @@ declare module Windows.Foundation { >error : (error: any) => IPromise > : ^ ^^ ^^^^^ >error : any +> : ^^^ >progress : (progress: any) => void > : ^ ^^ ^^^^^ >progress : any +> : ^^^ >Windows : any > : ^^^ >Foundation : any @@ -31,9 +33,11 @@ declare module Windows.Foundation { >error : (error: any) => U > : ^ ^^ ^^^^^ >error : any +> : ^^^ >progress : (progress: any) => void > : ^ ^^ ^^^^^ >progress : any +> : ^^^ >Windows : any > : ^^^ >Foundation : any @@ -49,9 +53,11 @@ declare module Windows.Foundation { >error : (error: any) => IPromise > : ^ ^^ ^^^^^ >error : any +> : ^^^ >progress : (progress: any) => void > : ^ ^^ ^^^^^ >progress : any +> : ^^^ >Windows : any > : ^^^ >Foundation : any @@ -67,9 +73,11 @@ declare module Windows.Foundation { >error : (error: any) => U > : ^ ^^ ^^^^^ >error : any +> : ^^^ >progress : (progress: any) => void > : ^ ^^ ^^^^^ >progress : any +> : ^^^ >Windows : any > : ^^^ >Foundation : any @@ -85,9 +93,11 @@ declare module Windows.Foundation { >error : (error: any) => any > : ^ ^^ ^^^^^ >error : any +> : ^^^ >progress : (progress: any) => void > : ^ ^^ ^^^^^ >progress : any +> : ^^^ value: T; >value : T diff --git a/tests/baselines/reference/ipromise4.errors.txt b/tests/baselines/reference/ipromise4.errors.txt new file mode 100644 index 0000000000000..abf57a29ff8d2 --- /dev/null +++ b/tests/baselines/reference/ipromise4.errors.txt @@ -0,0 +1,25 @@ +ipromise4.ts(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +ipromise4.ts(1,24): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== ipromise4.ts (2 errors) ==== + declare module Windows.Foundation { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~~~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export interface IPromise { + then(success?: (value: T) => IPromise, error?: (error: any) => IPromise, progress?: (progress: any) => void ): Windows.Foundation.IPromise; + then(success?: (value: T) => IPromise, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise; + then(success?: (value: T) => U, error?: (error: any) => IPromise, progress?: (progress: any) => void ): Windows.Foundation.IPromise; + then(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise; + done? (success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void; + } + } + + var p: Windows.Foundation.IPromise = null; + + p.then(function (x) { } ); // should not error + p.then(function (x) { return "hello"; } ).then(function (x) { return x } ); // should not error + + \ No newline at end of file diff --git a/tests/baselines/reference/ipromise4.types b/tests/baselines/reference/ipromise4.types index 46e5e4a020eea..1ce5a3a4c9733 100644 --- a/tests/baselines/reference/ipromise4.types +++ b/tests/baselines/reference/ipromise4.types @@ -13,9 +13,11 @@ declare module Windows.Foundation { >error : (error: any) => IPromise > : ^ ^^ ^^^^^ >error : any +> : ^^^ >progress : (progress: any) => void > : ^ ^^ ^^^^^ >progress : any +> : ^^^ >Windows : any > : ^^^ >Foundation : any @@ -31,9 +33,11 @@ declare module Windows.Foundation { >error : (error: any) => U > : ^ ^^ ^^^^^ >error : any +> : ^^^ >progress : (progress: any) => void > : ^ ^^ ^^^^^ >progress : any +> : ^^^ >Windows : any > : ^^^ >Foundation : any @@ -49,9 +53,11 @@ declare module Windows.Foundation { >error : (error: any) => IPromise > : ^ ^^ ^^^^^ >error : any +> : ^^^ >progress : (progress: any) => void > : ^ ^^ ^^^^^ >progress : any +> : ^^^ >Windows : any > : ^^^ >Foundation : any @@ -67,9 +73,11 @@ declare module Windows.Foundation { >error : (error: any) => U > : ^ ^^ ^^^^^ >error : any +> : ^^^ >progress : (progress: any) => void > : ^ ^^ ^^^^^ >progress : any +> : ^^^ >Windows : any > : ^^^ >Foundation : any @@ -85,9 +93,11 @@ declare module Windows.Foundation { >error : (error: any) => any > : ^ ^^ ^^^^^ >error : any +> : ^^^ >progress : (progress: any) => void > : ^ ^^ ^^^^^ >progress : any +> : ^^^ } } diff --git a/tests/baselines/reference/isDeclarationVisibleNodeKinds.js b/tests/baselines/reference/isDeclarationVisibleNodeKinds.js index 3c32766dd3627..d8cba6a6c4700 100644 --- a/tests/baselines/reference/isDeclarationVisibleNodeKinds.js +++ b/tests/baselines/reference/isDeclarationVisibleNodeKinds.js @@ -2,28 +2,28 @@ //// [isDeclarationVisibleNodeKinds.ts] // Function types -module schema { +namespace schema { export function createValidator1(schema: any): (data: T) => T { return undefined; } } // Constructor types -module schema { +namespace schema { export function createValidator2(schema: any): new (data: T) => T { return undefined; } } // union types -module schema { +namespace schema { export function createValidator3(schema: any): number | { new (data: T): T; } { return undefined; } } // Array types -module schema { +namespace schema { export function createValidator4(schema: any): { new (data: T): T; }[] { return undefined; } @@ -31,35 +31,35 @@ module schema { // TypeLiterals -module schema { +namespace schema { export function createValidator5(schema: any): { new (data: T): T } { return undefined; } } // Tuple types -module schema { +namespace schema { export function createValidator6(schema: any): [ new (data: T) => T, number] { return undefined; } } // Paren Types -module schema { +namespace schema { export function createValidator7(schema: any): (new (data: T)=>T )[] { return undefined; } } // Type reference -module schema { +namespace schema { export function createValidator8(schema: any): Array<{ (data: T) : T}> { return undefined; } } -module schema { +namespace schema { export class T { get createValidator9(): (data: T) => T { return undefined; diff --git a/tests/baselines/reference/isDeclarationVisibleNodeKinds.symbols b/tests/baselines/reference/isDeclarationVisibleNodeKinds.symbols index 3047367814c4a..c484193eee225 100644 --- a/tests/baselines/reference/isDeclarationVisibleNodeKinds.symbols +++ b/tests/baselines/reference/isDeclarationVisibleNodeKinds.symbols @@ -2,11 +2,11 @@ === isDeclarationVisibleNodeKinds.ts === // Function types -module schema { +namespace schema { >schema : Symbol(schema, Decl(isDeclarationVisibleNodeKinds.ts, 0, 0), Decl(isDeclarationVisibleNodeKinds.ts, 5, 1), Decl(isDeclarationVisibleNodeKinds.ts, 12, 1), Decl(isDeclarationVisibleNodeKinds.ts, 19, 1), Decl(isDeclarationVisibleNodeKinds.ts, 26, 1) ... and 4 more) export function createValidator1(schema: any): (data: T) => T { ->createValidator1 : Symbol(createValidator1, Decl(isDeclarationVisibleNodeKinds.ts, 1, 15)) +>createValidator1 : Symbol(createValidator1, Decl(isDeclarationVisibleNodeKinds.ts, 1, 18)) >schema : Symbol(schema, Decl(isDeclarationVisibleNodeKinds.ts, 2, 37)) >T : Symbol(T, Decl(isDeclarationVisibleNodeKinds.ts, 2, 52)) >data : Symbol(data, Decl(isDeclarationVisibleNodeKinds.ts, 2, 55)) @@ -19,11 +19,11 @@ module schema { } // Constructor types -module schema { +namespace schema { >schema : Symbol(schema, Decl(isDeclarationVisibleNodeKinds.ts, 0, 0), Decl(isDeclarationVisibleNodeKinds.ts, 5, 1), Decl(isDeclarationVisibleNodeKinds.ts, 12, 1), Decl(isDeclarationVisibleNodeKinds.ts, 19, 1), Decl(isDeclarationVisibleNodeKinds.ts, 26, 1) ... and 4 more) export function createValidator2(schema: any): new (data: T) => T { ->createValidator2 : Symbol(createValidator2, Decl(isDeclarationVisibleNodeKinds.ts, 8, 15)) +>createValidator2 : Symbol(createValidator2, Decl(isDeclarationVisibleNodeKinds.ts, 8, 18)) >schema : Symbol(schema, Decl(isDeclarationVisibleNodeKinds.ts, 9, 37)) >T : Symbol(T, Decl(isDeclarationVisibleNodeKinds.ts, 9, 56)) >data : Symbol(data, Decl(isDeclarationVisibleNodeKinds.ts, 9, 59)) @@ -36,11 +36,11 @@ module schema { } // union types -module schema { +namespace schema { >schema : Symbol(schema, Decl(isDeclarationVisibleNodeKinds.ts, 0, 0), Decl(isDeclarationVisibleNodeKinds.ts, 5, 1), Decl(isDeclarationVisibleNodeKinds.ts, 12, 1), Decl(isDeclarationVisibleNodeKinds.ts, 19, 1), Decl(isDeclarationVisibleNodeKinds.ts, 26, 1) ... and 4 more) export function createValidator3(schema: any): number | { new (data: T): T; } { ->createValidator3 : Symbol(createValidator3, Decl(isDeclarationVisibleNodeKinds.ts, 15, 15)) +>createValidator3 : Symbol(createValidator3, Decl(isDeclarationVisibleNodeKinds.ts, 15, 18)) >schema : Symbol(schema, Decl(isDeclarationVisibleNodeKinds.ts, 16, 38)) >T : Symbol(T, Decl(isDeclarationVisibleNodeKinds.ts, 16, 68)) >data : Symbol(data, Decl(isDeclarationVisibleNodeKinds.ts, 16, 71)) @@ -53,11 +53,11 @@ module schema { } // Array types -module schema { +namespace schema { >schema : Symbol(schema, Decl(isDeclarationVisibleNodeKinds.ts, 0, 0), Decl(isDeclarationVisibleNodeKinds.ts, 5, 1), Decl(isDeclarationVisibleNodeKinds.ts, 12, 1), Decl(isDeclarationVisibleNodeKinds.ts, 19, 1), Decl(isDeclarationVisibleNodeKinds.ts, 26, 1) ... and 4 more) export function createValidator4(schema: any): { new (data: T): T; }[] { ->createValidator4 : Symbol(createValidator4, Decl(isDeclarationVisibleNodeKinds.ts, 22, 15)) +>createValidator4 : Symbol(createValidator4, Decl(isDeclarationVisibleNodeKinds.ts, 22, 18)) >schema : Symbol(schema, Decl(isDeclarationVisibleNodeKinds.ts, 23, 38)) >T : Symbol(T, Decl(isDeclarationVisibleNodeKinds.ts, 23, 59)) >data : Symbol(data, Decl(isDeclarationVisibleNodeKinds.ts, 23, 62)) @@ -71,11 +71,11 @@ module schema { // TypeLiterals -module schema { +namespace schema { >schema : Symbol(schema, Decl(isDeclarationVisibleNodeKinds.ts, 0, 0), Decl(isDeclarationVisibleNodeKinds.ts, 5, 1), Decl(isDeclarationVisibleNodeKinds.ts, 12, 1), Decl(isDeclarationVisibleNodeKinds.ts, 19, 1), Decl(isDeclarationVisibleNodeKinds.ts, 26, 1) ... and 4 more) export function createValidator5(schema: any): { new (data: T): T } { ->createValidator5 : Symbol(createValidator5, Decl(isDeclarationVisibleNodeKinds.ts, 30, 15)) +>createValidator5 : Symbol(createValidator5, Decl(isDeclarationVisibleNodeKinds.ts, 30, 18)) >schema : Symbol(schema, Decl(isDeclarationVisibleNodeKinds.ts, 31, 37)) >T : Symbol(T, Decl(isDeclarationVisibleNodeKinds.ts, 31, 58)) >data : Symbol(data, Decl(isDeclarationVisibleNodeKinds.ts, 31, 61)) @@ -88,11 +88,11 @@ module schema { } // Tuple types -module schema { +namespace schema { >schema : Symbol(schema, Decl(isDeclarationVisibleNodeKinds.ts, 0, 0), Decl(isDeclarationVisibleNodeKinds.ts, 5, 1), Decl(isDeclarationVisibleNodeKinds.ts, 12, 1), Decl(isDeclarationVisibleNodeKinds.ts, 19, 1), Decl(isDeclarationVisibleNodeKinds.ts, 26, 1) ... and 4 more) export function createValidator6(schema: any): [ new (data: T) => T, number] { ->createValidator6 : Symbol(createValidator6, Decl(isDeclarationVisibleNodeKinds.ts, 37, 15)) +>createValidator6 : Symbol(createValidator6, Decl(isDeclarationVisibleNodeKinds.ts, 37, 18)) >schema : Symbol(schema, Decl(isDeclarationVisibleNodeKinds.ts, 38, 37)) >T : Symbol(T, Decl(isDeclarationVisibleNodeKinds.ts, 38, 58)) >data : Symbol(data, Decl(isDeclarationVisibleNodeKinds.ts, 38, 61)) @@ -105,11 +105,11 @@ module schema { } // Paren Types -module schema { +namespace schema { >schema : Symbol(schema, Decl(isDeclarationVisibleNodeKinds.ts, 0, 0), Decl(isDeclarationVisibleNodeKinds.ts, 5, 1), Decl(isDeclarationVisibleNodeKinds.ts, 12, 1), Decl(isDeclarationVisibleNodeKinds.ts, 19, 1), Decl(isDeclarationVisibleNodeKinds.ts, 26, 1) ... and 4 more) export function createValidator7(schema: any): (new (data: T)=>T )[] { ->createValidator7 : Symbol(createValidator7, Decl(isDeclarationVisibleNodeKinds.ts, 44, 15)) +>createValidator7 : Symbol(createValidator7, Decl(isDeclarationVisibleNodeKinds.ts, 44, 18)) >schema : Symbol(schema, Decl(isDeclarationVisibleNodeKinds.ts, 45, 37)) >T : Symbol(T, Decl(isDeclarationVisibleNodeKinds.ts, 45, 57)) >data : Symbol(data, Decl(isDeclarationVisibleNodeKinds.ts, 45, 60)) @@ -122,11 +122,11 @@ module schema { } // Type reference -module schema { +namespace schema { >schema : Symbol(schema, Decl(isDeclarationVisibleNodeKinds.ts, 0, 0), Decl(isDeclarationVisibleNodeKinds.ts, 5, 1), Decl(isDeclarationVisibleNodeKinds.ts, 12, 1), Decl(isDeclarationVisibleNodeKinds.ts, 19, 1), Decl(isDeclarationVisibleNodeKinds.ts, 26, 1) ... and 4 more) export function createValidator8(schema: any): Array<{ (data: T) : T}> { ->createValidator8 : Symbol(createValidator8, Decl(isDeclarationVisibleNodeKinds.ts, 51, 15)) +>createValidator8 : Symbol(createValidator8, Decl(isDeclarationVisibleNodeKinds.ts, 51, 18)) >schema : Symbol(schema, Decl(isDeclarationVisibleNodeKinds.ts, 52, 37)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >T : Symbol(T, Decl(isDeclarationVisibleNodeKinds.ts, 52, 60)) @@ -140,11 +140,11 @@ module schema { } -module schema { +namespace schema { >schema : Symbol(schema, Decl(isDeclarationVisibleNodeKinds.ts, 0, 0), Decl(isDeclarationVisibleNodeKinds.ts, 5, 1), Decl(isDeclarationVisibleNodeKinds.ts, 12, 1), Decl(isDeclarationVisibleNodeKinds.ts, 19, 1), Decl(isDeclarationVisibleNodeKinds.ts, 26, 1) ... and 4 more) export class T { ->T : Symbol(T, Decl(isDeclarationVisibleNodeKinds.ts, 58, 15)) +>T : Symbol(T, Decl(isDeclarationVisibleNodeKinds.ts, 58, 18)) get createValidator9(): (data: T) => T { >createValidator9 : Symbol(T.createValidator9, Decl(isDeclarationVisibleNodeKinds.ts, 59, 20)) diff --git a/tests/baselines/reference/isDeclarationVisibleNodeKinds.types b/tests/baselines/reference/isDeclarationVisibleNodeKinds.types index 7cec3b3c7d565..f1be37e0fba0c 100644 --- a/tests/baselines/reference/isDeclarationVisibleNodeKinds.types +++ b/tests/baselines/reference/isDeclarationVisibleNodeKinds.types @@ -2,7 +2,7 @@ === isDeclarationVisibleNodeKinds.ts === // Function types -module schema { +namespace schema { >schema : typeof schema > : ^^^^^^^^^^^^^ @@ -20,7 +20,7 @@ module schema { } // Constructor types -module schema { +namespace schema { >schema : typeof schema > : ^^^^^^^^^^^^^ @@ -38,7 +38,7 @@ module schema { } // union types -module schema { +namespace schema { >schema : typeof schema > : ^^^^^^^^^^^^^ @@ -56,7 +56,7 @@ module schema { } // Array types -module schema { +namespace schema { >schema : typeof schema > : ^^^^^^^^^^^^^ @@ -75,7 +75,7 @@ module schema { // TypeLiterals -module schema { +namespace schema { >schema : typeof schema > : ^^^^^^^^^^^^^ @@ -93,7 +93,7 @@ module schema { } // Tuple types -module schema { +namespace schema { >schema : typeof schema > : ^^^^^^^^^^^^^ @@ -111,7 +111,7 @@ module schema { } // Paren Types -module schema { +namespace schema { >schema : typeof schema > : ^^^^^^^^^^^^^ @@ -129,7 +129,7 @@ module schema { } // Type reference -module schema { +namespace schema { >schema : typeof schema > : ^^^^^^^^^^^^^ @@ -147,7 +147,7 @@ module schema { } -module schema { +namespace schema { >schema : typeof schema > : ^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt index efda02b1ad397..15ff5aab349d1 100644 --- a/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt @@ -1,11 +1,11 @@ error TS5055: Cannot write file 'a.js' because it would overwrite input file. Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -a.js(1,8): error TS8006: 'module' declarations can only be used in TypeScript files. +a.js(1,11): error TS8006: 'namespace' declarations can only be used in TypeScript files. !!! error TS5055: Cannot write file 'a.js' because it would overwrite input file. !!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. ==== a.js (1 errors) ==== - module M { } - ~ -!!! error TS8006: 'module' declarations can only be used in TypeScript files. \ No newline at end of file + namespace M { } + ~ +!!! error TS8006: 'namespace' declarations can only be used in TypeScript files. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationModuleSyntax.symbols b/tests/baselines/reference/jsFileCompilationModuleSyntax.symbols index fdce210ce3c49..607642a1c6677 100644 --- a/tests/baselines/reference/jsFileCompilationModuleSyntax.symbols +++ b/tests/baselines/reference/jsFileCompilationModuleSyntax.symbols @@ -1,6 +1,6 @@ //// [tests/cases/compiler/jsFileCompilationModuleSyntax.ts] //// === a.js === -module M { } +namespace M { } >M : Symbol(M, Decl(a.js, 0, 0)) diff --git a/tests/baselines/reference/jsFileCompilationModuleSyntax.types b/tests/baselines/reference/jsFileCompilationModuleSyntax.types index dd64e116777b9..371454e95f7c5 100644 --- a/tests/baselines/reference/jsFileCompilationModuleSyntax.types +++ b/tests/baselines/reference/jsFileCompilationModuleSyntax.types @@ -2,4 +2,4 @@ === a.js === -module M { } +namespace M { } diff --git a/tests/baselines/reference/jsxElementsAsIdentifierNames.errors.txt b/tests/baselines/reference/jsxElementsAsIdentifierNames.errors.txt new file mode 100644 index 0000000000000..fa27091b1d950 --- /dev/null +++ b/tests/baselines/reference/jsxElementsAsIdentifierNames.errors.txt @@ -0,0 +1,21 @@ +a.tsx(2,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== a.tsx (1 errors) ==== + declare const React: any; + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface IntrinsicElements { + ["package"]: any; + } + } + + function A() { + return + } + + function B() { + return + } + \ No newline at end of file diff --git a/tests/baselines/reference/jsxElementsAsIdentifierNames.types b/tests/baselines/reference/jsxElementsAsIdentifierNames.types index 3dc93d5340ab6..d918363830faf 100644 --- a/tests/baselines/reference/jsxElementsAsIdentifierNames.types +++ b/tests/baselines/reference/jsxElementsAsIdentifierNames.types @@ -3,11 +3,13 @@ === a.tsx === declare const React: any; >React : any +> : ^^^ declare module JSX { interface IntrinsicElements { ["package"]: any; >["package"] : any +> : ^^^ >"package" : "package" > : ^^^^^^^^^ } @@ -18,7 +20,8 @@ function A() { > : ^^^^^^^^^ return -> : error +> : any +> : ^^^ >package : any > : ^^^ } @@ -28,7 +31,8 @@ function B() { > : ^^^^^^^^^ return -> : error +> : any +> : ^^^ >package : any > : ^^^ >package : any diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js index 75a062bf6c9e7..890c0464a632b 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js +++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/jsxFactoryIdentifierAsParameter.ts] //// //// [test.tsx] -declare module JSX { +declare namespace JSX { interface IntrinsicElements { [s: string]: any; } diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map index 92a5fb6fc96fc..40e6076f64f2a 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map +++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map @@ -1,3 +1,3 @@ //// [test.js.map] {"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;;AAMA,MAAa,YAAY;IACrB,MAAM,CAAC,aAAa;QAChB,OAAO,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"} -//// https://sokra.github.io/source-map-visualization#base64,InVzZSBzdHJpY3QiOw0KT2JqZWN0LmRlZmluZVByb3BlcnR5KGV4cG9ydHMsICJfX2VzTW9kdWxlIiwgeyB2YWx1ZTogdHJ1ZSB9KTsNCmV4cG9ydHMuQXBwQ29tcG9uZW50ID0gdm9pZCAwOw0KY2xhc3MgQXBwQ29tcG9uZW50IHsNCiAgICByZW5kZXIoY3JlYXRlRWxlbWVudCkgew0KICAgICAgICByZXR1cm4gY3JlYXRlRWxlbWVudCgiZGl2IiwgbnVsbCk7DQogICAgfQ0KfQ0KZXhwb3J0cy5BcHBDb21wb25lbnQgPSBBcHBDb21wb25lbnQ7DQovLyMgc291cmNlTWFwcGluZ1VSTD10ZXN0LmpzLm1hcA==,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQU1BLE1BQWEsWUFBWTtJQUNyQixNQUFNLENBQUMsYUFBYTtRQUNoQixPQUFPLDBCQUFPLENBQUM7SUFDbkIsQ0FBQztDQUNKO0FBSkQsb0NBSUMifQ==,ZGVjbGFyZSBtb2R1bGUgSlNYIHsKICAgIGludGVyZmFjZSBJbnRyaW5zaWNFbGVtZW50cyB7CiAgICAgICAgW3M6IHN0cmluZ106IGFueTsKICAgIH0KfQoKZXhwb3J0IGNsYXNzIEFwcENvbXBvbmVudCB7CiAgICByZW5kZXIoY3JlYXRlRWxlbWVudCkgewogICAgICAgIHJldHVybiA8ZGl2IC8+OwogICAgfQp9Cg== +//// https://sokra.github.io/source-map-visualization#base64,InVzZSBzdHJpY3QiOw0KT2JqZWN0LmRlZmluZVByb3BlcnR5KGV4cG9ydHMsICJfX2VzTW9kdWxlIiwgeyB2YWx1ZTogdHJ1ZSB9KTsNCmV4cG9ydHMuQXBwQ29tcG9uZW50ID0gdm9pZCAwOw0KY2xhc3MgQXBwQ29tcG9uZW50IHsNCiAgICByZW5kZXIoY3JlYXRlRWxlbWVudCkgew0KICAgICAgICByZXR1cm4gY3JlYXRlRWxlbWVudCgiZGl2IiwgbnVsbCk7DQogICAgfQ0KfQ0KZXhwb3J0cy5BcHBDb21wb25lbnQgPSBBcHBDb21wb25lbnQ7DQovLyMgc291cmNlTWFwcGluZ1VSTD10ZXN0LmpzLm1hcA==,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQU1BLE1BQWEsWUFBWTtJQUNyQixNQUFNLENBQUMsYUFBYTtRQUNoQixPQUFPLDBCQUFPLENBQUM7SUFDbkIsQ0FBQztDQUNKO0FBSkQsb0NBSUMifQ==,ZGVjbGFyZSBuYW1lc3BhY2UgSlNYIHsKICAgIGludGVyZmFjZSBJbnRyaW5zaWNFbGVtZW50cyB7CiAgICAgICAgW3M6IHN0cmluZ106IGFueTsKICAgIH0KfQoKZXhwb3J0IGNsYXNzIEFwcENvbXBvbmVudCB7CiAgICByZW5kZXIoY3JlYXRlRWxlbWVudCkgewogICAgICAgIHJldHVybiA8ZGl2IC8+OwogICAgfQp9Cg== diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt index b3c05765f57c3..7ec82ffa8dfec 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt +++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt @@ -16,7 +16,7 @@ sourceFile:test.tsx 2 >^^^^^^ 3 > ^^^^^^^^^^^^ 4 > ^^^^^^^^^^-> -1 >declare module JSX { +1 >declare namespace JSX { > interface IntrinsicElements { > [s: string]: any; > } diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.symbols b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.symbols index 2d672d4436386..6026e8df2518c 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.symbols +++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/jsxFactoryIdentifierAsParameter.ts] //// === test.tsx === -declare module JSX { +declare namespace JSX { >JSX : Symbol(JSX, Decl(test.tsx, 0, 0)) interface IntrinsicElements { ->IntrinsicElements : Symbol(IntrinsicElements, Decl(test.tsx, 0, 20)) +>IntrinsicElements : Symbol(IntrinsicElements, Decl(test.tsx, 0, 23)) [s: string]: any; >s : Symbol(s, Decl(test.tsx, 2, 9)) diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.types b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.types index aae2038929eed..4be8ba2d8ddaf 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.types +++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/jsxFactoryIdentifierAsParameter.ts] //// === test.tsx === -declare module JSX { +declare namespace JSX { interface IntrinsicElements { [s: string]: any; >s : string diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.errors.txt b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.errors.txt index 12f0c6873c89f..9f223e1e28121 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.errors.txt +++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.errors.txt @@ -2,7 +2,7 @@ test.tsx(9,17): error TS2552: Cannot find name 'createElement'. Did you mean 'fr ==== test.tsx (1 errors) ==== - declare module JSX { + declare namespace JSX { interface IntrinsicElements { [s: string]: any; } diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js index 552ad4338acb3..1c87cb140dd6b 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js +++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/jsxFactoryIdentifierWithAbsentParameter.ts] //// //// [test.tsx] -declare module JSX { +declare namespace JSX { interface IntrinsicElements { [s: string]: any; } diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map index ec46e9e097edc..0d691ab4f5534 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map +++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map @@ -1,3 +1,3 @@ //// [test.js.map] {"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;;AAMA,MAAa,YAAY;IACrB,MAAM;QACF,OAAO,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"} -//// https://sokra.github.io/source-map-visualization#base64,InVzZSBzdHJpY3QiOw0KT2JqZWN0LmRlZmluZVByb3BlcnR5KGV4cG9ydHMsICJfX2VzTW9kdWxlIiwgeyB2YWx1ZTogdHJ1ZSB9KTsNCmV4cG9ydHMuQXBwQ29tcG9uZW50ID0gdm9pZCAwOw0KY2xhc3MgQXBwQ29tcG9uZW50IHsNCiAgICByZW5kZXIoKSB7DQogICAgICAgIHJldHVybiBjcmVhdGVFbGVtZW50KCJkaXYiLCBudWxsKTsNCiAgICB9DQp9DQpleHBvcnRzLkFwcENvbXBvbmVudCA9IEFwcENvbXBvbmVudDsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPXRlc3QuanMubWFw,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQU1BLE1BQWEsWUFBWTtJQUNyQixNQUFNO1FBQ0YsT0FBTywwQkFBTyxDQUFDO0lBQ25CLENBQUM7Q0FDSjtBQUpELG9DQUlDIn0=,ZGVjbGFyZSBtb2R1bGUgSlNYIHsKICAgIGludGVyZmFjZSBJbnRyaW5zaWNFbGVtZW50cyB7CiAgICAgICAgW3M6IHN0cmluZ106IGFueTsKICAgIH0KfQoKZXhwb3J0IGNsYXNzIEFwcENvbXBvbmVudCB7CiAgICByZW5kZXIoKSB7CiAgICAgICAgcmV0dXJuIDxkaXYgLz47CiAgICB9Cn0K +//// https://sokra.github.io/source-map-visualization#base64,InVzZSBzdHJpY3QiOw0KT2JqZWN0LmRlZmluZVByb3BlcnR5KGV4cG9ydHMsICJfX2VzTW9kdWxlIiwgeyB2YWx1ZTogdHJ1ZSB9KTsNCmV4cG9ydHMuQXBwQ29tcG9uZW50ID0gdm9pZCAwOw0KY2xhc3MgQXBwQ29tcG9uZW50IHsNCiAgICByZW5kZXIoKSB7DQogICAgICAgIHJldHVybiBjcmVhdGVFbGVtZW50KCJkaXYiLCBudWxsKTsNCiAgICB9DQp9DQpleHBvcnRzLkFwcENvbXBvbmVudCA9IEFwcENvbXBvbmVudDsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPXRlc3QuanMubWFw,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQU1BLE1BQWEsWUFBWTtJQUNyQixNQUFNO1FBQ0YsT0FBTywwQkFBTyxDQUFDO0lBQ25CLENBQUM7Q0FDSjtBQUpELG9DQUlDIn0=,ZGVjbGFyZSBuYW1lc3BhY2UgSlNYIHsKICAgIGludGVyZmFjZSBJbnRyaW5zaWNFbGVtZW50cyB7CiAgICAgICAgW3M6IHN0cmluZ106IGFueTsKICAgIH0KfQoKZXhwb3J0IGNsYXNzIEFwcENvbXBvbmVudCB7CiAgICByZW5kZXIoKSB7CiAgICAgICAgcmV0dXJuIDxkaXYgLz47CiAgICB9Cn0K diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt index 68383f2357a0e..474b61adde784 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt +++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt @@ -15,7 +15,7 @@ sourceFile:test.tsx 1 > 2 >^^^^^^ 3 > ^^^^^^^^^^^^ -1 >declare module JSX { +1 >declare namespace JSX { > interface IntrinsicElements { > [s: string]: any; > } diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.symbols b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.symbols index 06fc93d8eeb55..29fd832973861 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.symbols +++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/jsxFactoryIdentifierWithAbsentParameter.ts] //// === test.tsx === -declare module JSX { +declare namespace JSX { >JSX : Symbol(JSX, Decl(test.tsx, 0, 0)) interface IntrinsicElements { ->IntrinsicElements : Symbol(IntrinsicElements, Decl(test.tsx, 0, 20)) +>IntrinsicElements : Symbol(IntrinsicElements, Decl(test.tsx, 0, 23)) [s: string]: any; >s : Symbol(s, Decl(test.tsx, 2, 9)) diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.types b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.types index d632abed0a983..acaf2d910adf5 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.types +++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/jsxFactoryIdentifierWithAbsentParameter.ts] //// === test.tsx === -declare module JSX { +declare namespace JSX { interface IntrinsicElements { [s: string]: any; >s : string diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.errors.txt b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.errors.txt index 869be8017a463..effcaf3d25385 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.errors.txt +++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.errors.txt @@ -2,7 +2,7 @@ test.tsx(9,17): error TS2552: Cannot find name 'MyElement'. Did you mean 'Elemen ==== test.tsx (1 errors) ==== - declare module JSX { + declare namespace JSX { interface IntrinsicElements { [s: string]: any; } diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js index 262e29825d7a3..47131cebb8be9 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js +++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/jsxFactoryQualifiedNameResolutionError.ts] //// //// [test.tsx] -declare module JSX { +declare namespace JSX { interface IntrinsicElements { [s: string]: any; } diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map index 8fbdace13128c..958fc2ca8aa82 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map +++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map @@ -1,3 +1,3 @@ //// [test.js.map] {"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;;AAMA,MAAa,YAAY;IACrB,MAAM,CAAC,aAAa;QAChB,OAAO,oCAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"} -//// https://sokra.github.io/source-map-visualization#base64,InVzZSBzdHJpY3QiOw0KT2JqZWN0LmRlZmluZVByb3BlcnR5KGV4cG9ydHMsICJfX2VzTW9kdWxlIiwgeyB2YWx1ZTogdHJ1ZSB9KTsNCmV4cG9ydHMuQXBwQ29tcG9uZW50ID0gdm9pZCAwOw0KY2xhc3MgQXBwQ29tcG9uZW50IHsNCiAgICByZW5kZXIoY3JlYXRlRWxlbWVudCkgew0KICAgICAgICByZXR1cm4gTXlFbGVtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIsIG51bGwpOw0KICAgIH0NCn0NCmV4cG9ydHMuQXBwQ29tcG9uZW50ID0gQXBwQ29tcG9uZW50Ow0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9dGVzdC5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQU1BLE1BQWEsWUFBWTtJQUNyQixNQUFNLENBQUMsYUFBYTtRQUNoQixPQUFPLG9DQUFPLENBQUM7SUFDbkIsQ0FBQztDQUNKO0FBSkQsb0NBSUMifQ==,ZGVjbGFyZSBtb2R1bGUgSlNYIHsKICAgIGludGVyZmFjZSBJbnRyaW5zaWNFbGVtZW50cyB7CiAgICAgICAgW3M6IHN0cmluZ106IGFueTsKICAgIH0KfQoKZXhwb3J0IGNsYXNzIEFwcENvbXBvbmVudCB7CiAgICByZW5kZXIoY3JlYXRlRWxlbWVudCkgewogICAgICAgIHJldHVybiA8ZGl2IC8+OwogICAgfQp9 +//// https://sokra.github.io/source-map-visualization#base64,InVzZSBzdHJpY3QiOw0KT2JqZWN0LmRlZmluZVByb3BlcnR5KGV4cG9ydHMsICJfX2VzTW9kdWxlIiwgeyB2YWx1ZTogdHJ1ZSB9KTsNCmV4cG9ydHMuQXBwQ29tcG9uZW50ID0gdm9pZCAwOw0KY2xhc3MgQXBwQ29tcG9uZW50IHsNCiAgICByZW5kZXIoY3JlYXRlRWxlbWVudCkgew0KICAgICAgICByZXR1cm4gTXlFbGVtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIsIG51bGwpOw0KICAgIH0NCn0NCmV4cG9ydHMuQXBwQ29tcG9uZW50ID0gQXBwQ29tcG9uZW50Ow0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9dGVzdC5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQU1BLE1BQWEsWUFBWTtJQUNyQixNQUFNLENBQUMsYUFBYTtRQUNoQixPQUFPLG9DQUFPLENBQUM7SUFDbkIsQ0FBQztDQUNKO0FBSkQsb0NBSUMifQ==,ZGVjbGFyZSBuYW1lc3BhY2UgSlNYIHsKICAgIGludGVyZmFjZSBJbnRyaW5zaWNFbGVtZW50cyB7CiAgICAgICAgW3M6IHN0cmluZ106IGFueTsKICAgIH0KfQoKZXhwb3J0IGNsYXNzIEFwcENvbXBvbmVudCB7CiAgICByZW5kZXIoY3JlYXRlRWxlbWVudCkgewogICAgICAgIHJldHVybiA8ZGl2IC8+OwogICAgfQp9 diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt index f1ae06059bc10..cbf996d7174f5 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt +++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt @@ -16,7 +16,7 @@ sourceFile:test.tsx 2 >^^^^^^ 3 > ^^^^^^^^^^^^ 4 > ^^^^^^^^^^-> -1 >declare module JSX { +1 >declare namespace JSX { > interface IntrinsicElements { > [s: string]: any; > } diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.symbols b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.symbols index e8a460ccc2778..36602561e6640 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.symbols +++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/jsxFactoryQualifiedNameResolutionError.ts] //// === test.tsx === -declare module JSX { +declare namespace JSX { >JSX : Symbol(JSX, Decl(test.tsx, 0, 0)) interface IntrinsicElements { ->IntrinsicElements : Symbol(IntrinsicElements, Decl(test.tsx, 0, 20)) +>IntrinsicElements : Symbol(IntrinsicElements, Decl(test.tsx, 0, 23)) [s: string]: any; >s : Symbol(s, Decl(test.tsx, 2, 9)) diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.types b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.types index 4acd7037fdf0e..2caac026d2138 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.types +++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/jsxFactoryQualifiedNameResolutionError.ts] //// === test.tsx === -declare module JSX { +declare namespace JSX { interface IntrinsicElements { [s: string]: any; >s : string diff --git a/tests/baselines/reference/jsxParsingError1.errors.txt b/tests/baselines/reference/jsxParsingError1.errors.txt index 7d8811dc51eca..6c97c0673a583 100644 --- a/tests/baselines/reference/jsxParsingError1.errors.txt +++ b/tests/baselines/reference/jsxParsingError1.errors.txt @@ -1,9 +1,12 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(11,30): error TS2695: Left side of comma operator is unused and has no side effects. file.tsx(11,30): error TS18007: JSX expressions may not use the comma operator. Did you mean to write an array? -==== file.tsx (2 errors) ==== +==== file.tsx (3 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { [s: string]: any; diff --git a/tests/baselines/reference/jsxParsingError2.errors.txt b/tests/baselines/reference/jsxParsingError2.errors.txt index 5331d6576b655..107e949812284 100644 --- a/tests/baselines/reference/jsxParsingError2.errors.txt +++ b/tests/baselines/reference/jsxParsingError2.errors.txt @@ -8,10 +8,13 @@ Error4.tsx(2,1): error TS1005: ''}` or `>`? Error5.tsx(1,15): error TS1381: Unexpected token. Did you mean `{'}'}` or `}`? Error6.tsx(1,15): error TS1382: Unexpected token. Did you mean `{'>'}` or `>`? +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. -==== file.tsx (0 errors) ==== +==== file.tsx (1 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element {} interface IntrinsicElements { [s: string]: any; diff --git a/tests/baselines/reference/jsxViaImport.2.errors.txt b/tests/baselines/reference/jsxViaImport.2.errors.txt new file mode 100644 index 0000000000000..cd36535c298b5 --- /dev/null +++ b/tests/baselines/reference/jsxViaImport.2.errors.txt @@ -0,0 +1,29 @@ +component.d.ts(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +component.d.ts(4,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== consumer.tsx (0 errors) ==== + /// + import BaseComponent from 'BaseComponent'; + class TestComponent extends React.Component { + render() { + return ; + } + } + +==== component.d.ts (2 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface ElementAttributesProperty { props; } + } + declare module React { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + class Component { } + } + declare module "BaseComponent" { + export default class extends React.Component { + } + } + \ No newline at end of file diff --git a/tests/baselines/reference/jsxViaImport.2.types b/tests/baselines/reference/jsxViaImport.2.types index 363bee08dfd85..f09950d09b50c 100644 --- a/tests/baselines/reference/jsxViaImport.2.types +++ b/tests/baselines/reference/jsxViaImport.2.types @@ -21,7 +21,8 @@ class TestComponent extends React.Component { > : ^^^^^^^^^ return ; -> : error +> : any +> : ^^^ >BaseComponent : typeof BaseComponent > : ^^^^^^^^^^^^^^^^^^^^ } @@ -31,6 +32,7 @@ class TestComponent extends React.Component { declare module JSX { interface ElementAttributesProperty { props; } >props : any +> : ^^^ } declare module React { >React : typeof React diff --git a/tests/baselines/reference/jsxViaImport.errors.txt b/tests/baselines/reference/jsxViaImport.errors.txt index 0326a74ec9eb0..6d7b06320dd23 100644 --- a/tests/baselines/reference/jsxViaImport.errors.txt +++ b/tests/baselines/reference/jsxViaImport.errors.txt @@ -1,3 +1,5 @@ +component.d.ts(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +component.d.ts(4,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. consumer.tsx(5,17): error TS2604: JSX element type 'BaseComponent' does not have any construct or call signatures. @@ -12,11 +14,15 @@ consumer.tsx(5,17): error TS2604: JSX element type 'BaseComponent' does not have } } -==== component.d.ts (0 errors) ==== +==== component.d.ts (2 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface ElementAttributesProperty { props; } } declare module React { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. class Component { } } declare module "BaseComponent" { diff --git a/tests/baselines/reference/knockout.errors.txt b/tests/baselines/reference/knockout.errors.txt index 1bdb8f61a6ab7..9142592eb092f 100644 --- a/tests/baselines/reference/knockout.errors.txt +++ b/tests/baselines/reference/knockout.errors.txt @@ -2,7 +2,7 @@ knockout.ts(21,20): error TS2339: Property 'd' does not exist on type 'Observabl ==== knockout.ts (1 errors) ==== - declare module ko { + declare namespace ko { export interface Observable { (): T; (value: T): any; diff --git a/tests/baselines/reference/knockout.js b/tests/baselines/reference/knockout.js index c54bde861eb39..b52e62b708968 100644 --- a/tests/baselines/reference/knockout.js +++ b/tests/baselines/reference/knockout.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/knockout.ts] //// //// [knockout.ts] - declare module ko { + declare namespace ko { export interface Observable { (): T; (value: T): any; diff --git a/tests/baselines/reference/knockout.symbols b/tests/baselines/reference/knockout.symbols index 343099170eede..bbcac600f1ea5 100644 --- a/tests/baselines/reference/knockout.symbols +++ b/tests/baselines/reference/knockout.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/knockout.ts] //// === knockout.ts === - declare module ko { + declare namespace ko { >ko : Symbol(ko, Decl(knockout.ts, 0, 0)) export interface Observable { ->Observable : Symbol(Observable, Decl(knockout.ts, 0, 21)) +>Observable : Symbol(Observable, Decl(knockout.ts, 0, 24)) >T : Symbol(T, Decl(knockout.ts, 1, 31)) (): T; @@ -30,7 +30,7 @@ >T : Symbol(T, Decl(knockout.ts, 8, 30)) >value : Symbol(value, Decl(knockout.ts, 8, 33)) >T : Symbol(T, Decl(knockout.ts, 8, 30)) ->Observable : Symbol(Observable, Decl(knockout.ts, 0, 21)) +>Observable : Symbol(Observable, Decl(knockout.ts, 0, 24)) >T : Symbol(T, Decl(knockout.ts, 8, 30)) } var o = { diff --git a/tests/baselines/reference/knockout.types b/tests/baselines/reference/knockout.types index 8ae212db9b775..df69eff85cbcb 100644 --- a/tests/baselines/reference/knockout.types +++ b/tests/baselines/reference/knockout.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/knockout.ts] //// === knockout.ts === - declare module ko { + declare namespace ko { >ko : typeof ko > : ^^^^^^^^^ diff --git a/tests/baselines/reference/lambdaPropSelf.errors.txt b/tests/baselines/reference/lambdaPropSelf.errors.txt index 4bc36121a9bca..3fbe01a8bcdd3 100644 --- a/tests/baselines/reference/lambdaPropSelf.errors.txt +++ b/tests/baselines/reference/lambdaPropSelf.errors.txt @@ -21,7 +21,7 @@ lambdaPropSelf.ts(21,13): error TS2331: 'this' cannot be referenced in a module } } - module M { + namespace M { var x = this; ~~~~ !!! error TS2331: 'this' cannot be referenced in a module or namespace body. diff --git a/tests/baselines/reference/lambdaPropSelf.js b/tests/baselines/reference/lambdaPropSelf.js index df322f4da1c77..9651550f175d5 100644 --- a/tests/baselines/reference/lambdaPropSelf.js +++ b/tests/baselines/reference/lambdaPropSelf.js @@ -20,7 +20,7 @@ class T { } } -module M { +namespace M { var x = this; } diff --git a/tests/baselines/reference/lambdaPropSelf.symbols b/tests/baselines/reference/lambdaPropSelf.symbols index 9434b05b47a72..e65a55f35d59c 100644 --- a/tests/baselines/reference/lambdaPropSelf.symbols +++ b/tests/baselines/reference/lambdaPropSelf.symbols @@ -44,7 +44,7 @@ class T { } } -module M { +namespace M { >M : Symbol(M, Decl(lambdaPropSelf.ts, 17, 1)) var x = this; diff --git a/tests/baselines/reference/lambdaPropSelf.types b/tests/baselines/reference/lambdaPropSelf.types index a5795b4f4cc5a..41aed06b76b4a 100644 --- a/tests/baselines/reference/lambdaPropSelf.types +++ b/tests/baselines/reference/lambdaPropSelf.types @@ -78,7 +78,7 @@ class T { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/letAndVarRedeclaration.errors.txt b/tests/baselines/reference/letAndVarRedeclaration.errors.txt index 32dde58a19b01..3cc27b6dab8d2 100644 --- a/tests/baselines/reference/letAndVarRedeclaration.errors.txt +++ b/tests/baselines/reference/letAndVarRedeclaration.errors.txt @@ -60,7 +60,7 @@ letAndVarRedeclaration.ts(49,14): error TS2451: Cannot redeclare block-scoped va } } - module M0 { + namespace M0 { let x2; ~~ !!! error TS2300: Duplicate identifier 'x2'. @@ -72,7 +72,7 @@ letAndVarRedeclaration.ts(49,14): error TS2451: Cannot redeclare block-scoped va !!! error TS2300: Duplicate identifier 'x2'. } - module M1 { + namespace M1 { let x2; ~~ !!! error TS2451: Cannot redeclare block-scoped variable 'x2'. @@ -106,7 +106,7 @@ letAndVarRedeclaration.ts(49,14): error TS2451: Cannot redeclare block-scoped va } } - module M2 { + namespace M2 { let x11; ~~~ !!! error TS2451: Cannot redeclare block-scoped variable 'x11'. diff --git a/tests/baselines/reference/letAndVarRedeclaration.js b/tests/baselines/reference/letAndVarRedeclaration.js index 678505b88445c..c41dbd1b70353 100644 --- a/tests/baselines/reference/letAndVarRedeclaration.js +++ b/tests/baselines/reference/letAndVarRedeclaration.js @@ -21,13 +21,13 @@ function f1() { } } -module M0 { +namespace M0 { let x2; var x2; function x2() { } } -module M1 { +namespace M1 { let x2; { var x2; @@ -47,7 +47,7 @@ function f2() { } } -module M2 { +namespace M2 { let x11; for (var x11; ;) { } diff --git a/tests/baselines/reference/letAndVarRedeclaration.symbols b/tests/baselines/reference/letAndVarRedeclaration.symbols index a5594c9b67770..94a7913b96da9 100644 --- a/tests/baselines/reference/letAndVarRedeclaration.symbols +++ b/tests/baselines/reference/letAndVarRedeclaration.symbols @@ -38,7 +38,7 @@ function f1() { } } -module M0 { +namespace M0 { >M0 : Symbol(M0, Decl(letAndVarRedeclaration.ts, 18, 1)) let x2; @@ -51,7 +51,7 @@ module M0 { >x2 : Symbol(x2, Decl(letAndVarRedeclaration.ts, 22, 11)) } -module M1 { +namespace M1 { >M1 : Symbol(M1, Decl(letAndVarRedeclaration.ts, 24, 1)) let x2; @@ -84,7 +84,7 @@ function f2() { } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(letAndVarRedeclaration.ts, 44, 1)) let x11; diff --git a/tests/baselines/reference/letAndVarRedeclaration.types b/tests/baselines/reference/letAndVarRedeclaration.types index 7a76701771197..e79e3fb548a56 100644 --- a/tests/baselines/reference/letAndVarRedeclaration.types +++ b/tests/baselines/reference/letAndVarRedeclaration.types @@ -49,7 +49,7 @@ function f1() { } } -module M0 { +namespace M0 { >M0 : typeof M0 > : ^^^^^^^^^ @@ -66,7 +66,7 @@ module M0 { > : ^^^^^^^^^^ } -module M1 { +namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ @@ -108,7 +108,7 @@ function f2() { } } -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/letDeclarations-scopes.errors.txt b/tests/baselines/reference/letDeclarations-scopes.errors.txt index 821b2e4dcf71f..88220a8a4efad 100644 --- a/tests/baselines/reference/letDeclarations-scopes.errors.txt +++ b/tests/baselines/reference/letDeclarations-scopes.errors.txt @@ -113,7 +113,7 @@ letDeclarations-scopes.ts(27,1): error TS2410: The 'with' statement is not suppo }; // modules - module m { + namespace m { let l = 0; n = l; diff --git a/tests/baselines/reference/letDeclarations-scopes.js b/tests/baselines/reference/letDeclarations-scopes.js index 83d6c32d8dcc0..88a7d557b2cc3 100644 --- a/tests/baselines/reference/letDeclarations-scopes.js +++ b/tests/baselines/reference/letDeclarations-scopes.js @@ -110,7 +110,7 @@ var F3 = function () { }; // modules -module m { +namespace m { let l = 0; n = l; diff --git a/tests/baselines/reference/letDeclarations-scopes.symbols b/tests/baselines/reference/letDeclarations-scopes.symbols index 7f1d8ca4cf342..99cba4c11e317 100644 --- a/tests/baselines/reference/letDeclarations-scopes.symbols +++ b/tests/baselines/reference/letDeclarations-scopes.symbols @@ -212,7 +212,7 @@ var F3 = function () { }; // modules -module m { +namespace m { >m : Symbol(m, Decl(letDeclarations-scopes.ts, 106, 2)) let l = 0; diff --git a/tests/baselines/reference/letDeclarations-scopes.types b/tests/baselines/reference/letDeclarations-scopes.types index c16a11edfeb75..81087184aee05 100644 --- a/tests/baselines/reference/letDeclarations-scopes.types +++ b/tests/baselines/reference/letDeclarations-scopes.types @@ -414,7 +414,7 @@ var F3 = function () { }; // modules -module m { +namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/letDeclarations-validContexts.errors.txt b/tests/baselines/reference/letDeclarations-validContexts.errors.txt index 4c449306eaf6b..cfe1d3d189d66 100644 --- a/tests/baselines/reference/letDeclarations-validContexts.errors.txt +++ b/tests/baselines/reference/letDeclarations-validContexts.errors.txt @@ -88,7 +88,7 @@ letDeclarations-validContexts.ts(18,1): error TS2410: The 'with' statement is no }; // modules - module m { + namespace m { let l22 = 0; { @@ -139,7 +139,7 @@ letDeclarations-validContexts.ts(18,1): error TS2410: The 'with' statement is no } } - module m3 { + namespace m3 { label: let l34 = 0; { label2: let l35 = 0; diff --git a/tests/baselines/reference/letDeclarations-validContexts.js b/tests/baselines/reference/letDeclarations-validContexts.js index 2fd368d34106d..e38d594b25718 100644 --- a/tests/baselines/reference/letDeclarations-validContexts.js +++ b/tests/baselines/reference/letDeclarations-validContexts.js @@ -85,7 +85,7 @@ var F3 = function () { }; // modules -module m { +namespace m { let l22 = 0; { @@ -136,7 +136,7 @@ function f3() { } } -module m3 { +namespace m3 { label: let l34 = 0; { label2: let l35 = 0; diff --git a/tests/baselines/reference/letDeclarations-validContexts.symbols b/tests/baselines/reference/letDeclarations-validContexts.symbols index acbb43c243677..bcd518d814586 100644 --- a/tests/baselines/reference/letDeclarations-validContexts.symbols +++ b/tests/baselines/reference/letDeclarations-validContexts.symbols @@ -129,7 +129,7 @@ var F3 = function () { }; // modules -module m { +namespace m { >m : Symbol(m, Decl(letDeclarations-validContexts.ts, 81, 2)) let l22 = 0; @@ -215,7 +215,7 @@ function f3() { } } -module m3 { +namespace m3 { >m3 : Symbol(m3, Decl(letDeclarations-validContexts.ts, 133, 1)) label: let l34 = 0; diff --git a/tests/baselines/reference/letDeclarations-validContexts.types b/tests/baselines/reference/letDeclarations-validContexts.types index d743a8397ce2f..19e6aa1142ad5 100644 --- a/tests/baselines/reference/letDeclarations-validContexts.types +++ b/tests/baselines/reference/letDeclarations-validContexts.types @@ -247,7 +247,7 @@ var F3 = function () { }; // modules -module m { +namespace m { >m : typeof m > : ^^^^^^^^ @@ -391,7 +391,7 @@ function f3() { } } -module m3 { +namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/letDeclarations2.js b/tests/baselines/reference/letDeclarations2.js index fd3653c92eee9..32cadf409f1cb 100644 --- a/tests/baselines/reference/letDeclarations2.js +++ b/tests/baselines/reference/letDeclarations2.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/letDeclarations2.ts] //// //// [letDeclarations2.ts] -module M { +namespace M { let l1 = "s"; export let l2 = 0; } diff --git a/tests/baselines/reference/letDeclarations2.symbols b/tests/baselines/reference/letDeclarations2.symbols index 122dfa919f1da..9ca2452ea5f11 100644 --- a/tests/baselines/reference/letDeclarations2.symbols +++ b/tests/baselines/reference/letDeclarations2.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/letDeclarations2.ts] //// === letDeclarations2.ts === -module M { +namespace M { >M : Symbol(M, Decl(letDeclarations2.ts, 0, 0)) let l1 = "s"; diff --git a/tests/baselines/reference/letDeclarations2.types b/tests/baselines/reference/letDeclarations2.types index 0e055fd605cbf..e244492ab8513 100644 --- a/tests/baselines/reference/letDeclarations2.types +++ b/tests/baselines/reference/letDeclarations2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/letDeclarations2.ts] //// === letDeclarations2.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/letKeepNamesOfTopLevelItems.js b/tests/baselines/reference/letKeepNamesOfTopLevelItems.js index 18ea518743a86..37a45f930570b 100644 --- a/tests/baselines/reference/letKeepNamesOfTopLevelItems.js +++ b/tests/baselines/reference/letKeepNamesOfTopLevelItems.js @@ -6,7 +6,7 @@ function foo() { let x; } -module A { +namespace A { let x; } diff --git a/tests/baselines/reference/letKeepNamesOfTopLevelItems.symbols b/tests/baselines/reference/letKeepNamesOfTopLevelItems.symbols index 7ae68dc340679..4057942ef5ec6 100644 --- a/tests/baselines/reference/letKeepNamesOfTopLevelItems.symbols +++ b/tests/baselines/reference/letKeepNamesOfTopLevelItems.symbols @@ -11,7 +11,7 @@ function foo() { >x : Symbol(x, Decl(letKeepNamesOfTopLevelItems.ts, 2, 7)) } -module A { +namespace A { >A : Symbol(A, Decl(letKeepNamesOfTopLevelItems.ts, 3, 1)) let x; diff --git a/tests/baselines/reference/letKeepNamesOfTopLevelItems.types b/tests/baselines/reference/letKeepNamesOfTopLevelItems.types index 127a6345c598d..11303414f3360 100644 --- a/tests/baselines/reference/letKeepNamesOfTopLevelItems.types +++ b/tests/baselines/reference/letKeepNamesOfTopLevelItems.types @@ -12,7 +12,7 @@ function foo() { >x : any } -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/libMembers.errors.txt b/tests/baselines/reference/libMembers.errors.txt index b1d326c817969..139d8131a5c2b 100644 --- a/tests/baselines/reference/libMembers.errors.txt +++ b/tests/baselines/reference/libMembers.errors.txt @@ -11,7 +11,7 @@ libMembers.ts(12,15): error TS2339: Property 'prototype' does not exist on type ~~~~~ !!! error TS2339: Property 'subby' does not exist on type 'string'. String.fromCharCode(12); - module M { + namespace M { export class C { } var a=new C[]; diff --git a/tests/baselines/reference/libMembers.js b/tests/baselines/reference/libMembers.js index 043aaee7204a8..c3d8678a2d284 100644 --- a/tests/baselines/reference/libMembers.js +++ b/tests/baselines/reference/libMembers.js @@ -6,7 +6,7 @@ s.substring(0); s.substring(3,4); s.subby(12); // error unresolved String.fromCharCode(12); -module M { +namespace M { export class C { } var a=new C[]; diff --git a/tests/baselines/reference/libMembers.symbols b/tests/baselines/reference/libMembers.symbols index 06f8f497807a8..13663538ee3b4 100644 --- a/tests/baselines/reference/libMembers.symbols +++ b/tests/baselines/reference/libMembers.symbols @@ -22,25 +22,25 @@ String.fromCharCode(12); >String : Symbol(String, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >fromCharCode : Symbol(StringConstructor.fromCharCode, Decl(lib.es5.d.ts, --, --)) -module M { +namespace M { >M : Symbol(M, Decl(libMembers.ts, 4, 24)) export class C { ->C : Symbol(C, Decl(libMembers.ts, 5, 10)) +>C : Symbol(C, Decl(libMembers.ts, 5, 13)) } var a=new C[]; >a : Symbol(a, Decl(libMembers.ts, 8, 7)) ->C : Symbol(C, Decl(libMembers.ts, 5, 10)) +>C : Symbol(C, Decl(libMembers.ts, 5, 13)) a.length; >a : Symbol(a, Decl(libMembers.ts, 8, 7)) a.push(new C()); >a : Symbol(a, Decl(libMembers.ts, 8, 7)) ->C : Symbol(C, Decl(libMembers.ts, 5, 10)) +>C : Symbol(C, Decl(libMembers.ts, 5, 13)) (new C()).prototype; ->C : Symbol(C, Decl(libMembers.ts, 5, 10)) +>C : Symbol(C, Decl(libMembers.ts, 5, 13)) } diff --git a/tests/baselines/reference/libMembers.types b/tests/baselines/reference/libMembers.types index 8ea3173bf9051..136075c501d2b 100644 --- a/tests/baselines/reference/libMembers.types +++ b/tests/baselines/reference/libMembers.types @@ -57,7 +57,7 @@ String.fromCharCode(12); >12 : 12 > : ^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/listFailure.js b/tests/baselines/reference/listFailure.js index ed82eed6225d8..a66e2918a8345 100644 --- a/tests/baselines/reference/listFailure.js +++ b/tests/baselines/reference/listFailure.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/listFailure.ts] //// //// [listFailure.ts] -module Editor { +namespace Editor { export class Buffer { lines: List = ListMakeHead(); diff --git a/tests/baselines/reference/listFailure.symbols b/tests/baselines/reference/listFailure.symbols index 3013638f62447..e1028be210951 100644 --- a/tests/baselines/reference/listFailure.symbols +++ b/tests/baselines/reference/listFailure.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/listFailure.ts] //// === listFailure.ts === -module Editor { +namespace Editor { >Editor : Symbol(Editor, Decl(listFailure.ts, 0, 0)) export class Buffer { ->Buffer : Symbol(Buffer, Decl(listFailure.ts, 0, 15)) +>Buffer : Symbol(Buffer, Decl(listFailure.ts, 0, 18)) lines: List = ListMakeHead(); >lines : Symbol(Buffer.lines, Decl(listFailure.ts, 2, 25)) @@ -29,7 +29,7 @@ module Editor { >lineEntry : Symbol(lineEntry, Decl(listFailure.ts, 8, 15)) >this.lines.add : Symbol(List.add, Decl(listFailure.ts, 27, 29)) >this.lines : Symbol(Buffer.lines, Decl(listFailure.ts, 2, 25)) ->this : Symbol(Buffer, Decl(listFailure.ts, 0, 15)) +>this : Symbol(Buffer, Decl(listFailure.ts, 0, 18)) >lines : Symbol(Buffer.lines, Decl(listFailure.ts, 2, 25)) >add : Symbol(List.add, Decl(listFailure.ts, 27, 29)) >line : Symbol(line, Decl(listFailure.ts, 7, 15)) diff --git a/tests/baselines/reference/listFailure.types b/tests/baselines/reference/listFailure.types index ee4b68baf1b00..f998aa332a5c6 100644 --- a/tests/baselines/reference/listFailure.types +++ b/tests/baselines/reference/listFailure.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/listFailure.ts] //// === listFailure.ts === -module Editor { +namespace Editor { >Editor : typeof Editor > : ^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/localImportNameVsGlobalName.js b/tests/baselines/reference/localImportNameVsGlobalName.js index 86d874d672171..699c069ee09ff 100644 --- a/tests/baselines/reference/localImportNameVsGlobalName.js +++ b/tests/baselines/reference/localImportNameVsGlobalName.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/localImportNameVsGlobalName.ts] //// //// [localImportNameVsGlobalName.ts] -module Keyboard { +namespace Keyboard { export enum Key { UP, DOWN, LEFT, RIGHT } } -module App { +namespace App { import Key = Keyboard.Key; export function foo(key: Key): void {} diff --git a/tests/baselines/reference/localImportNameVsGlobalName.symbols b/tests/baselines/reference/localImportNameVsGlobalName.symbols index 6035240442ac5..4a056efd168b8 100644 --- a/tests/baselines/reference/localImportNameVsGlobalName.symbols +++ b/tests/baselines/reference/localImportNameVsGlobalName.symbols @@ -1,45 +1,45 @@ //// [tests/cases/compiler/localImportNameVsGlobalName.ts] //// === localImportNameVsGlobalName.ts === -module Keyboard { +namespace Keyboard { >Keyboard : Symbol(Keyboard, Decl(localImportNameVsGlobalName.ts, 0, 0)) export enum Key { UP, DOWN, LEFT, RIGHT } ->Key : Symbol(Key, Decl(localImportNameVsGlobalName.ts, 0, 17)) +>Key : Symbol(Key, Decl(localImportNameVsGlobalName.ts, 0, 20)) >UP : Symbol(Key.UP, Decl(localImportNameVsGlobalName.ts, 1, 19)) >DOWN : Symbol(Key.DOWN, Decl(localImportNameVsGlobalName.ts, 1, 23)) >LEFT : Symbol(Key.LEFT, Decl(localImportNameVsGlobalName.ts, 1, 29)) >RIGHT : Symbol(Key.RIGHT, Decl(localImportNameVsGlobalName.ts, 1, 35)) } -module App { +namespace App { >App : Symbol(App, Decl(localImportNameVsGlobalName.ts, 2, 1)) import Key = Keyboard.Key; ->Key : Symbol(Key, Decl(localImportNameVsGlobalName.ts, 4, 12)) +>Key : Symbol(Key, Decl(localImportNameVsGlobalName.ts, 4, 15)) >Keyboard : Symbol(Keyboard, Decl(localImportNameVsGlobalName.ts, 0, 0)) ->Key : Symbol(Key, Decl(localImportNameVsGlobalName.ts, 0, 17)) +>Key : Symbol(Key, Decl(localImportNameVsGlobalName.ts, 0, 20)) export function foo(key: Key): void {} >foo : Symbol(foo, Decl(localImportNameVsGlobalName.ts, 5, 28)) >key : Symbol(key, Decl(localImportNameVsGlobalName.ts, 7, 22)) ->Key : Symbol(Key, Decl(localImportNameVsGlobalName.ts, 4, 12)) +>Key : Symbol(Key, Decl(localImportNameVsGlobalName.ts, 4, 15)) foo(Key.UP); >foo : Symbol(foo, Decl(localImportNameVsGlobalName.ts, 5, 28)) >Key.UP : Symbol(Key.UP, Decl(localImportNameVsGlobalName.ts, 1, 19)) ->Key : Symbol(Key, Decl(localImportNameVsGlobalName.ts, 4, 12)) +>Key : Symbol(Key, Decl(localImportNameVsGlobalName.ts, 4, 15)) >UP : Symbol(Key.UP, Decl(localImportNameVsGlobalName.ts, 1, 19)) foo(Key.DOWN); >foo : Symbol(foo, Decl(localImportNameVsGlobalName.ts, 5, 28)) >Key.DOWN : Symbol(Key.DOWN, Decl(localImportNameVsGlobalName.ts, 1, 23)) ->Key : Symbol(Key, Decl(localImportNameVsGlobalName.ts, 4, 12)) +>Key : Symbol(Key, Decl(localImportNameVsGlobalName.ts, 4, 15)) >DOWN : Symbol(Key.DOWN, Decl(localImportNameVsGlobalName.ts, 1, 23)) foo(Key.LEFT); >foo : Symbol(foo, Decl(localImportNameVsGlobalName.ts, 5, 28)) >Key.LEFT : Symbol(Key.LEFT, Decl(localImportNameVsGlobalName.ts, 1, 29)) ->Key : Symbol(Key, Decl(localImportNameVsGlobalName.ts, 4, 12)) +>Key : Symbol(Key, Decl(localImportNameVsGlobalName.ts, 4, 15)) >LEFT : Symbol(Key.LEFT, Decl(localImportNameVsGlobalName.ts, 1, 29)) } diff --git a/tests/baselines/reference/localImportNameVsGlobalName.types b/tests/baselines/reference/localImportNameVsGlobalName.types index c7cc11debb02c..283ac85222278 100644 --- a/tests/baselines/reference/localImportNameVsGlobalName.types +++ b/tests/baselines/reference/localImportNameVsGlobalName.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/localImportNameVsGlobalName.ts] //// === localImportNameVsGlobalName.ts === -module Keyboard { +namespace Keyboard { >Keyboard : typeof Keyboard > : ^^^^^^^^^^^^^^^ @@ -18,7 +18,7 @@ module Keyboard { > : ^^^^^^^^^ } -module App { +namespace App { >App : typeof App > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.errors.txt b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.errors.txt index a6a8a41cdf887..043289f9b7523 100644 --- a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.errors.txt +++ b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.errors.txt @@ -25,7 +25,7 @@ logicalNotOperatorWithAnyOtherType.ts(57,1): error TS2695: Left side of comma op return a; } } - module M { + namespace M { export var n: any; } var objA = new A(); diff --git a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js index b77b03bafe0aa..0d36d1e07af8c 100644 --- a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js @@ -19,7 +19,7 @@ class A { return a; } } -module M { +namespace M { export var n: any; } var objA = new A(); diff --git a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.symbols b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.symbols index 6c18da5aa4e13..74db3a79283cf 100644 --- a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.symbols +++ b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.symbols @@ -45,7 +45,7 @@ class A { >a : Symbol(a, Decl(logicalNotOperatorWithAnyOtherType.ts, 14, 11)) } } -module M { +namespace M { >M : Symbol(M, Decl(logicalNotOperatorWithAnyOtherType.ts, 17, 1)) export var n: any; diff --git a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.types b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.types index 5a076c8d61b03..2008f78882470 100644 --- a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.types +++ b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.types @@ -72,7 +72,7 @@ class A { > : ^^^ } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/logicalNotOperatorWithBooleanType.errors.txt b/tests/baselines/reference/logicalNotOperatorWithBooleanType.errors.txt index 981e44fe46d48..cb601859fb889 100644 --- a/tests/baselines/reference/logicalNotOperatorWithBooleanType.errors.txt +++ b/tests/baselines/reference/logicalNotOperatorWithBooleanType.errors.txt @@ -12,7 +12,7 @@ logicalNotOperatorWithBooleanType.ts(36,1): error TS2695: Left side of comma ope public a: boolean; static foo() { return false; } } - module M { + namespace M { export var n: boolean; } diff --git a/tests/baselines/reference/logicalNotOperatorWithBooleanType.js b/tests/baselines/reference/logicalNotOperatorWithBooleanType.js index 0b6ddc865f9b3..3ba85d07e8fe4 100644 --- a/tests/baselines/reference/logicalNotOperatorWithBooleanType.js +++ b/tests/baselines/reference/logicalNotOperatorWithBooleanType.js @@ -10,7 +10,7 @@ class A { public a: boolean; static foo() { return false; } } -module M { +namespace M { export var n: boolean; } diff --git a/tests/baselines/reference/logicalNotOperatorWithBooleanType.symbols b/tests/baselines/reference/logicalNotOperatorWithBooleanType.symbols index 58991fd4534e0..b70b8a19fedb4 100644 --- a/tests/baselines/reference/logicalNotOperatorWithBooleanType.symbols +++ b/tests/baselines/reference/logicalNotOperatorWithBooleanType.symbols @@ -17,7 +17,7 @@ class A { static foo() { return false; } >foo : Symbol(A.foo, Decl(logicalNotOperatorWithBooleanType.ts, 6, 22)) } -module M { +namespace M { >M : Symbol(M, Decl(logicalNotOperatorWithBooleanType.ts, 8, 1)) export var n: boolean; diff --git a/tests/baselines/reference/logicalNotOperatorWithBooleanType.types b/tests/baselines/reference/logicalNotOperatorWithBooleanType.types index be8d2e629c9f3..12bdf272c643e 100644 --- a/tests/baselines/reference/logicalNotOperatorWithBooleanType.types +++ b/tests/baselines/reference/logicalNotOperatorWithBooleanType.types @@ -26,7 +26,7 @@ class A { >false : false > : ^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/logicalNotOperatorWithNumberType.errors.txt b/tests/baselines/reference/logicalNotOperatorWithNumberType.errors.txt index 03ced35d64485..a81e764f76862 100644 --- a/tests/baselines/reference/logicalNotOperatorWithNumberType.errors.txt +++ b/tests/baselines/reference/logicalNotOperatorWithNumberType.errors.txt @@ -14,7 +14,7 @@ logicalNotOperatorWithNumberType.ts(45,1): error TS2695: Left side of comma oper public a: number; static foo() { return 1; } } - module M { + namespace M { export var n: number; } diff --git a/tests/baselines/reference/logicalNotOperatorWithNumberType.js b/tests/baselines/reference/logicalNotOperatorWithNumberType.js index 580afaabf8b62..513b10d0add6a 100644 --- a/tests/baselines/reference/logicalNotOperatorWithNumberType.js +++ b/tests/baselines/reference/logicalNotOperatorWithNumberType.js @@ -11,7 +11,7 @@ class A { public a: number; static foo() { return 1; } } -module M { +namespace M { export var n: number; } diff --git a/tests/baselines/reference/logicalNotOperatorWithNumberType.symbols b/tests/baselines/reference/logicalNotOperatorWithNumberType.symbols index b4b5fe1dc3b7f..b67517c14ae5b 100644 --- a/tests/baselines/reference/logicalNotOperatorWithNumberType.symbols +++ b/tests/baselines/reference/logicalNotOperatorWithNumberType.symbols @@ -20,7 +20,7 @@ class A { static foo() { return 1; } >foo : Symbol(A.foo, Decl(logicalNotOperatorWithNumberType.ts, 7, 21)) } -module M { +namespace M { >M : Symbol(M, Decl(logicalNotOperatorWithNumberType.ts, 9, 1)) export var n: number; diff --git a/tests/baselines/reference/logicalNotOperatorWithNumberType.types b/tests/baselines/reference/logicalNotOperatorWithNumberType.types index c259d3feeb592..f1f661e88a70c 100644 --- a/tests/baselines/reference/logicalNotOperatorWithNumberType.types +++ b/tests/baselines/reference/logicalNotOperatorWithNumberType.types @@ -36,7 +36,7 @@ class A { >1 : 1 > : ^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/logicalNotOperatorWithStringType.errors.txt b/tests/baselines/reference/logicalNotOperatorWithStringType.errors.txt index 6ea2e395e8038..a03d7785b3b69 100644 --- a/tests/baselines/reference/logicalNotOperatorWithStringType.errors.txt +++ b/tests/baselines/reference/logicalNotOperatorWithStringType.errors.txt @@ -16,7 +16,7 @@ logicalNotOperatorWithStringType.ts(44,1): error TS2695: Left side of comma oper public a: string; static foo() { return ""; } } - module M { + namespace M { export var n: string; } diff --git a/tests/baselines/reference/logicalNotOperatorWithStringType.js b/tests/baselines/reference/logicalNotOperatorWithStringType.js index 9ee50143a7a04..a958ace014f5f 100644 --- a/tests/baselines/reference/logicalNotOperatorWithStringType.js +++ b/tests/baselines/reference/logicalNotOperatorWithStringType.js @@ -11,7 +11,7 @@ class A { public a: string; static foo() { return ""; } } -module M { +namespace M { export var n: string; } diff --git a/tests/baselines/reference/logicalNotOperatorWithStringType.symbols b/tests/baselines/reference/logicalNotOperatorWithStringType.symbols index e246853ba7902..0c4d3f3141fba 100644 --- a/tests/baselines/reference/logicalNotOperatorWithStringType.symbols +++ b/tests/baselines/reference/logicalNotOperatorWithStringType.symbols @@ -20,7 +20,7 @@ class A { static foo() { return ""; } >foo : Symbol(A.foo, Decl(logicalNotOperatorWithStringType.ts, 7, 21)) } -module M { +namespace M { >M : Symbol(M, Decl(logicalNotOperatorWithStringType.ts, 9, 1)) export var n: string; diff --git a/tests/baselines/reference/logicalNotOperatorWithStringType.types b/tests/baselines/reference/logicalNotOperatorWithStringType.types index bcb7b7d5fd858..833ff05adc6f9 100644 --- a/tests/baselines/reference/logicalNotOperatorWithStringType.types +++ b/tests/baselines/reference/logicalNotOperatorWithStringType.types @@ -36,7 +36,7 @@ class A { >"" : "" > : ^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/memberScope.errors.txt b/tests/baselines/reference/memberScope.errors.txt index f18e264bf6ad6..40f712d40b6ce 100644 --- a/tests/baselines/reference/memberScope.errors.txt +++ b/tests/baselines/reference/memberScope.errors.txt @@ -2,9 +2,9 @@ memberScope.ts(4,11): error TS2708: Cannot use namespace 'Basil' as a value. ==== memberScope.ts (1 errors) ==== - module Salt { + namespace Salt { export class Pepper {} - export module Basil { } + export namespace Basil { } var z = Basil.Pepper; ~~~~~ !!! error TS2708: Cannot use namespace 'Basil' as a value. diff --git a/tests/baselines/reference/memberScope.js b/tests/baselines/reference/memberScope.js index 210a4f7dc70b9..6bf20f9ea28ef 100644 --- a/tests/baselines/reference/memberScope.js +++ b/tests/baselines/reference/memberScope.js @@ -1,9 +1,9 @@ //// [tests/cases/compiler/memberScope.ts] //// //// [memberScope.ts] -module Salt { +namespace Salt { export class Pepper {} - export module Basil { } + export namespace Basil { } var z = Basil.Pepper; } diff --git a/tests/baselines/reference/memberScope.symbols b/tests/baselines/reference/memberScope.symbols index 0157119d8b16a..b917f36e1fae2 100644 --- a/tests/baselines/reference/memberScope.symbols +++ b/tests/baselines/reference/memberScope.symbols @@ -1,13 +1,13 @@ //// [tests/cases/compiler/memberScope.ts] //// === memberScope.ts === -module Salt { +namespace Salt { >Salt : Symbol(Salt, Decl(memberScope.ts, 0, 0)) export class Pepper {} ->Pepper : Symbol(Pepper, Decl(memberScope.ts, 0, 13)) +>Pepper : Symbol(Pepper, Decl(memberScope.ts, 0, 16)) - export module Basil { } + export namespace Basil { } >Basil : Symbol(Basil, Decl(memberScope.ts, 1, 24)) var z = Basil.Pepper; diff --git a/tests/baselines/reference/memberScope.types b/tests/baselines/reference/memberScope.types index 43bf058161a03..eb8679f3a5b2e 100644 --- a/tests/baselines/reference/memberScope.types +++ b/tests/baselines/reference/memberScope.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/memberScope.ts] //// === memberScope.ts === -module Salt { +namespace Salt { >Salt : typeof Salt > : ^^^^^^^^^^^ @@ -9,7 +9,7 @@ module Salt { >Pepper : Pepper > : ^^^^^^ - export module Basil { } + export namespace Basil { } var z = Basil.Pepper; >z : any > : ^^^ diff --git a/tests/baselines/reference/mergeClassInterfaceAndModule.js b/tests/baselines/reference/mergeClassInterfaceAndModule.js index 089ffab336b5a..2645544846d23 100644 --- a/tests/baselines/reference/mergeClassInterfaceAndModule.js +++ b/tests/baselines/reference/mergeClassInterfaceAndModule.js @@ -3,17 +3,17 @@ //// [mergeClassInterfaceAndModule.ts] interface C1 {} declare class C1 {} -module C1 {} +namespace C1 {} declare class C2 {} interface C2 {} -module C2 {} +namespace C2 {} declare class C3 {} -module C3 {} +namespace C3 {} interface C3 {} -module C4 {} +namespace C4 {} declare class C4 {} // error -- class declaration must precede module declaration interface C4 {} diff --git a/tests/baselines/reference/mergeClassInterfaceAndModule.symbols b/tests/baselines/reference/mergeClassInterfaceAndModule.symbols index 3f227c5652034..c948072ec4358 100644 --- a/tests/baselines/reference/mergeClassInterfaceAndModule.symbols +++ b/tests/baselines/reference/mergeClassInterfaceAndModule.symbols @@ -7,33 +7,33 @@ interface C1 {} declare class C1 {} >C1 : Symbol(C1, Decl(mergeClassInterfaceAndModule.ts, 0, 0), Decl(mergeClassInterfaceAndModule.ts, 0, 15), Decl(mergeClassInterfaceAndModule.ts, 1, 19)) -module C1 {} +namespace C1 {} >C1 : Symbol(C1, Decl(mergeClassInterfaceAndModule.ts, 0, 0), Decl(mergeClassInterfaceAndModule.ts, 0, 15), Decl(mergeClassInterfaceAndModule.ts, 1, 19)) declare class C2 {} ->C2 : Symbol(C2, Decl(mergeClassInterfaceAndModule.ts, 2, 12), Decl(mergeClassInterfaceAndModule.ts, 4, 19), Decl(mergeClassInterfaceAndModule.ts, 5, 15)) +>C2 : Symbol(C2, Decl(mergeClassInterfaceAndModule.ts, 2, 15), Decl(mergeClassInterfaceAndModule.ts, 4, 19), Decl(mergeClassInterfaceAndModule.ts, 5, 15)) interface C2 {} ->C2 : Symbol(C2, Decl(mergeClassInterfaceAndModule.ts, 2, 12), Decl(mergeClassInterfaceAndModule.ts, 4, 19), Decl(mergeClassInterfaceAndModule.ts, 5, 15)) +>C2 : Symbol(C2, Decl(mergeClassInterfaceAndModule.ts, 2, 15), Decl(mergeClassInterfaceAndModule.ts, 4, 19), Decl(mergeClassInterfaceAndModule.ts, 5, 15)) -module C2 {} ->C2 : Symbol(C2, Decl(mergeClassInterfaceAndModule.ts, 2, 12), Decl(mergeClassInterfaceAndModule.ts, 4, 19), Decl(mergeClassInterfaceAndModule.ts, 5, 15)) +namespace C2 {} +>C2 : Symbol(C2, Decl(mergeClassInterfaceAndModule.ts, 2, 15), Decl(mergeClassInterfaceAndModule.ts, 4, 19), Decl(mergeClassInterfaceAndModule.ts, 5, 15)) declare class C3 {} ->C3 : Symbol(C3, Decl(mergeClassInterfaceAndModule.ts, 6, 12), Decl(mergeClassInterfaceAndModule.ts, 8, 19), Decl(mergeClassInterfaceAndModule.ts, 9, 12)) +>C3 : Symbol(C3, Decl(mergeClassInterfaceAndModule.ts, 6, 15), Decl(mergeClassInterfaceAndModule.ts, 8, 19), Decl(mergeClassInterfaceAndModule.ts, 9, 15)) -module C3 {} ->C3 : Symbol(C3, Decl(mergeClassInterfaceAndModule.ts, 6, 12), Decl(mergeClassInterfaceAndModule.ts, 8, 19), Decl(mergeClassInterfaceAndModule.ts, 9, 12)) +namespace C3 {} +>C3 : Symbol(C3, Decl(mergeClassInterfaceAndModule.ts, 6, 15), Decl(mergeClassInterfaceAndModule.ts, 8, 19), Decl(mergeClassInterfaceAndModule.ts, 9, 15)) interface C3 {} ->C3 : Symbol(C3, Decl(mergeClassInterfaceAndModule.ts, 6, 12), Decl(mergeClassInterfaceAndModule.ts, 8, 19), Decl(mergeClassInterfaceAndModule.ts, 9, 12)) +>C3 : Symbol(C3, Decl(mergeClassInterfaceAndModule.ts, 6, 15), Decl(mergeClassInterfaceAndModule.ts, 8, 19), Decl(mergeClassInterfaceAndModule.ts, 9, 15)) -module C4 {} ->C4 : Symbol(C4, Decl(mergeClassInterfaceAndModule.ts, 10, 15), Decl(mergeClassInterfaceAndModule.ts, 12, 12), Decl(mergeClassInterfaceAndModule.ts, 13, 19)) +namespace C4 {} +>C4 : Symbol(C4, Decl(mergeClassInterfaceAndModule.ts, 10, 15), Decl(mergeClassInterfaceAndModule.ts, 12, 15), Decl(mergeClassInterfaceAndModule.ts, 13, 19)) declare class C4 {} // error -- class declaration must precede module declaration ->C4 : Symbol(C4, Decl(mergeClassInterfaceAndModule.ts, 10, 15), Decl(mergeClassInterfaceAndModule.ts, 12, 12), Decl(mergeClassInterfaceAndModule.ts, 13, 19)) +>C4 : Symbol(C4, Decl(mergeClassInterfaceAndModule.ts, 10, 15), Decl(mergeClassInterfaceAndModule.ts, 12, 15), Decl(mergeClassInterfaceAndModule.ts, 13, 19)) interface C4 {} ->C4 : Symbol(C4, Decl(mergeClassInterfaceAndModule.ts, 10, 15), Decl(mergeClassInterfaceAndModule.ts, 12, 12), Decl(mergeClassInterfaceAndModule.ts, 13, 19)) +>C4 : Symbol(C4, Decl(mergeClassInterfaceAndModule.ts, 10, 15), Decl(mergeClassInterfaceAndModule.ts, 12, 15), Decl(mergeClassInterfaceAndModule.ts, 13, 19)) diff --git a/tests/baselines/reference/mergeClassInterfaceAndModule.types b/tests/baselines/reference/mergeClassInterfaceAndModule.types index 77fb3ba9117fd..9be3fd8bd2a49 100644 --- a/tests/baselines/reference/mergeClassInterfaceAndModule.types +++ b/tests/baselines/reference/mergeClassInterfaceAndModule.types @@ -6,23 +6,23 @@ declare class C1 {} >C1 : C1 > : ^^ -module C1 {} +namespace C1 {} declare class C2 {} >C2 : C2 > : ^^ interface C2 {} -module C2 {} +namespace C2 {} declare class C3 {} >C3 : C3 > : ^^ -module C3 {} +namespace C3 {} interface C3 {} -module C4 {} +namespace C4 {} declare class C4 {} // error -- class declaration must precede module declaration >C4 : C4 > : ^^ diff --git a/tests/baselines/reference/mergeThreeInterfaces.js b/tests/baselines/reference/mergeThreeInterfaces.js index a444ce42f54cc..b93dfb30e8250 100644 --- a/tests/baselines/reference/mergeThreeInterfaces.js +++ b/tests/baselines/reference/mergeThreeInterfaces.js @@ -40,7 +40,7 @@ var r5 = b.bar; var r6 = b.baz; // basic non-generic and generic case inside a module -module M { +namespace M { interface A { foo: string; } diff --git a/tests/baselines/reference/mergeThreeInterfaces.symbols b/tests/baselines/reference/mergeThreeInterfaces.symbols index d4cc61df4c83c..98b9b21ac6d3f 100644 --- a/tests/baselines/reference/mergeThreeInterfaces.symbols +++ b/tests/baselines/reference/mergeThreeInterfaces.symbols @@ -98,25 +98,25 @@ var r6 = b.baz; >baz : Symbol(B.baz, Decl(mergeThreeInterfaces.ts, 29, 16)) // basic non-generic and generic case inside a module -module M { +namespace M { >M : Symbol(M, Decl(mergeThreeInterfaces.ts, 36, 15)) interface A { ->A : Symbol(A, Decl(mergeThreeInterfaces.ts, 39, 10), Decl(mergeThreeInterfaces.ts, 42, 5), Decl(mergeThreeInterfaces.ts, 46, 5)) +>A : Symbol(A, Decl(mergeThreeInterfaces.ts, 39, 13), Decl(mergeThreeInterfaces.ts, 42, 5), Decl(mergeThreeInterfaces.ts, 46, 5)) foo: string; >foo : Symbol(A.foo, Decl(mergeThreeInterfaces.ts, 40, 17)) } interface A { ->A : Symbol(A, Decl(mergeThreeInterfaces.ts, 39, 10), Decl(mergeThreeInterfaces.ts, 42, 5), Decl(mergeThreeInterfaces.ts, 46, 5)) +>A : Symbol(A, Decl(mergeThreeInterfaces.ts, 39, 13), Decl(mergeThreeInterfaces.ts, 42, 5), Decl(mergeThreeInterfaces.ts, 46, 5)) bar: number; >bar : Symbol(A.bar, Decl(mergeThreeInterfaces.ts, 44, 17)) } interface A { ->A : Symbol(A, Decl(mergeThreeInterfaces.ts, 39, 10), Decl(mergeThreeInterfaces.ts, 42, 5), Decl(mergeThreeInterfaces.ts, 46, 5)) +>A : Symbol(A, Decl(mergeThreeInterfaces.ts, 39, 13), Decl(mergeThreeInterfaces.ts, 42, 5), Decl(mergeThreeInterfaces.ts, 46, 5)) baz: boolean; >baz : Symbol(A.baz, Decl(mergeThreeInterfaces.ts, 48, 17)) @@ -124,7 +124,7 @@ module M { var a: A; >a : Symbol(a, Decl(mergeThreeInterfaces.ts, 52, 7)) ->A : Symbol(A, Decl(mergeThreeInterfaces.ts, 39, 10), Decl(mergeThreeInterfaces.ts, 42, 5), Decl(mergeThreeInterfaces.ts, 46, 5)) +>A : Symbol(A, Decl(mergeThreeInterfaces.ts, 39, 13), Decl(mergeThreeInterfaces.ts, 42, 5), Decl(mergeThreeInterfaces.ts, 46, 5)) var r1 = a.foo; >r1 : Symbol(r1, Decl(mergeThreeInterfaces.ts, 53, 7)) diff --git a/tests/baselines/reference/mergeThreeInterfaces.types b/tests/baselines/reference/mergeThreeInterfaces.types index ae71e06fa68c2..5d1796da4aee4 100644 --- a/tests/baselines/reference/mergeThreeInterfaces.types +++ b/tests/baselines/reference/mergeThreeInterfaces.types @@ -110,7 +110,7 @@ var r6 = b.baz; > : ^^^^^^ // basic non-generic and generic case inside a module -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/mergeThreeInterfaces2.js b/tests/baselines/reference/mergeThreeInterfaces2.js index 2577cc1405142..e50f87cb3560e 100644 --- a/tests/baselines/reference/mergeThreeInterfaces2.js +++ b/tests/baselines/reference/mergeThreeInterfaces2.js @@ -4,7 +4,7 @@ // two interfaces with the same root module should merge // root module now multiple module declarations -module M2 { +namespace M2 { export interface A { foo: string; } @@ -14,7 +14,7 @@ module M2 { var r2 = a.bar; } -module M2 { +namespace M2 { export interface A { bar: number; } @@ -30,8 +30,8 @@ module M2 { } // same as above but with an additional level of nesting and third module declaration -module M2 { - export module M3 { +namespace M2 { + export namespace M3 { export interface A { foo: string; } @@ -42,8 +42,8 @@ module M2 { } } -module M2 { - export module M3 { +namespace M2 { + export namespace M3 { export interface A { bar: number; } @@ -56,8 +56,8 @@ module M2 { } } -module M2 { - export module M3 { +namespace M2 { + export namespace M3 { export interface A { baz: boolean; } diff --git a/tests/baselines/reference/mergeThreeInterfaces2.symbols b/tests/baselines/reference/mergeThreeInterfaces2.symbols index 4aca790871a5a..07fc2ac332801 100644 --- a/tests/baselines/reference/mergeThreeInterfaces2.symbols +++ b/tests/baselines/reference/mergeThreeInterfaces2.symbols @@ -4,11 +4,11 @@ // two interfaces with the same root module should merge // root module now multiple module declarations -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(mergeThreeInterfaces2.ts, 0, 0), Decl(mergeThreeInterfaces2.ts, 11, 1), Decl(mergeThreeInterfaces2.ts, 26, 1), Decl(mergeThreeInterfaces2.ts, 39, 1), Decl(mergeThreeInterfaces2.ts, 53, 1)) export interface A { ->A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 3, 11), Decl(mergeThreeInterfaces2.ts, 13, 11), Decl(mergeThreeInterfaces2.ts, 16, 5)) +>A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 3, 14), Decl(mergeThreeInterfaces2.ts, 13, 14), Decl(mergeThreeInterfaces2.ts, 16, 5)) foo: string; >foo : Symbol(A.foo, Decl(mergeThreeInterfaces2.ts, 4, 24)) @@ -16,7 +16,7 @@ module M2 { var a: A; >a : Symbol(a, Decl(mergeThreeInterfaces2.ts, 8, 7)) ->A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 3, 11), Decl(mergeThreeInterfaces2.ts, 13, 11), Decl(mergeThreeInterfaces2.ts, 16, 5)) +>A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 3, 14), Decl(mergeThreeInterfaces2.ts, 13, 14), Decl(mergeThreeInterfaces2.ts, 16, 5)) var r1 = a.foo; >r1 : Symbol(r1, Decl(mergeThreeInterfaces2.ts, 9, 7)) @@ -31,18 +31,18 @@ module M2 { >bar : Symbol(A.bar, Decl(mergeThreeInterfaces2.ts, 14, 24)) } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(mergeThreeInterfaces2.ts, 0, 0), Decl(mergeThreeInterfaces2.ts, 11, 1), Decl(mergeThreeInterfaces2.ts, 26, 1), Decl(mergeThreeInterfaces2.ts, 39, 1), Decl(mergeThreeInterfaces2.ts, 53, 1)) export interface A { ->A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 3, 11), Decl(mergeThreeInterfaces2.ts, 13, 11), Decl(mergeThreeInterfaces2.ts, 16, 5)) +>A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 3, 14), Decl(mergeThreeInterfaces2.ts, 13, 14), Decl(mergeThreeInterfaces2.ts, 16, 5)) bar: number; >bar : Symbol(A.bar, Decl(mergeThreeInterfaces2.ts, 14, 24)) } export interface A { ->A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 3, 11), Decl(mergeThreeInterfaces2.ts, 13, 11), Decl(mergeThreeInterfaces2.ts, 16, 5)) +>A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 3, 14), Decl(mergeThreeInterfaces2.ts, 13, 14), Decl(mergeThreeInterfaces2.ts, 16, 5)) baz: boolean; >baz : Symbol(A.baz, Decl(mergeThreeInterfaces2.ts, 18, 24)) @@ -50,7 +50,7 @@ module M2 { var a: A; >a : Symbol(a, Decl(mergeThreeInterfaces2.ts, 22, 7)) ->A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 3, 11), Decl(mergeThreeInterfaces2.ts, 13, 11), Decl(mergeThreeInterfaces2.ts, 16, 5)) +>A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 3, 14), Decl(mergeThreeInterfaces2.ts, 13, 14), Decl(mergeThreeInterfaces2.ts, 16, 5)) var r1 = a.foo; >r1 : Symbol(r1, Decl(mergeThreeInterfaces2.ts, 23, 7)) @@ -72,14 +72,14 @@ module M2 { } // same as above but with an additional level of nesting and third module declaration -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(mergeThreeInterfaces2.ts, 0, 0), Decl(mergeThreeInterfaces2.ts, 11, 1), Decl(mergeThreeInterfaces2.ts, 26, 1), Decl(mergeThreeInterfaces2.ts, 39, 1), Decl(mergeThreeInterfaces2.ts, 53, 1)) - export module M3 { ->M3 : Symbol(M3, Decl(mergeThreeInterfaces2.ts, 29, 11), Decl(mergeThreeInterfaces2.ts, 41, 11), Decl(mergeThreeInterfaces2.ts, 55, 11)) + export namespace M3 { +>M3 : Symbol(M3, Decl(mergeThreeInterfaces2.ts, 29, 14), Decl(mergeThreeInterfaces2.ts, 41, 14), Decl(mergeThreeInterfaces2.ts, 55, 14)) export interface A { ->A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 30, 22), Decl(mergeThreeInterfaces2.ts, 42, 22), Decl(mergeThreeInterfaces2.ts, 56, 22)) +>A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 30, 25), Decl(mergeThreeInterfaces2.ts, 42, 25), Decl(mergeThreeInterfaces2.ts, 56, 25)) foo: string; >foo : Symbol(A.foo, Decl(mergeThreeInterfaces2.ts, 31, 28)) @@ -87,7 +87,7 @@ module M2 { var a: A; >a : Symbol(a, Decl(mergeThreeInterfaces2.ts, 35, 11)) ->A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 30, 22), Decl(mergeThreeInterfaces2.ts, 42, 22), Decl(mergeThreeInterfaces2.ts, 56, 22)) +>A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 30, 25), Decl(mergeThreeInterfaces2.ts, 42, 25), Decl(mergeThreeInterfaces2.ts, 56, 25)) var r1 = a.foo; >r1 : Symbol(r1, Decl(mergeThreeInterfaces2.ts, 36, 11)) @@ -103,14 +103,14 @@ module M2 { } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(mergeThreeInterfaces2.ts, 0, 0), Decl(mergeThreeInterfaces2.ts, 11, 1), Decl(mergeThreeInterfaces2.ts, 26, 1), Decl(mergeThreeInterfaces2.ts, 39, 1), Decl(mergeThreeInterfaces2.ts, 53, 1)) - export module M3 { ->M3 : Symbol(M3, Decl(mergeThreeInterfaces2.ts, 29, 11), Decl(mergeThreeInterfaces2.ts, 41, 11), Decl(mergeThreeInterfaces2.ts, 55, 11)) + export namespace M3 { +>M3 : Symbol(M3, Decl(mergeThreeInterfaces2.ts, 29, 14), Decl(mergeThreeInterfaces2.ts, 41, 14), Decl(mergeThreeInterfaces2.ts, 55, 14)) export interface A { ->A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 30, 22), Decl(mergeThreeInterfaces2.ts, 42, 22), Decl(mergeThreeInterfaces2.ts, 56, 22)) +>A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 30, 25), Decl(mergeThreeInterfaces2.ts, 42, 25), Decl(mergeThreeInterfaces2.ts, 56, 25)) bar: number; >bar : Symbol(A.bar, Decl(mergeThreeInterfaces2.ts, 43, 28)) @@ -118,7 +118,7 @@ module M2 { var a: A; >a : Symbol(a, Decl(mergeThreeInterfaces2.ts, 47, 11)) ->A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 30, 22), Decl(mergeThreeInterfaces2.ts, 42, 22), Decl(mergeThreeInterfaces2.ts, 56, 22)) +>A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 30, 25), Decl(mergeThreeInterfaces2.ts, 42, 25), Decl(mergeThreeInterfaces2.ts, 56, 25)) var r1 = a.foo >r1 : Symbol(r1, Decl(mergeThreeInterfaces2.ts, 49, 11)) @@ -140,14 +140,14 @@ module M2 { } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(mergeThreeInterfaces2.ts, 0, 0), Decl(mergeThreeInterfaces2.ts, 11, 1), Decl(mergeThreeInterfaces2.ts, 26, 1), Decl(mergeThreeInterfaces2.ts, 39, 1), Decl(mergeThreeInterfaces2.ts, 53, 1)) - export module M3 { ->M3 : Symbol(M3, Decl(mergeThreeInterfaces2.ts, 29, 11), Decl(mergeThreeInterfaces2.ts, 41, 11), Decl(mergeThreeInterfaces2.ts, 55, 11)) + export namespace M3 { +>M3 : Symbol(M3, Decl(mergeThreeInterfaces2.ts, 29, 14), Decl(mergeThreeInterfaces2.ts, 41, 14), Decl(mergeThreeInterfaces2.ts, 55, 14)) export interface A { ->A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 30, 22), Decl(mergeThreeInterfaces2.ts, 42, 22), Decl(mergeThreeInterfaces2.ts, 56, 22)) +>A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 30, 25), Decl(mergeThreeInterfaces2.ts, 42, 25), Decl(mergeThreeInterfaces2.ts, 56, 25)) baz: boolean; >baz : Symbol(A.baz, Decl(mergeThreeInterfaces2.ts, 57, 28)) @@ -155,7 +155,7 @@ module M2 { var a: A; >a : Symbol(a, Decl(mergeThreeInterfaces2.ts, 61, 11)) ->A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 30, 22), Decl(mergeThreeInterfaces2.ts, 42, 22), Decl(mergeThreeInterfaces2.ts, 56, 22)) +>A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 30, 25), Decl(mergeThreeInterfaces2.ts, 42, 25), Decl(mergeThreeInterfaces2.ts, 56, 25)) var r1 = a.foo >r1 : Symbol(r1, Decl(mergeThreeInterfaces2.ts, 62, 11)) diff --git a/tests/baselines/reference/mergeThreeInterfaces2.types b/tests/baselines/reference/mergeThreeInterfaces2.types index 609e3bd981aea..79a1b628298d4 100644 --- a/tests/baselines/reference/mergeThreeInterfaces2.types +++ b/tests/baselines/reference/mergeThreeInterfaces2.types @@ -4,7 +4,7 @@ // two interfaces with the same root module should merge // root module now multiple module declarations -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ @@ -39,7 +39,7 @@ module M2 { > : ^^^^^^ } -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ @@ -91,11 +91,11 @@ module M2 { } // same as above but with an additional level of nesting and third module declaration -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ - export module M3 { + export namespace M3 { >M3 : typeof M3 > : ^^^^^^^^^ @@ -131,11 +131,11 @@ module M2 { } } -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ - export module M3 { + export namespace M3 { >M3 : typeof M3 > : ^^^^^^^^^ @@ -181,11 +181,11 @@ module M2 { } } -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ - export module M3 { + export namespace M3 { >M3 : typeof M3 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/mergeTwoInterfaces.js b/tests/baselines/reference/mergeTwoInterfaces.js index e87d51b9ca2bd..7f7bf2d58f085 100644 --- a/tests/baselines/reference/mergeTwoInterfaces.js +++ b/tests/baselines/reference/mergeTwoInterfaces.js @@ -31,7 +31,7 @@ var r3 = b.foo var r4 = b.bar; // basic non-generic and generic case inside a module -module M { +namespace M { interface A { foo: string; } diff --git a/tests/baselines/reference/mergeTwoInterfaces.symbols b/tests/baselines/reference/mergeTwoInterfaces.symbols index baa2965d625e9..25f68db72ff82 100644 --- a/tests/baselines/reference/mergeTwoInterfaces.symbols +++ b/tests/baselines/reference/mergeTwoInterfaces.symbols @@ -73,18 +73,18 @@ var r4 = b.bar; >bar : Symbol(B.bar, Decl(mergeTwoInterfaces.ts, 21, 16)) // basic non-generic and generic case inside a module -module M { +namespace M { >M : Symbol(M, Decl(mergeTwoInterfaces.ts, 27, 15)) interface A { ->A : Symbol(A, Decl(mergeTwoInterfaces.ts, 30, 10), Decl(mergeTwoInterfaces.ts, 33, 5)) +>A : Symbol(A, Decl(mergeTwoInterfaces.ts, 30, 13), Decl(mergeTwoInterfaces.ts, 33, 5)) foo: string; >foo : Symbol(A.foo, Decl(mergeTwoInterfaces.ts, 31, 17)) } interface A { ->A : Symbol(A, Decl(mergeTwoInterfaces.ts, 30, 10), Decl(mergeTwoInterfaces.ts, 33, 5)) +>A : Symbol(A, Decl(mergeTwoInterfaces.ts, 30, 13), Decl(mergeTwoInterfaces.ts, 33, 5)) bar: number; >bar : Symbol(A.bar, Decl(mergeTwoInterfaces.ts, 35, 17)) @@ -92,7 +92,7 @@ module M { var a: A; >a : Symbol(a, Decl(mergeTwoInterfaces.ts, 39, 7)) ->A : Symbol(A, Decl(mergeTwoInterfaces.ts, 30, 10), Decl(mergeTwoInterfaces.ts, 33, 5)) +>A : Symbol(A, Decl(mergeTwoInterfaces.ts, 30, 13), Decl(mergeTwoInterfaces.ts, 33, 5)) var r1 = a.foo; >r1 : Symbol(r1, Decl(mergeTwoInterfaces.ts, 40, 7)) diff --git a/tests/baselines/reference/mergeTwoInterfaces.types b/tests/baselines/reference/mergeTwoInterfaces.types index d1329d95309b1..6f7d31d9e2856 100644 --- a/tests/baselines/reference/mergeTwoInterfaces.types +++ b/tests/baselines/reference/mergeTwoInterfaces.types @@ -82,7 +82,7 @@ var r4 = b.bar; > : ^^^^^^ // basic non-generic and generic case inside a module -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/mergeTwoInterfaces2.js b/tests/baselines/reference/mergeTwoInterfaces2.js index dfa6f1f6ad06e..31bd60ba5376b 100644 --- a/tests/baselines/reference/mergeTwoInterfaces2.js +++ b/tests/baselines/reference/mergeTwoInterfaces2.js @@ -4,7 +4,7 @@ // two interfaces with the same root module should merge // root module now multiple module declarations -module M2 { +namespace M2 { export interface A { foo: string; } @@ -14,7 +14,7 @@ module M2 { var r2 = a.bar; } -module M2 { +namespace M2 { export interface A { bar: number; } @@ -25,8 +25,8 @@ module M2 { } // same as above but with an additional level of nesting -module M2 { - export module M3 { +namespace M2 { + export namespace M3 { export interface A { foo: string; } @@ -37,8 +37,8 @@ module M2 { } } -module M2 { - export module M3 { +namespace M2 { + export namespace M3 { export interface A { bar: number; } diff --git a/tests/baselines/reference/mergeTwoInterfaces2.symbols b/tests/baselines/reference/mergeTwoInterfaces2.symbols index a664902bd20c6..a65a57b19fdee 100644 --- a/tests/baselines/reference/mergeTwoInterfaces2.symbols +++ b/tests/baselines/reference/mergeTwoInterfaces2.symbols @@ -4,11 +4,11 @@ // two interfaces with the same root module should merge // root module now multiple module declarations -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(mergeTwoInterfaces2.ts, 0, 0), Decl(mergeTwoInterfaces2.ts, 11, 1), Decl(mergeTwoInterfaces2.ts, 21, 1), Decl(mergeTwoInterfaces2.ts, 34, 1)) export interface A { ->A : Symbol(A, Decl(mergeTwoInterfaces2.ts, 3, 11), Decl(mergeTwoInterfaces2.ts, 13, 11)) +>A : Symbol(A, Decl(mergeTwoInterfaces2.ts, 3, 14), Decl(mergeTwoInterfaces2.ts, 13, 14)) foo: string; >foo : Symbol(A.foo, Decl(mergeTwoInterfaces2.ts, 4, 24)) @@ -16,7 +16,7 @@ module M2 { var a: A; >a : Symbol(a, Decl(mergeTwoInterfaces2.ts, 8, 7)) ->A : Symbol(A, Decl(mergeTwoInterfaces2.ts, 3, 11), Decl(mergeTwoInterfaces2.ts, 13, 11)) +>A : Symbol(A, Decl(mergeTwoInterfaces2.ts, 3, 14), Decl(mergeTwoInterfaces2.ts, 13, 14)) var r1 = a.foo >r1 : Symbol(r1, Decl(mergeTwoInterfaces2.ts, 9, 7)) @@ -31,11 +31,11 @@ module M2 { >bar : Symbol(A.bar, Decl(mergeTwoInterfaces2.ts, 14, 24)) } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(mergeTwoInterfaces2.ts, 0, 0), Decl(mergeTwoInterfaces2.ts, 11, 1), Decl(mergeTwoInterfaces2.ts, 21, 1), Decl(mergeTwoInterfaces2.ts, 34, 1)) export interface A { ->A : Symbol(A, Decl(mergeTwoInterfaces2.ts, 3, 11), Decl(mergeTwoInterfaces2.ts, 13, 11)) +>A : Symbol(A, Decl(mergeTwoInterfaces2.ts, 3, 14), Decl(mergeTwoInterfaces2.ts, 13, 14)) bar: number; >bar : Symbol(A.bar, Decl(mergeTwoInterfaces2.ts, 14, 24)) @@ -43,7 +43,7 @@ module M2 { var a: A; >a : Symbol(a, Decl(mergeTwoInterfaces2.ts, 18, 7)) ->A : Symbol(A, Decl(mergeTwoInterfaces2.ts, 3, 11), Decl(mergeTwoInterfaces2.ts, 13, 11)) +>A : Symbol(A, Decl(mergeTwoInterfaces2.ts, 3, 14), Decl(mergeTwoInterfaces2.ts, 13, 14)) var r1 = a.foo >r1 : Symbol(r1, Decl(mergeTwoInterfaces2.ts, 19, 7)) @@ -59,14 +59,14 @@ module M2 { } // same as above but with an additional level of nesting -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(mergeTwoInterfaces2.ts, 0, 0), Decl(mergeTwoInterfaces2.ts, 11, 1), Decl(mergeTwoInterfaces2.ts, 21, 1), Decl(mergeTwoInterfaces2.ts, 34, 1)) - export module M3 { ->M3 : Symbol(M3, Decl(mergeTwoInterfaces2.ts, 24, 11), Decl(mergeTwoInterfaces2.ts, 36, 11)) + export namespace M3 { +>M3 : Symbol(M3, Decl(mergeTwoInterfaces2.ts, 24, 14), Decl(mergeTwoInterfaces2.ts, 36, 14)) export interface A { ->A : Symbol(A, Decl(mergeTwoInterfaces2.ts, 25, 22), Decl(mergeTwoInterfaces2.ts, 37, 22)) +>A : Symbol(A, Decl(mergeTwoInterfaces2.ts, 25, 25), Decl(mergeTwoInterfaces2.ts, 37, 25)) foo: string; >foo : Symbol(A.foo, Decl(mergeTwoInterfaces2.ts, 26, 28)) @@ -74,7 +74,7 @@ module M2 { var a: A; >a : Symbol(a, Decl(mergeTwoInterfaces2.ts, 30, 11)) ->A : Symbol(A, Decl(mergeTwoInterfaces2.ts, 25, 22), Decl(mergeTwoInterfaces2.ts, 37, 22)) +>A : Symbol(A, Decl(mergeTwoInterfaces2.ts, 25, 25), Decl(mergeTwoInterfaces2.ts, 37, 25)) var r1 = a.foo >r1 : Symbol(r1, Decl(mergeTwoInterfaces2.ts, 31, 11)) @@ -90,14 +90,14 @@ module M2 { } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(mergeTwoInterfaces2.ts, 0, 0), Decl(mergeTwoInterfaces2.ts, 11, 1), Decl(mergeTwoInterfaces2.ts, 21, 1), Decl(mergeTwoInterfaces2.ts, 34, 1)) - export module M3 { ->M3 : Symbol(M3, Decl(mergeTwoInterfaces2.ts, 24, 11), Decl(mergeTwoInterfaces2.ts, 36, 11)) + export namespace M3 { +>M3 : Symbol(M3, Decl(mergeTwoInterfaces2.ts, 24, 14), Decl(mergeTwoInterfaces2.ts, 36, 14)) export interface A { ->A : Symbol(A, Decl(mergeTwoInterfaces2.ts, 25, 22), Decl(mergeTwoInterfaces2.ts, 37, 22)) +>A : Symbol(A, Decl(mergeTwoInterfaces2.ts, 25, 25), Decl(mergeTwoInterfaces2.ts, 37, 25)) bar: number; >bar : Symbol(A.bar, Decl(mergeTwoInterfaces2.ts, 38, 28)) @@ -105,7 +105,7 @@ module M2 { var a: A; >a : Symbol(a, Decl(mergeTwoInterfaces2.ts, 42, 11)) ->A : Symbol(A, Decl(mergeTwoInterfaces2.ts, 25, 22), Decl(mergeTwoInterfaces2.ts, 37, 22)) +>A : Symbol(A, Decl(mergeTwoInterfaces2.ts, 25, 25), Decl(mergeTwoInterfaces2.ts, 37, 25)) var r1 = a.foo >r1 : Symbol(r1, Decl(mergeTwoInterfaces2.ts, 43, 11)) diff --git a/tests/baselines/reference/mergeTwoInterfaces2.types b/tests/baselines/reference/mergeTwoInterfaces2.types index 14dac52fa5ff5..8e8c2a172947b 100644 --- a/tests/baselines/reference/mergeTwoInterfaces2.types +++ b/tests/baselines/reference/mergeTwoInterfaces2.types @@ -4,7 +4,7 @@ // two interfaces with the same root module should merge // root module now multiple module declarations -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ @@ -39,7 +39,7 @@ module M2 { > : ^^^^^^ } -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ @@ -75,11 +75,11 @@ module M2 { } // same as above but with an additional level of nesting -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ - export module M3 { + export namespace M3 { >M3 : typeof M3 > : ^^^^^^^^^ @@ -115,11 +115,11 @@ module M2 { } } -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ - export module M3 { + export namespace M3 { >M3 : typeof M3 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/mergedDeclarations1.js b/tests/baselines/reference/mergedDeclarations1.js index 78cd2432fd98b..636778b19d11b 100644 --- a/tests/baselines/reference/mergedDeclarations1.js +++ b/tests/baselines/reference/mergedDeclarations1.js @@ -8,7 +8,7 @@ interface Point { function point(x: number, y: number): Point { return { x: x, y: y }; } -module point { +namespace point { export var origin = point(0, 0); export function equals(p1: Point, p2: Point) { return p1.x == p2.x && p1.y == p2.y; diff --git a/tests/baselines/reference/mergedDeclarations1.symbols b/tests/baselines/reference/mergedDeclarations1.symbols index 2baa708bc5cf5..3e1a28e930c7e 100644 --- a/tests/baselines/reference/mergedDeclarations1.symbols +++ b/tests/baselines/reference/mergedDeclarations1.symbols @@ -22,7 +22,7 @@ function point(x: number, y: number): Point { >y : Symbol(y, Decl(mergedDeclarations1.ts, 5, 18)) >y : Symbol(y, Decl(mergedDeclarations1.ts, 4, 25)) } -module point { +namespace point { >point : Symbol(point, Decl(mergedDeclarations1.ts, 3, 1), Decl(mergedDeclarations1.ts, 6, 1)) export var origin = point(0, 0); diff --git a/tests/baselines/reference/mergedDeclarations1.types b/tests/baselines/reference/mergedDeclarations1.types index 84cc31991cc6d..9c8de079f3b4d 100644 --- a/tests/baselines/reference/mergedDeclarations1.types +++ b/tests/baselines/reference/mergedDeclarations1.types @@ -30,7 +30,7 @@ function point(x: number, y: number): Point { >y : number > : ^^^^^^ } -module point { +namespace point { >point : typeof point > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/mergedDeclarations2.errors.txt b/tests/baselines/reference/mergedDeclarations2.errors.txt index d7b6912c9426c..4a693cfd34a9f 100644 --- a/tests/baselines/reference/mergedDeclarations2.errors.txt +++ b/tests/baselines/reference/mergedDeclarations2.errors.txt @@ -9,7 +9,7 @@ mergedDeclarations2.ts(9,20): error TS2304: Cannot find name 'b'. a = b } - module Foo { + namespace Foo { export var x = b ~ !!! error TS2304: Cannot find name 'b'. diff --git a/tests/baselines/reference/mergedDeclarations2.js b/tests/baselines/reference/mergedDeclarations2.js index b12581beed202..12414e62d4b1c 100644 --- a/tests/baselines/reference/mergedDeclarations2.js +++ b/tests/baselines/reference/mergedDeclarations2.js @@ -8,7 +8,7 @@ enum Foo { a = b } -module Foo { +namespace Foo { export var x = b } diff --git a/tests/baselines/reference/mergedDeclarations2.symbols b/tests/baselines/reference/mergedDeclarations2.symbols index 9c2f56838a51e..2e81c317b830b 100644 --- a/tests/baselines/reference/mergedDeclarations2.symbols +++ b/tests/baselines/reference/mergedDeclarations2.symbols @@ -15,7 +15,7 @@ enum Foo { >b : Symbol(Foo.b, Decl(mergedDeclarations2.ts, 0, 10)) } -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(mergedDeclarations2.ts, 0, 0), Decl(mergedDeclarations2.ts, 2, 1), Decl(mergedDeclarations2.ts, 5, 1)) export var x = b diff --git a/tests/baselines/reference/mergedDeclarations2.types b/tests/baselines/reference/mergedDeclarations2.types index c4feff20c96b1..35fcc1086f920 100644 --- a/tests/baselines/reference/mergedDeclarations2.types +++ b/tests/baselines/reference/mergedDeclarations2.types @@ -20,7 +20,7 @@ enum Foo { > : ^^^ } -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/mergedDeclarations3.errors.txt b/tests/baselines/reference/mergedDeclarations3.errors.txt index 099768868618f..b92505ce2161f 100644 --- a/tests/baselines/reference/mergedDeclarations3.errors.txt +++ b/tests/baselines/reference/mergedDeclarations3.errors.txt @@ -3,37 +3,37 @@ mergedDeclarations3.ts(39,7): error TS2339: Property 'z' does not exist on type ==== mergedDeclarations3.ts (2 errors) ==== - module M { + namespace M { export enum Color { Red, Green } } - module M { - export module Color { + namespace M { + export namespace Color { export var Blue = 4; } } var p = M.Color.Blue; // ok - module M { + namespace M { export function foo() { } } - module M { - module foo { + namespace M { + namespace foo { export var x = 1; } } - module M { - export module foo { + namespace M { + export namespace foo { export var y = 2 } } - module M { - module foo { + namespace M { + namespace foo { export var z = 1; } } diff --git a/tests/baselines/reference/mergedDeclarations3.js b/tests/baselines/reference/mergedDeclarations3.js index be8fe3cc2ee82..9f76baa4ff10f 100644 --- a/tests/baselines/reference/mergedDeclarations3.js +++ b/tests/baselines/reference/mergedDeclarations3.js @@ -1,37 +1,37 @@ //// [tests/cases/compiler/mergedDeclarations3.ts] //// //// [mergedDeclarations3.ts] -module M { +namespace M { export enum Color { Red, Green } } -module M { - export module Color { +namespace M { + export namespace Color { export var Blue = 4; } } var p = M.Color.Blue; // ok -module M { +namespace M { export function foo() { } } -module M { - module foo { +namespace M { + namespace foo { export var x = 1; } } -module M { - export module foo { +namespace M { + export namespace foo { export var y = 2 } } -module M { - module foo { +namespace M { + namespace foo { export var z = 1; } } diff --git a/tests/baselines/reference/mergedDeclarations3.symbols b/tests/baselines/reference/mergedDeclarations3.symbols index 438e40fd6cb4a..e1f57ece02b12 100644 --- a/tests/baselines/reference/mergedDeclarations3.symbols +++ b/tests/baselines/reference/mergedDeclarations3.symbols @@ -1,22 +1,22 @@ //// [tests/cases/compiler/mergedDeclarations3.ts] //// === mergedDeclarations3.ts === -module M { +namespace M { >M : Symbol(M, Decl(mergedDeclarations3.ts, 0, 0), Decl(mergedDeclarations3.ts, 4, 1), Decl(mergedDeclarations3.ts, 10, 21), Decl(mergedDeclarations3.ts, 15, 1), Decl(mergedDeclarations3.ts, 21, 1) ... and 1 more) export enum Color { ->Color : Symbol(Color, Decl(mergedDeclarations3.ts, 0, 10), Decl(mergedDeclarations3.ts, 5, 10)) +>Color : Symbol(Color, Decl(mergedDeclarations3.ts, 0, 13), Decl(mergedDeclarations3.ts, 5, 13)) Red, Green >Red : Symbol(Color.Red, Decl(mergedDeclarations3.ts, 1, 20)) >Green : Symbol(Color.Green, Decl(mergedDeclarations3.ts, 2, 7)) } } -module M { +namespace M { >M : Symbol(M, Decl(mergedDeclarations3.ts, 0, 0), Decl(mergedDeclarations3.ts, 4, 1), Decl(mergedDeclarations3.ts, 10, 21), Decl(mergedDeclarations3.ts, 15, 1), Decl(mergedDeclarations3.ts, 21, 1) ... and 1 more) - export module Color { ->Color : Symbol(Color, Decl(mergedDeclarations3.ts, 0, 10), Decl(mergedDeclarations3.ts, 5, 10)) + export namespace Color { +>Color : Symbol(Color, Decl(mergedDeclarations3.ts, 0, 13), Decl(mergedDeclarations3.ts, 5, 13)) export var Blue = 4; >Blue : Symbol(Blue, Decl(mergedDeclarations3.ts, 7, 13)) @@ -25,46 +25,46 @@ module M { var p = M.Color.Blue; // ok >p : Symbol(p, Decl(mergedDeclarations3.ts, 10, 3)) >M.Color.Blue : Symbol(M.Color.Blue, Decl(mergedDeclarations3.ts, 7, 13)) ->M.Color : Symbol(M.Color, Decl(mergedDeclarations3.ts, 0, 10), Decl(mergedDeclarations3.ts, 5, 10)) +>M.Color : Symbol(M.Color, Decl(mergedDeclarations3.ts, 0, 13), Decl(mergedDeclarations3.ts, 5, 13)) >M : Symbol(M, Decl(mergedDeclarations3.ts, 0, 0), Decl(mergedDeclarations3.ts, 4, 1), Decl(mergedDeclarations3.ts, 10, 21), Decl(mergedDeclarations3.ts, 15, 1), Decl(mergedDeclarations3.ts, 21, 1) ... and 1 more) ->Color : Symbol(M.Color, Decl(mergedDeclarations3.ts, 0, 10), Decl(mergedDeclarations3.ts, 5, 10)) +>Color : Symbol(M.Color, Decl(mergedDeclarations3.ts, 0, 13), Decl(mergedDeclarations3.ts, 5, 13)) >Blue : Symbol(M.Color.Blue, Decl(mergedDeclarations3.ts, 7, 13)) -module M { +namespace M { >M : Symbol(M, Decl(mergedDeclarations3.ts, 0, 0), Decl(mergedDeclarations3.ts, 4, 1), Decl(mergedDeclarations3.ts, 10, 21), Decl(mergedDeclarations3.ts, 15, 1), Decl(mergedDeclarations3.ts, 21, 1) ... and 1 more) export function foo() { ->foo : Symbol(foo, Decl(mergedDeclarations3.ts, 12, 10), Decl(mergedDeclarations3.ts, 23, 10)) +>foo : Symbol(foo, Decl(mergedDeclarations3.ts, 12, 13), Decl(mergedDeclarations3.ts, 23, 13)) } } -module M { +namespace M { >M : Symbol(M, Decl(mergedDeclarations3.ts, 0, 0), Decl(mergedDeclarations3.ts, 4, 1), Decl(mergedDeclarations3.ts, 10, 21), Decl(mergedDeclarations3.ts, 15, 1), Decl(mergedDeclarations3.ts, 21, 1) ... and 1 more) - module foo { ->foo : Symbol(foo, Decl(mergedDeclarations3.ts, 17, 10)) + namespace foo { +>foo : Symbol(foo, Decl(mergedDeclarations3.ts, 17, 13)) export var x = 1; >x : Symbol(x, Decl(mergedDeclarations3.ts, 19, 18)) } } -module M { +namespace M { >M : Symbol(M, Decl(mergedDeclarations3.ts, 0, 0), Decl(mergedDeclarations3.ts, 4, 1), Decl(mergedDeclarations3.ts, 10, 21), Decl(mergedDeclarations3.ts, 15, 1), Decl(mergedDeclarations3.ts, 21, 1) ... and 1 more) - export module foo { ->foo : Symbol(foo, Decl(mergedDeclarations3.ts, 12, 10), Decl(mergedDeclarations3.ts, 23, 10)) + export namespace foo { +>foo : Symbol(foo, Decl(mergedDeclarations3.ts, 12, 13), Decl(mergedDeclarations3.ts, 23, 13)) export var y = 2 >y : Symbol(y, Decl(mergedDeclarations3.ts, 25, 18)) } } -module M { +namespace M { >M : Symbol(M, Decl(mergedDeclarations3.ts, 0, 0), Decl(mergedDeclarations3.ts, 4, 1), Decl(mergedDeclarations3.ts, 10, 21), Decl(mergedDeclarations3.ts, 15, 1), Decl(mergedDeclarations3.ts, 21, 1) ... and 1 more) - module foo { ->foo : Symbol(foo, Decl(mergedDeclarations3.ts, 29, 10)) + namespace foo { +>foo : Symbol(foo, Decl(mergedDeclarations3.ts, 29, 13)) export var z = 1; >z : Symbol(z, Decl(mergedDeclarations3.ts, 31, 18)) @@ -72,24 +72,24 @@ module M { } M.foo() // ok ->M.foo : Symbol(M.foo, Decl(mergedDeclarations3.ts, 12, 10), Decl(mergedDeclarations3.ts, 23, 10)) +>M.foo : Symbol(M.foo, Decl(mergedDeclarations3.ts, 12, 13), Decl(mergedDeclarations3.ts, 23, 13)) >M : Symbol(M, Decl(mergedDeclarations3.ts, 0, 0), Decl(mergedDeclarations3.ts, 4, 1), Decl(mergedDeclarations3.ts, 10, 21), Decl(mergedDeclarations3.ts, 15, 1), Decl(mergedDeclarations3.ts, 21, 1) ... and 1 more) ->foo : Symbol(M.foo, Decl(mergedDeclarations3.ts, 12, 10), Decl(mergedDeclarations3.ts, 23, 10)) +>foo : Symbol(M.foo, Decl(mergedDeclarations3.ts, 12, 13), Decl(mergedDeclarations3.ts, 23, 13)) M.foo.x // error ->M.foo : Symbol(M.foo, Decl(mergedDeclarations3.ts, 12, 10), Decl(mergedDeclarations3.ts, 23, 10)) +>M.foo : Symbol(M.foo, Decl(mergedDeclarations3.ts, 12, 13), Decl(mergedDeclarations3.ts, 23, 13)) >M : Symbol(M, Decl(mergedDeclarations3.ts, 0, 0), Decl(mergedDeclarations3.ts, 4, 1), Decl(mergedDeclarations3.ts, 10, 21), Decl(mergedDeclarations3.ts, 15, 1), Decl(mergedDeclarations3.ts, 21, 1) ... and 1 more) ->foo : Symbol(M.foo, Decl(mergedDeclarations3.ts, 12, 10), Decl(mergedDeclarations3.ts, 23, 10)) +>foo : Symbol(M.foo, Decl(mergedDeclarations3.ts, 12, 13), Decl(mergedDeclarations3.ts, 23, 13)) M.foo.y // ok >M.foo.y : Symbol(M.foo.y, Decl(mergedDeclarations3.ts, 25, 18)) ->M.foo : Symbol(M.foo, Decl(mergedDeclarations3.ts, 12, 10), Decl(mergedDeclarations3.ts, 23, 10)) +>M.foo : Symbol(M.foo, Decl(mergedDeclarations3.ts, 12, 13), Decl(mergedDeclarations3.ts, 23, 13)) >M : Symbol(M, Decl(mergedDeclarations3.ts, 0, 0), Decl(mergedDeclarations3.ts, 4, 1), Decl(mergedDeclarations3.ts, 10, 21), Decl(mergedDeclarations3.ts, 15, 1), Decl(mergedDeclarations3.ts, 21, 1) ... and 1 more) ->foo : Symbol(M.foo, Decl(mergedDeclarations3.ts, 12, 10), Decl(mergedDeclarations3.ts, 23, 10)) +>foo : Symbol(M.foo, Decl(mergedDeclarations3.ts, 12, 13), Decl(mergedDeclarations3.ts, 23, 13)) >y : Symbol(M.foo.y, Decl(mergedDeclarations3.ts, 25, 18)) M.foo.z // error ->M.foo : Symbol(M.foo, Decl(mergedDeclarations3.ts, 12, 10), Decl(mergedDeclarations3.ts, 23, 10)) +>M.foo : Symbol(M.foo, Decl(mergedDeclarations3.ts, 12, 13), Decl(mergedDeclarations3.ts, 23, 13)) >M : Symbol(M, Decl(mergedDeclarations3.ts, 0, 0), Decl(mergedDeclarations3.ts, 4, 1), Decl(mergedDeclarations3.ts, 10, 21), Decl(mergedDeclarations3.ts, 15, 1), Decl(mergedDeclarations3.ts, 21, 1) ... and 1 more) ->foo : Symbol(M.foo, Decl(mergedDeclarations3.ts, 12, 10), Decl(mergedDeclarations3.ts, 23, 10)) +>foo : Symbol(M.foo, Decl(mergedDeclarations3.ts, 12, 13), Decl(mergedDeclarations3.ts, 23, 13)) diff --git a/tests/baselines/reference/mergedDeclarations3.types b/tests/baselines/reference/mergedDeclarations3.types index 44e7ebf994bbe..0a2d0791205a6 100644 --- a/tests/baselines/reference/mergedDeclarations3.types +++ b/tests/baselines/reference/mergedDeclarations3.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/mergedDeclarations3.ts] //// === mergedDeclarations3.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -16,11 +16,11 @@ module M { > : ^^^^^^^^^^^ } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ - export module Color { + export namespace Color { >Color : typeof Color > : ^^^^^^^^^^^^ @@ -45,7 +45,7 @@ var p = M.Color.Blue; // ok >Blue : number > : ^^^^^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -55,11 +55,11 @@ module M { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ - module foo { + namespace foo { >foo : typeof foo > : ^^^^^^^^^^ @@ -71,11 +71,11 @@ module M { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ - export module foo { + export namespace foo { >foo : typeof foo > : ^^^^^^^^^^ @@ -87,11 +87,11 @@ module M { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ - module foo { + namespace foo { >foo : typeof foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/mergedDeclarations4.js b/tests/baselines/reference/mergedDeclarations4.js index 5841e8778fd96..4124abdb72655 100644 --- a/tests/baselines/reference/mergedDeclarations4.js +++ b/tests/baselines/reference/mergedDeclarations4.js @@ -1,15 +1,15 @@ //// [tests/cases/compiler/mergedDeclarations4.ts] //// //// [mergedDeclarations4.ts] -module M { +namespace M { export function f() { } f(); M.f(); var r = f.hello; } -module M { - export module f { +namespace M { + export namespace f { export var hello = 1; } f(); diff --git a/tests/baselines/reference/mergedDeclarations4.symbols b/tests/baselines/reference/mergedDeclarations4.symbols index d4b3f912450b7..1d82a8306ff0e 100644 --- a/tests/baselines/reference/mergedDeclarations4.symbols +++ b/tests/baselines/reference/mergedDeclarations4.symbols @@ -1,60 +1,60 @@ //// [tests/cases/compiler/mergedDeclarations4.ts] //// === mergedDeclarations4.ts === -module M { +namespace M { >M : Symbol(M, Decl(mergedDeclarations4.ts, 0, 0), Decl(mergedDeclarations4.ts, 5, 1)) export function f() { } ->f : Symbol(f, Decl(mergedDeclarations4.ts, 0, 10), Decl(mergedDeclarations4.ts, 7, 10)) +>f : Symbol(f, Decl(mergedDeclarations4.ts, 0, 13), Decl(mergedDeclarations4.ts, 7, 13)) f(); ->f : Symbol(f, Decl(mergedDeclarations4.ts, 0, 10), Decl(mergedDeclarations4.ts, 7, 10)) +>f : Symbol(f, Decl(mergedDeclarations4.ts, 0, 13), Decl(mergedDeclarations4.ts, 7, 13)) M.f(); ->M.f : Symbol(f, Decl(mergedDeclarations4.ts, 0, 10), Decl(mergedDeclarations4.ts, 7, 10)) +>M.f : Symbol(f, Decl(mergedDeclarations4.ts, 0, 13), Decl(mergedDeclarations4.ts, 7, 13)) >M : Symbol(M, Decl(mergedDeclarations4.ts, 0, 0), Decl(mergedDeclarations4.ts, 5, 1)) ->f : Symbol(f, Decl(mergedDeclarations4.ts, 0, 10), Decl(mergedDeclarations4.ts, 7, 10)) +>f : Symbol(f, Decl(mergedDeclarations4.ts, 0, 13), Decl(mergedDeclarations4.ts, 7, 13)) var r = f.hello; >r : Symbol(r, Decl(mergedDeclarations4.ts, 4, 7)) >f.hello : Symbol(f.hello, Decl(mergedDeclarations4.ts, 9, 18)) ->f : Symbol(f, Decl(mergedDeclarations4.ts, 0, 10), Decl(mergedDeclarations4.ts, 7, 10)) +>f : Symbol(f, Decl(mergedDeclarations4.ts, 0, 13), Decl(mergedDeclarations4.ts, 7, 13)) >hello : Symbol(f.hello, Decl(mergedDeclarations4.ts, 9, 18)) } -module M { +namespace M { >M : Symbol(M, Decl(mergedDeclarations4.ts, 0, 0), Decl(mergedDeclarations4.ts, 5, 1)) - export module f { ->f : Symbol(f, Decl(mergedDeclarations4.ts, 0, 10), Decl(mergedDeclarations4.ts, 7, 10)) + export namespace f { +>f : Symbol(f, Decl(mergedDeclarations4.ts, 0, 13), Decl(mergedDeclarations4.ts, 7, 13)) export var hello = 1; >hello : Symbol(hello, Decl(mergedDeclarations4.ts, 9, 18)) } f(); ->f : Symbol(f, Decl(mergedDeclarations4.ts, 0, 10), Decl(mergedDeclarations4.ts, 7, 10)) +>f : Symbol(f, Decl(mergedDeclarations4.ts, 0, 13), Decl(mergedDeclarations4.ts, 7, 13)) M.f(); ->M.f : Symbol(f, Decl(mergedDeclarations4.ts, 0, 10), Decl(mergedDeclarations4.ts, 7, 10)) +>M.f : Symbol(f, Decl(mergedDeclarations4.ts, 0, 13), Decl(mergedDeclarations4.ts, 7, 13)) >M : Symbol(M, Decl(mergedDeclarations4.ts, 0, 0), Decl(mergedDeclarations4.ts, 5, 1)) ->f : Symbol(f, Decl(mergedDeclarations4.ts, 0, 10), Decl(mergedDeclarations4.ts, 7, 10)) +>f : Symbol(f, Decl(mergedDeclarations4.ts, 0, 13), Decl(mergedDeclarations4.ts, 7, 13)) var r = f.hello; >r : Symbol(r, Decl(mergedDeclarations4.ts, 13, 7)) >f.hello : Symbol(f.hello, Decl(mergedDeclarations4.ts, 9, 18)) ->f : Symbol(f, Decl(mergedDeclarations4.ts, 0, 10), Decl(mergedDeclarations4.ts, 7, 10)) +>f : Symbol(f, Decl(mergedDeclarations4.ts, 0, 13), Decl(mergedDeclarations4.ts, 7, 13)) >hello : Symbol(f.hello, Decl(mergedDeclarations4.ts, 9, 18)) } M.f(); ->M.f : Symbol(M.f, Decl(mergedDeclarations4.ts, 0, 10), Decl(mergedDeclarations4.ts, 7, 10)) +>M.f : Symbol(M.f, Decl(mergedDeclarations4.ts, 0, 13), Decl(mergedDeclarations4.ts, 7, 13)) >M : Symbol(M, Decl(mergedDeclarations4.ts, 0, 0), Decl(mergedDeclarations4.ts, 5, 1)) ->f : Symbol(M.f, Decl(mergedDeclarations4.ts, 0, 10), Decl(mergedDeclarations4.ts, 7, 10)) +>f : Symbol(M.f, Decl(mergedDeclarations4.ts, 0, 13), Decl(mergedDeclarations4.ts, 7, 13)) M.f.hello; >M.f.hello : Symbol(M.f.hello, Decl(mergedDeclarations4.ts, 9, 18)) ->M.f : Symbol(M.f, Decl(mergedDeclarations4.ts, 0, 10), Decl(mergedDeclarations4.ts, 7, 10)) +>M.f : Symbol(M.f, Decl(mergedDeclarations4.ts, 0, 13), Decl(mergedDeclarations4.ts, 7, 13)) >M : Symbol(M, Decl(mergedDeclarations4.ts, 0, 0), Decl(mergedDeclarations4.ts, 5, 1)) ->f : Symbol(M.f, Decl(mergedDeclarations4.ts, 0, 10), Decl(mergedDeclarations4.ts, 7, 10)) +>f : Symbol(M.f, Decl(mergedDeclarations4.ts, 0, 13), Decl(mergedDeclarations4.ts, 7, 13)) >hello : Symbol(M.f.hello, Decl(mergedDeclarations4.ts, 9, 18)) diff --git a/tests/baselines/reference/mergedDeclarations4.types b/tests/baselines/reference/mergedDeclarations4.types index 553d7d57ff16a..8dba605155567 100644 --- a/tests/baselines/reference/mergedDeclarations4.types +++ b/tests/baselines/reference/mergedDeclarations4.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/mergedDeclarations4.ts] //// === mergedDeclarations4.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -36,11 +36,11 @@ module M { > : ^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ - export module f { + export namespace f { >f : typeof f > : ^^^^^^^^ diff --git a/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.errors.txt b/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.errors.txt index 4d94b9ee13242..7e7b68ffedd30 100644 --- a/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.errors.txt +++ b/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.errors.txt @@ -15,7 +15,7 @@ mergedInterfacesWithConflictingPropertyNames.ts(39,9): error TS2717: Subsequent !!! related TS6203 mergedInterfacesWithConflictingPropertyNames.ts:2:5: 'x' was also declared here. } - module M { + namespace M { interface A { x: T; } @@ -28,25 +28,25 @@ mergedInterfacesWithConflictingPropertyNames.ts(39,9): error TS2717: Subsequent } } - module M2 { + namespace M2 { interface A { x: T; } } - module M2 { + namespace M2 { interface A { x: number; // ok, different declaration space than other M2 } } - module M3 { + namespace M3 { export interface A { x: T; } } - module M3 { + namespace M3 { export interface A { x: number; // error ~ diff --git a/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.js b/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.js index 8e0cc7296e0a5..bcee14e1e1937 100644 --- a/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.js +++ b/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.js @@ -9,7 +9,7 @@ interface A { x: number; } -module M { +namespace M { interface A { x: T; } @@ -19,25 +19,25 @@ module M { } } -module M2 { +namespace M2 { interface A { x: T; } } -module M2 { +namespace M2 { interface A { x: number; // ok, different declaration space than other M2 } } -module M3 { +namespace M3 { export interface A { x: T; } } -module M3 { +namespace M3 { export interface A { x: number; // error } diff --git a/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.symbols b/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.symbols index 41a2dc33229e3..6ad149da54f70 100644 --- a/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.symbols +++ b/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.symbols @@ -15,11 +15,11 @@ interface A { >x : Symbol(A.x, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 0, 13), Decl(mergedInterfacesWithConflictingPropertyNames.ts, 4, 13)) } -module M { +namespace M { >M : Symbol(M, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 6, 1)) interface A { ->A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 8, 10), Decl(mergedInterfacesWithConflictingPropertyNames.ts, 11, 5)) +>A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 8, 13), Decl(mergedInterfacesWithConflictingPropertyNames.ts, 11, 5)) >T : Symbol(T, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 9, 16), Decl(mergedInterfacesWithConflictingPropertyNames.ts, 13, 16)) x: T; @@ -28,7 +28,7 @@ module M { } interface A { ->A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 8, 10), Decl(mergedInterfacesWithConflictingPropertyNames.ts, 11, 5)) +>A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 8, 13), Decl(mergedInterfacesWithConflictingPropertyNames.ts, 11, 5)) >T : Symbol(T, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 9, 16), Decl(mergedInterfacesWithConflictingPropertyNames.ts, 13, 16)) x: number; // error @@ -36,11 +36,11 @@ module M { } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 16, 1), Decl(mergedInterfacesWithConflictingPropertyNames.ts, 22, 1)) interface A { ->A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 18, 11)) +>A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 18, 14)) >T : Symbol(T, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 19, 16)) x: T; @@ -49,11 +49,11 @@ module M2 { } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 16, 1), Decl(mergedInterfacesWithConflictingPropertyNames.ts, 22, 1)) interface A { ->A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 24, 11)) +>A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 24, 14)) >T : Symbol(T, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 25, 16)) x: number; // ok, different declaration space than other M2 @@ -61,11 +61,11 @@ module M2 { } } -module M3 { +namespace M3 { >M3 : Symbol(M3, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 28, 1), Decl(mergedInterfacesWithConflictingPropertyNames.ts, 34, 1)) export interface A { ->A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 30, 11), Decl(mergedInterfacesWithConflictingPropertyNames.ts, 36, 11)) +>A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 30, 14), Decl(mergedInterfacesWithConflictingPropertyNames.ts, 36, 14)) >T : Symbol(T, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 31, 23), Decl(mergedInterfacesWithConflictingPropertyNames.ts, 37, 23)) x: T; @@ -74,11 +74,11 @@ module M3 { } } -module M3 { +namespace M3 { >M3 : Symbol(M3, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 28, 1), Decl(mergedInterfacesWithConflictingPropertyNames.ts, 34, 1)) export interface A { ->A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 30, 11), Decl(mergedInterfacesWithConflictingPropertyNames.ts, 36, 11)) +>A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 30, 14), Decl(mergedInterfacesWithConflictingPropertyNames.ts, 36, 14)) >T : Symbol(T, Decl(mergedInterfacesWithConflictingPropertyNames.ts, 31, 23), Decl(mergedInterfacesWithConflictingPropertyNames.ts, 37, 23)) x: number; // error diff --git a/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.types b/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.types index 4d702183b3387..2cd9f334245ad 100644 --- a/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.types +++ b/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames.types @@ -13,7 +13,7 @@ interface A { > : ^^^^^^ } -module M { +namespace M { interface A { x: T; >x : T @@ -27,7 +27,7 @@ module M { } } -module M2 { +namespace M2 { interface A { x: T; >x : T @@ -35,7 +35,7 @@ module M2 { } } -module M2 { +namespace M2 { interface A { x: number; // ok, different declaration space than other M2 >x : number @@ -43,7 +43,7 @@ module M2 { } } -module M3 { +namespace M3 { export interface A { x: T; >x : T @@ -51,7 +51,7 @@ module M3 { } } -module M3 { +namespace M3 { export interface A { x: number; // error >x : T diff --git a/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames2.js b/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames2.js index e04d3271a260d..14ea95b88550a 100644 --- a/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames2.js +++ b/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames2.js @@ -9,7 +9,7 @@ interface A { x: string; // error } -module M { +namespace M { interface A { x: T; } @@ -19,25 +19,25 @@ module M { } } -module M2 { +namespace M2 { interface A { x: T; } } -module M2 { +namespace M2 { interface A { x: T; // ok, different declaration space than other M2 } } -module M3 { +namespace M3 { export interface A { x: T; } } -module M3 { +namespace M3 { export interface A { x: T; // error } diff --git a/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames2.symbols b/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames2.symbols index 7c15d56ec2492..6ad34eb144805 100644 --- a/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames2.symbols +++ b/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames2.symbols @@ -15,11 +15,11 @@ interface A { >x : Symbol(A.x, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 0, 13), Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 4, 13)) } -module M { +namespace M { >M : Symbol(M, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 6, 1)) interface A { ->A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 8, 10), Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 11, 5)) +>A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 8, 13), Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 11, 5)) >T : Symbol(T, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 9, 16), Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 13, 16)) x: T; @@ -28,7 +28,7 @@ module M { } interface A { ->A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 8, 10), Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 11, 5)) +>A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 8, 13), Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 11, 5)) >T : Symbol(T, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 9, 16), Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 13, 16)) x: T; // error @@ -37,11 +37,11 @@ module M { } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 16, 1), Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 22, 1)) interface A { ->A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 18, 11)) +>A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 18, 14)) >T : Symbol(T, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 19, 16)) x: T; @@ -50,11 +50,11 @@ module M2 { } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 16, 1), Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 22, 1)) interface A { ->A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 24, 11)) +>A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 24, 14)) >T : Symbol(T, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 25, 16)) x: T; // ok, different declaration space than other M2 @@ -63,11 +63,11 @@ module M2 { } } -module M3 { +namespace M3 { >M3 : Symbol(M3, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 28, 1), Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 34, 1)) export interface A { ->A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 30, 11), Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 36, 11)) +>A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 30, 14), Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 36, 14)) >T : Symbol(T, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 31, 23), Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 37, 23)) x: T; @@ -76,11 +76,11 @@ module M3 { } } -module M3 { +namespace M3 { >M3 : Symbol(M3, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 28, 1), Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 34, 1)) export interface A { ->A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 30, 11), Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 36, 11)) +>A : Symbol(A, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 30, 14), Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 36, 14)) >T : Symbol(T, Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 31, 23), Decl(mergedInterfacesWithConflictingPropertyNames2.ts, 37, 23)) x: T; // error diff --git a/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames2.types b/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames2.types index 1d3962dc7684c..50255ca5daf7c 100644 --- a/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames2.types +++ b/tests/baselines/reference/mergedInterfacesWithConflictingPropertyNames2.types @@ -13,7 +13,7 @@ interface A { > : ^^^^^^ } -module M { +namespace M { interface A { x: T; >x : T @@ -27,7 +27,7 @@ module M { } } -module M2 { +namespace M2 { interface A { x: T; >x : T @@ -35,7 +35,7 @@ module M2 { } } -module M2 { +namespace M2 { interface A { x: T; // ok, different declaration space than other M2 >x : T @@ -43,7 +43,7 @@ module M2 { } } -module M3 { +namespace M3 { export interface A { x: T; >x : T @@ -51,7 +51,7 @@ module M3 { } } -module M3 { +namespace M3 { export interface A { x: T; // error >x : T diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.errors.txt b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.errors.txt index 00f383b07b34c..c25b9abb5d8e2 100644 --- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.errors.txt +++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.errors.txt @@ -29,7 +29,7 @@ mergedInterfacesWithInheritedPrivates3.ts(31,15): error TS2320: Interface 'A' ca z: string; } - module M { + namespace M { class C { private x: string; } diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js index d3c56d1900f97..18316b702f6e3 100644 --- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js +++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js @@ -22,7 +22,7 @@ class D extends C implements A { // error z: string; } -module M { +namespace M { class C { private x: string; } diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.symbols b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.symbols index 18be2e81bdc6e..86d0ee5a29247 100644 --- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.symbols +++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.symbols @@ -43,11 +43,11 @@ class D extends C implements A { // error >z : Symbol(D.z, Decl(mergedInterfacesWithInheritedPrivates3.ts, 17, 14)) } -module M { +namespace M { >M : Symbol(M, Decl(mergedInterfacesWithInheritedPrivates3.ts, 19, 1)) class C { ->C : Symbol(C, Decl(mergedInterfacesWithInheritedPrivates3.ts, 21, 10)) +>C : Symbol(C, Decl(mergedInterfacesWithInheritedPrivates3.ts, 21, 13)) private x: string; >x : Symbol(C.x, Decl(mergedInterfacesWithInheritedPrivates3.ts, 22, 13)) @@ -62,7 +62,7 @@ module M { interface A extends C { // error, privates conflict >A : Symbol(A, Decl(mergedInterfacesWithInheritedPrivates3.ts, 28, 5), Decl(mergedInterfacesWithInheritedPrivates3.ts, 32, 5)) ->C : Symbol(C, Decl(mergedInterfacesWithInheritedPrivates3.ts, 21, 10)) +>C : Symbol(C, Decl(mergedInterfacesWithInheritedPrivates3.ts, 21, 13)) y: string; >y : Symbol(A.y, Decl(mergedInterfacesWithInheritedPrivates3.ts, 30, 27)) diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.types b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.types index 529835c750e59..e577c0d7d21af 100644 --- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.types +++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.types @@ -46,7 +46,7 @@ class D extends C implements A { // error > : ^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases.js b/tests/baselines/reference/mergedInterfacesWithMultipleBases.js index 2974b263af7b4..36e1a8b51c63f 100644 --- a/tests/baselines/reference/mergedInterfacesWithMultipleBases.js +++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases.js @@ -31,7 +31,7 @@ var a: A; var r = a.a; // generic interfaces in a module -module M { +namespace M { class C { a: T; } diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases.symbols b/tests/baselines/reference/mergedInterfacesWithMultipleBases.symbols index fe23e8aedfe6c..49e2a83fdd22e 100644 --- a/tests/baselines/reference/mergedInterfacesWithMultipleBases.symbols +++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases.symbols @@ -62,11 +62,11 @@ var r = a.a; >a : Symbol(C.a, Decl(mergedInterfacesWithMultipleBases.ts, 3, 9)) // generic interfaces in a module -module M { +namespace M { >M : Symbol(M, Decl(mergedInterfacesWithMultipleBases.ts, 27, 12)) class C { ->C : Symbol(C, Decl(mergedInterfacesWithMultipleBases.ts, 30, 10)) +>C : Symbol(C, Decl(mergedInterfacesWithMultipleBases.ts, 30, 13)) >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases.ts, 31, 12)) a: T; @@ -86,7 +86,7 @@ module M { interface A extends C { >A : Symbol(A, Decl(mergedInterfacesWithMultipleBases.ts, 37, 5), Decl(mergedInterfacesWithMultipleBases.ts, 41, 5)) >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases.ts, 39, 16), Decl(mergedInterfacesWithMultipleBases.ts, 43, 16)) ->C : Symbol(C, Decl(mergedInterfacesWithMultipleBases.ts, 30, 10)) +>C : Symbol(C, Decl(mergedInterfacesWithMultipleBases.ts, 30, 13)) >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases.ts, 39, 16), Decl(mergedInterfacesWithMultipleBases.ts, 43, 16)) y: T; diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases.types b/tests/baselines/reference/mergedInterfacesWithMultipleBases.types index 18f23ccc7d951..34231d365d11f 100644 --- a/tests/baselines/reference/mergedInterfacesWithMultipleBases.types +++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases.types @@ -70,7 +70,7 @@ var r = a.a; > : ^^^^^^ // generic interfaces in a module -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases2.js b/tests/baselines/reference/mergedInterfacesWithMultipleBases2.js index 92e9aed5f0acc..b323211ac2a2e 100644 --- a/tests/baselines/reference/mergedInterfacesWithMultipleBases2.js +++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases2.js @@ -42,7 +42,7 @@ var a: A; var r = a.a; // generic interfaces in a module -module M { +namespace M { class C { a: T; } diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases2.symbols b/tests/baselines/reference/mergedInterfacesWithMultipleBases2.symbols index 82eb089778d3d..1b44e5e3a873a 100644 --- a/tests/baselines/reference/mergedInterfacesWithMultipleBases2.symbols +++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases2.symbols @@ -85,11 +85,11 @@ var r = a.a; >a : Symbol(C.a, Decl(mergedInterfacesWithMultipleBases2.ts, 3, 9)) // generic interfaces in a module -module M { +namespace M { >M : Symbol(M, Decl(mergedInterfacesWithMultipleBases2.ts, 38, 12)) class C { ->C : Symbol(C, Decl(mergedInterfacesWithMultipleBases2.ts, 41, 10)) +>C : Symbol(C, Decl(mergedInterfacesWithMultipleBases2.ts, 41, 13)) >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases2.ts, 42, 12)) a: T; @@ -127,7 +127,7 @@ module M { interface A extends C, C3 { >A : Symbol(A, Decl(mergedInterfacesWithMultipleBases2.ts, 56, 5), Decl(mergedInterfacesWithMultipleBases2.ts, 60, 5)) >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases2.ts, 58, 16), Decl(mergedInterfacesWithMultipleBases2.ts, 62, 16)) ->C : Symbol(C, Decl(mergedInterfacesWithMultipleBases2.ts, 41, 10)) +>C : Symbol(C, Decl(mergedInterfacesWithMultipleBases2.ts, 41, 13)) >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases2.ts, 58, 16), Decl(mergedInterfacesWithMultipleBases2.ts, 62, 16)) >C3 : Symbol(C3, Decl(mergedInterfacesWithMultipleBases2.ts, 48, 5)) >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases2.ts, 58, 16), Decl(mergedInterfacesWithMultipleBases2.ts, 62, 16)) diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases2.types b/tests/baselines/reference/mergedInterfacesWithMultipleBases2.types index a81a6c729b99e..5645c542a01d0 100644 --- a/tests/baselines/reference/mergedInterfacesWithMultipleBases2.types +++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases2.types @@ -97,7 +97,7 @@ var r = a.a; > : ^^^^^^ // generic interfaces in a module -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js index 715f1615bb12a..1567c46d048be 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/mergedModuleDeclarationCodeGen.ts] //// //// [mergedModuleDeclarationCodeGen.ts] -export module X { - export module Y { +export namespace X { + export namespace Y { class A { constructor(Y: any) { new B(); @@ -10,8 +10,8 @@ export module X { } } } -export module X { - export module Y { +export namespace X { + export namespace Y { export class B { } } diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.symbols b/tests/baselines/reference/mergedModuleDeclarationCodeGen.symbols index b1ab87cc563e4..a1320c82efa40 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen.symbols +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen.symbols @@ -1,32 +1,32 @@ //// [tests/cases/compiler/mergedModuleDeclarationCodeGen.ts] //// === mergedModuleDeclarationCodeGen.ts === -export module X { +export namespace X { >X : Symbol(X, Decl(mergedModuleDeclarationCodeGen.ts, 0, 0), Decl(mergedModuleDeclarationCodeGen.ts, 8, 1)) - export module Y { ->Y : Symbol(Y, Decl(mergedModuleDeclarationCodeGen.ts, 0, 17), Decl(mergedModuleDeclarationCodeGen.ts, 9, 17)) + export namespace Y { +>Y : Symbol(Y, Decl(mergedModuleDeclarationCodeGen.ts, 0, 20), Decl(mergedModuleDeclarationCodeGen.ts, 9, 20)) class A { ->A : Symbol(A, Decl(mergedModuleDeclarationCodeGen.ts, 1, 21)) +>A : Symbol(A, Decl(mergedModuleDeclarationCodeGen.ts, 1, 24)) constructor(Y: any) { >Y : Symbol(Y, Decl(mergedModuleDeclarationCodeGen.ts, 3, 24)) new B(); ->B : Symbol(B, Decl(mergedModuleDeclarationCodeGen.ts, 10, 21)) +>B : Symbol(B, Decl(mergedModuleDeclarationCodeGen.ts, 10, 24)) } } } } -export module X { +export namespace X { >X : Symbol(X, Decl(mergedModuleDeclarationCodeGen.ts, 0, 0), Decl(mergedModuleDeclarationCodeGen.ts, 8, 1)) - export module Y { ->Y : Symbol(Y, Decl(mergedModuleDeclarationCodeGen.ts, 0, 17), Decl(mergedModuleDeclarationCodeGen.ts, 9, 17)) + export namespace Y { +>Y : Symbol(Y, Decl(mergedModuleDeclarationCodeGen.ts, 0, 20), Decl(mergedModuleDeclarationCodeGen.ts, 9, 20)) export class B { ->B : Symbol(B, Decl(mergedModuleDeclarationCodeGen.ts, 10, 21)) +>B : Symbol(B, Decl(mergedModuleDeclarationCodeGen.ts, 10, 24)) } } } diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen.types index fcf9b2e57fe09..ad2c7d2c197b8 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen.types +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/mergedModuleDeclarationCodeGen.ts] //// === mergedModuleDeclarationCodeGen.ts === -export module X { +export namespace X { >X : typeof X > : ^^^^^^^^ - export module Y { + export namespace Y { >Y : typeof Y > : ^^^^^^^^ @@ -25,11 +25,11 @@ export module X { } } } -export module X { +export namespace X { >X : typeof X > : ^^^^^^^^ - export module Y { + export namespace Y { >Y : typeof Y > : ^^^^^^^^ diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen2.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen2.js index 23aec83a24cda..46732b37f0a25 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen2.js +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen2.js @@ -1,10 +1,10 @@ //// [tests/cases/compiler/mergedModuleDeclarationCodeGen2.ts] //// //// [mergedModuleDeclarationCodeGen2.ts] -module my.data.foo { +namespace my.data.foo { export function buz() { } } -module my.data { +namespace my.data { function data(my) { foo.buz(); } diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen2.symbols b/tests/baselines/reference/mergedModuleDeclarationCodeGen2.symbols index 32eaa370a52e1..a24d5667011fe 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen2.symbols +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen2.symbols @@ -1,25 +1,25 @@ //// [tests/cases/compiler/mergedModuleDeclarationCodeGen2.ts] //// === mergedModuleDeclarationCodeGen2.ts === -module my.data.foo { +namespace my.data.foo { >my : Symbol(my, Decl(mergedModuleDeclarationCodeGen2.ts, 0, 0), Decl(mergedModuleDeclarationCodeGen2.ts, 2, 1)) ->data : Symbol(data, Decl(mergedModuleDeclarationCodeGen2.ts, 0, 10), Decl(mergedModuleDeclarationCodeGen2.ts, 3, 10)) ->foo : Symbol(foo, Decl(mergedModuleDeclarationCodeGen2.ts, 0, 15)) +>data : Symbol(data, Decl(mergedModuleDeclarationCodeGen2.ts, 0, 13), Decl(mergedModuleDeclarationCodeGen2.ts, 3, 13)) +>foo : Symbol(foo, Decl(mergedModuleDeclarationCodeGen2.ts, 0, 18)) export function buz() { } ->buz : Symbol(buz, Decl(mergedModuleDeclarationCodeGen2.ts, 0, 20)) +>buz : Symbol(buz, Decl(mergedModuleDeclarationCodeGen2.ts, 0, 23)) } -module my.data { +namespace my.data { >my : Symbol(my, Decl(mergedModuleDeclarationCodeGen2.ts, 0, 0), Decl(mergedModuleDeclarationCodeGen2.ts, 2, 1)) ->data : Symbol(data, Decl(mergedModuleDeclarationCodeGen2.ts, 0, 10), Decl(mergedModuleDeclarationCodeGen2.ts, 3, 10)) +>data : Symbol(data, Decl(mergedModuleDeclarationCodeGen2.ts, 0, 13), Decl(mergedModuleDeclarationCodeGen2.ts, 3, 13)) function data(my) { ->data : Symbol(data, Decl(mergedModuleDeclarationCodeGen2.ts, 3, 16)) +>data : Symbol(data, Decl(mergedModuleDeclarationCodeGen2.ts, 3, 19)) >my : Symbol(my, Decl(mergedModuleDeclarationCodeGen2.ts, 4, 18)) foo.buz(); ->foo.buz : Symbol(foo.buz, Decl(mergedModuleDeclarationCodeGen2.ts, 0, 20)) ->foo : Symbol(foo, Decl(mergedModuleDeclarationCodeGen2.ts, 0, 15)) ->buz : Symbol(foo.buz, Decl(mergedModuleDeclarationCodeGen2.ts, 0, 20)) +>foo.buz : Symbol(foo.buz, Decl(mergedModuleDeclarationCodeGen2.ts, 0, 23)) +>foo : Symbol(foo, Decl(mergedModuleDeclarationCodeGen2.ts, 0, 18)) +>buz : Symbol(foo.buz, Decl(mergedModuleDeclarationCodeGen2.ts, 0, 23)) } } diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen2.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen2.types index 6ddf233e5d6e7..52e1abd7cf777 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen2.types +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/mergedModuleDeclarationCodeGen2.ts] //// === mergedModuleDeclarationCodeGen2.ts === -module my.data.foo { +namespace my.data.foo { >my : typeof my > : ^^^^^^^^^ >data : typeof data @@ -13,7 +13,7 @@ module my.data.foo { >buz : () => void > : ^^^^^^^^^^ } -module my.data { +namespace my.data { >my : typeof my > : ^^^^^^^^^ >data : typeof my.data diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen3.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen3.js index 42035d63d1c76..4eb38c889eaf6 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen3.js +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen3.js @@ -1,10 +1,10 @@ //// [tests/cases/compiler/mergedModuleDeclarationCodeGen3.ts] //// //// [mergedModuleDeclarationCodeGen3.ts] -module my.data { +namespace my.data { export function buz() { } } -module my.data.foo { +namespace my.data.foo { function data(my, foo) { buz(); } diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen3.symbols b/tests/baselines/reference/mergedModuleDeclarationCodeGen3.symbols index e65e4025a69be..27544a85f07e4 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen3.symbols +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen3.symbols @@ -1,24 +1,24 @@ //// [tests/cases/compiler/mergedModuleDeclarationCodeGen3.ts] //// === mergedModuleDeclarationCodeGen3.ts === -module my.data { +namespace my.data { >my : Symbol(my, Decl(mergedModuleDeclarationCodeGen3.ts, 0, 0), Decl(mergedModuleDeclarationCodeGen3.ts, 2, 1)) ->data : Symbol(data, Decl(mergedModuleDeclarationCodeGen3.ts, 0, 10), Decl(mergedModuleDeclarationCodeGen3.ts, 3, 10)) +>data : Symbol(data, Decl(mergedModuleDeclarationCodeGen3.ts, 0, 13), Decl(mergedModuleDeclarationCodeGen3.ts, 3, 13)) export function buz() { } ->buz : Symbol(buz, Decl(mergedModuleDeclarationCodeGen3.ts, 0, 16)) +>buz : Symbol(buz, Decl(mergedModuleDeclarationCodeGen3.ts, 0, 19)) } -module my.data.foo { +namespace my.data.foo { >my : Symbol(my, Decl(mergedModuleDeclarationCodeGen3.ts, 0, 0), Decl(mergedModuleDeclarationCodeGen3.ts, 2, 1)) ->data : Symbol(data, Decl(mergedModuleDeclarationCodeGen3.ts, 0, 10), Decl(mergedModuleDeclarationCodeGen3.ts, 3, 10)) ->foo : Symbol(foo, Decl(mergedModuleDeclarationCodeGen3.ts, 3, 15)) +>data : Symbol(data, Decl(mergedModuleDeclarationCodeGen3.ts, 0, 13), Decl(mergedModuleDeclarationCodeGen3.ts, 3, 13)) +>foo : Symbol(foo, Decl(mergedModuleDeclarationCodeGen3.ts, 3, 18)) function data(my, foo) { ->data : Symbol(data, Decl(mergedModuleDeclarationCodeGen3.ts, 3, 20)) +>data : Symbol(data, Decl(mergedModuleDeclarationCodeGen3.ts, 3, 23)) >my : Symbol(my, Decl(mergedModuleDeclarationCodeGen3.ts, 4, 18)) >foo : Symbol(foo, Decl(mergedModuleDeclarationCodeGen3.ts, 4, 21)) buz(); ->buz : Symbol(buz, Decl(mergedModuleDeclarationCodeGen3.ts, 0, 16)) +>buz : Symbol(buz, Decl(mergedModuleDeclarationCodeGen3.ts, 0, 19)) } } diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen3.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen3.types index aa57fb252bd81..e3dbb62253472 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen3.types +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen3.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/mergedModuleDeclarationCodeGen3.ts] //// === mergedModuleDeclarationCodeGen3.ts === -module my.data { +namespace my.data { >my : typeof my > : ^^^^^^^^^ >data : typeof data @@ -11,7 +11,7 @@ module my.data { >buz : () => void > : ^^^^^^^^^^ } -module my.data.foo { +namespace my.data.foo { >my : typeof my > : ^^^^^^^^^ >data : typeof data diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen4.errors.txt b/tests/baselines/reference/mergedModuleDeclarationCodeGen4.errors.txt new file mode 100644 index 0000000000000..8f5f2dd31daf3 --- /dev/null +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen4.errors.txt @@ -0,0 +1,31 @@ +mergedModuleDeclarationCodeGen4.ts(3,16): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +mergedModuleDeclarationCodeGen4.ts(3,26): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +mergedModuleDeclarationCodeGen4.ts(8,16): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +mergedModuleDeclarationCodeGen4.ts(8,26): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== mergedModuleDeclarationCodeGen4.ts (4 errors) ==== + namespace superContain { + export namespace contain { + export module my.buz { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export namespace data { + export function foo() { } + } + } + export module my.buz { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export namespace data { + export function bar(contain, my, buz, data) { + foo(); + } + } + } + } + } \ No newline at end of file diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen4.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen4.js index 81a7a6aac3f3f..ae42bd3d247ea 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen4.js +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen4.js @@ -1,15 +1,15 @@ //// [tests/cases/compiler/mergedModuleDeclarationCodeGen4.ts] //// //// [mergedModuleDeclarationCodeGen4.ts] -module superContain { - export module contain { +namespace superContain { + export namespace contain { export module my.buz { - export module data { + export namespace data { export function foo() { } } } export module my.buz { - export module data { + export namespace data { export function bar(contain, my, buz, data) { foo(); } diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen4.symbols b/tests/baselines/reference/mergedModuleDeclarationCodeGen4.symbols index b167c522dbcb7..99fd15e403889 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen4.symbols +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen4.symbols @@ -1,39 +1,39 @@ //// [tests/cases/compiler/mergedModuleDeclarationCodeGen4.ts] //// === mergedModuleDeclarationCodeGen4.ts === -module superContain { +namespace superContain { >superContain : Symbol(superContain, Decl(mergedModuleDeclarationCodeGen4.ts, 0, 0)) - export module contain { ->contain : Symbol(contain, Decl(mergedModuleDeclarationCodeGen4.ts, 0, 21)) + export namespace contain { +>contain : Symbol(contain, Decl(mergedModuleDeclarationCodeGen4.ts, 0, 24)) export module my.buz { ->my : Symbol(my, Decl(mergedModuleDeclarationCodeGen4.ts, 1, 27), Decl(mergedModuleDeclarationCodeGen4.ts, 6, 9)) +>my : Symbol(my, Decl(mergedModuleDeclarationCodeGen4.ts, 1, 30), Decl(mergedModuleDeclarationCodeGen4.ts, 6, 9)) >buz : Symbol(buz, Decl(mergedModuleDeclarationCodeGen4.ts, 2, 25), Decl(mergedModuleDeclarationCodeGen4.ts, 7, 25)) - export module data { + export namespace data { >data : Symbol(data, Decl(mergedModuleDeclarationCodeGen4.ts, 2, 30), Decl(mergedModuleDeclarationCodeGen4.ts, 7, 30)) export function foo() { } ->foo : Symbol(foo, Decl(mergedModuleDeclarationCodeGen4.ts, 3, 32)) +>foo : Symbol(foo, Decl(mergedModuleDeclarationCodeGen4.ts, 3, 35)) } } export module my.buz { ->my : Symbol(my, Decl(mergedModuleDeclarationCodeGen4.ts, 1, 27), Decl(mergedModuleDeclarationCodeGen4.ts, 6, 9)) +>my : Symbol(my, Decl(mergedModuleDeclarationCodeGen4.ts, 1, 30), Decl(mergedModuleDeclarationCodeGen4.ts, 6, 9)) >buz : Symbol(buz, Decl(mergedModuleDeclarationCodeGen4.ts, 2, 25), Decl(mergedModuleDeclarationCodeGen4.ts, 7, 25)) - export module data { + export namespace data { >data : Symbol(data, Decl(mergedModuleDeclarationCodeGen4.ts, 2, 30), Decl(mergedModuleDeclarationCodeGen4.ts, 7, 30)) export function bar(contain, my, buz, data) { ->bar : Symbol(bar, Decl(mergedModuleDeclarationCodeGen4.ts, 8, 32)) +>bar : Symbol(bar, Decl(mergedModuleDeclarationCodeGen4.ts, 8, 35)) >contain : Symbol(contain, Decl(mergedModuleDeclarationCodeGen4.ts, 9, 36)) >my : Symbol(my, Decl(mergedModuleDeclarationCodeGen4.ts, 9, 44)) >buz : Symbol(buz, Decl(mergedModuleDeclarationCodeGen4.ts, 9, 48)) >data : Symbol(data, Decl(mergedModuleDeclarationCodeGen4.ts, 9, 53)) foo(); ->foo : Symbol(foo, Decl(mergedModuleDeclarationCodeGen4.ts, 3, 32)) +>foo : Symbol(foo, Decl(mergedModuleDeclarationCodeGen4.ts, 3, 35)) } } } diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen4.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen4.types index d38c5bea8c3d7..ed14bbd9608ac 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen4.types +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen4.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/mergedModuleDeclarationCodeGen4.ts] //// === mergedModuleDeclarationCodeGen4.ts === -module superContain { +namespace superContain { >superContain : typeof superContain > : ^^^^^^^^^^^^^^^^^^^ - export module contain { + export namespace contain { >contain : typeof contain > : ^^^^^^^^^^^^^^ @@ -15,7 +15,7 @@ module superContain { >buz : typeof buz > : ^^^^^^^^^^ - export module data { + export namespace data { >data : typeof data > : ^^^^^^^^^^^ @@ -30,7 +30,7 @@ module superContain { >buz : typeof buz > : ^^^^^^^^^^ - export module data { + export namespace data { >data : typeof data > : ^^^^^^^^^^^ @@ -38,9 +38,13 @@ module superContain { >bar : (contain: any, my: any, buz: any, data: any) => void > : ^ ^^^^^^^ ^^^^^^^ ^^^^^^^ ^^^^^^^^^^^^^^ >contain : any +> : ^^^ >my : any +> : ^^^ >buz : any +> : ^^^ >data : any +> : ^^^ foo(); >foo() : void diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js index 062a721f608e1..bd705648e44db 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/mergedModuleDeclarationCodeGen5.ts] //// //// [mergedModuleDeclarationCodeGen5.ts] -module M.buz.plop { +namespace M.buz.plop { export function doom() { } export function M() { } } -module M.buz.plop { +namespace M.buz.plop { function gunk() { } function buz() { } export class fudge { } diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.symbols b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.symbols index f7f5b4ba47ebb..c67e0ecda79bb 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.symbols +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.symbols @@ -1,24 +1,24 @@ //// [tests/cases/compiler/mergedModuleDeclarationCodeGen5.ts] //// === mergedModuleDeclarationCodeGen5.ts === -module M.buz.plop { +namespace M.buz.plop { >M : Symbol(M, Decl(mergedModuleDeclarationCodeGen5.ts, 0, 0), Decl(mergedModuleDeclarationCodeGen5.ts, 3, 1)) ->buz : Symbol(buz, Decl(mergedModuleDeclarationCodeGen5.ts, 0, 9), Decl(mergedModuleDeclarationCodeGen5.ts, 4, 9)) ->plop : Symbol(plop, Decl(mergedModuleDeclarationCodeGen5.ts, 0, 13), Decl(mergedModuleDeclarationCodeGen5.ts, 4, 13)) +>buz : Symbol(buz, Decl(mergedModuleDeclarationCodeGen5.ts, 0, 12), Decl(mergedModuleDeclarationCodeGen5.ts, 4, 12)) +>plop : Symbol(plop, Decl(mergedModuleDeclarationCodeGen5.ts, 0, 16), Decl(mergedModuleDeclarationCodeGen5.ts, 4, 16)) export function doom() { } ->doom : Symbol(doom, Decl(mergedModuleDeclarationCodeGen5.ts, 0, 19)) +>doom : Symbol(doom, Decl(mergedModuleDeclarationCodeGen5.ts, 0, 22)) export function M() { } >M : Symbol(M, Decl(mergedModuleDeclarationCodeGen5.ts, 1, 30)) } -module M.buz.plop { +namespace M.buz.plop { >M : Symbol(M, Decl(mergedModuleDeclarationCodeGen5.ts, 0, 0), Decl(mergedModuleDeclarationCodeGen5.ts, 3, 1)) ->buz : Symbol(buz, Decl(mergedModuleDeclarationCodeGen5.ts, 0, 9), Decl(mergedModuleDeclarationCodeGen5.ts, 4, 9)) ->plop : Symbol(plop, Decl(mergedModuleDeclarationCodeGen5.ts, 0, 13), Decl(mergedModuleDeclarationCodeGen5.ts, 4, 13)) +>buz : Symbol(buz, Decl(mergedModuleDeclarationCodeGen5.ts, 0, 12), Decl(mergedModuleDeclarationCodeGen5.ts, 4, 12)) +>plop : Symbol(plop, Decl(mergedModuleDeclarationCodeGen5.ts, 0, 16), Decl(mergedModuleDeclarationCodeGen5.ts, 4, 16)) function gunk() { } ->gunk : Symbol(gunk, Decl(mergedModuleDeclarationCodeGen5.ts, 4, 19)) +>gunk : Symbol(gunk, Decl(mergedModuleDeclarationCodeGen5.ts, 4, 22)) function buz() { } >buz : Symbol(buz, Decl(mergedModuleDeclarationCodeGen5.ts, 5, 23)) @@ -32,7 +32,7 @@ module M.buz.plop { // Emit these references as follows var v1 = gunk; // gunk >v1 : Symbol(v1, Decl(mergedModuleDeclarationCodeGen5.ts, 11, 7)) ->gunk : Symbol(gunk, Decl(mergedModuleDeclarationCodeGen5.ts, 4, 19)) +>gunk : Symbol(gunk, Decl(mergedModuleDeclarationCodeGen5.ts, 4, 22)) var v2 = buz; // buz >v2 : Symbol(v2, Decl(mergedModuleDeclarationCodeGen5.ts, 12, 7)) @@ -40,7 +40,7 @@ module M.buz.plop { export var v3 = doom; // _plop.doom >v3 : Symbol(v3, Decl(mergedModuleDeclarationCodeGen5.ts, 13, 14)) ->doom : Symbol(doom, Decl(mergedModuleDeclarationCodeGen5.ts, 0, 19)) +>doom : Symbol(doom, Decl(mergedModuleDeclarationCodeGen5.ts, 0, 22)) export var v4 = M; // _plop.M >v4 : Symbol(v4, Decl(mergedModuleDeclarationCodeGen5.ts, 14, 14)) diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.types index 261b5ec60f495..7eadcfd585b16 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.types +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/mergedModuleDeclarationCodeGen5.ts] //// === mergedModuleDeclarationCodeGen5.ts === -module M.buz.plop { +namespace M.buz.plop { >M : typeof M > : ^^^^^^^^ >buz : typeof buz @@ -17,7 +17,7 @@ module M.buz.plop { >M : () => void > : ^^^^^^^^^^ } -module M.buz.plop { +namespace M.buz.plop { >M : typeof M > : ^^^^^^^^ >buz : typeof buz diff --git a/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.js b/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.js index a8cf49a072268..bb1fedc23bba4 100644 --- a/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.js +++ b/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/mergedModuleDeclarationWithSharedExportedVar.ts] //// //// [mergedModuleDeclarationWithSharedExportedVar.ts] -module M { +namespace M { export var v = 10; v; } -module M { +namespace M { v; } diff --git a/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.symbols b/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.symbols index 3c85c5e75e050..84dca152815bd 100644 --- a/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.symbols +++ b/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/mergedModuleDeclarationWithSharedExportedVar.ts] //// === mergedModuleDeclarationWithSharedExportedVar.ts === -module M { +namespace M { >M : Symbol(M, Decl(mergedModuleDeclarationWithSharedExportedVar.ts, 0, 0), Decl(mergedModuleDeclarationWithSharedExportedVar.ts, 3, 1)) export var v = 10; @@ -10,7 +10,7 @@ module M { v; >v : Symbol(v, Decl(mergedModuleDeclarationWithSharedExportedVar.ts, 1, 14)) } -module M { +namespace M { >M : Symbol(M, Decl(mergedModuleDeclarationWithSharedExportedVar.ts, 0, 0), Decl(mergedModuleDeclarationWithSharedExportedVar.ts, 3, 1)) v; diff --git a/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.types b/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.types index 7c778e8fe99c1..74d9fdca403e6 100644 --- a/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.types +++ b/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/mergedModuleDeclarationWithSharedExportedVar.ts] //// === mergedModuleDeclarationWithSharedExportedVar.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -15,7 +15,7 @@ module M { >v : number > : ^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/metadataOfClassFromModule.js b/tests/baselines/reference/metadataOfClassFromModule.js index 2f9639047cc3a..88cbed247ea06 100644 --- a/tests/baselines/reference/metadataOfClassFromModule.js +++ b/tests/baselines/reference/metadataOfClassFromModule.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/metadataOfClassFromModule.ts] //// //// [metadataOfClassFromModule.ts] -module MyModule { +namespace MyModule { export function inject(target: any, key: string): void { } diff --git a/tests/baselines/reference/metadataOfClassFromModule.symbols b/tests/baselines/reference/metadataOfClassFromModule.symbols index 0a681a2be83af..d8258d95cedae 100644 --- a/tests/baselines/reference/metadataOfClassFromModule.symbols +++ b/tests/baselines/reference/metadataOfClassFromModule.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/metadataOfClassFromModule.ts] //// === metadataOfClassFromModule.ts === -module MyModule { +namespace MyModule { >MyModule : Symbol(MyModule, Decl(metadataOfClassFromModule.ts, 0, 0)) export function inject(target: any, key: string): void { } ->inject : Symbol(inject, Decl(metadataOfClassFromModule.ts, 0, 17)) +>inject : Symbol(inject, Decl(metadataOfClassFromModule.ts, 0, 20)) >target : Symbol(target, Decl(metadataOfClassFromModule.ts, 2, 27)) >key : Symbol(key, Decl(metadataOfClassFromModule.ts, 2, 39)) @@ -16,7 +16,7 @@ module MyModule { >Person : Symbol(Person, Decl(metadataOfClassFromModule.ts, 4, 24)) @inject leftLeg: Leg; ->inject : Symbol(inject, Decl(metadataOfClassFromModule.ts, 0, 17)) +>inject : Symbol(inject, Decl(metadataOfClassFromModule.ts, 0, 20)) >leftLeg : Symbol(Person.leftLeg, Decl(metadataOfClassFromModule.ts, 6, 25)) >Leg : Symbol(Leg, Decl(metadataOfClassFromModule.ts, 2, 62)) } diff --git a/tests/baselines/reference/metadataOfClassFromModule.types b/tests/baselines/reference/metadataOfClassFromModule.types index fef7de3fb5480..99224772ae2c2 100644 --- a/tests/baselines/reference/metadataOfClassFromModule.types +++ b/tests/baselines/reference/metadataOfClassFromModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/metadataOfClassFromModule.ts] //// === metadataOfClassFromModule.ts === -module MyModule { +namespace MyModule { >MyModule : typeof MyModule > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/methodContainingLocalFunction.js b/tests/baselines/reference/methodContainingLocalFunction.js index 9c12616e129ed..8603085a0b009 100644 --- a/tests/baselines/reference/methodContainingLocalFunction.js +++ b/tests/baselines/reference/methodContainingLocalFunction.js @@ -35,7 +35,7 @@ class C { } } -module M { +namespace M { export function exhibitBug() { function localFunction() { } var x: { (): void; }; diff --git a/tests/baselines/reference/methodContainingLocalFunction.symbols b/tests/baselines/reference/methodContainingLocalFunction.symbols index c9bb8cd20d7ba..ed1e6806ef67b 100644 --- a/tests/baselines/reference/methodContainingLocalFunction.symbols +++ b/tests/baselines/reference/methodContainingLocalFunction.symbols @@ -85,11 +85,11 @@ class C { } } -module M { +namespace M { >M : Symbol(M, Decl(methodContainingLocalFunction.ts, 32, 1)) export function exhibitBug() { ->exhibitBug : Symbol(exhibitBug, Decl(methodContainingLocalFunction.ts, 34, 10)) +>exhibitBug : Symbol(exhibitBug, Decl(methodContainingLocalFunction.ts, 34, 13)) function localFunction() { } >localFunction : Symbol(localFunction, Decl(methodContainingLocalFunction.ts, 35, 34)) diff --git a/tests/baselines/reference/methodContainingLocalFunction.types b/tests/baselines/reference/methodContainingLocalFunction.types index 16e730b1e4543..4b964d817d05e 100644 --- a/tests/baselines/reference/methodContainingLocalFunction.types +++ b/tests/baselines/reference/methodContainingLocalFunction.types @@ -113,7 +113,7 @@ class C { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/missingReturnStatement.errors.txt b/tests/baselines/reference/missingReturnStatement.errors.txt index 816c39956d55f..87f6d3807fe63 100644 --- a/tests/baselines/reference/missingReturnStatement.errors.txt +++ b/tests/baselines/reference/missingReturnStatement.errors.txt @@ -2,7 +2,7 @@ missingReturnStatement.ts(3,22): error TS2355: A function whose declared type is ==== missingReturnStatement.ts (1 errors) ==== - module Test { + namespace Test { export class Bug { public foo():string { ~~~~~~ diff --git a/tests/baselines/reference/missingReturnStatement.js b/tests/baselines/reference/missingReturnStatement.js index c56e83a83fe7f..c1ee76028f7dc 100644 --- a/tests/baselines/reference/missingReturnStatement.js +++ b/tests/baselines/reference/missingReturnStatement.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/missingReturnStatement.ts] //// //// [missingReturnStatement.ts] -module Test { +namespace Test { export class Bug { public foo():string { } diff --git a/tests/baselines/reference/missingReturnStatement.symbols b/tests/baselines/reference/missingReturnStatement.symbols index a2573d9dde4ed..98b0da31122f7 100644 --- a/tests/baselines/reference/missingReturnStatement.symbols +++ b/tests/baselines/reference/missingReturnStatement.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/missingReturnStatement.ts] //// === missingReturnStatement.ts === -module Test { +namespace Test { >Test : Symbol(Test, Decl(missingReturnStatement.ts, 0, 0)) export class Bug { ->Bug : Symbol(Bug, Decl(missingReturnStatement.ts, 0, 13)) +>Bug : Symbol(Bug, Decl(missingReturnStatement.ts, 0, 16)) public foo():string { >foo : Symbol(Bug.foo, Decl(missingReturnStatement.ts, 1, 22)) diff --git a/tests/baselines/reference/missingReturnStatement.types b/tests/baselines/reference/missingReturnStatement.types index 46e8d2aa9d28a..cccfc13a8b77e 100644 --- a/tests/baselines/reference/missingReturnStatement.types +++ b/tests/baselines/reference/missingReturnStatement.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/missingReturnStatement.ts] //// === missingReturnStatement.ts === -module Test { +namespace Test { >Test : typeof Test > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/missingTypeArguments3.js b/tests/baselines/reference/missingTypeArguments3.js index 4edccfb0f2a85..7ee4cacc595b0 100644 --- a/tests/baselines/reference/missingTypeArguments3.js +++ b/tests/baselines/reference/missingTypeArguments3.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/missingTypeArguments3.ts] //// //// [missingTypeArguments3.ts] -declare module linq { +declare namespace linq { interface Enumerable { OrderByDescending(keySelector?: string): OrderedEnumerable; diff --git a/tests/baselines/reference/missingTypeArguments3.symbols b/tests/baselines/reference/missingTypeArguments3.symbols index 1cc4ec9003fd6..71fb273afa9d9 100644 --- a/tests/baselines/reference/missingTypeArguments3.symbols +++ b/tests/baselines/reference/missingTypeArguments3.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/missingTypeArguments3.ts] //// === missingTypeArguments3.ts === -declare module linq { +declare namespace linq { >linq : Symbol(linq, Decl(missingTypeArguments3.ts, 0, 0)) interface Enumerable { ->Enumerable : Symbol(Enumerable, Decl(missingTypeArguments3.ts, 0, 21)) +>Enumerable : Symbol(Enumerable, Decl(missingTypeArguments3.ts, 0, 24)) >T : Symbol(T, Decl(missingTypeArguments3.ts, 2, 25)) OrderByDescending(keySelector?: string): OrderedEnumerable; @@ -21,7 +21,7 @@ declare module linq { >element : Symbol(element, Decl(missingTypeArguments3.ts, 4, 36)) >T : Symbol(T, Decl(missingTypeArguments3.ts, 2, 25)) >TKey : Symbol(TKey, Decl(missingTypeArguments3.ts, 4, 16)) ->Enumerable : Symbol(Enumerable, Decl(missingTypeArguments3.ts, 0, 21)) +>Enumerable : Symbol(Enumerable, Decl(missingTypeArguments3.ts, 0, 24)) >Grouping : Symbol(Grouping, Decl(missingTypeArguments3.ts, 11, 5)) >TKey : Symbol(TKey, Decl(missingTypeArguments3.ts, 4, 16)) >T : Symbol(T, Decl(missingTypeArguments3.ts, 2, 25)) @@ -38,7 +38,7 @@ declare module linq { >element : Symbol(element, Decl(missingTypeArguments3.ts, 5, 85)) >T : Symbol(T, Decl(missingTypeArguments3.ts, 2, 25)) >TElement : Symbol(TElement, Decl(missingTypeArguments3.ts, 5, 21)) ->Enumerable : Symbol(Enumerable, Decl(missingTypeArguments3.ts, 0, 21)) +>Enumerable : Symbol(Enumerable, Decl(missingTypeArguments3.ts, 0, 24)) >Grouping : Symbol(Grouping, Decl(missingTypeArguments3.ts, 11, 5)) >TKey : Symbol(TKey, Decl(missingTypeArguments3.ts, 5, 16)) >TElement : Symbol(TElement, Decl(missingTypeArguments3.ts, 5, 21)) @@ -58,7 +58,7 @@ declare module linq { interface OrderedEnumerable extends Enumerable { >OrderedEnumerable : Symbol(OrderedEnumerable, Decl(missingTypeArguments3.ts, 7, 5)) >T : Symbol(T, Decl(missingTypeArguments3.ts, 9, 32)) ->Enumerable : Symbol(Enumerable, Decl(missingTypeArguments3.ts, 0, 21)) +>Enumerable : Symbol(Enumerable, Decl(missingTypeArguments3.ts, 0, 24)) >T : Symbol(T, Decl(missingTypeArguments3.ts, 9, 32)) ThenBy(keySelector: (element: T) => TCompare): OrderedEnumerable; // used to incorrectly think this was missing a type argument @@ -76,7 +76,7 @@ declare module linq { >Grouping : Symbol(Grouping, Decl(missingTypeArguments3.ts, 11, 5)) >TKey : Symbol(TKey, Decl(missingTypeArguments3.ts, 13, 23)) >TElement : Symbol(TElement, Decl(missingTypeArguments3.ts, 13, 28)) ->Enumerable : Symbol(Enumerable, Decl(missingTypeArguments3.ts, 0, 21)) +>Enumerable : Symbol(Enumerable, Decl(missingTypeArguments3.ts, 0, 24)) >TElement : Symbol(TElement, Decl(missingTypeArguments3.ts, 13, 28)) Key(): TKey; @@ -95,7 +95,7 @@ declare module linq { Get(key): Enumerable; >Get : Symbol(Lookup.Get, Decl(missingTypeArguments3.ts, 18, 24)) >key : Symbol(key, Decl(missingTypeArguments3.ts, 19, 12)) ->Enumerable : Symbol(Enumerable, Decl(missingTypeArguments3.ts, 0, 21)) +>Enumerable : Symbol(Enumerable, Decl(missingTypeArguments3.ts, 0, 24)) Contains(key): boolean; >Contains : Symbol(Lookup.Contains, Decl(missingTypeArguments3.ts, 19, 34)) @@ -103,7 +103,7 @@ declare module linq { ToEnumerable(): Enumerable>; >ToEnumerable : Symbol(Lookup.ToEnumerable, Decl(missingTypeArguments3.ts, 20, 31)) ->Enumerable : Symbol(Enumerable, Decl(missingTypeArguments3.ts, 0, 21)) +>Enumerable : Symbol(Enumerable, Decl(missingTypeArguments3.ts, 0, 24)) >Grouping : Symbol(Grouping, Decl(missingTypeArguments3.ts, 11, 5)) >TKey : Symbol(TKey, Decl(missingTypeArguments3.ts, 17, 21)) } @@ -151,7 +151,7 @@ declare module linq { ToEnumerable(): Enumerable>; >ToEnumerable : Symbol(Dictionary.ToEnumerable, Decl(missingTypeArguments3.ts, 31, 24)) ->Enumerable : Symbol(Enumerable, Decl(missingTypeArguments3.ts, 0, 21)) +>Enumerable : Symbol(Enumerable, Decl(missingTypeArguments3.ts, 0, 24)) >KeyValuePair : Symbol(KeyValuePair, Decl(missingTypeArguments3.ts, 33, 5)) >TKey : Symbol(TKey, Decl(missingTypeArguments3.ts, 24, 25)) >TValue : Symbol(TValue, Decl(missingTypeArguments3.ts, 24, 30)) diff --git a/tests/baselines/reference/missingTypeArguments3.types b/tests/baselines/reference/missingTypeArguments3.types index 15361f8b7f2e6..ea94d35c41dfe 100644 --- a/tests/baselines/reference/missingTypeArguments3.types +++ b/tests/baselines/reference/missingTypeArguments3.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/missingTypeArguments3.ts] //// === missingTypeArguments3.ts === -declare module linq { +declare namespace linq { interface Enumerable { OrderByDescending(keySelector?: string): OrderedEnumerable; diff --git a/tests/baselines/reference/mixedExports.js b/tests/baselines/reference/mixedExports.js index c6354222c4587..3d8d32a78a1da 100644 --- a/tests/baselines/reference/mixedExports.js +++ b/tests/baselines/reference/mixedExports.js @@ -1,20 +1,20 @@ //// [tests/cases/compiler/mixedExports.ts] //// //// [mixedExports.ts] -declare module M { +declare namespace M { function foo(); export function foo(); function foo(); } -declare module M1 { +declare namespace M1 { export interface Foo {} interface Foo {} } -module A { +namespace A { interface X {x} - export module X {} + export namespace X {} interface X {y} } diff --git a/tests/baselines/reference/mixedExports.symbols b/tests/baselines/reference/mixedExports.symbols index d4fde80e08d8d..0d297a92a5ac3 100644 --- a/tests/baselines/reference/mixedExports.symbols +++ b/tests/baselines/reference/mixedExports.symbols @@ -1,40 +1,40 @@ //// [tests/cases/compiler/mixedExports.ts] //// === mixedExports.ts === -declare module M { +declare namespace M { >M : Symbol(M, Decl(mixedExports.ts, 0, 0)) function foo(); ->foo : Symbol(foo, Decl(mixedExports.ts, 0, 18), Decl(mixedExports.ts, 1, 20), Decl(mixedExports.ts, 2, 27)) +>foo : Symbol(foo, Decl(mixedExports.ts, 0, 21), Decl(mixedExports.ts, 1, 20), Decl(mixedExports.ts, 2, 27)) export function foo(); ->foo : Symbol(foo, Decl(mixedExports.ts, 0, 18), Decl(mixedExports.ts, 1, 20), Decl(mixedExports.ts, 2, 27)) +>foo : Symbol(foo, Decl(mixedExports.ts, 0, 21), Decl(mixedExports.ts, 1, 20), Decl(mixedExports.ts, 2, 27)) function foo(); ->foo : Symbol(foo, Decl(mixedExports.ts, 0, 18), Decl(mixedExports.ts, 1, 20), Decl(mixedExports.ts, 2, 27)) +>foo : Symbol(foo, Decl(mixedExports.ts, 0, 21), Decl(mixedExports.ts, 1, 20), Decl(mixedExports.ts, 2, 27)) } -declare module M1 { +declare namespace M1 { >M1 : Symbol(M1, Decl(mixedExports.ts, 4, 1)) export interface Foo {} ->Foo : Symbol(Foo, Decl(mixedExports.ts, 6, 19), Decl(mixedExports.ts, 7, 28)) +>Foo : Symbol(Foo, Decl(mixedExports.ts, 6, 22), Decl(mixedExports.ts, 7, 28)) interface Foo {} ->Foo : Symbol(Foo, Decl(mixedExports.ts, 6, 19), Decl(mixedExports.ts, 7, 28)) +>Foo : Symbol(Foo, Decl(mixedExports.ts, 6, 22), Decl(mixedExports.ts, 7, 28)) } -module A { +namespace A { >A : Symbol(A, Decl(mixedExports.ts, 9, 1)) interface X {x} ->X : Symbol(X, Decl(mixedExports.ts, 11, 10), Decl(mixedExports.ts, 12, 20), Decl(mixedExports.ts, 13, 23)) +>X : Symbol(X, Decl(mixedExports.ts, 11, 13), Decl(mixedExports.ts, 12, 20), Decl(mixedExports.ts, 13, 26)) >x : Symbol(X.x, Decl(mixedExports.ts, 12, 18)) - export module X {} + export namespace X {} >X : Symbol(X, Decl(mixedExports.ts, 12, 20)) interface X {y} ->X : Symbol(X, Decl(mixedExports.ts, 11, 10), Decl(mixedExports.ts, 12, 20), Decl(mixedExports.ts, 13, 23)) +>X : Symbol(X, Decl(mixedExports.ts, 11, 13), Decl(mixedExports.ts, 12, 20), Decl(mixedExports.ts, 13, 26)) >y : Symbol(X.y, Decl(mixedExports.ts, 14, 18)) } diff --git a/tests/baselines/reference/mixedExports.types b/tests/baselines/reference/mixedExports.types index 1bd470ab57aff..49075b939c908 100644 --- a/tests/baselines/reference/mixedExports.types +++ b/tests/baselines/reference/mixedExports.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/mixedExports.ts] //// === mixedExports.ts === -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ @@ -18,16 +18,16 @@ declare module M { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -declare module M1 { +declare namespace M1 { export interface Foo {} interface Foo {} } -module A { +namespace A { interface X {x} >x : any - export module X {} + export namespace X {} interface X {y} >y : any } diff --git a/tests/baselines/reference/mixingFunctionAndAmbientModule1.js b/tests/baselines/reference/mixingFunctionAndAmbientModule1.js index a7963d9c031f6..ccf125f8a0429 100644 --- a/tests/baselines/reference/mixingFunctionAndAmbientModule1.js +++ b/tests/baselines/reference/mixingFunctionAndAmbientModule1.js @@ -1,30 +1,30 @@ //// [tests/cases/compiler/mixingFunctionAndAmbientModule1.ts] //// //// [mixingFunctionAndAmbientModule1.ts] -module A { - declare module My { +namespace A { + declare namespace My { export var x: number; } function My(s: string) { } } -module B { - declare module My { +namespace B { + declare namespace My { export var x: number; } function My(s: boolean); function My(s: any) { } } -module C { - declare module My { +namespace C { + declare namespace My { export var x: number; } declare function My(s: boolean); } -module D { - declare module My { +namespace D { + declare namespace My { export var x: number; } declare function My(s: boolean); @@ -32,12 +32,12 @@ module D { } -module E { - declare module My { +namespace E { + declare namespace My { export var x: number; } declare function My(s: boolean); - declare module My { + declare namespace My { export var y: number; } declare function My(s: any); diff --git a/tests/baselines/reference/mixingFunctionAndAmbientModule1.symbols b/tests/baselines/reference/mixingFunctionAndAmbientModule1.symbols index 4bd48e344675f..79e3e5631a311 100644 --- a/tests/baselines/reference/mixingFunctionAndAmbientModule1.symbols +++ b/tests/baselines/reference/mixingFunctionAndAmbientModule1.symbols @@ -1,92 +1,92 @@ //// [tests/cases/compiler/mixingFunctionAndAmbientModule1.ts] //// === mixingFunctionAndAmbientModule1.ts === -module A { +namespace A { >A : Symbol(A, Decl(mixingFunctionAndAmbientModule1.ts, 0, 0)) - declare module My { ->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 3, 5), Decl(mixingFunctionAndAmbientModule1.ts, 0, 10)) + declare namespace My { +>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 3, 5), Decl(mixingFunctionAndAmbientModule1.ts, 0, 13)) export var x: number; >x : Symbol(x, Decl(mixingFunctionAndAmbientModule1.ts, 2, 18)) } function My(s: string) { } ->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 3, 5), Decl(mixingFunctionAndAmbientModule1.ts, 0, 10)) +>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 3, 5), Decl(mixingFunctionAndAmbientModule1.ts, 0, 13)) >s : Symbol(s, Decl(mixingFunctionAndAmbientModule1.ts, 4, 16)) } -module B { +namespace B { >B : Symbol(B, Decl(mixingFunctionAndAmbientModule1.ts, 5, 1)) - declare module My { ->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 10, 5), Decl(mixingFunctionAndAmbientModule1.ts, 11, 28), Decl(mixingFunctionAndAmbientModule1.ts, 7, 10)) + declare namespace My { +>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 10, 5), Decl(mixingFunctionAndAmbientModule1.ts, 11, 28), Decl(mixingFunctionAndAmbientModule1.ts, 7, 13)) export var x: number; >x : Symbol(x, Decl(mixingFunctionAndAmbientModule1.ts, 9, 18)) } function My(s: boolean); ->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 10, 5), Decl(mixingFunctionAndAmbientModule1.ts, 11, 28), Decl(mixingFunctionAndAmbientModule1.ts, 7, 10)) +>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 10, 5), Decl(mixingFunctionAndAmbientModule1.ts, 11, 28), Decl(mixingFunctionAndAmbientModule1.ts, 7, 13)) >s : Symbol(s, Decl(mixingFunctionAndAmbientModule1.ts, 11, 16)) function My(s: any) { } ->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 10, 5), Decl(mixingFunctionAndAmbientModule1.ts, 11, 28), Decl(mixingFunctionAndAmbientModule1.ts, 7, 10)) +>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 10, 5), Decl(mixingFunctionAndAmbientModule1.ts, 11, 28), Decl(mixingFunctionAndAmbientModule1.ts, 7, 13)) >s : Symbol(s, Decl(mixingFunctionAndAmbientModule1.ts, 12, 16)) } -module C { +namespace C { >C : Symbol(C, Decl(mixingFunctionAndAmbientModule1.ts, 13, 1)) - declare module My { ->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 18, 5), Decl(mixingFunctionAndAmbientModule1.ts, 15, 10)) + declare namespace My { +>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 18, 5), Decl(mixingFunctionAndAmbientModule1.ts, 15, 13)) export var x: number; >x : Symbol(x, Decl(mixingFunctionAndAmbientModule1.ts, 17, 18)) } declare function My(s: boolean); ->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 18, 5), Decl(mixingFunctionAndAmbientModule1.ts, 15, 10)) +>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 18, 5), Decl(mixingFunctionAndAmbientModule1.ts, 15, 13)) >s : Symbol(s, Decl(mixingFunctionAndAmbientModule1.ts, 19, 24)) } -module D { +namespace D { >D : Symbol(D, Decl(mixingFunctionAndAmbientModule1.ts, 20, 1)) - declare module My { ->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 25, 5), Decl(mixingFunctionAndAmbientModule1.ts, 26, 36), Decl(mixingFunctionAndAmbientModule1.ts, 22, 10)) + declare namespace My { +>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 25, 5), Decl(mixingFunctionAndAmbientModule1.ts, 26, 36), Decl(mixingFunctionAndAmbientModule1.ts, 22, 13)) export var x: number; >x : Symbol(x, Decl(mixingFunctionAndAmbientModule1.ts, 24, 18)) } declare function My(s: boolean); ->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 25, 5), Decl(mixingFunctionAndAmbientModule1.ts, 26, 36), Decl(mixingFunctionAndAmbientModule1.ts, 22, 10)) +>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 25, 5), Decl(mixingFunctionAndAmbientModule1.ts, 26, 36), Decl(mixingFunctionAndAmbientModule1.ts, 22, 13)) >s : Symbol(s, Decl(mixingFunctionAndAmbientModule1.ts, 26, 24)) declare function My(s: any); ->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 25, 5), Decl(mixingFunctionAndAmbientModule1.ts, 26, 36), Decl(mixingFunctionAndAmbientModule1.ts, 22, 10)) +>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 25, 5), Decl(mixingFunctionAndAmbientModule1.ts, 26, 36), Decl(mixingFunctionAndAmbientModule1.ts, 22, 13)) >s : Symbol(s, Decl(mixingFunctionAndAmbientModule1.ts, 27, 24)) } -module E { +namespace E { >E : Symbol(E, Decl(mixingFunctionAndAmbientModule1.ts, 28, 1)) - declare module My { ->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 34, 5), Decl(mixingFunctionAndAmbientModule1.ts, 38, 5), Decl(mixingFunctionAndAmbientModule1.ts, 31, 10), Decl(mixingFunctionAndAmbientModule1.ts, 35, 36)) + declare namespace My { +>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 34, 5), Decl(mixingFunctionAndAmbientModule1.ts, 38, 5), Decl(mixingFunctionAndAmbientModule1.ts, 31, 13), Decl(mixingFunctionAndAmbientModule1.ts, 35, 36)) export var x: number; >x : Symbol(x, Decl(mixingFunctionAndAmbientModule1.ts, 33, 18)) } declare function My(s: boolean); ->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 34, 5), Decl(mixingFunctionAndAmbientModule1.ts, 38, 5), Decl(mixingFunctionAndAmbientModule1.ts, 31, 10), Decl(mixingFunctionAndAmbientModule1.ts, 35, 36)) +>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 34, 5), Decl(mixingFunctionAndAmbientModule1.ts, 38, 5), Decl(mixingFunctionAndAmbientModule1.ts, 31, 13), Decl(mixingFunctionAndAmbientModule1.ts, 35, 36)) >s : Symbol(s, Decl(mixingFunctionAndAmbientModule1.ts, 35, 24)) - declare module My { ->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 34, 5), Decl(mixingFunctionAndAmbientModule1.ts, 38, 5), Decl(mixingFunctionAndAmbientModule1.ts, 31, 10), Decl(mixingFunctionAndAmbientModule1.ts, 35, 36)) + declare namespace My { +>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 34, 5), Decl(mixingFunctionAndAmbientModule1.ts, 38, 5), Decl(mixingFunctionAndAmbientModule1.ts, 31, 13), Decl(mixingFunctionAndAmbientModule1.ts, 35, 36)) export var y: number; >y : Symbol(y, Decl(mixingFunctionAndAmbientModule1.ts, 37, 18)) } declare function My(s: any); ->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 34, 5), Decl(mixingFunctionAndAmbientModule1.ts, 38, 5), Decl(mixingFunctionAndAmbientModule1.ts, 31, 10), Decl(mixingFunctionAndAmbientModule1.ts, 35, 36)) +>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 34, 5), Decl(mixingFunctionAndAmbientModule1.ts, 38, 5), Decl(mixingFunctionAndAmbientModule1.ts, 31, 13), Decl(mixingFunctionAndAmbientModule1.ts, 35, 36)) >s : Symbol(s, Decl(mixingFunctionAndAmbientModule1.ts, 39, 24)) } diff --git a/tests/baselines/reference/mixingFunctionAndAmbientModule1.types b/tests/baselines/reference/mixingFunctionAndAmbientModule1.types index 96351887a1861..c7f97bb321fb7 100644 --- a/tests/baselines/reference/mixingFunctionAndAmbientModule1.types +++ b/tests/baselines/reference/mixingFunctionAndAmbientModule1.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/mixingFunctionAndAmbientModule1.ts] //// === mixingFunctionAndAmbientModule1.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ - declare module My { + declare namespace My { >My : typeof My > : ^^^^^^^^^ @@ -20,11 +20,11 @@ module A { > : ^^^^^^ } -module B { +namespace B { >B : typeof B > : ^^^^^^^^ - declare module My { + declare namespace My { >My : typeof My > : ^^^^^^^^^ @@ -44,11 +44,11 @@ module B { >s : any } -module C { +namespace C { >C : typeof C > : ^^^^^^^^ - declare module My { + declare namespace My { >My : typeof My > : ^^^^^^^^^ @@ -63,11 +63,11 @@ module C { > : ^^^^^^^ } -module D { +namespace D { >D : typeof D > : ^^^^^^^^ - declare module My { + declare namespace My { >My : typeof My > : ^^^^^^^^^ @@ -88,11 +88,11 @@ module D { } -module E { +namespace E { >E : typeof E > : ^^^^^^^^ - declare module My { + declare namespace My { >My : typeof My > : ^^^^^^^^^ @@ -106,7 +106,7 @@ module E { >s : boolean > : ^^^^^^^ - declare module My { + declare namespace My { >My : typeof My > : ^^^^^^^^^ diff --git a/tests/baselines/reference/modFunctionCrash.js b/tests/baselines/reference/modFunctionCrash.js index 377bd52e9228e..682573b41f0cc 100644 --- a/tests/baselines/reference/modFunctionCrash.js +++ b/tests/baselines/reference/modFunctionCrash.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/modFunctionCrash.ts] //// //// [modFunctionCrash.ts] -declare module Q { +declare namespace Q { function f(fn:()=>void); // typechecking the function type shouldnot crash the compiler } diff --git a/tests/baselines/reference/modFunctionCrash.symbols b/tests/baselines/reference/modFunctionCrash.symbols index 3a2ba4320332d..dc40f00d4a265 100644 --- a/tests/baselines/reference/modFunctionCrash.symbols +++ b/tests/baselines/reference/modFunctionCrash.symbols @@ -1,17 +1,17 @@ //// [tests/cases/compiler/modFunctionCrash.ts] //// === modFunctionCrash.ts === -declare module Q { +declare namespace Q { >Q : Symbol(Q, Decl(modFunctionCrash.ts, 0, 0)) function f(fn:()=>void); // typechecking the function type shouldnot crash the compiler ->f : Symbol(f, Decl(modFunctionCrash.ts, 0, 18)) +>f : Symbol(f, Decl(modFunctionCrash.ts, 0, 21)) >fn : Symbol(fn, Decl(modFunctionCrash.ts, 1, 15)) } Q.f(function() {this;}); ->Q.f : Symbol(Q.f, Decl(modFunctionCrash.ts, 0, 18)) +>Q.f : Symbol(Q.f, Decl(modFunctionCrash.ts, 0, 21)) >Q : Symbol(Q, Decl(modFunctionCrash.ts, 0, 0)) ->f : Symbol(Q.f, Decl(modFunctionCrash.ts, 0, 18)) +>f : Symbol(Q.f, Decl(modFunctionCrash.ts, 0, 21)) diff --git a/tests/baselines/reference/modFunctionCrash.types b/tests/baselines/reference/modFunctionCrash.types index debfc1b57fdd9..8937fa203e9ab 100644 --- a/tests/baselines/reference/modFunctionCrash.types +++ b/tests/baselines/reference/modFunctionCrash.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/modFunctionCrash.ts] //// === modFunctionCrash.ts === -declare module Q { +declare namespace Q { >Q : typeof Q > : ^^^^^^^^ diff --git a/tests/baselines/reference/moduleAliasInterface.js b/tests/baselines/reference/moduleAliasInterface.js index 0b521151e9b58..2bd6d5d9e2d32 100644 --- a/tests/baselines/reference/moduleAliasInterface.js +++ b/tests/baselines/reference/moduleAliasInterface.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleAliasInterface.ts] //// //// [moduleAliasInterface.ts] -module _modes { +namespace _modes { export interface IMode { } @@ -13,7 +13,7 @@ module _modes { // _modes. // produces an internal error - please implement in derived class -module editor { +namespace editor { import modes = _modes; var i : modes.IMode; @@ -28,7 +28,7 @@ module editor { } import modesOuter = _modes; -module editor2 { +namespace editor2 { var i : modesOuter.IMode; @@ -37,19 +37,19 @@ module editor2 { } - module Foo { export class Bar{} } + namespace Foo { export class Bar{} } class Bug2 { constructor(p1: Foo.Bar, p2: modesOuter.Mode) { } } } -module A1 { +namespace A1 { export interface A1I1 {} export class A1C1 {} } -module B1 { +namespace B1 { import A1Alias1 = A1; var i : A1Alias1.A1I1; diff --git a/tests/baselines/reference/moduleAliasInterface.symbols b/tests/baselines/reference/moduleAliasInterface.symbols index d194a04e03c4e..3a92b2eb307c4 100644 --- a/tests/baselines/reference/moduleAliasInterface.symbols +++ b/tests/baselines/reference/moduleAliasInterface.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/moduleAliasInterface.ts] //// === moduleAliasInterface.ts === -module _modes { +namespace _modes { >_modes : Symbol(_modes, Decl(moduleAliasInterface.ts, 0, 0)) export interface IMode { ->IMode : Symbol(IMode, Decl(moduleAliasInterface.ts, 0, 15)) +>IMode : Symbol(IMode, Decl(moduleAliasInterface.ts, 0, 18)) } @@ -17,17 +17,17 @@ module _modes { // _modes. // produces an internal error - please implement in derived class -module editor { +namespace editor { >editor : Symbol(editor, Decl(moduleAliasInterface.ts, 8, 1)) import modes = _modes; ->modes : Symbol(modes, Decl(moduleAliasInterface.ts, 12, 15)) +>modes : Symbol(modes, Decl(moduleAliasInterface.ts, 12, 18)) >_modes : Symbol(modes, Decl(moduleAliasInterface.ts, 0, 0)) var i : modes.IMode; >i : Symbol(i, Decl(moduleAliasInterface.ts, 15, 4)) ->modes : Symbol(modes, Decl(moduleAliasInterface.ts, 12, 15)) ->IMode : Symbol(modes.IMode, Decl(moduleAliasInterface.ts, 0, 15)) +>modes : Symbol(modes, Decl(moduleAliasInterface.ts, 12, 18)) +>IMode : Symbol(modes.IMode, Decl(moduleAliasInterface.ts, 0, 18)) // If you just use p1:modes, the compiler accepts it - should be an error class Bug { @@ -35,17 +35,17 @@ module editor { constructor(p1: modes.IMode, p2: modes.Mode) { }// should be an error on p2 - it's not exported >p1 : Symbol(p1, Decl(moduleAliasInterface.ts, 19, 14)) ->modes : Symbol(modes, Decl(moduleAliasInterface.ts, 12, 15)) ->IMode : Symbol(modes.IMode, Decl(moduleAliasInterface.ts, 0, 15)) +>modes : Symbol(modes, Decl(moduleAliasInterface.ts, 12, 18)) +>IMode : Symbol(modes.IMode, Decl(moduleAliasInterface.ts, 0, 18)) >p2 : Symbol(p2, Decl(moduleAliasInterface.ts, 19, 30)) ->modes : Symbol(modes, Decl(moduleAliasInterface.ts, 12, 15)) +>modes : Symbol(modes, Decl(moduleAliasInterface.ts, 12, 18)) >Mode : Symbol(modes.Mode, Decl(moduleAliasInterface.ts, 3, 2)) public foo(p1:modes.IMode) { >foo : Symbol(Bug.foo, Decl(moduleAliasInterface.ts, 19, 50)) >p1 : Symbol(p1, Decl(moduleAliasInterface.ts, 20, 13)) ->modes : Symbol(modes, Decl(moduleAliasInterface.ts, 12, 15)) ->IMode : Symbol(modes.IMode, Decl(moduleAliasInterface.ts, 0, 15)) +>modes : Symbol(modes, Decl(moduleAliasInterface.ts, 12, 18)) +>IMode : Symbol(modes.IMode, Decl(moduleAliasInterface.ts, 0, 18)) } } @@ -55,13 +55,13 @@ import modesOuter = _modes; >modesOuter : Symbol(modesOuter, Decl(moduleAliasInterface.ts, 24, 1)) >_modes : Symbol(_modes, Decl(moduleAliasInterface.ts, 0, 0)) -module editor2 { +namespace editor2 { >editor2 : Symbol(editor2, Decl(moduleAliasInterface.ts, 26, 27)) var i : modesOuter.IMode; >i : Symbol(i, Decl(moduleAliasInterface.ts, 29, 4)) >modesOuter : Symbol(modesOuter, Decl(moduleAliasInterface.ts, 24, 1)) ->IMode : Symbol(modesOuter.IMode, Decl(moduleAliasInterface.ts, 0, 15)) +>IMode : Symbol(modesOuter.IMode, Decl(moduleAliasInterface.ts, 0, 18)) class Bug { >Bug : Symbol(Bug, Decl(moduleAliasInterface.ts, 29, 26)) @@ -69,55 +69,55 @@ module editor2 { constructor(p1: modesOuter.IMode, p2: modesOuter.Mode) { }// no error here, since modesOuter is declared externally >p1 : Symbol(p1, Decl(moduleAliasInterface.ts, 32, 17)) >modesOuter : Symbol(modesOuter, Decl(moduleAliasInterface.ts, 24, 1)) ->IMode : Symbol(modesOuter.IMode, Decl(moduleAliasInterface.ts, 0, 15)) +>IMode : Symbol(modesOuter.IMode, Decl(moduleAliasInterface.ts, 0, 18)) >p2 : Symbol(p2, Decl(moduleAliasInterface.ts, 32, 38)) >modesOuter : Symbol(modesOuter, Decl(moduleAliasInterface.ts, 24, 1)) >Mode : Symbol(modesOuter.Mode, Decl(moduleAliasInterface.ts, 3, 2)) } - module Foo { export class Bar{} } + namespace Foo { export class Bar{} } >Foo : Symbol(Foo, Decl(moduleAliasInterface.ts, 34, 2)) ->Bar : Symbol(Bar, Decl(moduleAliasInterface.ts, 36, 14)) +>Bar : Symbol(Bar, Decl(moduleAliasInterface.ts, 36, 17)) class Bug2 { ->Bug2 : Symbol(Bug2, Decl(moduleAliasInterface.ts, 36, 35)) +>Bug2 : Symbol(Bug2, Decl(moduleAliasInterface.ts, 36, 38)) constructor(p1: Foo.Bar, p2: modesOuter.Mode) { } >p1 : Symbol(p1, Decl(moduleAliasInterface.ts, 39, 18)) >Foo : Symbol(Foo, Decl(moduleAliasInterface.ts, 34, 2)) ->Bar : Symbol(Foo.Bar, Decl(moduleAliasInterface.ts, 36, 14)) +>Bar : Symbol(Foo.Bar, Decl(moduleAliasInterface.ts, 36, 17)) >p2 : Symbol(p2, Decl(moduleAliasInterface.ts, 39, 30)) >modesOuter : Symbol(modesOuter, Decl(moduleAliasInterface.ts, 24, 1)) >Mode : Symbol(modesOuter.Mode, Decl(moduleAliasInterface.ts, 3, 2)) } } -module A1 { +namespace A1 { >A1 : Symbol(A1, Decl(moduleAliasInterface.ts, 41, 1)) export interface A1I1 {} ->A1I1 : Symbol(A1I1, Decl(moduleAliasInterface.ts, 43, 11)) +>A1I1 : Symbol(A1I1, Decl(moduleAliasInterface.ts, 43, 14)) export class A1C1 {} >A1C1 : Symbol(A1C1, Decl(moduleAliasInterface.ts, 44, 28)) } -module B1 { +namespace B1 { >B1 : Symbol(B1, Decl(moduleAliasInterface.ts, 46, 1)) import A1Alias1 = A1; ->A1Alias1 : Symbol(A1Alias1, Decl(moduleAliasInterface.ts, 48, 11)) +>A1Alias1 : Symbol(A1Alias1, Decl(moduleAliasInterface.ts, 48, 14)) >A1 : Symbol(A1Alias1, Decl(moduleAliasInterface.ts, 41, 1)) var i : A1Alias1.A1I1; >i : Symbol(i, Decl(moduleAliasInterface.ts, 51, 7)) ->A1Alias1 : Symbol(A1Alias1, Decl(moduleAliasInterface.ts, 48, 11)) ->A1I1 : Symbol(A1Alias1.A1I1, Decl(moduleAliasInterface.ts, 43, 11)) +>A1Alias1 : Symbol(A1Alias1, Decl(moduleAliasInterface.ts, 48, 14)) +>A1I1 : Symbol(A1Alias1.A1I1, Decl(moduleAliasInterface.ts, 43, 14)) var c : A1Alias1.A1C1; >c : Symbol(c, Decl(moduleAliasInterface.ts, 52, 7)) ->A1Alias1 : Symbol(A1Alias1, Decl(moduleAliasInterface.ts, 48, 11)) +>A1Alias1 : Symbol(A1Alias1, Decl(moduleAliasInterface.ts, 48, 14)) >A1C1 : Symbol(A1Alias1.A1C1, Decl(moduleAliasInterface.ts, 44, 28)) } diff --git a/tests/baselines/reference/moduleAliasInterface.types b/tests/baselines/reference/moduleAliasInterface.types index 81cb892891141..4ea677d959149 100644 --- a/tests/baselines/reference/moduleAliasInterface.types +++ b/tests/baselines/reference/moduleAliasInterface.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleAliasInterface.ts] //// === moduleAliasInterface.ts === -module _modes { +namespace _modes { >_modes : typeof _modes > : ^^^^^^^^^^^^^ @@ -18,7 +18,7 @@ module _modes { // _modes. // produces an internal error - please implement in derived class -module editor { +namespace editor { >editor : typeof editor > : ^^^^^^^^^^^^^ @@ -67,7 +67,7 @@ import modesOuter = _modes; >_modes : typeof _modes > : ^^^^^^^^^^^^^ -module editor2 { +namespace editor2 { >editor2 : typeof editor2 > : ^^^^^^^^^^^^^^ @@ -93,7 +93,7 @@ module editor2 { } - module Foo { export class Bar{} } + namespace Foo { export class Bar{} } >Foo : typeof Foo > : ^^^^^^^^^^ >Bar : Bar @@ -115,7 +115,7 @@ module editor2 { } } -module A1 { +namespace A1 { >A1 : typeof A1 > : ^^^^^^^^^ @@ -125,7 +125,7 @@ module A1 { > : ^^^^ } -module B1 { +namespace B1 { >B1 : typeof B1 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName.js b/tests/baselines/reference/moduleAndInterfaceSharingName.js index d961ff6f33719..05cbb77f40309 100644 --- a/tests/baselines/reference/moduleAndInterfaceSharingName.js +++ b/tests/baselines/reference/moduleAndInterfaceSharingName.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/moduleAndInterfaceSharingName.ts] //// //// [moduleAndInterfaceSharingName.ts] -module X { - export module Y { +namespace X { + export namespace Y { export interface Z { } } export interface Y { } diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName.symbols b/tests/baselines/reference/moduleAndInterfaceSharingName.symbols index efde17564d98c..a9bd06a988528 100644 --- a/tests/baselines/reference/moduleAndInterfaceSharingName.symbols +++ b/tests/baselines/reference/moduleAndInterfaceSharingName.symbols @@ -1,26 +1,26 @@ //// [tests/cases/compiler/moduleAndInterfaceSharingName.ts] //// === moduleAndInterfaceSharingName.ts === -module X { +namespace X { >X : Symbol(X, Decl(moduleAndInterfaceSharingName.ts, 0, 0)) - export module Y { ->Y : Symbol(Y, Decl(moduleAndInterfaceSharingName.ts, 0, 10), Decl(moduleAndInterfaceSharingName.ts, 3, 5)) + export namespace Y { +>Y : Symbol(Y, Decl(moduleAndInterfaceSharingName.ts, 0, 13), Decl(moduleAndInterfaceSharingName.ts, 3, 5)) export interface Z { } ->Z : Symbol(Z, Decl(moduleAndInterfaceSharingName.ts, 1, 21)) +>Z : Symbol(Z, Decl(moduleAndInterfaceSharingName.ts, 1, 24)) } export interface Y { } ->Y : Symbol(Y, Decl(moduleAndInterfaceSharingName.ts, 0, 10), Decl(moduleAndInterfaceSharingName.ts, 3, 5)) +>Y : Symbol(Y, Decl(moduleAndInterfaceSharingName.ts, 0, 13), Decl(moduleAndInterfaceSharingName.ts, 3, 5)) } var z: X.Y.Z = null; >z : Symbol(z, Decl(moduleAndInterfaceSharingName.ts, 6, 3)) >X : Symbol(X, Decl(moduleAndInterfaceSharingName.ts, 0, 0)) ->Y : Symbol(X.Y, Decl(moduleAndInterfaceSharingName.ts, 0, 10), Decl(moduleAndInterfaceSharingName.ts, 3, 5)) ->Z : Symbol(X.Y.Z, Decl(moduleAndInterfaceSharingName.ts, 1, 21)) +>Y : Symbol(X.Y, Decl(moduleAndInterfaceSharingName.ts, 0, 13), Decl(moduleAndInterfaceSharingName.ts, 3, 5)) +>Z : Symbol(X.Y.Z, Decl(moduleAndInterfaceSharingName.ts, 1, 24)) var z2: X.Y; >z2 : Symbol(z2, Decl(moduleAndInterfaceSharingName.ts, 7, 3)) >X : Symbol(X, Decl(moduleAndInterfaceSharingName.ts, 0, 0)) ->Y : Symbol(X.Y, Decl(moduleAndInterfaceSharingName.ts, 0, 10), Decl(moduleAndInterfaceSharingName.ts, 3, 5)) +>Y : Symbol(X.Y, Decl(moduleAndInterfaceSharingName.ts, 0, 13), Decl(moduleAndInterfaceSharingName.ts, 3, 5)) diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName.types b/tests/baselines/reference/moduleAndInterfaceSharingName.types index e9b19351f87f7..ce9dbeaeb040e 100644 --- a/tests/baselines/reference/moduleAndInterfaceSharingName.types +++ b/tests/baselines/reference/moduleAndInterfaceSharingName.types @@ -1,8 +1,8 @@ //// [tests/cases/compiler/moduleAndInterfaceSharingName.ts] //// === moduleAndInterfaceSharingName.ts === -module X { - export module Y { +namespace X { + export namespace Y { export interface Z { } } export interface Y { } diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName2.errors.txt b/tests/baselines/reference/moduleAndInterfaceSharingName2.errors.txt index 7b6e0888e1d1d..95b0566e283bf 100644 --- a/tests/baselines/reference/moduleAndInterfaceSharingName2.errors.txt +++ b/tests/baselines/reference/moduleAndInterfaceSharingName2.errors.txt @@ -2,8 +2,8 @@ moduleAndInterfaceSharingName2.ts(8,9): error TS2315: Type 'Y' is not generic. ==== moduleAndInterfaceSharingName2.ts (1 errors) ==== - module X { - export module Y { + namespace X { + export namespace Y { export interface Z { } } export interface Y { } diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName2.js b/tests/baselines/reference/moduleAndInterfaceSharingName2.js index 04140b1f34487..5aca5f3429a08 100644 --- a/tests/baselines/reference/moduleAndInterfaceSharingName2.js +++ b/tests/baselines/reference/moduleAndInterfaceSharingName2.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/moduleAndInterfaceSharingName2.ts] //// //// [moduleAndInterfaceSharingName2.ts] -module X { - export module Y { +namespace X { + export namespace Y { export interface Z { } } export interface Y { } diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName2.symbols b/tests/baselines/reference/moduleAndInterfaceSharingName2.symbols index 7686ee648426f..8d31e31b3e312 100644 --- a/tests/baselines/reference/moduleAndInterfaceSharingName2.symbols +++ b/tests/baselines/reference/moduleAndInterfaceSharingName2.symbols @@ -1,26 +1,26 @@ //// [tests/cases/compiler/moduleAndInterfaceSharingName2.ts] //// === moduleAndInterfaceSharingName2.ts === -module X { +namespace X { >X : Symbol(X, Decl(moduleAndInterfaceSharingName2.ts, 0, 0)) - export module Y { ->Y : Symbol(Y, Decl(moduleAndInterfaceSharingName2.ts, 0, 10), Decl(moduleAndInterfaceSharingName2.ts, 3, 5)) + export namespace Y { +>Y : Symbol(Y, Decl(moduleAndInterfaceSharingName2.ts, 0, 13), Decl(moduleAndInterfaceSharingName2.ts, 3, 5)) export interface Z { } ->Z : Symbol(Z, Decl(moduleAndInterfaceSharingName2.ts, 1, 21)) +>Z : Symbol(Z, Decl(moduleAndInterfaceSharingName2.ts, 1, 24)) } export interface Y { } ->Y : Symbol(Y, Decl(moduleAndInterfaceSharingName2.ts, 0, 10), Decl(moduleAndInterfaceSharingName2.ts, 3, 5)) +>Y : Symbol(Y, Decl(moduleAndInterfaceSharingName2.ts, 0, 13), Decl(moduleAndInterfaceSharingName2.ts, 3, 5)) } var z: X.Y.Z = null; >z : Symbol(z, Decl(moduleAndInterfaceSharingName2.ts, 6, 3)) >X : Symbol(X, Decl(moduleAndInterfaceSharingName2.ts, 0, 0)) ->Y : Symbol(X.Y, Decl(moduleAndInterfaceSharingName2.ts, 0, 10), Decl(moduleAndInterfaceSharingName2.ts, 3, 5)) ->Z : Symbol(X.Y.Z, Decl(moduleAndInterfaceSharingName2.ts, 1, 21)) +>Y : Symbol(X.Y, Decl(moduleAndInterfaceSharingName2.ts, 0, 13), Decl(moduleAndInterfaceSharingName2.ts, 3, 5)) +>Z : Symbol(X.Y.Z, Decl(moduleAndInterfaceSharingName2.ts, 1, 24)) var z2: X.Y; >z2 : Symbol(z2, Decl(moduleAndInterfaceSharingName2.ts, 7, 3)) >X : Symbol(X, Decl(moduleAndInterfaceSharingName2.ts, 0, 0)) ->Y : Symbol(X.Y, Decl(moduleAndInterfaceSharingName2.ts, 0, 10), Decl(moduleAndInterfaceSharingName2.ts, 3, 5)) +>Y : Symbol(X.Y, Decl(moduleAndInterfaceSharingName2.ts, 0, 13), Decl(moduleAndInterfaceSharingName2.ts, 3, 5)) diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName2.types b/tests/baselines/reference/moduleAndInterfaceSharingName2.types index 1684f592b205d..36d90e4e28da3 100644 --- a/tests/baselines/reference/moduleAndInterfaceSharingName2.types +++ b/tests/baselines/reference/moduleAndInterfaceSharingName2.types @@ -1,8 +1,8 @@ //// [tests/cases/compiler/moduleAndInterfaceSharingName2.ts] //// === moduleAndInterfaceSharingName2.ts === -module X { - export module Y { +namespace X { + export namespace Y { export interface Z { } } export interface Y { } diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName3.js b/tests/baselines/reference/moduleAndInterfaceSharingName3.js index cc090763940aa..fa007cc30d06f 100644 --- a/tests/baselines/reference/moduleAndInterfaceSharingName3.js +++ b/tests/baselines/reference/moduleAndInterfaceSharingName3.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/moduleAndInterfaceSharingName3.ts] //// //// [moduleAndInterfaceSharingName3.ts] -module X { - export module Y { +namespace X { + export namespace Y { export interface Z { } } export interface Y { } diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName3.symbols b/tests/baselines/reference/moduleAndInterfaceSharingName3.symbols index 96bde42098880..6a3617d4ee125 100644 --- a/tests/baselines/reference/moduleAndInterfaceSharingName3.symbols +++ b/tests/baselines/reference/moduleAndInterfaceSharingName3.symbols @@ -1,27 +1,27 @@ //// [tests/cases/compiler/moduleAndInterfaceSharingName3.ts] //// === moduleAndInterfaceSharingName3.ts === -module X { +namespace X { >X : Symbol(X, Decl(moduleAndInterfaceSharingName3.ts, 0, 0)) - export module Y { ->Y : Symbol(Y, Decl(moduleAndInterfaceSharingName3.ts, 0, 10), Decl(moduleAndInterfaceSharingName3.ts, 3, 5)) + export namespace Y { +>Y : Symbol(Y, Decl(moduleAndInterfaceSharingName3.ts, 0, 13), Decl(moduleAndInterfaceSharingName3.ts, 3, 5)) export interface Z { } ->Z : Symbol(Z, Decl(moduleAndInterfaceSharingName3.ts, 1, 21)) +>Z : Symbol(Z, Decl(moduleAndInterfaceSharingName3.ts, 1, 24)) } export interface Y { } ->Y : Symbol(Y, Decl(moduleAndInterfaceSharingName3.ts, 0, 10), Decl(moduleAndInterfaceSharingName3.ts, 3, 5)) +>Y : Symbol(Y, Decl(moduleAndInterfaceSharingName3.ts, 0, 13), Decl(moduleAndInterfaceSharingName3.ts, 3, 5)) >T : Symbol(T, Decl(moduleAndInterfaceSharingName3.ts, 4, 23)) } var z: X.Y.Z = null; >z : Symbol(z, Decl(moduleAndInterfaceSharingName3.ts, 6, 3)) >X : Symbol(X, Decl(moduleAndInterfaceSharingName3.ts, 0, 0)) ->Y : Symbol(X.Y, Decl(moduleAndInterfaceSharingName3.ts, 0, 10), Decl(moduleAndInterfaceSharingName3.ts, 3, 5)) ->Z : Symbol(X.Y.Z, Decl(moduleAndInterfaceSharingName3.ts, 1, 21)) +>Y : Symbol(X.Y, Decl(moduleAndInterfaceSharingName3.ts, 0, 13), Decl(moduleAndInterfaceSharingName3.ts, 3, 5)) +>Z : Symbol(X.Y.Z, Decl(moduleAndInterfaceSharingName3.ts, 1, 24)) var z2: X.Y; >z2 : Symbol(z2, Decl(moduleAndInterfaceSharingName3.ts, 7, 3)) >X : Symbol(X, Decl(moduleAndInterfaceSharingName3.ts, 0, 0)) ->Y : Symbol(X.Y, Decl(moduleAndInterfaceSharingName3.ts, 0, 10), Decl(moduleAndInterfaceSharingName3.ts, 3, 5)) +>Y : Symbol(X.Y, Decl(moduleAndInterfaceSharingName3.ts, 0, 13), Decl(moduleAndInterfaceSharingName3.ts, 3, 5)) diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName3.types b/tests/baselines/reference/moduleAndInterfaceSharingName3.types index e8f872067218c..6bd49d9b5737e 100644 --- a/tests/baselines/reference/moduleAndInterfaceSharingName3.types +++ b/tests/baselines/reference/moduleAndInterfaceSharingName3.types @@ -1,8 +1,8 @@ //// [tests/cases/compiler/moduleAndInterfaceSharingName3.ts] //// === moduleAndInterfaceSharingName3.ts === -module X { - export module Y { +namespace X { + export namespace Y { export interface Z { } } export interface Y { } diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName4.js b/tests/baselines/reference/moduleAndInterfaceSharingName4.js index c4a4967079949..978db06812930 100644 --- a/tests/baselines/reference/moduleAndInterfaceSharingName4.js +++ b/tests/baselines/reference/moduleAndInterfaceSharingName4.js @@ -1,10 +1,10 @@ //// [tests/cases/compiler/moduleAndInterfaceSharingName4.ts] //// //// [moduleAndInterfaceSharingName4.ts] -declare module D3 { +declare namespace D3 { var x: D3.Color.Color; - module Color { + namespace Color { export interface Color { darker: Color; } diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName4.symbols b/tests/baselines/reference/moduleAndInterfaceSharingName4.symbols index b80966157c296..0b2115beaae92 100644 --- a/tests/baselines/reference/moduleAndInterfaceSharingName4.symbols +++ b/tests/baselines/reference/moduleAndInterfaceSharingName4.symbols @@ -1,24 +1,24 @@ //// [tests/cases/compiler/moduleAndInterfaceSharingName4.ts] //// === moduleAndInterfaceSharingName4.ts === -declare module D3 { +declare namespace D3 { >D3 : Symbol(D3, Decl(moduleAndInterfaceSharingName4.ts, 0, 0)) var x: D3.Color.Color; >x : Symbol(x, Decl(moduleAndInterfaceSharingName4.ts, 1, 7)) >D3 : Symbol(D3, Decl(moduleAndInterfaceSharingName4.ts, 0, 0)) >Color : Symbol(Color, Decl(moduleAndInterfaceSharingName4.ts, 1, 26)) ->Color : Symbol(Color.Color, Decl(moduleAndInterfaceSharingName4.ts, 3, 18)) +>Color : Symbol(Color.Color, Decl(moduleAndInterfaceSharingName4.ts, 3, 21)) - module Color { + namespace Color { >Color : Symbol(Color, Decl(moduleAndInterfaceSharingName4.ts, 1, 26)) export interface Color { ->Color : Symbol(Color, Decl(moduleAndInterfaceSharingName4.ts, 3, 18)) +>Color : Symbol(Color, Decl(moduleAndInterfaceSharingName4.ts, 3, 21)) darker: Color; >darker : Symbol(Color.darker, Decl(moduleAndInterfaceSharingName4.ts, 4, 32)) ->Color : Symbol(Color, Decl(moduleAndInterfaceSharingName4.ts, 3, 18)) +>Color : Symbol(Color, Decl(moduleAndInterfaceSharingName4.ts, 3, 21)) } } } diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName4.types b/tests/baselines/reference/moduleAndInterfaceSharingName4.types index f7f9a45dddec6..3d34dd652516d 100644 --- a/tests/baselines/reference/moduleAndInterfaceSharingName4.types +++ b/tests/baselines/reference/moduleAndInterfaceSharingName4.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleAndInterfaceSharingName4.ts] //// === moduleAndInterfaceSharingName4.ts === -declare module D3 { +declare namespace D3 { >D3 : typeof D3 > : ^^^^^^^^^ @@ -13,7 +13,7 @@ declare module D3 { >Color : any > : ^^^ - module Color { + namespace Color { export interface Color { darker: Color; >darker : Color diff --git a/tests/baselines/reference/moduleAndInterfaceWithSameName.errors.txt b/tests/baselines/reference/moduleAndInterfaceWithSameName.errors.txt index 2a7726c5c87ec..89768999aee40 100644 --- a/tests/baselines/reference/moduleAndInterfaceWithSameName.errors.txt +++ b/tests/baselines/reference/moduleAndInterfaceWithSameName.errors.txt @@ -2,8 +2,8 @@ moduleAndInterfaceWithSameName.ts(21,15): error TS2339: Property 'Bar' does not ==== moduleAndInterfaceWithSameName.ts (1 errors) ==== - module Foo1 { - export module Bar { + namespace Foo1 { + export namespace Bar { export var x = 42; } @@ -12,8 +12,8 @@ moduleAndInterfaceWithSameName.ts(21,15): error TS2339: Property 'Bar' does not } } - module Foo2 { - module Bar { + namespace Foo2 { + namespace Bar { export var x = 42; } @@ -26,8 +26,8 @@ moduleAndInterfaceWithSameName.ts(21,15): error TS2339: Property 'Bar' does not ~~~ !!! error TS2339: Property 'Bar' does not exist on type 'typeof Foo2'. - module Foo3 { - export module Bar { + namespace Foo3 { + export namespace Bar { export var x = 42; } diff --git a/tests/baselines/reference/moduleAndInterfaceWithSameName.js b/tests/baselines/reference/moduleAndInterfaceWithSameName.js index 2b3068faace2f..7361da03198fc 100644 --- a/tests/baselines/reference/moduleAndInterfaceWithSameName.js +++ b/tests/baselines/reference/moduleAndInterfaceWithSameName.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/moduleAndInterfaceWithSameName.ts] //// //// [moduleAndInterfaceWithSameName.ts] -module Foo1 { - export module Bar { +namespace Foo1 { + export namespace Bar { export var x = 42; } @@ -11,8 +11,8 @@ module Foo1 { } } -module Foo2 { - module Bar { +namespace Foo2 { + namespace Bar { export var x = 42; } @@ -23,8 +23,8 @@ module Foo2 { var z2 = Foo2.Bar.y; // Error for using interface name as a value. -module Foo3 { - export module Bar { +namespace Foo3 { + export namespace Bar { export var x = 42; } diff --git a/tests/baselines/reference/moduleAndInterfaceWithSameName.symbols b/tests/baselines/reference/moduleAndInterfaceWithSameName.symbols index 4b2240dc8998f..5f60b78df8d64 100644 --- a/tests/baselines/reference/moduleAndInterfaceWithSameName.symbols +++ b/tests/baselines/reference/moduleAndInterfaceWithSameName.symbols @@ -1,29 +1,29 @@ //// [tests/cases/compiler/moduleAndInterfaceWithSameName.ts] //// === moduleAndInterfaceWithSameName.ts === -module Foo1 { +namespace Foo1 { >Foo1 : Symbol(Foo1, Decl(moduleAndInterfaceWithSameName.ts, 0, 0)) - export module Bar { ->Bar : Symbol(Bar, Decl(moduleAndInterfaceWithSameName.ts, 0, 13), Decl(moduleAndInterfaceWithSameName.ts, 3, 5)) + export namespace Bar { +>Bar : Symbol(Bar, Decl(moduleAndInterfaceWithSameName.ts, 0, 16), Decl(moduleAndInterfaceWithSameName.ts, 3, 5)) export var x = 42; >x : Symbol(x, Decl(moduleAndInterfaceWithSameName.ts, 2, 18)) } export interface Bar { ->Bar : Symbol(Bar, Decl(moduleAndInterfaceWithSameName.ts, 0, 13), Decl(moduleAndInterfaceWithSameName.ts, 3, 5)) +>Bar : Symbol(Bar, Decl(moduleAndInterfaceWithSameName.ts, 0, 16), Decl(moduleAndInterfaceWithSameName.ts, 3, 5)) y: string; >y : Symbol(Bar.y, Decl(moduleAndInterfaceWithSameName.ts, 5, 26)) } } -module Foo2 { +namespace Foo2 { >Foo2 : Symbol(Foo2, Decl(moduleAndInterfaceWithSameName.ts, 8, 1)) - module Bar { ->Bar : Symbol(Bar, Decl(moduleAndInterfaceWithSameName.ts, 10, 13), Decl(moduleAndInterfaceWithSameName.ts, 13, 5)) + namespace Bar { +>Bar : Symbol(Bar, Decl(moduleAndInterfaceWithSameName.ts, 10, 16), Decl(moduleAndInterfaceWithSameName.ts, 13, 5)) export var x = 42; >x : Symbol(x, Decl(moduleAndInterfaceWithSameName.ts, 12, 18)) @@ -41,18 +41,18 @@ var z2 = Foo2.Bar.y; // Error for using interface name as a value. >z2 : Symbol(z2, Decl(moduleAndInterfaceWithSameName.ts, 20, 3)) >Foo2 : Symbol(Foo2, Decl(moduleAndInterfaceWithSameName.ts, 8, 1)) -module Foo3 { +namespace Foo3 { >Foo3 : Symbol(Foo3, Decl(moduleAndInterfaceWithSameName.ts, 20, 20)) - export module Bar { ->Bar : Symbol(Bar, Decl(moduleAndInterfaceWithSameName.ts, 22, 13)) + export namespace Bar { +>Bar : Symbol(Bar, Decl(moduleAndInterfaceWithSameName.ts, 22, 16)) export var x = 42; >x : Symbol(x, Decl(moduleAndInterfaceWithSameName.ts, 24, 18)) } interface Bar { ->Bar : Symbol(Bar, Decl(moduleAndInterfaceWithSameName.ts, 22, 13), Decl(moduleAndInterfaceWithSameName.ts, 25, 5)) +>Bar : Symbol(Bar, Decl(moduleAndInterfaceWithSameName.ts, 22, 16), Decl(moduleAndInterfaceWithSameName.ts, 25, 5)) y: string; >y : Symbol(Bar.y, Decl(moduleAndInterfaceWithSameName.ts, 27, 19)) diff --git a/tests/baselines/reference/moduleAndInterfaceWithSameName.types b/tests/baselines/reference/moduleAndInterfaceWithSameName.types index 105588f12c261..110d6fa583f69 100644 --- a/tests/baselines/reference/moduleAndInterfaceWithSameName.types +++ b/tests/baselines/reference/moduleAndInterfaceWithSameName.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/moduleAndInterfaceWithSameName.ts] //// === moduleAndInterfaceWithSameName.ts === -module Foo1 { +namespace Foo1 { >Foo1 : typeof Foo1 > : ^^^^^^^^^^^ - export module Bar { + export namespace Bar { >Bar : typeof Bar > : ^^^^^^^^^^ @@ -23,11 +23,11 @@ module Foo1 { } } -module Foo2 { +namespace Foo2 { >Foo2 : typeof Foo2 > : ^^^^^^^^^^^ - module Bar { + namespace Bar { >Bar : typeof Bar > : ^^^^^^^^^^ @@ -59,11 +59,11 @@ var z2 = Foo2.Bar.y; // Error for using interface name as a value. >y : any > : ^^^ -module Foo3 { +namespace Foo3 { >Foo3 : typeof Foo3 > : ^^^^^^^^^^^ - export module Bar { + export namespace Bar { >Bar : typeof Bar > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/moduleAsBaseType.errors.txt b/tests/baselines/reference/moduleAsBaseType.errors.txt index 7d1e45521eb67..26b00f1dbc0e1 100644 --- a/tests/baselines/reference/moduleAsBaseType.errors.txt +++ b/tests/baselines/reference/moduleAsBaseType.errors.txt @@ -4,7 +4,7 @@ moduleAsBaseType.ts(4,21): error TS2709: Cannot use namespace 'M' as a type. ==== moduleAsBaseType.ts (3 errors) ==== - module M {} + namespace M {} class C extends M {} ~ !!! error TS2708: Cannot use namespace 'M' as a value. diff --git a/tests/baselines/reference/moduleAsBaseType.js b/tests/baselines/reference/moduleAsBaseType.js index 9493575faf69c..379e22a91620f 100644 --- a/tests/baselines/reference/moduleAsBaseType.js +++ b/tests/baselines/reference/moduleAsBaseType.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleAsBaseType.ts] //// //// [moduleAsBaseType.ts] -module M {} +namespace M {} class C extends M {} interface I extends M { } class C2 implements M { } diff --git a/tests/baselines/reference/moduleAsBaseType.symbols b/tests/baselines/reference/moduleAsBaseType.symbols index 76e87984324cb..b31ba31b59410 100644 --- a/tests/baselines/reference/moduleAsBaseType.symbols +++ b/tests/baselines/reference/moduleAsBaseType.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/moduleAsBaseType.ts] //// === moduleAsBaseType.ts === -module M {} +namespace M {} >M : Symbol(M, Decl(moduleAsBaseType.ts, 0, 0)) class C extends M {} ->C : Symbol(C, Decl(moduleAsBaseType.ts, 0, 11)) +>C : Symbol(C, Decl(moduleAsBaseType.ts, 0, 14)) interface I extends M { } >I : Symbol(I, Decl(moduleAsBaseType.ts, 1, 20)) diff --git a/tests/baselines/reference/moduleAsBaseType.types b/tests/baselines/reference/moduleAsBaseType.types index 36044b0c02ef9..015d9f82d5b8d 100644 --- a/tests/baselines/reference/moduleAsBaseType.types +++ b/tests/baselines/reference/moduleAsBaseType.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleAsBaseType.ts] //// === moduleAsBaseType.ts === -module M {} +namespace M {} class C extends M {} >C : C > : ^ diff --git a/tests/baselines/reference/moduleAssignmentCompat1.errors.txt b/tests/baselines/reference/moduleAssignmentCompat1.errors.txt index 93c6c91a2a8e2..b4d911b053e23 100644 --- a/tests/baselines/reference/moduleAssignmentCompat1.errors.txt +++ b/tests/baselines/reference/moduleAssignmentCompat1.errors.txt @@ -3,10 +3,10 @@ moduleAssignmentCompat1.ts(10,8): error TS2709: Cannot use namespace 'B' as a ty ==== moduleAssignmentCompat1.ts (2 errors) ==== - module A { + namespace A { export class C { } } - module B { + namespace B { export class C { } class D { } } diff --git a/tests/baselines/reference/moduleAssignmentCompat1.js b/tests/baselines/reference/moduleAssignmentCompat1.js index 5537da27be20f..e3a41f27cd422 100644 --- a/tests/baselines/reference/moduleAssignmentCompat1.js +++ b/tests/baselines/reference/moduleAssignmentCompat1.js @@ -1,10 +1,10 @@ //// [tests/cases/compiler/moduleAssignmentCompat1.ts] //// //// [moduleAssignmentCompat1.ts] -module A { +namespace A { export class C { } } -module B { +namespace B { export class C { } class D { } } diff --git a/tests/baselines/reference/moduleAssignmentCompat1.symbols b/tests/baselines/reference/moduleAssignmentCompat1.symbols index 6858be61fda52..01dcaf2edb868 100644 --- a/tests/baselines/reference/moduleAssignmentCompat1.symbols +++ b/tests/baselines/reference/moduleAssignmentCompat1.symbols @@ -1,17 +1,17 @@ //// [tests/cases/compiler/moduleAssignmentCompat1.ts] //// === moduleAssignmentCompat1.ts === -module A { +namespace A { >A : Symbol(A, Decl(moduleAssignmentCompat1.ts, 0, 0)) export class C { } ->C : Symbol(C, Decl(moduleAssignmentCompat1.ts, 0, 10)) +>C : Symbol(C, Decl(moduleAssignmentCompat1.ts, 0, 13)) } -module B { +namespace B { >B : Symbol(B, Decl(moduleAssignmentCompat1.ts, 2, 1)) export class C { } ->C : Symbol(C, Decl(moduleAssignmentCompat1.ts, 3, 10)) +>C : Symbol(C, Decl(moduleAssignmentCompat1.ts, 3, 13)) class D { } >D : Symbol(D, Decl(moduleAssignmentCompat1.ts, 4, 22)) diff --git a/tests/baselines/reference/moduleAssignmentCompat1.types b/tests/baselines/reference/moduleAssignmentCompat1.types index 4b11a3d93dc22..8d01c79c265b4 100644 --- a/tests/baselines/reference/moduleAssignmentCompat1.types +++ b/tests/baselines/reference/moduleAssignmentCompat1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleAssignmentCompat1.ts] //// === moduleAssignmentCompat1.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -9,7 +9,7 @@ module A { >C : C > : ^ } -module B { +namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/moduleAssignmentCompat2.errors.txt b/tests/baselines/reference/moduleAssignmentCompat2.errors.txt index ed8c40902bfb4..b907432dc0e41 100644 --- a/tests/baselines/reference/moduleAssignmentCompat2.errors.txt +++ b/tests/baselines/reference/moduleAssignmentCompat2.errors.txt @@ -3,10 +3,10 @@ moduleAssignmentCompat2.ts(10,8): error TS2709: Cannot use namespace 'B' as a ty ==== moduleAssignmentCompat2.ts (2 errors) ==== - module A { + namespace A { export class C { } } - module B { + namespace B { export class C { } export class D { } } diff --git a/tests/baselines/reference/moduleAssignmentCompat2.js b/tests/baselines/reference/moduleAssignmentCompat2.js index b7ff67635c200..8907f43f48af7 100644 --- a/tests/baselines/reference/moduleAssignmentCompat2.js +++ b/tests/baselines/reference/moduleAssignmentCompat2.js @@ -1,10 +1,10 @@ //// [tests/cases/compiler/moduleAssignmentCompat2.ts] //// //// [moduleAssignmentCompat2.ts] -module A { +namespace A { export class C { } } -module B { +namespace B { export class C { } export class D { } } diff --git a/tests/baselines/reference/moduleAssignmentCompat2.symbols b/tests/baselines/reference/moduleAssignmentCompat2.symbols index 285d1142b106f..e2581a91741ae 100644 --- a/tests/baselines/reference/moduleAssignmentCompat2.symbols +++ b/tests/baselines/reference/moduleAssignmentCompat2.symbols @@ -1,17 +1,17 @@ //// [tests/cases/compiler/moduleAssignmentCompat2.ts] //// === moduleAssignmentCompat2.ts === -module A { +namespace A { >A : Symbol(A, Decl(moduleAssignmentCompat2.ts, 0, 0)) export class C { } ->C : Symbol(C, Decl(moduleAssignmentCompat2.ts, 0, 10)) +>C : Symbol(C, Decl(moduleAssignmentCompat2.ts, 0, 13)) } -module B { +namespace B { >B : Symbol(B, Decl(moduleAssignmentCompat2.ts, 2, 1)) export class C { } ->C : Symbol(C, Decl(moduleAssignmentCompat2.ts, 3, 10)) +>C : Symbol(C, Decl(moduleAssignmentCompat2.ts, 3, 13)) export class D { } >D : Symbol(D, Decl(moduleAssignmentCompat2.ts, 4, 22)) diff --git a/tests/baselines/reference/moduleAssignmentCompat2.types b/tests/baselines/reference/moduleAssignmentCompat2.types index a0f500bc57663..6bc69cd93929b 100644 --- a/tests/baselines/reference/moduleAssignmentCompat2.types +++ b/tests/baselines/reference/moduleAssignmentCompat2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleAssignmentCompat2.ts] //// === moduleAssignmentCompat2.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -9,7 +9,7 @@ module A { >C : C > : ^ } -module B { +namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/moduleAssignmentCompat3.errors.txt b/tests/baselines/reference/moduleAssignmentCompat3.errors.txt index 1643bfe42d87f..b210565638fcf 100644 --- a/tests/baselines/reference/moduleAssignmentCompat3.errors.txt +++ b/tests/baselines/reference/moduleAssignmentCompat3.errors.txt @@ -3,10 +3,10 @@ moduleAssignmentCompat3.ts(9,8): error TS2709: Cannot use namespace 'B' as a typ ==== moduleAssignmentCompat3.ts (2 errors) ==== - module A { + namespace A { export var x = 1; } - module B { + namespace B { export var x = ""; } diff --git a/tests/baselines/reference/moduleAssignmentCompat3.js b/tests/baselines/reference/moduleAssignmentCompat3.js index 9ca47dc251ea9..823518659e48c 100644 --- a/tests/baselines/reference/moduleAssignmentCompat3.js +++ b/tests/baselines/reference/moduleAssignmentCompat3.js @@ -1,10 +1,10 @@ //// [tests/cases/compiler/moduleAssignmentCompat3.ts] //// //// [moduleAssignmentCompat3.ts] -module A { +namespace A { export var x = 1; } -module B { +namespace B { export var x = ""; } diff --git a/tests/baselines/reference/moduleAssignmentCompat3.symbols b/tests/baselines/reference/moduleAssignmentCompat3.symbols index 1887d56b6992d..7e1597957136f 100644 --- a/tests/baselines/reference/moduleAssignmentCompat3.symbols +++ b/tests/baselines/reference/moduleAssignmentCompat3.symbols @@ -1,13 +1,13 @@ //// [tests/cases/compiler/moduleAssignmentCompat3.ts] //// === moduleAssignmentCompat3.ts === -module A { +namespace A { >A : Symbol(A, Decl(moduleAssignmentCompat3.ts, 0, 0)) export var x = 1; >x : Symbol(x, Decl(moduleAssignmentCompat3.ts, 1, 14)) } -module B { +namespace B { >B : Symbol(B, Decl(moduleAssignmentCompat3.ts, 2, 1)) export var x = ""; diff --git a/tests/baselines/reference/moduleAssignmentCompat3.types b/tests/baselines/reference/moduleAssignmentCompat3.types index 1fafbff219191..8219052ef0032 100644 --- a/tests/baselines/reference/moduleAssignmentCompat3.types +++ b/tests/baselines/reference/moduleAssignmentCompat3.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleAssignmentCompat3.ts] //// === moduleAssignmentCompat3.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -11,7 +11,7 @@ module A { >1 : 1 > : ^ } -module B { +namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/moduleAssignmentCompat4.errors.txt b/tests/baselines/reference/moduleAssignmentCompat4.errors.txt index 0220f7c46e6d3..8d6d0029cbd3f 100644 --- a/tests/baselines/reference/moduleAssignmentCompat4.errors.txt +++ b/tests/baselines/reference/moduleAssignmentCompat4.errors.txt @@ -3,13 +3,13 @@ moduleAssignmentCompat4.ts(13,8): error TS2709: Cannot use namespace 'B' as a ty ==== moduleAssignmentCompat4.ts (2 errors) ==== - module A { - export module M { + namespace A { + export namespace M { class C { } } } - module B { - export module M { + namespace B { + export namespace M { export class D { } } } diff --git a/tests/baselines/reference/moduleAssignmentCompat4.js b/tests/baselines/reference/moduleAssignmentCompat4.js index 45ea0dcfb4cdb..1b506eecc6a90 100644 --- a/tests/baselines/reference/moduleAssignmentCompat4.js +++ b/tests/baselines/reference/moduleAssignmentCompat4.js @@ -1,13 +1,13 @@ //// [tests/cases/compiler/moduleAssignmentCompat4.ts] //// //// [moduleAssignmentCompat4.ts] -module A { - export module M { +namespace A { + export namespace M { class C { } } } -module B { - export module M { +namespace B { + export namespace M { export class D { } } } diff --git a/tests/baselines/reference/moduleAssignmentCompat4.symbols b/tests/baselines/reference/moduleAssignmentCompat4.symbols index 9ebfba0ea4da3..0a9b4c0edf2c3 100644 --- a/tests/baselines/reference/moduleAssignmentCompat4.symbols +++ b/tests/baselines/reference/moduleAssignmentCompat4.symbols @@ -1,24 +1,24 @@ //// [tests/cases/compiler/moduleAssignmentCompat4.ts] //// === moduleAssignmentCompat4.ts === -module A { +namespace A { >A : Symbol(A, Decl(moduleAssignmentCompat4.ts, 0, 0)) - export module M { ->M : Symbol(M, Decl(moduleAssignmentCompat4.ts, 0, 10)) + export namespace M { +>M : Symbol(M, Decl(moduleAssignmentCompat4.ts, 0, 13)) class C { } ->C : Symbol(C, Decl(moduleAssignmentCompat4.ts, 1, 20)) +>C : Symbol(C, Decl(moduleAssignmentCompat4.ts, 1, 23)) } } -module B { +namespace B { >B : Symbol(B, Decl(moduleAssignmentCompat4.ts, 4, 1)) - export module M { ->M : Symbol(M, Decl(moduleAssignmentCompat4.ts, 5, 10)) + export namespace M { +>M : Symbol(M, Decl(moduleAssignmentCompat4.ts, 5, 13)) export class D { } ->D : Symbol(D, Decl(moduleAssignmentCompat4.ts, 6, 21)) +>D : Symbol(D, Decl(moduleAssignmentCompat4.ts, 6, 24)) } } diff --git a/tests/baselines/reference/moduleAssignmentCompat4.types b/tests/baselines/reference/moduleAssignmentCompat4.types index 8e3b333581bf0..78d4aa01c0857 100644 --- a/tests/baselines/reference/moduleAssignmentCompat4.types +++ b/tests/baselines/reference/moduleAssignmentCompat4.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/moduleAssignmentCompat4.ts] //// === moduleAssignmentCompat4.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ - export module M { + export namespace M { >M : typeof M > : ^^^^^^^^ @@ -14,11 +14,11 @@ module A { > : ^ } } -module B { +namespace B { >B : typeof B > : ^^^^^^^^ - export module M { + export namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/moduleAugmentationNoNewNames.js b/tests/baselines/reference/moduleAugmentationNoNewNames.js index 939fa2ca85d3a..254db79ce403e 100644 --- a/tests/baselines/reference/moduleAugmentationNoNewNames.js +++ b/tests/baselines/reference/moduleAugmentationNoNewNames.js @@ -12,7 +12,7 @@ declare module "./observable" { class Bar {} let y: number, z: string; let {a: x, b: x1}: {a: number, b: number}; - module Z {} + namespace Z {} } //// [observable.ts] diff --git a/tests/baselines/reference/moduleAugmentationNoNewNames.symbols b/tests/baselines/reference/moduleAugmentationNoNewNames.symbols index 37b77c5fc8fdb..25eeab07e2323 100644 --- a/tests/baselines/reference/moduleAugmentationNoNewNames.symbols +++ b/tests/baselines/reference/moduleAugmentationNoNewNames.symbols @@ -41,7 +41,7 @@ declare module "./observable" { >a : Symbol(a, Decl(map.ts, 10, 24)) >b : Symbol(b, Decl(map.ts, 10, 34)) - module Z {} + namespace Z {} >Z : Symbol(Z, Decl(map.ts, 10, 46)) } diff --git a/tests/baselines/reference/moduleAugmentationNoNewNames.types b/tests/baselines/reference/moduleAugmentationNoNewNames.types index 0e7be89f26576..14c8589ab0099 100644 --- a/tests/baselines/reference/moduleAugmentationNoNewNames.types +++ b/tests/baselines/reference/moduleAugmentationNoNewNames.types @@ -60,7 +60,7 @@ declare module "./observable" { >b : number > : ^^^^^^ - module Z {} + namespace Z {} } === observable.ts === diff --git a/tests/baselines/reference/moduleClassArrayCodeGenTest.errors.txt b/tests/baselines/reference/moduleClassArrayCodeGenTest.errors.txt index d3fe9ca151c49..72adf78dfc2fc 100644 --- a/tests/baselines/reference/moduleClassArrayCodeGenTest.errors.txt +++ b/tests/baselines/reference/moduleClassArrayCodeGenTest.errors.txt @@ -4,7 +4,7 @@ moduleClassArrayCodeGenTest.ts(10,11): error TS2694: Namespace 'M' has no export ==== moduleClassArrayCodeGenTest.ts (1 errors) ==== // Invalid code gen for Array of Module class - module M + namespace M { export class A { } class B{ } diff --git a/tests/baselines/reference/moduleClassArrayCodeGenTest.js b/tests/baselines/reference/moduleClassArrayCodeGenTest.js index b67a42a03a051..05fa75d326dd2 100644 --- a/tests/baselines/reference/moduleClassArrayCodeGenTest.js +++ b/tests/baselines/reference/moduleClassArrayCodeGenTest.js @@ -3,7 +3,7 @@ //// [moduleClassArrayCodeGenTest.ts] // Invalid code gen for Array of Module class -module M +namespace M { export class A { } class B{ } diff --git a/tests/baselines/reference/moduleClassArrayCodeGenTest.symbols b/tests/baselines/reference/moduleClassArrayCodeGenTest.symbols index 0c4e636bc863c..f52f757893297 100644 --- a/tests/baselines/reference/moduleClassArrayCodeGenTest.symbols +++ b/tests/baselines/reference/moduleClassArrayCodeGenTest.symbols @@ -3,7 +3,7 @@ === moduleClassArrayCodeGenTest.ts === // Invalid code gen for Array of Module class -module M +namespace M >M : Symbol(M, Decl(moduleClassArrayCodeGenTest.ts, 0, 0)) { export class A { } diff --git a/tests/baselines/reference/moduleClassArrayCodeGenTest.types b/tests/baselines/reference/moduleClassArrayCodeGenTest.types index ced3a0ab7a366..ba377eb9f5a50 100644 --- a/tests/baselines/reference/moduleClassArrayCodeGenTest.types +++ b/tests/baselines/reference/moduleClassArrayCodeGenTest.types @@ -3,7 +3,7 @@ === moduleClassArrayCodeGenTest.ts === // Invalid code gen for Array of Module class -module M +namespace M >M : typeof M > : ^^^^^^^^ { diff --git a/tests/baselines/reference/moduleCodeGenTest3.js b/tests/baselines/reference/moduleCodeGenTest3.js index 5cf8dd3634eac..4544ff4a0a6e5 100644 --- a/tests/baselines/reference/moduleCodeGenTest3.js +++ b/tests/baselines/reference/moduleCodeGenTest3.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleCodeGenTest3.ts] //// //// [moduleCodeGenTest3.ts] -module Baz { export var x = "hello"; } +namespace Baz { export var x = "hello"; } Baz.x = "goodbye"; diff --git a/tests/baselines/reference/moduleCodeGenTest3.symbols b/tests/baselines/reference/moduleCodeGenTest3.symbols index 0d0b351b561d7..21e773d559e2a 100644 --- a/tests/baselines/reference/moduleCodeGenTest3.symbols +++ b/tests/baselines/reference/moduleCodeGenTest3.symbols @@ -1,12 +1,12 @@ //// [tests/cases/compiler/moduleCodeGenTest3.ts] //// === moduleCodeGenTest3.ts === -module Baz { export var x = "hello"; } +namespace Baz { export var x = "hello"; } >Baz : Symbol(Baz, Decl(moduleCodeGenTest3.ts, 0, 0)) ->x : Symbol(x, Decl(moduleCodeGenTest3.ts, 0, 23)) +>x : Symbol(x, Decl(moduleCodeGenTest3.ts, 0, 26)) Baz.x = "goodbye"; ->Baz.x : Symbol(Baz.x, Decl(moduleCodeGenTest3.ts, 0, 23)) +>Baz.x : Symbol(Baz.x, Decl(moduleCodeGenTest3.ts, 0, 26)) >Baz : Symbol(Baz, Decl(moduleCodeGenTest3.ts, 0, 0)) ->x : Symbol(Baz.x, Decl(moduleCodeGenTest3.ts, 0, 23)) +>x : Symbol(Baz.x, Decl(moduleCodeGenTest3.ts, 0, 26)) diff --git a/tests/baselines/reference/moduleCodeGenTest3.types b/tests/baselines/reference/moduleCodeGenTest3.types index b0aa027280add..28b1af4dcf1a6 100644 --- a/tests/baselines/reference/moduleCodeGenTest3.types +++ b/tests/baselines/reference/moduleCodeGenTest3.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleCodeGenTest3.ts] //// === moduleCodeGenTest3.ts === -module Baz { export var x = "hello"; } +namespace Baz { export var x = "hello"; } >Baz : typeof Baz > : ^^^^^^^^^^ >x : string diff --git a/tests/baselines/reference/moduleCodegenTest4.js b/tests/baselines/reference/moduleCodegenTest4.js index 5378c57cb6cd0..fb8971067911a 100644 --- a/tests/baselines/reference/moduleCodegenTest4.js +++ b/tests/baselines/reference/moduleCodegenTest4.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleCodegenTest4.ts] //// //// [moduleCodegenTest4.ts] -export module Baz { export var x = "hello"; } +export namespace Baz { export var x = "hello"; } Baz.x = "goodbye"; void 0; diff --git a/tests/baselines/reference/moduleCodegenTest4.symbols b/tests/baselines/reference/moduleCodegenTest4.symbols index 4c3e3e024db1a..c0ba4b074cb8b 100644 --- a/tests/baselines/reference/moduleCodegenTest4.symbols +++ b/tests/baselines/reference/moduleCodegenTest4.symbols @@ -1,13 +1,13 @@ //// [tests/cases/compiler/moduleCodegenTest4.ts] //// === moduleCodegenTest4.ts === -export module Baz { export var x = "hello"; } +export namespace Baz { export var x = "hello"; } >Baz : Symbol(Baz, Decl(moduleCodegenTest4.ts, 0, 0)) ->x : Symbol(x, Decl(moduleCodegenTest4.ts, 0, 30)) +>x : Symbol(x, Decl(moduleCodegenTest4.ts, 0, 33)) Baz.x = "goodbye"; ->Baz.x : Symbol(Baz.x, Decl(moduleCodegenTest4.ts, 0, 30)) +>Baz.x : Symbol(Baz.x, Decl(moduleCodegenTest4.ts, 0, 33)) >Baz : Symbol(Baz, Decl(moduleCodegenTest4.ts, 0, 0)) ->x : Symbol(Baz.x, Decl(moduleCodegenTest4.ts, 0, 30)) +>x : Symbol(Baz.x, Decl(moduleCodegenTest4.ts, 0, 33)) void 0; diff --git a/tests/baselines/reference/moduleCodegenTest4.types b/tests/baselines/reference/moduleCodegenTest4.types index afe8768e10da8..626eeaed6c500 100644 --- a/tests/baselines/reference/moduleCodegenTest4.types +++ b/tests/baselines/reference/moduleCodegenTest4.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleCodegenTest4.ts] //// === moduleCodegenTest4.ts === -export module Baz { export var x = "hello"; } +export namespace Baz { export var x = "hello"; } >Baz : typeof Baz > : ^^^^^^^^^^ >x : string diff --git a/tests/baselines/reference/moduleCrashBug1.errors.txt b/tests/baselines/reference/moduleCrashBug1.errors.txt index e7ad457d04b5e..fff01650da81c 100644 --- a/tests/baselines/reference/moduleCrashBug1.errors.txt +++ b/tests/baselines/reference/moduleCrashBug1.errors.txt @@ -2,7 +2,7 @@ moduleCrashBug1.ts(18,9): error TS2709: Cannot use namespace '_modes' as a type. ==== moduleCrashBug1.ts (1 errors) ==== - module _modes { + namespace _modes { export interface IMode { } @@ -14,7 +14,7 @@ moduleCrashBug1.ts(18,9): error TS2709: Cannot use namespace '_modes' as a type. //_modes. // produces an internal error - please implement in derived class - module editor { + namespace editor { import modes = _modes; } diff --git a/tests/baselines/reference/moduleCrashBug1.js b/tests/baselines/reference/moduleCrashBug1.js index c97555cc26af4..9ae4f0703bc49 100644 --- a/tests/baselines/reference/moduleCrashBug1.js +++ b/tests/baselines/reference/moduleCrashBug1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleCrashBug1.ts] //// //// [moduleCrashBug1.ts] -module _modes { +namespace _modes { export interface IMode { } @@ -13,7 +13,7 @@ module _modes { //_modes. // produces an internal error - please implement in derived class -module editor { +namespace editor { import modes = _modes; } diff --git a/tests/baselines/reference/moduleCrashBug1.symbols b/tests/baselines/reference/moduleCrashBug1.symbols index efaaa98fb0ff7..4cf90272f54d3 100644 --- a/tests/baselines/reference/moduleCrashBug1.symbols +++ b/tests/baselines/reference/moduleCrashBug1.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/moduleCrashBug1.ts] //// === moduleCrashBug1.ts === -module _modes { +namespace _modes { >_modes : Symbol(_modes, Decl(moduleCrashBug1.ts, 0, 0)) export interface IMode { ->IMode : Symbol(IMode, Decl(moduleCrashBug1.ts, 0, 15)) +>IMode : Symbol(IMode, Decl(moduleCrashBug1.ts, 0, 18)) } @@ -17,11 +17,11 @@ module _modes { //_modes. // produces an internal error - please implement in derived class -module editor { +namespace editor { >editor : Symbol(editor, Decl(moduleCrashBug1.ts, 8, 1)) import modes = _modes; ->modes : Symbol(modes, Decl(moduleCrashBug1.ts, 12, 15)) +>modes : Symbol(modes, Decl(moduleCrashBug1.ts, 12, 18)) >_modes : Symbol(modes, Decl(moduleCrashBug1.ts, 0, 0)) } diff --git a/tests/baselines/reference/moduleCrashBug1.types b/tests/baselines/reference/moduleCrashBug1.types index 5bd66d656bca7..22f48c2390165 100644 --- a/tests/baselines/reference/moduleCrashBug1.types +++ b/tests/baselines/reference/moduleCrashBug1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleCrashBug1.ts] //// === moduleCrashBug1.ts === -module _modes { +namespace _modes { >_modes : typeof _modes > : ^^^^^^^^^^^^^ @@ -18,7 +18,7 @@ module _modes { //_modes. // produces an internal error - please implement in derived class -module editor { +namespace editor { import modes = _modes; >modes : typeof modes > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/moduleElementsInWrongContext.errors.txt b/tests/baselines/reference/moduleElementsInWrongContext.errors.txt index 205ad33b96f35..af0204ba8e224 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext.errors.txt +++ b/tests/baselines/reference/moduleElementsInWrongContext.errors.txt @@ -19,8 +19,8 @@ moduleElementsInWrongContext.ts(28,5): error TS1232: An import declaration can o ==== moduleElementsInWrongContext.ts (17 errors) ==== { - module M { } - ~~~~~~ + namespace M { } + ~~~~~~~~~ !!! error TS1235: A namespace declaration is only allowed at the top level of a namespace or module. export namespace N { ~~~~~~ diff --git a/tests/baselines/reference/moduleElementsInWrongContext.js b/tests/baselines/reference/moduleElementsInWrongContext.js index 312038e50f63d..7f815fd504e9a 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext.js +++ b/tests/baselines/reference/moduleElementsInWrongContext.js @@ -2,7 +2,7 @@ //// [moduleElementsInWrongContext.ts] { - module M { } + namespace M { } export namespace N { export interface I { } } diff --git a/tests/baselines/reference/moduleElementsInWrongContext.symbols b/tests/baselines/reference/moduleElementsInWrongContext.symbols index ee24c9ed3710e..9bb4ff0da426a 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext.symbols +++ b/tests/baselines/reference/moduleElementsInWrongContext.symbols @@ -2,11 +2,11 @@ === moduleElementsInWrongContext.ts === { - module M { } + namespace M { } >M : Symbol(M, Decl(moduleElementsInWrongContext.ts, 0, 1)) export namespace N { ->N : Symbol(N, Decl(moduleElementsInWrongContext.ts, 1, 16)) +>N : Symbol(N, Decl(moduleElementsInWrongContext.ts, 1, 19)) export interface I { } >I : Symbol(I, Decl(moduleElementsInWrongContext.ts, 2, 24)) diff --git a/tests/baselines/reference/moduleElementsInWrongContext.types b/tests/baselines/reference/moduleElementsInWrongContext.types index e1e7d4904729f..389bfc8eef927 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext.types +++ b/tests/baselines/reference/moduleElementsInWrongContext.types @@ -2,7 +2,7 @@ === moduleElementsInWrongContext.ts === { - module M { } + namespace M { } export namespace N { export interface I { } } diff --git a/tests/baselines/reference/moduleElementsInWrongContext2.errors.txt b/tests/baselines/reference/moduleElementsInWrongContext2.errors.txt index c841e04874c2c..5198a067f37c9 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext2.errors.txt +++ b/tests/baselines/reference/moduleElementsInWrongContext2.errors.txt @@ -19,8 +19,8 @@ moduleElementsInWrongContext2.ts(28,5): error TS1232: An import declaration can ==== moduleElementsInWrongContext2.ts (17 errors) ==== function blah () { - module M { } - ~~~~~~ + namespace M { } + ~~~~~~~~~ !!! error TS1235: A namespace declaration is only allowed at the top level of a namespace or module. export namespace N { ~~~~~~ diff --git a/tests/baselines/reference/moduleElementsInWrongContext2.js b/tests/baselines/reference/moduleElementsInWrongContext2.js index 09ac9dc91d8c1..bcc20d8b8e703 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext2.js +++ b/tests/baselines/reference/moduleElementsInWrongContext2.js @@ -2,7 +2,7 @@ //// [moduleElementsInWrongContext2.ts] function blah () { - module M { } + namespace M { } export namespace N { export interface I { } } diff --git a/tests/baselines/reference/moduleElementsInWrongContext2.symbols b/tests/baselines/reference/moduleElementsInWrongContext2.symbols index 5b4201ad56fbd..4536d1db57bfc 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext2.symbols +++ b/tests/baselines/reference/moduleElementsInWrongContext2.symbols @@ -4,11 +4,11 @@ function blah () { >blah : Symbol(blah, Decl(moduleElementsInWrongContext2.ts, 0, 0)) - module M { } + namespace M { } >M : Symbol(M, Decl(moduleElementsInWrongContext2.ts, 0, 18)) export namespace N { ->N : Symbol(N, Decl(moduleElementsInWrongContext2.ts, 1, 16)) +>N : Symbol(N, Decl(moduleElementsInWrongContext2.ts, 1, 19)) export interface I { } >I : Symbol(I, Decl(moduleElementsInWrongContext2.ts, 2, 24)) diff --git a/tests/baselines/reference/moduleElementsInWrongContext2.types b/tests/baselines/reference/moduleElementsInWrongContext2.types index 2c0dd89a1658a..aa7f8c4fef7aa 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext2.types +++ b/tests/baselines/reference/moduleElementsInWrongContext2.types @@ -5,7 +5,7 @@ function blah () { >blah : () => void > : ^^^^^^^^^^ - module M { } + namespace M { } export namespace N { export interface I { } } diff --git a/tests/baselines/reference/moduleElementsInWrongContext3.errors.txt b/tests/baselines/reference/moduleElementsInWrongContext3.errors.txt index 52720f8a0b7c2..dc5ebd4bf9d74 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext3.errors.txt +++ b/tests/baselines/reference/moduleElementsInWrongContext3.errors.txt @@ -18,10 +18,10 @@ moduleElementsInWrongContext3.ts(29,9): error TS1232: An import declaration can ==== moduleElementsInWrongContext3.ts (17 errors) ==== - module P { + namespace P { { - module M { } - ~~~~~~ + namespace M { } + ~~~~~~~~~ !!! error TS1235: A namespace declaration is only allowed at the top level of a namespace or module. export namespace N { ~~~~~~ diff --git a/tests/baselines/reference/moduleElementsInWrongContext3.js b/tests/baselines/reference/moduleElementsInWrongContext3.js index ae224f5387af9..b28181167f1c9 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext3.js +++ b/tests/baselines/reference/moduleElementsInWrongContext3.js @@ -1,9 +1,9 @@ //// [tests/cases/compiler/moduleElementsInWrongContext3.ts] //// //// [moduleElementsInWrongContext3.ts] -module P { +namespace P { { - module M { } + namespace M { } export namespace N { export interface I { } } diff --git a/tests/baselines/reference/moduleElementsInWrongContext3.symbols b/tests/baselines/reference/moduleElementsInWrongContext3.symbols index 8985d01fac89d..b742bf7318f55 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext3.symbols +++ b/tests/baselines/reference/moduleElementsInWrongContext3.symbols @@ -1,14 +1,14 @@ //// [tests/cases/compiler/moduleElementsInWrongContext3.ts] //// === moduleElementsInWrongContext3.ts === -module P { +namespace P { >P : Symbol(P, Decl(moduleElementsInWrongContext3.ts, 0, 0)) { - module M { } + namespace M { } >M : Symbol(M, Decl(moduleElementsInWrongContext3.ts, 1, 5)) export namespace N { ->N : Symbol(N, Decl(moduleElementsInWrongContext3.ts, 2, 20)) +>N : Symbol(N, Decl(moduleElementsInWrongContext3.ts, 2, 23)) export interface I { } >I : Symbol(I, Decl(moduleElementsInWrongContext3.ts, 3, 28)) diff --git a/tests/baselines/reference/moduleElementsInWrongContext3.types b/tests/baselines/reference/moduleElementsInWrongContext3.types index 259f82410e96b..4e2786e3a8117 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext3.types +++ b/tests/baselines/reference/moduleElementsInWrongContext3.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/moduleElementsInWrongContext3.ts] //// === moduleElementsInWrongContext3.ts === -module P { +namespace P { >P : typeof P > : ^^^^^^^^ { - module M { } + namespace M { } export namespace N { export interface I { } } diff --git a/tests/baselines/reference/moduleExports1.errors.txt b/tests/baselines/reference/moduleExports1.errors.txt index 299a23e0e3243..51e0d41d46137 100644 --- a/tests/baselines/reference/moduleExports1.errors.txt +++ b/tests/baselines/reference/moduleExports1.errors.txt @@ -1,15 +1,12 @@ -moduleExports1.ts(13,6): error TS2580: Cannot find name 'module'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`. -moduleExports1.ts(13,22): error TS2580: Cannot find name 'module'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`. +moduleExports1.ts(1,15): error TS2304: Cannot find name 'TypeScript'. +moduleExports1.ts(7,6): error TS2580: Cannot find name 'module'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`. +moduleExports1.ts(7,22): error TS2580: Cannot find name 'module'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`. -==== moduleExports1.ts (2 errors) ==== - export module TypeScript.Strasse.Street { - export class Rue { - public address:string; - } - } - +==== moduleExports1.ts (3 errors) ==== var rue = new TypeScript.Strasse.Street.Rue(); + ~~~~~~~~~~ +!!! error TS2304: Cannot find name 'TypeScript'. rue.address = "1 Main Street"; diff --git a/tests/baselines/reference/moduleExports1.js b/tests/baselines/reference/moduleExports1.js index 28c3283857d89..d3e02fc28e444 100644 --- a/tests/baselines/reference/moduleExports1.js +++ b/tests/baselines/reference/moduleExports1.js @@ -1,12 +1,6 @@ //// [tests/cases/compiler/moduleExports1.ts] //// //// [moduleExports1.ts] -export module TypeScript.Strasse.Street { - export class Rue { - public address:string; - } -} - var rue = new TypeScript.Strasse.Street.Rue(); rue.address = "1 Main Street"; @@ -16,28 +10,8 @@ void 0; if (!module.exports) module.exports = ""; //// [moduleExports1.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); - exports.TypeScript = void 0; - var TypeScript; - (function (TypeScript) { - var Strasse; - (function (Strasse) { - var Street; - (function (Street) { - var Rue = /** @class */ (function () { - function Rue() { - } - return Rue; - }()); - Street.Rue = Rue; - })(Street = Strasse.Street || (Strasse.Street = {})); - })(Strasse = TypeScript.Strasse || (TypeScript.Strasse = {})); - })(TypeScript || (exports.TypeScript = TypeScript = {})); - var rue = new TypeScript.Strasse.Street.Rue(); - rue.address = "1 Main Street"; - void 0; - if (!module.exports) - module.exports = ""; -}); +var rue = new TypeScript.Strasse.Street.Rue(); +rue.address = "1 Main Street"; +void 0; +if (!module.exports) + module.exports = ""; diff --git a/tests/baselines/reference/moduleExports1.symbols b/tests/baselines/reference/moduleExports1.symbols index b0c54318c3d14..60e7089a15823 100644 --- a/tests/baselines/reference/moduleExports1.symbols +++ b/tests/baselines/reference/moduleExports1.symbols @@ -1,33 +1,11 @@ //// [tests/cases/compiler/moduleExports1.ts] //// === moduleExports1.ts === -export module TypeScript.Strasse.Street { ->TypeScript : Symbol(TypeScript, Decl(moduleExports1.ts, 0, 0)) ->Strasse : Symbol(Strasse, Decl(moduleExports1.ts, 0, 25)) ->Street : Symbol(Street, Decl(moduleExports1.ts, 0, 33)) - - export class Rue { ->Rue : Symbol(Rue, Decl(moduleExports1.ts, 0, 41)) - - public address:string; ->address : Symbol(Rue.address, Decl(moduleExports1.ts, 1, 19)) - } -} - var rue = new TypeScript.Strasse.Street.Rue(); ->rue : Symbol(rue, Decl(moduleExports1.ts, 6, 3)) ->TypeScript.Strasse.Street.Rue : Symbol(TypeScript.Strasse.Street.Rue, Decl(moduleExports1.ts, 0, 41)) ->TypeScript.Strasse.Street : Symbol(TypeScript.Strasse.Street, Decl(moduleExports1.ts, 0, 33)) ->TypeScript.Strasse : Symbol(TypeScript.Strasse, Decl(moduleExports1.ts, 0, 25)) ->TypeScript : Symbol(TypeScript, Decl(moduleExports1.ts, 0, 0)) ->Strasse : Symbol(TypeScript.Strasse, Decl(moduleExports1.ts, 0, 25)) ->Street : Symbol(TypeScript.Strasse.Street, Decl(moduleExports1.ts, 0, 33)) ->Rue : Symbol(TypeScript.Strasse.Street.Rue, Decl(moduleExports1.ts, 0, 41)) +>rue : Symbol(rue, Decl(moduleExports1.ts, 0, 3)) rue.address = "1 Main Street"; ->rue.address : Symbol(TypeScript.Strasse.Street.Rue.address, Decl(moduleExports1.ts, 1, 19)) ->rue : Symbol(rue, Decl(moduleExports1.ts, 6, 3)) ->address : Symbol(TypeScript.Strasse.Street.Rue.address, Decl(moduleExports1.ts, 1, 19)) +>rue : Symbol(rue, Decl(moduleExports1.ts, 0, 3)) void 0; diff --git a/tests/baselines/reference/moduleExports1.types b/tests/baselines/reference/moduleExports1.types index 6aeb420d7ee37..5e0963218e304 100644 --- a/tests/baselines/reference/moduleExports1.types +++ b/tests/baselines/reference/moduleExports1.types @@ -1,53 +1,35 @@ //// [tests/cases/compiler/moduleExports1.ts] //// === moduleExports1.ts === -export module TypeScript.Strasse.Street { ->TypeScript : typeof TypeScript -> : ^^^^^^^^^^^^^^^^^ ->Strasse : typeof Strasse -> : ^^^^^^^^^^^^^^ ->Street : typeof Street -> : ^^^^^^^^^^^^^ - - export class Rue { ->Rue : Rue -> : ^^^ - - public address:string; ->address : string -> : ^^^^^^ - } -} - var rue = new TypeScript.Strasse.Street.Rue(); ->rue : TypeScript.Strasse.Street.Rue -> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ->new TypeScript.Strasse.Street.Rue() : TypeScript.Strasse.Street.Rue -> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ->TypeScript.Strasse.Street.Rue : typeof TypeScript.Strasse.Street.Rue -> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ->TypeScript.Strasse.Street : typeof TypeScript.Strasse.Street -> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ->TypeScript.Strasse : typeof TypeScript.Strasse -> : ^^^^^^^^^^^^^^^^^^^^^^^^^ ->TypeScript : typeof TypeScript -> : ^^^^^^^^^^^^^^^^^ ->Strasse : typeof TypeScript.Strasse -> : ^^^^^^^^^^^^^^^^^^^^^^^^^ ->Street : typeof TypeScript.Strasse.Street -> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ->Rue : typeof TypeScript.Strasse.Street.Rue -> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +>rue : any +> : ^^^ +>new TypeScript.Strasse.Street.Rue() : any +> : ^^^ +>TypeScript.Strasse.Street.Rue : any +> : ^^^ +>TypeScript.Strasse.Street : any +> : ^^^ +>TypeScript.Strasse : any +> : ^^^ +>TypeScript : any +> : ^^^ +>Strasse : any +> : ^^^ +>Street : any +> : ^^^ +>Rue : any +> : ^^^ rue.address = "1 Main Street"; >rue.address = "1 Main Street" : "1 Main Street" > : ^^^^^^^^^^^^^^^ ->rue.address : string -> : ^^^^^^ ->rue : TypeScript.Strasse.Street.Rue -> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ->address : string -> : ^^^^^^ +>rue.address : any +> : ^^^ +>rue : any +> : ^^^ +>address : any +> : ^^^ >"1 Main Street" : "1 Main Street" > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/moduleIdentifiers.js b/tests/baselines/reference/moduleIdentifiers.js index f8b6a5fb0807c..921bb15b675ab 100644 --- a/tests/baselines/reference/moduleIdentifiers.js +++ b/tests/baselines/reference/moduleIdentifiers.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleIdentifiers.ts] //// //// [moduleIdentifiers.ts] -module M { +namespace M { interface P { x: number; y: number; } export var a = 1 } diff --git a/tests/baselines/reference/moduleIdentifiers.symbols b/tests/baselines/reference/moduleIdentifiers.symbols index 4a4aeae44bbc9..98b5b4ccfb12b 100644 --- a/tests/baselines/reference/moduleIdentifiers.symbols +++ b/tests/baselines/reference/moduleIdentifiers.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/moduleIdentifiers.ts] //// === moduleIdentifiers.ts === -module M { +namespace M { >M : Symbol(M, Decl(moduleIdentifiers.ts, 0, 0)) interface P { x: number; y: number; } ->P : Symbol(P, Decl(moduleIdentifiers.ts, 0, 10)) +>P : Symbol(P, Decl(moduleIdentifiers.ts, 0, 13)) >x : Symbol(P.x, Decl(moduleIdentifiers.ts, 1, 17)) >y : Symbol(P.y, Decl(moduleIdentifiers.ts, 1, 28)) diff --git a/tests/baselines/reference/moduleIdentifiers.types b/tests/baselines/reference/moduleIdentifiers.types index 92e6fb2be5586..2d722b10cdfd0 100644 --- a/tests/baselines/reference/moduleIdentifiers.types +++ b/tests/baselines/reference/moduleIdentifiers.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleIdentifiers.ts] //// === moduleIdentifiers.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/moduleImport.errors.txt b/tests/baselines/reference/moduleImport.errors.txt index 585eb6dfe19d6..5a6651f6edb12 100644 --- a/tests/baselines/reference/moduleImport.errors.txt +++ b/tests/baselines/reference/moduleImport.errors.txt @@ -1,8 +1,17 @@ +moduleImport.ts(1,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +moduleImport.ts(1,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +moduleImport.ts(1,12): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. moduleImport.ts(2,17): error TS2694: Namespace 'X' has no exported member 'Y'. -==== moduleImport.ts (1 errors) ==== +==== moduleImport.ts (4 errors) ==== module A.B.C { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. import XYZ = X.Y.Z; ~ !!! error TS2694: Namespace 'X' has no exported member 'Y'. @@ -11,7 +20,7 @@ moduleImport.ts(2,17): error TS2694: Namespace 'X' has no exported member 'Y'. } } - module X { + namespace X { import ABC = A.B.C; export function pong(x: number) { if (x > 0) ABC.ping(x-1); diff --git a/tests/baselines/reference/moduleImport.js b/tests/baselines/reference/moduleImport.js index 917e328ca6257..7186f7dc5be3e 100644 --- a/tests/baselines/reference/moduleImport.js +++ b/tests/baselines/reference/moduleImport.js @@ -8,7 +8,7 @@ module A.B.C { } } -module X { +namespace X { import ABC = A.B.C; export function pong(x: number) { if (x > 0) ABC.ping(x-1); diff --git a/tests/baselines/reference/moduleImport.symbols b/tests/baselines/reference/moduleImport.symbols index 2f46a71337be4..fd7238ce3b1b4 100644 --- a/tests/baselines/reference/moduleImport.symbols +++ b/tests/baselines/reference/moduleImport.symbols @@ -21,11 +21,11 @@ module A.B.C { } } -module X { +namespace X { >X : Symbol(X, Decl(moduleImport.ts, 5, 1)) import ABC = A.B.C; ->ABC : Symbol(ABC, Decl(moduleImport.ts, 7, 10)) +>ABC : Symbol(ABC, Decl(moduleImport.ts, 7, 13)) >A : Symbol(A, Decl(moduleImport.ts, 0, 0)) >B : Symbol(A.B, Decl(moduleImport.ts, 0, 9)) >C : Symbol(ABC, Decl(moduleImport.ts, 0, 11)) @@ -37,7 +37,7 @@ module X { if (x > 0) ABC.ping(x-1); >x : Symbol(x, Decl(moduleImport.ts, 9, 22)) >ABC.ping : Symbol(ABC.ping, Decl(moduleImport.ts, 1, 20)) ->ABC : Symbol(ABC, Decl(moduleImport.ts, 7, 10)) +>ABC : Symbol(ABC, Decl(moduleImport.ts, 7, 13)) >ping : Symbol(ABC.ping, Decl(moduleImport.ts, 1, 20)) >x : Symbol(x, Decl(moduleImport.ts, 9, 22)) } diff --git a/tests/baselines/reference/moduleImport.types b/tests/baselines/reference/moduleImport.types index e5a54829278f7..b68ba62933d12 100644 --- a/tests/baselines/reference/moduleImport.types +++ b/tests/baselines/reference/moduleImport.types @@ -49,7 +49,7 @@ module A.B.C { } } -module X { +namespace X { >X : typeof X > : ^^^^^^^^ diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.errors.txt b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.errors.txt new file mode 100644 index 0000000000000..27c6c96e5a71f --- /dev/null +++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.errors.txt @@ -0,0 +1,55 @@ +moduleMemberWithoutTypeAnnotation1.ts(1,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +moduleMemberWithoutTypeAnnotation1.ts(1,19): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== moduleMemberWithoutTypeAnnotation1.ts (2 errors) ==== + module TypeScript.Parser { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + class SyntaxCursor { + public currentNode(): SyntaxNode { + return null; + } + } + } + + namespace TypeScript { + export interface ISyntaxElement { }; + export interface ISyntaxToken { }; + + export class PositionedElement { + public childIndex(child: ISyntaxElement) { + return Syntax.childIndex(); + } + } + + export class PositionedToken { + constructor(parent: PositionedElement, token: ISyntaxToken, fullStart: number) { + } + } + } + + namespace TypeScript { + export class SyntaxNode { + public findToken(position: number, includeSkippedTokens: boolean = false): PositionedToken { + var positionedToken = this.findTokenInternal(null, position, 0); + return null; + } + findTokenInternal(x, y, z) { + return null; + } + } + } + + namespace TypeScript.Syntax { + export function childIndex() { } + + export class VariableWidthTokenWithTrailingTrivia implements ISyntaxToken { + private findTokenInternal(parent: PositionedElement, position: number, fullStart: number) { + return new PositionedToken(parent, this, fullStart); + } + } + } + \ No newline at end of file diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.js b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.js index 769e83b227a5c..13bf3315d7072 100644 --- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.js +++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.js @@ -9,7 +9,7 @@ module TypeScript.Parser { } } -module TypeScript { +namespace TypeScript { export interface ISyntaxElement { }; export interface ISyntaxToken { }; @@ -25,7 +25,7 @@ module TypeScript { } } -module TypeScript { +namespace TypeScript { export class SyntaxNode { public findToken(position: number, includeSkippedTokens: boolean = false): PositionedToken { var positionedToken = this.findTokenInternal(null, position, 0); @@ -37,7 +37,7 @@ module TypeScript { } } -module TypeScript.Syntax { +namespace TypeScript.Syntax { export function childIndex() { } export class VariableWidthTokenWithTrailingTrivia implements ISyntaxToken { diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.symbols b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.symbols index aa1045093d243..767967c1c1de1 100644 --- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.symbols +++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.symbols @@ -10,18 +10,18 @@ module TypeScript.Parser { public currentNode(): SyntaxNode { >currentNode : Symbol(SyntaxCursor.currentNode, Decl(moduleMemberWithoutTypeAnnotation1.ts, 1, 24)) ->SyntaxNode : Symbol(SyntaxNode, Decl(moduleMemberWithoutTypeAnnotation1.ts, 24, 19)) +>SyntaxNode : Symbol(SyntaxNode, Decl(moduleMemberWithoutTypeAnnotation1.ts, 24, 22)) return null; } } } -module TypeScript { +namespace TypeScript { >TypeScript : Symbol(TypeScript, Decl(moduleMemberWithoutTypeAnnotation1.ts, 0, 0), Decl(moduleMemberWithoutTypeAnnotation1.ts, 6, 1), Decl(moduleMemberWithoutTypeAnnotation1.ts, 22, 1), Decl(moduleMemberWithoutTypeAnnotation1.ts, 34, 1)) export interface ISyntaxElement { }; ->ISyntaxElement : Symbol(ISyntaxElement, Decl(moduleMemberWithoutTypeAnnotation1.ts, 8, 19)) +>ISyntaxElement : Symbol(ISyntaxElement, Decl(moduleMemberWithoutTypeAnnotation1.ts, 8, 22)) export interface ISyntaxToken { }; >ISyntaxToken : Symbol(ISyntaxToken, Decl(moduleMemberWithoutTypeAnnotation1.ts, 9, 40)) @@ -32,12 +32,12 @@ module TypeScript { public childIndex(child: ISyntaxElement) { >childIndex : Symbol(PositionedElement.childIndex, Decl(moduleMemberWithoutTypeAnnotation1.ts, 12, 36)) >child : Symbol(child, Decl(moduleMemberWithoutTypeAnnotation1.ts, 13, 26)) ->ISyntaxElement : Symbol(ISyntaxElement, Decl(moduleMemberWithoutTypeAnnotation1.ts, 8, 19)) +>ISyntaxElement : Symbol(ISyntaxElement, Decl(moduleMemberWithoutTypeAnnotation1.ts, 8, 22)) return Syntax.childIndex(); ->Syntax.childIndex : Symbol(Syntax.childIndex, Decl(moduleMemberWithoutTypeAnnotation1.ts, 36, 26)) ->Syntax : Symbol(Syntax, Decl(moduleMemberWithoutTypeAnnotation1.ts, 36, 18)) ->childIndex : Symbol(Syntax.childIndex, Decl(moduleMemberWithoutTypeAnnotation1.ts, 36, 26)) +>Syntax.childIndex : Symbol(Syntax.childIndex, Decl(moduleMemberWithoutTypeAnnotation1.ts, 36, 29)) +>Syntax : Symbol(Syntax, Decl(moduleMemberWithoutTypeAnnotation1.ts, 36, 21)) +>childIndex : Symbol(Syntax.childIndex, Decl(moduleMemberWithoutTypeAnnotation1.ts, 36, 29)) } } @@ -54,11 +54,11 @@ module TypeScript { } } -module TypeScript { +namespace TypeScript { >TypeScript : Symbol(TypeScript, Decl(moduleMemberWithoutTypeAnnotation1.ts, 0, 0), Decl(moduleMemberWithoutTypeAnnotation1.ts, 6, 1), Decl(moduleMemberWithoutTypeAnnotation1.ts, 22, 1), Decl(moduleMemberWithoutTypeAnnotation1.ts, 34, 1)) export class SyntaxNode { ->SyntaxNode : Symbol(SyntaxNode, Decl(moduleMemberWithoutTypeAnnotation1.ts, 24, 19)) +>SyntaxNode : Symbol(SyntaxNode, Decl(moduleMemberWithoutTypeAnnotation1.ts, 24, 22)) public findToken(position: number, includeSkippedTokens: boolean = false): PositionedToken { >findToken : Symbol(SyntaxNode.findToken, Decl(moduleMemberWithoutTypeAnnotation1.ts, 25, 29)) @@ -69,7 +69,7 @@ module TypeScript { var positionedToken = this.findTokenInternal(null, position, 0); >positionedToken : Symbol(positionedToken, Decl(moduleMemberWithoutTypeAnnotation1.ts, 27, 15)) >this.findTokenInternal : Symbol(SyntaxNode.findTokenInternal, Decl(moduleMemberWithoutTypeAnnotation1.ts, 29, 9)) ->this : Symbol(SyntaxNode, Decl(moduleMemberWithoutTypeAnnotation1.ts, 24, 19)) +>this : Symbol(SyntaxNode, Decl(moduleMemberWithoutTypeAnnotation1.ts, 24, 22)) >findTokenInternal : Symbol(SyntaxNode.findTokenInternal, Decl(moduleMemberWithoutTypeAnnotation1.ts, 29, 9)) >position : Symbol(position, Decl(moduleMemberWithoutTypeAnnotation1.ts, 26, 25)) @@ -86,12 +86,12 @@ module TypeScript { } } -module TypeScript.Syntax { +namespace TypeScript.Syntax { >TypeScript : Symbol(TypeScript, Decl(moduleMemberWithoutTypeAnnotation1.ts, 0, 0), Decl(moduleMemberWithoutTypeAnnotation1.ts, 6, 1), Decl(moduleMemberWithoutTypeAnnotation1.ts, 22, 1), Decl(moduleMemberWithoutTypeAnnotation1.ts, 34, 1)) ->Syntax : Symbol(Syntax, Decl(moduleMemberWithoutTypeAnnotation1.ts, 36, 18)) +>Syntax : Symbol(Syntax, Decl(moduleMemberWithoutTypeAnnotation1.ts, 36, 21)) export function childIndex() { } ->childIndex : Symbol(childIndex, Decl(moduleMemberWithoutTypeAnnotation1.ts, 36, 26)) +>childIndex : Symbol(childIndex, Decl(moduleMemberWithoutTypeAnnotation1.ts, 36, 29)) export class VariableWidthTokenWithTrailingTrivia implements ISyntaxToken { >VariableWidthTokenWithTrailingTrivia : Symbol(VariableWidthTokenWithTrailingTrivia, Decl(moduleMemberWithoutTypeAnnotation1.ts, 37, 36)) diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types index 6d1a1d52fda04..98900935dc620 100644 --- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types +++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types @@ -20,7 +20,7 @@ module TypeScript.Parser { } } -module TypeScript { +namespace TypeScript { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ @@ -64,7 +64,7 @@ module TypeScript { } } -module TypeScript { +namespace TypeScript { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ @@ -84,7 +84,9 @@ module TypeScript { var positionedToken = this.findTokenInternal(null, position, 0); >positionedToken : any +> : ^^^ >this.findTokenInternal(null, position, 0) : any +> : ^^^ >this.findTokenInternal : (x: any, y: any, z: any) => any > : ^ ^^^^^^^ ^^^^^^^ ^^^^^^^^^^^^^ >this : this @@ -102,15 +104,18 @@ module TypeScript { >findTokenInternal : (x: any, y: any, z: any) => any > : ^ ^^^^^^^ ^^^^^^^ ^^^^^^^^^^^^^ >x : any +> : ^^^ >y : any +> : ^^^ >z : any +> : ^^^ return null; } } } -module TypeScript.Syntax { +namespace TypeScript.Syntax { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ >Syntax : typeof Syntax diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.js b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.js index 91fe55da84b92..00e80837d755b 100644 --- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.js +++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/moduleMemberWithoutTypeAnnotation2.ts] //// //// [moduleMemberWithoutTypeAnnotation2.ts] -module TypeScript { - export module CompilerDiagnostics { +namespace TypeScript { + export namespace CompilerDiagnostics { export interface IDiagnosticWriter { Alert(output: string): void; diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.symbols b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.symbols index b2f580cb2a3c0..64748d2114baf 100644 --- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.symbols +++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.symbols @@ -1,14 +1,14 @@ //// [tests/cases/compiler/moduleMemberWithoutTypeAnnotation2.ts] //// === moduleMemberWithoutTypeAnnotation2.ts === -module TypeScript { +namespace TypeScript { >TypeScript : Symbol(TypeScript, Decl(moduleMemberWithoutTypeAnnotation2.ts, 0, 0)) - export module CompilerDiagnostics { ->CompilerDiagnostics : Symbol(CompilerDiagnostics, Decl(moduleMemberWithoutTypeAnnotation2.ts, 0, 19)) + export namespace CompilerDiagnostics { +>CompilerDiagnostics : Symbol(CompilerDiagnostics, Decl(moduleMemberWithoutTypeAnnotation2.ts, 0, 22)) export interface IDiagnosticWriter { ->IDiagnosticWriter : Symbol(IDiagnosticWriter, Decl(moduleMemberWithoutTypeAnnotation2.ts, 1, 39)) +>IDiagnosticWriter : Symbol(IDiagnosticWriter, Decl(moduleMemberWithoutTypeAnnotation2.ts, 1, 42)) Alert(output: string): void; >Alert : Symbol(IDiagnosticWriter.Alert, Decl(moduleMemberWithoutTypeAnnotation2.ts, 3, 44)) diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types index b67cc2c13d03c..7222b835542a3 100644 --- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types +++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/moduleMemberWithoutTypeAnnotation2.ts] //// === moduleMemberWithoutTypeAnnotation2.ts === -module TypeScript { +namespace TypeScript { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ - export module CompilerDiagnostics { + export namespace CompilerDiagnostics { >CompilerDiagnostics : typeof CompilerDiagnostics > : ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/moduleMerge.js b/tests/baselines/reference/moduleMerge.js index ecace8f22c78b..155d1d93c80a0 100644 --- a/tests/baselines/reference/moduleMerge.js +++ b/tests/baselines/reference/moduleMerge.js @@ -3,7 +3,7 @@ //// [moduleMerge.ts] // This should not compile both B classes are in the same module this should be a collission -module A +namespace A { class B { @@ -14,7 +14,7 @@ module A } } -module A +namespace A { export class B { diff --git a/tests/baselines/reference/moduleMerge.symbols b/tests/baselines/reference/moduleMerge.symbols index bb06dbe912148..7ff92d181f45b 100644 --- a/tests/baselines/reference/moduleMerge.symbols +++ b/tests/baselines/reference/moduleMerge.symbols @@ -3,7 +3,7 @@ === moduleMerge.ts === // This should not compile both B classes are in the same module this should be a collission -module A +namespace A >A : Symbol(A, Decl(moduleMerge.ts, 0, 0), Decl(moduleMerge.ts, 11, 1)) { class B @@ -17,7 +17,7 @@ module A } } -module A +namespace A >A : Symbol(A, Decl(moduleMerge.ts, 0, 0), Decl(moduleMerge.ts, 11, 1)) { export class B diff --git a/tests/baselines/reference/moduleMerge.types b/tests/baselines/reference/moduleMerge.types index 8e746a04b5e76..32f5584e7de55 100644 --- a/tests/baselines/reference/moduleMerge.types +++ b/tests/baselines/reference/moduleMerge.types @@ -3,7 +3,7 @@ === moduleMerge.ts === // This should not compile both B classes are in the same module this should be a collission -module A +namespace A >A : typeof A > : ^^^^^^^^ { @@ -22,7 +22,7 @@ module A } } -module A +namespace A >A : typeof A > : ^^^^^^^^ { diff --git a/tests/baselines/reference/moduleNewExportBug.errors.txt b/tests/baselines/reference/moduleNewExportBug.errors.txt index 24739911f895e..0ee3bcb5c7732 100644 --- a/tests/baselines/reference/moduleNewExportBug.errors.txt +++ b/tests/baselines/reference/moduleNewExportBug.errors.txt @@ -2,7 +2,7 @@ moduleNewExportBug.ts(10,14): error TS2694: Namespace 'mod1' has no exported mem ==== moduleNewExportBug.ts (1 errors) ==== - module mod1 { + namespace mod1 { interface mInt { new (bar:any):any; foo (bar:any):any; diff --git a/tests/baselines/reference/moduleNewExportBug.js b/tests/baselines/reference/moduleNewExportBug.js index 6d4c97b1893d3..8e0ab18c6f458 100644 --- a/tests/baselines/reference/moduleNewExportBug.js +++ b/tests/baselines/reference/moduleNewExportBug.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleNewExportBug.ts] //// //// [moduleNewExportBug.ts] -module mod1 { +namespace mod1 { interface mInt { new (bar:any):any; foo (bar:any):any; diff --git a/tests/baselines/reference/moduleNewExportBug.symbols b/tests/baselines/reference/moduleNewExportBug.symbols index c6b591b4f3e53..4d447528f2e1c 100644 --- a/tests/baselines/reference/moduleNewExportBug.symbols +++ b/tests/baselines/reference/moduleNewExportBug.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/moduleNewExportBug.ts] //// === moduleNewExportBug.ts === -module mod1 { +namespace mod1 { >mod1 : Symbol(mod1, Decl(moduleNewExportBug.ts, 0, 0)) interface mInt { ->mInt : Symbol(mInt, Decl(moduleNewExportBug.ts, 0, 13)) +>mInt : Symbol(mInt, Decl(moduleNewExportBug.ts, 0, 16)) new (bar:any):any; >bar : Symbol(bar, Decl(moduleNewExportBug.ts, 2, 7)) diff --git a/tests/baselines/reference/moduleNewExportBug.types b/tests/baselines/reference/moduleNewExportBug.types index 2282afd183bb1..b53d4dc0faefc 100644 --- a/tests/baselines/reference/moduleNewExportBug.types +++ b/tests/baselines/reference/moduleNewExportBug.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleNewExportBug.ts] //// === moduleNewExportBug.ts === -module mod1 { +namespace mod1 { >mod1 : typeof mod1 > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/moduleNoEmit.js b/tests/baselines/reference/moduleNoEmit.js index 648cf7abb9351..59ed1e7fc874b 100644 --- a/tests/baselines/reference/moduleNoEmit.js +++ b/tests/baselines/reference/moduleNoEmit.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleNoEmit.ts] //// //// [moduleNoEmit.ts] -module Foo { +namespace Foo { 1+1; } diff --git a/tests/baselines/reference/moduleNoEmit.symbols b/tests/baselines/reference/moduleNoEmit.symbols index 86e0c0826a2ef..e98d26df95835 100644 --- a/tests/baselines/reference/moduleNoEmit.symbols +++ b/tests/baselines/reference/moduleNoEmit.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleNoEmit.ts] //// === moduleNoEmit.ts === -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(moduleNoEmit.ts, 0, 0)) 1+1; diff --git a/tests/baselines/reference/moduleNoEmit.types b/tests/baselines/reference/moduleNoEmit.types index 5a4131dae12fb..b6d0cf0f8f764 100644 --- a/tests/baselines/reference/moduleNoEmit.types +++ b/tests/baselines/reference/moduleNoEmit.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleNoEmit.ts] //// === moduleNoEmit.ts === -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/moduleOuterQualification.js b/tests/baselines/reference/moduleOuterQualification.js index 5d8afb8461e19..d0d5da5a0dead 100644 --- a/tests/baselines/reference/moduleOuterQualification.js +++ b/tests/baselines/reference/moduleOuterQualification.js @@ -1,9 +1,9 @@ //// [tests/cases/compiler/moduleOuterQualification.ts] //// //// [moduleOuterQualification.ts] -declare module outer { +declare namespace outer { interface Beta { } - module inner { + namespace inner { // .d.ts emit: should be 'extends outer.Beta' export interface Beta extends outer.Beta { } } diff --git a/tests/baselines/reference/moduleOuterQualification.symbols b/tests/baselines/reference/moduleOuterQualification.symbols index ce0cd98b84e51..082ba57dbd0eb 100644 --- a/tests/baselines/reference/moduleOuterQualification.symbols +++ b/tests/baselines/reference/moduleOuterQualification.symbols @@ -1,21 +1,21 @@ //// [tests/cases/compiler/moduleOuterQualification.ts] //// === moduleOuterQualification.ts === -declare module outer { +declare namespace outer { >outer : Symbol(outer, Decl(moduleOuterQualification.ts, 0, 0)) interface Beta { } ->Beta : Symbol(Beta, Decl(moduleOuterQualification.ts, 0, 22)) +>Beta : Symbol(Beta, Decl(moduleOuterQualification.ts, 0, 25)) - module inner { + namespace inner { >inner : Symbol(inner, Decl(moduleOuterQualification.ts, 1, 20)) // .d.ts emit: should be 'extends outer.Beta' export interface Beta extends outer.Beta { } ->Beta : Symbol(Beta, Decl(moduleOuterQualification.ts, 2, 16)) ->outer.Beta : Symbol(Beta, Decl(moduleOuterQualification.ts, 0, 22)) +>Beta : Symbol(Beta, Decl(moduleOuterQualification.ts, 2, 19)) +>outer.Beta : Symbol(Beta, Decl(moduleOuterQualification.ts, 0, 25)) >outer : Symbol(outer, Decl(moduleOuterQualification.ts, 0, 0)) ->Beta : Symbol(Beta, Decl(moduleOuterQualification.ts, 0, 22)) +>Beta : Symbol(Beta, Decl(moduleOuterQualification.ts, 0, 25)) } } diff --git a/tests/baselines/reference/moduleOuterQualification.types b/tests/baselines/reference/moduleOuterQualification.types index 7b7f92bfbd5ad..23cbf014edeec 100644 --- a/tests/baselines/reference/moduleOuterQualification.types +++ b/tests/baselines/reference/moduleOuterQualification.types @@ -1,9 +1,9 @@ //// [tests/cases/compiler/moduleOuterQualification.ts] //// === moduleOuterQualification.ts === -declare module outer { +declare namespace outer { interface Beta { } - module inner { + namespace inner { // .d.ts emit: should be 'extends outer.Beta' export interface Beta extends outer.Beta { } >outer : any diff --git a/tests/baselines/reference/moduleProperty1.errors.txt b/tests/baselines/reference/moduleProperty1.errors.txt index 19e7bab740400..9ab7a481eb163 100644 --- a/tests/baselines/reference/moduleProperty1.errors.txt +++ b/tests/baselines/reference/moduleProperty1.errors.txt @@ -4,13 +4,13 @@ moduleProperty1.ts(10,20): error TS2304: Cannot find name 'y'. ==== moduleProperty1.ts (3 errors) ==== - module M { + namespace M { var x=10; // variable local to this module body var y=x; // property visible only in module export var z=y; // property visible to any code } - module M2 { + namespace M2 { var x = 10; // variable local to this module body private y = x; // can't use private in modules ~~~~~~~ diff --git a/tests/baselines/reference/moduleProperty1.js b/tests/baselines/reference/moduleProperty1.js index 9a8baa076a5e5..e8b284cdeebfd 100644 --- a/tests/baselines/reference/moduleProperty1.js +++ b/tests/baselines/reference/moduleProperty1.js @@ -1,13 +1,13 @@ //// [tests/cases/compiler/moduleProperty1.ts] //// //// [moduleProperty1.ts] -module M { +namespace M { var x=10; // variable local to this module body var y=x; // property visible only in module export var z=y; // property visible to any code } -module M2 { +namespace M2 { var x = 10; // variable local to this module body private y = x; // can't use private in modules export var z = y; // property visible to any code diff --git a/tests/baselines/reference/moduleProperty1.symbols b/tests/baselines/reference/moduleProperty1.symbols index 44191fc69b357..4a80813d98f6d 100644 --- a/tests/baselines/reference/moduleProperty1.symbols +++ b/tests/baselines/reference/moduleProperty1.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleProperty1.ts] //// === moduleProperty1.ts === -module M { +namespace M { >M : Symbol(M, Decl(moduleProperty1.ts, 0, 0)) var x=10; // variable local to this module body @@ -16,7 +16,7 @@ module M { >y : Symbol(y, Decl(moduleProperty1.ts, 2, 7)) } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(moduleProperty1.ts, 4, 1)) var x = 10; // variable local to this module body diff --git a/tests/baselines/reference/moduleProperty1.types b/tests/baselines/reference/moduleProperty1.types index 9dcece40c2c91..f91189ead0ba8 100644 --- a/tests/baselines/reference/moduleProperty1.types +++ b/tests/baselines/reference/moduleProperty1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleProperty1.ts] //// === moduleProperty1.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -24,7 +24,7 @@ module M { > : ^^^^^^ } -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/moduleProperty2.errors.txt b/tests/baselines/reference/moduleProperty2.errors.txt index 6e2a19391d5f1..922a8bbe3a93f 100644 --- a/tests/baselines/reference/moduleProperty2.errors.txt +++ b/tests/baselines/reference/moduleProperty2.errors.txt @@ -3,7 +3,7 @@ moduleProperty2.ts(12,17): error TS2339: Property 'y' does not exist on type 'ty ==== moduleProperty2.ts (2 errors) ==== - module M { + namespace M { function f() { var x; } @@ -15,7 +15,7 @@ moduleProperty2.ts(12,17): error TS2339: Property 'y' does not exist on type 'ty var test2=y; // y visible because same module } - module N { + namespace N { var test3=M.y; // nope y private property of M ~ !!! error TS2339: Property 'y' does not exist on type 'typeof M'. diff --git a/tests/baselines/reference/moduleProperty2.js b/tests/baselines/reference/moduleProperty2.js index ecd9328071661..adb49f1d1c548 100644 --- a/tests/baselines/reference/moduleProperty2.js +++ b/tests/baselines/reference/moduleProperty2.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleProperty2.ts] //// //// [moduleProperty2.ts] -module M { +namespace M { function f() { var x; } @@ -11,7 +11,7 @@ module M { var test2=y; // y visible because same module } -module N { +namespace N { var test3=M.y; // nope y private property of M var test4=M.z; // ok public property of M } diff --git a/tests/baselines/reference/moduleProperty2.symbols b/tests/baselines/reference/moduleProperty2.symbols index 4855de3868a95..b2c5b6b3942ef 100644 --- a/tests/baselines/reference/moduleProperty2.symbols +++ b/tests/baselines/reference/moduleProperty2.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/moduleProperty2.ts] //// === moduleProperty2.ts === -module M { +namespace M { >M : Symbol(M, Decl(moduleProperty2.ts, 0, 0)) function f() { ->f : Symbol(f, Decl(moduleProperty2.ts, 0, 10)) +>f : Symbol(f, Decl(moduleProperty2.ts, 0, 13)) var x; >x : Symbol(x, Decl(moduleProperty2.ts, 2, 11)) @@ -24,7 +24,7 @@ module M { >y : Symbol(y, Decl(moduleProperty2.ts, 4, 7)) } -module N { +namespace N { >N : Symbol(N, Decl(moduleProperty2.ts, 8, 1)) var test3=M.y; // nope y private property of M diff --git a/tests/baselines/reference/moduleProperty2.types b/tests/baselines/reference/moduleProperty2.types index 5fa075067cda8..6ed3539a3aec1 100644 --- a/tests/baselines/reference/moduleProperty2.types +++ b/tests/baselines/reference/moduleProperty2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleProperty2.ts] //// === moduleProperty2.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -34,7 +34,7 @@ module M { > : ^^^ } -module N { +namespace N { >N : typeof N > : ^^^^^^^^ diff --git a/tests/baselines/reference/moduleRedifinitionErrors.js b/tests/baselines/reference/moduleRedifinitionErrors.js index a083c58fd363f..c48fd9ce1d94c 100644 --- a/tests/baselines/reference/moduleRedifinitionErrors.js +++ b/tests/baselines/reference/moduleRedifinitionErrors.js @@ -3,7 +3,7 @@ //// [moduleRedifinitionErrors.ts] class A { } -module A { +namespace A { } diff --git a/tests/baselines/reference/moduleRedifinitionErrors.symbols b/tests/baselines/reference/moduleRedifinitionErrors.symbols index 8050ff2b17c8b..e43ed73711c7e 100644 --- a/tests/baselines/reference/moduleRedifinitionErrors.symbols +++ b/tests/baselines/reference/moduleRedifinitionErrors.symbols @@ -4,7 +4,7 @@ class A { >A : Symbol(A, Decl(moduleRedifinitionErrors.ts, 0, 0), Decl(moduleRedifinitionErrors.ts, 1, 1)) } -module A { +namespace A { >A : Symbol(A, Decl(moduleRedifinitionErrors.ts, 0, 0), Decl(moduleRedifinitionErrors.ts, 1, 1)) } diff --git a/tests/baselines/reference/moduleRedifinitionErrors.types b/tests/baselines/reference/moduleRedifinitionErrors.types index 4d92809ef7d52..22d27c04bd1dd 100644 --- a/tests/baselines/reference/moduleRedifinitionErrors.types +++ b/tests/baselines/reference/moduleRedifinitionErrors.types @@ -5,6 +5,6 @@ class A { >A : A > : ^ } -module A { +namespace A { } diff --git a/tests/baselines/reference/moduleReopenedTypeOtherBlock.js b/tests/baselines/reference/moduleReopenedTypeOtherBlock.js index 994cf8e66c686..875b6f0f9fafb 100644 --- a/tests/baselines/reference/moduleReopenedTypeOtherBlock.js +++ b/tests/baselines/reference/moduleReopenedTypeOtherBlock.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/moduleReopenedTypeOtherBlock.ts] //// //// [moduleReopenedTypeOtherBlock.ts] -module M { +namespace M { export class C1 { } export interface I { n: number; } } -module M { +namespace M { export class C2 { f(): I { return null; } } } diff --git a/tests/baselines/reference/moduleReopenedTypeOtherBlock.symbols b/tests/baselines/reference/moduleReopenedTypeOtherBlock.symbols index 30163735d8628..95e431912f02d 100644 --- a/tests/baselines/reference/moduleReopenedTypeOtherBlock.symbols +++ b/tests/baselines/reference/moduleReopenedTypeOtherBlock.symbols @@ -1,21 +1,21 @@ //// [tests/cases/compiler/moduleReopenedTypeOtherBlock.ts] //// === moduleReopenedTypeOtherBlock.ts === -module M { +namespace M { >M : Symbol(M, Decl(moduleReopenedTypeOtherBlock.ts, 0, 0), Decl(moduleReopenedTypeOtherBlock.ts, 3, 1)) export class C1 { } ->C1 : Symbol(C1, Decl(moduleReopenedTypeOtherBlock.ts, 0, 10)) +>C1 : Symbol(C1, Decl(moduleReopenedTypeOtherBlock.ts, 0, 13)) export interface I { n: number; } >I : Symbol(I, Decl(moduleReopenedTypeOtherBlock.ts, 1, 23)) >n : Symbol(I.n, Decl(moduleReopenedTypeOtherBlock.ts, 2, 24)) } -module M { +namespace M { >M : Symbol(M, Decl(moduleReopenedTypeOtherBlock.ts, 0, 0), Decl(moduleReopenedTypeOtherBlock.ts, 3, 1)) export class C2 { f(): I { return null; } } ->C2 : Symbol(C2, Decl(moduleReopenedTypeOtherBlock.ts, 4, 10)) +>C2 : Symbol(C2, Decl(moduleReopenedTypeOtherBlock.ts, 4, 13)) >f : Symbol(C2.f, Decl(moduleReopenedTypeOtherBlock.ts, 5, 21)) >I : Symbol(I, Decl(moduleReopenedTypeOtherBlock.ts, 1, 23)) } diff --git a/tests/baselines/reference/moduleReopenedTypeOtherBlock.types b/tests/baselines/reference/moduleReopenedTypeOtherBlock.types index 600113551712c..1c8c8387bb9fd 100644 --- a/tests/baselines/reference/moduleReopenedTypeOtherBlock.types +++ b/tests/baselines/reference/moduleReopenedTypeOtherBlock.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleReopenedTypeOtherBlock.ts] //// === moduleReopenedTypeOtherBlock.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -13,7 +13,7 @@ module M { >n : number > : ^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/moduleReopenedTypeSameBlock.js b/tests/baselines/reference/moduleReopenedTypeSameBlock.js index d199ba91a1c97..3755b0855c9d4 100644 --- a/tests/baselines/reference/moduleReopenedTypeSameBlock.js +++ b/tests/baselines/reference/moduleReopenedTypeSameBlock.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/moduleReopenedTypeSameBlock.ts] //// //// [moduleReopenedTypeSameBlock.ts] -module M { export class C1 { } } -module M { +namespace M { export class C1 { } } +namespace M { export interface I { n: number; } export class C2 { f(): I { return null; } } } diff --git a/tests/baselines/reference/moduleReopenedTypeSameBlock.symbols b/tests/baselines/reference/moduleReopenedTypeSameBlock.symbols index ca611a27bb5a8..e7b69569820e5 100644 --- a/tests/baselines/reference/moduleReopenedTypeSameBlock.symbols +++ b/tests/baselines/reference/moduleReopenedTypeSameBlock.symbols @@ -1,20 +1,20 @@ //// [tests/cases/compiler/moduleReopenedTypeSameBlock.ts] //// === moduleReopenedTypeSameBlock.ts === -module M { export class C1 { } } ->M : Symbol(M, Decl(moduleReopenedTypeSameBlock.ts, 0, 0), Decl(moduleReopenedTypeSameBlock.ts, 0, 32)) ->C1 : Symbol(C1, Decl(moduleReopenedTypeSameBlock.ts, 0, 10)) +namespace M { export class C1 { } } +>M : Symbol(M, Decl(moduleReopenedTypeSameBlock.ts, 0, 0), Decl(moduleReopenedTypeSameBlock.ts, 0, 35)) +>C1 : Symbol(C1, Decl(moduleReopenedTypeSameBlock.ts, 0, 13)) -module M { ->M : Symbol(M, Decl(moduleReopenedTypeSameBlock.ts, 0, 0), Decl(moduleReopenedTypeSameBlock.ts, 0, 32)) +namespace M { +>M : Symbol(M, Decl(moduleReopenedTypeSameBlock.ts, 0, 0), Decl(moduleReopenedTypeSameBlock.ts, 0, 35)) export interface I { n: number; } ->I : Symbol(I, Decl(moduleReopenedTypeSameBlock.ts, 1, 10)) +>I : Symbol(I, Decl(moduleReopenedTypeSameBlock.ts, 1, 13)) >n : Symbol(I.n, Decl(moduleReopenedTypeSameBlock.ts, 2, 24)) export class C2 { f(): I { return null; } } >C2 : Symbol(C2, Decl(moduleReopenedTypeSameBlock.ts, 2, 37)) >f : Symbol(C2.f, Decl(moduleReopenedTypeSameBlock.ts, 3, 21)) ->I : Symbol(I, Decl(moduleReopenedTypeSameBlock.ts, 1, 10)) +>I : Symbol(I, Decl(moduleReopenedTypeSameBlock.ts, 1, 13)) } diff --git a/tests/baselines/reference/moduleReopenedTypeSameBlock.types b/tests/baselines/reference/moduleReopenedTypeSameBlock.types index 38cc6969d1954..b58f63136a8f6 100644 --- a/tests/baselines/reference/moduleReopenedTypeSameBlock.types +++ b/tests/baselines/reference/moduleReopenedTypeSameBlock.types @@ -1,13 +1,13 @@ //// [tests/cases/compiler/moduleReopenedTypeSameBlock.ts] //// === moduleReopenedTypeSameBlock.ts === -module M { export class C1 { } } +namespace M { export class C1 { } } >M : typeof M > : ^^^^^^^^ >C1 : C1 > : ^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/moduleScopingBug.js b/tests/baselines/reference/moduleScopingBug.js index e1fa3e581f3c9..324a64d1375b4 100644 --- a/tests/baselines/reference/moduleScopingBug.js +++ b/tests/baselines/reference/moduleScopingBug.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleScopingBug.ts] //// //// [moduleScopingBug.ts] -module M +namespace M { @@ -21,7 +21,7 @@ module M } - module X { + namespace X { var inner = outer; // Error: outer not visible diff --git a/tests/baselines/reference/moduleScopingBug.symbols b/tests/baselines/reference/moduleScopingBug.symbols index f8930aa8b5a80..b483474e6d24e 100644 --- a/tests/baselines/reference/moduleScopingBug.symbols +++ b/tests/baselines/reference/moduleScopingBug.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleScopingBug.ts] //// === moduleScopingBug.ts === -module M +namespace M >M : Symbol(M, Decl(moduleScopingBug.ts, 0, 0)) { @@ -29,7 +29,7 @@ module M } - module X { + namespace X { >X : Symbol(X, Decl(moduleScopingBug.ts, 18, 5)) var inner = outer; // Error: outer not visible diff --git a/tests/baselines/reference/moduleScopingBug.types b/tests/baselines/reference/moduleScopingBug.types index 21ff84454dd8a..dd11f06a9f4de 100644 --- a/tests/baselines/reference/moduleScopingBug.types +++ b/tests/baselines/reference/moduleScopingBug.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleScopingBug.ts] //// === moduleScopingBug.ts === -module M +namespace M >M : typeof M > : ^^^^^^^^ @@ -37,7 +37,7 @@ module M } - module X { + namespace X { >X : typeof X > : ^^^^^^^^ diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.errors.txt b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.errors.txt new file mode 100644 index 0000000000000..6dece67c14fdf --- /dev/null +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.errors.txt @@ -0,0 +1,20 @@ +moduleSharesNameWithImportDeclarationInsideIt.ts(1,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +moduleSharesNameWithImportDeclarationInsideIt.ts(1,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== moduleSharesNameWithImportDeclarationInsideIt.ts (2 errors) ==== + module Z.M { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export function bar() { + return ""; + } + } + namespace A.M { + import M = Z.M; + export function bar() { + } + M.bar(); // Should call Z.M.bar + } \ No newline at end of file diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.js b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.js index ed498df8e89a5..c504cc2a28835 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.js +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.js @@ -6,7 +6,7 @@ module Z.M { return ""; } } -module A.M { +namespace A.M { import M = Z.M; export function bar() { } diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.symbols b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.symbols index da88b224e351f..713f7fcaf4146 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.symbols +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.symbols @@ -11,12 +11,12 @@ module Z.M { return ""; } } -module A.M { +namespace A.M { >A : Symbol(A, Decl(moduleSharesNameWithImportDeclarationInsideIt.ts, 4, 1)) ->M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt.ts, 5, 9)) +>M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt.ts, 5, 12)) import M = Z.M; ->M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt.ts, 5, 12)) +>M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt.ts, 5, 15)) >Z : Symbol(Z, Decl(moduleSharesNameWithImportDeclarationInsideIt.ts, 0, 0)) >M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt.ts, 0, 9)) @@ -25,6 +25,6 @@ module A.M { } M.bar(); // Should call Z.M.bar >M.bar : Symbol(M.bar, Decl(moduleSharesNameWithImportDeclarationInsideIt.ts, 0, 12)) ->M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt.ts, 5, 12)) +>M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt.ts, 5, 15)) >bar : Symbol(M.bar, Decl(moduleSharesNameWithImportDeclarationInsideIt.ts, 0, 12)) } diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.types b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.types index e63872b036379..7035ceedd99dd 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.types +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.types @@ -16,7 +16,7 @@ module Z.M { > : ^^ } } -module A.M { +namespace A.M { >A : typeof A > : ^^^^^^^^ >M : typeof A.M diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt2.errors.txt b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt2.errors.txt new file mode 100644 index 0000000000000..130653f343405 --- /dev/null +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt2.errors.txt @@ -0,0 +1,20 @@ +moduleSharesNameWithImportDeclarationInsideIt2.ts(1,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +moduleSharesNameWithImportDeclarationInsideIt2.ts(1,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== moduleSharesNameWithImportDeclarationInsideIt2.ts (2 errors) ==== + module Z.M { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export function bar() { + return ""; + } + } + namespace A.M { + export import M = Z.M; + export function bar() { + } + M.bar(); // Should call Z.M.bar + } \ No newline at end of file diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt2.js b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt2.js index d1354a792b7bf..22dde526eefb3 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt2.js +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt2.js @@ -6,7 +6,7 @@ module Z.M { return ""; } } -module A.M { +namespace A.M { export import M = Z.M; export function bar() { } diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt2.symbols b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt2.symbols index c9652b8d18361..619ffb8aa90c0 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt2.symbols +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt2.symbols @@ -11,12 +11,12 @@ module Z.M { return ""; } } -module A.M { +namespace A.M { >A : Symbol(A, Decl(moduleSharesNameWithImportDeclarationInsideIt2.ts, 4, 1)) ->M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt2.ts, 5, 9)) +>M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt2.ts, 5, 12)) export import M = Z.M; ->M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt2.ts, 5, 12)) +>M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt2.ts, 5, 15)) >Z : Symbol(Z, Decl(moduleSharesNameWithImportDeclarationInsideIt2.ts, 0, 0)) >M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt2.ts, 0, 9)) @@ -25,6 +25,6 @@ module A.M { } M.bar(); // Should call Z.M.bar >M.bar : Symbol(M.bar, Decl(moduleSharesNameWithImportDeclarationInsideIt2.ts, 0, 12)) ->M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt2.ts, 5, 12)) +>M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt2.ts, 5, 15)) >bar : Symbol(M.bar, Decl(moduleSharesNameWithImportDeclarationInsideIt2.ts, 0, 12)) } diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt2.types b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt2.types index 66b2f5e71731d..d10bf4ab23646 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt2.types +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt2.types @@ -16,7 +16,7 @@ module Z.M { > : ^^ } } -module A.M { +namespace A.M { >A : typeof A > : ^^^^^^^^ >M : typeof A.M diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.errors.txt b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.errors.txt index 33f779f295c0e..420a510a27526 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.errors.txt +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.errors.txt @@ -3,15 +3,15 @@ moduleSharesNameWithImportDeclarationInsideIt3.ts(11,12): error TS2300: Duplicat ==== moduleSharesNameWithImportDeclarationInsideIt3.ts (2 errors) ==== - module Z { - export module M { + namespace Z { + export namespace M { export function bar() { return ""; } } export interface I { } } - module A.M { + namespace A.M { import M = Z.M; ~ !!! error TS2300: Duplicate identifier 'M'. diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.js b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.js index 9673863554752..cdd7b8b6428c9 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.js +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.js @@ -1,15 +1,15 @@ //// [tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt3.ts] //// //// [moduleSharesNameWithImportDeclarationInsideIt3.ts] -module Z { - export module M { +namespace Z { + export namespace M { export function bar() { return ""; } } export interface I { } } -module A.M { +namespace A.M { import M = Z.M; import M = Z.I; diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.symbols b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.symbols index 3894ee37a3e75..da61769a51c69 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.symbols +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.symbols @@ -1,14 +1,14 @@ //// [tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt3.ts] //// === moduleSharesNameWithImportDeclarationInsideIt3.ts === -module Z { +namespace Z { >Z : Symbol(Z, Decl(moduleSharesNameWithImportDeclarationInsideIt3.ts, 0, 0)) - export module M { ->M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt3.ts, 0, 10)) + export namespace M { +>M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt3.ts, 0, 13)) export function bar() { ->bar : Symbol(bar, Decl(moduleSharesNameWithImportDeclarationInsideIt3.ts, 1, 21)) +>bar : Symbol(bar, Decl(moduleSharesNameWithImportDeclarationInsideIt3.ts, 1, 24)) return ""; } @@ -16,14 +16,14 @@ module Z { export interface I { } >I : Symbol(I, Decl(moduleSharesNameWithImportDeclarationInsideIt3.ts, 5, 5)) } -module A.M { +namespace A.M { >A : Symbol(A, Decl(moduleSharesNameWithImportDeclarationInsideIt3.ts, 7, 1)) ->M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt3.ts, 8, 9)) +>M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt3.ts, 8, 12)) import M = Z.M; ->M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt3.ts, 8, 12)) +>M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt3.ts, 8, 15)) >Z : Symbol(Z, Decl(moduleSharesNameWithImportDeclarationInsideIt3.ts, 0, 0)) ->M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt3.ts, 0, 10)) +>M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt3.ts, 0, 13)) import M = Z.I; >M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt3.ts, 9, 19)) @@ -34,7 +34,7 @@ module A.M { >bar : Symbol(bar, Decl(moduleSharesNameWithImportDeclarationInsideIt3.ts, 10, 19)) } M.bar(); // Should call Z.M.bar ->M.bar : Symbol(M.bar, Decl(moduleSharesNameWithImportDeclarationInsideIt3.ts, 1, 21)) ->M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt3.ts, 8, 12)) ->bar : Symbol(M.bar, Decl(moduleSharesNameWithImportDeclarationInsideIt3.ts, 1, 21)) +>M.bar : Symbol(M.bar, Decl(moduleSharesNameWithImportDeclarationInsideIt3.ts, 1, 24)) +>M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt3.ts, 8, 15)) +>bar : Symbol(M.bar, Decl(moduleSharesNameWithImportDeclarationInsideIt3.ts, 1, 24)) } diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.types b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.types index 68aeb12888183..a4e8a0f94a33e 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.types +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt3.ts] //// === moduleSharesNameWithImportDeclarationInsideIt3.ts === -module Z { +namespace Z { >Z : typeof Z > : ^^^^^^^^ - export module M { + export namespace M { >M : typeof M > : ^^^^^^^^ @@ -20,7 +20,7 @@ module Z { } export interface I { } } -module A.M { +namespace A.M { >A : typeof A > : ^^^^^^^^ >M : typeof A.M diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.errors.txt b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.errors.txt new file mode 100644 index 0000000000000..1f0283dc974c4 --- /dev/null +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.errors.txt @@ -0,0 +1,21 @@ +moduleSharesNameWithImportDeclarationInsideIt4.ts(1,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +moduleSharesNameWithImportDeclarationInsideIt4.ts(1,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== moduleSharesNameWithImportDeclarationInsideIt4.ts (2 errors) ==== + module Z.M { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export function bar() { + return ""; + } + } + namespace A.M { + interface M { } + import M = Z.M; + export function bar() { + } + M.bar(); // Should call Z.M.bar + } \ No newline at end of file diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.js b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.js index f588742d76c02..ac59948597a30 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.js +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.js @@ -6,7 +6,7 @@ module Z.M { return ""; } } -module A.M { +namespace A.M { interface M { } import M = Z.M; export function bar() { diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.symbols b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.symbols index e4f715bb9854b..af294ee7996ea 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.symbols +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.symbols @@ -11,15 +11,15 @@ module Z.M { return ""; } } -module A.M { +namespace A.M { >A : Symbol(A, Decl(moduleSharesNameWithImportDeclarationInsideIt4.ts, 4, 1)) ->M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt4.ts, 5, 9)) +>M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt4.ts, 5, 12)) interface M { } ->M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt4.ts, 5, 12), Decl(moduleSharesNameWithImportDeclarationInsideIt4.ts, 6, 19)) +>M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt4.ts, 5, 15), Decl(moduleSharesNameWithImportDeclarationInsideIt4.ts, 6, 19)) import M = Z.M; ->M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt4.ts, 5, 12), Decl(moduleSharesNameWithImportDeclarationInsideIt4.ts, 6, 19)) +>M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt4.ts, 5, 15), Decl(moduleSharesNameWithImportDeclarationInsideIt4.ts, 6, 19)) >Z : Symbol(Z, Decl(moduleSharesNameWithImportDeclarationInsideIt4.ts, 0, 0)) >M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt4.ts, 0, 9)) @@ -28,6 +28,6 @@ module A.M { } M.bar(); // Should call Z.M.bar >M.bar : Symbol(M.bar, Decl(moduleSharesNameWithImportDeclarationInsideIt4.ts, 0, 12)) ->M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt4.ts, 5, 12), Decl(moduleSharesNameWithImportDeclarationInsideIt4.ts, 6, 19)) +>M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt4.ts, 5, 15), Decl(moduleSharesNameWithImportDeclarationInsideIt4.ts, 6, 19)) >bar : Symbol(M.bar, Decl(moduleSharesNameWithImportDeclarationInsideIt4.ts, 0, 12)) } diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.types b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.types index de022111a261b..36105f7075ad7 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.types +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.types @@ -16,7 +16,7 @@ module Z.M { > : ^^ } } -module A.M { +namespace A.M { >A : typeof A > : ^^^^^^^^ >M : typeof A.M diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.errors.txt b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.errors.txt index bd51066e00919..0a92c1479d1e5 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.errors.txt +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.errors.txt @@ -3,15 +3,15 @@ moduleSharesNameWithImportDeclarationInsideIt5.ts(11,12): error TS2300: Duplicat ==== moduleSharesNameWithImportDeclarationInsideIt5.ts (2 errors) ==== - module Z { - export module M { + namespace Z { + export namespace M { export function bar() { return ""; } } export interface I { } } - module A.M { + namespace A.M { import M = Z.I; ~ !!! error TS2300: Duplicate identifier 'M'. diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.js b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.js index fe707f782aacb..e6d23a8379a40 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.js +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.js @@ -1,15 +1,15 @@ //// [tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt5.ts] //// //// [moduleSharesNameWithImportDeclarationInsideIt5.ts] -module Z { - export module M { +namespace Z { + export namespace M { export function bar() { return ""; } } export interface I { } } -module A.M { +namespace A.M { import M = Z.I; import M = Z.M; diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.symbols b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.symbols index 01ddc5c355650..baab06adb8f51 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.symbols +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.symbols @@ -1,14 +1,14 @@ //// [tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt5.ts] //// === moduleSharesNameWithImportDeclarationInsideIt5.ts === -module Z { +namespace Z { >Z : Symbol(Z, Decl(moduleSharesNameWithImportDeclarationInsideIt5.ts, 0, 0)) - export module M { ->M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt5.ts, 0, 10)) + export namespace M { +>M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt5.ts, 0, 13)) export function bar() { ->bar : Symbol(bar, Decl(moduleSharesNameWithImportDeclarationInsideIt5.ts, 1, 21)) +>bar : Symbol(bar, Decl(moduleSharesNameWithImportDeclarationInsideIt5.ts, 1, 24)) return ""; } @@ -16,25 +16,25 @@ module Z { export interface I { } >I : Symbol(I, Decl(moduleSharesNameWithImportDeclarationInsideIt5.ts, 5, 5)) } -module A.M { +namespace A.M { >A : Symbol(A, Decl(moduleSharesNameWithImportDeclarationInsideIt5.ts, 7, 1)) ->M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt5.ts, 8, 9)) +>M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt5.ts, 8, 12)) import M = Z.I; ->M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt5.ts, 8, 12)) +>M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt5.ts, 8, 15)) >Z : Symbol(Z, Decl(moduleSharesNameWithImportDeclarationInsideIt5.ts, 0, 0)) >I : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt5.ts, 5, 5)) import M = Z.M; >M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt5.ts, 9, 19)) >Z : Symbol(Z, Decl(moduleSharesNameWithImportDeclarationInsideIt5.ts, 0, 0)) ->M : Symbol(Z.M, Decl(moduleSharesNameWithImportDeclarationInsideIt5.ts, 0, 10)) +>M : Symbol(Z.M, Decl(moduleSharesNameWithImportDeclarationInsideIt5.ts, 0, 13)) export function bar() { >bar : Symbol(bar, Decl(moduleSharesNameWithImportDeclarationInsideIt5.ts, 10, 19)) } M.bar(); // Should call Z.M.bar >M.bar : Symbol(bar, Decl(moduleSharesNameWithImportDeclarationInsideIt5.ts, 10, 19)) ->M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt5.ts, 8, 9)) +>M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt5.ts, 8, 12)) >bar : Symbol(bar, Decl(moduleSharesNameWithImportDeclarationInsideIt5.ts, 10, 19)) } diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.types b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.types index 2ff049596a898..5669d21f4f239 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.types +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt5.ts] //// === moduleSharesNameWithImportDeclarationInsideIt5.ts === -module Z { +namespace Z { >Z : typeof Z > : ^^^^^^^^ - export module M { + export namespace M { >M : typeof M > : ^^^^^^^^ @@ -20,7 +20,7 @@ module Z { } export interface I { } } -module A.M { +namespace A.M { >A : typeof A > : ^^^^^^^^ >M : typeof M diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.errors.txt b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.errors.txt new file mode 100644 index 0000000000000..422cc72a18a0b --- /dev/null +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.errors.txt @@ -0,0 +1,19 @@ +moduleSharesNameWithImportDeclarationInsideIt6.ts(1,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +moduleSharesNameWithImportDeclarationInsideIt6.ts(1,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== moduleSharesNameWithImportDeclarationInsideIt6.ts (2 errors) ==== + module Z.M { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export function bar() { + return ""; + } + } + namespace A.M { + import M = Z.M; + export function bar() { + } + } \ No newline at end of file diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.js b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.js index 6f1085edece65..f0bc468fd89b5 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.js +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.js @@ -6,7 +6,7 @@ module Z.M { return ""; } } -module A.M { +namespace A.M { import M = Z.M; export function bar() { } diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.symbols b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.symbols index b43d0c795191d..16c67c1515cc4 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.symbols +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.symbols @@ -11,12 +11,12 @@ module Z.M { return ""; } } -module A.M { +namespace A.M { >A : Symbol(A, Decl(moduleSharesNameWithImportDeclarationInsideIt6.ts, 4, 1)) ->M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt6.ts, 5, 9)) +>M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt6.ts, 5, 12)) import M = Z.M; ->M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt6.ts, 5, 12)) +>M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt6.ts, 5, 15)) >Z : Symbol(Z, Decl(moduleSharesNameWithImportDeclarationInsideIt6.ts, 0, 0)) >M : Symbol(M, Decl(moduleSharesNameWithImportDeclarationInsideIt6.ts, 0, 9)) diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.types b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.types index 1a81dc492235b..f1a1c05c9846b 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.types +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.types @@ -16,7 +16,7 @@ module Z.M { > : ^^ } } -module A.M { +namespace A.M { >A : typeof A > : ^^^^^^^^ >M : typeof A.M diff --git a/tests/baselines/reference/moduleSymbolMerging.js b/tests/baselines/reference/moduleSymbolMerging.js index 07b2ab6222ef9..164cfff0ca6ba 100644 --- a/tests/baselines/reference/moduleSymbolMerging.js +++ b/tests/baselines/reference/moduleSymbolMerging.js @@ -1,12 +1,12 @@ //// [tests/cases/compiler/moduleSymbolMerging.ts] //// //// [A.ts] -module A { export interface I {} } +namespace A { export interface I {} } //// [B.ts] /// -module A { ; } -module B { +namespace A { ; } +namespace B { export function f(): A.I { return null; } } diff --git a/tests/baselines/reference/moduleSymbolMerging.symbols b/tests/baselines/reference/moduleSymbolMerging.symbols index 9ec86373cd5be..62087c90729ee 100644 --- a/tests/baselines/reference/moduleSymbolMerging.symbols +++ b/tests/baselines/reference/moduleSymbolMerging.symbols @@ -2,21 +2,21 @@ === B.ts === /// -module A { ; } +namespace A { ; } >A : Symbol(A, Decl(A.ts, 0, 0), Decl(B.ts, 0, 0)) -module B { ->B : Symbol(B, Decl(B.ts, 1, 14)) +namespace B { +>B : Symbol(B, Decl(B.ts, 1, 17)) export function f(): A.I { return null; } ->f : Symbol(f, Decl(B.ts, 2, 10)) +>f : Symbol(f, Decl(B.ts, 2, 13)) >A : Symbol(A, Decl(A.ts, 0, 0), Decl(B.ts, 0, 0)) ->I : Symbol(A.I, Decl(A.ts, 0, 10)) +>I : Symbol(A.I, Decl(A.ts, 0, 13)) } === A.ts === -module A { export interface I {} } +namespace A { export interface I {} } >A : Symbol(A, Decl(A.ts, 0, 0), Decl(B.ts, 0, 0)) ->I : Symbol(I, Decl(A.ts, 0, 10)) +>I : Symbol(I, Decl(A.ts, 0, 13)) diff --git a/tests/baselines/reference/moduleSymbolMerging.types b/tests/baselines/reference/moduleSymbolMerging.types index 5f150bfc61bc8..8dcdd5d0bbdf0 100644 --- a/tests/baselines/reference/moduleSymbolMerging.types +++ b/tests/baselines/reference/moduleSymbolMerging.types @@ -2,11 +2,11 @@ === B.ts === /// -module A { ; } +namespace A { ; } >A : typeof A > : ^^^^^^^^ -module B { +namespace B { >B : typeof B > : ^^^^^^^^ @@ -20,5 +20,5 @@ module B { === A.ts === -module A { export interface I {} } +namespace A { export interface I {} } diff --git a/tests/baselines/reference/moduleUnassignedVariable.js b/tests/baselines/reference/moduleUnassignedVariable.js index 8d8be36a30f1c..bf588e15c8ba5 100644 --- a/tests/baselines/reference/moduleUnassignedVariable.js +++ b/tests/baselines/reference/moduleUnassignedVariable.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleUnassignedVariable.ts] //// //// [moduleUnassignedVariable.ts] -module Bar { +namespace Bar { export var a = 1; function fooA() { return a; } // Correct: return Bar.a diff --git a/tests/baselines/reference/moduleUnassignedVariable.symbols b/tests/baselines/reference/moduleUnassignedVariable.symbols index 941bafc7c171c..7a04389ba06f2 100644 --- a/tests/baselines/reference/moduleUnassignedVariable.symbols +++ b/tests/baselines/reference/moduleUnassignedVariable.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleUnassignedVariable.ts] //// === moduleUnassignedVariable.ts === -module Bar { +namespace Bar { >Bar : Symbol(Bar, Decl(moduleUnassignedVariable.ts, 0, 0)) export var a = 1; diff --git a/tests/baselines/reference/moduleUnassignedVariable.types b/tests/baselines/reference/moduleUnassignedVariable.types index bd13d33b35ca9..d467eff14d391 100644 --- a/tests/baselines/reference/moduleUnassignedVariable.types +++ b/tests/baselines/reference/moduleUnassignedVariable.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleUnassignedVariable.ts] //// === moduleUnassignedVariable.ts === -module Bar { +namespace Bar { >Bar : typeof Bar > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/moduleVariableArrayIndexer.errors.txt b/tests/baselines/reference/moduleVariableArrayIndexer.errors.txt index 65b74f01de5d0..49f5ea1e7d1e2 100644 --- a/tests/baselines/reference/moduleVariableArrayIndexer.errors.txt +++ b/tests/baselines/reference/moduleVariableArrayIndexer.errors.txt @@ -2,7 +2,7 @@ moduleVariableArrayIndexer.ts(3,13): error TS18050: The value 'undefined' cannot ==== moduleVariableArrayIndexer.ts (1 errors) ==== - module Bar { + namespace Bar { export var a = 1; var t = undefined[a][a]; // CG: var t = undefined[Bar.a][a]; ~~~~~~~~~ diff --git a/tests/baselines/reference/moduleVariableArrayIndexer.js b/tests/baselines/reference/moduleVariableArrayIndexer.js index 3fa139cd352ee..a9388686f1288 100644 --- a/tests/baselines/reference/moduleVariableArrayIndexer.js +++ b/tests/baselines/reference/moduleVariableArrayIndexer.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleVariableArrayIndexer.ts] //// //// [moduleVariableArrayIndexer.ts] -module Bar { +namespace Bar { export var a = 1; var t = undefined[a][a]; // CG: var t = undefined[Bar.a][a]; } diff --git a/tests/baselines/reference/moduleVariableArrayIndexer.symbols b/tests/baselines/reference/moduleVariableArrayIndexer.symbols index a6d70337b7f5f..b0a5f0c5c70a8 100644 --- a/tests/baselines/reference/moduleVariableArrayIndexer.symbols +++ b/tests/baselines/reference/moduleVariableArrayIndexer.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleVariableArrayIndexer.ts] //// === moduleVariableArrayIndexer.ts === -module Bar { +namespace Bar { >Bar : Symbol(Bar, Decl(moduleVariableArrayIndexer.ts, 0, 0)) export var a = 1; diff --git a/tests/baselines/reference/moduleVariableArrayIndexer.types b/tests/baselines/reference/moduleVariableArrayIndexer.types index d26085b546e54..ef75e0197f3a9 100644 --- a/tests/baselines/reference/moduleVariableArrayIndexer.types +++ b/tests/baselines/reference/moduleVariableArrayIndexer.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleVariableArrayIndexer.ts] //// === moduleVariableArrayIndexer.ts === -module Bar { +namespace Bar { >Bar : typeof Bar > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/moduleVariables.js b/tests/baselines/reference/moduleVariables.js index 359ad51469fa8..e8552c500f49f 100644 --- a/tests/baselines/reference/moduleVariables.js +++ b/tests/baselines/reference/moduleVariables.js @@ -4,16 +4,16 @@ declare var console: any; var x = 1; -module M { +namespace M { export var x = 2; console.log(x); // 2 } -module M { +namespace M { console.log(x); // 2 } -module M { +namespace M { var x = 3; console.log(x); // 3 } diff --git a/tests/baselines/reference/moduleVariables.symbols b/tests/baselines/reference/moduleVariables.symbols index 9cd52d91a9772..9ea1d08c3bb34 100644 --- a/tests/baselines/reference/moduleVariables.symbols +++ b/tests/baselines/reference/moduleVariables.symbols @@ -7,7 +7,7 @@ declare var console: any; var x = 1; >x : Symbol(x, Decl(moduleVariables.ts, 2, 3)) -module M { +namespace M { >M : Symbol(M, Decl(moduleVariables.ts, 2, 10), Decl(moduleVariables.ts, 6, 1), Decl(moduleVariables.ts, 10, 1)) export var x = 2; @@ -18,7 +18,7 @@ module M { >x : Symbol(x, Decl(moduleVariables.ts, 4, 14)) } -module M { +namespace M { >M : Symbol(M, Decl(moduleVariables.ts, 2, 10), Decl(moduleVariables.ts, 6, 1), Decl(moduleVariables.ts, 10, 1)) console.log(x); // 2 @@ -26,7 +26,7 @@ module M { >x : Symbol(x, Decl(moduleVariables.ts, 4, 14)) } -module M { +namespace M { >M : Symbol(M, Decl(moduleVariables.ts, 2, 10), Decl(moduleVariables.ts, 6, 1), Decl(moduleVariables.ts, 10, 1)) var x = 3; diff --git a/tests/baselines/reference/moduleVariables.types b/tests/baselines/reference/moduleVariables.types index 4adb04889fa80..5246448115abe 100644 --- a/tests/baselines/reference/moduleVariables.types +++ b/tests/baselines/reference/moduleVariables.types @@ -10,7 +10,7 @@ var x = 1; >1 : 1 > : ^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -31,7 +31,7 @@ module M { > : ^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -46,7 +46,7 @@ module M { > : ^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/moduleVisibilityTest1.js b/tests/baselines/reference/moduleVisibilityTest1.js index 6c8c628e67d7e..cd0c1b813eb95 100644 --- a/tests/baselines/reference/moduleVisibilityTest1.js +++ b/tests/baselines/reference/moduleVisibilityTest1.js @@ -1,19 +1,19 @@ //// [tests/cases/compiler/moduleVisibilityTest1.ts] //// //// [moduleVisibilityTest1.ts] -module OuterMod { +namespace OuterMod { export function someExportedOuterFunc() { return -1; } - export module OuterInnerMod { + export namespace OuterInnerMod { export function someExportedOuterInnerFunc() { return "foo"; } } } import OuterInnerAlias = OuterMod.OuterInnerMod; -module M { +namespace M { - export module InnerMod { + export namespace InnerMod { export function someExportedInnerFunc() { return -2; } } @@ -53,7 +53,7 @@ module M { function someModuleFunction() { return 5;} } -module M { +namespace M { export var c = x; export var meb = M.E.B; } diff --git a/tests/baselines/reference/moduleVisibilityTest1.symbols b/tests/baselines/reference/moduleVisibilityTest1.symbols index b0cc2b502692f..f97df6077f99a 100644 --- a/tests/baselines/reference/moduleVisibilityTest1.symbols +++ b/tests/baselines/reference/moduleVisibilityTest1.symbols @@ -1,17 +1,17 @@ //// [tests/cases/compiler/moduleVisibilityTest1.ts] //// === moduleVisibilityTest1.ts === -module OuterMod { +namespace OuterMod { >OuterMod : Symbol(OuterMod, Decl(moduleVisibilityTest1.ts, 0, 0)) export function someExportedOuterFunc() { return -1; } ->someExportedOuterFunc : Symbol(someExportedOuterFunc, Decl(moduleVisibilityTest1.ts, 0, 17)) +>someExportedOuterFunc : Symbol(someExportedOuterFunc, Decl(moduleVisibilityTest1.ts, 0, 20)) - export module OuterInnerMod { + export namespace OuterInnerMod { >OuterInnerMod : Symbol(OuterInnerMod, Decl(moduleVisibilityTest1.ts, 1, 55)) export function someExportedOuterInnerFunc() { return "foo"; } ->someExportedOuterInnerFunc : Symbol(someExportedOuterInnerFunc, Decl(moduleVisibilityTest1.ts, 3, 30)) +>someExportedOuterInnerFunc : Symbol(someExportedOuterInnerFunc, Decl(moduleVisibilityTest1.ts, 3, 33)) } } @@ -20,14 +20,14 @@ import OuterInnerAlias = OuterMod.OuterInnerMod; >OuterMod : Symbol(OuterMod, Decl(moduleVisibilityTest1.ts, 0, 0)) >OuterInnerMod : Symbol(OuterInnerAlias, Decl(moduleVisibilityTest1.ts, 1, 55)) -module M { +namespace M { >M : Symbol(M, Decl(moduleVisibilityTest1.ts, 8, 48), Decl(moduleVisibilityTest1.ts, 50, 1)) - export module InnerMod { ->InnerMod : Symbol(InnerMod, Decl(moduleVisibilityTest1.ts, 10, 10)) + export namespace InnerMod { +>InnerMod : Symbol(InnerMod, Decl(moduleVisibilityTest1.ts, 10, 13)) export function someExportedInnerFunc() { return -2; } ->someExportedInnerFunc : Symbol(someExportedInnerFunc, Decl(moduleVisibilityTest1.ts, 12, 25)) +>someExportedInnerFunc : Symbol(someExportedInnerFunc, Decl(moduleVisibilityTest1.ts, 12, 28)) } export enum E { @@ -72,21 +72,21 @@ module M { public someMethodThatCallsAnOuterMethod() {return OuterInnerAlias.someExportedOuterInnerFunc();} >someMethodThatCallsAnOuterMethod : Symbol(C.someMethodThatCallsAnOuterMethod, Decl(moduleVisibilityTest1.ts, 34, 31)) ->OuterInnerAlias.someExportedOuterInnerFunc : Symbol(OuterInnerAlias.someExportedOuterInnerFunc, Decl(moduleVisibilityTest1.ts, 3, 30)) +>OuterInnerAlias.someExportedOuterInnerFunc : Symbol(OuterInnerAlias.someExportedOuterInnerFunc, Decl(moduleVisibilityTest1.ts, 3, 33)) >OuterInnerAlias : Symbol(OuterInnerAlias, Decl(moduleVisibilityTest1.ts, 6, 1)) ->someExportedOuterInnerFunc : Symbol(OuterInnerAlias.someExportedOuterInnerFunc, Decl(moduleVisibilityTest1.ts, 3, 30)) +>someExportedOuterInnerFunc : Symbol(OuterInnerAlias.someExportedOuterInnerFunc, Decl(moduleVisibilityTest1.ts, 3, 33)) public someMethodThatCallsAnInnerMethod() {return InnerMod.someExportedInnerFunc();} >someMethodThatCallsAnInnerMethod : Symbol(C.someMethodThatCallsAnInnerMethod, Decl(moduleVisibilityTest1.ts, 35, 98)) ->InnerMod.someExportedInnerFunc : Symbol(InnerMod.someExportedInnerFunc, Decl(moduleVisibilityTest1.ts, 12, 25)) ->InnerMod : Symbol(InnerMod, Decl(moduleVisibilityTest1.ts, 10, 10)) ->someExportedInnerFunc : Symbol(InnerMod.someExportedInnerFunc, Decl(moduleVisibilityTest1.ts, 12, 25)) +>InnerMod.someExportedInnerFunc : Symbol(InnerMod.someExportedInnerFunc, Decl(moduleVisibilityTest1.ts, 12, 28)) +>InnerMod : Symbol(InnerMod, Decl(moduleVisibilityTest1.ts, 10, 13)) +>someExportedInnerFunc : Symbol(InnerMod.someExportedInnerFunc, Decl(moduleVisibilityTest1.ts, 12, 28)) public someMethodThatCallsAnOuterInnerMethod() {return OuterMod.someExportedOuterFunc();} >someMethodThatCallsAnOuterInnerMethod : Symbol(C.someMethodThatCallsAnOuterInnerMethod, Decl(moduleVisibilityTest1.ts, 36, 86)) ->OuterMod.someExportedOuterFunc : Symbol(OuterMod.someExportedOuterFunc, Decl(moduleVisibilityTest1.ts, 0, 17)) +>OuterMod.someExportedOuterFunc : Symbol(OuterMod.someExportedOuterFunc, Decl(moduleVisibilityTest1.ts, 0, 20)) >OuterMod : Symbol(OuterMod, Decl(moduleVisibilityTest1.ts, 0, 0)) ->someExportedOuterFunc : Symbol(OuterMod.someExportedOuterFunc, Decl(moduleVisibilityTest1.ts, 0, 17)) +>someExportedOuterFunc : Symbol(OuterMod.someExportedOuterFunc, Decl(moduleVisibilityTest1.ts, 0, 20)) public someMethod() { return 0; } >someMethod : Symbol(C.someMethod, Decl(moduleVisibilityTest1.ts, 37, 91)) @@ -110,7 +110,7 @@ module M { >someModuleFunction : Symbol(someModuleFunction, Decl(moduleVisibilityTest1.ts, 47, 23)) } -module M { +namespace M { >M : Symbol(M, Decl(moduleVisibilityTest1.ts, 8, 48), Decl(moduleVisibilityTest1.ts, 50, 1)) export var c = x; diff --git a/tests/baselines/reference/moduleVisibilityTest1.types b/tests/baselines/reference/moduleVisibilityTest1.types index d300bd0a6437c..38fb058a226c1 100644 --- a/tests/baselines/reference/moduleVisibilityTest1.types +++ b/tests/baselines/reference/moduleVisibilityTest1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleVisibilityTest1.ts] //// === moduleVisibilityTest1.ts === -module OuterMod { +namespace OuterMod { >OuterMod : typeof OuterMod > : ^^^^^^^^^^^^^^^ @@ -13,7 +13,7 @@ module OuterMod { >1 : 1 > : ^ - export module OuterInnerMod { + export namespace OuterInnerMod { >OuterInnerMod : typeof OuterInnerMod > : ^^^^^^^^^^^^^^^^^^^^ @@ -33,11 +33,11 @@ import OuterInnerAlias = OuterMod.OuterInnerMod; >OuterInnerMod : typeof OuterInnerAlias > : ^^^^^^^^^^^^^^^^^^^^^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ - export module InnerMod { + export namespace InnerMod { >InnerMod : typeof InnerMod > : ^^^^^^^^^^^^^^^ @@ -181,7 +181,7 @@ module M { > : ^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/moduleVisibilityTest2.errors.txt b/tests/baselines/reference/moduleVisibilityTest2.errors.txt index 0fd8fbeb7a0d0..f34b08c4e6291 100644 --- a/tests/baselines/reference/moduleVisibilityTest2.errors.txt +++ b/tests/baselines/reference/moduleVisibilityTest2.errors.txt @@ -7,19 +7,19 @@ moduleVisibilityTest2.ts(63,15): error TS2339: Property 'E' does not exist on ty ==== moduleVisibilityTest2.ts (6 errors) ==== - module OuterMod { + namespace OuterMod { export function someExportedOuterFunc() { return -1; } - export module OuterInnerMod { + export namespace OuterInnerMod { export function someExportedOuterInnerFunc() { return "foo"; } } } import OuterInnerAlias = OuterMod.OuterInnerMod; - module M { + namespace M { - module InnerMod { + namespace InnerMod { export function someExportedInnerFunc() { return -2; } } @@ -60,7 +60,7 @@ moduleVisibilityTest2.ts(63,15): error TS2339: Property 'E' does not exist on ty function someModuleFunction() { return 5;} } - module M { + namespace M { export var c = x; ~ !!! error TS2304: Cannot find name 'x'. diff --git a/tests/baselines/reference/moduleVisibilityTest2.js b/tests/baselines/reference/moduleVisibilityTest2.js index 4af5db8352992..550ad6ca6febd 100644 --- a/tests/baselines/reference/moduleVisibilityTest2.js +++ b/tests/baselines/reference/moduleVisibilityTest2.js @@ -1,19 +1,19 @@ //// [tests/cases/compiler/moduleVisibilityTest2.ts] //// //// [moduleVisibilityTest2.ts] -module OuterMod { +namespace OuterMod { export function someExportedOuterFunc() { return -1; } - export module OuterInnerMod { + export namespace OuterInnerMod { export function someExportedOuterInnerFunc() { return "foo"; } } } import OuterInnerAlias = OuterMod.OuterInnerMod; -module M { +namespace M { - module InnerMod { + namespace InnerMod { export function someExportedInnerFunc() { return -2; } } @@ -54,7 +54,7 @@ module M { function someModuleFunction() { return 5;} } -module M { +namespace M { export var c = x; export var meb = M.E.B; } diff --git a/tests/baselines/reference/moduleVisibilityTest2.symbols b/tests/baselines/reference/moduleVisibilityTest2.symbols index 132777b572d51..692495f9298f1 100644 --- a/tests/baselines/reference/moduleVisibilityTest2.symbols +++ b/tests/baselines/reference/moduleVisibilityTest2.symbols @@ -1,17 +1,17 @@ //// [tests/cases/compiler/moduleVisibilityTest2.ts] //// === moduleVisibilityTest2.ts === -module OuterMod { +namespace OuterMod { >OuterMod : Symbol(OuterMod, Decl(moduleVisibilityTest2.ts, 0, 0)) export function someExportedOuterFunc() { return -1; } ->someExportedOuterFunc : Symbol(someExportedOuterFunc, Decl(moduleVisibilityTest2.ts, 0, 17)) +>someExportedOuterFunc : Symbol(someExportedOuterFunc, Decl(moduleVisibilityTest2.ts, 0, 20)) - export module OuterInnerMod { + export namespace OuterInnerMod { >OuterInnerMod : Symbol(OuterInnerMod, Decl(moduleVisibilityTest2.ts, 1, 55)) export function someExportedOuterInnerFunc() { return "foo"; } ->someExportedOuterInnerFunc : Symbol(someExportedOuterInnerFunc, Decl(moduleVisibilityTest2.ts, 3, 30)) +>someExportedOuterInnerFunc : Symbol(someExportedOuterInnerFunc, Decl(moduleVisibilityTest2.ts, 3, 33)) } } @@ -20,14 +20,14 @@ import OuterInnerAlias = OuterMod.OuterInnerMod; >OuterMod : Symbol(OuterMod, Decl(moduleVisibilityTest2.ts, 0, 0)) >OuterInnerMod : Symbol(OuterInnerAlias, Decl(moduleVisibilityTest2.ts, 1, 55)) -module M { +namespace M { >M : Symbol(M, Decl(moduleVisibilityTest2.ts, 8, 48), Decl(moduleVisibilityTest2.ts, 51, 1)) - module InnerMod { ->InnerMod : Symbol(InnerMod, Decl(moduleVisibilityTest2.ts, 10, 10)) + namespace InnerMod { +>InnerMod : Symbol(InnerMod, Decl(moduleVisibilityTest2.ts, 10, 13)) export function someExportedInnerFunc() { return -2; } ->someExportedInnerFunc : Symbol(someExportedInnerFunc, Decl(moduleVisibilityTest2.ts, 12, 18)) +>someExportedInnerFunc : Symbol(someExportedInnerFunc, Decl(moduleVisibilityTest2.ts, 12, 21)) } enum E { @@ -72,21 +72,21 @@ module M { public someMethodThatCallsAnOuterMethod() {return OuterInnerAlias.someExportedOuterInnerFunc();} >someMethodThatCallsAnOuterMethod : Symbol(C.someMethodThatCallsAnOuterMethod, Decl(moduleVisibilityTest2.ts, 34, 31)) ->OuterInnerAlias.someExportedOuterInnerFunc : Symbol(OuterInnerAlias.someExportedOuterInnerFunc, Decl(moduleVisibilityTest2.ts, 3, 30)) +>OuterInnerAlias.someExportedOuterInnerFunc : Symbol(OuterInnerAlias.someExportedOuterInnerFunc, Decl(moduleVisibilityTest2.ts, 3, 33)) >OuterInnerAlias : Symbol(OuterInnerAlias, Decl(moduleVisibilityTest2.ts, 6, 1)) ->someExportedOuterInnerFunc : Symbol(OuterInnerAlias.someExportedOuterInnerFunc, Decl(moduleVisibilityTest2.ts, 3, 30)) +>someExportedOuterInnerFunc : Symbol(OuterInnerAlias.someExportedOuterInnerFunc, Decl(moduleVisibilityTest2.ts, 3, 33)) public someMethodThatCallsAnInnerMethod() {return InnerMod.someExportedInnerFunc();} >someMethodThatCallsAnInnerMethod : Symbol(C.someMethodThatCallsAnInnerMethod, Decl(moduleVisibilityTest2.ts, 35, 98)) ->InnerMod.someExportedInnerFunc : Symbol(InnerMod.someExportedInnerFunc, Decl(moduleVisibilityTest2.ts, 12, 18)) ->InnerMod : Symbol(InnerMod, Decl(moduleVisibilityTest2.ts, 10, 10)) ->someExportedInnerFunc : Symbol(InnerMod.someExportedInnerFunc, Decl(moduleVisibilityTest2.ts, 12, 18)) +>InnerMod.someExportedInnerFunc : Symbol(InnerMod.someExportedInnerFunc, Decl(moduleVisibilityTest2.ts, 12, 21)) +>InnerMod : Symbol(InnerMod, Decl(moduleVisibilityTest2.ts, 10, 13)) +>someExportedInnerFunc : Symbol(InnerMod.someExportedInnerFunc, Decl(moduleVisibilityTest2.ts, 12, 21)) public someMethodThatCallsAnOuterInnerMethod() {return OuterMod.someExportedOuterFunc();} >someMethodThatCallsAnOuterInnerMethod : Symbol(C.someMethodThatCallsAnOuterInnerMethod, Decl(moduleVisibilityTest2.ts, 36, 86)) ->OuterMod.someExportedOuterFunc : Symbol(OuterMod.someExportedOuterFunc, Decl(moduleVisibilityTest2.ts, 0, 17)) +>OuterMod.someExportedOuterFunc : Symbol(OuterMod.someExportedOuterFunc, Decl(moduleVisibilityTest2.ts, 0, 20)) >OuterMod : Symbol(OuterMod, Decl(moduleVisibilityTest2.ts, 0, 0)) ->someExportedOuterFunc : Symbol(OuterMod.someExportedOuterFunc, Decl(moduleVisibilityTest2.ts, 0, 17)) +>someExportedOuterFunc : Symbol(OuterMod.someExportedOuterFunc, Decl(moduleVisibilityTest2.ts, 0, 20)) public someMethod() { return 0; } >someMethod : Symbol(C.someMethod, Decl(moduleVisibilityTest2.ts, 37, 91)) @@ -111,7 +111,7 @@ module M { >someModuleFunction : Symbol(someModuleFunction, Decl(moduleVisibilityTest2.ts, 48, 23)) } -module M { +namespace M { >M : Symbol(M, Decl(moduleVisibilityTest2.ts, 8, 48), Decl(moduleVisibilityTest2.ts, 51, 1)) export var c = x; diff --git a/tests/baselines/reference/moduleVisibilityTest2.types b/tests/baselines/reference/moduleVisibilityTest2.types index 82c99a8fb2bae..4d0ff6f076f7d 100644 --- a/tests/baselines/reference/moduleVisibilityTest2.types +++ b/tests/baselines/reference/moduleVisibilityTest2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleVisibilityTest2.ts] //// === moduleVisibilityTest2.ts === -module OuterMod { +namespace OuterMod { >OuterMod : typeof OuterMod > : ^^^^^^^^^^^^^^^ @@ -13,7 +13,7 @@ module OuterMod { >1 : 1 > : ^ - export module OuterInnerMod { + export namespace OuterInnerMod { >OuterInnerMod : typeof OuterInnerMod > : ^^^^^^^^^^^^^^^^^^^^ @@ -33,11 +33,11 @@ import OuterInnerAlias = OuterMod.OuterInnerMod; >OuterInnerMod : typeof OuterInnerAlias > : ^^^^^^^^^^^^^^^^^^^^^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ - module InnerMod { + namespace InnerMod { >InnerMod : typeof InnerMod > : ^^^^^^^^^^^^^^^ @@ -183,7 +183,7 @@ module M { > : ^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/moduleVisibilityTest3.errors.txt b/tests/baselines/reference/moduleVisibilityTest3.errors.txt index 588c7dcaf4b94..7f832636d664f 100644 --- a/tests/baselines/reference/moduleVisibilityTest3.errors.txt +++ b/tests/baselines/reference/moduleVisibilityTest3.errors.txt @@ -4,7 +4,7 @@ moduleVisibilityTest3.ts(21,22): error TS2724: '_modes' has no exported member n ==== moduleVisibilityTest3.ts (3 errors) ==== - module _modes { + namespace _modes { export interface IMode { } @@ -16,7 +16,7 @@ moduleVisibilityTest3.ts(21,22): error TS2724: '_modes' has no exported member n //_modes. // produces an internal error - please implement in derived class - module editor { + namespace editor { import modes = _modes; var i : modes.IMode; diff --git a/tests/baselines/reference/moduleVisibilityTest3.js b/tests/baselines/reference/moduleVisibilityTest3.js index 92bf431611413..480fd51decd53 100644 --- a/tests/baselines/reference/moduleVisibilityTest3.js +++ b/tests/baselines/reference/moduleVisibilityTest3.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleVisibilityTest3.ts] //// //// [moduleVisibilityTest3.ts] -module _modes { +namespace _modes { export interface IMode { } @@ -13,7 +13,7 @@ module _modes { //_modes. // produces an internal error - please implement in derived class -module editor { +namespace editor { import modes = _modes; var i : modes.IMode; diff --git a/tests/baselines/reference/moduleVisibilityTest3.symbols b/tests/baselines/reference/moduleVisibilityTest3.symbols index 25181f73ed82c..7c12920450fe4 100644 --- a/tests/baselines/reference/moduleVisibilityTest3.symbols +++ b/tests/baselines/reference/moduleVisibilityTest3.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/moduleVisibilityTest3.ts] //// === moduleVisibilityTest3.ts === -module _modes { +namespace _modes { >_modes : Symbol(_modes, Decl(moduleVisibilityTest3.ts, 0, 0)) export interface IMode { ->IMode : Symbol(IMode, Decl(moduleVisibilityTest3.ts, 0, 15)) +>IMode : Symbol(IMode, Decl(moduleVisibilityTest3.ts, 0, 18)) } @@ -17,17 +17,17 @@ module _modes { //_modes. // produces an internal error - please implement in derived class -module editor { +namespace editor { >editor : Symbol(editor, Decl(moduleVisibilityTest3.ts, 8, 1)) import modes = _modes; ->modes : Symbol(modes, Decl(moduleVisibilityTest3.ts, 12, 15)) +>modes : Symbol(modes, Decl(moduleVisibilityTest3.ts, 12, 18)) >_modes : Symbol(modes, Decl(moduleVisibilityTest3.ts, 0, 0)) var i : modes.IMode; >i : Symbol(i, Decl(moduleVisibilityTest3.ts, 15, 4)) ->modes : Symbol(modes, Decl(moduleVisibilityTest3.ts, 12, 15)) ->IMode : Symbol(modes.IMode, Decl(moduleVisibilityTest3.ts, 0, 15)) +>modes : Symbol(modes, Decl(moduleVisibilityTest3.ts, 12, 18)) +>IMode : Symbol(modes.IMode, Decl(moduleVisibilityTest3.ts, 0, 18)) // If you just use p1:modes, the compiler accepts it - should be an error class Bug { @@ -37,12 +37,12 @@ module editor { >p1 : Symbol(p1, Decl(moduleVisibilityTest3.ts, 19, 17)) >modes : Symbol(modes) >p2 : Symbol(p2, Decl(moduleVisibilityTest3.ts, 19, 27)) ->modes : Symbol(modes, Decl(moduleVisibilityTest3.ts, 12, 15)) +>modes : Symbol(modes, Decl(moduleVisibilityTest3.ts, 12, 18)) >Mode : Symbol(modes.Mode) var x:modes.Mode; >x : Symbol(x, Decl(moduleVisibilityTest3.ts, 20, 12)) ->modes : Symbol(modes, Decl(moduleVisibilityTest3.ts, 12, 15)) +>modes : Symbol(modes, Decl(moduleVisibilityTest3.ts, 12, 18)) >Mode : Symbol(modes.Mode) } diff --git a/tests/baselines/reference/moduleVisibilityTest3.types b/tests/baselines/reference/moduleVisibilityTest3.types index f302a1eae7025..f4cf7d8ce7ca3 100644 --- a/tests/baselines/reference/moduleVisibilityTest3.types +++ b/tests/baselines/reference/moduleVisibilityTest3.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleVisibilityTest3.ts] //// === moduleVisibilityTest3.ts === -module _modes { +namespace _modes { >_modes : typeof _modes > : ^^^^^^^^^^^^^ @@ -18,7 +18,7 @@ module _modes { //_modes. // produces an internal error - please implement in derived class -module editor { +namespace editor { >editor : typeof editor > : ^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/moduleVisibilityTest4.errors.txt b/tests/baselines/reference/moduleVisibilityTest4.errors.txt index 9bea2e3c23db7..a55fb31f79753 100644 --- a/tests/baselines/reference/moduleVisibilityTest4.errors.txt +++ b/tests/baselines/reference/moduleVisibilityTest4.errors.txt @@ -5,7 +5,7 @@ moduleVisibilityTest4.ts(15,11): error TS2694: Namespace 'N' has no exported mem ==== moduleVisibilityTest4.ts (4 errors) ==== - module M { + namespace M { export type nums = number; } diff --git a/tests/baselines/reference/moduleVisibilityTest4.js b/tests/baselines/reference/moduleVisibilityTest4.js index f009c6ba9f9dc..e5f5af8ff48f6 100644 --- a/tests/baselines/reference/moduleVisibilityTest4.js +++ b/tests/baselines/reference/moduleVisibilityTest4.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleVisibilityTest4.ts] //// //// [moduleVisibilityTest4.ts] -module M { +namespace M { export type nums = number; } diff --git a/tests/baselines/reference/moduleVisibilityTest4.symbols b/tests/baselines/reference/moduleVisibilityTest4.symbols index 1693083e6bea2..6ed1d390e8635 100644 --- a/tests/baselines/reference/moduleVisibilityTest4.symbols +++ b/tests/baselines/reference/moduleVisibilityTest4.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/moduleVisibilityTest4.ts] //// === moduleVisibilityTest4.ts === -module M { +namespace M { >M : Symbol(M, Decl(moduleVisibilityTest4.ts, 0, 0)) export type nums = number; ->nums : Symbol(nums, Decl(moduleVisibilityTest4.ts, 0, 10)) +>nums : Symbol(nums, Decl(moduleVisibilityTest4.ts, 0, 13)) } namespace N { @@ -23,7 +23,7 @@ let a1: M.num; let b1: M.nums; >b1 : Symbol(b1, Decl(moduleVisibilityTest4.ts, 9, 3)) >M : Symbol(M, Decl(moduleVisibilityTest4.ts, 0, 0)) ->nums : Symbol(M.nums, Decl(moduleVisibilityTest4.ts, 0, 10)) +>nums : Symbol(M.nums, Decl(moduleVisibilityTest4.ts, 0, 13)) let c1: M.bar; >c1 : Symbol(c1, Decl(moduleVisibilityTest4.ts, 10, 3)) diff --git a/tests/baselines/reference/moduleVisibilityTest4.types b/tests/baselines/reference/moduleVisibilityTest4.types index 7dd7c56cf4e40..3953ef685e280 100644 --- a/tests/baselines/reference/moduleVisibilityTest4.types +++ b/tests/baselines/reference/moduleVisibilityTest4.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleVisibilityTest4.ts] //// === moduleVisibilityTest4.ts === -module M { +namespace M { export type nums = number; >nums : number > : ^^^^^^ diff --git a/tests/baselines/reference/moduleWithNoValuesAsType.errors.txt b/tests/baselines/reference/moduleWithNoValuesAsType.errors.txt index d2a123782666b..5fb19676ff900 100644 --- a/tests/baselines/reference/moduleWithNoValuesAsType.errors.txt +++ b/tests/baselines/reference/moduleWithNoValuesAsType.errors.txt @@ -4,20 +4,20 @@ moduleWithNoValuesAsType.ts(15,8): error TS2709: Cannot use namespace 'C' as a t ==== moduleWithNoValuesAsType.ts (3 errors) ==== - module A { } + namespace A { } var a: A; // error ~ !!! error TS2709: Cannot use namespace 'A' as a type. - module B { + namespace B { interface I {} } var b: B; // error ~ !!! error TS2709: Cannot use namespace 'B' as a type. - module C { - module M { + namespace C { + namespace M { interface I {} } } diff --git a/tests/baselines/reference/moduleWithNoValuesAsType.js b/tests/baselines/reference/moduleWithNoValuesAsType.js index e4b12da3d5608..4f149f63774d0 100644 --- a/tests/baselines/reference/moduleWithNoValuesAsType.js +++ b/tests/baselines/reference/moduleWithNoValuesAsType.js @@ -1,16 +1,16 @@ //// [tests/cases/compiler/moduleWithNoValuesAsType.ts] //// //// [moduleWithNoValuesAsType.ts] -module A { } +namespace A { } var a: A; // error -module B { +namespace B { interface I {} } var b: B; // error -module C { - module M { +namespace C { + namespace M { interface I {} } } diff --git a/tests/baselines/reference/moduleWithNoValuesAsType.symbols b/tests/baselines/reference/moduleWithNoValuesAsType.symbols index 52272ee4555e7..148a90d1ad73f 100644 --- a/tests/baselines/reference/moduleWithNoValuesAsType.symbols +++ b/tests/baselines/reference/moduleWithNoValuesAsType.symbols @@ -1,31 +1,31 @@ //// [tests/cases/compiler/moduleWithNoValuesAsType.ts] //// === moduleWithNoValuesAsType.ts === -module A { } +namespace A { } >A : Symbol(A, Decl(moduleWithNoValuesAsType.ts, 0, 0)) var a: A; // error >a : Symbol(a, Decl(moduleWithNoValuesAsType.ts, 1, 3)) >A : Symbol(A) -module B { +namespace B { >B : Symbol(B, Decl(moduleWithNoValuesAsType.ts, 1, 9)) interface I {} ->I : Symbol(I, Decl(moduleWithNoValuesAsType.ts, 3, 10)) +>I : Symbol(I, Decl(moduleWithNoValuesAsType.ts, 3, 13)) } var b: B; // error >b : Symbol(b, Decl(moduleWithNoValuesAsType.ts, 6, 3)) >B : Symbol(B) -module C { +namespace C { >C : Symbol(C, Decl(moduleWithNoValuesAsType.ts, 6, 9)) - module M { ->M : Symbol(M, Decl(moduleWithNoValuesAsType.ts, 8, 10)) + namespace M { +>M : Symbol(M, Decl(moduleWithNoValuesAsType.ts, 8, 13)) interface I {} ->I : Symbol(I, Decl(moduleWithNoValuesAsType.ts, 9, 14)) +>I : Symbol(I, Decl(moduleWithNoValuesAsType.ts, 9, 17)) } } diff --git a/tests/baselines/reference/moduleWithNoValuesAsType.types b/tests/baselines/reference/moduleWithNoValuesAsType.types index 912e66514fceb..30a78285804c8 100644 --- a/tests/baselines/reference/moduleWithNoValuesAsType.types +++ b/tests/baselines/reference/moduleWithNoValuesAsType.types @@ -1,20 +1,20 @@ //// [tests/cases/compiler/moduleWithNoValuesAsType.ts] //// === moduleWithNoValuesAsType.ts === -module A { } +namespace A { } var a: A; // error >a : A > : ^ -module B { +namespace B { interface I {} } var b: B; // error >b : B > : ^ -module C { - module M { +namespace C { + namespace M { interface I {} } } diff --git a/tests/baselines/reference/moduleWithStatementsOfEveryKind.js b/tests/baselines/reference/moduleWithStatementsOfEveryKind.js index 8d205c5b9edd9..948d629e2a986 100644 --- a/tests/baselines/reference/moduleWithStatementsOfEveryKind.js +++ b/tests/baselines/reference/moduleWithStatementsOfEveryKind.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/moduleBody/moduleWithStatementsOfEveryKind.ts] //// //// [moduleWithStatementsOfEveryKind.ts] -module A { +namespace A { class A { s: string } class AA { s: T } interface I { id: number } @@ -11,7 +11,7 @@ module A { id: number; } - module Module { + namespace Module { class A { s: string } } enum Color { Blue, Red } @@ -30,7 +30,7 @@ module A { } } -module Y { +namespace Y { export class A { s: string } export class AA { s: T } export interface I { id: number } @@ -40,7 +40,7 @@ module Y { id: number; } - export module Module { + export namespace Module { class A { s: string } } export enum Color { Blue, Red } diff --git a/tests/baselines/reference/moduleWithStatementsOfEveryKind.symbols b/tests/baselines/reference/moduleWithStatementsOfEveryKind.symbols index 7cdfe04076c12..74d3fd22720e5 100644 --- a/tests/baselines/reference/moduleWithStatementsOfEveryKind.symbols +++ b/tests/baselines/reference/moduleWithStatementsOfEveryKind.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/moduleBody/moduleWithStatementsOfEveryKind.ts] //// === moduleWithStatementsOfEveryKind.ts === -module A { +namespace A { >A : Symbol(A, Decl(moduleWithStatementsOfEveryKind.ts, 0, 0)) class A { s: string } ->A : Symbol(A, Decl(moduleWithStatementsOfEveryKind.ts, 0, 10)) +>A : Symbol(A, Decl(moduleWithStatementsOfEveryKind.ts, 0, 13)) >s : Symbol(A.s, Decl(moduleWithStatementsOfEveryKind.ts, 1, 13)) class AA { s: T } @@ -27,17 +27,17 @@ module A { class BB extends A { >BB : Symbol(BB, Decl(moduleWithStatementsOfEveryKind.ts, 5, 58)) >T : Symbol(T, Decl(moduleWithStatementsOfEveryKind.ts, 6, 13)) ->A : Symbol(A, Decl(moduleWithStatementsOfEveryKind.ts, 0, 10)) +>A : Symbol(A, Decl(moduleWithStatementsOfEveryKind.ts, 0, 13)) id: number; >id : Symbol(BB.id, Decl(moduleWithStatementsOfEveryKind.ts, 6, 27)) } - module Module { + namespace Module { >Module : Symbol(Module, Decl(moduleWithStatementsOfEveryKind.ts, 8, 5)) class A { s: string } ->A : Symbol(A, Decl(moduleWithStatementsOfEveryKind.ts, 10, 19)) +>A : Symbol(A, Decl(moduleWithStatementsOfEveryKind.ts, 10, 22)) >s : Symbol(A.s, Decl(moduleWithStatementsOfEveryKind.ts, 11, 17)) } enum Color { Blue, Red } @@ -79,11 +79,11 @@ module A { } } -module Y { +namespace Y { >Y : Symbol(Y, Decl(moduleWithStatementsOfEveryKind.ts, 27, 1)) export class A { s: string } ->A : Symbol(A, Decl(moduleWithStatementsOfEveryKind.ts, 29, 10)) +>A : Symbol(A, Decl(moduleWithStatementsOfEveryKind.ts, 29, 13)) >s : Symbol(A.s, Decl(moduleWithStatementsOfEveryKind.ts, 30, 20)) export class AA { s: T } @@ -105,17 +105,17 @@ module Y { export class BB extends A { >BB : Symbol(BB, Decl(moduleWithStatementsOfEveryKind.ts, 34, 65)) >T : Symbol(T, Decl(moduleWithStatementsOfEveryKind.ts, 35, 20)) ->A : Symbol(A, Decl(moduleWithStatementsOfEveryKind.ts, 29, 10)) +>A : Symbol(A, Decl(moduleWithStatementsOfEveryKind.ts, 29, 13)) id: number; >id : Symbol(BB.id, Decl(moduleWithStatementsOfEveryKind.ts, 35, 34)) } - export module Module { + export namespace Module { >Module : Symbol(Module, Decl(moduleWithStatementsOfEveryKind.ts, 37, 5)) class A { s: string } ->A : Symbol(A, Decl(moduleWithStatementsOfEveryKind.ts, 39, 26)) +>A : Symbol(A, Decl(moduleWithStatementsOfEveryKind.ts, 39, 29)) >s : Symbol(A.s, Decl(moduleWithStatementsOfEveryKind.ts, 40, 17)) } export enum Color { Blue, Red } diff --git a/tests/baselines/reference/moduleWithStatementsOfEveryKind.types b/tests/baselines/reference/moduleWithStatementsOfEveryKind.types index 60e0307c3ad3d..bc7c14d475507 100644 --- a/tests/baselines/reference/moduleWithStatementsOfEveryKind.types +++ b/tests/baselines/reference/moduleWithStatementsOfEveryKind.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/moduleBody/moduleWithStatementsOfEveryKind.ts] //// === moduleWithStatementsOfEveryKind.ts === -module A { +namespace A { >A : typeof globalThis.A > : ^^^^^^^^^^^^^^^^^^^ @@ -40,7 +40,7 @@ module A { > : ^^^^^^ } - module Module { + namespace Module { >Module : typeof Module > : ^^^^^^^^^^^^^ @@ -122,7 +122,7 @@ module A { } } -module Y { +namespace Y { >Y : typeof Y > : ^^^^^^^^ @@ -161,7 +161,7 @@ module Y { > : ^^^^^^ } - export module Module { + export namespace Module { >Module : typeof Module > : ^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/moduleWithTryStatement1.js b/tests/baselines/reference/moduleWithTryStatement1.js index 4ea003dc1c46d..8a59e9be7d36f 100644 --- a/tests/baselines/reference/moduleWithTryStatement1.js +++ b/tests/baselines/reference/moduleWithTryStatement1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleWithTryStatement1.ts] //// //// [moduleWithTryStatement1.ts] -module M { +namespace M { try { } catch (e) { diff --git a/tests/baselines/reference/moduleWithTryStatement1.symbols b/tests/baselines/reference/moduleWithTryStatement1.symbols index 6ea4196d5c6eb..e91eabaa9d3ba 100644 --- a/tests/baselines/reference/moduleWithTryStatement1.symbols +++ b/tests/baselines/reference/moduleWithTryStatement1.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleWithTryStatement1.ts] //// === moduleWithTryStatement1.ts === -module M { +namespace M { >M : Symbol(M, Decl(moduleWithTryStatement1.ts, 0, 0)) try { diff --git a/tests/baselines/reference/moduleWithTryStatement1.types b/tests/baselines/reference/moduleWithTryStatement1.types index d17142683cc1f..faedc2e131d1b 100644 --- a/tests/baselines/reference/moduleWithTryStatement1.types +++ b/tests/baselines/reference/moduleWithTryStatement1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleWithTryStatement1.ts] //// === moduleWithTryStatement1.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/moduleWithValuesAsType.errors.txt b/tests/baselines/reference/moduleWithValuesAsType.errors.txt index 52a7f8c38b477..e6b2836db6a60 100644 --- a/tests/baselines/reference/moduleWithValuesAsType.errors.txt +++ b/tests/baselines/reference/moduleWithValuesAsType.errors.txt @@ -2,7 +2,7 @@ moduleWithValuesAsType.ts(5,8): error TS2709: Cannot use namespace 'A' as a type ==== moduleWithValuesAsType.ts (1 errors) ==== - module A { + namespace A { var b = 1; } diff --git a/tests/baselines/reference/moduleWithValuesAsType.js b/tests/baselines/reference/moduleWithValuesAsType.js index 24c5f25d69f20..ba19a39ea2e8d 100644 --- a/tests/baselines/reference/moduleWithValuesAsType.js +++ b/tests/baselines/reference/moduleWithValuesAsType.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleWithValuesAsType.ts] //// //// [moduleWithValuesAsType.ts] -module A { +namespace A { var b = 1; } diff --git a/tests/baselines/reference/moduleWithValuesAsType.symbols b/tests/baselines/reference/moduleWithValuesAsType.symbols index fe1bbca735587..2d8eca2d4a138 100644 --- a/tests/baselines/reference/moduleWithValuesAsType.symbols +++ b/tests/baselines/reference/moduleWithValuesAsType.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleWithValuesAsType.ts] //// === moduleWithValuesAsType.ts === -module A { +namespace A { >A : Symbol(A, Decl(moduleWithValuesAsType.ts, 0, 0)) var b = 1; diff --git a/tests/baselines/reference/moduleWithValuesAsType.types b/tests/baselines/reference/moduleWithValuesAsType.types index 8b8eb8f3033af..16a5ec3218f12 100644 --- a/tests/baselines/reference/moduleWithValuesAsType.types +++ b/tests/baselines/reference/moduleWithValuesAsType.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/moduleWithValuesAsType.ts] //// === moduleWithValuesAsType.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/module_augmentExistingAmbientVariable.errors.txt b/tests/baselines/reference/module_augmentExistingAmbientVariable.errors.txt index 65c5918ed50af..1fb5b47a4c58d 100644 --- a/tests/baselines/reference/module_augmentExistingAmbientVariable.errors.txt +++ b/tests/baselines/reference/module_augmentExistingAmbientVariable.errors.txt @@ -1,5 +1,5 @@ module_augmentExistingAmbientVariable.ts(1,13): error TS2300: Duplicate identifier 'console'. -module_augmentExistingAmbientVariable.ts(3,8): error TS2300: Duplicate identifier 'console'. +module_augmentExistingAmbientVariable.ts(3,11): error TS2300: Duplicate identifier 'console'. ==== module_augmentExistingAmbientVariable.ts (2 errors) ==== @@ -7,8 +7,8 @@ module_augmentExistingAmbientVariable.ts(3,8): error TS2300: Duplicate identifie ~~~~~~~ !!! error TS2300: Duplicate identifier 'console'. - module console { - ~~~~~~~ + namespace console { + ~~~~~~~ !!! error TS2300: Duplicate identifier 'console'. export var x = 2; } \ No newline at end of file diff --git a/tests/baselines/reference/module_augmentExistingAmbientVariable.js b/tests/baselines/reference/module_augmentExistingAmbientVariable.js index 6a948f25a140e..c10b34aac2dc9 100644 --- a/tests/baselines/reference/module_augmentExistingAmbientVariable.js +++ b/tests/baselines/reference/module_augmentExistingAmbientVariable.js @@ -3,7 +3,7 @@ //// [module_augmentExistingAmbientVariable.ts] declare var console: any; -module console { +namespace console { export var x = 2; } diff --git a/tests/baselines/reference/module_augmentExistingAmbientVariable.symbols b/tests/baselines/reference/module_augmentExistingAmbientVariable.symbols index 7af36e8bfb789..a6bb96f0b273c 100644 --- a/tests/baselines/reference/module_augmentExistingAmbientVariable.symbols +++ b/tests/baselines/reference/module_augmentExistingAmbientVariable.symbols @@ -4,7 +4,7 @@ declare var console: any; >console : Symbol(console, Decl(module_augmentExistingAmbientVariable.ts, 0, 11)) -module console { +namespace console { >console : Symbol(console, Decl(module_augmentExistingAmbientVariable.ts, 0, 25)) export var x = 2; diff --git a/tests/baselines/reference/module_augmentExistingAmbientVariable.types b/tests/baselines/reference/module_augmentExistingAmbientVariable.types index 39cb66f9496ac..47616b6d32c2b 100644 --- a/tests/baselines/reference/module_augmentExistingAmbientVariable.types +++ b/tests/baselines/reference/module_augmentExistingAmbientVariable.types @@ -5,7 +5,7 @@ declare var console: any; >console : any > : ^^^ -module console { +namespace console { >console : typeof console > : ^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/module_augmentExistingVariable.errors.txt b/tests/baselines/reference/module_augmentExistingVariable.errors.txt index abcdfd4fd27a1..c924d043cdef1 100644 --- a/tests/baselines/reference/module_augmentExistingVariable.errors.txt +++ b/tests/baselines/reference/module_augmentExistingVariable.errors.txt @@ -1,5 +1,5 @@ module_augmentExistingVariable.ts(1,5): error TS2300: Duplicate identifier 'console'. -module_augmentExistingVariable.ts(3,8): error TS2300: Duplicate identifier 'console'. +module_augmentExistingVariable.ts(3,11): error TS2300: Duplicate identifier 'console'. ==== module_augmentExistingVariable.ts (2 errors) ==== @@ -7,8 +7,8 @@ module_augmentExistingVariable.ts(3,8): error TS2300: Duplicate identifier 'cons ~~~~~~~ !!! error TS2300: Duplicate identifier 'console'. - module console { - ~~~~~~~ + namespace console { + ~~~~~~~ !!! error TS2300: Duplicate identifier 'console'. export var x = 2; } \ No newline at end of file diff --git a/tests/baselines/reference/module_augmentExistingVariable.js b/tests/baselines/reference/module_augmentExistingVariable.js index 6c826276bb6ab..4afb608411f13 100644 --- a/tests/baselines/reference/module_augmentExistingVariable.js +++ b/tests/baselines/reference/module_augmentExistingVariable.js @@ -3,7 +3,7 @@ //// [module_augmentExistingVariable.ts] var console: any; -module console { +namespace console { export var x = 2; } diff --git a/tests/baselines/reference/module_augmentExistingVariable.symbols b/tests/baselines/reference/module_augmentExistingVariable.symbols index ee3f393330a29..11c21584b9a44 100644 --- a/tests/baselines/reference/module_augmentExistingVariable.symbols +++ b/tests/baselines/reference/module_augmentExistingVariable.symbols @@ -4,7 +4,7 @@ var console: any; >console : Symbol(console, Decl(module_augmentExistingVariable.ts, 0, 3)) -module console { +namespace console { >console : Symbol(console, Decl(module_augmentExistingVariable.ts, 0, 17)) export var x = 2; diff --git a/tests/baselines/reference/module_augmentExistingVariable.types b/tests/baselines/reference/module_augmentExistingVariable.types index 74d176342353d..2dd0a2423ded8 100644 --- a/tests/baselines/reference/module_augmentExistingVariable.types +++ b/tests/baselines/reference/module_augmentExistingVariable.types @@ -5,7 +5,7 @@ var console: any; >console : any > : ^^^ -module console { +namespace console { >console : typeof console > : ^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/module_augmentUninstantiatedModule2.js b/tests/baselines/reference/module_augmentUninstantiatedModule2.js index 3f5624133e410..32c17aaf2ba33 100644 --- a/tests/baselines/reference/module_augmentUninstantiatedModule2.js +++ b/tests/baselines/reference/module_augmentUninstantiatedModule2.js @@ -17,7 +17,7 @@ declare module "angular" { //// [index.d.ts] declare var ng: ng.IAngularStatic; -declare module ng { +declare namespace ng { export interface IModule { name: string; } diff --git a/tests/baselines/reference/module_augmentUninstantiatedModule2.symbols b/tests/baselines/reference/module_augmentUninstantiatedModule2.symbols index 17c284df01978..8af4d58f5f662 100644 --- a/tests/baselines/reference/module_augmentUninstantiatedModule2.symbols +++ b/tests/baselines/reference/module_augmentUninstantiatedModule2.symbols @@ -33,11 +33,11 @@ declare var ng: ng.IAngularStatic; >ng : Symbol(ng, Decl(index.d.ts, 0, 11), Decl(index.d.ts, 0, 34), Decl(moduleAugmentation.ts, 0, 29)) >IAngularStatic : Symbol(ng.IAngularStatic, Decl(index.d.ts, 5, 4), Decl(moduleAugmentation.ts, 1, 26)) -declare module ng { +declare namespace ng { >ng : Symbol(ng, Decl(index.d.ts, 0, 11), Decl(index.d.ts, 0, 34), Decl(moduleAugmentation.ts, 0, 29)) export interface IModule { ->IModule : Symbol(IModule, Decl(index.d.ts, 2, 19)) +>IModule : Symbol(IModule, Decl(index.d.ts, 2, 22)) name: string; >name : Symbol(IModule.name, Decl(index.d.ts, 3, 29)) @@ -49,7 +49,7 @@ declare module ng { module: (s: string) => IModule; >module : Symbol(IAngularStatic.module, Decl(index.d.ts, 7, 36)) >s : Symbol(s, Decl(index.d.ts, 8, 16)) ->IModule : Symbol(IModule, Decl(index.d.ts, 2, 19)) +>IModule : Symbol(IModule, Decl(index.d.ts, 2, 22)) } } diff --git a/tests/baselines/reference/module_augmentUninstantiatedModule2.types b/tests/baselines/reference/module_augmentUninstantiatedModule2.types index 63f548564dd8b..69637fb59c35f 100644 --- a/tests/baselines/reference/module_augmentUninstantiatedModule2.types +++ b/tests/baselines/reference/module_augmentUninstantiatedModule2.types @@ -42,7 +42,7 @@ declare var ng: ng.IAngularStatic; >ng : any > : ^^^ -declare module ng { +declare namespace ng { export interface IModule { name: string; >name : string diff --git a/tests/baselines/reference/moduledecl.js b/tests/baselines/reference/moduledecl.js index 2d66db9d01f02..f3630ba4d6b3a 100644 --- a/tests/baselines/reference/moduledecl.js +++ b/tests/baselines/reference/moduledecl.js @@ -1,24 +1,24 @@ //// [tests/cases/compiler/moduledecl.ts] //// //// [moduledecl.ts] -module a { +namespace a { } -module b.a { +namespace b.a { } -module c.a.b { +namespace c.a.b { import ma = a; } -module mImport { +namespace mImport { import d = a; import e = b.a; import d1 = a; import e1 = b.a; } -module m0 { +namespace m0 { function f1() { } @@ -47,7 +47,7 @@ module m0 { import m7 = c.a.b; } -module m1 { +namespace m1 { export function f1() { } @@ -84,30 +84,30 @@ module m1 { import m7 = c.a.b; } -module m { - export module m2 { +namespace m { + export namespace m2 { var a = 10; export var b: number; } - export module m3 { + export namespace m3 { export var c: number; } } -module m { +namespace m { - export module m25 { - export module m5 { + export namespace m25 { + export namespace m5 { export var c: number; } } } -module m13 { - export module m4 { - export module m2 { - export module m3 { +namespace m13 { + export namespace m4 { + export namespace m2 { + export namespace m3 { export var c: number; } } @@ -118,19 +118,19 @@ module m13 { } } -declare module m4 { +declare namespace m4 { export var b; } -declare module m5 { +declare namespace m5 { export var c; } -declare module m43 { +declare namespace m43 { export var b; } -declare module m55 { +declare namespace m55 { export var c; } @@ -138,7 +138,7 @@ declare module "m3" { export var b: number; } -module exportTests { +namespace exportTests { export class C1_public { private f2() { return 30; @@ -178,7 +178,7 @@ module exportTests { } } -declare module mAmbient { +declare namespace mAmbient { class C { public myProp: number; } @@ -195,7 +195,7 @@ declare module mAmbient { z } - module m3 { + namespace m3 { class C { public myProp: number; } diff --git a/tests/baselines/reference/moduledecl.symbols b/tests/baselines/reference/moduledecl.symbols index b407a01edf062..64bce6bf73795 100644 --- a/tests/baselines/reference/moduledecl.symbols +++ b/tests/baselines/reference/moduledecl.symbols @@ -1,36 +1,36 @@ //// [tests/cases/compiler/moduledecl.ts] //// === moduledecl.ts === -module a { +namespace a { >a : Symbol(a, Decl(moduledecl.ts, 0, 0)) } -module b.a { +namespace b.a { >b : Symbol(b, Decl(moduledecl.ts, 1, 1)) ->a : Symbol(a, Decl(moduledecl.ts, 3, 9)) +>a : Symbol(a, Decl(moduledecl.ts, 3, 12)) } -module c.a.b { +namespace c.a.b { >c : Symbol(c, Decl(moduledecl.ts, 4, 1)) ->a : Symbol(a, Decl(moduledecl.ts, 6, 9)) ->b : Symbol(ma.b, Decl(moduledecl.ts, 6, 11)) +>a : Symbol(a, Decl(moduledecl.ts, 6, 12)) +>b : Symbol(ma.b, Decl(moduledecl.ts, 6, 14)) import ma = a; ->ma : Symbol(ma, Decl(moduledecl.ts, 6, 14)) ->a : Symbol(ma, Decl(moduledecl.ts, 6, 9)) +>ma : Symbol(ma, Decl(moduledecl.ts, 6, 17)) +>a : Symbol(ma, Decl(moduledecl.ts, 6, 12)) } -module mImport { +namespace mImport { >mImport : Symbol(mImport, Decl(moduledecl.ts, 8, 1)) import d = a; ->d : Symbol(d, Decl(moduledecl.ts, 10, 16)) +>d : Symbol(d, Decl(moduledecl.ts, 10, 19)) >a : Symbol(d, Decl(moduledecl.ts, 0, 0)) import e = b.a; >e : Symbol(e, Decl(moduledecl.ts, 11, 17)) >b : Symbol(b, Decl(moduledecl.ts, 1, 1)) ->a : Symbol(e, Decl(moduledecl.ts, 3, 9)) +>a : Symbol(e, Decl(moduledecl.ts, 3, 12)) import d1 = a; >d1 : Symbol(d1, Decl(moduledecl.ts, 12, 19)) @@ -39,14 +39,14 @@ module mImport { import e1 = b.a; >e1 : Symbol(e1, Decl(moduledecl.ts, 13, 18)) >b : Symbol(b, Decl(moduledecl.ts, 1, 1)) ->a : Symbol(e, Decl(moduledecl.ts, 3, 9)) +>a : Symbol(e, Decl(moduledecl.ts, 3, 12)) } -module m0 { +namespace m0 { >m0 : Symbol(m0, Decl(moduledecl.ts, 15, 1)) function f1() { ->f1 : Symbol(f1, Decl(moduledecl.ts, 17, 11)) +>f1 : Symbol(f1, Decl(moduledecl.ts, 17, 14)) } function f2(s: string); @@ -100,7 +100,7 @@ module m0 { import m4 = b.a; >m4 : Symbol(m4, Decl(moduledecl.ts, 39, 18)) >b : Symbol(m3, Decl(moduledecl.ts, 1, 1)) ->a : Symbol(m3.a, Decl(moduledecl.ts, 3, 9)) +>a : Symbol(m3.a, Decl(moduledecl.ts, 3, 12)) import m5 = c; >m5 : Symbol(m5, Decl(moduledecl.ts, 40, 20)) @@ -109,20 +109,20 @@ module m0 { import m6 = c.a; >m6 : Symbol(m6, Decl(moduledecl.ts, 41, 18)) >c : Symbol(m5, Decl(moduledecl.ts, 4, 1)) ->a : Symbol(m5.a, Decl(moduledecl.ts, 6, 9)) +>a : Symbol(m5.a, Decl(moduledecl.ts, 6, 12)) import m7 = c.a.b; >m7 : Symbol(m7, Decl(moduledecl.ts, 42, 20)) >c : Symbol(m5, Decl(moduledecl.ts, 4, 1)) ->a : Symbol(m5.a, Decl(moduledecl.ts, 6, 9)) ->b : Symbol(m6.b, Decl(moduledecl.ts, 6, 11)) +>a : Symbol(m5.a, Decl(moduledecl.ts, 6, 12)) +>b : Symbol(m6.b, Decl(moduledecl.ts, 6, 14)) } -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(moduledecl.ts, 44, 1)) export function f1() { ->f1 : Symbol(f1, Decl(moduledecl.ts, 46, 11)) +>f1 : Symbol(f1, Decl(moduledecl.ts, 46, 14)) } export function f2(s: string); @@ -194,7 +194,7 @@ module m1 { import m4 = b.a; >m4 : Symbol(m4, Decl(moduledecl.ts, 76, 18)) >b : Symbol(m3, Decl(moduledecl.ts, 1, 1)) ->a : Symbol(m3.a, Decl(moduledecl.ts, 3, 9)) +>a : Symbol(m3.a, Decl(moduledecl.ts, 3, 12)) import m5 = c; >m5 : Symbol(m5, Decl(moduledecl.ts, 77, 20)) @@ -203,20 +203,20 @@ module m1 { import m6 = c.a; >m6 : Symbol(m6, Decl(moduledecl.ts, 78, 18)) >c : Symbol(m5, Decl(moduledecl.ts, 4, 1)) ->a : Symbol(m5.a, Decl(moduledecl.ts, 6, 9)) +>a : Symbol(m5.a, Decl(moduledecl.ts, 6, 12)) import m7 = c.a.b; >m7 : Symbol(m7, Decl(moduledecl.ts, 79, 20)) >c : Symbol(m5, Decl(moduledecl.ts, 4, 1)) ->a : Symbol(m5.a, Decl(moduledecl.ts, 6, 9)) ->b : Symbol(m6.b, Decl(moduledecl.ts, 6, 11)) +>a : Symbol(m5.a, Decl(moduledecl.ts, 6, 12)) +>b : Symbol(m6.b, Decl(moduledecl.ts, 6, 14)) } -module m { +namespace m { >m : Symbol(m, Decl(moduledecl.ts, 81, 1), Decl(moduledecl.ts, 92, 1)) - export module m2 { ->m2 : Symbol(m2, Decl(moduledecl.ts, 83, 10)) + export namespace m2 { +>m2 : Symbol(m2, Decl(moduledecl.ts, 83, 13)) var a = 10; >a : Symbol(a, Decl(moduledecl.ts, 85, 11)) @@ -225,7 +225,7 @@ module m { >b : Symbol(b, Decl(moduledecl.ts, 86, 18)) } - export module m3 { + export namespace m3 { >m3 : Symbol(m3, Decl(moduledecl.ts, 87, 5)) export var c: number; @@ -233,14 +233,14 @@ module m { } } -module m { +namespace m { >m : Symbol(m, Decl(moduledecl.ts, 81, 1), Decl(moduledecl.ts, 92, 1)) - export module m25 { ->m25 : Symbol(m25, Decl(moduledecl.ts, 94, 10)) + export namespace m25 { +>m25 : Symbol(m25, Decl(moduledecl.ts, 94, 13)) - export module m5 { ->m5 : Symbol(m5, Decl(moduledecl.ts, 96, 23)) + export namespace m5 { +>m5 : Symbol(m5, Decl(moduledecl.ts, 96, 26)) export var c: number; >c : Symbol(c, Decl(moduledecl.ts, 98, 22)) @@ -248,17 +248,17 @@ module m { } } -module m13 { +namespace m13 { >m13 : Symbol(m13, Decl(moduledecl.ts, 101, 1)) - export module m4 { ->m4 : Symbol(m4, Decl(moduledecl.ts, 103, 12)) + export namespace m4 { +>m4 : Symbol(m4, Decl(moduledecl.ts, 103, 15)) - export module m2 { ->m2 : Symbol(m2, Decl(moduledecl.ts, 104, 22)) + export namespace m2 { +>m2 : Symbol(m2, Decl(moduledecl.ts, 104, 25)) - export module m3 { ->m3 : Symbol(m3, Decl(moduledecl.ts, 105, 26)) + export namespace m3 { +>m3 : Symbol(m3, Decl(moduledecl.ts, 105, 29)) export var c: number; >c : Symbol(c, Decl(moduledecl.ts, 107, 26)) @@ -273,28 +273,28 @@ module m13 { } } -declare module m4 { +declare namespace m4 { >m4 : Symbol(m4, Decl(moduledecl.ts, 115, 1)) export var b; >b : Symbol(b, Decl(moduledecl.ts, 118, 14)) } -declare module m5 { +declare namespace m5 { >m5 : Symbol(m5, Decl(moduledecl.ts, 119, 1)) export var c; >c : Symbol(c, Decl(moduledecl.ts, 122, 14)) } -declare module m43 { +declare namespace m43 { >m43 : Symbol(m43, Decl(moduledecl.ts, 123, 1)) export var b; >b : Symbol(b, Decl(moduledecl.ts, 126, 14)) } -declare module m55 { +declare namespace m55 { >m55 : Symbol(m55, Decl(moduledecl.ts, 127, 1)) export var c; @@ -308,11 +308,11 @@ declare module "m3" { >b : Symbol(b, Decl(moduledecl.ts, 134, 14)) } -module exportTests { +namespace exportTests { >exportTests : Symbol(exportTests, Decl(moduledecl.ts, 135, 1)) export class C1_public { ->C1_public : Symbol(C1_public, Decl(moduledecl.ts, 137, 20)) +>C1_public : Symbol(C1_public, Decl(moduledecl.ts, 137, 23)) private f2() { >f2 : Symbol(C1_public.f2, Decl(moduledecl.ts, 138, 28)) @@ -366,27 +366,27 @@ module exportTests { >getC1_public : Symbol(C3_public.getC1_public, Decl(moduledecl.ts, 165, 9)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(moduledecl.ts, 137, 20)) +>C1_public : Symbol(C1_public, Decl(moduledecl.ts, 137, 23)) } public setC1_public(arg: C1_public) { >setC1_public : Symbol(C3_public.setC1_public, Decl(moduledecl.ts, 168, 9)) >arg : Symbol(arg, Decl(moduledecl.ts, 169, 28)) ->C1_public : Symbol(C1_public, Decl(moduledecl.ts, 137, 20)) +>C1_public : Symbol(C1_public, Decl(moduledecl.ts, 137, 23)) } public get c1() { >c1 : Symbol(C3_public.c1, Decl(moduledecl.ts, 170, 9)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(moduledecl.ts, 137, 20)) +>C1_public : Symbol(C1_public, Decl(moduledecl.ts, 137, 23)) } } } -declare module mAmbient { +declare namespace mAmbient { >mAmbient : Symbol(mAmbient, Decl(moduledecl.ts, 175, 1)) class C { ->C : Symbol(C, Decl(moduledecl.ts, 177, 25)) +>C : Symbol(C, Decl(moduledecl.ts, 177, 28)) public myProp: number; >myProp : Symbol(C.myProp, Decl(moduledecl.ts, 178, 13)) @@ -394,11 +394,11 @@ declare module mAmbient { function foo() : C; >foo : Symbol(foo, Decl(moduledecl.ts, 180, 5)) ->C : Symbol(C, Decl(moduledecl.ts, 177, 25)) +>C : Symbol(C, Decl(moduledecl.ts, 177, 28)) var aVar: C; >aVar : Symbol(aVar, Decl(moduledecl.ts, 183, 7)) ->C : Symbol(C, Decl(moduledecl.ts, 177, 25)) +>C : Symbol(C, Decl(moduledecl.ts, 177, 28)) interface B { >B : Symbol(B, Decl(moduledecl.ts, 183, 16)) @@ -408,7 +408,7 @@ declare module mAmbient { y: C; >y : Symbol(B.y, Decl(moduledecl.ts, 185, 18)) ->C : Symbol(C, Decl(moduledecl.ts, 177, 25)) +>C : Symbol(C, Decl(moduledecl.ts, 177, 28)) } enum e { >e : Symbol(e, Decl(moduledecl.ts, 187, 5)) @@ -423,11 +423,11 @@ declare module mAmbient { >z : Symbol(e.z, Decl(moduledecl.ts, 190, 10)) } - module m3 { + namespace m3 { >m3 : Symbol(m3, Decl(moduledecl.ts, 192, 5)) class C { ->C : Symbol(C, Decl(moduledecl.ts, 194, 15)) +>C : Symbol(C, Decl(moduledecl.ts, 194, 18)) public myProp: number; >myProp : Symbol(C.myProp, Decl(moduledecl.ts, 195, 17)) @@ -435,11 +435,11 @@ declare module mAmbient { function foo(): C; >foo : Symbol(foo, Decl(moduledecl.ts, 197, 9)) ->C : Symbol(C, Decl(moduledecl.ts, 194, 15)) +>C : Symbol(C, Decl(moduledecl.ts, 194, 18)) var aVar: C; >aVar : Symbol(aVar, Decl(moduledecl.ts, 200, 11)) ->C : Symbol(C, Decl(moduledecl.ts, 194, 15)) +>C : Symbol(C, Decl(moduledecl.ts, 194, 18)) interface B { >B : Symbol(B, Decl(moduledecl.ts, 200, 20)) @@ -449,7 +449,7 @@ declare module mAmbient { y: C; >y : Symbol(B.y, Decl(moduledecl.ts, 202, 22)) ->C : Symbol(C, Decl(moduledecl.ts, 194, 15)) +>C : Symbol(C, Decl(moduledecl.ts, 194, 18)) } enum e { >e : Symbol(e, Decl(moduledecl.ts, 204, 9)) @@ -477,9 +477,9 @@ function foo() { var cVar = new mAmbient.C(); >cVar : Symbol(cVar, Decl(moduledecl.ts, 217, 3)) ->mAmbient.C : Symbol(mAmbient.C, Decl(moduledecl.ts, 177, 25)) +>mAmbient.C : Symbol(mAmbient.C, Decl(moduledecl.ts, 177, 28)) >mAmbient : Symbol(mAmbient, Decl(moduledecl.ts, 175, 1)) ->C : Symbol(mAmbient.C, Decl(moduledecl.ts, 177, 25)) +>C : Symbol(mAmbient.C, Decl(moduledecl.ts, 177, 28)) var aVar = mAmbient.aVar; >aVar : Symbol(aVar, Decl(moduledecl.ts, 218, 3)) @@ -510,11 +510,11 @@ function m3foo() { var m3cVar = new mAmbient.m3.C(); >m3cVar : Symbol(m3cVar, Decl(moduledecl.ts, 226, 3)) ->mAmbient.m3.C : Symbol(mAmbient.m3.C, Decl(moduledecl.ts, 194, 15)) +>mAmbient.m3.C : Symbol(mAmbient.m3.C, Decl(moduledecl.ts, 194, 18)) >mAmbient.m3 : Symbol(mAmbient.m3, Decl(moduledecl.ts, 192, 5)) >mAmbient : Symbol(mAmbient, Decl(moduledecl.ts, 175, 1)) >m3 : Symbol(mAmbient.m3, Decl(moduledecl.ts, 192, 5)) ->C : Symbol(mAmbient.m3.C, Decl(moduledecl.ts, 194, 15)) +>C : Symbol(mAmbient.m3.C, Decl(moduledecl.ts, 194, 18)) var m3aVar = mAmbient.m3.aVar; >m3aVar : Symbol(m3aVar, Decl(moduledecl.ts, 227, 3)) diff --git a/tests/baselines/reference/moduledecl.types b/tests/baselines/reference/moduledecl.types index 184d5e917e68a..3f73baec83104 100644 --- a/tests/baselines/reference/moduledecl.types +++ b/tests/baselines/reference/moduledecl.types @@ -1,20 +1,20 @@ //// [tests/cases/compiler/moduledecl.ts] //// === moduledecl.ts === -module a { +namespace a { } -module b.a { +namespace b.a { } -module c.a.b { +namespace c.a.b { import ma = a; >ma : any > : ^^^ >a : error } -module mImport { +namespace mImport { import d = a; >d : any > : ^^^ @@ -42,7 +42,7 @@ module mImport { > : ^^^ } -module m0 { +namespace m0 { >m0 : typeof m0 > : ^^^^^^^^^ @@ -137,7 +137,7 @@ module m0 { > : ^^^ } -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -258,11 +258,11 @@ module m1 { > : ^^^ } -module m { +namespace m { >m : typeof m > : ^^^^^^^^ - export module m2 { + export namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -277,7 +277,7 @@ module m { > : ^^^^^^ } - export module m3 { + export namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ @@ -287,15 +287,15 @@ module m { } } -module m { +namespace m { >m : typeof m > : ^^^^^^^^ - export module m25 { + export namespace m25 { >m25 : typeof m25 > : ^^^^^^^^^^ - export module m5 { + export namespace m5 { >m5 : typeof m5 > : ^^^^^^^^^ @@ -306,19 +306,19 @@ module m { } } -module m13 { +namespace m13 { >m13 : typeof m13 > : ^^^^^^^^^^ - export module m4 { + export namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ - export module m2 { + export namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ - export module m3 { + export namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ @@ -339,7 +339,7 @@ module m13 { } } -declare module m4 { +declare namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ @@ -347,7 +347,7 @@ declare module m4 { >b : any } -declare module m5 { +declare namespace m5 { >m5 : typeof m5 > : ^^^^^^^^^ @@ -355,7 +355,7 @@ declare module m5 { >c : any } -declare module m43 { +declare namespace m43 { >m43 : typeof m43 > : ^^^^^^^^^^ @@ -363,7 +363,7 @@ declare module m43 { >b : any } -declare module m55 { +declare namespace m55 { >m55 : typeof m55 > : ^^^^^^^^^^ @@ -380,7 +380,7 @@ declare module "m3" { > : ^^^^^^ } -module exportTests { +namespace exportTests { >exportTests : typeof exportTests > : ^^^^^^^^^^^^^^^^^^ @@ -488,7 +488,7 @@ module exportTests { } } -declare module mAmbient { +declare namespace mAmbient { >mAmbient : typeof mAmbient > : ^^^^^^^^^^^^^^^ @@ -535,7 +535,7 @@ declare module mAmbient { > : ^^^ } - module m3 { + namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/multiModuleClodule1.js b/tests/baselines/reference/multiModuleClodule1.js index a3cb054efc863..765edfdc8326e 100644 --- a/tests/baselines/reference/multiModuleClodule1.js +++ b/tests/baselines/reference/multiModuleClodule1.js @@ -8,11 +8,11 @@ class C { static boo() { } } -module C { +namespace C { export var x = 1; var y = 2; } -module C { +namespace C { export function foo() { } function baz() { return ''; } } diff --git a/tests/baselines/reference/multiModuleClodule1.symbols b/tests/baselines/reference/multiModuleClodule1.symbols index 82a79656974f8..6c4fdd04e1db5 100644 --- a/tests/baselines/reference/multiModuleClodule1.symbols +++ b/tests/baselines/reference/multiModuleClodule1.symbols @@ -17,7 +17,7 @@ class C { >boo : Symbol(C.boo, Decl(multiModuleClodule1.ts, 3, 13)) } -module C { +namespace C { >C : Symbol(C, Decl(multiModuleClodule1.ts, 0, 0), Decl(multiModuleClodule1.ts, 5, 1), Decl(multiModuleClodule1.ts, 10, 1)) export var x = 1; @@ -26,11 +26,11 @@ module C { var y = 2; >y : Symbol(y, Decl(multiModuleClodule1.ts, 9, 7)) } -module C { +namespace C { >C : Symbol(C, Decl(multiModuleClodule1.ts, 0, 0), Decl(multiModuleClodule1.ts, 5, 1), Decl(multiModuleClodule1.ts, 10, 1)) export function foo() { } ->foo : Symbol(foo, Decl(multiModuleClodule1.ts, 11, 10)) +>foo : Symbol(foo, Decl(multiModuleClodule1.ts, 11, 13)) function baz() { return ''; } >baz : Symbol(baz, Decl(multiModuleClodule1.ts, 12, 29)) @@ -47,7 +47,7 @@ c.foo = C.foo; >c.foo : Symbol(C.foo, Decl(multiModuleClodule1.ts, 1, 30)) >c : Symbol(c, Decl(multiModuleClodule1.ts, 16, 3)) >foo : Symbol(C.foo, Decl(multiModuleClodule1.ts, 1, 30)) ->C.foo : Symbol(C.foo, Decl(multiModuleClodule1.ts, 11, 10)) +>C.foo : Symbol(C.foo, Decl(multiModuleClodule1.ts, 11, 13)) >C : Symbol(C, Decl(multiModuleClodule1.ts, 0, 0), Decl(multiModuleClodule1.ts, 5, 1), Decl(multiModuleClodule1.ts, 10, 1)) ->foo : Symbol(C.foo, Decl(multiModuleClodule1.ts, 11, 10)) +>foo : Symbol(C.foo, Decl(multiModuleClodule1.ts, 11, 13)) diff --git a/tests/baselines/reference/multiModuleClodule1.types b/tests/baselines/reference/multiModuleClodule1.types index a99c73c8a63aa..154a9fa991d0a 100644 --- a/tests/baselines/reference/multiModuleClodule1.types +++ b/tests/baselines/reference/multiModuleClodule1.types @@ -22,7 +22,7 @@ class C { > : ^^^^^^^^^^ } -module C { +namespace C { >C : typeof C > : ^^^^^^^^ @@ -38,7 +38,7 @@ module C { >2 : 2 > : ^ } -module C { +namespace C { >C : typeof C > : ^^^^^^^^ diff --git a/tests/baselines/reference/multiModuleFundule1.js b/tests/baselines/reference/multiModuleFundule1.js index 33f3fbff3d16f..9a51743ec3e28 100644 --- a/tests/baselines/reference/multiModuleFundule1.js +++ b/tests/baselines/reference/multiModuleFundule1.js @@ -3,10 +3,10 @@ //// [multiModuleFundule1.ts] function C(x: number) { } -module C { +namespace C { export var x = 1; } -module C { +namespace C { export function foo() { } } diff --git a/tests/baselines/reference/multiModuleFundule1.symbols b/tests/baselines/reference/multiModuleFundule1.symbols index a95452dba605d..feb76e1e9863d 100644 --- a/tests/baselines/reference/multiModuleFundule1.symbols +++ b/tests/baselines/reference/multiModuleFundule1.symbols @@ -5,17 +5,17 @@ function C(x: number) { } >C : Symbol(C, Decl(multiModuleFundule1.ts, 0, 0), Decl(multiModuleFundule1.ts, 0, 25), Decl(multiModuleFundule1.ts, 4, 1)) >x : Symbol(x, Decl(multiModuleFundule1.ts, 0, 11)) -module C { +namespace C { >C : Symbol(C, Decl(multiModuleFundule1.ts, 0, 0), Decl(multiModuleFundule1.ts, 0, 25), Decl(multiModuleFundule1.ts, 4, 1)) export var x = 1; >x : Symbol(x, Decl(multiModuleFundule1.ts, 3, 14)) } -module C { +namespace C { >C : Symbol(C, Decl(multiModuleFundule1.ts, 0, 0), Decl(multiModuleFundule1.ts, 0, 25), Decl(multiModuleFundule1.ts, 4, 1)) export function foo() { } ->foo : Symbol(foo, Decl(multiModuleFundule1.ts, 5, 10)) +>foo : Symbol(foo, Decl(multiModuleFundule1.ts, 5, 13)) } var r = C(2); @@ -28,7 +28,7 @@ var r2 = new C(2); // using void returning function as constructor var r3 = C.foo(); >r3 : Symbol(r3, Decl(multiModuleFundule1.ts, 11, 3)) ->C.foo : Symbol(C.foo, Decl(multiModuleFundule1.ts, 5, 10)) +>C.foo : Symbol(C.foo, Decl(multiModuleFundule1.ts, 5, 13)) >C : Symbol(C, Decl(multiModuleFundule1.ts, 0, 0), Decl(multiModuleFundule1.ts, 0, 25), Decl(multiModuleFundule1.ts, 4, 1)) ->foo : Symbol(C.foo, Decl(multiModuleFundule1.ts, 5, 10)) +>foo : Symbol(C.foo, Decl(multiModuleFundule1.ts, 5, 13)) diff --git a/tests/baselines/reference/multiModuleFundule1.types b/tests/baselines/reference/multiModuleFundule1.types index 0b5b16a5a2130..4ab9297d28b66 100644 --- a/tests/baselines/reference/multiModuleFundule1.types +++ b/tests/baselines/reference/multiModuleFundule1.types @@ -7,7 +7,7 @@ function C(x: number) { } >x : number > : ^^^^^^ -module C { +namespace C { >C : typeof C > : ^^^^^^^^ @@ -17,7 +17,7 @@ module C { >1 : 1 > : ^ } -module C { +namespace C { >C : typeof C > : ^^^^^^^^ diff --git a/tests/baselines/reference/multipleExports.errors.txt b/tests/baselines/reference/multipleExports.errors.txt index 4898356ca11bb..1b04604815f2a 100644 --- a/tests/baselines/reference/multipleExports.errors.txt +++ b/tests/baselines/reference/multipleExports.errors.txt @@ -3,13 +3,13 @@ multipleExports.ts(9,13): error TS2484: Export declaration conflicts with export ==== multipleExports.ts (2 errors) ==== - export module M { + export namespace M { export var v = 0; export let x; } const x = 0; - export module M { + export namespace M { v; export {x}; ~~~~~~~~~~~ diff --git a/tests/baselines/reference/multipleExports.js b/tests/baselines/reference/multipleExports.js index 9432a2f1a111f..be5171cb05c3c 100644 --- a/tests/baselines/reference/multipleExports.js +++ b/tests/baselines/reference/multipleExports.js @@ -1,13 +1,13 @@ //// [tests/cases/compiler/multipleExports.ts] //// //// [multipleExports.ts] -export module M { +export namespace M { export var v = 0; export let x; } const x = 0; -export module M { +export namespace M { v; export {x}; } diff --git a/tests/baselines/reference/multipleExports.symbols b/tests/baselines/reference/multipleExports.symbols index 2db54152c9549..051bdf588277f 100644 --- a/tests/baselines/reference/multipleExports.symbols +++ b/tests/baselines/reference/multipleExports.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/multipleExports.ts] //// === multipleExports.ts === -export module M { +export namespace M { >M : Symbol(M, Decl(multipleExports.ts, 0, 0), Decl(multipleExports.ts, 5, 12)) export var v = 0; @@ -14,7 +14,7 @@ export module M { const x = 0; >x : Symbol(x, Decl(multipleExports.ts, 5, 5)) -export module M { +export namespace M { >M : Symbol(M, Decl(multipleExports.ts, 0, 0), Decl(multipleExports.ts, 5, 12)) v; diff --git a/tests/baselines/reference/multipleExports.types b/tests/baselines/reference/multipleExports.types index cdc545008c224..e32ed486b8ea8 100644 --- a/tests/baselines/reference/multipleExports.types +++ b/tests/baselines/reference/multipleExports.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/multipleExports.ts] //// === multipleExports.ts === -export module M { +export namespace M { >M : typeof M > : ^^^^^^^^ @@ -22,7 +22,7 @@ const x = 0; >0 : 0 > : ^ -export module M { +export namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/multivar.errors.txt b/tests/baselines/reference/multivar.errors.txt index 60d2469c7276f..27929eddd12ad 100644 --- a/tests/baselines/reference/multivar.errors.txt +++ b/tests/baselines/reference/multivar.errors.txt @@ -6,7 +6,7 @@ multivar.ts(22,9): error TS2395: Individual declarations in merged declaration ' var a,b,c; var x=1,y=2,z=3; - module m2 { + namespace m2 { export var a, b2: number = 10, b; ~~ diff --git a/tests/baselines/reference/multivar.js b/tests/baselines/reference/multivar.js index 341eff55b52ee..dac6b065f2669 100644 --- a/tests/baselines/reference/multivar.js +++ b/tests/baselines/reference/multivar.js @@ -4,7 +4,7 @@ var a,b,c; var x=1,y=2,z=3; -module m2 { +namespace m2 { export var a, b2: number = 10, b; var m1; diff --git a/tests/baselines/reference/multivar.symbols b/tests/baselines/reference/multivar.symbols index 5db18515df6e3..641881de871b3 100644 --- a/tests/baselines/reference/multivar.symbols +++ b/tests/baselines/reference/multivar.symbols @@ -11,7 +11,7 @@ var x=1,y=2,z=3; >y : Symbol(y, Decl(multivar.ts, 1, 8)) >z : Symbol(z, Decl(multivar.ts, 1, 12)) -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(multivar.ts, 1, 16)) export var a, b2: number = 10, b; diff --git a/tests/baselines/reference/multivar.types b/tests/baselines/reference/multivar.types index c4b66a709feea..f8771ad08fe19 100644 --- a/tests/baselines/reference/multivar.types +++ b/tests/baselines/reference/multivar.types @@ -23,7 +23,7 @@ var x=1,y=2,z=3; >3 : 3 > : ^ -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/nameCollision.errors.txt b/tests/baselines/reference/nameCollision.errors.txt new file mode 100644 index 0000000000000..72234e1cdcba8 --- /dev/null +++ b/tests/baselines/reference/nameCollision.errors.txt @@ -0,0 +1,55 @@ +nameCollision.ts(32,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +nameCollision.ts(32,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== nameCollision.ts (2 errors) ==== + namespace A { + // these 2 statements force an underscore before the 'A' + // in the generated function call. + var A = 12; + var _A = ''; + } + + namespace B { + var A = 12; + } + + namespace B { + // re-opened module with colliding name + // this should add an underscore. + class B { + name: string; + } + } + + namespace X { + var X = 13; + export namespace Y { + var Y = 13; + export namespace Z { + var X = 12; + var Y = 12; + var Z = 12; + } + } + } + + module Y.Y { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export enum Y { + Red, Blue + } + } + + // no collision, since interface doesn't + // generate code. + namespace D { + export interface D { + id: number; + } + + export var E = 'hello'; + } \ No newline at end of file diff --git a/tests/baselines/reference/nameCollision.js b/tests/baselines/reference/nameCollision.js index b21658630513f..42d711cd4a7d3 100644 --- a/tests/baselines/reference/nameCollision.js +++ b/tests/baselines/reference/nameCollision.js @@ -1,18 +1,18 @@ //// [tests/cases/conformance/internalModules/codeGeneration/nameCollision.ts] //// //// [nameCollision.ts] -module A { +namespace A { // these 2 statements force an underscore before the 'A' // in the generated function call. var A = 12; var _A = ''; } -module B { +namespace B { var A = 12; } -module B { +namespace B { // re-opened module with colliding name // this should add an underscore. class B { @@ -20,11 +20,11 @@ module B { } } -module X { +namespace X { var X = 13; - export module Y { + export namespace Y { var Y = 13; - export module Z { + export namespace Z { var X = 12; var Y = 12; var Z = 12; @@ -40,7 +40,7 @@ module Y.Y { // no collision, since interface doesn't // generate code. -module D { +namespace D { export interface D { id: number; } diff --git a/tests/baselines/reference/nameCollision.symbols b/tests/baselines/reference/nameCollision.symbols index 4877a412a0b65..4437f68422ef8 100644 --- a/tests/baselines/reference/nameCollision.symbols +++ b/tests/baselines/reference/nameCollision.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/codeGeneration/nameCollision.ts] //// === nameCollision.ts === -module A { +namespace A { >A : Symbol(A, Decl(nameCollision.ts, 0, 0)) // these 2 statements force an underscore before the 'A' @@ -13,39 +13,39 @@ module A { >_A : Symbol(_A, Decl(nameCollision.ts, 4, 7)) } -module B { +namespace B { >B : Symbol(B, Decl(nameCollision.ts, 5, 1), Decl(nameCollision.ts, 9, 1)) var A = 12; >A : Symbol(A, Decl(nameCollision.ts, 8, 7)) } -module B { +namespace B { >B : Symbol(B, Decl(nameCollision.ts, 5, 1), Decl(nameCollision.ts, 9, 1)) // re-opened module with colliding name // this should add an underscore. class B { ->B : Symbol(B, Decl(nameCollision.ts, 11, 10)) +>B : Symbol(B, Decl(nameCollision.ts, 11, 13)) name: string; >name : Symbol(B.name, Decl(nameCollision.ts, 14, 13)) } } -module X { +namespace X { >X : Symbol(X, Decl(nameCollision.ts, 17, 1)) var X = 13; >X : Symbol(X, Decl(nameCollision.ts, 20, 7)) - export module Y { + export namespace Y { >Y : Symbol(Y, Decl(nameCollision.ts, 20, 15)) var Y = 13; >Y : Symbol(Y, Decl(nameCollision.ts, 22, 11)) - export module Z { + export namespace Z { >Z : Symbol(Z, Decl(nameCollision.ts, 22, 19)) var X = 12; @@ -75,11 +75,11 @@ module Y.Y { // no collision, since interface doesn't // generate code. -module D { +namespace D { >D : Symbol(D, Decl(nameCollision.ts, 35, 1)) export interface D { ->D : Symbol(D, Decl(nameCollision.ts, 39, 10)) +>D : Symbol(D, Decl(nameCollision.ts, 39, 13)) id: number; >id : Symbol(D.id, Decl(nameCollision.ts, 40, 24)) diff --git a/tests/baselines/reference/nameCollision.types b/tests/baselines/reference/nameCollision.types index a0cc9a1c262ba..daa109908c7c3 100644 --- a/tests/baselines/reference/nameCollision.types +++ b/tests/baselines/reference/nameCollision.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/codeGeneration/nameCollision.ts] //// === nameCollision.ts === -module A { +namespace A { >A : typeof globalThis.A > : ^^^^^^^^^^^^^^^^^^^ @@ -20,7 +20,7 @@ module A { > : ^^ } -module B { +namespace B { >B : typeof B > : ^^^^^^^^ @@ -31,7 +31,7 @@ module B { > : ^^ } -module B { +namespace B { >B : typeof globalThis.B > : ^^^^^^^^^^^^^^^^^^^ @@ -47,7 +47,7 @@ module B { } } -module X { +namespace X { >X : typeof globalThis.X > : ^^^^^^^^^^^^^^^^^^^ @@ -57,7 +57,7 @@ module X { >13 : 13 > : ^^ - export module Y { + export namespace Y { >Y : typeof globalThis.X.Y > : ^^^^^^^^^^^^^^^^^^^^^ @@ -67,7 +67,7 @@ module X { >13 : 13 > : ^^ - export module Z { + export namespace Z { >Z : typeof globalThis.X.Y.Z > : ^^^^^^^^^^^^^^^^^^^^^^^ @@ -112,7 +112,7 @@ module Y.Y { // no collision, since interface doesn't // generate code. -module D { +namespace D { >D : typeof D > : ^^^^^^^^ diff --git a/tests/baselines/reference/nameCollisionWithBlockScopedVariable1.js b/tests/baselines/reference/nameCollisionWithBlockScopedVariable1.js index 315412ec7c36d..e3b19d48003bb 100644 --- a/tests/baselines/reference/nameCollisionWithBlockScopedVariable1.js +++ b/tests/baselines/reference/nameCollisionWithBlockScopedVariable1.js @@ -1,10 +1,10 @@ //// [tests/cases/compiler/nameCollisionWithBlockScopedVariable1.ts] //// //// [nameCollisionWithBlockScopedVariable1.ts] -module M { +namespace M { export class C { } } -module M { +namespace M { { let M = 0; new C(); diff --git a/tests/baselines/reference/nameCollisionWithBlockScopedVariable1.symbols b/tests/baselines/reference/nameCollisionWithBlockScopedVariable1.symbols index bdcbd0ba785ad..45e8f6844011a 100644 --- a/tests/baselines/reference/nameCollisionWithBlockScopedVariable1.symbols +++ b/tests/baselines/reference/nameCollisionWithBlockScopedVariable1.symbols @@ -1,19 +1,19 @@ //// [tests/cases/compiler/nameCollisionWithBlockScopedVariable1.ts] //// === nameCollisionWithBlockScopedVariable1.ts === -module M { +namespace M { >M : Symbol(M, Decl(nameCollisionWithBlockScopedVariable1.ts, 0, 0), Decl(nameCollisionWithBlockScopedVariable1.ts, 2, 1)) export class C { } ->C : Symbol(C, Decl(nameCollisionWithBlockScopedVariable1.ts, 0, 10)) +>C : Symbol(C, Decl(nameCollisionWithBlockScopedVariable1.ts, 0, 13)) } -module M { +namespace M { >M : Symbol(M, Decl(nameCollisionWithBlockScopedVariable1.ts, 0, 0), Decl(nameCollisionWithBlockScopedVariable1.ts, 2, 1)) { let M = 0; >M : Symbol(M, Decl(nameCollisionWithBlockScopedVariable1.ts, 5, 11)) new C(); ->C : Symbol(C, Decl(nameCollisionWithBlockScopedVariable1.ts, 0, 10)) +>C : Symbol(C, Decl(nameCollisionWithBlockScopedVariable1.ts, 0, 13)) } } diff --git a/tests/baselines/reference/nameCollisionWithBlockScopedVariable1.types b/tests/baselines/reference/nameCollisionWithBlockScopedVariable1.types index 70c32fd82a2cc..0d0621091e565 100644 --- a/tests/baselines/reference/nameCollisionWithBlockScopedVariable1.types +++ b/tests/baselines/reference/nameCollisionWithBlockScopedVariable1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/nameCollisionWithBlockScopedVariable1.ts] //// === nameCollisionWithBlockScopedVariable1.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -9,7 +9,7 @@ module M { >C : C > : ^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ { diff --git a/tests/baselines/reference/nameCollisions.errors.txt b/tests/baselines/reference/nameCollisions.errors.txt index 8d1a833330241..aa851a6004521 100644 --- a/tests/baselines/reference/nameCollisions.errors.txt +++ b/tests/baselines/reference/nameCollisions.errors.txt @@ -1,8 +1,8 @@ nameCollisions.ts(2,9): error TS2300: Duplicate identifier 'x'. -nameCollisions.ts(4,12): error TS2300: Duplicate identifier 'x'. -nameCollisions.ts(10,12): error TS2300: Duplicate identifier 'z'. +nameCollisions.ts(4,15): error TS2300: Duplicate identifier 'x'. +nameCollisions.ts(10,15): error TS2300: Duplicate identifier 'z'. nameCollisions.ts(13,9): error TS2300: Duplicate identifier 'z'. -nameCollisions.ts(15,12): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. +nameCollisions.ts(15,15): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. nameCollisions.ts(24,9): error TS2300: Duplicate identifier 'f'. nameCollisions.ts(25,14): error TS2300: Duplicate identifier 'f'. nameCollisions.ts(27,14): error TS2300: Duplicate identifier 'f2'. @@ -14,21 +14,21 @@ nameCollisions.ts(37,11): error TS2813: Class declaration cannot implement overl ==== nameCollisions.ts (13 errors) ==== - module T { + namespace T { var x = 2; ~ !!! error TS2300: Duplicate identifier 'x'. - module x { // error - ~ + namespace x { // error + ~ !!! error TS2300: Duplicate identifier 'x'. export class Bar { test: number; } } - module z { - ~ + namespace z { + ~ !!! error TS2300: Duplicate identifier 'z'. var t; } @@ -36,8 +36,8 @@ nameCollisions.ts(37,11): error TS2813: Class declaration cannot implement overl ~ !!! error TS2300: Duplicate identifier 'z'. - module y { - ~ + namespace y { + ~ !!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. var b; } @@ -45,7 +45,7 @@ nameCollisions.ts(37,11): error TS2813: Class declaration cannot implement overl class y { } // error var w; - module w { } //ok + namespace w { } //ok var f; ~ diff --git a/tests/baselines/reference/nameCollisions.js b/tests/baselines/reference/nameCollisions.js index af9da6e6e3aff..9295a84d1c43a 100644 --- a/tests/baselines/reference/nameCollisions.js +++ b/tests/baselines/reference/nameCollisions.js @@ -1,28 +1,28 @@ //// [tests/cases/compiler/nameCollisions.ts] //// //// [nameCollisions.ts] -module T { +namespace T { var x = 2; - module x { // error + namespace x { // error export class Bar { test: number; } } - module z { + namespace z { var t; } var z; // error - module y { + namespace y { var b; } class y { } // error var w; - module w { } //ok + namespace w { } //ok var f; function f() { } //error diff --git a/tests/baselines/reference/nameCollisions.symbols b/tests/baselines/reference/nameCollisions.symbols index 4c66db19f6b77..dcd29d4044421 100644 --- a/tests/baselines/reference/nameCollisions.symbols +++ b/tests/baselines/reference/nameCollisions.symbols @@ -1,24 +1,24 @@ //// [tests/cases/compiler/nameCollisions.ts] //// === nameCollisions.ts === -module T { +namespace T { >T : Symbol(T, Decl(nameCollisions.ts, 0, 0)) var x = 2; >x : Symbol(x, Decl(nameCollisions.ts, 1, 7)) - module x { // error + namespace x { // error >x : Symbol(x, Decl(nameCollisions.ts, 1, 14)) export class Bar { ->Bar : Symbol(Bar, Decl(nameCollisions.ts, 3, 14)) +>Bar : Symbol(Bar, Decl(nameCollisions.ts, 3, 17)) test: number; >test : Symbol(Bar.test, Decl(nameCollisions.ts, 4, 26)) } } - module z { + namespace z { >z : Symbol(z, Decl(nameCollisions.ts, 7, 5)) var t; @@ -27,7 +27,7 @@ module T { var z; // error >z : Symbol(z, Decl(nameCollisions.ts, 12, 7)) - module y { + namespace y { >y : Symbol(y, Decl(nameCollisions.ts, 12, 10), Decl(nameCollisions.ts, 16, 5)) var b; @@ -40,7 +40,7 @@ module T { var w; >w : Symbol(w, Decl(nameCollisions.ts, 20, 7), Decl(nameCollisions.ts, 20, 10)) - module w { } //ok + namespace w { } //ok >w : Symbol(w, Decl(nameCollisions.ts, 20, 7), Decl(nameCollisions.ts, 20, 10)) var f; diff --git a/tests/baselines/reference/nameCollisions.types b/tests/baselines/reference/nameCollisions.types index 96a4c2e6a0640..7721787973ad1 100644 --- a/tests/baselines/reference/nameCollisions.types +++ b/tests/baselines/reference/nameCollisions.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/nameCollisions.ts] //// === nameCollisions.ts === -module T { +namespace T { >T : typeof T > : ^^^^^^^^ @@ -11,7 +11,7 @@ module T { >2 : 2 > : ^ - module x { // error + namespace x { // error >x : typeof x > : ^^^^^^^^ @@ -25,7 +25,7 @@ module T { } } - module z { + namespace z { >z : typeof z > : ^^^^^^^^ @@ -37,7 +37,7 @@ module T { >z : any > : ^^^ - module y { + namespace y { >y : typeof y > : ^^^^^^^^ @@ -54,7 +54,7 @@ module T { >w : any > : ^^^ - module w { } //ok + namespace w { } //ok var f; >f : any diff --git a/tests/baselines/reference/nameWithRelativePaths.js b/tests/baselines/reference/nameWithRelativePaths.js index 2aaa0d699b7bd..c01dd53d3b71e 100644 --- a/tests/baselines/reference/nameWithRelativePaths.js +++ b/tests/baselines/reference/nameWithRelativePaths.js @@ -9,7 +9,7 @@ export function f(){ } //// [foo_2.ts] -export module M2 { +export namespace M2 { export var x = true; } diff --git a/tests/baselines/reference/nameWithRelativePaths.symbols b/tests/baselines/reference/nameWithRelativePaths.symbols index 2d4f94dfacdba..9f8a7a3b1024d 100644 --- a/tests/baselines/reference/nameWithRelativePaths.symbols +++ b/tests/baselines/reference/nameWithRelativePaths.symbols @@ -39,7 +39,7 @@ export function f(){ } === test/foo_2.ts === -export module M2 { +export namespace M2 { >M2 : Symbol(M2, Decl(foo_2.ts, 0, 0)) export var x = true; diff --git a/tests/baselines/reference/nameWithRelativePaths.types b/tests/baselines/reference/nameWithRelativePaths.types index 6253ec7abea72..e748afb725206 100644 --- a/tests/baselines/reference/nameWithRelativePaths.types +++ b/tests/baselines/reference/nameWithRelativePaths.types @@ -64,7 +64,7 @@ export function f(){ } === test/foo_2.ts === -export module M2 { +export namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/namedFunctionExpressionInModule.js b/tests/baselines/reference/namedFunctionExpressionInModule.js index e835f55ebc58c..80ca717335350 100644 --- a/tests/baselines/reference/namedFunctionExpressionInModule.js +++ b/tests/baselines/reference/namedFunctionExpressionInModule.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/namedFunctionExpressionInModule.ts] //// //// [namedFunctionExpressionInModule.ts] -module Variables{ +namespace Variables{ var x = function bar(a, b, c) { } x(1, 2, 3); diff --git a/tests/baselines/reference/namedFunctionExpressionInModule.symbols b/tests/baselines/reference/namedFunctionExpressionInModule.symbols index 7ab00121354d2..9352b8c3960e3 100644 --- a/tests/baselines/reference/namedFunctionExpressionInModule.symbols +++ b/tests/baselines/reference/namedFunctionExpressionInModule.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/namedFunctionExpressionInModule.ts] //// === namedFunctionExpressionInModule.ts === -module Variables{ +namespace Variables{ >Variables : Symbol(Variables, Decl(namedFunctionExpressionInModule.ts, 0, 0)) var x = function bar(a, b, c) { diff --git a/tests/baselines/reference/namedFunctionExpressionInModule.types b/tests/baselines/reference/namedFunctionExpressionInModule.types index 64f8af41eeeff..455a4b570499c 100644 --- a/tests/baselines/reference/namedFunctionExpressionInModule.types +++ b/tests/baselines/reference/namedFunctionExpressionInModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/namedFunctionExpressionInModule.ts] //// === namedFunctionExpressionInModule.ts === -module Variables{ +namespace Variables{ >Variables : typeof Variables > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/namespaces1.js b/tests/baselines/reference/namespaces1.js index 2928bb4fda490..33ae63960c4b6 100644 --- a/tests/baselines/reference/namespaces1.js +++ b/tests/baselines/reference/namespaces1.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/namespaces1.ts] //// //// [namespaces1.ts] -module X { - export module Y { +namespace X { + export namespace Y { export interface Z { } } export interface Y { } diff --git a/tests/baselines/reference/namespaces1.symbols b/tests/baselines/reference/namespaces1.symbols index 25b3553d4dd88..e850d0996e6ba 100644 --- a/tests/baselines/reference/namespaces1.symbols +++ b/tests/baselines/reference/namespaces1.symbols @@ -1,27 +1,27 @@ //// [tests/cases/compiler/namespaces1.ts] //// === namespaces1.ts === -module X { +namespace X { >X : Symbol(X, Decl(namespaces1.ts, 0, 0)) - export module Y { ->Y : Symbol(Y, Decl(namespaces1.ts, 0, 10), Decl(namespaces1.ts, 3, 5)) + export namespace Y { +>Y : Symbol(Y, Decl(namespaces1.ts, 0, 13), Decl(namespaces1.ts, 3, 5)) export interface Z { } ->Z : Symbol(Z, Decl(namespaces1.ts, 1, 21)) +>Z : Symbol(Z, Decl(namespaces1.ts, 1, 24)) } export interface Y { } ->Y : Symbol(Y, Decl(namespaces1.ts, 0, 10), Decl(namespaces1.ts, 3, 5)) +>Y : Symbol(Y, Decl(namespaces1.ts, 0, 13), Decl(namespaces1.ts, 3, 5)) } var x: X.Y.Z; >x : Symbol(x, Decl(namespaces1.ts, 7, 3)) >X : Symbol(X, Decl(namespaces1.ts, 0, 0)) ->Y : Symbol(X.Y, Decl(namespaces1.ts, 0, 10), Decl(namespaces1.ts, 3, 5)) ->Z : Symbol(X.Y.Z, Decl(namespaces1.ts, 1, 21)) +>Y : Symbol(X.Y, Decl(namespaces1.ts, 0, 13), Decl(namespaces1.ts, 3, 5)) +>Z : Symbol(X.Y.Z, Decl(namespaces1.ts, 1, 24)) var x2: X.Y; >x2 : Symbol(x2, Decl(namespaces1.ts, 8, 3)) >X : Symbol(X, Decl(namespaces1.ts, 0, 0)) ->Y : Symbol(X.Y, Decl(namespaces1.ts, 0, 10), Decl(namespaces1.ts, 3, 5)) +>Y : Symbol(X.Y, Decl(namespaces1.ts, 0, 13), Decl(namespaces1.ts, 3, 5)) diff --git a/tests/baselines/reference/namespaces1.types b/tests/baselines/reference/namespaces1.types index 5c2329447e1f0..8019fa583aec3 100644 --- a/tests/baselines/reference/namespaces1.types +++ b/tests/baselines/reference/namespaces1.types @@ -1,8 +1,8 @@ //// [tests/cases/compiler/namespaces1.ts] //// === namespaces1.ts === -module X { - export module Y { +namespace X { + export namespace Y { export interface Z { } } export interface Y { } diff --git a/tests/baselines/reference/namespaces2.js b/tests/baselines/reference/namespaces2.js index 0173d82839fe4..bea28de3e317f 100644 --- a/tests/baselines/reference/namespaces2.js +++ b/tests/baselines/reference/namespaces2.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/namespaces2.ts] //// //// [namespaces2.ts] -module A { - export module B { +namespace A { + export namespace B { export class C { } } } diff --git a/tests/baselines/reference/namespaces2.symbols b/tests/baselines/reference/namespaces2.symbols index 649749d46e6c6..8e38978a5b721 100644 --- a/tests/baselines/reference/namespaces2.symbols +++ b/tests/baselines/reference/namespaces2.symbols @@ -1,25 +1,25 @@ //// [tests/cases/compiler/namespaces2.ts] //// === namespaces2.ts === -module A { +namespace A { >A : Symbol(A, Decl(namespaces2.ts, 0, 0)) - export module B { ->B : Symbol(B, Decl(namespaces2.ts, 0, 10)) + export namespace B { +>B : Symbol(B, Decl(namespaces2.ts, 0, 13)) export class C { } ->C : Symbol(C, Decl(namespaces2.ts, 1, 21)) +>C : Symbol(C, Decl(namespaces2.ts, 1, 24)) } } var c: A.B.C = new A.B.C(); >c : Symbol(c, Decl(namespaces2.ts, 6, 3)) >A : Symbol(A, Decl(namespaces2.ts, 0, 0)) ->B : Symbol(A.B, Decl(namespaces2.ts, 0, 10)) ->C : Symbol(A.B.C, Decl(namespaces2.ts, 1, 21)) ->A.B.C : Symbol(A.B.C, Decl(namespaces2.ts, 1, 21)) ->A.B : Symbol(A.B, Decl(namespaces2.ts, 0, 10)) +>B : Symbol(A.B, Decl(namespaces2.ts, 0, 13)) +>C : Symbol(A.B.C, Decl(namespaces2.ts, 1, 24)) +>A.B.C : Symbol(A.B.C, Decl(namespaces2.ts, 1, 24)) +>A.B : Symbol(A.B, Decl(namespaces2.ts, 0, 13)) >A : Symbol(A, Decl(namespaces2.ts, 0, 0)) ->B : Symbol(A.B, Decl(namespaces2.ts, 0, 10)) ->C : Symbol(A.B.C, Decl(namespaces2.ts, 1, 21)) +>B : Symbol(A.B, Decl(namespaces2.ts, 0, 13)) +>C : Symbol(A.B.C, Decl(namespaces2.ts, 1, 24)) diff --git a/tests/baselines/reference/namespaces2.types b/tests/baselines/reference/namespaces2.types index 7c4044a4bd940..d95643b94774e 100644 --- a/tests/baselines/reference/namespaces2.types +++ b/tests/baselines/reference/namespaces2.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/namespaces2.ts] //// === namespaces2.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ - export module B { + export namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/namespacesDeclaration1.js b/tests/baselines/reference/namespacesDeclaration1.js index da07863d89efd..9d0981392426d 100644 --- a/tests/baselines/reference/namespacesDeclaration1.js +++ b/tests/baselines/reference/namespacesDeclaration1.js @@ -1,9 +1,9 @@ //// [tests/cases/compiler/namespacesDeclaration1.ts] //// //// [namespacesDeclaration1.ts] -module M { +namespace M { export namespace N { - export module M2 { + export namespace M2 { export interface I {} } } diff --git a/tests/baselines/reference/namespacesDeclaration1.symbols b/tests/baselines/reference/namespacesDeclaration1.symbols index 8381b5962f08b..615cebfd6ce6b 100644 --- a/tests/baselines/reference/namespacesDeclaration1.symbols +++ b/tests/baselines/reference/namespacesDeclaration1.symbols @@ -1,17 +1,17 @@ //// [tests/cases/compiler/namespacesDeclaration1.ts] //// === namespacesDeclaration1.ts === -module M { +namespace M { >M : Symbol(M, Decl(namespacesDeclaration1.ts, 0, 0)) export namespace N { ->N : Symbol(N, Decl(namespacesDeclaration1.ts, 0, 10)) +>N : Symbol(N, Decl(namespacesDeclaration1.ts, 0, 13)) - export module M2 { + export namespace M2 { >M2 : Symbol(M2, Decl(namespacesDeclaration1.ts, 1, 23)) export interface I {} ->I : Symbol(I, Decl(namespacesDeclaration1.ts, 2, 24)) +>I : Symbol(I, Decl(namespacesDeclaration1.ts, 2, 27)) } } } diff --git a/tests/baselines/reference/namespacesDeclaration1.types b/tests/baselines/reference/namespacesDeclaration1.types index 8352ec4fe2f36..5b8d21de015f3 100644 --- a/tests/baselines/reference/namespacesDeclaration1.types +++ b/tests/baselines/reference/namespacesDeclaration1.types @@ -2,9 +2,9 @@ === namespacesDeclaration1.ts === -module M { +namespace M { export namespace N { - export module M2 { + export namespace M2 { export interface I {} } } diff --git a/tests/baselines/reference/namespacesDeclaration2.errors.txt b/tests/baselines/reference/namespacesDeclaration2.errors.txt index 57b79004be78b..cda482f1c86f6 100644 --- a/tests/baselines/reference/namespacesDeclaration2.errors.txt +++ b/tests/baselines/reference/namespacesDeclaration2.errors.txt @@ -7,7 +7,7 @@ namespacesDeclaration2.ts(14,11): error TS2694: Namespace 'ns' has no exported m namespace N { function S() {} } - module M { + namespace M { function F() {} } diff --git a/tests/baselines/reference/namespacesDeclaration2.js b/tests/baselines/reference/namespacesDeclaration2.js index 936260eabf1fd..d360ca8fd6de1 100644 --- a/tests/baselines/reference/namespacesDeclaration2.js +++ b/tests/baselines/reference/namespacesDeclaration2.js @@ -4,7 +4,7 @@ namespace N { function S() {} } -module M { +namespace M { function F() {} } diff --git a/tests/baselines/reference/namespacesDeclaration2.symbols b/tests/baselines/reference/namespacesDeclaration2.symbols index 09ee600127e7a..fdd4a25c70f1a 100644 --- a/tests/baselines/reference/namespacesDeclaration2.symbols +++ b/tests/baselines/reference/namespacesDeclaration2.symbols @@ -7,11 +7,11 @@ namespace N { function S() {} >S : Symbol(S, Decl(namespacesDeclaration2.ts, 0, 13)) } -module M { +namespace M { >M : Symbol(M, Decl(namespacesDeclaration2.ts, 2, 1)) function F() {} ->F : Symbol(F, Decl(namespacesDeclaration2.ts, 3, 10)) +>F : Symbol(F, Decl(namespacesDeclaration2.ts, 3, 13)) } declare namespace ns { diff --git a/tests/baselines/reference/namespacesDeclaration2.types b/tests/baselines/reference/namespacesDeclaration2.types index 1e3a0a40b830b..454bd39b3ce6d 100644 --- a/tests/baselines/reference/namespacesDeclaration2.types +++ b/tests/baselines/reference/namespacesDeclaration2.types @@ -9,7 +9,7 @@ namespace N { >S : () => void > : ^^^^^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/negateOperatorWithAnyOtherType.errors.txt b/tests/baselines/reference/negateOperatorWithAnyOtherType.errors.txt index dac9e9f08c8c3..8470f20aff24e 100644 --- a/tests/baselines/reference/negateOperatorWithAnyOtherType.errors.txt +++ b/tests/baselines/reference/negateOperatorWithAnyOtherType.errors.txt @@ -23,7 +23,7 @@ negateOperatorWithAnyOtherType.ts(51,1): error TS2695: Left side of comma operat return a; } } - module M { + namespace M { export var n: any; } var objA = new A(); diff --git a/tests/baselines/reference/negateOperatorWithAnyOtherType.js b/tests/baselines/reference/negateOperatorWithAnyOtherType.js index b3c90d30f2144..2434d8aa05d38 100644 --- a/tests/baselines/reference/negateOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/negateOperatorWithAnyOtherType.js @@ -20,7 +20,7 @@ class A { return a; } } -module M { +namespace M { export var n: any; } var objA = new A(); diff --git a/tests/baselines/reference/negateOperatorWithAnyOtherType.symbols b/tests/baselines/reference/negateOperatorWithAnyOtherType.symbols index 6a6ac6fd8c7a8..1b726ddd565f7 100644 --- a/tests/baselines/reference/negateOperatorWithAnyOtherType.symbols +++ b/tests/baselines/reference/negateOperatorWithAnyOtherType.symbols @@ -45,7 +45,7 @@ class A { >a : Symbol(a, Decl(negateOperatorWithAnyOtherType.ts, 15, 11)) } } -module M { +namespace M { >M : Symbol(M, Decl(negateOperatorWithAnyOtherType.ts, 18, 1)) export var n: any; diff --git a/tests/baselines/reference/negateOperatorWithAnyOtherType.types b/tests/baselines/reference/negateOperatorWithAnyOtherType.types index e0d6fd9727f5f..beb251f9743a6 100644 --- a/tests/baselines/reference/negateOperatorWithAnyOtherType.types +++ b/tests/baselines/reference/negateOperatorWithAnyOtherType.types @@ -72,7 +72,7 @@ class A { > : ^^^ } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/negateOperatorWithBooleanType.errors.txt b/tests/baselines/reference/negateOperatorWithBooleanType.errors.txt index 20bbd09ba5b78..7a7bf05bbe394 100644 --- a/tests/baselines/reference/negateOperatorWithBooleanType.errors.txt +++ b/tests/baselines/reference/negateOperatorWithBooleanType.errors.txt @@ -11,7 +11,7 @@ negateOperatorWithBooleanType.ts(33,1): error TS2695: Left side of comma operato public a: boolean; static foo() { return false; } } - module M { + namespace M { export var n: boolean; } diff --git a/tests/baselines/reference/negateOperatorWithBooleanType.js b/tests/baselines/reference/negateOperatorWithBooleanType.js index 9f023cfa3ea04..abe50078a187d 100644 --- a/tests/baselines/reference/negateOperatorWithBooleanType.js +++ b/tests/baselines/reference/negateOperatorWithBooleanType.js @@ -10,7 +10,7 @@ class A { public a: boolean; static foo() { return false; } } -module M { +namespace M { export var n: boolean; } diff --git a/tests/baselines/reference/negateOperatorWithBooleanType.symbols b/tests/baselines/reference/negateOperatorWithBooleanType.symbols index ab2eaf3b494f6..14e8dd137a24b 100644 --- a/tests/baselines/reference/negateOperatorWithBooleanType.symbols +++ b/tests/baselines/reference/negateOperatorWithBooleanType.symbols @@ -17,7 +17,7 @@ class A { static foo() { return false; } >foo : Symbol(A.foo, Decl(negateOperatorWithBooleanType.ts, 6, 22)) } -module M { +namespace M { >M : Symbol(M, Decl(negateOperatorWithBooleanType.ts, 8, 1)) export var n: boolean; diff --git a/tests/baselines/reference/negateOperatorWithBooleanType.types b/tests/baselines/reference/negateOperatorWithBooleanType.types index 7721ee54ec70b..edf1a2f4de5b0 100644 --- a/tests/baselines/reference/negateOperatorWithBooleanType.types +++ b/tests/baselines/reference/negateOperatorWithBooleanType.types @@ -26,7 +26,7 @@ class A { >false : false > : ^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/negateOperatorWithNumberType.errors.txt b/tests/baselines/reference/negateOperatorWithNumberType.errors.txt index 39755ca934ccb..a8989f6bc0500 100644 --- a/tests/baselines/reference/negateOperatorWithNumberType.errors.txt +++ b/tests/baselines/reference/negateOperatorWithNumberType.errors.txt @@ -12,7 +12,7 @@ negateOperatorWithNumberType.ts(41,1): error TS2695: Left side of comma operator public a: number; static foo() { return 1; } } - module M { + namespace M { export var n: number; } diff --git a/tests/baselines/reference/negateOperatorWithNumberType.js b/tests/baselines/reference/negateOperatorWithNumberType.js index b80fa75fea1bf..1f6b029fbfe3a 100644 --- a/tests/baselines/reference/negateOperatorWithNumberType.js +++ b/tests/baselines/reference/negateOperatorWithNumberType.js @@ -11,7 +11,7 @@ class A { public a: number; static foo() { return 1; } } -module M { +namespace M { export var n: number; } diff --git a/tests/baselines/reference/negateOperatorWithNumberType.symbols b/tests/baselines/reference/negateOperatorWithNumberType.symbols index 79aee79591dec..0b9f34f75e562 100644 --- a/tests/baselines/reference/negateOperatorWithNumberType.symbols +++ b/tests/baselines/reference/negateOperatorWithNumberType.symbols @@ -20,7 +20,7 @@ class A { static foo() { return 1; } >foo : Symbol(A.foo, Decl(negateOperatorWithNumberType.ts, 7, 21)) } -module M { +namespace M { >M : Symbol(M, Decl(negateOperatorWithNumberType.ts, 9, 1)) export var n: number; diff --git a/tests/baselines/reference/negateOperatorWithNumberType.types b/tests/baselines/reference/negateOperatorWithNumberType.types index 15e97f716a9f4..a90192bed6104 100644 --- a/tests/baselines/reference/negateOperatorWithNumberType.types +++ b/tests/baselines/reference/negateOperatorWithNumberType.types @@ -36,7 +36,7 @@ class A { >1 : 1 > : ^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/negateOperatorWithStringType.errors.txt b/tests/baselines/reference/negateOperatorWithStringType.errors.txt index de62b955974f5..6bb99cf65f89f 100644 --- a/tests/baselines/reference/negateOperatorWithStringType.errors.txt +++ b/tests/baselines/reference/negateOperatorWithStringType.errors.txt @@ -12,7 +12,7 @@ negateOperatorWithStringType.ts(40,1): error TS2695: Left side of comma operator public a: string; static foo() { return ""; } } - module M { + namespace M { export var n: string; } diff --git a/tests/baselines/reference/negateOperatorWithStringType.js b/tests/baselines/reference/negateOperatorWithStringType.js index eb731164f4c65..4583e60272c36 100644 --- a/tests/baselines/reference/negateOperatorWithStringType.js +++ b/tests/baselines/reference/negateOperatorWithStringType.js @@ -11,7 +11,7 @@ class A { public a: string; static foo() { return ""; } } -module M { +namespace M { export var n: string; } diff --git a/tests/baselines/reference/negateOperatorWithStringType.symbols b/tests/baselines/reference/negateOperatorWithStringType.symbols index 5616771f4f159..048e88fea9851 100644 --- a/tests/baselines/reference/negateOperatorWithStringType.symbols +++ b/tests/baselines/reference/negateOperatorWithStringType.symbols @@ -20,7 +20,7 @@ class A { static foo() { return ""; } >foo : Symbol(A.foo, Decl(negateOperatorWithStringType.ts, 7, 21)) } -module M { +namespace M { >M : Symbol(M, Decl(negateOperatorWithStringType.ts, 9, 1)) export var n: string; diff --git a/tests/baselines/reference/negateOperatorWithStringType.types b/tests/baselines/reference/negateOperatorWithStringType.types index f1dae72d5b9fc..ce90e74df7d5a 100644 --- a/tests/baselines/reference/negateOperatorWithStringType.types +++ b/tests/baselines/reference/negateOperatorWithStringType.types @@ -36,7 +36,7 @@ class A { >"" : "" > : ^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/nestedModulePrivateAccess.js b/tests/baselines/reference/nestedModulePrivateAccess.js index a887bc6d85be9..5e042553ce88a 100644 --- a/tests/baselines/reference/nestedModulePrivateAccess.js +++ b/tests/baselines/reference/nestedModulePrivateAccess.js @@ -1,9 +1,9 @@ //// [tests/cases/compiler/nestedModulePrivateAccess.ts] //// //// [nestedModulePrivateAccess.ts] -module a{ +namespace a{ var x:number; - module b{ + namespace b{ var y = x; // should not be an error } } diff --git a/tests/baselines/reference/nestedModulePrivateAccess.symbols b/tests/baselines/reference/nestedModulePrivateAccess.symbols index a9f18e367252a..064b67c4e4559 100644 --- a/tests/baselines/reference/nestedModulePrivateAccess.symbols +++ b/tests/baselines/reference/nestedModulePrivateAccess.symbols @@ -1,13 +1,13 @@ //// [tests/cases/compiler/nestedModulePrivateAccess.ts] //// === nestedModulePrivateAccess.ts === -module a{ +namespace a{ >a : Symbol(a, Decl(nestedModulePrivateAccess.ts, 0, 0)) var x:number; >x : Symbol(x, Decl(nestedModulePrivateAccess.ts, 1, 10)) - module b{ + namespace b{ >b : Symbol(b, Decl(nestedModulePrivateAccess.ts, 1, 20)) var y = x; // should not be an error diff --git a/tests/baselines/reference/nestedModulePrivateAccess.types b/tests/baselines/reference/nestedModulePrivateAccess.types index 5e6b85bc619b3..e3a1cb577308c 100644 --- a/tests/baselines/reference/nestedModulePrivateAccess.types +++ b/tests/baselines/reference/nestedModulePrivateAccess.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/nestedModulePrivateAccess.ts] //// === nestedModulePrivateAccess.ts === -module a{ +namespace a{ >a : typeof a > : ^^^^^^^^ @@ -9,7 +9,7 @@ module a{ >x : number > : ^^^^^^ - module b{ + namespace b{ >b : typeof b > : ^^^^^^^^ diff --git a/tests/baselines/reference/nestedModules.errors.txt b/tests/baselines/reference/nestedModules.errors.txt new file mode 100644 index 0000000000000..fa291bbca7734 --- /dev/null +++ b/tests/baselines/reference/nestedModules.errors.txt @@ -0,0 +1,50 @@ +nestedModules.ts(1,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +nestedModules.ts(1,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +nestedModules.ts(1,12): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +nestedModules.ts(14,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +nestedModules.ts(14,11): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== nestedModules.ts (5 errors) ==== + module A.B.C { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export interface Point { + x: number; + y: number; + } + } + + namespace A { + export namespace B { + var Point: C.Point = { x: 0, y: 0 }; // bug 832088: could not find module 'C' + } + } + + module M2.X { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export interface Point { + x: number; y: number; + } + } + + namespace M2 { + export namespace X { + export var Point: number; + } + } + + var m = M2.X; + var point: number; + var point = m.Point; + + var p: { x: number; y: number; } + var p: M2.X.Point; + \ No newline at end of file diff --git a/tests/baselines/reference/nestedModules.js b/tests/baselines/reference/nestedModules.js index 27885cdb52615..a2cf656a1bd4a 100644 --- a/tests/baselines/reference/nestedModules.js +++ b/tests/baselines/reference/nestedModules.js @@ -8,8 +8,8 @@ module A.B.C { } } -module A { - export module B { +namespace A { + export namespace B { var Point: C.Point = { x: 0, y: 0 }; // bug 832088: could not find module 'C' } } @@ -20,8 +20,8 @@ module M2.X { } } -module M2 { - export module X { +namespace M2 { + export namespace X { export var Point: number; } } diff --git a/tests/baselines/reference/nestedModules.symbols b/tests/baselines/reference/nestedModules.symbols index f9519573606d2..2902ea3a04cb4 100644 --- a/tests/baselines/reference/nestedModules.symbols +++ b/tests/baselines/reference/nestedModules.symbols @@ -3,7 +3,7 @@ === nestedModules.ts === module A.B.C { >A : Symbol(A, Decl(nestedModules.ts, 0, 0), Decl(nestedModules.ts, 5, 1)) ->B : Symbol(B, Decl(nestedModules.ts, 0, 9), Decl(nestedModules.ts, 7, 10)) +>B : Symbol(B, Decl(nestedModules.ts, 0, 9), Decl(nestedModules.ts, 7, 13)) >C : Symbol(C, Decl(nestedModules.ts, 0, 11)) export interface Point { @@ -17,11 +17,11 @@ module A.B.C { } } -module A { +namespace A { >A : Symbol(A, Decl(nestedModules.ts, 0, 0), Decl(nestedModules.ts, 5, 1)) - export module B { ->B : Symbol(B, Decl(nestedModules.ts, 0, 9), Decl(nestedModules.ts, 7, 10)) + export namespace B { +>B : Symbol(B, Decl(nestedModules.ts, 0, 9), Decl(nestedModules.ts, 7, 13)) var Point: C.Point = { x: 0, y: 0 }; // bug 832088: could not find module 'C' >Point : Symbol(Point, Decl(nestedModules.ts, 9, 11)) @@ -34,7 +34,7 @@ module A { module M2.X { >M2 : Symbol(M2, Decl(nestedModules.ts, 11, 1), Decl(nestedModules.ts, 17, 1)) ->X : Symbol(X, Decl(nestedModules.ts, 13, 10), Decl(nestedModules.ts, 19, 11)) +>X : Symbol(X, Decl(nestedModules.ts, 13, 10), Decl(nestedModules.ts, 19, 14)) export interface Point { >Point : Symbol(Point, Decl(nestedModules.ts, 13, 13), Decl(nestedModules.ts, 21, 18)) @@ -45,11 +45,11 @@ module M2.X { } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(nestedModules.ts, 11, 1), Decl(nestedModules.ts, 17, 1)) - export module X { ->X : Symbol(X, Decl(nestedModules.ts, 13, 10), Decl(nestedModules.ts, 19, 11)) + export namespace X { +>X : Symbol(X, Decl(nestedModules.ts, 13, 10), Decl(nestedModules.ts, 19, 14)) export var Point: number; >Point : Symbol(Point, Decl(nestedModules.ts, 13, 13), Decl(nestedModules.ts, 21, 18)) @@ -58,9 +58,9 @@ module M2 { var m = M2.X; >m : Symbol(m, Decl(nestedModules.ts, 25, 3)) ->M2.X : Symbol(M2.X, Decl(nestedModules.ts, 13, 10), Decl(nestedModules.ts, 19, 11)) +>M2.X : Symbol(M2.X, Decl(nestedModules.ts, 13, 10), Decl(nestedModules.ts, 19, 14)) >M2 : Symbol(M2, Decl(nestedModules.ts, 11, 1), Decl(nestedModules.ts, 17, 1)) ->X : Symbol(M2.X, Decl(nestedModules.ts, 13, 10), Decl(nestedModules.ts, 19, 11)) +>X : Symbol(M2.X, Decl(nestedModules.ts, 13, 10), Decl(nestedModules.ts, 19, 14)) var point: number; >point : Symbol(point, Decl(nestedModules.ts, 26, 3), Decl(nestedModules.ts, 27, 3)) @@ -79,6 +79,6 @@ var p: { x: number; y: number; } var p: M2.X.Point; >p : Symbol(p, Decl(nestedModules.ts, 29, 3), Decl(nestedModules.ts, 30, 3)) >M2 : Symbol(M2, Decl(nestedModules.ts, 11, 1), Decl(nestedModules.ts, 17, 1)) ->X : Symbol(M2.X, Decl(nestedModules.ts, 13, 10), Decl(nestedModules.ts, 19, 11)) +>X : Symbol(M2.X, Decl(nestedModules.ts, 13, 10), Decl(nestedModules.ts, 19, 14)) >Point : Symbol(M2.X.Point, Decl(nestedModules.ts, 13, 13), Decl(nestedModules.ts, 21, 18)) diff --git a/tests/baselines/reference/nestedModules.types b/tests/baselines/reference/nestedModules.types index df7ba930ab5b4..21459bafe1fb0 100644 --- a/tests/baselines/reference/nestedModules.types +++ b/tests/baselines/reference/nestedModules.types @@ -13,11 +13,11 @@ module A.B.C { } } -module A { +namespace A { >A : typeof A > : ^^^^^^^^ - export module B { + export namespace B { >B : typeof B > : ^^^^^^^^ @@ -49,11 +49,11 @@ module M2.X { } } -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ - export module X { + export namespace X { >X : typeof X > : ^^^^^^^^ diff --git a/tests/baselines/reference/nestedSelf.js b/tests/baselines/reference/nestedSelf.js index 488edc1974757..fa8cd165900bb 100644 --- a/tests/baselines/reference/nestedSelf.js +++ b/tests/baselines/reference/nestedSelf.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/nestedSelf.ts] //// //// [nestedSelf.ts] -module M { +namespace M { export class C { public n = 42; public foo() { [1,2,3].map((x) => { return this.n * x; })} diff --git a/tests/baselines/reference/nestedSelf.symbols b/tests/baselines/reference/nestedSelf.symbols index 4c6eba51f9d65..e0a5c8e9daa24 100644 --- a/tests/baselines/reference/nestedSelf.symbols +++ b/tests/baselines/reference/nestedSelf.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/nestedSelf.ts] //// === nestedSelf.ts === -module M { +namespace M { >M : Symbol(M, Decl(nestedSelf.ts, 0, 0)) export class C { ->C : Symbol(C, Decl(nestedSelf.ts, 0, 10)) +>C : Symbol(C, Decl(nestedSelf.ts, 0, 13)) public n = 42; >n : Symbol(C.n, Decl(nestedSelf.ts, 1, 17)) @@ -16,7 +16,7 @@ module M { >map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --)) >x : Symbol(x, Decl(nestedSelf.ts, 3, 31)) >this.n : Symbol(C.n, Decl(nestedSelf.ts, 1, 17)) ->this : Symbol(C, Decl(nestedSelf.ts, 0, 10)) +>this : Symbol(C, Decl(nestedSelf.ts, 0, 13)) >n : Symbol(C.n, Decl(nestedSelf.ts, 1, 17)) >x : Symbol(x, Decl(nestedSelf.ts, 3, 31)) } diff --git a/tests/baselines/reference/nestedSelf.types b/tests/baselines/reference/nestedSelf.types index b676271d5113b..6ac3eea8712c3 100644 --- a/tests/baselines/reference/nestedSelf.types +++ b/tests/baselines/reference/nestedSelf.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/nestedSelf.ts] //// === nestedSelf.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/newArrays.js b/tests/baselines/reference/newArrays.js index 6751c241cb7cf..2fd202d028925 100644 --- a/tests/baselines/reference/newArrays.js +++ b/tests/baselines/reference/newArrays.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/newArrays.ts] //// //// [newArrays.ts] -module M { +namespace M { class Foo {} class Gar { public fa: Foo[]; diff --git a/tests/baselines/reference/newArrays.symbols b/tests/baselines/reference/newArrays.symbols index cd27f8f0dcb57..5be688a131584 100644 --- a/tests/baselines/reference/newArrays.symbols +++ b/tests/baselines/reference/newArrays.symbols @@ -1,18 +1,18 @@ //// [tests/cases/compiler/newArrays.ts] //// === newArrays.ts === -module M { +namespace M { >M : Symbol(M, Decl(newArrays.ts, 0, 0)) class Foo {} ->Foo : Symbol(Foo, Decl(newArrays.ts, 0, 10)) +>Foo : Symbol(Foo, Decl(newArrays.ts, 0, 13)) class Gar { >Gar : Symbol(Gar, Decl(newArrays.ts, 1, 13)) public fa: Foo[]; >fa : Symbol(Gar.fa, Decl(newArrays.ts, 2, 12)) ->Foo : Symbol(Foo, Decl(newArrays.ts, 0, 10)) +>Foo : Symbol(Foo, Decl(newArrays.ts, 0, 13)) public x = 10; >x : Symbol(Gar.x, Decl(newArrays.ts, 3, 19)) @@ -28,7 +28,7 @@ module M { >this : Symbol(Gar, Decl(newArrays.ts, 1, 13)) >fa : Symbol(Gar.fa, Decl(newArrays.ts, 2, 12)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->Foo : Symbol(Foo, Decl(newArrays.ts, 0, 10)) +>Foo : Symbol(Foo, Decl(newArrays.ts, 0, 13)) >this.x : Symbol(Gar.x, Decl(newArrays.ts, 3, 19)) >this : Symbol(Gar, Decl(newArrays.ts, 1, 13)) >x : Symbol(Gar.x, Decl(newArrays.ts, 3, 19)) diff --git a/tests/baselines/reference/newArrays.types b/tests/baselines/reference/newArrays.types index 561e09a548018..57926ce14854f 100644 --- a/tests/baselines/reference/newArrays.types +++ b/tests/baselines/reference/newArrays.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/newArrays.ts] //// === newArrays.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/newNamesInGlobalAugmentations1.errors.txt b/tests/baselines/reference/newNamesInGlobalAugmentations1.errors.txt new file mode 100644 index 0000000000000..32436d2b54c61 --- /dev/null +++ b/tests/baselines/reference/newNamesInGlobalAugmentations1.errors.txt @@ -0,0 +1,27 @@ +f1.d.ts(3,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +f1.d.ts(3,18): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== f1.d.ts (2 errors) ==== + export {}; + + declare module M.M1 { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export let x: number; + } + declare global { + interface SymbolConstructor { + observable: symbol; + } + class Cls {x} + let [a, b]: number[]; + export import X = M.M1.x; + } + +==== main.ts (0 errors) ==== + Symbol.observable; + new Cls().x + let c = a + b + X; \ No newline at end of file diff --git a/tests/baselines/reference/newNamesInGlobalAugmentations1.types b/tests/baselines/reference/newNamesInGlobalAugmentations1.types index 324a8b494003a..f46c99b0c5bca 100644 --- a/tests/baselines/reference/newNamesInGlobalAugmentations1.types +++ b/tests/baselines/reference/newNamesInGlobalAugmentations1.types @@ -26,6 +26,7 @@ declare global { >Cls : Cls > : ^^^ >x : any +> : ^^^ let [a, b]: number[]; >a : number @@ -55,6 +56,7 @@ Symbol.observable; new Cls().x >new Cls().x : any +> : ^^^ >new Cls() : Cls > : ^^^ >Cls : typeof Cls diff --git a/tests/baselines/reference/newOperator.errors.txt b/tests/baselines/reference/newOperator.errors.txt index c12003b73e5c9..487aba812d3bb 100644 --- a/tests/baselines/reference/newOperator.errors.txt +++ b/tests/baselines/reference/newOperator.errors.txt @@ -102,7 +102,7 @@ newOperator.ts(56,24): error TS1011: An element access expression should take an !!! error TS2351: This expression is not constructable. !!! error TS2351: Each member of the union type '(new (a: T) => void) | (new (a: string) => void)' has construct signatures, but none of those signatures are compatible with each other. - module M { + namespace M { export class T { x: number; } diff --git a/tests/baselines/reference/newOperator.js b/tests/baselines/reference/newOperator.js index 39160aaf8b51a..f972a886544fb 100644 --- a/tests/baselines/reference/newOperator.js +++ b/tests/baselines/reference/newOperator.js @@ -48,7 +48,7 @@ new ctorUnion(""); declare const ctorUnion2: (new (a: T) => void) | (new (a: string) => void) new ctorUnion2(""); -module M { +namespace M { export class T { x: number; } diff --git a/tests/baselines/reference/newOperator.symbols b/tests/baselines/reference/newOperator.symbols index 7765991d24525..f718612f0ca7c 100644 --- a/tests/baselines/reference/newOperator.symbols +++ b/tests/baselines/reference/newOperator.symbols @@ -89,11 +89,11 @@ declare const ctorUnion2: (new (a: T) => void) | (new (a: s new ctorUnion2(""); >ctorUnion2 : Symbol(ctorUnion2, Decl(newOperator.ts, 44, 13)) -module M { +namespace M { >M : Symbol(M, Decl(newOperator.ts, 45, 19)) export class T { ->T : Symbol(T, Decl(newOperator.ts, 47, 10)) +>T : Symbol(T, Decl(newOperator.ts, 47, 13)) x: number; >x : Symbol(T.x, Decl(newOperator.ts, 48, 20)) @@ -106,12 +106,12 @@ class S { public get xs(): M.T[] { >xs : Symbol(S.xs, Decl(newOperator.ts, 53, 9)) >M : Symbol(M, Decl(newOperator.ts, 45, 19)) ->T : Symbol(M.T, Decl(newOperator.ts, 47, 10)) +>T : Symbol(M.T, Decl(newOperator.ts, 47, 13)) return new M.T[]; ->M.T : Symbol(M.T, Decl(newOperator.ts, 47, 10)) +>M.T : Symbol(M.T, Decl(newOperator.ts, 47, 13)) >M : Symbol(M, Decl(newOperator.ts, 45, 19)) ->T : Symbol(M.T, Decl(newOperator.ts, 47, 10)) +>T : Symbol(M.T, Decl(newOperator.ts, 47, 13)) } } diff --git a/tests/baselines/reference/newOperator.types b/tests/baselines/reference/newOperator.types index a6b271c857ab5..894dfc4791b37 100644 --- a/tests/baselines/reference/newOperator.types +++ b/tests/baselines/reference/newOperator.types @@ -177,7 +177,7 @@ new ctorUnion2(""); >"" : "" > : ^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/noImplicitAnyModule.errors.txt b/tests/baselines/reference/noImplicitAnyModule.errors.txt index 21e6ac3676167..9cd83d9a2c09a 100644 --- a/tests/baselines/reference/noImplicitAnyModule.errors.txt +++ b/tests/baselines/reference/noImplicitAnyModule.errors.txt @@ -5,7 +5,7 @@ noImplicitAnyModule.ts(17,14): error TS7010: 'f', which lacks return-type annota ==== noImplicitAnyModule.ts (4 errors) ==== - declare module Module { + declare namespace Module { interface Interface { // Should return error for implicit any on return type. new (); diff --git a/tests/baselines/reference/noImplicitAnyModule.js b/tests/baselines/reference/noImplicitAnyModule.js index 2fec1972318fd..52371949c7a43 100644 --- a/tests/baselines/reference/noImplicitAnyModule.js +++ b/tests/baselines/reference/noImplicitAnyModule.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/noImplicitAnyModule.ts] //// //// [noImplicitAnyModule.ts] -declare module Module { +declare namespace Module { interface Interface { // Should return error for implicit any on return type. new (); diff --git a/tests/baselines/reference/noImplicitAnyModule.symbols b/tests/baselines/reference/noImplicitAnyModule.symbols index afbd5880527d1..4d81daf9dca60 100644 --- a/tests/baselines/reference/noImplicitAnyModule.symbols +++ b/tests/baselines/reference/noImplicitAnyModule.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/noImplicitAnyModule.ts] //// === noImplicitAnyModule.ts === -declare module Module { +declare namespace Module { >Module : Symbol(Module, Decl(noImplicitAnyModule.ts, 0, 0)) interface Interface { ->Interface : Symbol(Interface, Decl(noImplicitAnyModule.ts, 0, 23)) +>Interface : Symbol(Interface, Decl(noImplicitAnyModule.ts, 0, 26)) // Should return error for implicit any on return type. new (); diff --git a/tests/baselines/reference/noImplicitAnyModule.types b/tests/baselines/reference/noImplicitAnyModule.types index 4d2ba0541bd82..afd3b3697aaae 100644 --- a/tests/baselines/reference/noImplicitAnyModule.types +++ b/tests/baselines/reference/noImplicitAnyModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/noImplicitAnyModule.ts] //// === noImplicitAnyModule.ts === -declare module Module { +declare namespace Module { >Module : typeof Module > : ^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.errors.txt b/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.errors.txt index 2d32b2f64f541..bc94f43869a98 100644 --- a/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.errors.txt +++ b/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.errors.txt @@ -23,7 +23,7 @@ noImplicitAnyParametersInAmbientModule.ts(44,21): error TS7019: Rest parameter ' ==== noImplicitAnyParametersInAmbientModule.ts (22 errors) ==== - declare module D_M { + declare namespace D_M { // No implicit-'any' errors. function dm_f1(): void; diff --git a/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.js b/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.js index 9c010c1ea81c0..a3996bdcdbb4e 100644 --- a/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.js +++ b/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/noImplicitAnyParametersInAmbientModule.ts] //// //// [noImplicitAnyParametersInAmbientModule.ts] -declare module D_M { +declare namespace D_M { // No implicit-'any' errors. function dm_f1(): void; diff --git a/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.symbols b/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.symbols index be4898dc1a0e0..cd525087fcb54 100644 --- a/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.symbols +++ b/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.symbols @@ -1,12 +1,12 @@ //// [tests/cases/compiler/noImplicitAnyParametersInAmbientModule.ts] //// === noImplicitAnyParametersInAmbientModule.ts === -declare module D_M { +declare namespace D_M { >D_M : Symbol(D_M, Decl(noImplicitAnyParametersInAmbientModule.ts, 0, 0)) // No implicit-'any' errors. function dm_f1(): void; ->dm_f1 : Symbol(dm_f1, Decl(noImplicitAnyParametersInAmbientModule.ts, 0, 20)) +>dm_f1 : Symbol(dm_f1, Decl(noImplicitAnyParametersInAmbientModule.ts, 0, 23)) // No implicit-'any' errors. function dm_f2(x): void; diff --git a/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.types b/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.types index 912acde1947d4..6b18ba5dd12c8 100644 --- a/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.types +++ b/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/noImplicitAnyParametersInAmbientModule.ts] //// === noImplicitAnyParametersInAmbientModule.ts === -declare module D_M { +declare namespace D_M { >D_M : typeof D_M > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/noImplicitAnyParametersInModule.errors.txt b/tests/baselines/reference/noImplicitAnyParametersInModule.errors.txt index 1813c2559b1f0..dac3344eada6b 100644 --- a/tests/baselines/reference/noImplicitAnyParametersInModule.errors.txt +++ b/tests/baselines/reference/noImplicitAnyParametersInModule.errors.txt @@ -23,7 +23,7 @@ noImplicitAnyParametersInModule.ts(44,21): error TS7019: Rest parameter 'r' impl ==== noImplicitAnyParametersInModule.ts (22 errors) ==== - module M { + namespace M { // No implicit-'any' errors. function m_f1(): void { } diff --git a/tests/baselines/reference/noImplicitAnyParametersInModule.js b/tests/baselines/reference/noImplicitAnyParametersInModule.js index 0d92159b1be95..575fbdbebef26 100644 --- a/tests/baselines/reference/noImplicitAnyParametersInModule.js +++ b/tests/baselines/reference/noImplicitAnyParametersInModule.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/noImplicitAnyParametersInModule.ts] //// //// [noImplicitAnyParametersInModule.ts] -module M { +namespace M { // No implicit-'any' errors. function m_f1(): void { } diff --git a/tests/baselines/reference/noImplicitAnyParametersInModule.symbols b/tests/baselines/reference/noImplicitAnyParametersInModule.symbols index b00368828c1e0..beb7da910d58e 100644 --- a/tests/baselines/reference/noImplicitAnyParametersInModule.symbols +++ b/tests/baselines/reference/noImplicitAnyParametersInModule.symbols @@ -1,12 +1,12 @@ //// [tests/cases/compiler/noImplicitAnyParametersInModule.ts] //// === noImplicitAnyParametersInModule.ts === -module M { +namespace M { >M : Symbol(M, Decl(noImplicitAnyParametersInModule.ts, 0, 0)) // No implicit-'any' errors. function m_f1(): void { } ->m_f1 : Symbol(m_f1, Decl(noImplicitAnyParametersInModule.ts, 0, 10)) +>m_f1 : Symbol(m_f1, Decl(noImplicitAnyParametersInModule.ts, 0, 13)) // Implicit-'any' error for x. function m_f2(x): void { } diff --git a/tests/baselines/reference/noImplicitAnyParametersInModule.types b/tests/baselines/reference/noImplicitAnyParametersInModule.types index e20ae7fa333d7..5246167cf54ba 100644 --- a/tests/baselines/reference/noImplicitAnyParametersInModule.types +++ b/tests/baselines/reference/noImplicitAnyParametersInModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/noImplicitAnyParametersInModule.ts] //// === noImplicitAnyParametersInModule.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/nonExportedElementsOfMergedModules.errors.txt b/tests/baselines/reference/nonExportedElementsOfMergedModules.errors.txt index 9122941c6ff6e..7b7988a8836c4 100644 --- a/tests/baselines/reference/nonExportedElementsOfMergedModules.errors.txt +++ b/tests/baselines/reference/nonExportedElementsOfMergedModules.errors.txt @@ -2,16 +2,16 @@ nonExportedElementsOfMergedModules.ts(13,7): error TS2339: Property 'x' does not ==== nonExportedElementsOfMergedModules.ts (1 errors) ==== - module One { + namespace One { enum A { X } - module B { + namespace B { export var x; } } - module One { + namespace One { enum A { Y } - module B { + namespace B { export var y; } B.x; diff --git a/tests/baselines/reference/nonExportedElementsOfMergedModules.js b/tests/baselines/reference/nonExportedElementsOfMergedModules.js index 659adef9017d7..1f1a0cb69ed1f 100644 --- a/tests/baselines/reference/nonExportedElementsOfMergedModules.js +++ b/tests/baselines/reference/nonExportedElementsOfMergedModules.js @@ -1,16 +1,16 @@ //// [tests/cases/compiler/nonExportedElementsOfMergedModules.ts] //// //// [nonExportedElementsOfMergedModules.ts] -module One { +namespace One { enum A { X } - module B { + namespace B { export var x; } } -module One { +namespace One { enum A { Y } - module B { + namespace B { export var y; } B.x; diff --git a/tests/baselines/reference/nonExportedElementsOfMergedModules.symbols b/tests/baselines/reference/nonExportedElementsOfMergedModules.symbols index d1fc7d6184eee..3a17fb0483cab 100644 --- a/tests/baselines/reference/nonExportedElementsOfMergedModules.symbols +++ b/tests/baselines/reference/nonExportedElementsOfMergedModules.symbols @@ -1,14 +1,14 @@ //// [tests/cases/compiler/nonExportedElementsOfMergedModules.ts] //// === nonExportedElementsOfMergedModules.ts === -module One { +namespace One { >One : Symbol(One, Decl(nonExportedElementsOfMergedModules.ts, 0, 0), Decl(nonExportedElementsOfMergedModules.ts, 5, 1)) enum A { X } ->A : Symbol(A, Decl(nonExportedElementsOfMergedModules.ts, 0, 12)) +>A : Symbol(A, Decl(nonExportedElementsOfMergedModules.ts, 0, 15)) >X : Symbol(A.X, Decl(nonExportedElementsOfMergedModules.ts, 1, 12)) - module B { + namespace B { >B : Symbol(B, Decl(nonExportedElementsOfMergedModules.ts, 1, 16)) export var x; @@ -16,14 +16,14 @@ module One { } } -module One { +namespace One { >One : Symbol(One, Decl(nonExportedElementsOfMergedModules.ts, 0, 0), Decl(nonExportedElementsOfMergedModules.ts, 5, 1)) enum A { Y } ->A : Symbol(A, Decl(nonExportedElementsOfMergedModules.ts, 7, 12)) +>A : Symbol(A, Decl(nonExportedElementsOfMergedModules.ts, 7, 15)) >Y : Symbol(A.Y, Decl(nonExportedElementsOfMergedModules.ts, 8, 12)) - module B { + namespace B { >B : Symbol(B, Decl(nonExportedElementsOfMergedModules.ts, 8, 16)) export var y; diff --git a/tests/baselines/reference/nonExportedElementsOfMergedModules.types b/tests/baselines/reference/nonExportedElementsOfMergedModules.types index b4fa11a1e7d54..c278f5d78bef1 100644 --- a/tests/baselines/reference/nonExportedElementsOfMergedModules.types +++ b/tests/baselines/reference/nonExportedElementsOfMergedModules.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/nonExportedElementsOfMergedModules.ts] //// === nonExportedElementsOfMergedModules.ts === -module One { +namespace One { >One : typeof One > : ^^^^^^^^^^ @@ -11,7 +11,7 @@ module One { >X : A.X > : ^^^ - module B { + namespace B { >B : typeof B > : ^^^^^^^^ @@ -21,7 +21,7 @@ module One { } } -module One { +namespace One { >One : typeof One > : ^^^^^^^^^^ @@ -31,7 +31,7 @@ module One { >Y : A.Y > : ^^^ - module B { + namespace B { >B : typeof B > : ^^^^^^^^ diff --git a/tests/baselines/reference/nonInstantiatedModule.js b/tests/baselines/reference/nonInstantiatedModule.js index 8aff0f523a42f..09a6c69e4a632 100644 --- a/tests/baselines/reference/nonInstantiatedModule.js +++ b/tests/baselines/reference/nonInstantiatedModule.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/moduleDeclarations/nonInstantiatedModule.ts] //// //// [nonInstantiatedModule.ts] -module M { +namespace M { export interface Point { x: number; y: number } export var a = 1; } @@ -16,8 +16,8 @@ var a1 = M.a; var a2: number; var a2 = m.a; -module M2 { - export module Point { +namespace M2 { + export namespace Point { export function Origin(): Point { return { x: 0, y: 0 }; } @@ -35,8 +35,8 @@ var p: M2.Point; var p2: { Origin() : { x: number; y: number; } }; var p2: typeof M2.Point; -module M3 { - export module Utils { +namespace M3 { + export namespace Utils { export interface Point { x: number; y: number; } diff --git a/tests/baselines/reference/nonInstantiatedModule.symbols b/tests/baselines/reference/nonInstantiatedModule.symbols index 6fe1b7f3c0b59..f8982604ef2db 100644 --- a/tests/baselines/reference/nonInstantiatedModule.symbols +++ b/tests/baselines/reference/nonInstantiatedModule.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/internalModules/moduleDeclarations/nonInstantiatedModule.ts] //// === nonInstantiatedModule.ts === -module M { +namespace M { >M : Symbol(M, Decl(nonInstantiatedModule.ts, 0, 0)) export interface Point { x: number; y: number } ->Point : Symbol(Point, Decl(nonInstantiatedModule.ts, 0, 10)) +>Point : Symbol(Point, Decl(nonInstantiatedModule.ts, 0, 13)) >x : Symbol(Point.x, Decl(nonInstantiatedModule.ts, 1, 28)) >y : Symbol(Point.y, Decl(nonInstantiatedModule.ts, 1, 39)) @@ -40,15 +40,15 @@ var a2 = m.a; >m : Symbol(m, Decl(nonInstantiatedModule.ts, 6, 3), Decl(nonInstantiatedModule.ts, 7, 3)) >a : Symbol(M.a, Decl(nonInstantiatedModule.ts, 2, 14)) -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(nonInstantiatedModule.ts, 13, 13)) - export module Point { ->Point : Symbol(Point, Decl(nonInstantiatedModule.ts, 15, 11), Decl(nonInstantiatedModule.ts, 20, 5)) + export namespace Point { +>Point : Symbol(Point, Decl(nonInstantiatedModule.ts, 15, 14), Decl(nonInstantiatedModule.ts, 20, 5)) export function Origin(): Point { ->Origin : Symbol(Origin, Decl(nonInstantiatedModule.ts, 16, 25)) ->Point : Symbol(Point, Decl(nonInstantiatedModule.ts, 15, 11), Decl(nonInstantiatedModule.ts, 20, 5)) +>Origin : Symbol(Origin, Decl(nonInstantiatedModule.ts, 16, 28)) +>Point : Symbol(Point, Decl(nonInstantiatedModule.ts, 15, 14), Decl(nonInstantiatedModule.ts, 20, 5)) return { x: 0, y: 0 }; >x : Symbol(x, Decl(nonInstantiatedModule.ts, 18, 20)) @@ -57,7 +57,7 @@ module M2 { } export interface Point { ->Point : Symbol(Point, Decl(nonInstantiatedModule.ts, 15, 11), Decl(nonInstantiatedModule.ts, 20, 5)) +>Point : Symbol(Point, Decl(nonInstantiatedModule.ts, 15, 14), Decl(nonInstantiatedModule.ts, 20, 5)) x: number; >x : Symbol(Point.x, Decl(nonInstantiatedModule.ts, 22, 28)) @@ -75,7 +75,7 @@ var p: { x: number; y: number; }; var p: M2.Point; >p : Symbol(p, Decl(nonInstantiatedModule.ts, 28, 3), Decl(nonInstantiatedModule.ts, 29, 3)) >M2 : Symbol(M2, Decl(nonInstantiatedModule.ts, 13, 13)) ->Point : Symbol(M2.Point, Decl(nonInstantiatedModule.ts, 15, 11), Decl(nonInstantiatedModule.ts, 20, 5)) +>Point : Symbol(M2.Point, Decl(nonInstantiatedModule.ts, 15, 14), Decl(nonInstantiatedModule.ts, 20, 5)) var p2: { Origin() : { x: number; y: number; } }; >p2 : Symbol(p2, Decl(nonInstantiatedModule.ts, 31, 3), Decl(nonInstantiatedModule.ts, 32, 3)) @@ -85,18 +85,18 @@ var p2: { Origin() : { x: number; y: number; } }; var p2: typeof M2.Point; >p2 : Symbol(p2, Decl(nonInstantiatedModule.ts, 31, 3), Decl(nonInstantiatedModule.ts, 32, 3)) ->M2.Point : Symbol(M2.Point, Decl(nonInstantiatedModule.ts, 15, 11), Decl(nonInstantiatedModule.ts, 20, 5)) +>M2.Point : Symbol(M2.Point, Decl(nonInstantiatedModule.ts, 15, 14), Decl(nonInstantiatedModule.ts, 20, 5)) >M2 : Symbol(M2, Decl(nonInstantiatedModule.ts, 13, 13)) ->Point : Symbol(M2.Point, Decl(nonInstantiatedModule.ts, 15, 11), Decl(nonInstantiatedModule.ts, 20, 5)) +>Point : Symbol(M2.Point, Decl(nonInstantiatedModule.ts, 15, 14), Decl(nonInstantiatedModule.ts, 20, 5)) -module M3 { +namespace M3 { >M3 : Symbol(M3, Decl(nonInstantiatedModule.ts, 32, 24)) - export module Utils { ->Utils : Symbol(Utils, Decl(nonInstantiatedModule.ts, 34, 11), Decl(nonInstantiatedModule.ts, 39, 5)) + export namespace Utils { +>Utils : Symbol(Utils, Decl(nonInstantiatedModule.ts, 34, 14), Decl(nonInstantiatedModule.ts, 39, 5)) export interface Point { ->Point : Symbol(Point, Decl(nonInstantiatedModule.ts, 35, 25)) +>Point : Symbol(Point, Decl(nonInstantiatedModule.ts, 35, 28)) x: number; y: number; >x : Symbol(Point.x, Decl(nonInstantiatedModule.ts, 36, 32)) @@ -105,7 +105,7 @@ module M3 { } export class Utils { ->Utils : Symbol(Utils, Decl(nonInstantiatedModule.ts, 34, 11), Decl(nonInstantiatedModule.ts, 39, 5)) +>Utils : Symbol(Utils, Decl(nonInstantiatedModule.ts, 34, 14), Decl(nonInstantiatedModule.ts, 39, 5)) name: string; >name : Symbol(Utils.name, Decl(nonInstantiatedModule.ts, 41, 24)) diff --git a/tests/baselines/reference/nonInstantiatedModule.types b/tests/baselines/reference/nonInstantiatedModule.types index 640e6f374cda6..353e20d24327e 100644 --- a/tests/baselines/reference/nonInstantiatedModule.types +++ b/tests/baselines/reference/nonInstantiatedModule.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/moduleDeclarations/nonInstantiatedModule.ts] //// === nonInstantiatedModule.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -59,11 +59,11 @@ var a2 = m.a; >a : number > : ^^^^^^ -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ - export module Point { + export namespace Point { >Point : typeof Point > : ^^^^^^^^^^^^ @@ -130,11 +130,11 @@ var p2: typeof M2.Point; >Point : typeof M2.Point > : ^^^^^^^^^^^^^^^ -module M3 { +namespace M3 { >M3 : typeof M3 > : ^^^^^^^^^ - export module Utils { + export namespace Utils { export interface Point { x: number; y: number; >x : number diff --git a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.js b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.js index b8f8fbab8ff53..6458b3540b90e 100644 --- a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.js +++ b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.js @@ -57,7 +57,7 @@ var r14 = true ? E.A : null; var r14 = true ? null : E.A; function f() { } -module f { +namespace f { export var bar = 1; } var af: typeof f; @@ -65,7 +65,7 @@ var r15 = true ? af : null; var r15 = true ? null : af; class c { baz: string } -module c { +namespace c { export var bar = 1; } var ac: typeof c; diff --git a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.symbols b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.symbols index 5e6e205ed8f2d..403762d2417f8 100644 --- a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.symbols +++ b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.symbols @@ -158,7 +158,7 @@ var r14 = true ? null : E.A; function f() { } >f : Symbol(f, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 53, 28), Decl(nullIsSubtypeOfEverythingButUndefined.ts, 55, 16)) -module f { +namespace f { >f : Symbol(f, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 53, 28), Decl(nullIsSubtypeOfEverythingButUndefined.ts, 55, 16)) export var bar = 1; @@ -180,7 +180,7 @@ class c { baz: string } >c : Symbol(c, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 61, 27), Decl(nullIsSubtypeOfEverythingButUndefined.ts, 63, 23)) >baz : Symbol(c.baz, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 63, 9)) -module c { +namespace c { >c : Symbol(c, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 61, 27), Decl(nullIsSubtypeOfEverythingButUndefined.ts, 63, 23)) export var bar = 1; diff --git a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types index 222e52de3e669..ff0e04bd67409 100644 --- a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types +++ b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types @@ -362,7 +362,7 @@ function f() { } >f : typeof f > : ^^^^^^^^ -module f { +namespace f { >f : typeof f > : ^^^^^^^^ @@ -404,7 +404,7 @@ class c { baz: string } >baz : string > : ^^^^^^ -module c { +namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/objectLitArrayDeclNoNew.errors.txt b/tests/baselines/reference/objectLitArrayDeclNoNew.errors.txt index 710f8d4f01013..46588056c2324 100644 --- a/tests/baselines/reference/objectLitArrayDeclNoNew.errors.txt +++ b/tests/baselines/reference/objectLitArrayDeclNoNew.errors.txt @@ -5,7 +5,7 @@ objectLitArrayDeclNoNew.ts(27,1): error TS1128: Declaration or statement expecte ==== objectLitArrayDeclNoNew.ts (2 errors) ==== declare var console; "use strict"; - module Test { + namespace Test { export interface IState { } diff --git a/tests/baselines/reference/objectLitArrayDeclNoNew.js b/tests/baselines/reference/objectLitArrayDeclNoNew.js index 7fd3705cbdd9f..3d4a87bf246e0 100644 --- a/tests/baselines/reference/objectLitArrayDeclNoNew.js +++ b/tests/baselines/reference/objectLitArrayDeclNoNew.js @@ -3,7 +3,7 @@ //// [objectLitArrayDeclNoNew.ts] declare var console; "use strict"; -module Test { +namespace Test { export interface IState { } diff --git a/tests/baselines/reference/objectLitArrayDeclNoNew.symbols b/tests/baselines/reference/objectLitArrayDeclNoNew.symbols index 0ce530320efaa..b29fbd7ed8215 100644 --- a/tests/baselines/reference/objectLitArrayDeclNoNew.symbols +++ b/tests/baselines/reference/objectLitArrayDeclNoNew.symbols @@ -5,11 +5,11 @@ declare var console; >console : Symbol(console, Decl(objectLitArrayDeclNoNew.ts, 0, 11)) "use strict"; -module Test { +namespace Test { >Test : Symbol(Test, Decl(objectLitArrayDeclNoNew.ts, 1, 13)) export interface IState { ->IState : Symbol(IState, Decl(objectLitArrayDeclNoNew.ts, 2, 13)) +>IState : Symbol(IState, Decl(objectLitArrayDeclNoNew.ts, 2, 16)) } export interface IToken { @@ -25,7 +25,7 @@ module Test { endState: IState; >endState : Symbol(ILineTokens.endState, Decl(objectLitArrayDeclNoNew.ts, 10, 25)) ->IState : Symbol(IState, Decl(objectLitArrayDeclNoNew.ts, 2, 13)) +>IState : Symbol(IState, Decl(objectLitArrayDeclNoNew.ts, 2, 16)) } export class Gar { @@ -41,7 +41,7 @@ module Test { var state:IState= null; >state : Symbol(state, Decl(objectLitArrayDeclNoNew.ts, 19, 9)) ->IState : Symbol(IState, Decl(objectLitArrayDeclNoNew.ts, 2, 13)) +>IState : Symbol(IState, Decl(objectLitArrayDeclNoNew.ts, 2, 16)) return { tokens: Gar[],//IToken[], // Missing new. Correct syntax is: tokens: new IToken[] diff --git a/tests/baselines/reference/objectLitArrayDeclNoNew.types b/tests/baselines/reference/objectLitArrayDeclNoNew.types index 2a6acf522a46f..126ff49f2ff5f 100644 --- a/tests/baselines/reference/objectLitArrayDeclNoNew.types +++ b/tests/baselines/reference/objectLitArrayDeclNoNew.types @@ -9,7 +9,7 @@ declare var console; >"use strict" : "use strict" > : ^^^^^^^^^^^^ -module Test { +namespace Test { >Test : typeof Test > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.errors.txt b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.errors.txt index ca2bf88013094..5b0e196b65eff 100644 --- a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.errors.txt +++ b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.errors.txt @@ -5,11 +5,11 @@ objectLiteralShorthandPropertiesErrorWithModule.ts(14,3): error TS2339: Property ==== objectLiteralShorthandPropertiesErrorWithModule.ts (2 errors) ==== // module export var x = "Foo"; - module m { + namespace m { export var x; } - module n { + namespace n { var z = 10000; export var y = { m.x // error diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.js b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.js index 1184629b99136..86e9217c6952b 100644 --- a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.js +++ b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.js @@ -3,11 +3,11 @@ //// [objectLiteralShorthandPropertiesErrorWithModule.ts] // module export var x = "Foo"; -module m { +namespace m { export var x; } -module n { +namespace n { var z = 10000; export var y = { m.x // error diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.symbols b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.symbols index 3a57169790240..e3587d1e6970f 100644 --- a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.symbols +++ b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.symbols @@ -5,14 +5,14 @@ var x = "Foo"; >x : Symbol(x, Decl(objectLiteralShorthandPropertiesErrorWithModule.ts, 1, 3)) -module m { +namespace m { >m : Symbol(m, Decl(objectLiteralShorthandPropertiesErrorWithModule.ts, 1, 14)) export var x; >x : Symbol(x, Decl(objectLiteralShorthandPropertiesErrorWithModule.ts, 3, 14)) } -module n { +namespace n { >n : Symbol(n, Decl(objectLiteralShorthandPropertiesErrorWithModule.ts, 4, 1)) var z = 10000; diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.types b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.types index ad983dc909b24..1b6063a29d1bf 100644 --- a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.types +++ b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.types @@ -8,7 +8,7 @@ var x = "Foo"; >"Foo" : "Foo" > : ^^^^^ -module m { +namespace m { >m : typeof m > : ^^^^^^^^ @@ -17,7 +17,7 @@ module m { > : ^^^ } -module n { +namespace n { >n : typeof n > : ^^^^^^^^ diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesWithModule.js b/tests/baselines/reference/objectLiteralShorthandPropertiesWithModule.js index 9db6e62becb68..acd6177669c4f 100644 --- a/tests/baselines/reference/objectLiteralShorthandPropertiesWithModule.js +++ b/tests/baselines/reference/objectLiteralShorthandPropertiesWithModule.js @@ -3,11 +3,11 @@ //// [objectLiteralShorthandPropertiesWithModule.ts] // module export -module m { +namespace m { export var x; } -module m { +namespace m { var z = x; var y = { a: x, diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesWithModule.symbols b/tests/baselines/reference/objectLiteralShorthandPropertiesWithModule.symbols index 7f5035bc9e90e..d743cf1541922 100644 --- a/tests/baselines/reference/objectLiteralShorthandPropertiesWithModule.symbols +++ b/tests/baselines/reference/objectLiteralShorthandPropertiesWithModule.symbols @@ -3,14 +3,14 @@ === objectLiteralShorthandPropertiesWithModule.ts === // module export -module m { +namespace m { >m : Symbol(m, Decl(objectLiteralShorthandPropertiesWithModule.ts, 0, 0), Decl(objectLiteralShorthandPropertiesWithModule.ts, 4, 1)) export var x; >x : Symbol(x, Decl(objectLiteralShorthandPropertiesWithModule.ts, 3, 14)) } -module m { +namespace m { >m : Symbol(m, Decl(objectLiteralShorthandPropertiesWithModule.ts, 0, 0), Decl(objectLiteralShorthandPropertiesWithModule.ts, 4, 1)) var z = x; diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesWithModule.types b/tests/baselines/reference/objectLiteralShorthandPropertiesWithModule.types index 56be0034acbe1..3768f78ddf4dc 100644 --- a/tests/baselines/reference/objectLiteralShorthandPropertiesWithModule.types +++ b/tests/baselines/reference/objectLiteralShorthandPropertiesWithModule.types @@ -3,7 +3,7 @@ === objectLiteralShorthandPropertiesWithModule.ts === // module export -module m { +namespace m { >m : typeof m > : ^^^^^^^^ @@ -11,7 +11,7 @@ module m { >x : any } -module m { +namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesWithModuleES6.js b/tests/baselines/reference/objectLiteralShorthandPropertiesWithModuleES6.js index 2716f09985af9..f665c8e40badd 100644 --- a/tests/baselines/reference/objectLiteralShorthandPropertiesWithModuleES6.js +++ b/tests/baselines/reference/objectLiteralShorthandPropertiesWithModuleES6.js @@ -1,11 +1,11 @@ //// [tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModuleES6.ts] //// //// [objectLiteralShorthandPropertiesWithModuleES6.ts] -module m { +namespace m { export var x; } -module m { +namespace m { var z = x; var y = { a: x, diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesWithModuleES6.symbols b/tests/baselines/reference/objectLiteralShorthandPropertiesWithModuleES6.symbols index cf0d3aec97b58..d193b7d53abd7 100644 --- a/tests/baselines/reference/objectLiteralShorthandPropertiesWithModuleES6.symbols +++ b/tests/baselines/reference/objectLiteralShorthandPropertiesWithModuleES6.symbols @@ -1,14 +1,14 @@ //// [tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModuleES6.ts] //// === objectLiteralShorthandPropertiesWithModuleES6.ts === -module m { +namespace m { >m : Symbol(m, Decl(objectLiteralShorthandPropertiesWithModuleES6.ts, 0, 0), Decl(objectLiteralShorthandPropertiesWithModuleES6.ts, 2, 1)) export var x; >x : Symbol(x, Decl(objectLiteralShorthandPropertiesWithModuleES6.ts, 1, 14)) } -module m { +namespace m { >m : Symbol(m, Decl(objectLiteralShorthandPropertiesWithModuleES6.ts, 0, 0), Decl(objectLiteralShorthandPropertiesWithModuleES6.ts, 2, 1)) var z = x; diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesWithModuleES6.types b/tests/baselines/reference/objectLiteralShorthandPropertiesWithModuleES6.types index 123bef1ce64a8..b222b2722f901 100644 --- a/tests/baselines/reference/objectLiteralShorthandPropertiesWithModuleES6.types +++ b/tests/baselines/reference/objectLiteralShorthandPropertiesWithModuleES6.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModuleES6.ts] //// === objectLiteralShorthandPropertiesWithModuleES6.ts === -module m { +namespace m { >m : typeof m > : ^^^^^^^^ @@ -9,7 +9,7 @@ module m { >x : any } -module m { +namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/overload1.errors.txt b/tests/baselines/reference/overload1.errors.txt index 5a000bae8bd24..e35822064cddf 100644 --- a/tests/baselines/reference/overload1.errors.txt +++ b/tests/baselines/reference/overload1.errors.txt @@ -11,7 +11,7 @@ overload1.ts(34,5): error TS2769: No overload matches this call. ==== overload1.ts (6 errors) ==== - module O { + namespace O { export class A { } diff --git a/tests/baselines/reference/overload1.js b/tests/baselines/reference/overload1.js index 06fc1e5e68390..cf329f6380f88 100644 --- a/tests/baselines/reference/overload1.js +++ b/tests/baselines/reference/overload1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/overload1.ts] //// //// [overload1.ts] -module O { +namespace O { export class A { } diff --git a/tests/baselines/reference/overload1.symbols b/tests/baselines/reference/overload1.symbols index 8abab330cf45b..6d9afca65793b 100644 --- a/tests/baselines/reference/overload1.symbols +++ b/tests/baselines/reference/overload1.symbols @@ -1,17 +1,17 @@ //// [tests/cases/compiler/overload1.ts] //// === overload1.ts === -module O { +namespace O { >O : Symbol(O, Decl(overload1.ts, 0, 0)) export class A { ->A : Symbol(A, Decl(overload1.ts, 0, 10)) +>A : Symbol(A, Decl(overload1.ts, 0, 13)) } export class B extends A { >B : Symbol(B, Decl(overload1.ts, 3, 5)) ->A : Symbol(A, Decl(overload1.ts, 0, 10)) +>A : Symbol(A, Decl(overload1.ts, 0, 13)) } export class C extends B { @@ -43,7 +43,7 @@ module O { g(a:A):C; >g : Symbol(I.g, Decl(overload1.ts, 14, 27), Decl(overload1.ts, 15, 38), Decl(overload1.ts, 16, 27), Decl(overload1.ts, 17, 17)) >a : Symbol(a, Decl(overload1.ts, 17, 10)) ->A : Symbol(A, Decl(overload1.ts, 0, 10)) +>A : Symbol(A, Decl(overload1.ts, 0, 13)) >C : Symbol(C, Decl(overload1.ts, 6, 5)) g(c:C):string; @@ -73,9 +73,9 @@ var e:string=x.g(new O.A()); // matches overload but bad assignment >x.g : Symbol(O.I.g, Decl(overload1.ts, 14, 27), Decl(overload1.ts, 15, 38), Decl(overload1.ts, 16, 27), Decl(overload1.ts, 17, 17)) >x : Symbol(x, Decl(overload1.ts, 24, 11)) >g : Symbol(O.I.g, Decl(overload1.ts, 14, 27), Decl(overload1.ts, 15, 38), Decl(overload1.ts, 16, 27), Decl(overload1.ts, 17, 17)) ->O.A : Symbol(O.A, Decl(overload1.ts, 0, 10)) +>O.A : Symbol(O.A, Decl(overload1.ts, 0, 13)) >O : Symbol(O, Decl(overload1.ts, 0, 0)) ->A : Symbol(O.A, Decl(overload1.ts, 0, 10)) +>A : Symbol(O.A, Decl(overload1.ts, 0, 13)) var y:string=x.f(3); // good >y : Symbol(y, Decl(overload1.ts, 27, 3)) diff --git a/tests/baselines/reference/overload1.types b/tests/baselines/reference/overload1.types index 610004a716bc7..e5c44a57b7189 100644 --- a/tests/baselines/reference/overload1.types +++ b/tests/baselines/reference/overload1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/overload1.ts] //// === overload1.ts === -module O { +namespace O { >O : typeof O > : ^^^^^^^^ diff --git a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js index 4a588a79d4200..b2ee832bf2f86 100644 --- a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js +++ b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/overloadResolutionOverNonCTLambdas.ts] //// //// [overloadResolutionOverNonCTLambdas.ts] -module Bugs { +namespace Bugs { class A { } diff --git a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.symbols b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.symbols index a221ea2db99c9..e250534932f8b 100644 --- a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.symbols +++ b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/overloadResolutionOverNonCTLambdas.ts] //// === overloadResolutionOverNonCTLambdas.ts === -module Bugs { +namespace Bugs { >Bugs : Symbol(Bugs, Decl(overloadResolutionOverNonCTLambdas.ts, 0, 0)) class A { ->A : Symbol(A, Decl(overloadResolutionOverNonCTLambdas.ts, 0, 13)) +>A : Symbol(A, Decl(overloadResolutionOverNonCTLambdas.ts, 0, 16)) } // replace(searchValue: RegExp, replaceValue: (substring: string, ...args: any[]) => string): string; diff --git a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types index 1543da64f1476..553ac8a101e97 100644 --- a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types +++ b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/overloadResolutionOverNonCTLambdas.ts] //// === overloadResolutionOverNonCTLambdas.ts === -module Bugs { +namespace Bugs { >Bugs : typeof Bugs > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.js b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.js index 25ba0e2502f8e..2afecc89ef3ac 100644 --- a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.js +++ b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/overloadResolutionOverNonCTObjectLit.ts] //// //// [overloadResolutionOverNonCTObjectLit.ts] -module Bugs { +namespace Bugs { export interface IToken { startIndex:number; type:string; diff --git a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.symbols b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.symbols index fe98bd4f9b9ef..8d270c8ec1396 100644 --- a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.symbols +++ b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/overloadResolutionOverNonCTObjectLit.ts] //// === overloadResolutionOverNonCTObjectLit.ts === -module Bugs { +namespace Bugs { >Bugs : Symbol(Bugs, Decl(overloadResolutionOverNonCTObjectLit.ts, 0, 0)) export interface IToken { ->IToken : Symbol(IToken, Decl(overloadResolutionOverNonCTObjectLit.ts, 0, 13)) +>IToken : Symbol(IToken, Decl(overloadResolutionOverNonCTObjectLit.ts, 0, 16)) startIndex:number; >startIndex : Symbol(IToken.startIndex, Decl(overloadResolutionOverNonCTObjectLit.ts, 1, 41)) @@ -23,7 +23,7 @@ module Bugs { export interface IStateToken extends IToken { >IStateToken : Symbol(IStateToken, Decl(overloadResolutionOverNonCTObjectLit.ts, 8, 17)) ->IToken : Symbol(IToken, Decl(overloadResolutionOverNonCTObjectLit.ts, 0, 13)) +>IToken : Symbol(IToken, Decl(overloadResolutionOverNonCTObjectLit.ts, 0, 16)) state: IState; >state : Symbol(IStateToken.state, Decl(overloadResolutionOverNonCTObjectLit.ts, 10, 61)) @@ -38,7 +38,7 @@ module Bugs { var tokens:IToken[]= []; >tokens : Symbol(tokens, Decl(overloadResolutionOverNonCTObjectLit.ts, 16, 35)) ->IToken : Symbol(IToken, Decl(overloadResolutionOverNonCTObjectLit.ts, 0, 13)) +>IToken : Symbol(IToken, Decl(overloadResolutionOverNonCTObjectLit.ts, 0, 16)) tokens.push({ startIndex: 1, type: '', bracket: 3 }); >tokens.push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --)) @@ -52,7 +52,7 @@ module Bugs { >tokens.push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --)) >tokens : Symbol(tokens, Decl(overloadResolutionOverNonCTObjectLit.ts, 16, 35)) >push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --)) ->IToken : Symbol(IToken, Decl(overloadResolutionOverNonCTObjectLit.ts, 0, 13)) +>IToken : Symbol(IToken, Decl(overloadResolutionOverNonCTObjectLit.ts, 0, 16)) >startIndex : Symbol(startIndex, Decl(overloadResolutionOverNonCTObjectLit.ts, 18, 54)) >type : Symbol(type, Decl(overloadResolutionOverNonCTObjectLit.ts, 18, 69)) >bracket : Symbol(bracket, Decl(overloadResolutionOverNonCTObjectLit.ts, 18, 79)) diff --git a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types index 70f803ce6b125..72dc06823c499 100644 --- a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types +++ b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/overloadResolutionOverNonCTObjectLit.ts] //// === overloadResolutionOverNonCTObjectLit.ts === -module Bugs { +namespace Bugs { >Bugs : typeof Bugs > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.errors.txt b/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.errors.txt index 17a0a2a27f781..8e85138f573b8 100644 --- a/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.errors.txt +++ b/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.errors.txt @@ -2,12 +2,12 @@ overloadsInDifferentContainersDisagreeOnAmbient.ts(7,21): error TS2384: Overload ==== overloadsInDifferentContainersDisagreeOnAmbient.ts (1 errors) ==== - declare module M { + declare namespace M { // Error because body is not ambient and this overload is export function f(); } - module M { + namespace M { export function f() { } ~ !!! error TS2384: Overload signatures must all be ambient or non-ambient. diff --git a/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.js b/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.js index 2e29d0cdb14ff..bea304463ad93 100644 --- a/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.js +++ b/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.js @@ -1,12 +1,12 @@ //// [tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts] //// //// [overloadsInDifferentContainersDisagreeOnAmbient.ts] -declare module M { +declare namespace M { // Error because body is not ambient and this overload is export function f(); } -module M { +namespace M { export function f() { } } diff --git a/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.symbols b/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.symbols index 002771061b657..5e41c49a6f930 100644 --- a/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.symbols +++ b/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.symbols @@ -1,17 +1,17 @@ //// [tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts] //// === overloadsInDifferentContainersDisagreeOnAmbient.ts === -declare module M { +declare namespace M { >M : Symbol(M, Decl(overloadsInDifferentContainersDisagreeOnAmbient.ts, 0, 0), Decl(overloadsInDifferentContainersDisagreeOnAmbient.ts, 3, 1)) // Error because body is not ambient and this overload is export function f(); ->f : Symbol(f, Decl(overloadsInDifferentContainersDisagreeOnAmbient.ts, 0, 18), Decl(overloadsInDifferentContainersDisagreeOnAmbient.ts, 5, 10)) +>f : Symbol(f, Decl(overloadsInDifferentContainersDisagreeOnAmbient.ts, 0, 21), Decl(overloadsInDifferentContainersDisagreeOnAmbient.ts, 5, 13)) } -module M { +namespace M { >M : Symbol(M, Decl(overloadsInDifferentContainersDisagreeOnAmbient.ts, 0, 0), Decl(overloadsInDifferentContainersDisagreeOnAmbient.ts, 3, 1)) export function f() { } ->f : Symbol(f, Decl(overloadsInDifferentContainersDisagreeOnAmbient.ts, 0, 18), Decl(overloadsInDifferentContainersDisagreeOnAmbient.ts, 5, 10)) +>f : Symbol(f, Decl(overloadsInDifferentContainersDisagreeOnAmbient.ts, 0, 21), Decl(overloadsInDifferentContainersDisagreeOnAmbient.ts, 5, 13)) } diff --git a/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.types b/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.types index 74514b30ee736..d64e9d718c458 100644 --- a/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.types +++ b/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts] //// === overloadsInDifferentContainersDisagreeOnAmbient.ts === -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ @@ -11,7 +11,7 @@ declare module M { > : ^^^^^^^^^^^^^^^^^^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/parameterPropertyInConstructor1.errors.txt b/tests/baselines/reference/parameterPropertyInConstructor1.errors.txt index 07b25b5ac150f..2e1f84f22b278 100644 --- a/tests/baselines/reference/parameterPropertyInConstructor1.errors.txt +++ b/tests/baselines/reference/parameterPropertyInConstructor1.errors.txt @@ -2,7 +2,7 @@ parameterPropertyInConstructor1.ts(3,17): error TS2369: A parameter property is ==== parameterPropertyInConstructor1.ts (1 errors) ==== - declare module mod { + declare namespace mod { class Customers { constructor(public names: string); ~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/baselines/reference/parameterPropertyInConstructor1.js b/tests/baselines/reference/parameterPropertyInConstructor1.js index e75c90a4e6ab7..de8a0c8639319 100644 --- a/tests/baselines/reference/parameterPropertyInConstructor1.js +++ b/tests/baselines/reference/parameterPropertyInConstructor1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/parameterPropertyInConstructor1.ts] //// //// [parameterPropertyInConstructor1.ts] -declare module mod { +declare namespace mod { class Customers { constructor(public names: string); } diff --git a/tests/baselines/reference/parameterPropertyInConstructor1.symbols b/tests/baselines/reference/parameterPropertyInConstructor1.symbols index 1c71d50ae64c3..bd1c02c467ffc 100644 --- a/tests/baselines/reference/parameterPropertyInConstructor1.symbols +++ b/tests/baselines/reference/parameterPropertyInConstructor1.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/parameterPropertyInConstructor1.ts] //// === parameterPropertyInConstructor1.ts === -declare module mod { +declare namespace mod { >mod : Symbol(mod, Decl(parameterPropertyInConstructor1.ts, 0, 0)) class Customers { ->Customers : Symbol(Customers, Decl(parameterPropertyInConstructor1.ts, 0, 20)) +>Customers : Symbol(Customers, Decl(parameterPropertyInConstructor1.ts, 0, 23)) constructor(public names: string); >names : Symbol(Customers.names, Decl(parameterPropertyInConstructor1.ts, 2, 16)) diff --git a/tests/baselines/reference/parameterPropertyInConstructor1.types b/tests/baselines/reference/parameterPropertyInConstructor1.types index a2ab708cdcbb4..50b4b49487b56 100644 --- a/tests/baselines/reference/parameterPropertyInConstructor1.types +++ b/tests/baselines/reference/parameterPropertyInConstructor1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/parameterPropertyInConstructor1.ts] //// === parameterPropertyInConstructor1.ts === -declare module mod { +declare namespace mod { >mod : typeof mod > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/parameterPropertyInConstructor2.errors.txt b/tests/baselines/reference/parameterPropertyInConstructor2.errors.txt index 4bfba6c77cd0d..44bfa879e0028 100644 --- a/tests/baselines/reference/parameterPropertyInConstructor2.errors.txt +++ b/tests/baselines/reference/parameterPropertyInConstructor2.errors.txt @@ -4,7 +4,7 @@ parameterPropertyInConstructor2.ts(4,24): error TS2300: Duplicate identifier 'na ==== parameterPropertyInConstructor2.ts (3 errors) ==== - module mod { + namespace mod { class Customers { constructor(public names: string); ~~~~~~~~~~~ diff --git a/tests/baselines/reference/parameterPropertyInConstructor2.js b/tests/baselines/reference/parameterPropertyInConstructor2.js index 0b2325ea2b07c..66029494de1d1 100644 --- a/tests/baselines/reference/parameterPropertyInConstructor2.js +++ b/tests/baselines/reference/parameterPropertyInConstructor2.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/parameterPropertyInConstructor2.ts] //// //// [parameterPropertyInConstructor2.ts] -module mod { +namespace mod { class Customers { constructor(public names: string); constructor(public names: string, public ages: number) { diff --git a/tests/baselines/reference/parameterPropertyInConstructor2.symbols b/tests/baselines/reference/parameterPropertyInConstructor2.symbols index abcabe088cec1..a55cb96fb8cec 100644 --- a/tests/baselines/reference/parameterPropertyInConstructor2.symbols +++ b/tests/baselines/reference/parameterPropertyInConstructor2.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/parameterPropertyInConstructor2.ts] //// === parameterPropertyInConstructor2.ts === -module mod { +namespace mod { >mod : Symbol(mod, Decl(parameterPropertyInConstructor2.ts, 0, 0)) class Customers { ->Customers : Symbol(Customers, Decl(parameterPropertyInConstructor2.ts, 0, 12)) +>Customers : Symbol(Customers, Decl(parameterPropertyInConstructor2.ts, 0, 15)) constructor(public names: string); >names : Symbol(Customers.names, Decl(parameterPropertyInConstructor2.ts, 2, 16), Decl(parameterPropertyInConstructor2.ts, 3, 16)) diff --git a/tests/baselines/reference/parameterPropertyInConstructor2.types b/tests/baselines/reference/parameterPropertyInConstructor2.types index e95ddeefac69d..660dfdc1323b3 100644 --- a/tests/baselines/reference/parameterPropertyInConstructor2.types +++ b/tests/baselines/reference/parameterPropertyInConstructor2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/parameterPropertyInConstructor2.ts] //// === parameterPropertyInConstructor2.ts === -module mod { +namespace mod { >mod : typeof mod > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/parser509618.errors.txt b/tests/baselines/reference/parser509618.errors.txt index c9d41143d4738..c7688c3d07b3d 100644 --- a/tests/baselines/reference/parser509618.errors.txt +++ b/tests/baselines/reference/parser509618.errors.txt @@ -2,7 +2,7 @@ parser509618.ts(2,20): error TS1036: Statements are not allowed in ambient conte ==== parser509618.ts (1 errors) ==== - declare module ambiModule { + declare namespace ambiModule { interface i1 { }; ~ !!! error TS1036: Statements are not allowed in ambient contexts. diff --git a/tests/baselines/reference/parser509618.js b/tests/baselines/reference/parser509618.js index 28221fd8b2fed..47ffbe70890de 100644 --- a/tests/baselines/reference/parser509618.js +++ b/tests/baselines/reference/parser509618.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509618.ts] //// //// [parser509618.ts] -declare module ambiModule { +declare namespace ambiModule { interface i1 { }; } diff --git a/tests/baselines/reference/parser509618.symbols b/tests/baselines/reference/parser509618.symbols index e91096e845bcd..d0797a7b30cf2 100644 --- a/tests/baselines/reference/parser509618.symbols +++ b/tests/baselines/reference/parser509618.symbols @@ -1,10 +1,10 @@ //// [tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509618.ts] //// === parser509618.ts === -declare module ambiModule { +declare namespace ambiModule { >ambiModule : Symbol(ambiModule, Decl(parser509618.ts, 0, 0)) interface i1 { }; ->i1 : Symbol(i1, Decl(parser509618.ts, 0, 27)) +>i1 : Symbol(i1, Decl(parser509618.ts, 0, 30)) } diff --git a/tests/baselines/reference/parser509618.types b/tests/baselines/reference/parser509618.types index 04f57f123a1c3..1cd34b2d2a023 100644 --- a/tests/baselines/reference/parser509618.types +++ b/tests/baselines/reference/parser509618.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509618.ts] //// === parser509618.ts === -declare module ambiModule { +declare namespace ambiModule { >ambiModule : typeof ambiModule > : ^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/parserClassDeclaration7.errors.txt b/tests/baselines/reference/parserClassDeclaration7.errors.txt index 482e70500840e..a16ba778d06b1 100644 --- a/tests/baselines/reference/parserClassDeclaration7.errors.txt +++ b/tests/baselines/reference/parserClassDeclaration7.errors.txt @@ -2,7 +2,7 @@ parserClassDeclaration7.ts(2,3): error TS1038: A 'declare' modifier cannot be us ==== parserClassDeclaration7.ts (1 errors) ==== - declare module M { + declare namespace M { declare class C { ~~~~~~~ !!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. diff --git a/tests/baselines/reference/parserClassDeclaration7.js b/tests/baselines/reference/parserClassDeclaration7.js index bc05947a5f1bb..d1ab6c615d8a6 100644 --- a/tests/baselines/reference/parserClassDeclaration7.js +++ b/tests/baselines/reference/parserClassDeclaration7.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration7.ts] //// //// [parserClassDeclaration7.ts] -declare module M { +declare namespace M { declare class C { } } diff --git a/tests/baselines/reference/parserClassDeclaration7.symbols b/tests/baselines/reference/parserClassDeclaration7.symbols index 9f64ca68376a1..4e341942d95d6 100644 --- a/tests/baselines/reference/parserClassDeclaration7.symbols +++ b/tests/baselines/reference/parserClassDeclaration7.symbols @@ -1,10 +1,10 @@ //// [tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration7.ts] //// === parserClassDeclaration7.ts === -declare module M { +declare namespace M { >M : Symbol(M, Decl(parserClassDeclaration7.ts, 0, 0)) declare class C { ->C : Symbol(C, Decl(parserClassDeclaration7.ts, 0, 18)) +>C : Symbol(C, Decl(parserClassDeclaration7.ts, 0, 21)) } } diff --git a/tests/baselines/reference/parserClassDeclaration7.types b/tests/baselines/reference/parserClassDeclaration7.types index 7c84fb301f4ff..2ff8311782e30 100644 --- a/tests/baselines/reference/parserClassDeclaration7.types +++ b/tests/baselines/reference/parserClassDeclaration7.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration7.ts] //// === parserClassDeclaration7.ts === -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/parserEnumDeclaration2.errors.txt b/tests/baselines/reference/parserEnumDeclaration2.errors.txt index de0fdb0802b4f..b48f77d916c85 100644 --- a/tests/baselines/reference/parserEnumDeclaration2.errors.txt +++ b/tests/baselines/reference/parserEnumDeclaration2.errors.txt @@ -2,7 +2,7 @@ parserEnumDeclaration2.ts(2,3): error TS1038: A 'declare' modifier cannot be use ==== parserEnumDeclaration2.ts (1 errors) ==== - declare module M { + declare namespace M { declare enum E { ~~~~~~~ !!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. diff --git a/tests/baselines/reference/parserEnumDeclaration2.js b/tests/baselines/reference/parserEnumDeclaration2.js index ea37fc653bacd..cdd142febc222 100644 --- a/tests/baselines/reference/parserEnumDeclaration2.js +++ b/tests/baselines/reference/parserEnumDeclaration2.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration2.ts] //// //// [parserEnumDeclaration2.ts] -declare module M { +declare namespace M { declare enum E { } } diff --git a/tests/baselines/reference/parserEnumDeclaration2.symbols b/tests/baselines/reference/parserEnumDeclaration2.symbols index 6e4ed3b947e29..28933aa12c8d7 100644 --- a/tests/baselines/reference/parserEnumDeclaration2.symbols +++ b/tests/baselines/reference/parserEnumDeclaration2.symbols @@ -1,10 +1,10 @@ //// [tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration2.ts] //// === parserEnumDeclaration2.ts === -declare module M { +declare namespace M { >M : Symbol(M, Decl(parserEnumDeclaration2.ts, 0, 0)) declare enum E { ->E : Symbol(E, Decl(parserEnumDeclaration2.ts, 0, 18)) +>E : Symbol(E, Decl(parserEnumDeclaration2.ts, 0, 21)) } } diff --git a/tests/baselines/reference/parserEnumDeclaration2.types b/tests/baselines/reference/parserEnumDeclaration2.types index c6f602b866fbb..44c3e3ff00dfe 100644 --- a/tests/baselines/reference/parserEnumDeclaration2.types +++ b/tests/baselines/reference/parserEnumDeclaration2.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration2.ts] //// === parserEnumDeclaration2.ts === -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/parserErrantAccessibilityModifierInModule1.errors.txt b/tests/baselines/reference/parserErrantAccessibilityModifierInModule1.errors.txt index 815f05181903c..f042db4bb8a4a 100644 --- a/tests/baselines/reference/parserErrantAccessibilityModifierInModule1.errors.txt +++ b/tests/baselines/reference/parserErrantAccessibilityModifierInModule1.errors.txt @@ -4,7 +4,7 @@ parserErrantAccessibilityModifierInModule1.ts(4,18): error TS2304: Cannot find n ==== parserErrantAccessibilityModifierInModule1.ts (3 errors) ==== - module M { + namespace M { var x=10; // variable local to this module body private y=x; // property visible only in module ~~~~~~~ diff --git a/tests/baselines/reference/parserErrantAccessibilityModifierInModule1.js b/tests/baselines/reference/parserErrantAccessibilityModifierInModule1.js index dfabb80a733ad..4cca522b93ff3 100644 --- a/tests/baselines/reference/parserErrantAccessibilityModifierInModule1.js +++ b/tests/baselines/reference/parserErrantAccessibilityModifierInModule1.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantAccessibilityModifierInModule1.ts] //// //// [parserErrantAccessibilityModifierInModule1.ts] -module M { +namespace M { var x=10; // variable local to this module body private y=x; // property visible only in module export var z=y; // property visible to any code diff --git a/tests/baselines/reference/parserErrantAccessibilityModifierInModule1.symbols b/tests/baselines/reference/parserErrantAccessibilityModifierInModule1.symbols index d77fcdace2484..d7bbc60dab302 100644 --- a/tests/baselines/reference/parserErrantAccessibilityModifierInModule1.symbols +++ b/tests/baselines/reference/parserErrantAccessibilityModifierInModule1.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantAccessibilityModifierInModule1.ts] //// === parserErrantAccessibilityModifierInModule1.ts === -module M { +namespace M { >M : Symbol(M, Decl(parserErrantAccessibilityModifierInModule1.ts, 0, 0)) var x=10; // variable local to this module body diff --git a/tests/baselines/reference/parserErrantAccessibilityModifierInModule1.types b/tests/baselines/reference/parserErrantAccessibilityModifierInModule1.types index 8510a8ea4e164..1f43d3c15b166 100644 --- a/tests/baselines/reference/parserErrantAccessibilityModifierInModule1.types +++ b/tests/baselines/reference/parserErrantAccessibilityModifierInModule1.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantAccessibilityModifierInModule1.ts] //// === parserErrantAccessibilityModifierInModule1.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/parserErrorRecovery_ClassElement2.errors.txt b/tests/baselines/reference/parserErrorRecovery_ClassElement2.errors.txt index 8a2971e8af2d9..f8a2a789ffca5 100644 --- a/tests/baselines/reference/parserErrorRecovery_ClassElement2.errors.txt +++ b/tests/baselines/reference/parserErrorRecovery_ClassElement2.errors.txt @@ -2,7 +2,7 @@ parserErrorRecovery_ClassElement2.ts(4,3): error TS1068: Unexpected token. A con ==== parserErrorRecovery_ClassElement2.ts (1 errors) ==== - module M { + namespace M { class C { enum E { diff --git a/tests/baselines/reference/parserErrorRecovery_ClassElement2.js b/tests/baselines/reference/parserErrorRecovery_ClassElement2.js index 54b3ecd3e7780..96981ddb4e123 100644 --- a/tests/baselines/reference/parserErrorRecovery_ClassElement2.js +++ b/tests/baselines/reference/parserErrorRecovery_ClassElement2.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ClassElements/parserErrorRecovery_ClassElement2.ts] //// //// [parserErrorRecovery_ClassElement2.ts] -module M { +namespace M { class C { enum E { diff --git a/tests/baselines/reference/parserErrorRecovery_ClassElement2.symbols b/tests/baselines/reference/parserErrorRecovery_ClassElement2.symbols index a0cf21a7970b9..f442107cf23d5 100644 --- a/tests/baselines/reference/parserErrorRecovery_ClassElement2.symbols +++ b/tests/baselines/reference/parserErrorRecovery_ClassElement2.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ClassElements/parserErrorRecovery_ClassElement2.ts] //// === parserErrorRecovery_ClassElement2.ts === -module M { +namespace M { >M : Symbol(M, Decl(parserErrorRecovery_ClassElement2.ts, 0, 0)) class C { ->C : Symbol(C, Decl(parserErrorRecovery_ClassElement2.ts, 0, 10)) +>C : Symbol(C, Decl(parserErrorRecovery_ClassElement2.ts, 0, 13)) enum E { >E : Symbol(E, Decl(parserErrorRecovery_ClassElement2.ts, 1, 11)) diff --git a/tests/baselines/reference/parserErrorRecovery_ClassElement2.types b/tests/baselines/reference/parserErrorRecovery_ClassElement2.types index 209558d2b98a1..b8c65ebe2d378 100644 --- a/tests/baselines/reference/parserErrorRecovery_ClassElement2.types +++ b/tests/baselines/reference/parserErrorRecovery_ClassElement2.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ClassElements/parserErrorRecovery_ClassElement2.ts] //// === parserErrorRecovery_ClassElement2.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/parserErrorRecovery_ClassElement3.errors.txt b/tests/baselines/reference/parserErrorRecovery_ClassElement3.errors.txt index ef7a80f1ff4bd..d61c29b292429 100644 --- a/tests/baselines/reference/parserErrorRecovery_ClassElement3.errors.txt +++ b/tests/baselines/reference/parserErrorRecovery_ClassElement3.errors.txt @@ -5,7 +5,7 @@ parserErrorRecovery_ClassElement3.ts(7,5): error TS1005: '}' expected. ==== parserErrorRecovery_ClassElement3.ts (4 errors) ==== - module M { + namespace M { ¬ ~ !!! error TS1127: Invalid character. diff --git a/tests/baselines/reference/parserErrorRecovery_ClassElement3.js b/tests/baselines/reference/parserErrorRecovery_ClassElement3.js index 258d5527169ca..429f18eb9722d 100644 --- a/tests/baselines/reference/parserErrorRecovery_ClassElement3.js +++ b/tests/baselines/reference/parserErrorRecovery_ClassElement3.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ClassElements/parserErrorRecovery_ClassElement3.ts] //// //// [parserErrorRecovery_ClassElement3.ts] -module M { +namespace M { ¬ class C { } diff --git a/tests/baselines/reference/parserErrorRecovery_ClassElement3.symbols b/tests/baselines/reference/parserErrorRecovery_ClassElement3.symbols index 48e49ea3e299f..516824b3a6feb 100644 --- a/tests/baselines/reference/parserErrorRecovery_ClassElement3.symbols +++ b/tests/baselines/reference/parserErrorRecovery_ClassElement3.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ClassElements/parserErrorRecovery_ClassElement3.ts] //// === parserErrorRecovery_ClassElement3.ts === -module M { +namespace M { >M : Symbol(M, Decl(parserErrorRecovery_ClassElement3.ts, 0, 0)) ¬ diff --git a/tests/baselines/reference/parserErrorRecovery_ClassElement3.types b/tests/baselines/reference/parserErrorRecovery_ClassElement3.types index 486fad1020158..61ed0f61b0bf2 100644 --- a/tests/baselines/reference/parserErrorRecovery_ClassElement3.types +++ b/tests/baselines/reference/parserErrorRecovery_ClassElement3.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ClassElements/parserErrorRecovery_ClassElement3.ts] //// === parserErrorRecovery_ClassElement3.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js index 32401a6192782..29b6d2e95bc97 100644 --- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js +++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js @@ -7,7 +7,7 @@ interface IPoint { } // Module -module Shapes { +namespace Shapes { // Class export class Point implements IPoint { diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.symbols b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.symbols index e5dd8470fa9c2..262131f9e8b3d 100644 --- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.symbols +++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.symbols @@ -10,12 +10,12 @@ interface IPoint { } // Module -module Shapes { +namespace Shapes { >Shapes : Symbol(Shapes, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 3, 1)) // Class export class Point implements IPoint { ->Point : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15)) +>Point : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 18)) >IPoint : Symbol(IPoint, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 0, 0)) public con: "hello"; @@ -33,22 +33,22 @@ module Shapes { >Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >sqrt : Symbol(Math.sqrt, Decl(lib.es5.d.ts, --, --)) >this.x : Symbol(Point.x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21)) ->this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15)) +>this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 18)) >x : Symbol(Point.x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21)) >this.x : Symbol(Point.x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21)) ->this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15)) +>this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 18)) >x : Symbol(Point.x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21)) >this.y : Symbol(Point.y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38)) ->this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15)) +>this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 18)) >y : Symbol(Point.y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38)) >this.y : Symbol(Point.y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38)) ->this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15)) +>this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 18)) >y : Symbol(Point.y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38)) // Static member static origin = new Point(0, 0); >origin : Symbol(Point.origin, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 16, 74)) ->Point : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15)) +>Point : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 18)) } } @@ -57,9 +57,9 @@ module Shapes { var p: IPoint = new Shapes.Point(3, 4); >p : Symbol(p, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 25, 3)) >IPoint : Symbol(IPoint, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 0, 0)) ->Shapes.Point : Symbol(Shapes.Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15)) +>Shapes.Point : Symbol(Shapes.Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 18)) >Shapes : Symbol(Shapes, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 3, 1)) ->Point : Symbol(Shapes.Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15)) +>Point : Symbol(Shapes.Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 18)) var dist = p.getDist(); >dist : Symbol(dist, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 26, 3)) diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types index 3450d8be6e31b..9afc53f33ff62 100644 --- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types +++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.types @@ -9,7 +9,7 @@ interface IPoint { } // Module -module Shapes { +namespace Shapes { >Shapes : typeof Shapes > : ^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.errors.txt b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.errors.txt index 0156814f35b72..947c7ee7aaa5e 100644 --- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.errors.txt +++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.errors.txt @@ -9,7 +9,7 @@ parserErrorRecovery_IncompleteMemberVariable2.ts(12,22): error TS1442: Expected } // Module - module Shapes { + namespace Shapes { // Class export class Point implements IPoint { diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js index 1737dd6bfea8c..6a3a02d2341f2 100644 --- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js +++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js @@ -7,7 +7,7 @@ interface IPoint { } // Module -module Shapes { +namespace Shapes { // Class export class Point implements IPoint { diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.symbols b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.symbols index 5e1bec210004a..c92cd18e94eab 100644 --- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.symbols +++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.symbols @@ -10,12 +10,12 @@ interface IPoint { } // Module -module Shapes { +namespace Shapes { >Shapes : Symbol(Shapes, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 3, 1)) // Class export class Point implements IPoint { ->Point : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 6, 15)) +>Point : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 6, 18)) >IPoint : Symbol(IPoint, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 0, 0)) public con:C "hello"; @@ -35,22 +35,22 @@ module Shapes { >Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >sqrt : Symbol(Math.sqrt, Decl(lib.es5.d.ts, --, --)) >this.x : Symbol(Point.x, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 13, 21)) ->this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 6, 15)) +>this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 6, 18)) >x : Symbol(Point.x, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 13, 21)) >this.x : Symbol(Point.x, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 13, 21)) ->this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 6, 15)) +>this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 6, 18)) >x : Symbol(Point.x, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 13, 21)) >this.y : Symbol(Point.y, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 13, 38)) ->this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 6, 15)) +>this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 6, 18)) >y : Symbol(Point.y, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 13, 38)) >this.y : Symbol(Point.y, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 13, 38)) ->this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 6, 15)) +>this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 6, 18)) >y : Symbol(Point.y, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 13, 38)) // Static member static origin = new Point(0, 0); >origin : Symbol(Point.origin, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 16, 74)) ->Point : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 6, 15)) +>Point : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 6, 18)) } } @@ -59,9 +59,9 @@ module Shapes { var p: IPoint = new Shapes.Point(3, 4); >p : Symbol(p, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 25, 3)) >IPoint : Symbol(IPoint, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 0, 0)) ->Shapes.Point : Symbol(Shapes.Point, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 6, 15)) +>Shapes.Point : Symbol(Shapes.Point, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 6, 18)) >Shapes : Symbol(Shapes, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 3, 1)) ->Point : Symbol(Shapes.Point, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 6, 15)) +>Point : Symbol(Shapes.Point, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 6, 18)) var dist = p.getDist(); >dist : Symbol(dist, Decl(parserErrorRecovery_IncompleteMemberVariable2.ts, 26, 3)) diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.types b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.types index 615d9357f26ea..b024f8eb33e30 100644 --- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.types +++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.types @@ -9,7 +9,7 @@ interface IPoint { } // Module -module Shapes { +namespace Shapes { >Shapes : typeof Shapes > : ^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/parserExportAssignment5.errors.txt b/tests/baselines/reference/parserExportAssignment5.errors.txt index 861eba34262c5..84fc190425594 100644 --- a/tests/baselines/reference/parserExportAssignment5.errors.txt +++ b/tests/baselines/reference/parserExportAssignment5.errors.txt @@ -2,7 +2,7 @@ parserExportAssignment5.ts(2,5): error TS1063: An export assignment cannot be us ==== parserExportAssignment5.ts (1 errors) ==== - module M { + namespace M { export = A; ~~~~~~~~~~~ !!! error TS1063: An export assignment cannot be used in a namespace. diff --git a/tests/baselines/reference/parserExportAssignment5.js b/tests/baselines/reference/parserExportAssignment5.js index 86c7a9b6af984..753795051521f 100644 --- a/tests/baselines/reference/parserExportAssignment5.js +++ b/tests/baselines/reference/parserExportAssignment5.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment5.ts] //// //// [parserExportAssignment5.ts] -module M { +namespace M { export = A; } diff --git a/tests/baselines/reference/parserExportAssignment5.symbols b/tests/baselines/reference/parserExportAssignment5.symbols index 46d533a919d41..ac43a0fd2b16e 100644 --- a/tests/baselines/reference/parserExportAssignment5.symbols +++ b/tests/baselines/reference/parserExportAssignment5.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment5.ts] //// === parserExportAssignment5.ts === -module M { +namespace M { >M : Symbol(M, Decl(parserExportAssignment5.ts, 0, 0)) export = A; diff --git a/tests/baselines/reference/parserExportAssignment5.types b/tests/baselines/reference/parserExportAssignment5.types index 02d6603c3324f..739ed5d5a53f0 100644 --- a/tests/baselines/reference/parserExportAssignment5.types +++ b/tests/baselines/reference/parserExportAssignment5.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment5.ts] //// === parserExportAssignment5.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/parserExportAssignment9.errors.txt b/tests/baselines/reference/parserExportAssignment9.errors.txt index 55a5a4e95bdbc..67949c07edb58 100644 --- a/tests/baselines/reference/parserExportAssignment9.errors.txt +++ b/tests/baselines/reference/parserExportAssignment9.errors.txt @@ -9,7 +9,7 @@ parserExportAssignment9.ts(6,3): error TS1319: A default export can only be used !!! error TS1319: A default export can only be used in an ECMAScript-style module. } - module Bar { + namespace Bar { export default bar; ~~~~~~~~~~~~~~~~~~~ !!! error TS1319: A default export can only be used in an ECMAScript-style module. diff --git a/tests/baselines/reference/parserExportAssignment9.js b/tests/baselines/reference/parserExportAssignment9.js index 76740fa6cbfd8..d17c1fd749959 100644 --- a/tests/baselines/reference/parserExportAssignment9.js +++ b/tests/baselines/reference/parserExportAssignment9.js @@ -5,7 +5,7 @@ namespace Foo { export default foo; } -module Bar { +namespace Bar { export default bar; } diff --git a/tests/baselines/reference/parserExportAssignment9.symbols b/tests/baselines/reference/parserExportAssignment9.symbols index f46832b87e338..325af21efd13d 100644 --- a/tests/baselines/reference/parserExportAssignment9.symbols +++ b/tests/baselines/reference/parserExportAssignment9.symbols @@ -7,7 +7,7 @@ namespace Foo { export default foo; } -module Bar { +namespace Bar { >Bar : Symbol(Bar, Decl(parserExportAssignment9.ts, 2, 1)) export default bar; diff --git a/tests/baselines/reference/parserExportAssignment9.types b/tests/baselines/reference/parserExportAssignment9.types index 4b9ab43638813..75673875d45e2 100644 --- a/tests/baselines/reference/parserExportAssignment9.types +++ b/tests/baselines/reference/parserExportAssignment9.types @@ -10,7 +10,7 @@ namespace Foo { > : ^^^ } -module Bar { +namespace Bar { >Bar : typeof Bar > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/parserFunctionDeclaration1.errors.txt b/tests/baselines/reference/parserFunctionDeclaration1.errors.txt index 0a60c8a717fe0..57f5488552576 100644 --- a/tests/baselines/reference/parserFunctionDeclaration1.errors.txt +++ b/tests/baselines/reference/parserFunctionDeclaration1.errors.txt @@ -2,7 +2,7 @@ parserFunctionDeclaration1.ts(2,3): error TS1038: A 'declare' modifier cannot be ==== parserFunctionDeclaration1.ts (1 errors) ==== - declare module M { + declare namespace M { declare function F(); ~~~~~~~ !!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. diff --git a/tests/baselines/reference/parserFunctionDeclaration1.js b/tests/baselines/reference/parserFunctionDeclaration1.js index 109f42ec3c898..d02dff13921f9 100644 --- a/tests/baselines/reference/parserFunctionDeclaration1.js +++ b/tests/baselines/reference/parserFunctionDeclaration1.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration1.ts] //// //// [parserFunctionDeclaration1.ts] -declare module M { +declare namespace M { declare function F(); } diff --git a/tests/baselines/reference/parserFunctionDeclaration1.symbols b/tests/baselines/reference/parserFunctionDeclaration1.symbols index 91ebcac97465d..922d8e0bcf293 100644 --- a/tests/baselines/reference/parserFunctionDeclaration1.symbols +++ b/tests/baselines/reference/parserFunctionDeclaration1.symbols @@ -1,9 +1,9 @@ //// [tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration1.ts] //// === parserFunctionDeclaration1.ts === -declare module M { +declare namespace M { >M : Symbol(M, Decl(parserFunctionDeclaration1.ts, 0, 0)) declare function F(); ->F : Symbol(F, Decl(parserFunctionDeclaration1.ts, 0, 18)) +>F : Symbol(F, Decl(parserFunctionDeclaration1.ts, 0, 21)) } diff --git a/tests/baselines/reference/parserFunctionDeclaration1.types b/tests/baselines/reference/parserFunctionDeclaration1.types index 3a7e076a2e871..609360e1aed5d 100644 --- a/tests/baselines/reference/parserFunctionDeclaration1.types +++ b/tests/baselines/reference/parserFunctionDeclaration1.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration1.ts] //// === parserFunctionDeclaration1.ts === -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/parserFunctionDeclaration7.errors.txt b/tests/baselines/reference/parserFunctionDeclaration7.errors.txt index 91b641b2774b4..13106cf165b46 100644 --- a/tests/baselines/reference/parserFunctionDeclaration7.errors.txt +++ b/tests/baselines/reference/parserFunctionDeclaration7.errors.txt @@ -2,7 +2,7 @@ parserFunctionDeclaration7.ts(2,13): error TS2391: Function implementation is mi ==== parserFunctionDeclaration7.ts (1 errors) ==== - module M { + namespace M { function foo(); ~~~ !!! error TS2391: Function implementation is missing or not immediately following the declaration. diff --git a/tests/baselines/reference/parserFunctionDeclaration7.js b/tests/baselines/reference/parserFunctionDeclaration7.js index 56208035d2b0a..0f47252c901ba 100644 --- a/tests/baselines/reference/parserFunctionDeclaration7.js +++ b/tests/baselines/reference/parserFunctionDeclaration7.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration7.ts] //// //// [parserFunctionDeclaration7.ts] -module M { +namespace M { function foo(); } diff --git a/tests/baselines/reference/parserFunctionDeclaration7.symbols b/tests/baselines/reference/parserFunctionDeclaration7.symbols index 3804938d6a65f..70aa132336c60 100644 --- a/tests/baselines/reference/parserFunctionDeclaration7.symbols +++ b/tests/baselines/reference/parserFunctionDeclaration7.symbols @@ -1,9 +1,9 @@ //// [tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration7.ts] //// === parserFunctionDeclaration7.ts === -module M { +namespace M { >M : Symbol(M, Decl(parserFunctionDeclaration7.ts, 0, 0)) function foo(); ->foo : Symbol(foo, Decl(parserFunctionDeclaration7.ts, 0, 10)) +>foo : Symbol(foo, Decl(parserFunctionDeclaration7.ts, 0, 13)) } diff --git a/tests/baselines/reference/parserFunctionDeclaration7.types b/tests/baselines/reference/parserFunctionDeclaration7.types index feb7cc25d52f9..5e8450717ea32 100644 --- a/tests/baselines/reference/parserFunctionDeclaration7.types +++ b/tests/baselines/reference/parserFunctionDeclaration7.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration7.ts] //// === parserFunctionDeclaration7.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/parserFunctionDeclaration8.js b/tests/baselines/reference/parserFunctionDeclaration8.js index cb231ed7a0ff1..7ade091a044f4 100644 --- a/tests/baselines/reference/parserFunctionDeclaration8.js +++ b/tests/baselines/reference/parserFunctionDeclaration8.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration8.ts] //// //// [parserFunctionDeclaration8.ts] -declare module M { +declare namespace M { function foo(); } diff --git a/tests/baselines/reference/parserFunctionDeclaration8.symbols b/tests/baselines/reference/parserFunctionDeclaration8.symbols index 795999a98ba56..3c761f524f04b 100644 --- a/tests/baselines/reference/parserFunctionDeclaration8.symbols +++ b/tests/baselines/reference/parserFunctionDeclaration8.symbols @@ -1,9 +1,9 @@ //// [tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration8.ts] //// === parserFunctionDeclaration8.ts === -declare module M { +declare namespace M { >M : Symbol(M, Decl(parserFunctionDeclaration8.ts, 0, 0)) function foo(); ->foo : Symbol(foo, Decl(parserFunctionDeclaration8.ts, 0, 18)) +>foo : Symbol(foo, Decl(parserFunctionDeclaration8.ts, 0, 21)) } diff --git a/tests/baselines/reference/parserFunctionDeclaration8.types b/tests/baselines/reference/parserFunctionDeclaration8.types index 0cb20360f1b22..84f75107ac701 100644 --- a/tests/baselines/reference/parserFunctionDeclaration8.types +++ b/tests/baselines/reference/parserFunctionDeclaration8.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration8.ts] //// === parserFunctionDeclaration8.ts === -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/parserModule1.js b/tests/baselines/reference/parserModule1.js index fd7c6cc291e87..b8d3d6537e4e1 100644 --- a/tests/baselines/reference/parserModule1.js +++ b/tests/baselines/reference/parserModule1.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModule1.ts] //// //// [parserModule1.ts] - export module CompilerDiagnostics { + export namespace CompilerDiagnostics { export var debug = false; export interface IDiagnosticWriter { Alert(output: string): void; diff --git a/tests/baselines/reference/parserModule1.symbols b/tests/baselines/reference/parserModule1.symbols index 3ef713901a30e..b4821ea34ca1f 100644 --- a/tests/baselines/reference/parserModule1.symbols +++ b/tests/baselines/reference/parserModule1.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModule1.ts] //// === parserModule1.ts === - export module CompilerDiagnostics { + export namespace CompilerDiagnostics { >CompilerDiagnostics : Symbol(CompilerDiagnostics, Decl(parserModule1.ts, 0, 0)) export var debug = false; diff --git a/tests/baselines/reference/parserModule1.types b/tests/baselines/reference/parserModule1.types index d4f0a3e9d931c..7502e98adf334 100644 --- a/tests/baselines/reference/parserModule1.types +++ b/tests/baselines/reference/parserModule1.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModule1.ts] //// === parserModule1.ts === - export module CompilerDiagnostics { + export namespace CompilerDiagnostics { >CompilerDiagnostics : typeof CompilerDiagnostics > : ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/parserModuleDeclaration11.js b/tests/baselines/reference/parserModuleDeclaration11.js index 25df121278399..8dcbdc0e85f42 100644 --- a/tests/baselines/reference/parserModuleDeclaration11.js +++ b/tests/baselines/reference/parserModuleDeclaration11.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration11.ts] //// //// [parserModuleDeclaration11.ts] -declare module string { +declare namespace string { interface X { } export function foo(s: string); } diff --git a/tests/baselines/reference/parserModuleDeclaration11.symbols b/tests/baselines/reference/parserModuleDeclaration11.symbols index 4f1791fade473..b6f65d2a66851 100644 --- a/tests/baselines/reference/parserModuleDeclaration11.symbols +++ b/tests/baselines/reference/parserModuleDeclaration11.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration11.ts] //// === parserModuleDeclaration11.ts === -declare module string { +declare namespace string { >string : Symbol(string, Decl(parserModuleDeclaration11.ts, 0, 0)) interface X { } ->X : Symbol(X, Decl(parserModuleDeclaration11.ts, 0, 23)) +>X : Symbol(X, Decl(parserModuleDeclaration11.ts, 0, 26)) export function foo(s: string); >foo : Symbol(foo, Decl(parserModuleDeclaration11.ts, 1, 19)) @@ -19,5 +19,5 @@ string.foo("abc"); var x: string.X; >x : Symbol(x, Decl(parserModuleDeclaration11.ts, 5, 3)) >string : Symbol(string, Decl(parserModuleDeclaration11.ts, 0, 0)) ->X : Symbol(string.X, Decl(parserModuleDeclaration11.ts, 0, 23)) +>X : Symbol(string.X, Decl(parserModuleDeclaration11.ts, 0, 26)) diff --git a/tests/baselines/reference/parserModuleDeclaration11.types b/tests/baselines/reference/parserModuleDeclaration11.types index b2f62f9dd5eaa..88d146971b150 100644 --- a/tests/baselines/reference/parserModuleDeclaration11.types +++ b/tests/baselines/reference/parserModuleDeclaration11.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration11.ts] //// === parserModuleDeclaration11.ts === -declare module string { +declare namespace string { >string : typeof string > : ^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/parserModuleDeclaration12.errors.txt b/tests/baselines/reference/parserModuleDeclaration12.errors.txt new file mode 100644 index 0000000000000..79743d1ddaca1 --- /dev/null +++ b/tests/baselines/reference/parserModuleDeclaration12.errors.txt @@ -0,0 +1,11 @@ +parserModuleDeclaration12.ts(1,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +parserModuleDeclaration12.ts(1,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== parserModuleDeclaration12.ts (2 errors) ==== + module A.string { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + } \ No newline at end of file diff --git a/tests/baselines/reference/parserModuleDeclaration2.d.errors.txt b/tests/baselines/reference/parserModuleDeclaration2.d.errors.txt index cfe9971abc6c1..b1ed8dde3ca7e 100644 --- a/tests/baselines/reference/parserModuleDeclaration2.d.errors.txt +++ b/tests/baselines/reference/parserModuleDeclaration2.d.errors.txt @@ -2,7 +2,7 @@ parserModuleDeclaration2.d.ts(1,1): error TS1046: Top-level declarations in .d.t ==== parserModuleDeclaration2.d.ts (1 errors) ==== - module M { - ~~~~~~ + namespace M { + ~~~~~~~~~ !!! error TS1046: Top-level declarations in .d.ts files must start with either a 'declare' or 'export' modifier. } \ No newline at end of file diff --git a/tests/baselines/reference/parserModuleDeclaration2.d.symbols b/tests/baselines/reference/parserModuleDeclaration2.d.symbols index 89773f6a84baf..80bcaed07194a 100644 --- a/tests/baselines/reference/parserModuleDeclaration2.d.symbols +++ b/tests/baselines/reference/parserModuleDeclaration2.d.symbols @@ -1,6 +1,6 @@ //// [tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration2.d.ts] //// === parserModuleDeclaration2.d.ts === -module M { +namespace M { >M : Symbol(M, Decl(parserModuleDeclaration2.d.ts, 0, 0)) } diff --git a/tests/baselines/reference/parserModuleDeclaration2.d.types b/tests/baselines/reference/parserModuleDeclaration2.d.types index 650e9ef33a478..aeb9b04a3e254 100644 --- a/tests/baselines/reference/parserModuleDeclaration2.d.types +++ b/tests/baselines/reference/parserModuleDeclaration2.d.types @@ -2,5 +2,5 @@ === parserModuleDeclaration2.d.ts === -module M { +namespace M { } diff --git a/tests/baselines/reference/parserModuleDeclaration3.d.symbols b/tests/baselines/reference/parserModuleDeclaration3.d.symbols index c371140b895f8..05bd8cf70bb1d 100644 --- a/tests/baselines/reference/parserModuleDeclaration3.d.symbols +++ b/tests/baselines/reference/parserModuleDeclaration3.d.symbols @@ -1,6 +1,6 @@ //// [tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.d.ts] //// === parserModuleDeclaration3.d.ts === -declare module M { +declare namespace M { >M : Symbol(M, Decl(parserModuleDeclaration3.d.ts, 0, 0)) } diff --git a/tests/baselines/reference/parserModuleDeclaration3.d.types b/tests/baselines/reference/parserModuleDeclaration3.d.types index 41d8821b09725..a4ea57e0b211a 100644 --- a/tests/baselines/reference/parserModuleDeclaration3.d.types +++ b/tests/baselines/reference/parserModuleDeclaration3.d.types @@ -2,5 +2,5 @@ === parserModuleDeclaration3.d.ts === -declare module M { +declare namespace M { } diff --git a/tests/baselines/reference/parserModuleDeclaration3.errors.txt b/tests/baselines/reference/parserModuleDeclaration3.errors.txt index e8ecb4cc7b801..41ec75df860c1 100644 --- a/tests/baselines/reference/parserModuleDeclaration3.errors.txt +++ b/tests/baselines/reference/parserModuleDeclaration3.errors.txt @@ -2,8 +2,8 @@ parserModuleDeclaration3.ts(2,3): error TS1038: A 'declare' modifier cannot be u ==== parserModuleDeclaration3.ts (1 errors) ==== - declare module M { - declare module M2 { + declare namespace M { + declare namespace M2 { ~~~~~~~ !!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. } diff --git a/tests/baselines/reference/parserModuleDeclaration3.js b/tests/baselines/reference/parserModuleDeclaration3.js index 444767e186e30..3c5c593e04bcb 100644 --- a/tests/baselines/reference/parserModuleDeclaration3.js +++ b/tests/baselines/reference/parserModuleDeclaration3.js @@ -1,8 +1,8 @@ //// [tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.ts] //// //// [parserModuleDeclaration3.ts] -declare module M { - declare module M2 { +declare namespace M { + declare namespace M2 { } } diff --git a/tests/baselines/reference/parserModuleDeclaration3.symbols b/tests/baselines/reference/parserModuleDeclaration3.symbols index 672594763ed57..6458a1fc982ff 100644 --- a/tests/baselines/reference/parserModuleDeclaration3.symbols +++ b/tests/baselines/reference/parserModuleDeclaration3.symbols @@ -1,10 +1,10 @@ //// [tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.ts] //// === parserModuleDeclaration3.ts === -declare module M { +declare namespace M { >M : Symbol(M, Decl(parserModuleDeclaration3.ts, 0, 0)) - declare module M2 { ->M2 : Symbol(M2, Decl(parserModuleDeclaration3.ts, 0, 18)) + declare namespace M2 { +>M2 : Symbol(M2, Decl(parserModuleDeclaration3.ts, 0, 21)) } } diff --git a/tests/baselines/reference/parserModuleDeclaration3.types b/tests/baselines/reference/parserModuleDeclaration3.types index a98093db9ed64..0f26e5c844b70 100644 --- a/tests/baselines/reference/parserModuleDeclaration3.types +++ b/tests/baselines/reference/parserModuleDeclaration3.types @@ -2,7 +2,7 @@ === parserModuleDeclaration3.ts === -declare module M { - declare module M2 { +declare namespace M { + declare namespace M2 { } } diff --git a/tests/baselines/reference/parserModuleDeclaration4.d.errors.txt b/tests/baselines/reference/parserModuleDeclaration4.d.errors.txt index cab9abc357d69..1bbe4075b10d0 100644 --- a/tests/baselines/reference/parserModuleDeclaration4.d.errors.txt +++ b/tests/baselines/reference/parserModuleDeclaration4.d.errors.txt @@ -3,10 +3,10 @@ parserModuleDeclaration4.d.ts(2,3): error TS1038: A 'declare' modifier cannot be ==== parserModuleDeclaration4.d.ts (2 errors) ==== - module M { - ~~~~~~ + namespace M { + ~~~~~~~~~ !!! error TS1046: Top-level declarations in .d.ts files must start with either a 'declare' or 'export' modifier. - declare module M1 { + declare namespace M1 { ~~~~~~~ !!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. } diff --git a/tests/baselines/reference/parserModuleDeclaration4.d.symbols b/tests/baselines/reference/parserModuleDeclaration4.d.symbols index cbfb51c20894f..9ad0a21f84280 100644 --- a/tests/baselines/reference/parserModuleDeclaration4.d.symbols +++ b/tests/baselines/reference/parserModuleDeclaration4.d.symbols @@ -1,10 +1,10 @@ //// [tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4.d.ts] //// === parserModuleDeclaration4.d.ts === -module M { +namespace M { >M : Symbol(M, Decl(parserModuleDeclaration4.d.ts, 0, 0)) - declare module M1 { ->M1 : Symbol(M1, Decl(parserModuleDeclaration4.d.ts, 0, 10)) + declare namespace M1 { +>M1 : Symbol(M1, Decl(parserModuleDeclaration4.d.ts, 0, 13)) } } diff --git a/tests/baselines/reference/parserModuleDeclaration4.d.types b/tests/baselines/reference/parserModuleDeclaration4.d.types index 80541fc1ba8af..7bc485b00f7d4 100644 --- a/tests/baselines/reference/parserModuleDeclaration4.d.types +++ b/tests/baselines/reference/parserModuleDeclaration4.d.types @@ -2,7 +2,7 @@ === parserModuleDeclaration4.d.ts === -module M { - declare module M1 { +namespace M { + declare namespace M1 { } } diff --git a/tests/baselines/reference/parserModuleDeclaration4.js b/tests/baselines/reference/parserModuleDeclaration4.js index 10a89a8e6f326..5ad0bc3008f51 100644 --- a/tests/baselines/reference/parserModuleDeclaration4.js +++ b/tests/baselines/reference/parserModuleDeclaration4.js @@ -1,9 +1,9 @@ //// [tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4.ts] //// //// [parserModuleDeclaration4.ts] -module M { - declare module M1 { - module M2 { +namespace M { + declare namespace M1 { + namespace M2 { } } } diff --git a/tests/baselines/reference/parserModuleDeclaration4.symbols b/tests/baselines/reference/parserModuleDeclaration4.symbols index 256231e600c24..564160eb1a8fb 100644 --- a/tests/baselines/reference/parserModuleDeclaration4.symbols +++ b/tests/baselines/reference/parserModuleDeclaration4.symbols @@ -1,14 +1,14 @@ //// [tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4.ts] //// === parserModuleDeclaration4.ts === -module M { +namespace M { >M : Symbol(M, Decl(parserModuleDeclaration4.ts, 0, 0)) - declare module M1 { ->M1 : Symbol(M1, Decl(parserModuleDeclaration4.ts, 0, 10)) + declare namespace M1 { +>M1 : Symbol(M1, Decl(parserModuleDeclaration4.ts, 0, 13)) - module M2 { ->M2 : Symbol(M2, Decl(parserModuleDeclaration4.ts, 1, 21)) + namespace M2 { +>M2 : Symbol(M2, Decl(parserModuleDeclaration4.ts, 1, 24)) } } } diff --git a/tests/baselines/reference/parserModuleDeclaration4.types b/tests/baselines/reference/parserModuleDeclaration4.types index 38159b4e3b9d1..9b32925b5bc93 100644 --- a/tests/baselines/reference/parserModuleDeclaration4.types +++ b/tests/baselines/reference/parserModuleDeclaration4.types @@ -2,9 +2,9 @@ === parserModuleDeclaration4.ts === -module M { - declare module M1 { - module M2 { +namespace M { + declare namespace M1 { + namespace M2 { } } } diff --git a/tests/baselines/reference/parserModuleDeclaration5.errors.txt b/tests/baselines/reference/parserModuleDeclaration5.errors.txt index 42fdd4795e59c..004e91228c69c 100644 --- a/tests/baselines/reference/parserModuleDeclaration5.errors.txt +++ b/tests/baselines/reference/parserModuleDeclaration5.errors.txt @@ -2,9 +2,9 @@ parserModuleDeclaration5.ts(3,5): error TS1038: A 'declare' modifier cannot be u ==== parserModuleDeclaration5.ts (1 errors) ==== - module M1 { - declare module M2 { - declare module M3 { + namespace M1 { + declare namespace M2 { + declare namespace M3 { ~~~~~~~ !!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. } diff --git a/tests/baselines/reference/parserModuleDeclaration5.js b/tests/baselines/reference/parserModuleDeclaration5.js index 171837618cc1a..b1c89a6e94c0b 100644 --- a/tests/baselines/reference/parserModuleDeclaration5.js +++ b/tests/baselines/reference/parserModuleDeclaration5.js @@ -1,9 +1,9 @@ //// [tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration5.ts] //// //// [parserModuleDeclaration5.ts] -module M1 { - declare module M2 { - declare module M3 { +namespace M1 { + declare namespace M2 { + declare namespace M3 { } } } diff --git a/tests/baselines/reference/parserModuleDeclaration5.symbols b/tests/baselines/reference/parserModuleDeclaration5.symbols index bda5a822e980c..f2248e0756420 100644 --- a/tests/baselines/reference/parserModuleDeclaration5.symbols +++ b/tests/baselines/reference/parserModuleDeclaration5.symbols @@ -1,14 +1,14 @@ //// [tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration5.ts] //// === parserModuleDeclaration5.ts === -module M1 { +namespace M1 { >M1 : Symbol(M1, Decl(parserModuleDeclaration5.ts, 0, 0)) - declare module M2 { ->M2 : Symbol(M2, Decl(parserModuleDeclaration5.ts, 0, 11)) + declare namespace M2 { +>M2 : Symbol(M2, Decl(parserModuleDeclaration5.ts, 0, 14)) - declare module M3 { ->M3 : Symbol(M3, Decl(parserModuleDeclaration5.ts, 1, 21)) + declare namespace M3 { +>M3 : Symbol(M3, Decl(parserModuleDeclaration5.ts, 1, 24)) } } } diff --git a/tests/baselines/reference/parserModuleDeclaration5.types b/tests/baselines/reference/parserModuleDeclaration5.types index af0672a5daf8e..187ec5179017b 100644 --- a/tests/baselines/reference/parserModuleDeclaration5.types +++ b/tests/baselines/reference/parserModuleDeclaration5.types @@ -2,9 +2,9 @@ === parserModuleDeclaration5.ts === -module M1 { - declare module M2 { - declare module M3 { +namespace M1 { + declare namespace M2 { + declare namespace M3 { } } } diff --git a/tests/baselines/reference/parserModuleDeclaration6.js b/tests/baselines/reference/parserModuleDeclaration6.js index e79bf3d527a9f..edec18ac47e91 100644 --- a/tests/baselines/reference/parserModuleDeclaration6.js +++ b/tests/baselines/reference/parserModuleDeclaration6.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration6.ts] //// //// [parserModuleDeclaration6.ts] -module number { +namespace number { } //// [parserModuleDeclaration6.js] diff --git a/tests/baselines/reference/parserModuleDeclaration6.symbols b/tests/baselines/reference/parserModuleDeclaration6.symbols index 596fc90df6c61..d1178aa7c29cd 100644 --- a/tests/baselines/reference/parserModuleDeclaration6.symbols +++ b/tests/baselines/reference/parserModuleDeclaration6.symbols @@ -1,6 +1,6 @@ //// [tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration6.ts] //// === parserModuleDeclaration6.ts === -module number { +namespace number { >number : Symbol(number, Decl(parserModuleDeclaration6.ts, 0, 0)) } diff --git a/tests/baselines/reference/parserModuleDeclaration6.types b/tests/baselines/reference/parserModuleDeclaration6.types index 1a9503f8fb8bb..b142dcefeacf4 100644 --- a/tests/baselines/reference/parserModuleDeclaration6.types +++ b/tests/baselines/reference/parserModuleDeclaration6.types @@ -2,5 +2,5 @@ === parserModuleDeclaration6.ts === -module number { +namespace number { } diff --git a/tests/baselines/reference/parserModuleDeclaration7.errors.txt b/tests/baselines/reference/parserModuleDeclaration7.errors.txt new file mode 100644 index 0000000000000..f14b59fb0609b --- /dev/null +++ b/tests/baselines/reference/parserModuleDeclaration7.errors.txt @@ -0,0 +1,11 @@ +parserModuleDeclaration7.ts(1,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +parserModuleDeclaration7.ts(1,15): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== parserModuleDeclaration7.ts (2 errors) ==== + module number.a { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + } \ No newline at end of file diff --git a/tests/baselines/reference/parserModuleDeclaration8.errors.txt b/tests/baselines/reference/parserModuleDeclaration8.errors.txt new file mode 100644 index 0000000000000..6d769b748c5a5 --- /dev/null +++ b/tests/baselines/reference/parserModuleDeclaration8.errors.txt @@ -0,0 +1,11 @@ +parserModuleDeclaration8.ts(1,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +parserModuleDeclaration8.ts(1,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== parserModuleDeclaration8.ts (2 errors) ==== + module a.number { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + } \ No newline at end of file diff --git a/tests/baselines/reference/parserModuleDeclaration9.errors.txt b/tests/baselines/reference/parserModuleDeclaration9.errors.txt new file mode 100644 index 0000000000000..9e62ddb4f0714 --- /dev/null +++ b/tests/baselines/reference/parserModuleDeclaration9.errors.txt @@ -0,0 +1,14 @@ +parserModuleDeclaration9.ts(1,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +parserModuleDeclaration9.ts(1,10): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +parserModuleDeclaration9.ts(1,17): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== parserModuleDeclaration9.ts (3 errors) ==== + module a.number.b { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + } \ No newline at end of file diff --git a/tests/baselines/reference/parserRealSource1.errors.txt b/tests/baselines/reference/parserRealSource1.errors.txt index e7d69ba104562..15a43786f7c12 100644 --- a/tests/baselines/reference/parserRealSource1.errors.txt +++ b/tests/baselines/reference/parserRealSource1.errors.txt @@ -9,8 +9,8 @@ parserRealSource1.ts(4,21): error TS6053: File 'typescript.ts' not found. ~~~~~~~~~~~~~ !!! error TS6053: File 'typescript.ts' not found. - module TypeScript { - export module CompilerDiagnostics { + namespace TypeScript { + export namespace CompilerDiagnostics { export var debug = false; export interface IDiagnosticWriter { Alert(output: string): void; diff --git a/tests/baselines/reference/parserRealSource1.js b/tests/baselines/reference/parserRealSource1.js index aebd1901c1910..7cc99562c974c 100644 --- a/tests/baselines/reference/parserRealSource1.js +++ b/tests/baselines/reference/parserRealSource1.js @@ -6,8 +6,8 @@ /// -module TypeScript { - export module CompilerDiagnostics { +namespace TypeScript { + export namespace CompilerDiagnostics { export var debug = false; export interface IDiagnosticWriter { Alert(output: string): void; diff --git a/tests/baselines/reference/parserRealSource1.symbols b/tests/baselines/reference/parserRealSource1.symbols index 5e8eb9e78536b..224464e9d4817 100644 --- a/tests/baselines/reference/parserRealSource1.symbols +++ b/tests/baselines/reference/parserRealSource1.symbols @@ -6,11 +6,11 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : Symbol(TypeScript, Decl(parserRealSource1.ts, 0, 0)) - export module CompilerDiagnostics { ->CompilerDiagnostics : Symbol(CompilerDiagnostics, Decl(parserRealSource1.ts, 5, 19)) + export namespace CompilerDiagnostics { +>CompilerDiagnostics : Symbol(CompilerDiagnostics, Decl(parserRealSource1.ts, 5, 22)) export var debug = false; >debug : Symbol(debug, Decl(parserRealSource1.ts, 7, 18)) diff --git a/tests/baselines/reference/parserRealSource1.types b/tests/baselines/reference/parserRealSource1.types index dd6543ab65839..94e968cda3977 100644 --- a/tests/baselines/reference/parserRealSource1.types +++ b/tests/baselines/reference/parserRealSource1.types @@ -6,11 +6,11 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ - export module CompilerDiagnostics { + export namespace CompilerDiagnostics { >CompilerDiagnostics : typeof CompilerDiagnostics > : ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/parserRealSource10.errors.txt b/tests/baselines/reference/parserRealSource10.errors.txt index e0e0ea045ae97..aaa25df2fab66 100644 --- a/tests/baselines/reference/parserRealSource10.errors.txt +++ b/tests/baselines/reference/parserRealSource10.errors.txt @@ -351,7 +351,7 @@ parserRealSource10.ts(449,41): error TS1011: An element access expression should ~~~~~~~~~~~~~ !!! error TS6053: File 'typescript.ts' not found. - module TypeScript { + namespace TypeScript { export enum TokenID { // Keywords Any, diff --git a/tests/baselines/reference/parserRealSource10.js b/tests/baselines/reference/parserRealSource10.js index 828e3bb1772f6..d00de70871183 100644 --- a/tests/baselines/reference/parserRealSource10.js +++ b/tests/baselines/reference/parserRealSource10.js @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { export enum TokenID { // Keywords Any, diff --git a/tests/baselines/reference/parserRealSource10.symbols b/tests/baselines/reference/parserRealSource10.symbols index 6368fd9b289b9..fc3f35d3565c9 100644 --- a/tests/baselines/reference/parserRealSource10.symbols +++ b/tests/baselines/reference/parserRealSource10.symbols @@ -6,11 +6,11 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : Symbol(TypeScript, Decl(parserRealSource10.ts, 0, 0)) export enum TokenID { ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) // Keywords Any, @@ -378,73 +378,73 @@ module TypeScript { noRegexTable[TokenID.Identifier] = true; >noRegexTable : Symbol(noRegexTable, Decl(parserRealSource10.ts, 129, 14)) >TokenID.Identifier : Symbol(TokenID.Identifier, Decl(parserRealSource10.ts, 114, 26)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Identifier : Symbol(TokenID.Identifier, Decl(parserRealSource10.ts, 114, 26)) noRegexTable[TokenID.StringLiteral] = true; >noRegexTable : Symbol(noRegexTable, Decl(parserRealSource10.ts, 129, 14)) >TokenID.StringLiteral : Symbol(TokenID.StringLiteral, Decl(parserRealSource10.ts, 115, 19)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >StringLiteral : Symbol(TokenID.StringLiteral, Decl(parserRealSource10.ts, 115, 19)) noRegexTable[TokenID.NumberLiteral] = true; >noRegexTable : Symbol(noRegexTable, Decl(parserRealSource10.ts, 129, 14)) >TokenID.NumberLiteral : Symbol(TokenID.NumberLiteral, Decl(parserRealSource10.ts, 117, 33)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >NumberLiteral : Symbol(TokenID.NumberLiteral, Decl(parserRealSource10.ts, 117, 33)) noRegexTable[TokenID.RegularExpressionLiteral] = true; >noRegexTable : Symbol(noRegexTable, Decl(parserRealSource10.ts, 129, 14)) >TokenID.RegularExpressionLiteral : Symbol(TokenID.RegularExpressionLiteral, Decl(parserRealSource10.ts, 116, 22)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >RegularExpressionLiteral : Symbol(TokenID.RegularExpressionLiteral, Decl(parserRealSource10.ts, 116, 22)) noRegexTable[TokenID.This] = true; >noRegexTable : Symbol(noRegexTable, Decl(parserRealSource10.ts, 129, 14)) >TokenID.This : Symbol(TokenID.This, Decl(parserRealSource10.ts, 51, 15)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >This : Symbol(TokenID.This, Decl(parserRealSource10.ts, 51, 15)) noRegexTable[TokenID.PlusPlus] = true; >noRegexTable : Symbol(noRegexTable, Decl(parserRealSource10.ts, 129, 14)) >TokenID.PlusPlus : Symbol(TokenID.PlusPlus, Decl(parserRealSource10.ts, 107, 20)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >PlusPlus : Symbol(TokenID.PlusPlus, Decl(parserRealSource10.ts, 107, 20)) noRegexTable[TokenID.MinusMinus] = true; >noRegexTable : Symbol(noRegexTable, Decl(parserRealSource10.ts, 129, 14)) >TokenID.MinusMinus : Symbol(TokenID.MinusMinus, Decl(parserRealSource10.ts, 108, 17)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >MinusMinus : Symbol(TokenID.MinusMinus, Decl(parserRealSource10.ts, 108, 17)) noRegexTable[TokenID.CloseParen] = true; >noRegexTable : Symbol(noRegexTable, Decl(parserRealSource10.ts, 129, 14)) >TokenID.CloseParen : Symbol(TokenID.CloseParen, Decl(parserRealSource10.ts, 64, 18)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >CloseParen : Symbol(TokenID.CloseParen, Decl(parserRealSource10.ts, 64, 18)) noRegexTable[TokenID.CloseBracket] = true; >noRegexTable : Symbol(noRegexTable, Decl(parserRealSource10.ts, 129, 14)) >TokenID.CloseBracket : Symbol(TokenID.CloseBracket, Decl(parserRealSource10.ts, 66, 20)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >CloseBracket : Symbol(TokenID.CloseBracket, Decl(parserRealSource10.ts, 66, 20)) noRegexTable[TokenID.CloseBrace] = true; >noRegexTable : Symbol(noRegexTable, Decl(parserRealSource10.ts, 129, 14)) >TokenID.CloseBrace : Symbol(TokenID.CloseBrace, Decl(parserRealSource10.ts, 68, 18)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >CloseBrace : Symbol(TokenID.CloseBrace, Decl(parserRealSource10.ts, 68, 18)) noRegexTable[TokenID.True] = true; >noRegexTable : Symbol(noRegexTable, Decl(parserRealSource10.ts, 129, 14)) >TokenID.True : Symbol(TokenID.True, Decl(parserRealSource10.ts, 53, 14)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >True : Symbol(TokenID.True, Decl(parserRealSource10.ts, 53, 14)) noRegexTable[TokenID.False] = true; >noRegexTable : Symbol(noRegexTable, Decl(parserRealSource10.ts, 129, 14)) >TokenID.False : Symbol(TokenID.False, Decl(parserRealSource10.ts, 24, 16)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >False : Symbol(TokenID.False, Decl(parserRealSource10.ts, 24, 16)) export enum OperatorPrecedence { @@ -538,7 +538,7 @@ module TypeScript { constructor (public tokenId: TokenID, public reservation: Reservation, >tokenId : Symbol(TokenInfo.tokenId, Decl(parserRealSource10.ts, 175, 21)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >reservation : Symbol(TokenInfo.reservation, Decl(parserRealSource10.ts, 175, 45)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -559,7 +559,7 @@ module TypeScript { function setTokenInfo(tokenId: TokenID, reservation: number, binopPrecedence: number, >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >tokenId : Symbol(tokenId, Decl(parserRealSource10.ts, 181, 26)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >reservation : Symbol(reservation, Decl(parserRealSource10.ts, 181, 43)) >binopPrecedence : Symbol(binopPrecedence, Decl(parserRealSource10.ts, 181, 64)) @@ -619,7 +619,7 @@ module TypeScript { setTokenInfo(TokenID.Any, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "any", ErrorRecoverySet.PrimType); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Any : Symbol(TokenID.Any, Decl(parserRealSource10.ts, 6, 25)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Any : Symbol(TokenID.Any, Decl(parserRealSource10.ts, 6, 25)) >Reservation.TypeScript : Symbol(Reservation.TypeScript, Decl(parserRealSource10.ts, 166, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -634,7 +634,7 @@ module TypeScript { setTokenInfo(TokenID.Bool, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "boolean", ErrorRecoverySet.PrimType); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Bool : Symbol(TokenID.Bool, Decl(parserRealSource10.ts, 8, 12)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Bool : Symbol(TokenID.Bool, Decl(parserRealSource10.ts, 8, 12)) >Reservation.TypeScript : Symbol(Reservation.TypeScript, Decl(parserRealSource10.ts, 166, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -649,7 +649,7 @@ module TypeScript { setTokenInfo(TokenID.Break, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "break", ErrorRecoverySet.Stmt); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Break : Symbol(TokenID.Break, Decl(parserRealSource10.ts, 9, 13)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Break : Symbol(TokenID.Break, Decl(parserRealSource10.ts, 9, 13)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -664,7 +664,7 @@ module TypeScript { setTokenInfo(TokenID.Case, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "case", ErrorRecoverySet.SCase); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Case : Symbol(TokenID.Case, Decl(parserRealSource10.ts, 10, 14)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Case : Symbol(TokenID.Case, Decl(parserRealSource10.ts, 10, 14)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -679,7 +679,7 @@ module TypeScript { setTokenInfo(TokenID.Catch, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "catch", ErrorRecoverySet.Catch); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Catch : Symbol(TokenID.Catch, Decl(parserRealSource10.ts, 11, 13)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Catch : Symbol(TokenID.Catch, Decl(parserRealSource10.ts, 11, 13)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -694,7 +694,7 @@ module TypeScript { setTokenInfo(TokenID.Class, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "class", ErrorRecoverySet.TypeScriptS); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Class : Symbol(TokenID.Class, Decl(parserRealSource10.ts, 12, 14)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Class : Symbol(TokenID.Class, Decl(parserRealSource10.ts, 12, 14)) >Reservation.TypeScriptAndJSFuture : Symbol(Reservation.TypeScriptAndJSFuture, Decl(parserRealSource10.ts, 169, 50)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -709,7 +709,7 @@ module TypeScript { setTokenInfo(TokenID.Const, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "const", ErrorRecoverySet.Var); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Const : Symbol(TokenID.Const, Decl(parserRealSource10.ts, 13, 14)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Const : Symbol(TokenID.Const, Decl(parserRealSource10.ts, 13, 14)) >Reservation.TypeScriptAndJSFuture : Symbol(Reservation.TypeScriptAndJSFuture, Decl(parserRealSource10.ts, 169, 50)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -724,7 +724,7 @@ module TypeScript { setTokenInfo(TokenID.Continue, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "continue", ErrorRecoverySet.Stmt); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Continue : Symbol(TokenID.Continue, Decl(parserRealSource10.ts, 14, 14)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Continue : Symbol(TokenID.Continue, Decl(parserRealSource10.ts, 14, 14)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -739,7 +739,7 @@ module TypeScript { setTokenInfo(TokenID.Debugger, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.Debugger, "debugger", ErrorRecoverySet.Stmt); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Debugger : Symbol(TokenID.Debugger, Decl(parserRealSource10.ts, 15, 17)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Debugger : Symbol(TokenID.Debugger, Decl(parserRealSource10.ts, 15, 17)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -754,7 +754,7 @@ module TypeScript { setTokenInfo(TokenID.Default, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "default", ErrorRecoverySet.SCase); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Default : Symbol(TokenID.Default, Decl(parserRealSource10.ts, 16, 17)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Default : Symbol(TokenID.Default, Decl(parserRealSource10.ts, 16, 17)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -769,7 +769,7 @@ module TypeScript { setTokenInfo(TokenID.Delete, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.Delete, "delete", ErrorRecoverySet.Prefix); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Delete : Symbol(TokenID.Delete, Decl(parserRealSource10.ts, 17, 16)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Delete : Symbol(TokenID.Delete, Decl(parserRealSource10.ts, 17, 16)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -784,7 +784,7 @@ module TypeScript { setTokenInfo(TokenID.Do, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "do", ErrorRecoverySet.Stmt); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Do : Symbol(TokenID.Do, Decl(parserRealSource10.ts, 18, 15)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Do : Symbol(TokenID.Do, Decl(parserRealSource10.ts, 18, 15)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -799,7 +799,7 @@ module TypeScript { setTokenInfo(TokenID.Else, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "else", ErrorRecoverySet.Else); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Else : Symbol(TokenID.Else, Decl(parserRealSource10.ts, 19, 11)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Else : Symbol(TokenID.Else, Decl(parserRealSource10.ts, 19, 11)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -814,7 +814,7 @@ module TypeScript { setTokenInfo(TokenID.Enum, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "enum", ErrorRecoverySet.TypeScriptS); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Enum : Symbol(TokenID.Enum, Decl(parserRealSource10.ts, 20, 13)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Enum : Symbol(TokenID.Enum, Decl(parserRealSource10.ts, 20, 13)) >Reservation.TypeScriptAndJSFuture : Symbol(Reservation.TypeScriptAndJSFuture, Decl(parserRealSource10.ts, 169, 50)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -829,7 +829,7 @@ module TypeScript { setTokenInfo(TokenID.Export, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "export", ErrorRecoverySet.TypeScriptS); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Export : Symbol(TokenID.Export, Decl(parserRealSource10.ts, 21, 13)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Export : Symbol(TokenID.Export, Decl(parserRealSource10.ts, 21, 13)) >Reservation.TypeScriptAndJSFuture : Symbol(Reservation.TypeScriptAndJSFuture, Decl(parserRealSource10.ts, 169, 50)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -844,7 +844,7 @@ module TypeScript { setTokenInfo(TokenID.Extends, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "extends", ErrorRecoverySet.None); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Extends : Symbol(TokenID.Extends, Decl(parserRealSource10.ts, 22, 15)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Extends : Symbol(TokenID.Extends, Decl(parserRealSource10.ts, 22, 15)) >Reservation.TypeScriptAndJSFuture : Symbol(Reservation.TypeScriptAndJSFuture, Decl(parserRealSource10.ts, 169, 50)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -859,7 +859,7 @@ module TypeScript { setTokenInfo(TokenID.Declare, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "declare", ErrorRecoverySet.Stmt); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Declare : Symbol(TokenID.Declare, Decl(parserRealSource10.ts, 23, 16)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Declare : Symbol(TokenID.Declare, Decl(parserRealSource10.ts, 23, 16)) >Reservation.TypeScript : Symbol(Reservation.TypeScript, Decl(parserRealSource10.ts, 166, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -874,7 +874,7 @@ module TypeScript { setTokenInfo(TokenID.False, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "false", ErrorRecoverySet.RLit); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.False : Symbol(TokenID.False, Decl(parserRealSource10.ts, 24, 16)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >False : Symbol(TokenID.False, Decl(parserRealSource10.ts, 24, 16)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -889,7 +889,7 @@ module TypeScript { setTokenInfo(TokenID.Finally, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "finally", ErrorRecoverySet.Catch); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Finally : Symbol(TokenID.Finally, Decl(parserRealSource10.ts, 25, 14)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Finally : Symbol(TokenID.Finally, Decl(parserRealSource10.ts, 25, 14)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -904,7 +904,7 @@ module TypeScript { setTokenInfo(TokenID.For, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "for", ErrorRecoverySet.Stmt); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.For : Symbol(TokenID.For, Decl(parserRealSource10.ts, 26, 16)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >For : Symbol(TokenID.For, Decl(parserRealSource10.ts, 26, 16)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -919,7 +919,7 @@ module TypeScript { setTokenInfo(TokenID.Function, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "function", ErrorRecoverySet.Func); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Function : Symbol(TokenID.Function, Decl(parserRealSource10.ts, 27, 12)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Function : Symbol(TokenID.Function, Decl(parserRealSource10.ts, 27, 12)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -934,7 +934,7 @@ module TypeScript { setTokenInfo(TokenID.Constructor, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "constructor", ErrorRecoverySet.Func); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Constructor : Symbol(TokenID.Constructor, Decl(parserRealSource10.ts, 28, 17)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Constructor : Symbol(TokenID.Constructor, Decl(parserRealSource10.ts, 28, 17)) >Reservation.TypeScriptAndJSFutureStrict : Symbol(Reservation.TypeScriptAndJSFutureStrict, Decl(parserRealSource10.ts, 170, 62)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -949,7 +949,7 @@ module TypeScript { setTokenInfo(TokenID.Get, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "get", ErrorRecoverySet.Func); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Get : Symbol(TokenID.Get, Decl(parserRealSource10.ts, 29, 20)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Get : Symbol(TokenID.Get, Decl(parserRealSource10.ts, 29, 20)) >Reservation.TypeScript : Symbol(Reservation.TypeScript, Decl(parserRealSource10.ts, 166, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -964,7 +964,7 @@ module TypeScript { setTokenInfo(TokenID.Set, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "set", ErrorRecoverySet.Func); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Set : Symbol(TokenID.Set, Decl(parserRealSource10.ts, 46, 15)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Set : Symbol(TokenID.Set, Decl(parserRealSource10.ts, 46, 15)) >Reservation.TypeScript : Symbol(Reservation.TypeScript, Decl(parserRealSource10.ts, 166, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -979,7 +979,7 @@ module TypeScript { setTokenInfo(TokenID.If, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "if", ErrorRecoverySet.Stmt); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.If : Symbol(TokenID.If, Decl(parserRealSource10.ts, 30, 12)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >If : Symbol(TokenID.If, Decl(parserRealSource10.ts, 30, 12)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -994,7 +994,7 @@ module TypeScript { setTokenInfo(TokenID.Implements, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "implements", ErrorRecoverySet.None); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Implements : Symbol(TokenID.Implements, Decl(parserRealSource10.ts, 31, 11)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Implements : Symbol(TokenID.Implements, Decl(parserRealSource10.ts, 31, 11)) >Reservation.TypeScriptAndJSFutureStrict : Symbol(Reservation.TypeScriptAndJSFutureStrict, Decl(parserRealSource10.ts, 170, 62)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1009,7 +1009,7 @@ module TypeScript { setTokenInfo(TokenID.Import, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "import", ErrorRecoverySet.TypeScriptS); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Import : Symbol(TokenID.Import, Decl(parserRealSource10.ts, 32, 19)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Import : Symbol(TokenID.Import, Decl(parserRealSource10.ts, 32, 19)) >Reservation.TypeScriptAndJSFuture : Symbol(Reservation.TypeScriptAndJSFuture, Decl(parserRealSource10.ts, 169, 50)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1024,7 +1024,7 @@ module TypeScript { setTokenInfo(TokenID.In, Reservation.TypeScriptAndJS, OperatorPrecedence.Relational, NodeType.In, OperatorPrecedence.None, NodeType.None, "in", ErrorRecoverySet.None); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.In : Symbol(TokenID.In, Decl(parserRealSource10.ts, 33, 15)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >In : Symbol(TokenID.In, Decl(parserRealSource10.ts, 33, 15)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1039,7 +1039,7 @@ module TypeScript { setTokenInfo(TokenID.InstanceOf, Reservation.TypeScriptAndJS, OperatorPrecedence.Relational, NodeType.InstOf, OperatorPrecedence.None, NodeType.None, "instanceof", ErrorRecoverySet.BinOp); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.InstanceOf : Symbol(TokenID.InstanceOf, Decl(parserRealSource10.ts, 34, 11)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >InstanceOf : Symbol(TokenID.InstanceOf, Decl(parserRealSource10.ts, 34, 11)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1054,7 +1054,7 @@ module TypeScript { setTokenInfo(TokenID.Interface, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "interface", ErrorRecoverySet.TypeScriptS); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Interface : Symbol(TokenID.Interface, Decl(parserRealSource10.ts, 35, 19)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Interface : Symbol(TokenID.Interface, Decl(parserRealSource10.ts, 35, 19)) >Reservation.TypeScriptAndJSFutureStrict : Symbol(Reservation.TypeScriptAndJSFutureStrict, Decl(parserRealSource10.ts, 170, 62)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1069,7 +1069,7 @@ module TypeScript { setTokenInfo(TokenID.Let, Reservation.JavascriptFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "let", ErrorRecoverySet.None); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Let : Symbol(TokenID.Let, Decl(parserRealSource10.ts, 36, 18)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Let : Symbol(TokenID.Let, Decl(parserRealSource10.ts, 36, 18)) >Reservation.JavascriptFutureStrict : Symbol(Reservation.JavascriptFutureStrict, Decl(parserRealSource10.ts, 167, 23)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1084,7 +1084,7 @@ module TypeScript { setTokenInfo(TokenID.Module, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "module", ErrorRecoverySet.TypeScriptS); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Module : Symbol(TokenID.Module, Decl(parserRealSource10.ts, 37, 12)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Module : Symbol(TokenID.Module, Decl(parserRealSource10.ts, 37, 12)) >Reservation.TypeScript : Symbol(Reservation.TypeScript, Decl(parserRealSource10.ts, 166, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1099,7 +1099,7 @@ module TypeScript { setTokenInfo(TokenID.New, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "new", ErrorRecoverySet.PreOp); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.New : Symbol(TokenID.New, Decl(parserRealSource10.ts, 38, 15)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >New : Symbol(TokenID.New, Decl(parserRealSource10.ts, 38, 15)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1114,7 +1114,7 @@ module TypeScript { setTokenInfo(TokenID.Number, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "number", ErrorRecoverySet.PrimType); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Number : Symbol(TokenID.Number, Decl(parserRealSource10.ts, 39, 12)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Number : Symbol(TokenID.Number, Decl(parserRealSource10.ts, 39, 12)) >Reservation.TypeScript : Symbol(Reservation.TypeScript, Decl(parserRealSource10.ts, 166, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1129,7 +1129,7 @@ module TypeScript { setTokenInfo(TokenID.Null, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "null", ErrorRecoverySet.RLit); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Null : Symbol(TokenID.Null, Decl(parserRealSource10.ts, 40, 15)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Null : Symbol(TokenID.Null, Decl(parserRealSource10.ts, 40, 15)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1144,7 +1144,7 @@ module TypeScript { setTokenInfo(TokenID.Package, Reservation.JavascriptFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "package", ErrorRecoverySet.None); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Package : Symbol(TokenID.Package, Decl(parserRealSource10.ts, 41, 13)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Package : Symbol(TokenID.Package, Decl(parserRealSource10.ts, 41, 13)) >Reservation.JavascriptFutureStrict : Symbol(Reservation.JavascriptFutureStrict, Decl(parserRealSource10.ts, 167, 23)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1159,7 +1159,7 @@ module TypeScript { setTokenInfo(TokenID.Private, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "private", ErrorRecoverySet.TypeScriptS); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Private : Symbol(TokenID.Private, Decl(parserRealSource10.ts, 42, 16)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Private : Symbol(TokenID.Private, Decl(parserRealSource10.ts, 42, 16)) >Reservation.TypeScriptAndJSFutureStrict : Symbol(Reservation.TypeScriptAndJSFutureStrict, Decl(parserRealSource10.ts, 170, 62)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1174,7 +1174,7 @@ module TypeScript { setTokenInfo(TokenID.Protected, Reservation.JavascriptFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "protected", ErrorRecoverySet.None); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Protected : Symbol(TokenID.Protected, Decl(parserRealSource10.ts, 43, 16)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Protected : Symbol(TokenID.Protected, Decl(parserRealSource10.ts, 43, 16)) >Reservation.JavascriptFutureStrict : Symbol(Reservation.JavascriptFutureStrict, Decl(parserRealSource10.ts, 167, 23)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1189,7 +1189,7 @@ module TypeScript { setTokenInfo(TokenID.Public, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "public", ErrorRecoverySet.TypeScriptS); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Public : Symbol(TokenID.Public, Decl(parserRealSource10.ts, 44, 18)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Public : Symbol(TokenID.Public, Decl(parserRealSource10.ts, 44, 18)) >Reservation.TypeScriptAndJSFutureStrict : Symbol(Reservation.TypeScriptAndJSFutureStrict, Decl(parserRealSource10.ts, 170, 62)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1204,7 +1204,7 @@ module TypeScript { setTokenInfo(TokenID.Return, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "return", ErrorRecoverySet.Stmt); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Return : Symbol(TokenID.Return, Decl(parserRealSource10.ts, 45, 15)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Return : Symbol(TokenID.Return, Decl(parserRealSource10.ts, 45, 15)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1219,7 +1219,7 @@ module TypeScript { setTokenInfo(TokenID.Static, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "static", ErrorRecoverySet.None); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Static : Symbol(TokenID.Static, Decl(parserRealSource10.ts, 47, 12)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Static : Symbol(TokenID.Static, Decl(parserRealSource10.ts, 47, 12)) >Reservation.TypeScriptAndJSFutureStrict : Symbol(Reservation.TypeScriptAndJSFutureStrict, Decl(parserRealSource10.ts, 170, 62)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1234,7 +1234,7 @@ module TypeScript { setTokenInfo(TokenID.String, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "string", ErrorRecoverySet.PrimType); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.String : Symbol(TokenID.String, Decl(parserRealSource10.ts, 48, 15)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >String : Symbol(TokenID.String, Decl(parserRealSource10.ts, 48, 15)) >Reservation.TypeScript : Symbol(Reservation.TypeScript, Decl(parserRealSource10.ts, 166, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1249,7 +1249,7 @@ module TypeScript { setTokenInfo(TokenID.Super, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "super", ErrorRecoverySet.RLit); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Super : Symbol(TokenID.Super, Decl(parserRealSource10.ts, 49, 15)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Super : Symbol(TokenID.Super, Decl(parserRealSource10.ts, 49, 15)) >Reservation.TypeScriptAndJSFuture : Symbol(Reservation.TypeScriptAndJSFuture, Decl(parserRealSource10.ts, 169, 50)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1264,7 +1264,7 @@ module TypeScript { setTokenInfo(TokenID.Switch, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "switch", ErrorRecoverySet.Stmt); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Switch : Symbol(TokenID.Switch, Decl(parserRealSource10.ts, 50, 14)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Switch : Symbol(TokenID.Switch, Decl(parserRealSource10.ts, 50, 14)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1279,7 +1279,7 @@ module TypeScript { setTokenInfo(TokenID.This, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "this", ErrorRecoverySet.RLit); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.This : Symbol(TokenID.This, Decl(parserRealSource10.ts, 51, 15)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >This : Symbol(TokenID.This, Decl(parserRealSource10.ts, 51, 15)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1294,7 +1294,7 @@ module TypeScript { setTokenInfo(TokenID.Throw, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "throw", ErrorRecoverySet.Stmt); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Throw : Symbol(TokenID.Throw, Decl(parserRealSource10.ts, 52, 13)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Throw : Symbol(TokenID.Throw, Decl(parserRealSource10.ts, 52, 13)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1309,7 +1309,7 @@ module TypeScript { setTokenInfo(TokenID.True, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "true", ErrorRecoverySet.RLit); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.True : Symbol(TokenID.True, Decl(parserRealSource10.ts, 53, 14)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >True : Symbol(TokenID.True, Decl(parserRealSource10.ts, 53, 14)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1324,7 +1324,7 @@ module TypeScript { setTokenInfo(TokenID.Try, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "try", ErrorRecoverySet.Stmt); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Try : Symbol(TokenID.Try, Decl(parserRealSource10.ts, 54, 13)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Try : Symbol(TokenID.Try, Decl(parserRealSource10.ts, 54, 13)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1339,7 +1339,7 @@ module TypeScript { setTokenInfo(TokenID.TypeOf, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.Typeof, "typeof", ErrorRecoverySet.Prefix); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.TypeOf : Symbol(TokenID.TypeOf, Decl(parserRealSource10.ts, 55, 12)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >TypeOf : Symbol(TokenID.TypeOf, Decl(parserRealSource10.ts, 55, 12)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1354,7 +1354,7 @@ module TypeScript { setTokenInfo(TokenID.Var, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "var", ErrorRecoverySet.Var); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Var : Symbol(TokenID.Var, Decl(parserRealSource10.ts, 56, 15)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Var : Symbol(TokenID.Var, Decl(parserRealSource10.ts, 56, 15)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1369,7 +1369,7 @@ module TypeScript { setTokenInfo(TokenID.Void, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.Void, "void", ErrorRecoverySet.Prefix); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Void : Symbol(TokenID.Void, Decl(parserRealSource10.ts, 57, 12)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Void : Symbol(TokenID.Void, Decl(parserRealSource10.ts, 57, 12)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1384,7 +1384,7 @@ module TypeScript { setTokenInfo(TokenID.With, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.With, "with", ErrorRecoverySet.Stmt); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.With : Symbol(TokenID.With, Decl(parserRealSource10.ts, 58, 13)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >With : Symbol(TokenID.With, Decl(parserRealSource10.ts, 58, 13)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1399,7 +1399,7 @@ module TypeScript { setTokenInfo(TokenID.While, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "while", ErrorRecoverySet.While); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.While : Symbol(TokenID.While, Decl(parserRealSource10.ts, 59, 13)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >While : Symbol(TokenID.While, Decl(parserRealSource10.ts, 59, 13)) >Reservation.TypeScriptAndJS : Symbol(Reservation.TypeScriptAndJS, Decl(parserRealSource10.ts, 168, 35)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1414,7 +1414,7 @@ module TypeScript { setTokenInfo(TokenID.Yield, Reservation.JavascriptFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "yield", ErrorRecoverySet.None); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Yield : Symbol(TokenID.Yield, Decl(parserRealSource10.ts, 60, 14)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Yield : Symbol(TokenID.Yield, Decl(parserRealSource10.ts, 60, 14)) >Reservation.JavascriptFutureStrict : Symbol(Reservation.JavascriptFutureStrict, Decl(parserRealSource10.ts, 167, 23)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1429,7 +1429,7 @@ module TypeScript { setTokenInfo(TokenID.Identifier, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "identifier", ErrorRecoverySet.ID); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Identifier : Symbol(TokenID.Identifier, Decl(parserRealSource10.ts, 114, 26)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Identifier : Symbol(TokenID.Identifier, Decl(parserRealSource10.ts, 114, 26)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1444,7 +1444,7 @@ module TypeScript { setTokenInfo(TokenID.NumberLiteral, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "numberLiteral", ErrorRecoverySet.Literal); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.NumberLiteral : Symbol(TokenID.NumberLiteral, Decl(parserRealSource10.ts, 117, 33)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >NumberLiteral : Symbol(TokenID.NumberLiteral, Decl(parserRealSource10.ts, 117, 33)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1459,7 +1459,7 @@ module TypeScript { setTokenInfo(TokenID.RegularExpressionLiteral, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "regex", ErrorRecoverySet.RegExp); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.RegularExpressionLiteral : Symbol(TokenID.RegularExpressionLiteral, Decl(parserRealSource10.ts, 116, 22)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >RegularExpressionLiteral : Symbol(TokenID.RegularExpressionLiteral, Decl(parserRealSource10.ts, 116, 22)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1474,7 +1474,7 @@ module TypeScript { setTokenInfo(TokenID.StringLiteral, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "qstring", ErrorRecoverySet.Literal); >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.StringLiteral : Symbol(TokenID.StringLiteral, Decl(parserRealSource10.ts, 115, 19)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >StringLiteral : Symbol(TokenID.StringLiteral, Decl(parserRealSource10.ts, 115, 19)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1490,7 +1490,7 @@ module TypeScript { setTokenInfo(TokenID.Semicolon, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, ";", ErrorRecoverySet.SColon); // ; >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Semicolon : Symbol(TokenID.Semicolon, Decl(parserRealSource10.ts, 61, 14)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Semicolon : Symbol(TokenID.Semicolon, Decl(parserRealSource10.ts, 61, 14)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1505,7 +1505,7 @@ module TypeScript { setTokenInfo(TokenID.CloseParen, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, ")", ErrorRecoverySet.RParen); // ) >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.CloseParen : Symbol(TokenID.CloseParen, Decl(parserRealSource10.ts, 64, 18)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >CloseParen : Symbol(TokenID.CloseParen, Decl(parserRealSource10.ts, 64, 18)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1520,7 +1520,7 @@ module TypeScript { setTokenInfo(TokenID.CloseBracket, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "]", ErrorRecoverySet.RBrack); // ] >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.CloseBracket : Symbol(TokenID.CloseBracket, Decl(parserRealSource10.ts, 66, 20)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >CloseBracket : Symbol(TokenID.CloseBracket, Decl(parserRealSource10.ts, 66, 20)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1535,7 +1535,7 @@ module TypeScript { setTokenInfo(TokenID.OpenBrace, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "{", ErrorRecoverySet.LCurly); // { >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.OpenBrace : Symbol(TokenID.OpenBrace, Decl(parserRealSource10.ts, 67, 21)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >OpenBrace : Symbol(TokenID.OpenBrace, Decl(parserRealSource10.ts, 67, 21)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1550,7 +1550,7 @@ module TypeScript { setTokenInfo(TokenID.CloseBrace, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "}", ErrorRecoverySet.RCurly); // } >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.CloseBrace : Symbol(TokenID.CloseBrace, Decl(parserRealSource10.ts, 68, 18)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >CloseBrace : Symbol(TokenID.CloseBrace, Decl(parserRealSource10.ts, 68, 18)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1565,7 +1565,7 @@ module TypeScript { setTokenInfo(TokenID.DotDotDot, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "...", ErrorRecoverySet.None); // ... >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.DotDotDot : Symbol(TokenID.DotDotDot, Decl(parserRealSource10.ts, 110, 12)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >DotDotDot : Symbol(TokenID.DotDotDot, Decl(parserRealSource10.ts, 110, 12)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1581,7 +1581,7 @@ module TypeScript { setTokenInfo(TokenID.Comma, Reservation.None, OperatorPrecedence.Comma, NodeType.Comma, OperatorPrecedence.None, NodeType.None, ",", ErrorRecoverySet.Comma); // , >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Comma : Symbol(TokenID.Comma, Decl(parserRealSource10.ts, 69, 19)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Comma : Symbol(TokenID.Comma, Decl(parserRealSource10.ts, 69, 19)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1596,7 +1596,7 @@ module TypeScript { setTokenInfo(TokenID.Equals, Reservation.None, OperatorPrecedence.Assignment, NodeType.Asg, OperatorPrecedence.None, NodeType.None, "=", ErrorRecoverySet.Asg); // = >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Equals : Symbol(TokenID.Equals, Decl(parserRealSource10.ts, 70, 14)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Equals : Symbol(TokenID.Equals, Decl(parserRealSource10.ts, 70, 14)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1611,7 +1611,7 @@ module TypeScript { setTokenInfo(TokenID.PlusEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgAdd, OperatorPrecedence.None, NodeType.None, "+=", ErrorRecoverySet.BinOp); // += >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.PlusEquals : Symbol(TokenID.PlusEquals, Decl(parserRealSource10.ts, 71, 15)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >PlusEquals : Symbol(TokenID.PlusEquals, Decl(parserRealSource10.ts, 71, 15)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1626,7 +1626,7 @@ module TypeScript { setTokenInfo(TokenID.MinusEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgSub, OperatorPrecedence.None, NodeType.None, "-=", ErrorRecoverySet.BinOp); // -= >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.MinusEquals : Symbol(TokenID.MinusEquals, Decl(parserRealSource10.ts, 72, 19)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >MinusEquals : Symbol(TokenID.MinusEquals, Decl(parserRealSource10.ts, 72, 19)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1641,7 +1641,7 @@ module TypeScript { setTokenInfo(TokenID.AsteriskEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgMul, OperatorPrecedence.None, NodeType.None, "*=", ErrorRecoverySet.BinOp); // *= >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.AsteriskEquals : Symbol(TokenID.AsteriskEquals, Decl(parserRealSource10.ts, 73, 20)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >AsteriskEquals : Symbol(TokenID.AsteriskEquals, Decl(parserRealSource10.ts, 73, 20)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1656,7 +1656,7 @@ module TypeScript { setTokenInfo(TokenID.SlashEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgDiv, OperatorPrecedence.None, NodeType.None, "/=", ErrorRecoverySet.BinOp); // /= >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.SlashEquals : Symbol(TokenID.SlashEquals, Decl(parserRealSource10.ts, 74, 23)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >SlashEquals : Symbol(TokenID.SlashEquals, Decl(parserRealSource10.ts, 74, 23)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1671,7 +1671,7 @@ module TypeScript { setTokenInfo(TokenID.PercentEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgMod, OperatorPrecedence.None, NodeType.None, "%=", ErrorRecoverySet.BinOp); // %= >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.PercentEquals : Symbol(TokenID.PercentEquals, Decl(parserRealSource10.ts, 75, 20)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >PercentEquals : Symbol(TokenID.PercentEquals, Decl(parserRealSource10.ts, 75, 20)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1686,7 +1686,7 @@ module TypeScript { setTokenInfo(TokenID.AmpersandEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgAnd, OperatorPrecedence.None, NodeType.None, "&=", ErrorRecoverySet.BinOp); // &= >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.AmpersandEquals : Symbol(TokenID.AmpersandEquals, Decl(parserRealSource10.ts, 76, 22)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >AmpersandEquals : Symbol(TokenID.AmpersandEquals, Decl(parserRealSource10.ts, 76, 22)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1701,7 +1701,7 @@ module TypeScript { setTokenInfo(TokenID.CaretEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgXor, OperatorPrecedence.None, NodeType.None, "^=", ErrorRecoverySet.BinOp); // ^= >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.CaretEquals : Symbol(TokenID.CaretEquals, Decl(parserRealSource10.ts, 77, 24)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >CaretEquals : Symbol(TokenID.CaretEquals, Decl(parserRealSource10.ts, 77, 24)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1716,7 +1716,7 @@ module TypeScript { setTokenInfo(TokenID.BarEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgOr, OperatorPrecedence.None, NodeType.None, "|=", ErrorRecoverySet.BinOp); // |= >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.BarEquals : Symbol(TokenID.BarEquals, Decl(parserRealSource10.ts, 78, 20)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >BarEquals : Symbol(TokenID.BarEquals, Decl(parserRealSource10.ts, 78, 20)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1731,7 +1731,7 @@ module TypeScript { setTokenInfo(TokenID.LessThanLessThanEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgLsh, OperatorPrecedence.None, NodeType.None, "<<=", ErrorRecoverySet.BinOp); // <<= >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.LessThanLessThanEquals : Symbol(TokenID.LessThanLessThanEquals, Decl(parserRealSource10.ts, 79, 18)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >LessThanLessThanEquals : Symbol(TokenID.LessThanLessThanEquals, Decl(parserRealSource10.ts, 79, 18)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1746,7 +1746,7 @@ module TypeScript { setTokenInfo(TokenID.GreaterThanGreaterThanEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgRsh, OperatorPrecedence.None, NodeType.None, ">>=", ErrorRecoverySet.BinOp); // >>= >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.GreaterThanGreaterThanEquals : Symbol(TokenID.GreaterThanGreaterThanEquals, Decl(parserRealSource10.ts, 80, 31)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >GreaterThanGreaterThanEquals : Symbol(TokenID.GreaterThanGreaterThanEquals, Decl(parserRealSource10.ts, 80, 31)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1761,7 +1761,7 @@ module TypeScript { setTokenInfo(TokenID.GreaterThanGreaterThanGreaterThanEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgRs2, OperatorPrecedence.None, NodeType.None, ">>>=", ErrorRecoverySet.BinOp); // >>>= >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.GreaterThanGreaterThanGreaterThanEquals : Symbol(TokenID.GreaterThanGreaterThanGreaterThanEquals, Decl(parserRealSource10.ts, 81, 37)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >GreaterThanGreaterThanGreaterThanEquals : Symbol(TokenID.GreaterThanGreaterThanGreaterThanEquals, Decl(parserRealSource10.ts, 81, 37)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1776,7 +1776,7 @@ module TypeScript { setTokenInfo(TokenID.Question, Reservation.None, OperatorPrecedence.Conditional, NodeType.ConditionalExpression, OperatorPrecedence.None, NodeType.None, "?", ErrorRecoverySet.BinOp); // ? >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Question : Symbol(TokenID.Question, Decl(parserRealSource10.ts, 82, 48)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Question : Symbol(TokenID.Question, Decl(parserRealSource10.ts, 82, 48)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1791,7 +1791,7 @@ module TypeScript { setTokenInfo(TokenID.Colon, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, ":", ErrorRecoverySet.Colon); // : >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Colon : Symbol(TokenID.Colon, Decl(parserRealSource10.ts, 83, 17)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Colon : Symbol(TokenID.Colon, Decl(parserRealSource10.ts, 83, 17)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1806,7 +1806,7 @@ module TypeScript { setTokenInfo(TokenID.BarBar, Reservation.None, OperatorPrecedence.LogicalOr, NodeType.LogOr, OperatorPrecedence.None, NodeType.None, "||", ErrorRecoverySet.BinOp); // || >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.BarBar : Symbol(TokenID.BarBar, Decl(parserRealSource10.ts, 84, 14)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >BarBar : Symbol(TokenID.BarBar, Decl(parserRealSource10.ts, 84, 14)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1821,7 +1821,7 @@ module TypeScript { setTokenInfo(TokenID.AmpersandAmpersand, Reservation.None, OperatorPrecedence.LogicalAnd, NodeType.LogAnd, OperatorPrecedence.None, NodeType.None, "&&", ErrorRecoverySet.BinOp); // && >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.AmpersandAmpersand : Symbol(TokenID.AmpersandAmpersand, Decl(parserRealSource10.ts, 85, 15)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >AmpersandAmpersand : Symbol(TokenID.AmpersandAmpersand, Decl(parserRealSource10.ts, 85, 15)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1836,7 +1836,7 @@ module TypeScript { setTokenInfo(TokenID.Bar, Reservation.None, OperatorPrecedence.BitwiseOr, NodeType.Or, OperatorPrecedence.None, NodeType.None, "|", ErrorRecoverySet.BinOp); // | >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Bar : Symbol(TokenID.Bar, Decl(parserRealSource10.ts, 86, 27)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Bar : Symbol(TokenID.Bar, Decl(parserRealSource10.ts, 86, 27)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1851,7 +1851,7 @@ module TypeScript { setTokenInfo(TokenID.Caret, Reservation.None, OperatorPrecedence.BitwiseExclusiveOr, NodeType.Xor, OperatorPrecedence.None, NodeType.None, "^", ErrorRecoverySet.BinOp); // ^ >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Caret : Symbol(TokenID.Caret, Decl(parserRealSource10.ts, 87, 12)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Caret : Symbol(TokenID.Caret, Decl(parserRealSource10.ts, 87, 12)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1866,7 +1866,7 @@ module TypeScript { setTokenInfo(TokenID.And, Reservation.None, OperatorPrecedence.BitwiseAnd, NodeType.And, OperatorPrecedence.None, NodeType.None, "&", ErrorRecoverySet.BinOp); // & >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.And : Symbol(TokenID.And, Decl(parserRealSource10.ts, 88, 14)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >And : Symbol(TokenID.And, Decl(parserRealSource10.ts, 88, 14)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1881,7 +1881,7 @@ module TypeScript { setTokenInfo(TokenID.EqualsEquals, Reservation.None, OperatorPrecedence.Equality, NodeType.Eq, OperatorPrecedence.None, NodeType.None, "==", ErrorRecoverySet.BinOp); // == >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.EqualsEquals : Symbol(TokenID.EqualsEquals, Decl(parserRealSource10.ts, 89, 12)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >EqualsEquals : Symbol(TokenID.EqualsEquals, Decl(parserRealSource10.ts, 89, 12)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1896,7 +1896,7 @@ module TypeScript { setTokenInfo(TokenID.ExclamationEquals, Reservation.None, OperatorPrecedence.Equality, NodeType.Ne, OperatorPrecedence.None, NodeType.None, "!=", ErrorRecoverySet.BinOp); // != >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.ExclamationEquals : Symbol(TokenID.ExclamationEquals, Decl(parserRealSource10.ts, 90, 21)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >ExclamationEquals : Symbol(TokenID.ExclamationEquals, Decl(parserRealSource10.ts, 90, 21)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1911,7 +1911,7 @@ module TypeScript { setTokenInfo(TokenID.EqualsEqualsEquals, Reservation.None, OperatorPrecedence.Equality, NodeType.Eqv, OperatorPrecedence.None, NodeType.None, "===", ErrorRecoverySet.BinOp); // === >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.EqualsEqualsEquals : Symbol(TokenID.EqualsEqualsEquals, Decl(parserRealSource10.ts, 91, 26)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >EqualsEqualsEquals : Symbol(TokenID.EqualsEqualsEquals, Decl(parserRealSource10.ts, 91, 26)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1926,7 +1926,7 @@ module TypeScript { setTokenInfo(TokenID.ExclamationEqualsEquals, Reservation.None, OperatorPrecedence.Equality, NodeType.NEqv, OperatorPrecedence.None, NodeType.None, "!==", ErrorRecoverySet.BinOp); // !== >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.ExclamationEqualsEquals : Symbol(TokenID.ExclamationEqualsEquals, Decl(parserRealSource10.ts, 92, 27)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >ExclamationEqualsEquals : Symbol(TokenID.ExclamationEqualsEquals, Decl(parserRealSource10.ts, 92, 27)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1941,7 +1941,7 @@ module TypeScript { setTokenInfo(TokenID.LessThan, Reservation.None, OperatorPrecedence.Relational, NodeType.Lt, OperatorPrecedence.None, NodeType.None, "<", ErrorRecoverySet.BinOp); // < >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.LessThan : Symbol(TokenID.LessThan, Decl(parserRealSource10.ts, 93, 32)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >LessThan : Symbol(TokenID.LessThan, Decl(parserRealSource10.ts, 93, 32)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1956,7 +1956,7 @@ module TypeScript { setTokenInfo(TokenID.LessThanEquals, Reservation.None, OperatorPrecedence.Relational, NodeType.Le, OperatorPrecedence.None, NodeType.None, "<=", ErrorRecoverySet.BinOp); // <= >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.LessThanEquals : Symbol(TokenID.LessThanEquals, Decl(parserRealSource10.ts, 94, 17)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >LessThanEquals : Symbol(TokenID.LessThanEquals, Decl(parserRealSource10.ts, 94, 17)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1971,7 +1971,7 @@ module TypeScript { setTokenInfo(TokenID.GreaterThan, Reservation.None, OperatorPrecedence.Relational, NodeType.Gt, OperatorPrecedence.None, NodeType.None, ">", ErrorRecoverySet.BinOp); // > >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.GreaterThan : Symbol(TokenID.GreaterThan, Decl(parserRealSource10.ts, 95, 23)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >GreaterThan : Symbol(TokenID.GreaterThan, Decl(parserRealSource10.ts, 95, 23)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -1986,7 +1986,7 @@ module TypeScript { setTokenInfo(TokenID.GreaterThanEquals, Reservation.None, OperatorPrecedence.Relational, NodeType.Ge, OperatorPrecedence.None, NodeType.None, ">=", ErrorRecoverySet.BinOp); // >= >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.GreaterThanEquals : Symbol(TokenID.GreaterThanEquals, Decl(parserRealSource10.ts, 96, 20)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >GreaterThanEquals : Symbol(TokenID.GreaterThanEquals, Decl(parserRealSource10.ts, 96, 20)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -2001,7 +2001,7 @@ module TypeScript { setTokenInfo(TokenID.LessThanLessThan, Reservation.None, OperatorPrecedence.Shift, NodeType.Lsh, OperatorPrecedence.None, NodeType.None, "<<", ErrorRecoverySet.BinOp); // << >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.LessThanLessThan : Symbol(TokenID.LessThanLessThan, Decl(parserRealSource10.ts, 97, 26)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >LessThanLessThan : Symbol(TokenID.LessThanLessThan, Decl(parserRealSource10.ts, 97, 26)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -2016,7 +2016,7 @@ module TypeScript { setTokenInfo(TokenID.GreaterThanGreaterThan, Reservation.None, OperatorPrecedence.Shift, NodeType.Rsh, OperatorPrecedence.None, NodeType.None, ">>", ErrorRecoverySet.BinOp); // >> >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.GreaterThanGreaterThan : Symbol(TokenID.GreaterThanGreaterThan, Decl(parserRealSource10.ts, 98, 25)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >GreaterThanGreaterThan : Symbol(TokenID.GreaterThanGreaterThan, Decl(parserRealSource10.ts, 98, 25)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -2031,7 +2031,7 @@ module TypeScript { setTokenInfo(TokenID.GreaterThanGreaterThanGreaterThan, Reservation.None, OperatorPrecedence.Shift, NodeType.Rs2, OperatorPrecedence.None, NodeType.None, ">>>", ErrorRecoverySet.BinOp); // >>> >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.GreaterThanGreaterThanGreaterThan : Symbol(TokenID.GreaterThanGreaterThanGreaterThan, Decl(parserRealSource10.ts, 99, 31)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >GreaterThanGreaterThanGreaterThan : Symbol(TokenID.GreaterThanGreaterThanGreaterThan, Decl(parserRealSource10.ts, 99, 31)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -2046,7 +2046,7 @@ module TypeScript { setTokenInfo(TokenID.Plus, Reservation.None, OperatorPrecedence.Additive, NodeType.Add, OperatorPrecedence.Unary, NodeType.Pos, "+", ErrorRecoverySet.AddOp); // + >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Plus : Symbol(TokenID.Plus, Decl(parserRealSource10.ts, 100, 42)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Plus : Symbol(TokenID.Plus, Decl(parserRealSource10.ts, 100, 42)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -2061,7 +2061,7 @@ module TypeScript { setTokenInfo(TokenID.Minus, Reservation.None, OperatorPrecedence.Additive, NodeType.Sub, OperatorPrecedence.Unary, NodeType.Neg, "-", ErrorRecoverySet.AddOp); // - >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Minus : Symbol(TokenID.Minus, Decl(parserRealSource10.ts, 101, 13)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Minus : Symbol(TokenID.Minus, Decl(parserRealSource10.ts, 101, 13)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -2076,7 +2076,7 @@ module TypeScript { setTokenInfo(TokenID.Asterisk, Reservation.None, OperatorPrecedence.Multiplicative, NodeType.Mul, OperatorPrecedence.None, NodeType.None, "*", ErrorRecoverySet.BinOp); // * >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Asterisk : Symbol(TokenID.Asterisk, Decl(parserRealSource10.ts, 102, 14)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Asterisk : Symbol(TokenID.Asterisk, Decl(parserRealSource10.ts, 102, 14)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -2091,7 +2091,7 @@ module TypeScript { setTokenInfo(TokenID.Slash, Reservation.None, OperatorPrecedence.Multiplicative, NodeType.Div, OperatorPrecedence.None, NodeType.None, "/", ErrorRecoverySet.BinOp); // / >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Slash : Symbol(TokenID.Slash, Decl(parserRealSource10.ts, 103, 17)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Slash : Symbol(TokenID.Slash, Decl(parserRealSource10.ts, 103, 17)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -2106,7 +2106,7 @@ module TypeScript { setTokenInfo(TokenID.Percent, Reservation.None, OperatorPrecedence.Multiplicative, NodeType.Mod, OperatorPrecedence.None, NodeType.None, "%", ErrorRecoverySet.BinOp); // % >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Percent : Symbol(TokenID.Percent, Decl(parserRealSource10.ts, 104, 14)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Percent : Symbol(TokenID.Percent, Decl(parserRealSource10.ts, 104, 14)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -2121,7 +2121,7 @@ module TypeScript { setTokenInfo(TokenID.Tilde, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.Not, "~", ErrorRecoverySet.PreOp); // ~ >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Tilde : Symbol(TokenID.Tilde, Decl(parserRealSource10.ts, 105, 16)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Tilde : Symbol(TokenID.Tilde, Decl(parserRealSource10.ts, 105, 16)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -2136,7 +2136,7 @@ module TypeScript { setTokenInfo(TokenID.Exclamation, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.LogNot, "!", ErrorRecoverySet.PreOp); // ! >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Exclamation : Symbol(TokenID.Exclamation, Decl(parserRealSource10.ts, 106, 14)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Exclamation : Symbol(TokenID.Exclamation, Decl(parserRealSource10.ts, 106, 14)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -2151,7 +2151,7 @@ module TypeScript { setTokenInfo(TokenID.PlusPlus, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.IncPre, "++", ErrorRecoverySet.PreOp); // ++ >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.PlusPlus : Symbol(TokenID.PlusPlus, Decl(parserRealSource10.ts, 107, 20)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >PlusPlus : Symbol(TokenID.PlusPlus, Decl(parserRealSource10.ts, 107, 20)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -2166,7 +2166,7 @@ module TypeScript { setTokenInfo(TokenID.MinusMinus, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.DecPre, "--", ErrorRecoverySet.PreOp); // -- >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.MinusMinus : Symbol(TokenID.MinusMinus, Decl(parserRealSource10.ts, 108, 17)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >MinusMinus : Symbol(TokenID.MinusMinus, Decl(parserRealSource10.ts, 108, 17)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -2181,7 +2181,7 @@ module TypeScript { setTokenInfo(TokenID.OpenParen, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "(", ErrorRecoverySet.LParen); // ( >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.OpenParen : Symbol(TokenID.OpenParen, Decl(parserRealSource10.ts, 63, 18)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >OpenParen : Symbol(TokenID.OpenParen, Decl(parserRealSource10.ts, 63, 18)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -2196,7 +2196,7 @@ module TypeScript { setTokenInfo(TokenID.OpenBracket, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "[", ErrorRecoverySet.LBrack); // [ >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.OpenBracket : Symbol(TokenID.OpenBracket, Decl(parserRealSource10.ts, 65, 19)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >OpenBracket : Symbol(TokenID.OpenBracket, Decl(parserRealSource10.ts, 65, 19)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -2211,7 +2211,7 @@ module TypeScript { setTokenInfo(TokenID.Dot, Reservation.None, OperatorPrecedence.Unary, NodeType.None, OperatorPrecedence.None, NodeType.None, ".", ErrorRecoverySet.Dot); // . >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.Dot : Symbol(TokenID.Dot, Decl(parserRealSource10.ts, 109, 19)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Dot : Symbol(TokenID.Dot, Decl(parserRealSource10.ts, 109, 19)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -2226,7 +2226,7 @@ module TypeScript { setTokenInfo(TokenID.EndOfFile, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "", ErrorRecoverySet.EOF); // EOF >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.EndOfFile : Symbol(TokenID.EndOfFile, Decl(parserRealSource10.ts, 112, 14)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >EndOfFile : Symbol(TokenID.EndOfFile, Decl(parserRealSource10.ts, 112, 14)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -2241,7 +2241,7 @@ module TypeScript { setTokenInfo(TokenID.EqualsGreaterThan, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "=>", ErrorRecoverySet.None); // => >setTokenInfo : Symbol(setTokenInfo, Decl(parserRealSource10.ts, 179, 5)) >TokenID.EqualsGreaterThan : Symbol(TokenID.EqualsGreaterThan, Decl(parserRealSource10.ts, 113, 18)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >EqualsGreaterThan : Symbol(TokenID.EqualsGreaterThan, Decl(parserRealSource10.ts, 113, 18)) >Reservation.None : Symbol(Reservation.None, Decl(parserRealSource10.ts, 163, 29)) >Reservation : Symbol(Reservation, Decl(parserRealSource10.ts, 161, 5)) @@ -2256,7 +2256,7 @@ module TypeScript { export function lookupToken(tokenId: TokenID): TokenInfo { >lookupToken : Symbol(lookupToken, Decl(parserRealSource10.ts, 311, 171)) >tokenId : Symbol(tokenId, Decl(parserRealSource10.ts, 313, 32)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >TokenInfo : Symbol(TokenInfo, Decl(parserRealSource10.ts, 172, 5)) return tokenTable[tokenId]; @@ -2304,7 +2304,7 @@ module TypeScript { constructor (public tokenId: TokenID) { >tokenId : Symbol(Token.tokenId, Decl(parserRealSource10.ts, 332, 21)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) } public toString() { @@ -2317,7 +2317,7 @@ module TypeScript { >this.getText : Symbol(Token.getText, Decl(parserRealSource10.ts, 341, 9)) >this : Symbol(Token, Decl(parserRealSource10.ts, 329, 5)) >getText : Symbol(Token.getText, Decl(parserRealSource10.ts, 341, 9)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >this.tokenId : Symbol(Token.tokenId, Decl(parserRealSource10.ts, 332, 21)) >this : Symbol(Token, Decl(parserRealSource10.ts, 329, 5)) >tokenId : Symbol(Token.tokenId, Decl(parserRealSource10.ts, 332, 21)) @@ -2355,7 +2355,7 @@ module TypeScript { >this : Symbol(Token, Decl(parserRealSource10.ts, 329, 5)) >tokenId : Symbol(Token.tokenId, Decl(parserRealSource10.ts, 332, 21)) >TokenID.LimKeyword : Symbol(TokenID.LimKeyword, Decl(parserRealSource10.ts, 122, 37)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >LimKeyword : Symbol(TokenID.LimKeyword, Decl(parserRealSource10.ts, 122, 37)) return TokenClass.Keyword; @@ -2411,7 +2411,7 @@ module TypeScript { super(TokenID.NumberLiteral); >super : Symbol(Token, Decl(parserRealSource10.ts, 329, 5)) >TokenID.NumberLiteral : Symbol(TokenID.NumberLiteral, Decl(parserRealSource10.ts, 117, 33)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >NumberLiteral : Symbol(TokenID.NumberLiteral, Decl(parserRealSource10.ts, 117, 33)) } @@ -2455,7 +2455,7 @@ module TypeScript { super(TokenID.StringLiteral); >super : Symbol(Token, Decl(parserRealSource10.ts, 329, 5)) >TokenID.StringLiteral : Symbol(TokenID.StringLiteral, Decl(parserRealSource10.ts, 115, 19)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >StringLiteral : Symbol(TokenID.StringLiteral, Decl(parserRealSource10.ts, 115, 19)) } @@ -2490,7 +2490,7 @@ module TypeScript { super(TokenID.Identifier); >super : Symbol(Token, Decl(parserRealSource10.ts, 329, 5)) >TokenID.Identifier : Symbol(TokenID.Identifier, Decl(parserRealSource10.ts, 114, 26)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >Identifier : Symbol(TokenID.Identifier, Decl(parserRealSource10.ts, 114, 26)) } public getText(): string { @@ -2518,7 +2518,7 @@ module TypeScript { constructor (tokenId: TokenID, public value: string) { >tokenId : Symbol(tokenId, Decl(parserRealSource10.ts, 406, 21)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >value : Symbol(WhitespaceToken.value, Decl(parserRealSource10.ts, 406, 38)) super(tokenId); @@ -2552,7 +2552,7 @@ module TypeScript { constructor (tokenID: TokenID, public value: string, public isBlock: boolean, public startPos: number, public line: number, public endsLine: boolean) { >tokenID : Symbol(tokenID, Decl(parserRealSource10.ts, 420, 21)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >value : Symbol(CommentToken.value, Decl(parserRealSource10.ts, 420, 38)) >isBlock : Symbol(CommentToken.isBlock, Decl(parserRealSource10.ts, 420, 60)) >startPos : Symbol(CommentToken.startPos, Decl(parserRealSource10.ts, 420, 85)) @@ -2594,7 +2594,7 @@ module TypeScript { super(TokenID.RegularExpressionLiteral); >super : Symbol(Token, Decl(parserRealSource10.ts, 329, 5)) >TokenID.RegularExpressionLiteral : Symbol(TokenID.RegularExpressionLiteral, Decl(parserRealSource10.ts, 116, 22)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >RegularExpressionLiteral : Symbol(TokenID.RegularExpressionLiteral, Decl(parserRealSource10.ts, 116, 22)) } @@ -2630,7 +2630,7 @@ module TypeScript { >i : Symbol(i, Decl(parserRealSource10.ts, 450, 16)) >i : Symbol(i, Decl(parserRealSource10.ts, 450, 16)) >TokenID.LimFixed : Symbol(TokenID.LimFixed, Decl(parserRealSource10.ts, 121, 12)) ->TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 19)) +>TokenID : Symbol(TokenID, Decl(parserRealSource10.ts, 5, 22)) >LimFixed : Symbol(TokenID.LimFixed, Decl(parserRealSource10.ts, 121, 12)) >i : Symbol(i, Decl(parserRealSource10.ts, 450, 16)) diff --git a/tests/baselines/reference/parserRealSource10.types b/tests/baselines/reference/parserRealSource10.types index 3ba5196d8a27d..8caeba4a9587d 100644 --- a/tests/baselines/reference/parserRealSource10.types +++ b/tests/baselines/reference/parserRealSource10.types @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/parserRealSource11.errors.txt b/tests/baselines/reference/parserRealSource11.errors.txt index fd0b98343ed89..73ab1c6a053f2 100644 --- a/tests/baselines/reference/parserRealSource11.errors.txt +++ b/tests/baselines/reference/parserRealSource11.errors.txt @@ -519,7 +519,7 @@ parserRealSource11.ts(2356,48): error TS2304: Cannot find name 'TokenID'. ~~~~~~~~~~~~~ !!! error TS6053: File 'typescript.ts' not found. - module TypeScript { + namespace TypeScript { export class ASTSpan { public minChar: number = -1; // -1 = "undefined" or "compiler generated" public limChar: number = -1; // -1 = "undefined" or "compiler generated" diff --git a/tests/baselines/reference/parserRealSource11.js b/tests/baselines/reference/parserRealSource11.js index 28354273a3ed5..87888efa04535 100644 --- a/tests/baselines/reference/parserRealSource11.js +++ b/tests/baselines/reference/parserRealSource11.js @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { export class ASTSpan { public minChar: number = -1; // -1 = "undefined" or "compiler generated" public limChar: number = -1; // -1 = "undefined" or "compiler generated" diff --git a/tests/baselines/reference/parserRealSource11.symbols b/tests/baselines/reference/parserRealSource11.symbols index 676682dedf82d..1ab90b0559a46 100644 --- a/tests/baselines/reference/parserRealSource11.symbols +++ b/tests/baselines/reference/parserRealSource11.symbols @@ -6,11 +6,11 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : Symbol(TypeScript, Decl(parserRealSource11.ts, 0, 0)) export class ASTSpan { ->ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 19)) +>ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 22)) public minChar: number = -1; // -1 = "undefined" or "compiler generated" >minChar : Symbol(ASTSpan.minChar, Decl(parserRealSource11.ts, 6, 26)) @@ -21,7 +21,7 @@ module TypeScript { export class AST extends ASTSpan { >AST : Symbol(AST, Decl(parserRealSource11.ts, 9, 5)) ->ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 19)) +>ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 22)) public type: Type = null; >type : Symbol(AST.type, Decl(parserRealSource11.ts, 11, 38)) @@ -50,7 +50,7 @@ module TypeScript { >NodeType : Symbol(NodeType) super(); ->super : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 19)) +>super : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 22)) } public isExpression() { return false; } @@ -2820,7 +2820,7 @@ module TypeScript { public endingToken: ASTSpan = null; >endingToken : Symbol(FuncDecl.endingToken, Decl(parserRealSource11.ts, 980, 38)) ->ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 19)) +>ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 22)) constructor (public name: Identifier, public bod: ASTList, public isConstructor: boolean, >name : Symbol(FuncDecl.name, Decl(parserRealSource11.ts, 983, 21)) @@ -3585,7 +3585,7 @@ module TypeScript { >scopes : Symbol(scopes, Decl(parserRealSource11.ts, 1204, 71)) >ASTList : Symbol(ASTList, Decl(parserRealSource11.ts, 188, 5)) >endingToken : Symbol(ModuleDeclaration.endingToken, Decl(parserRealSource11.ts, 1204, 88)) ->ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 19)) +>ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 22)) super(NodeType.ModuleDeclaration, name, members); >super : Symbol(NamedDeclaration, Decl(parserRealSource11.ts, 1180, 5)) @@ -3757,7 +3757,7 @@ module TypeScript { public endingToken: ASTSpan = null; >endingToken : Symbol(ClassDeclaration.endingToken, Decl(parserRealSource11.ts, 1258, 43)) ->ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 19)) +>ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 22)) constructor (name: Identifier, >name : Symbol(name, Decl(parserRealSource11.ts, 1261, 21)) @@ -4742,8 +4742,8 @@ module TypeScript { public statement: ASTSpan = new ASTSpan(); >statement : Symbol(IfStatement.statement, Decl(parserRealSource11.ts, 1567, 35)) ->ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 19)) ->ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 19)) +>ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 22)) +>ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 22)) constructor (public cond: AST) { >cond : Symbol(IfStatement.cond, Decl(parserRealSource11.ts, 1570, 21)) @@ -5109,8 +5109,8 @@ module TypeScript { } public statement: ASTSpan = new ASTSpan(); >statement : Symbol(ForInStatement.statement, Decl(parserRealSource11.ts, 1691, 9)) ->ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 19)) ->ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 19)) +>ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 22)) +>ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 22)) public body: AST; >body : Symbol(ForInStatement.body, Decl(parserRealSource11.ts, 1692, 50)) @@ -5934,8 +5934,8 @@ module TypeScript { public statement: ASTSpan = new ASTSpan(); >statement : Symbol(SwitchStatement.statement, Decl(parserRealSource11.ts, 1934, 49)) ->ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 19)) ->ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 19)) +>ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 22)) +>ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 22)) constructor (public val: AST) { >val : Symbol(SwitchStatement.val, Decl(parserRealSource11.ts, 1937, 21)) @@ -6908,8 +6908,8 @@ module TypeScript { } public statement: ASTSpan = new ASTSpan(); >statement : Symbol(Catch.statement, Decl(parserRealSource11.ts, 2226, 9)) ->ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 19)) ->ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 19)) +>ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 22)) +>ASTSpan : Symbol(ASTSpan, Decl(parserRealSource11.ts, 5, 22)) public containedScope: SymbolScope = null; >containedScope : Symbol(Catch.containedScope, Decl(parserRealSource11.ts, 2227, 50)) diff --git a/tests/baselines/reference/parserRealSource11.types b/tests/baselines/reference/parserRealSource11.types index d941bb4c4efe1..e988e6238805c 100644 --- a/tests/baselines/reference/parserRealSource11.types +++ b/tests/baselines/reference/parserRealSource11.types @@ -9,7 +9,7 @@ Type Count: 1,000 /// -module TypeScript { +namespace TypeScript { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/parserRealSource12.errors.txt b/tests/baselines/reference/parserRealSource12.errors.txt index 5d507e5b46af4..13604144620e0 100644 --- a/tests/baselines/reference/parserRealSource12.errors.txt +++ b/tests/baselines/reference/parserRealSource12.errors.txt @@ -217,7 +217,7 @@ parserRealSource12.ts(524,30): error TS2304: Cannot find name 'ASTList'. ~~~~~~~~~~~~~ !!! error TS6053: File 'typescript.ts' not found. - module TypeScript { + namespace TypeScript { export interface IAstWalker { walk(ast: AST, parent: AST): AST; ~~~ @@ -673,7 +673,7 @@ parserRealSource12.ts(524,30): error TS2304: Cannot find name 'ASTList'. return globalAstWalkerFactory; } - module ChildrenWalkers { + namespace ChildrenWalkers { export function walkNone(preAst: ASTList, parent: AST, walker: IAstWalker): void { ~~~~~~~ !!! error TS2304: Cannot find name 'ASTList'. diff --git a/tests/baselines/reference/parserRealSource12.js b/tests/baselines/reference/parserRealSource12.js index 03813d0b54a8e..509b0188c8ffe 100644 --- a/tests/baselines/reference/parserRealSource12.js +++ b/tests/baselines/reference/parserRealSource12.js @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { export interface IAstWalker { walk(ast: AST, parent: AST): AST; options: AstWalkOptions; @@ -220,7 +220,7 @@ module TypeScript { return globalAstWalkerFactory; } - module ChildrenWalkers { + namespace ChildrenWalkers { export function walkNone(preAst: ASTList, parent: AST, walker: IAstWalker): void { // Nothing to do } diff --git a/tests/baselines/reference/parserRealSource12.symbols b/tests/baselines/reference/parserRealSource12.symbols index 3a91965c1e3a8..fb103d3ac361a 100644 --- a/tests/baselines/reference/parserRealSource12.symbols +++ b/tests/baselines/reference/parserRealSource12.symbols @@ -6,11 +6,11 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : Symbol(TypeScript, Decl(parserRealSource12.ts, 0, 0)) export interface IAstWalker { ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) walk(ast: AST, parent: AST): AST; >walk : Symbol(IAstWalker.walk, Decl(parserRealSource12.ts, 6, 33)) @@ -67,7 +67,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 24, 18)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 24, 31)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) >AST : Symbol(AST) } @@ -80,12 +80,12 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 28, 21)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 28, 34)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) } class AstWalker implements IAstWalker { >AstWalker : Symbol(AstWalker, Decl(parserRealSource12.ts, 29, 5)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) constructor ( private childrenWalkers: IAstWalkChildren[], @@ -263,7 +263,7 @@ module TypeScript { >options : Symbol(options, Decl(parserRealSource12.ts, 80, 72)) >AstWalkOptions : Symbol(AstWalkOptions, Decl(parserRealSource12.ts, 10, 5)) >state : Symbol(state, Decl(parserRealSource12.ts, 80, 98)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) return this.getSlowWalker(pre, post, options, state); >this.getSlowWalker : Symbol(AstWalkerFactory.getSlowWalker, Decl(parserRealSource12.ts, 82, 9)) @@ -284,7 +284,7 @@ module TypeScript { >options : Symbol(options, Decl(parserRealSource12.ts, 84, 77)) >AstWalkOptions : Symbol(AstWalkOptions, Decl(parserRealSource12.ts, 10, 5)) >state : Symbol(state, Decl(parserRealSource12.ts, 84, 103)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) if (!options) { >options : Symbol(options, Decl(parserRealSource12.ts, 84, 77)) @@ -312,81 +312,81 @@ module TypeScript { >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) >this : Symbol(AstWalkerFactory, Decl(parserRealSource12.ts, 67, 5)) >childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) ->ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) >ChildrenWalkers : Symbol(ChildrenWalkers, Decl(parserRealSource12.ts, 217, 5)) ->walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) this.childrenWalkers[NodeType.Empty] = ChildrenWalkers.walkNone; >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) >this : Symbol(AstWalkerFactory, Decl(parserRealSource12.ts, 67, 5)) >childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) ->ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) >ChildrenWalkers : Symbol(ChildrenWalkers, Decl(parserRealSource12.ts, 217, 5)) ->walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) this.childrenWalkers[NodeType.EmptyExpr] = ChildrenWalkers.walkNone; >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) >this : Symbol(AstWalkerFactory, Decl(parserRealSource12.ts, 67, 5)) >childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) ->ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) >ChildrenWalkers : Symbol(ChildrenWalkers, Decl(parserRealSource12.ts, 217, 5)) ->walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) this.childrenWalkers[NodeType.True] = ChildrenWalkers.walkNone; >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) >this : Symbol(AstWalkerFactory, Decl(parserRealSource12.ts, 67, 5)) >childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) ->ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) >ChildrenWalkers : Symbol(ChildrenWalkers, Decl(parserRealSource12.ts, 217, 5)) ->walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) this.childrenWalkers[NodeType.False] = ChildrenWalkers.walkNone; >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) >this : Symbol(AstWalkerFactory, Decl(parserRealSource12.ts, 67, 5)) >childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) ->ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) >ChildrenWalkers : Symbol(ChildrenWalkers, Decl(parserRealSource12.ts, 217, 5)) ->walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) this.childrenWalkers[NodeType.This] = ChildrenWalkers.walkNone; >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) >this : Symbol(AstWalkerFactory, Decl(parserRealSource12.ts, 67, 5)) >childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) ->ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) >ChildrenWalkers : Symbol(ChildrenWalkers, Decl(parserRealSource12.ts, 217, 5)) ->walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) this.childrenWalkers[NodeType.Super] = ChildrenWalkers.walkNone; >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) >this : Symbol(AstWalkerFactory, Decl(parserRealSource12.ts, 67, 5)) >childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) ->ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) >ChildrenWalkers : Symbol(ChildrenWalkers, Decl(parserRealSource12.ts, 217, 5)) ->walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) this.childrenWalkers[NodeType.QString] = ChildrenWalkers.walkNone; >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) >this : Symbol(AstWalkerFactory, Decl(parserRealSource12.ts, 67, 5)) >childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) ->ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) >ChildrenWalkers : Symbol(ChildrenWalkers, Decl(parserRealSource12.ts, 217, 5)) ->walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) this.childrenWalkers[NodeType.Regex] = ChildrenWalkers.walkNone; >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) >this : Symbol(AstWalkerFactory, Decl(parserRealSource12.ts, 67, 5)) >childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) ->ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) >ChildrenWalkers : Symbol(ChildrenWalkers, Decl(parserRealSource12.ts, 217, 5)) ->walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) this.childrenWalkers[NodeType.Null] = ChildrenWalkers.walkNone; >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) >this : Symbol(AstWalkerFactory, Decl(parserRealSource12.ts, 67, 5)) >childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) ->ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) >ChildrenWalkers : Symbol(ChildrenWalkers, Decl(parserRealSource12.ts, 217, 5)) ->walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) this.childrenWalkers[NodeType.ArrayLit] = ChildrenWalkers.walkUnaryExpressionChildren; >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) @@ -504,17 +504,17 @@ module TypeScript { >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) >this : Symbol(AstWalkerFactory, Decl(parserRealSource12.ts, 67, 5)) >childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) ->ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) >ChildrenWalkers : Symbol(ChildrenWalkers, Decl(parserRealSource12.ts, 217, 5)) ->walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) this.childrenWalkers[NodeType.Name] = ChildrenWalkers.walkNone; >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) >this : Symbol(AstWalkerFactory, Decl(parserRealSource12.ts, 67, 5)) >childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) ->ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) >ChildrenWalkers : Symbol(ChildrenWalkers, Decl(parserRealSource12.ts, 217, 5)) ->walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) this.childrenWalkers[NodeType.TypeRef] = ChildrenWalkers.walkTypeReferenceChildren; >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) @@ -920,17 +920,17 @@ module TypeScript { >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) >this : Symbol(AstWalkerFactory, Decl(parserRealSource12.ts, 67, 5)) >childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) ->ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) >ChildrenWalkers : Symbol(ChildrenWalkers, Decl(parserRealSource12.ts, 217, 5)) ->walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) this.childrenWalkers[NodeType.Continue] = ChildrenWalkers.walkNone; >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) >this : Symbol(AstWalkerFactory, Decl(parserRealSource12.ts, 67, 5)) >childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) ->ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) >ChildrenWalkers : Symbol(ChildrenWalkers, Decl(parserRealSource12.ts, 217, 5)) ->walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) this.childrenWalkers[NodeType.Throw] = ChildrenWalkers.walkUnaryExpressionChildren; >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) @@ -1120,49 +1120,49 @@ module TypeScript { >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) >this : Symbol(AstWalkerFactory, Decl(parserRealSource12.ts, 67, 5)) >childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) ->ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) >ChildrenWalkers : Symbol(ChildrenWalkers, Decl(parserRealSource12.ts, 217, 5)) ->walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) this.childrenWalkers[NodeType.GotoEB] = ChildrenWalkers.walkNone; >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) >this : Symbol(AstWalkerFactory, Decl(parserRealSource12.ts, 67, 5)) >childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) ->ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) >ChildrenWalkers : Symbol(ChildrenWalkers, Decl(parserRealSource12.ts, 217, 5)) ->walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) this.childrenWalkers[NodeType.EndCode] = ChildrenWalkers.walkNone; >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) >this : Symbol(AstWalkerFactory, Decl(parserRealSource12.ts, 67, 5)) >childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) ->ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) >ChildrenWalkers : Symbol(ChildrenWalkers, Decl(parserRealSource12.ts, 217, 5)) ->walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) this.childrenWalkers[NodeType.Error] = ChildrenWalkers.walkNone; >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) >this : Symbol(AstWalkerFactory, Decl(parserRealSource12.ts, 67, 5)) >childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) ->ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) >ChildrenWalkers : Symbol(ChildrenWalkers, Decl(parserRealSource12.ts, 217, 5)) ->walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) this.childrenWalkers[NodeType.Comment] = ChildrenWalkers.walkNone; >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) >this : Symbol(AstWalkerFactory, Decl(parserRealSource12.ts, 67, 5)) >childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) ->ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) >ChildrenWalkers : Symbol(ChildrenWalkers, Decl(parserRealSource12.ts, 217, 5)) ->walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) this.childrenWalkers[NodeType.Debugger] = ChildrenWalkers.walkNone; >this.childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) >this : Symbol(AstWalkerFactory, Decl(parserRealSource12.ts, 67, 5)) >childrenWalkers : Symbol(AstWalkerFactory.childrenWalkers, Decl(parserRealSource12.ts, 69, 35)) ->ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>ChildrenWalkers.walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) >ChildrenWalkers : Symbol(ChildrenWalkers, Decl(parserRealSource12.ts, 217, 5)) ->walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 28)) +>walkNone : Symbol(ChildrenWalkers.walkNone, Decl(parserRealSource12.ts, 219, 31)) // Verify the code is up to date with the enum for (var e in (NodeType)._map) { @@ -1201,17 +1201,17 @@ module TypeScript { >globalAstWalkerFactory : Symbol(globalAstWalkerFactory, Decl(parserRealSource12.ts, 210, 7)) } - module ChildrenWalkers { + namespace ChildrenWalkers { >ChildrenWalkers : Symbol(ChildrenWalkers, Decl(parserRealSource12.ts, 217, 5)) export function walkNone(preAst: ASTList, parent: AST, walker: IAstWalker): void { ->walkNone : Symbol(walkNone, Decl(parserRealSource12.ts, 219, 28)) +>walkNone : Symbol(walkNone, Decl(parserRealSource12.ts, 219, 31)) >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 220, 33)) >ASTList : Symbol(ASTList) >parent : Symbol(parent, Decl(parserRealSource12.ts, 220, 49)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 220, 62)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) // Nothing to do } @@ -1223,7 +1223,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 224, 57)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 224, 70)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) var len = preAst.members.length; >len : Symbol(len, Decl(parserRealSource12.ts, 225, 15)) @@ -1296,7 +1296,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 242, 76)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 242, 89)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) if (preAst.castTerm) { >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 242, 52)) @@ -1329,7 +1329,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 251, 78)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 251, 91)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) if (walker.options.reverseSiblings) { >walker.options.reverseSiblings : Symbol(AstWalkOptions.reverseSiblings, Decl(parserRealSource12.ts, 14, 36)) @@ -1403,7 +1403,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 269, 72)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 269, 85)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) if (preAst.term) { >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 269, 50)) @@ -1425,7 +1425,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 275, 74)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 275, 87)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) if (!walker.options.reverseSiblings) { >walker.options.reverseSiblings : Symbol(AstWalkOptions.reverseSiblings, Decl(parserRealSource12.ts, 14, 36)) @@ -1488,7 +1488,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 287, 84)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 287, 97)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) if (preAst.operand1) { >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 287, 54)) @@ -1542,7 +1542,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 299, 62)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 299, 75)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) if (preAst.name) { >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 299, 45)) @@ -1617,7 +1617,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 314, 64)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 314, 77)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) if (preAst.id) { >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 314, 46)) @@ -1667,7 +1667,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 326, 76)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 326, 89)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) if (preAst.returnExpression) { >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 326, 52)) @@ -1689,7 +1689,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 332, 70)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 332, 83)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) if (preAst.init) { >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 332, 49)) @@ -1762,7 +1762,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 350, 74)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 350, 87)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) preAst.lval = walker.walk(preAst.lval, preAst); >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 350, 51)) @@ -1812,7 +1812,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 360, 68)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 360, 81)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) preAst.cond = walker.walk(preAst.cond, preAst); >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 360, 48)) @@ -1863,7 +1863,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 370, 74)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 370, 87)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) preAst.cond = walker.walk(preAst.cond, preAst); >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 370, 51)) @@ -1898,7 +1898,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 377, 78)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 377, 91)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) preAst.cond = walker.walk(preAst.cond, preAst); >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 377, 53)) @@ -1933,7 +1933,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 384, 56)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 384, 69)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) if (preAst.statements) { >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 384, 42)) @@ -1956,7 +1956,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 390, 72)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 390, 85)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) if (preAst.expr) { >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 390, 50)) @@ -1996,7 +1996,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 400, 76)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 400, 89)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) if (preAst.val) { >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 400, 52)) @@ -2036,7 +2036,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 410, 52)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 410, 65)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) if (preAst.body) { >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 410, 40)) @@ -2058,7 +2058,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 416, 62)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 416, 75)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) if (preAst.tryNode) { >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 416, 45)) @@ -2099,7 +2099,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 426, 66)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 426, 79)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) if (preAst.tryNode) { >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 426, 47)) @@ -2139,7 +2139,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 436, 60)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 436, 73)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) if (preAst.body) { >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 436, 44)) @@ -2161,7 +2161,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 442, 56)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 442, 69)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) if (preAst.param) { >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 442, 42)) @@ -2201,7 +2201,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 452, 68)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 452, 81)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) preAst.name = walker.walk(preAst.name, preAst); >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 452, 43)) @@ -2239,7 +2239,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 460, 70)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 460, 83)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) walkRecordChildren(preAst, parent, walker); >walkRecordChildren : Symbol(walkRecordChildren, Decl(parserRealSource12.ts, 450, 9)) @@ -2255,7 +2255,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 464, 71)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 464, 84)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) walkNamedTypeChildren(preAst, parent, walker); >walkNamedTypeChildren : Symbol(walkNamedTypeChildren, Decl(parserRealSource12.ts, 458, 9)) @@ -2307,7 +2307,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 476, 58)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 476, 71)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) if (preAst.bod) { >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 476, 43)) @@ -2330,7 +2330,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 482, 74)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 482, 87)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) walkNamedTypeChildren(preAst, parent, walker); >walkNamedTypeChildren : Symbol(walkNamedTypeChildren, Decl(parserRealSource12.ts, 458, 9)) @@ -2383,7 +2383,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 495, 73)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 495, 86)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) walkRecordChildren(preAst, parent, walker); >walkRecordChildren : Symbol(walkRecordChildren, Decl(parserRealSource12.ts, 450, 9)) @@ -2399,7 +2399,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 499, 73)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 499, 86)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) if (preAst.id) { >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 499, 47)) @@ -2433,7 +2433,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 508, 72)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 508, 85)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) if (preAst.expr) { >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 508, 50)) @@ -2472,7 +2472,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 518, 56)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 518, 69)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) //TODO: Walk "id"? } @@ -2484,7 +2484,7 @@ module TypeScript { >parent : Symbol(parent, Decl(parserRealSource12.ts, 522, 78)) >AST : Symbol(AST) >walker : Symbol(walker, Decl(parserRealSource12.ts, 522, 91)) ->IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 19)) +>IAstWalker : Symbol(IAstWalker, Decl(parserRealSource12.ts, 5, 22)) preAst.labels = walker.walk(preAst.labels, preAst); >preAst : Symbol(preAst, Decl(parserRealSource12.ts, 522, 53)) diff --git a/tests/baselines/reference/parserRealSource12.types b/tests/baselines/reference/parserRealSource12.types index 6763d907264ef..5b21f67eea5e7 100644 --- a/tests/baselines/reference/parserRealSource12.types +++ b/tests/baselines/reference/parserRealSource12.types @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ @@ -3123,7 +3123,7 @@ module TypeScript { > : ^^^^^^^^^^^^^^^^ } - module ChildrenWalkers { + namespace ChildrenWalkers { >ChildrenWalkers : typeof ChildrenWalkers > : ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/parserRealSource13.errors.txt b/tests/baselines/reference/parserRealSource13.errors.txt index 2170deb93c140..1f964aef9f86a 100644 --- a/tests/baselines/reference/parserRealSource13.errors.txt +++ b/tests/baselines/reference/parserRealSource13.errors.txt @@ -124,7 +124,7 @@ parserRealSource13.ts(135,36): error TS2304: Cannot find name 'NodeType'. ~~~~~~~~~~~~~ !!! error TS6053: File 'typescript.ts' not found. - module TypeScript.AstWalkerWithDetailCallback { + namespace TypeScript.AstWalkerWithDetailCallback { export interface AstWalkerDetailCallback { EmptyCallback? (pre, ast: AST): boolean; ~~~ diff --git a/tests/baselines/reference/parserRealSource13.js b/tests/baselines/reference/parserRealSource13.js index 46383de17b828..f2b738f37b2ab 100644 --- a/tests/baselines/reference/parserRealSource13.js +++ b/tests/baselines/reference/parserRealSource13.js @@ -6,7 +6,7 @@ /// -module TypeScript.AstWalkerWithDetailCallback { +namespace TypeScript.AstWalkerWithDetailCallback { export interface AstWalkerDetailCallback { EmptyCallback? (pre, ast: AST): boolean; EmptyExprCallback? (pre, ast: AST): boolean; diff --git a/tests/baselines/reference/parserRealSource13.symbols b/tests/baselines/reference/parserRealSource13.symbols index 316b2e11c03aa..3a2b026856b78 100644 --- a/tests/baselines/reference/parserRealSource13.symbols +++ b/tests/baselines/reference/parserRealSource13.symbols @@ -6,12 +6,12 @@ /// -module TypeScript.AstWalkerWithDetailCallback { +namespace TypeScript.AstWalkerWithDetailCallback { >TypeScript : Symbol(TypeScript, Decl(parserRealSource13.ts, 0, 0)) ->AstWalkerWithDetailCallback : Symbol(AstWalkerWithDetailCallback, Decl(parserRealSource13.ts, 5, 18)) +>AstWalkerWithDetailCallback : Symbol(AstWalkerWithDetailCallback, Decl(parserRealSource13.ts, 5, 21)) export interface AstWalkerDetailCallback { ->AstWalkerDetailCallback : Symbol(AstWalkerDetailCallback, Decl(parserRealSource13.ts, 5, 47)) +>AstWalkerDetailCallback : Symbol(AstWalkerDetailCallback, Decl(parserRealSource13.ts, 5, 50)) EmptyCallback? (pre, ast: AST): boolean; >EmptyCallback : Symbol(AstWalkerDetailCallback.EmptyCallback, Decl(parserRealSource13.ts, 6, 46)) @@ -661,7 +661,7 @@ module TypeScript.AstWalkerWithDetailCallback { >script : Symbol(script, Decl(parserRealSource13.ts, 116, 25)) >Script : Symbol(Script) >callback : Symbol(callback, Decl(parserRealSource13.ts, 116, 40)) ->AstWalkerDetailCallback : Symbol(AstWalkerDetailCallback, Decl(parserRealSource13.ts, 5, 47)) +>AstWalkerDetailCallback : Symbol(AstWalkerDetailCallback, Decl(parserRealSource13.ts, 5, 50)) var pre = (cur: AST, parent: AST) => { >pre : Symbol(pre, Decl(parserRealSource13.ts, 117, 11)) @@ -713,7 +713,7 @@ module TypeScript.AstWalkerWithDetailCallback { >ast : Symbol(ast, Decl(parserRealSource13.ts, 131, 44)) >AST : Symbol(AST) >callback : Symbol(callback, Decl(parserRealSource13.ts, 131, 54)) ->AstWalkerDetailCallback : Symbol(AstWalkerDetailCallback, Decl(parserRealSource13.ts, 5, 47)) +>AstWalkerDetailCallback : Symbol(AstWalkerDetailCallback, Decl(parserRealSource13.ts, 5, 50)) // See if the Callback needs to be handled using specific one or default one var nodeType = ast.nodeType; diff --git a/tests/baselines/reference/parserRealSource13.types b/tests/baselines/reference/parserRealSource13.types index 90f4660a711ff..8d039138f9d1d 100644 --- a/tests/baselines/reference/parserRealSource13.types +++ b/tests/baselines/reference/parserRealSource13.types @@ -6,7 +6,7 @@ /// -module TypeScript.AstWalkerWithDetailCallback { +namespace TypeScript.AstWalkerWithDetailCallback { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ >AstWalkerWithDetailCallback : typeof AstWalkerWithDetailCallback diff --git a/tests/baselines/reference/parserRealSource14.errors.txt b/tests/baselines/reference/parserRealSource14.errors.txt index 417b0c7c6bb3e..7c74bb3299530 100644 --- a/tests/baselines/reference/parserRealSource14.errors.txt +++ b/tests/baselines/reference/parserRealSource14.errors.txt @@ -168,7 +168,7 @@ parserRealSource14.ts(572,20): error TS2339: Property 'getAstWalkerFactory' does ~~~~~~~~~~~~~ !!! error TS6053: File 'typescript.ts' not found. - module TypeScript { + namespace TypeScript { export function lastOf(items: any[]): any { return (items === null || items.length === 0) ? null : items[items.length - 1]; } diff --git a/tests/baselines/reference/parserRealSource14.js b/tests/baselines/reference/parserRealSource14.js index 2d54636a488fa..cf66b1301f0cb 100644 --- a/tests/baselines/reference/parserRealSource14.js +++ b/tests/baselines/reference/parserRealSource14.js @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { export function lastOf(items: any[]): any { return (items === null || items.length === 0) ? null : items[items.length - 1]; } diff --git a/tests/baselines/reference/parserRealSource14.symbols b/tests/baselines/reference/parserRealSource14.symbols index 7db46eceffe1e..44f9aeec74a02 100644 --- a/tests/baselines/reference/parserRealSource14.symbols +++ b/tests/baselines/reference/parserRealSource14.symbols @@ -6,11 +6,11 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : Symbol(TypeScript, Decl(parserRealSource14.ts, 0, 0)) export function lastOf(items: any[]): any { ->lastOf : Symbol(lastOf, Decl(parserRealSource14.ts, 5, 19)) +>lastOf : Symbol(lastOf, Decl(parserRealSource14.ts, 5, 22)) >items : Symbol(items, Decl(parserRealSource14.ts, 6, 27)) return (items === null || items.length === 0) ? null : items[items.length - 1]; @@ -537,7 +537,7 @@ module TypeScript { var ast = lastOf(this.asts); >ast : Symbol(ast, Decl(parserRealSource14.ts, 144, 15)) ->lastOf : Symbol(lastOf, Decl(parserRealSource14.ts, 5, 19)) +>lastOf : Symbol(lastOf, Decl(parserRealSource14.ts, 5, 22)) >this.asts : Symbol(AstPath.asts, Decl(parserRealSource14.ts, 22, 26)) >this : Symbol(AstPath, Decl(parserRealSource14.ts, 16, 5)) >asts : Symbol(AstPath.asts, Decl(parserRealSource14.ts, 22, 26)) @@ -580,7 +580,7 @@ module TypeScript { var ast = lastOf(this.asts); >ast : Symbol(ast, Decl(parserRealSource14.ts, 152, 15)) ->lastOf : Symbol(lastOf, Decl(parserRealSource14.ts, 5, 19)) +>lastOf : Symbol(lastOf, Decl(parserRealSource14.ts, 5, 22)) >this.asts : Symbol(AstPath.asts, Decl(parserRealSource14.ts, 22, 26)) >this : Symbol(AstPath, Decl(parserRealSource14.ts, 16, 5)) >asts : Symbol(AstPath.asts, Decl(parserRealSource14.ts, 22, 26)) @@ -623,7 +623,7 @@ module TypeScript { var ast = lastOf(this.asts); >ast : Symbol(ast, Decl(parserRealSource14.ts, 160, 15)) ->lastOf : Symbol(lastOf, Decl(parserRealSource14.ts, 5, 19)) +>lastOf : Symbol(lastOf, Decl(parserRealSource14.ts, 5, 22)) >this.asts : Symbol(AstPath.asts, Decl(parserRealSource14.ts, 22, 26)) >this : Symbol(AstPath, Decl(parserRealSource14.ts, 16, 5)) >asts : Symbol(AstPath.asts, Decl(parserRealSource14.ts, 22, 26)) @@ -666,7 +666,7 @@ module TypeScript { var ast = lastOf(this.asts); >ast : Symbol(ast, Decl(parserRealSource14.ts, 168, 15)) ->lastOf : Symbol(lastOf, Decl(parserRealSource14.ts, 5, 19)) +>lastOf : Symbol(lastOf, Decl(parserRealSource14.ts, 5, 22)) >this.asts : Symbol(AstPath.asts, Decl(parserRealSource14.ts, 22, 26)) >this : Symbol(AstPath, Decl(parserRealSource14.ts, 16, 5)) >asts : Symbol(AstPath.asts, Decl(parserRealSource14.ts, 22, 26)) @@ -769,7 +769,7 @@ module TypeScript { var ast = lastOf(this.asts); >ast : Symbol(ast, Decl(parserRealSource14.ts, 181, 15)) ->lastOf : Symbol(lastOf, Decl(parserRealSource14.ts, 5, 19)) +>lastOf : Symbol(lastOf, Decl(parserRealSource14.ts, 5, 22)) >this.asts : Symbol(AstPath.asts, Decl(parserRealSource14.ts, 22, 26)) >this : Symbol(AstPath, Decl(parserRealSource14.ts, 16, 5)) >asts : Symbol(AstPath.asts, Decl(parserRealSource14.ts, 22, 26)) diff --git a/tests/baselines/reference/parserRealSource14.types b/tests/baselines/reference/parserRealSource14.types index 6619d911f4142..defd8f53d4381 100644 --- a/tests/baselines/reference/parserRealSource14.types +++ b/tests/baselines/reference/parserRealSource14.types @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/parserRealSource2.errors.txt b/tests/baselines/reference/parserRealSource2.errors.txt index fe21785dbda33..fcdda1ba74ee7 100644 --- a/tests/baselines/reference/parserRealSource2.errors.txt +++ b/tests/baselines/reference/parserRealSource2.errors.txt @@ -9,7 +9,7 @@ parserRealSource2.ts(4,21): error TS6053: File 'typescript.ts' not found. ~~~~~~~~~~~~~ !!! error TS6053: File 'typescript.ts' not found. - module TypeScript { + namespace TypeScript { export function hasFlag(val: number, flag: number) { return (val & flag) != 0; diff --git a/tests/baselines/reference/parserRealSource2.js b/tests/baselines/reference/parserRealSource2.js index a405ead193982..99ef9562d7577 100644 --- a/tests/baselines/reference/parserRealSource2.js +++ b/tests/baselines/reference/parserRealSource2.js @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { export function hasFlag(val: number, flag: number) { return (val & flag) != 0; diff --git a/tests/baselines/reference/parserRealSource2.symbols b/tests/baselines/reference/parserRealSource2.symbols index c53f7a6145327..fb8f0a7966c99 100644 --- a/tests/baselines/reference/parserRealSource2.symbols +++ b/tests/baselines/reference/parserRealSource2.symbols @@ -6,11 +6,11 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : Symbol(TypeScript, Decl(parserRealSource2.ts, 0, 0)) export function hasFlag(val: number, flag: number) { ->hasFlag : Symbol(hasFlag, Decl(parserRealSource2.ts, 5, 19)) +>hasFlag : Symbol(hasFlag, Decl(parserRealSource2.ts, 5, 22)) >val : Symbol(val, Decl(parserRealSource2.ts, 7, 28)) >flag : Symbol(flag, Decl(parserRealSource2.ts, 7, 40)) diff --git a/tests/baselines/reference/parserRealSource2.types b/tests/baselines/reference/parserRealSource2.types index beb7a8348569c..43c6f739cc829 100644 --- a/tests/baselines/reference/parserRealSource2.types +++ b/tests/baselines/reference/parserRealSource2.types @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/parserRealSource3.errors.txt b/tests/baselines/reference/parserRealSource3.errors.txt index ad9c1f9ac64b5..1ca604b03bdcb 100644 --- a/tests/baselines/reference/parserRealSource3.errors.txt +++ b/tests/baselines/reference/parserRealSource3.errors.txt @@ -9,7 +9,7 @@ parserRealSource3.ts(4,21): error TS6053: File 'typescript.ts' not found. ~~~~~~~~~~~~~ !!! error TS6053: File 'typescript.ts' not found. - module TypeScript { + namespace TypeScript { // Note: Any addition to the NodeType should also be supported with addition to AstWalkerDetailCallback export enum NodeType { None, diff --git a/tests/baselines/reference/parserRealSource3.js b/tests/baselines/reference/parserRealSource3.js index a1d12e2dd8e77..f806337f34d98 100644 --- a/tests/baselines/reference/parserRealSource3.js +++ b/tests/baselines/reference/parserRealSource3.js @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { // Note: Any addition to the NodeType should also be supported with addition to AstWalkerDetailCallback export enum NodeType { None, diff --git a/tests/baselines/reference/parserRealSource3.symbols b/tests/baselines/reference/parserRealSource3.symbols index 24af4f3811543..3e47146c11774 100644 --- a/tests/baselines/reference/parserRealSource3.symbols +++ b/tests/baselines/reference/parserRealSource3.symbols @@ -6,12 +6,12 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : Symbol(TypeScript, Decl(parserRealSource3.ts, 0, 0)) // Note: Any addition to the NodeType should also be supported with addition to AstWalkerDetailCallback export enum NodeType { ->NodeType : Symbol(NodeType, Decl(parserRealSource3.ts, 5, 19)) +>NodeType : Symbol(NodeType, Decl(parserRealSource3.ts, 5, 22)) None, >None : Symbol(NodeType.None, Decl(parserRealSource3.ts, 7, 26)) diff --git a/tests/baselines/reference/parserRealSource3.types b/tests/baselines/reference/parserRealSource3.types index 619ca03a399cd..7a6d457f382c4 100644 --- a/tests/baselines/reference/parserRealSource3.types +++ b/tests/baselines/reference/parserRealSource3.types @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/parserRealSource4.errors.txt b/tests/baselines/reference/parserRealSource4.errors.txt index d20b223402471..0a6d4abe317b1 100644 --- a/tests/baselines/reference/parserRealSource4.errors.txt +++ b/tests/baselines/reference/parserRealSource4.errors.txt @@ -10,7 +10,7 @@ parserRealSource4.ts(195,38): error TS1011: An element access expression should ~~~~~~~~~~~~~ !!! error TS6053: File 'typescript.ts' not found. - module TypeScript { + namespace TypeScript { export class BlockIntrinsics { public prototype = undefined; diff --git a/tests/baselines/reference/parserRealSource4.js b/tests/baselines/reference/parserRealSource4.js index 525c76cfaa6b3..90188c23e9d82 100644 --- a/tests/baselines/reference/parserRealSource4.js +++ b/tests/baselines/reference/parserRealSource4.js @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { export class BlockIntrinsics { public prototype = undefined; diff --git a/tests/baselines/reference/parserRealSource4.symbols b/tests/baselines/reference/parserRealSource4.symbols index ce03b550d193d..796fef4fb253f 100644 --- a/tests/baselines/reference/parserRealSource4.symbols +++ b/tests/baselines/reference/parserRealSource4.symbols @@ -6,11 +6,11 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : Symbol(TypeScript, Decl(parserRealSource4.ts, 0, 0)) export class BlockIntrinsics { ->BlockIntrinsics : Symbol(BlockIntrinsics, Decl(parserRealSource4.ts, 5, 19)) +>BlockIntrinsics : Symbol(BlockIntrinsics, Decl(parserRealSource4.ts, 5, 22)) public prototype = undefined; >prototype : Symbol(BlockIntrinsics.prototype, Decl(parserRealSource4.ts, 7, 34)) @@ -43,7 +43,7 @@ module TypeScript { constructor () { // initialize the 'constructor' field this["constructor"] = undefined; ->this : Symbol(BlockIntrinsics, Decl(parserRealSource4.ts, 5, 19)) +>this : Symbol(BlockIntrinsics, Decl(parserRealSource4.ts, 5, 22)) >"constructor" : Symbol(Object.constructor, Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) } @@ -106,7 +106,7 @@ module TypeScript { public table = ( new BlockIntrinsics()); >table : Symbol(StringHashTable.table, Decl(parserRealSource4.ts, 34, 29)) ->BlockIntrinsics : Symbol(BlockIntrinsics, Decl(parserRealSource4.ts, 5, 19)) +>BlockIntrinsics : Symbol(BlockIntrinsics, Decl(parserRealSource4.ts, 5, 22)) public getAllKeys(): string[]{ >getAllKeys : Symbol(StringHashTable.getAllKeys, Decl(parserRealSource4.ts, 35, 58)) diff --git a/tests/baselines/reference/parserRealSource4.types b/tests/baselines/reference/parserRealSource4.types index 639d1e2f0595e..f876a886e5662 100644 --- a/tests/baselines/reference/parserRealSource4.types +++ b/tests/baselines/reference/parserRealSource4.types @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/parserRealSource5.errors.txt b/tests/baselines/reference/parserRealSource5.errors.txt index 9166edb4e681e..5921f8d26ae01 100644 --- a/tests/baselines/reference/parserRealSource5.errors.txt +++ b/tests/baselines/reference/parserRealSource5.errors.txt @@ -17,7 +17,7 @@ parserRealSource5.ts(61,65): error TS2304: Cannot find name 'IAstWalker'. ~~~~~~~~~~~~~ !!! error TS6053: File 'typescript.ts' not found. - module TypeScript { + namespace TypeScript { // TODO: refactor indent logic for use in emit export class PrintContext { public builder = ""; diff --git a/tests/baselines/reference/parserRealSource5.js b/tests/baselines/reference/parserRealSource5.js index 552eb54f3be6f..6b6d7e645e63f 100644 --- a/tests/baselines/reference/parserRealSource5.js +++ b/tests/baselines/reference/parserRealSource5.js @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { // TODO: refactor indent logic for use in emit export class PrintContext { public builder = ""; diff --git a/tests/baselines/reference/parserRealSource5.symbols b/tests/baselines/reference/parserRealSource5.symbols index b6fafda41b25b..5cf928d5df93d 100644 --- a/tests/baselines/reference/parserRealSource5.symbols +++ b/tests/baselines/reference/parserRealSource5.symbols @@ -6,12 +6,12 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : Symbol(TypeScript, Decl(parserRealSource5.ts, 0, 0)) // TODO: refactor indent logic for use in emit export class PrintContext { ->PrintContext : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 19)) +>PrintContext : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 22)) public builder = ""; >builder : Symbol(PrintContext.builder, Decl(parserRealSource5.ts, 7, 31)) @@ -37,7 +37,7 @@ module TypeScript { this.indentAmt++; >this.indentAmt : Symbol(PrintContext.indentAmt, Decl(parserRealSource5.ts, 10, 44)) ->this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 19)) +>this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 22)) >indentAmt : Symbol(PrintContext.indentAmt, Decl(parserRealSource5.ts, 10, 44)) } @@ -46,7 +46,7 @@ module TypeScript { this.indentAmt--; >this.indentAmt : Symbol(PrintContext.indentAmt, Decl(parserRealSource5.ts, 10, 44)) ->this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 19)) +>this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 22)) >indentAmt : Symbol(PrintContext.indentAmt, Decl(parserRealSource5.ts, 10, 44)) } @@ -56,22 +56,22 @@ module TypeScript { if (this.builder.length > 0) { >this.builder.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --)) >this.builder : Symbol(PrintContext.builder, Decl(parserRealSource5.ts, 7, 31)) ->this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 19)) +>this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 22)) >builder : Symbol(PrintContext.builder, Decl(parserRealSource5.ts, 7, 31)) >length : Symbol(String.length, Decl(lib.es5.d.ts, --, --)) CompilerDiagnostics.Alert(this.builder); >this.builder : Symbol(PrintContext.builder, Decl(parserRealSource5.ts, 7, 31)) ->this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 19)) +>this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 22)) >builder : Symbol(PrintContext.builder, Decl(parserRealSource5.ts, 7, 31)) } var indentString = this.indentStrings[this.indentAmt]; >indentString : Symbol(indentString, Decl(parserRealSource5.ts, 28, 15)) >this.indentStrings : Symbol(PrintContext.indentStrings, Decl(parserRealSource5.ts, 9, 30)) ->this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 19)) +>this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 22)) >indentStrings : Symbol(PrintContext.indentStrings, Decl(parserRealSource5.ts, 9, 30)) >this.indentAmt : Symbol(PrintContext.indentAmt, Decl(parserRealSource5.ts, 10, 44)) ->this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 19)) +>this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 22)) >indentAmt : Symbol(PrintContext.indentAmt, Decl(parserRealSource5.ts, 10, 44)) if (indentString === undefined) { @@ -85,28 +85,28 @@ module TypeScript { >i : Symbol(i, Decl(parserRealSource5.ts, 31, 24)) >i : Symbol(i, Decl(parserRealSource5.ts, 31, 24)) >this.indentAmt : Symbol(PrintContext.indentAmt, Decl(parserRealSource5.ts, 10, 44)) ->this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 19)) +>this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 22)) >indentAmt : Symbol(PrintContext.indentAmt, Decl(parserRealSource5.ts, 10, 44)) >i : Symbol(i, Decl(parserRealSource5.ts, 31, 24)) indentString += this.indent1; >indentString : Symbol(indentString, Decl(parserRealSource5.ts, 28, 15)) >this.indent1 : Symbol(PrintContext.indent1, Decl(parserRealSource5.ts, 8, 28)) ->this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 19)) +>this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 22)) >indent1 : Symbol(PrintContext.indent1, Decl(parserRealSource5.ts, 8, 28)) } this.indentStrings[this.indentAmt] = indentString; >this.indentStrings : Symbol(PrintContext.indentStrings, Decl(parserRealSource5.ts, 9, 30)) ->this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 19)) +>this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 22)) >indentStrings : Symbol(PrintContext.indentStrings, Decl(parserRealSource5.ts, 9, 30)) >this.indentAmt : Symbol(PrintContext.indentAmt, Decl(parserRealSource5.ts, 10, 44)) ->this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 19)) +>this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 22)) >indentAmt : Symbol(PrintContext.indentAmt, Decl(parserRealSource5.ts, 10, 44)) >indentString : Symbol(indentString, Decl(parserRealSource5.ts, 28, 15)) } this.builder += indentString; >this.builder : Symbol(PrintContext.builder, Decl(parserRealSource5.ts, 7, 31)) ->this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 19)) +>this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 22)) >builder : Symbol(PrintContext.builder, Decl(parserRealSource5.ts, 7, 31)) >indentString : Symbol(indentString, Decl(parserRealSource5.ts, 28, 15)) } @@ -117,7 +117,7 @@ module TypeScript { this.builder += s; >this.builder : Symbol(PrintContext.builder, Decl(parserRealSource5.ts, 7, 31)) ->this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 19)) +>this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 22)) >builder : Symbol(PrintContext.builder, Decl(parserRealSource5.ts, 7, 31)) >s : Symbol(s, Decl(parserRealSource5.ts, 39, 21)) } @@ -128,23 +128,23 @@ module TypeScript { this.builder += s; >this.builder : Symbol(PrintContext.builder, Decl(parserRealSource5.ts, 7, 31)) ->this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 19)) +>this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 22)) >builder : Symbol(PrintContext.builder, Decl(parserRealSource5.ts, 7, 31)) >s : Symbol(s, Decl(parserRealSource5.ts, 43, 25)) this.outfile.WriteLine(this.builder); >this.outfile.WriteLine : Symbol(ITextWriter.WriteLine, Decl(lib.scripthost.d.ts, --, --)) >this.outfile : Symbol(PrintContext.outfile, Decl(parserRealSource5.ts, 13, 21)) ->this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 19)) +>this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 22)) >outfile : Symbol(PrintContext.outfile, Decl(parserRealSource5.ts, 13, 21)) >WriteLine : Symbol(ITextWriter.WriteLine, Decl(lib.scripthost.d.ts, --, --)) >this.builder : Symbol(PrintContext.builder, Decl(parserRealSource5.ts, 7, 31)) ->this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 19)) +>this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 22)) >builder : Symbol(PrintContext.builder, Decl(parserRealSource5.ts, 7, 31)) this.builder = ""; >this.builder : Symbol(PrintContext.builder, Decl(parserRealSource5.ts, 7, 31)) ->this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 19)) +>this : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 22)) >builder : Symbol(PrintContext.builder, Decl(parserRealSource5.ts, 7, 31)) } @@ -161,8 +161,8 @@ module TypeScript { var pc: PrintContext = walker.state; >pc : Symbol(pc, Decl(parserRealSource5.ts, 52, 11)) ->PrintContext : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 19)) ->PrintContext : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 19)) +>PrintContext : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 22)) +>PrintContext : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 22)) >walker : Symbol(walker, Decl(parserRealSource5.ts, 51, 54)) ast.print(pc); @@ -190,8 +190,8 @@ module TypeScript { var pc: PrintContext = walker.state; >pc : Symbol(pc, Decl(parserRealSource5.ts, 61, 11)) ->PrintContext : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 19)) ->PrintContext : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 19)) +>PrintContext : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 22)) +>PrintContext : Symbol(PrintContext, Decl(parserRealSource5.ts, 5, 22)) >walker : Symbol(walker, Decl(parserRealSource5.ts, 60, 55)) pc.decreaseIndent(); diff --git a/tests/baselines/reference/parserRealSource5.types b/tests/baselines/reference/parserRealSource5.types index 8f3ed1a4a4b1f..cbdcde43e589a 100644 --- a/tests/baselines/reference/parserRealSource5.types +++ b/tests/baselines/reference/parserRealSource5.types @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/parserRealSource6.errors.txt b/tests/baselines/reference/parserRealSource6.errors.txt index 9099081e6cd29..a46db5e35aef3 100644 --- a/tests/baselines/reference/parserRealSource6.errors.txt +++ b/tests/baselines/reference/parserRealSource6.errors.txt @@ -68,7 +68,7 @@ parserRealSource6.ts(215,20): error TS2339: Property 'getAstWalkerFactory' does ~~~~~~~~~~~~~ !!! error TS6053: File 'typescript.ts' not found. - module TypeScript { + namespace TypeScript { export class TypeCollectionContext { public script: Script = null; ~~~~~~ diff --git a/tests/baselines/reference/parserRealSource6.js b/tests/baselines/reference/parserRealSource6.js index 83438ab7caf64..0fdc21406b3fd 100644 --- a/tests/baselines/reference/parserRealSource6.js +++ b/tests/baselines/reference/parserRealSource6.js @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { export class TypeCollectionContext { public script: Script = null; diff --git a/tests/baselines/reference/parserRealSource6.symbols b/tests/baselines/reference/parserRealSource6.symbols index b14fed9cd24fb..302fec9cd4357 100644 --- a/tests/baselines/reference/parserRealSource6.symbols +++ b/tests/baselines/reference/parserRealSource6.symbols @@ -6,11 +6,11 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : Symbol(TypeScript, Decl(parserRealSource6.ts, 0, 0)) export class TypeCollectionContext { ->TypeCollectionContext : Symbol(TypeCollectionContext, Decl(parserRealSource6.ts, 5, 19)) +>TypeCollectionContext : Symbol(TypeCollectionContext, Decl(parserRealSource6.ts, 5, 22)) public script: Script = null; >script : Symbol(TypeCollectionContext.script, Decl(parserRealSource6.ts, 6, 40)) @@ -306,7 +306,7 @@ module TypeScript { context: TypeCollectionContext, >context : Symbol(context, Decl(parserRealSource6.ts, 95, 44)) ->TypeCollectionContext : Symbol(TypeCollectionContext, Decl(parserRealSource6.ts, 5, 19)) +>TypeCollectionContext : Symbol(TypeCollectionContext, Decl(parserRealSource6.ts, 5, 22)) thisType: Type, >thisType : Symbol(thisType, Decl(parserRealSource6.ts, 96, 39)) @@ -359,7 +359,7 @@ module TypeScript { export function popTypeCollectionScope(context: TypeCollectionContext) { >popTypeCollectionScope : Symbol(popTypeCollectionScope, Decl(parserRealSource6.ts, 106, 5)) >context : Symbol(context, Decl(parserRealSource6.ts, 108, 43)) ->TypeCollectionContext : Symbol(TypeCollectionContext, Decl(parserRealSource6.ts, 5, 19)) +>TypeCollectionContext : Symbol(TypeCollectionContext, Decl(parserRealSource6.ts, 5, 22)) context.scopeChain = context.scopeChain.previous; >context.scopeChain : Symbol(TypeCollectionContext.scopeChain, Decl(parserRealSource6.ts, 9, 21)) diff --git a/tests/baselines/reference/parserRealSource6.types b/tests/baselines/reference/parserRealSource6.types index 0ca3b7cf60791..fe802d1e49648 100644 --- a/tests/baselines/reference/parserRealSource6.types +++ b/tests/baselines/reference/parserRealSource6.types @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/parserRealSource7.errors.txt b/tests/baselines/reference/parserRealSource7.errors.txt index bb52a1a2e0c45..b2fe845e3d6cc 100644 --- a/tests/baselines/reference/parserRealSource7.errors.txt +++ b/tests/baselines/reference/parserRealSource7.errors.txt @@ -312,7 +312,7 @@ parserRealSource7.ts(828,13): error TS2304: Cannot find name 'popTypeCollectionS ~~~~~~~~~~~~~ !!! error TS6053: File 'typescript.ts' not found. - module TypeScript { + namespace TypeScript { export class Continuation { public exceptionBlock = -1; constructor (public normalBlock: number) { } diff --git a/tests/baselines/reference/parserRealSource7.js b/tests/baselines/reference/parserRealSource7.js index ac7a7fbca80aa..b5d5981220927 100644 --- a/tests/baselines/reference/parserRealSource7.js +++ b/tests/baselines/reference/parserRealSource7.js @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { export class Continuation { public exceptionBlock = -1; constructor (public normalBlock: number) { } diff --git a/tests/baselines/reference/parserRealSource7.symbols b/tests/baselines/reference/parserRealSource7.symbols index 65f154f911a85..6ba7c7012face 100644 --- a/tests/baselines/reference/parserRealSource7.symbols +++ b/tests/baselines/reference/parserRealSource7.symbols @@ -6,11 +6,11 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : Symbol(TypeScript, Decl(parserRealSource7.ts, 0, 0)) export class Continuation { ->Continuation : Symbol(Continuation, Decl(parserRealSource7.ts, 5, 19)) +>Continuation : Symbol(Continuation, Decl(parserRealSource7.ts, 5, 22)) public exceptionBlock = -1; >exceptionBlock : Symbol(Continuation.exceptionBlock, Decl(parserRealSource7.ts, 6, 31)) diff --git a/tests/baselines/reference/parserRealSource7.types b/tests/baselines/reference/parserRealSource7.types index 8b2d40b9c40ca..f619b78c885fa 100644 --- a/tests/baselines/reference/parserRealSource7.types +++ b/tests/baselines/reference/parserRealSource7.types @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/parserRealSource8.errors.txt b/tests/baselines/reference/parserRealSource8.errors.txt index 9a767155b9ea9..0994c05d7dc43 100644 --- a/tests/baselines/reference/parserRealSource8.errors.txt +++ b/tests/baselines/reference/parserRealSource8.errors.txt @@ -138,7 +138,7 @@ parserRealSource8.ts(454,35): error TS2304: Cannot find name 'Catch'. ~~~~~~~~~~~~~ !!! error TS6053: File 'typescript.ts' not found. - module TypeScript { + namespace TypeScript { export class AssignScopeContext { constructor (public scopeChain: ScopeChain, diff --git a/tests/baselines/reference/parserRealSource8.js b/tests/baselines/reference/parserRealSource8.js index 62b8716757dad..8756d6291c7de 100644 --- a/tests/baselines/reference/parserRealSource8.js +++ b/tests/baselines/reference/parserRealSource8.js @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { export class AssignScopeContext { constructor (public scopeChain: ScopeChain, diff --git a/tests/baselines/reference/parserRealSource8.symbols b/tests/baselines/reference/parserRealSource8.symbols index 8233d5d9b9d5b..004ffd6f0fc62 100644 --- a/tests/baselines/reference/parserRealSource8.symbols +++ b/tests/baselines/reference/parserRealSource8.symbols @@ -6,11 +6,11 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : Symbol(TypeScript, Decl(parserRealSource8.ts, 0, 0)) export class AssignScopeContext { ->AssignScopeContext : Symbol(AssignScopeContext, Decl(parserRealSource8.ts, 5, 19)) +>AssignScopeContext : Symbol(AssignScopeContext, Decl(parserRealSource8.ts, 5, 22)) constructor (public scopeChain: ScopeChain, >scopeChain : Symbol(AssignScopeContext.scopeChain, Decl(parserRealSource8.ts, 8, 21)) @@ -33,7 +33,7 @@ module TypeScript { context: AssignScopeContext, >context : Symbol(context, Decl(parserRealSource8.ts, 14, 55)) ->AssignScopeContext : Symbol(AssignScopeContext, Decl(parserRealSource8.ts, 5, 19)) +>AssignScopeContext : Symbol(AssignScopeContext, Decl(parserRealSource8.ts, 5, 22)) type: Type, >type : Symbol(type, Decl(parserRealSource8.ts, 15, 36)) @@ -76,7 +76,7 @@ module TypeScript { export function popAssignScope(context: AssignScopeContext) { >popAssignScope : Symbol(popAssignScope, Decl(parserRealSource8.ts, 25, 5)) >context : Symbol(context, Decl(parserRealSource8.ts, 27, 35)) ->AssignScopeContext : Symbol(AssignScopeContext, Decl(parserRealSource8.ts, 5, 19)) +>AssignScopeContext : Symbol(AssignScopeContext, Decl(parserRealSource8.ts, 5, 22)) context.scopeChain = context.scopeChain.previous; >context.scopeChain : Symbol(AssignScopeContext.scopeChain, Decl(parserRealSource8.ts, 8, 21)) @@ -192,7 +192,7 @@ module TypeScript { >ast : Symbol(ast, Decl(parserRealSource8.ts, 68, 42)) >AST : Symbol(AST) >context : Symbol(context, Decl(parserRealSource8.ts, 68, 51)) ->AssignScopeContext : Symbol(AssignScopeContext, Decl(parserRealSource8.ts, 5, 19)) +>AssignScopeContext : Symbol(AssignScopeContext, Decl(parserRealSource8.ts, 5, 22)) var moduleDecl = ast; >moduleDecl : Symbol(moduleDecl, Decl(parserRealSource8.ts, 69, 11)) @@ -295,7 +295,7 @@ module TypeScript { >ast : Symbol(ast, Decl(parserRealSource8.ts, 98, 41)) >AST : Symbol(AST) >context : Symbol(context, Decl(parserRealSource8.ts, 98, 50)) ->AssignScopeContext : Symbol(AssignScopeContext, Decl(parserRealSource8.ts, 5, 19)) +>AssignScopeContext : Symbol(AssignScopeContext, Decl(parserRealSource8.ts, 5, 22)) var classDecl = ast; >classDecl : Symbol(classDecl, Decl(parserRealSource8.ts, 99, 11)) @@ -411,7 +411,7 @@ module TypeScript { >ast : Symbol(ast, Decl(parserRealSource8.ts, 135, 45)) >AST : Symbol(AST) >context : Symbol(context, Decl(parserRealSource8.ts, 135, 54)) ->AssignScopeContext : Symbol(AssignScopeContext, Decl(parserRealSource8.ts, 5, 19)) +>AssignScopeContext : Symbol(AssignScopeContext, Decl(parserRealSource8.ts, 5, 22)) var interfaceDecl = ast; >interfaceDecl : Symbol(interfaceDecl, Decl(parserRealSource8.ts, 136, 11)) @@ -480,7 +480,7 @@ module TypeScript { >ast : Symbol(ast, Decl(parserRealSource8.ts, 154, 40)) >AST : Symbol(AST) >context : Symbol(context, Decl(parserRealSource8.ts, 154, 49)) ->AssignScopeContext : Symbol(AssignScopeContext, Decl(parserRealSource8.ts, 5, 19)) +>AssignScopeContext : Symbol(AssignScopeContext, Decl(parserRealSource8.ts, 5, 22)) var withStmt = ast; >withStmt : Symbol(withStmt, Decl(parserRealSource8.ts, 155, 11)) @@ -552,7 +552,7 @@ module TypeScript { >ast : Symbol(ast, Decl(parserRealSource8.ts, 175, 44)) >AST : Symbol(AST) >context : Symbol(context, Decl(parserRealSource8.ts, 175, 53)) ->AssignScopeContext : Symbol(AssignScopeContext, Decl(parserRealSource8.ts, 5, 19)) +>AssignScopeContext : Symbol(AssignScopeContext, Decl(parserRealSource8.ts, 5, 22)) var funcDecl = ast; >funcDecl : Symbol(funcDecl, Decl(parserRealSource8.ts, 176, 11)) @@ -1115,7 +1115,7 @@ module TypeScript { >ast : Symbol(ast, Decl(parserRealSource8.ts, 377, 41)) >AST : Symbol(AST) >context : Symbol(context, Decl(parserRealSource8.ts, 377, 50)) ->AssignScopeContext : Symbol(AssignScopeContext, Decl(parserRealSource8.ts, 5, 19)) +>AssignScopeContext : Symbol(AssignScopeContext, Decl(parserRealSource8.ts, 5, 22)) var catchBlock = ast; >catchBlock : Symbol(catchBlock, Decl(parserRealSource8.ts, 378, 11)) @@ -1171,7 +1171,7 @@ module TypeScript { var context:AssignScopeContext = walker.state; >context : Symbol(context, Decl(parserRealSource8.ts, 389, 11)) ->AssignScopeContext : Symbol(AssignScopeContext, Decl(parserRealSource8.ts, 5, 19)) +>AssignScopeContext : Symbol(AssignScopeContext, Decl(parserRealSource8.ts, 5, 22)) >walker : Symbol(walker, Decl(parserRealSource8.ts, 388, 58)) var go = true; @@ -1268,7 +1268,7 @@ module TypeScript { var context:AssignScopeContext = walker.state; >context : Symbol(context, Decl(parserRealSource8.ts, 424, 11)) ->AssignScopeContext : Symbol(AssignScopeContext, Decl(parserRealSource8.ts, 5, 19)) +>AssignScopeContext : Symbol(AssignScopeContext, Decl(parserRealSource8.ts, 5, 22)) >walker : Symbol(walker, Decl(parserRealSource8.ts, 423, 59)) var go = true; diff --git a/tests/baselines/reference/parserRealSource8.types b/tests/baselines/reference/parserRealSource8.types index 011cf47ae9f94..7e66ee5ee32b5 100644 --- a/tests/baselines/reference/parserRealSource8.types +++ b/tests/baselines/reference/parserRealSource8.types @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/parserRealSource9.errors.txt b/tests/baselines/reference/parserRealSource9.errors.txt index c8c7ac6a30ca2..10a644fd2c619 100644 --- a/tests/baselines/reference/parserRealSource9.errors.txt +++ b/tests/baselines/reference/parserRealSource9.errors.txt @@ -47,7 +47,7 @@ parserRealSource9.ts(200,48): error TS2304: Cannot find name 'IHashTable'. ~~~~~~~~~~~~~ !!! error TS6053: File 'typescript.ts' not found. - module TypeScript { + namespace TypeScript { export class Binder { constructor (public checker: TypeChecker) { } ~~~~~~~~~~~ diff --git a/tests/baselines/reference/parserRealSource9.js b/tests/baselines/reference/parserRealSource9.js index e03ae91c66f23..0923fae8d1f59 100644 --- a/tests/baselines/reference/parserRealSource9.js +++ b/tests/baselines/reference/parserRealSource9.js @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { export class Binder { constructor (public checker: TypeChecker) { } public resolveBaseTypeLinks(typeLinks: TypeLink[], scope: SymbolScope) { diff --git a/tests/baselines/reference/parserRealSource9.symbols b/tests/baselines/reference/parserRealSource9.symbols index b5a9445f6e76d..73a98ebaa7191 100644 --- a/tests/baselines/reference/parserRealSource9.symbols +++ b/tests/baselines/reference/parserRealSource9.symbols @@ -6,11 +6,11 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : Symbol(TypeScript, Decl(parserRealSource9.ts, 0, 0)) export class Binder { ->Binder : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>Binder : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) constructor (public checker: TypeChecker) { } >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) @@ -50,19 +50,19 @@ module TypeScript { this.checker.resolvingBases = true; >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) this.checker.resolveTypeLink(scope, typeLink, true); >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) >scope : Symbol(scope, Decl(parserRealSource9.ts, 8, 58)) >typeLink : Symbol(typeLink, Decl(parserRealSource9.ts, 13, 23)) this.checker.resolvingBases = false; >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) if (typeLink.type.isClass()) { @@ -95,7 +95,7 @@ module TypeScript { type.extendsList = this.resolveBaseTypeLinks(type.extendsTypeLinks, scope); >type : Symbol(type, Decl(parserRealSource9.ts, 28, 47)) >this.resolveBaseTypeLinks : Symbol(Binder.resolveBaseTypeLinks, Decl(parserRealSource9.ts, 7, 53)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >resolveBaseTypeLinks : Symbol(Binder.resolveBaseTypeLinks, Decl(parserRealSource9.ts, 7, 53)) >type : Symbol(type, Decl(parserRealSource9.ts, 28, 47)) >scope : Symbol(scope, Decl(parserRealSource9.ts, 28, 28)) @@ -123,7 +123,7 @@ module TypeScript { >type : Symbol(type, Decl(parserRealSource9.ts, 28, 47)) >i : Symbol(i, Decl(parserRealSource9.ts, 31, 15)) >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) if (derivedIsClass) { @@ -134,7 +134,7 @@ module TypeScript { this.checker.errorReporter.simpleErrorFromSym(type.symbol, >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) >type : Symbol(type, Decl(parserRealSource9.ts, 28, 47)) @@ -149,7 +149,7 @@ module TypeScript { this.checker.errorReporter.simpleErrorFromSym(type.symbol, >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) >type : Symbol(type, Decl(parserRealSource9.ts, 28, 47)) @@ -164,7 +164,7 @@ module TypeScript { type.implementsList = this.resolveBaseTypeLinks(type.implementsTypeLinks, scope); >type : Symbol(type, Decl(parserRealSource9.ts, 28, 47)) >this.resolveBaseTypeLinks : Symbol(Binder.resolveBaseTypeLinks, Decl(parserRealSource9.ts, 7, 53)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >resolveBaseTypeLinks : Symbol(Binder.resolveBaseTypeLinks, Decl(parserRealSource9.ts, 7, 53)) >type : Symbol(type, Decl(parserRealSource9.ts, 28, 47)) >scope : Symbol(scope, Decl(parserRealSource9.ts, 28, 28)) @@ -193,7 +193,7 @@ module TypeScript { this.checker.errorReporter.simpleErrorFromSym(type.symbol, >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) >type : Symbol(type, Decl(parserRealSource9.ts, 28, 47)) @@ -241,7 +241,7 @@ module TypeScript { else { this.checker.resolveTypeLink(scope, signature.returnType, supplyVar); >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) >scope : Symbol(scope, Decl(parserRealSource9.ts, 66, 68)) >signature : Symbol(signature, Decl(parserRealSource9.ts, 69, 19)) @@ -259,7 +259,7 @@ module TypeScript { this.bindSymbol(scope, signature.parameters[j]); >this.bindSymbol : Symbol(Binder.bindSymbol, Decl(parserRealSource9.ts, 142, 9)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >bindSymbol : Symbol(Binder.bindSymbol, Decl(parserRealSource9.ts, 142, 9)) >scope : Symbol(scope, Decl(parserRealSource9.ts, 66, 68)) >signature : Symbol(signature, Decl(parserRealSource9.ts, 69, 19)) @@ -284,7 +284,7 @@ module TypeScript { this.checker.errorReporter.simpleErrorFromSym(lastParam, >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) >lastParam : Symbol(lastParam, Decl(parserRealSource9.ts, 82, 23)) @@ -292,7 +292,7 @@ module TypeScript { lastParam.parameter.typeLink.type = this.checker.makeArrayType(lastParam.parameter.typeLink.type); >lastParam : Symbol(lastParam, Decl(parserRealSource9.ts, 82, 23)) >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) >lastParam : Symbol(lastParam, Decl(parserRealSource9.ts, 82, 23)) } @@ -314,7 +314,7 @@ module TypeScript { this.bindType(scope, instanceType, null); >this.bindType : Symbol(Binder.bindType, Decl(parserRealSource9.ts, 91, 9)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >bindType : Symbol(Binder.bindType, Decl(parserRealSource9.ts, 91, 9)) >scope : Symbol(scope, Decl(parserRealSource9.ts, 93, 24)) >instanceType : Symbol(instanceType, Decl(parserRealSource9.ts, 93, 55)) @@ -353,13 +353,13 @@ module TypeScript { var prevCurrentModDecl = this.checker.currentModDecl; >prevCurrentModDecl : Symbol(prevCurrentModDecl, Decl(parserRealSource9.ts, 104, 19)) >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) var prevBindStatus = this.checker.inBind; >prevBindStatus : Symbol(prevBindStatus, Decl(parserRealSource9.ts, 105, 19)) >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) agg.addParentScope(memberScope); @@ -375,14 +375,14 @@ module TypeScript { this.checker.currentModDecl = type.symbol.declAST; >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) >ModuleDeclaration : Symbol(ModuleDeclaration) >type : Symbol(type, Decl(parserRealSource9.ts, 93, 43)) this.checker.inBind = true; >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) } if (members) { @@ -390,7 +390,7 @@ module TypeScript { this.bind(agg, type.members.allMembers); // REVIEW: Should only be getting exported types? >this.bind : Symbol(Binder.bind, Decl(parserRealSource9.ts, 197, 9)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >bind : Symbol(Binder.bind, Decl(parserRealSource9.ts, 197, 9)) >agg : Symbol(agg, Decl(parserRealSource9.ts, 103, 19)) >type : Symbol(type, Decl(parserRealSource9.ts, 93, 43)) @@ -400,7 +400,7 @@ module TypeScript { this.bind(agg, typeMembers.allMembers); >this.bind : Symbol(Binder.bind, Decl(parserRealSource9.ts, 197, 9)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >bind : Symbol(Binder.bind, Decl(parserRealSource9.ts, 197, 9)) >agg : Symbol(agg, Decl(parserRealSource9.ts, 103, 19)) >typeMembers : Symbol(typeMembers, Decl(parserRealSource9.ts, 100, 19)) @@ -410,7 +410,7 @@ module TypeScript { this.bind(agg, ambientMembers.allMembers); >this.bind : Symbol(Binder.bind, Decl(parserRealSource9.ts, 197, 9)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >bind : Symbol(Binder.bind, Decl(parserRealSource9.ts, 197, 9)) >agg : Symbol(agg, Decl(parserRealSource9.ts, 103, 19)) >ambientMembers : Symbol(ambientMembers, Decl(parserRealSource9.ts, 99, 19)) @@ -420,20 +420,20 @@ module TypeScript { this.bind(agg, ambientTypeMembers.allMembers); >this.bind : Symbol(Binder.bind, Decl(parserRealSource9.ts, 197, 9)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >bind : Symbol(Binder.bind, Decl(parserRealSource9.ts, 197, 9)) >agg : Symbol(agg, Decl(parserRealSource9.ts, 103, 19)) >ambientTypeMembers : Symbol(ambientTypeMembers, Decl(parserRealSource9.ts, 101, 19)) } this.checker.currentModDecl = prevCurrentModDecl; >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) >prevCurrentModDecl : Symbol(prevCurrentModDecl, Decl(parserRealSource9.ts, 104, 19)) this.checker.inBind = prevBindStatus; >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) >prevBindStatus : Symbol(prevBindStatus, Decl(parserRealSource9.ts, 105, 19)) } @@ -442,7 +442,7 @@ module TypeScript { this.resolveBases(scope, type); >this.resolveBases : Symbol(Binder.resolveBases, Decl(parserRealSource9.ts, 26, 9)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >resolveBases : Symbol(Binder.resolveBases, Decl(parserRealSource9.ts, 26, 9)) >scope : Symbol(scope, Decl(parserRealSource9.ts, 93, 24)) >type : Symbol(type, Decl(parserRealSource9.ts, 93, 43)) @@ -452,7 +452,7 @@ module TypeScript { this.resolveSignatureGroup(type.construct, scope, instanceType); >this.resolveSignatureGroup : Symbol(Binder.resolveSignatureGroup, Decl(parserRealSource9.ts, 64, 9)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >resolveSignatureGroup : Symbol(Binder.resolveSignatureGroup, Decl(parserRealSource9.ts, 64, 9)) >type : Symbol(type, Decl(parserRealSource9.ts, 93, 43)) >scope : Symbol(scope, Decl(parserRealSource9.ts, 93, 24)) @@ -463,7 +463,7 @@ module TypeScript { this.resolveSignatureGroup(type.call, scope, null); >this.resolveSignatureGroup : Symbol(Binder.resolveSignatureGroup, Decl(parserRealSource9.ts, 64, 9)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >resolveSignatureGroup : Symbol(Binder.resolveSignatureGroup, Decl(parserRealSource9.ts, 64, 9)) >type : Symbol(type, Decl(parserRealSource9.ts, 93, 43)) >scope : Symbol(scope, Decl(parserRealSource9.ts, 93, 24)) @@ -473,7 +473,7 @@ module TypeScript { this.resolveSignatureGroup(type.index, scope, null); >this.resolveSignatureGroup : Symbol(Binder.resolveSignatureGroup, Decl(parserRealSource9.ts, 64, 9)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >resolveSignatureGroup : Symbol(Binder.resolveSignatureGroup, Decl(parserRealSource9.ts, 64, 9)) >type : Symbol(type, Decl(parserRealSource9.ts, 93, 43)) >scope : Symbol(scope, Decl(parserRealSource9.ts, 93, 24)) @@ -483,7 +483,7 @@ module TypeScript { this.bindType(scope, type.elementType, null); >this.bindType : Symbol(Binder.bindType, Decl(parserRealSource9.ts, 91, 9)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >bindType : Symbol(Binder.bindType, Decl(parserRealSource9.ts, 91, 9)) >scope : Symbol(scope, Decl(parserRealSource9.ts, 93, 24)) >type : Symbol(type, Decl(parserRealSource9.ts, 93, 43)) @@ -503,25 +503,25 @@ module TypeScript { var prevLocationInfo = this.checker.locationInfo; >prevLocationInfo : Symbol(prevLocationInfo, Decl(parserRealSource9.ts, 146, 19)) >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) if ((this.checker.units) && (symbol.unitIndex >= 0) && (symbol.unitIndex < this.checker.units.length)) { >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) >symbol : Symbol(symbol, Decl(parserRealSource9.ts, 144, 45)) >symbol : Symbol(symbol, Decl(parserRealSource9.ts, 144, 45)) >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) this.checker.locationInfo = this.checker.units[symbol.unitIndex]; >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) >symbol : Symbol(symbol, Decl(parserRealSource9.ts, 144, 45)) } @@ -562,11 +562,11 @@ module TypeScript { var modSym = this.checker.findSymbolForDynamicModule(modPath, this.checker.locationInfo.filename, (id) => scope.find(id, false, true)); >modSym : Symbol(modSym, Decl(parserRealSource9.ts, 167, 31)) >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) >modPath : Symbol(modPath, Decl(parserRealSource9.ts, 166, 31)) >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) >id : Symbol(id, Decl(parserRealSource9.ts, 167, 127)) >scope : Symbol(scope, Decl(parserRealSource9.ts, 144, 26)) @@ -585,12 +585,12 @@ module TypeScript { >typeSymbol : Symbol(typeSymbol, Decl(parserRealSource9.ts, 157, 27)) >typeSymbol : Symbol(typeSymbol, Decl(parserRealSource9.ts, 157, 27)) >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) this.bindType(scope, typeSymbol.type, typeSymbol.instanceType); >this.bindType : Symbol(Binder.bindType, Decl(parserRealSource9.ts, 91, 9)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >bindType : Symbol(Binder.bindType, Decl(parserRealSource9.ts, 91, 9)) >scope : Symbol(scope, Decl(parserRealSource9.ts, 144, 26)) >typeSymbol : Symbol(typeSymbol, Decl(parserRealSource9.ts, 157, 27)) @@ -608,7 +608,7 @@ module TypeScript { this.bindType(scope, typeSymbol.expansions[i], typeSymbol.instanceType); >this.bindType : Symbol(Binder.bindType, Decl(parserRealSource9.ts, 91, 9)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >bindType : Symbol(Binder.bindType, Decl(parserRealSource9.ts, 91, 9)) >scope : Symbol(scope, Decl(parserRealSource9.ts, 144, 26)) >typeSymbol : Symbol(typeSymbol, Decl(parserRealSource9.ts, 157, 27)) @@ -621,7 +621,7 @@ module TypeScript { case SymbolKind.Field: this.checker.resolveTypeLink(scope, (symbol).field.typeLink, >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) >scope : Symbol(scope, Decl(parserRealSource9.ts, 144, 26)) >FieldSymbol : Symbol(FieldSymbol) @@ -632,7 +632,7 @@ module TypeScript { case SymbolKind.Parameter: this.checker.resolveTypeLink(scope, >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) >scope : Symbol(scope, Decl(parserRealSource9.ts, 144, 26)) @@ -645,7 +645,7 @@ module TypeScript { } this.checker.locationInfo = prevLocationInfo; >this.checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) >checker : Symbol(Binder.checker, Decl(parserRealSource9.ts, 7, 21)) >prevLocationInfo : Symbol(prevLocationInfo, Decl(parserRealSource9.ts, 146, 19)) } @@ -675,7 +675,7 @@ module TypeScript { }, this); ->this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 19)) +>this : Symbol(Binder, Decl(parserRealSource9.ts, 5, 22)) } } diff --git a/tests/baselines/reference/parserRealSource9.types b/tests/baselines/reference/parserRealSource9.types index ab395310ba98b..072a99550ccab 100644 --- a/tests/baselines/reference/parserRealSource9.types +++ b/tests/baselines/reference/parserRealSource9.types @@ -6,7 +6,7 @@ /// -module TypeScript { +namespace TypeScript { >TypeScript : typeof TypeScript > : ^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/parserSkippedTokens16.errors.txt b/tests/baselines/reference/parserSkippedTokens16.errors.txt index 3926fe4647c47..cebb3ae7828f4 100644 --- a/tests/baselines/reference/parserSkippedTokens16.errors.txt +++ b/tests/baselines/reference/parserSkippedTokens16.errors.txt @@ -25,7 +25,7 @@ parserSkippedTokens16.ts(8,14): error TS1109: Expression expected. 4+:5 ~ !!! error TS1109: Expression expected. - module M { + namespace M { function a( : T) { } ~ diff --git a/tests/baselines/reference/parserSkippedTokens16.js b/tests/baselines/reference/parserSkippedTokens16.js index 14625cdb63664..bf856abbdee67 100644 --- a/tests/baselines/reference/parserSkippedTokens16.js +++ b/tests/baselines/reference/parserSkippedTokens16.js @@ -4,7 +4,7 @@ foo(): Bar { } function Foo () ¬ { } 4+:5 -module M { +namespace M { function a( : T) { } } diff --git a/tests/baselines/reference/parserSkippedTokens16.symbols b/tests/baselines/reference/parserSkippedTokens16.symbols index 338359a5a7baa..9f215390b232a 100644 --- a/tests/baselines/reference/parserSkippedTokens16.symbols +++ b/tests/baselines/reference/parserSkippedTokens16.symbols @@ -6,11 +6,11 @@ function Foo () ¬ { } >Foo : Symbol(Foo, Decl(parserSkippedTokens16.ts, 0, 14)) 4+:5 -module M { +namespace M { >M : Symbol(M, Decl(parserSkippedTokens16.ts, 2, 4)) function a( ->a : Symbol(a, Decl(parserSkippedTokens16.ts, 3, 10)) +>a : Symbol(a, Decl(parserSkippedTokens16.ts, 3, 13)) : T) { } >T : Symbol(T, Decl(parserSkippedTokens16.ts, 5, 5)) diff --git a/tests/baselines/reference/parserSkippedTokens16.types b/tests/baselines/reference/parserSkippedTokens16.types index 6751ca2206321..f021559321480 100644 --- a/tests/baselines/reference/parserSkippedTokens16.types +++ b/tests/baselines/reference/parserSkippedTokens16.types @@ -23,7 +23,7 @@ function Foo () ¬ { } >5 : 5 > : ^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/parserSuperExpression1.errors.txt b/tests/baselines/reference/parserSuperExpression1.errors.txt index 20dea88856f8e..c10ecb080ac41 100644 --- a/tests/baselines/reference/parserSuperExpression1.errors.txt +++ b/tests/baselines/reference/parserSuperExpression1.errors.txt @@ -11,7 +11,7 @@ parserSuperExpression1.ts(10,13): error TS2335: 'super' can only be referenced i } } - module M1.M2 { + namespace M1.M2 { class C { private foo() { super.foo(); diff --git a/tests/baselines/reference/parserSuperExpression1.js b/tests/baselines/reference/parserSuperExpression1.js index 816d0537a7676..ad8af27460554 100644 --- a/tests/baselines/reference/parserSuperExpression1.js +++ b/tests/baselines/reference/parserSuperExpression1.js @@ -7,7 +7,7 @@ class C { } } -module M1.M2 { +namespace M1.M2 { class C { private foo() { super.foo(); diff --git a/tests/baselines/reference/parserSuperExpression1.symbols b/tests/baselines/reference/parserSuperExpression1.symbols index b2551739a5dea..3051e9f5fe15b 100644 --- a/tests/baselines/reference/parserSuperExpression1.symbols +++ b/tests/baselines/reference/parserSuperExpression1.symbols @@ -11,12 +11,12 @@ class C { } } -module M1.M2 { +namespace M1.M2 { >M1 : Symbol(M1, Decl(parserSuperExpression1.ts, 4, 1)) ->M2 : Symbol(M2, Decl(parserSuperExpression1.ts, 6, 10)) +>M2 : Symbol(M2, Decl(parserSuperExpression1.ts, 6, 13)) class C { ->C : Symbol(C, Decl(parserSuperExpression1.ts, 6, 14)) +>C : Symbol(C, Decl(parserSuperExpression1.ts, 6, 17)) private foo() { >foo : Symbol(C.foo, Decl(parserSuperExpression1.ts, 7, 13)) diff --git a/tests/baselines/reference/parserSuperExpression1.types b/tests/baselines/reference/parserSuperExpression1.types index cf76772be1884..31303e4d23b64 100644 --- a/tests/baselines/reference/parserSuperExpression1.types +++ b/tests/baselines/reference/parserSuperExpression1.types @@ -21,7 +21,7 @@ class C { } } -module M1.M2 { +namespace M1.M2 { >M1 : typeof M1 > : ^^^^^^^^^ >M2 : typeof M2 diff --git a/tests/baselines/reference/parserSuperExpression4.errors.txt b/tests/baselines/reference/parserSuperExpression4.errors.txt index c7e2dd601c604..69bf06f44e378 100644 --- a/tests/baselines/reference/parserSuperExpression4.errors.txt +++ b/tests/baselines/reference/parserSuperExpression4.errors.txt @@ -11,7 +11,7 @@ parserSuperExpression4.ts(10,13): error TS2335: 'super' can only be referenced i } } - module M1.M2 { + namespace M1.M2 { class C { private foo() { super.foo = 1 diff --git a/tests/baselines/reference/parserSuperExpression4.js b/tests/baselines/reference/parserSuperExpression4.js index 708b84cecafd6..8c86910e9ed47 100644 --- a/tests/baselines/reference/parserSuperExpression4.js +++ b/tests/baselines/reference/parserSuperExpression4.js @@ -7,7 +7,7 @@ class C { } } -module M1.M2 { +namespace M1.M2 { class C { private foo() { super.foo = 1 diff --git a/tests/baselines/reference/parserSuperExpression4.symbols b/tests/baselines/reference/parserSuperExpression4.symbols index 02f1b1a5683c5..7106229c1adf1 100644 --- a/tests/baselines/reference/parserSuperExpression4.symbols +++ b/tests/baselines/reference/parserSuperExpression4.symbols @@ -11,12 +11,12 @@ class C { } } -module M1.M2 { +namespace M1.M2 { >M1 : Symbol(M1, Decl(parserSuperExpression4.ts, 4, 1)) ->M2 : Symbol(M2, Decl(parserSuperExpression4.ts, 6, 10)) +>M2 : Symbol(M2, Decl(parserSuperExpression4.ts, 6, 13)) class C { ->C : Symbol(C, Decl(parserSuperExpression4.ts, 6, 14)) +>C : Symbol(C, Decl(parserSuperExpression4.ts, 6, 17)) private foo() { >foo : Symbol(C.foo, Decl(parserSuperExpression4.ts, 7, 13)) diff --git a/tests/baselines/reference/parserSuperExpression4.types b/tests/baselines/reference/parserSuperExpression4.types index e1c9ddb6442d4..5cbaab7b3ed9d 100644 --- a/tests/baselines/reference/parserSuperExpression4.types +++ b/tests/baselines/reference/parserSuperExpression4.types @@ -23,7 +23,7 @@ class C { } } -module M1.M2 { +namespace M1.M2 { >M1 : typeof M1 > : ^^^^^^^^^ >M2 : typeof M2 diff --git a/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.errors.txt b/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.errors.txt index ba7bc354c5562..bed59b211ef47 100644 --- a/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.errors.txt +++ b/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.errors.txt @@ -8,6 +8,6 @@ parserUnfinishedTypeNameBeforeKeyword1.ts(1,20): error TS1003: Identifier expect !!! error TS2833: Cannot find namespace 'TypeModule1'. Did you mean 'TypeModule2'? !!! error TS1003: Identifier expected. - module TypeModule2 { + namespace TypeModule2 { } \ No newline at end of file diff --git a/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.js b/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.js index cebefe76d3c6c..6c87390404eec 100644 --- a/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.js +++ b/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.js @@ -2,7 +2,7 @@ //// [parserUnfinishedTypeNameBeforeKeyword1.ts] var x: TypeModule1. -module TypeModule2 { +namespace TypeModule2 { } diff --git a/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.symbols b/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.symbols index c735f18482427..41c37ccbbd118 100644 --- a/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.symbols +++ b/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.symbols @@ -5,7 +5,7 @@ var x: TypeModule1. >x : Symbol(x, Decl(parserUnfinishedTypeNameBeforeKeyword1.ts, 0, 3)) >TypeModule1 : Symbol(TypeModule1) -module TypeModule2 { +namespace TypeModule2 { > : Symbol(unknown) >TypeModule2 : Symbol(TypeModule2, Decl(parserUnfinishedTypeNameBeforeKeyword1.ts, 0, 19)) } diff --git a/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.types b/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.types index b89560e7ac32e..5d70442f4ee3d 100644 --- a/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.types +++ b/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.types @@ -7,6 +7,6 @@ var x: TypeModule1. >TypeModule1 : any > : ^^^ -module TypeModule2 { +namespace TypeModule2 { } diff --git a/tests/baselines/reference/parserUnterminatedGeneric2.errors.txt b/tests/baselines/reference/parserUnterminatedGeneric2.errors.txt index 55c36a4780baf..dcb3c31ee6df4 100644 --- a/tests/baselines/reference/parserUnterminatedGeneric2.errors.txt +++ b/tests/baselines/reference/parserUnterminatedGeneric2.errors.txt @@ -16,7 +16,7 @@ parserUnterminatedGeneric2.ts(8,54): error TS1005: '>' expected. ==== parserUnterminatedGeneric2.ts (15 errors) ==== - declare module ng { + declare namespace ng { interfaceICompiledExpression { ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS1435: Unknown keyword or identifier. Did you mean 'interface ICompiledExpression'? diff --git a/tests/baselines/reference/parserUnterminatedGeneric2.js b/tests/baselines/reference/parserUnterminatedGeneric2.js index 1d1aa81dd02f8..3ca2adcac47ef 100644 --- a/tests/baselines/reference/parserUnterminatedGeneric2.js +++ b/tests/baselines/reference/parserUnterminatedGeneric2.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric2.ts] //// //// [parserUnterminatedGeneric2.ts] -declare module ng { +declare namespace ng { interfaceICompiledExpression { (context: any, locals?: any): any; assign(context: any, value: any): any; diff --git a/tests/baselines/reference/parserUnterminatedGeneric2.symbols b/tests/baselines/reference/parserUnterminatedGeneric2.symbols index b93d59a1f9008..1a31db3092746 100644 --- a/tests/baselines/reference/parserUnterminatedGeneric2.symbols +++ b/tests/baselines/reference/parserUnterminatedGeneric2.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric2.ts] //// === parserUnterminatedGeneric2.ts === -declare module ng { +declare namespace ng { >ng : Symbol(ng, Decl(parserUnterminatedGeneric2.ts, 0, 0)) interfaceICompiledExpression { diff --git a/tests/baselines/reference/parserUnterminatedGeneric2.types b/tests/baselines/reference/parserUnterminatedGeneric2.types index b947eed9d1388..53d59a200fe82 100644 --- a/tests/baselines/reference/parserUnterminatedGeneric2.types +++ b/tests/baselines/reference/parserUnterminatedGeneric2.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric2.ts] //// === parserUnterminatedGeneric2.ts === -declare module ng { +declare namespace ng { >ng : typeof ng > : ^^^^^^^^^ diff --git a/tests/baselines/reference/parserVariableDeclaration4.errors.txt b/tests/baselines/reference/parserVariableDeclaration4.errors.txt index e0795fa850d70..b31899a9d30b0 100644 --- a/tests/baselines/reference/parserVariableDeclaration4.errors.txt +++ b/tests/baselines/reference/parserVariableDeclaration4.errors.txt @@ -2,7 +2,7 @@ parserVariableDeclaration4.ts(2,4): error TS1038: A 'declare' modifier cannot be ==== parserVariableDeclaration4.ts (1 errors) ==== - declare module M { + declare namespace M { declare var v; ~~~~~~~ !!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. diff --git a/tests/baselines/reference/parserVariableDeclaration4.js b/tests/baselines/reference/parserVariableDeclaration4.js index 711bf9cc112e1..c2c5fd63f6359 100644 --- a/tests/baselines/reference/parserVariableDeclaration4.js +++ b/tests/baselines/reference/parserVariableDeclaration4.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration4.ts] //// //// [parserVariableDeclaration4.ts] -declare module M { +declare namespace M { declare var v; } diff --git a/tests/baselines/reference/parserVariableDeclaration4.symbols b/tests/baselines/reference/parserVariableDeclaration4.symbols index ec5390ef77ab9..6117c18769def 100644 --- a/tests/baselines/reference/parserVariableDeclaration4.symbols +++ b/tests/baselines/reference/parserVariableDeclaration4.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration4.ts] //// === parserVariableDeclaration4.ts === -declare module M { +declare namespace M { >M : Symbol(M, Decl(parserVariableDeclaration4.ts, 0, 0)) declare var v; diff --git a/tests/baselines/reference/parserVariableDeclaration4.types b/tests/baselines/reference/parserVariableDeclaration4.types index 19cdbf345605f..4a9b04d7d46ac 100644 --- a/tests/baselines/reference/parserVariableDeclaration4.types +++ b/tests/baselines/reference/parserVariableDeclaration4.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration4.ts] //// === parserVariableDeclaration4.ts === -declare module M { +declare namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/parserharness.errors.txt b/tests/baselines/reference/parserharness.errors.txt index 67cb9950d30c9..c231ee2022d51 100644 --- a/tests/baselines/reference/parserharness.errors.txt +++ b/tests/baselines/reference/parserharness.errors.txt @@ -178,12 +178,12 @@ parserharness.ts(2030,32): error TS2304: Cannot find name 'Diff'. throw new Error('Unknown context'); } - declare module process { + declare namespace process { export function nextTick(callback: () => any): void; export function on(event: string, listener: Function); } - module Harness { + namespace Harness { // Settings export var userSpecifiedroot = ""; var global = Function("return this").call(null); @@ -209,7 +209,7 @@ parserharness.ts(2030,32): error TS2304: Cannot find name 'Diff'. } // Assert functions - export module Assert { + export namespace Assert { export var bugIds: string[] = []; export var throwAssertError = (error: Error) => { throw error; @@ -637,16 +637,16 @@ parserharness.ts(2030,32): error TS2304: Cannot find name 'Diff'. } // Performance test - export module Perf { - export module Clock { + export namespace Perf { + export namespace Clock { export var now: () => number; export var resolution: number; - declare module WScript { + declare namespace WScript { export function InitializeProjection(); } - declare module TestUtilities { + declare namespace TestUtilities { export function QueryPerformanceCounter(): number; export function QueryPerformanceFrequency(): number; } @@ -825,7 +825,7 @@ parserharness.ts(2030,32): error TS2304: Cannot find name 'Diff'. } /** Functionality for compiling TypeScript code */ - export module Compiler { + export namespace Compiler { /** Aggregate various writes into a single array of lines. Useful for passing to the * TypeScript compiler to fill with source code or errors. */ @@ -1682,7 +1682,7 @@ parserharness.ts(2030,32): error TS2304: Cannot find name 'Diff'. /** Parses the test cases files * extracts options and individual files in a multifile test */ - export module TestCaseParser { + export namespace TestCaseParser { /** all the necesarry information to set the right compiler settings */ export interface CompilerSetting { flag: string; @@ -2197,7 +2197,7 @@ parserharness.ts(2030,32): error TS2304: Cannot find name 'Diff'. } /** Runs TypeScript or Javascript code. */ - export module Runner { + export namespace Runner { export function runCollateral(path: string, callback: (error: Error, result: any) => void ) { path = switchToForwardSlashes(path); runString(readFile(path), path.match(/[^\/]*$/)[0], callback); @@ -2238,7 +2238,7 @@ parserharness.ts(2030,32): error TS2304: Cannot find name 'Diff'. } /** Support class for baseline files */ - export module Baseline { + export namespace Baseline { var reportFilename = 'baseline-report.html'; var firstRun = true; diff --git a/tests/baselines/reference/parserharness.js b/tests/baselines/reference/parserharness.js index 5aab93906746a..45aa9ec9609a8 100644 --- a/tests/baselines/reference/parserharness.js +++ b/tests/baselines/reference/parserharness.js @@ -50,12 +50,12 @@ if (typeof ActiveXObject === "function") { throw new Error('Unknown context'); } -declare module process { +declare namespace process { export function nextTick(callback: () => any): void; export function on(event: string, listener: Function); } -module Harness { +namespace Harness { // Settings export var userSpecifiedroot = ""; var global = Function("return this").call(null); @@ -81,7 +81,7 @@ module Harness { } // Assert functions - export module Assert { + export namespace Assert { export var bugIds: string[] = []; export var throwAssertError = (error: Error) => { throw error; @@ -499,16 +499,16 @@ module Harness { } // Performance test - export module Perf { - export module Clock { + export namespace Perf { + export namespace Clock { export var now: () => number; export var resolution: number; - declare module WScript { + declare namespace WScript { export function InitializeProjection(); } - declare module TestUtilities { + declare namespace TestUtilities { export function QueryPerformanceCounter(): number; export function QueryPerformanceFrequency(): number; } @@ -687,7 +687,7 @@ module Harness { } /** Functionality for compiling TypeScript code */ - export module Compiler { + export namespace Compiler { /** Aggregate various writes into a single array of lines. Useful for passing to the * TypeScript compiler to fill with source code or errors. */ @@ -1414,7 +1414,7 @@ module Harness { /** Parses the test cases files * extracts options and individual files in a multifile test */ - export module TestCaseParser { + export namespace TestCaseParser { /** all the necesarry information to set the right compiler settings */ export interface CompilerSetting { flag: string; @@ -1869,7 +1869,7 @@ module Harness { } /** Runs TypeScript or Javascript code. */ - export module Runner { + export namespace Runner { export function runCollateral(path: string, callback: (error: Error, result: any) => void ) { path = switchToForwardSlashes(path); runString(readFile(path), path.match(/[^\/]*$/)[0], callback); @@ -1910,7 +1910,7 @@ module Harness { } /** Support class for baseline files */ - export module Baseline { + export namespace Baseline { var reportFilename = 'baseline-report.html'; var firstRun = true; diff --git a/tests/baselines/reference/parserharness.symbols b/tests/baselines/reference/parserharness.symbols index 1bab54ca5c5b5..690d31fd68eed 100644 --- a/tests/baselines/reference/parserharness.symbols +++ b/tests/baselines/reference/parserharness.symbols @@ -110,11 +110,11 @@ if (typeof ActiveXObject === "function") { >Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) } -declare module process { +declare namespace process { >process : Symbol(process, Decl(parserharness.ts, 47, 1)) export function nextTick(callback: () => any): void; ->nextTick : Symbol(nextTick, Decl(parserharness.ts, 49, 24)) +>nextTick : Symbol(nextTick, Decl(parserharness.ts, 49, 27)) >callback : Symbol(callback, Decl(parserharness.ts, 50, 29)) export function on(event: string, listener: Function); @@ -124,7 +124,7 @@ declare module process { >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) } -module Harness { +namespace Harness { >Harness : Symbol(Harness, Decl(parserharness.ts, 52, 1)) // Settings @@ -189,7 +189,7 @@ module Harness { } // Assert functions - export module Assert { + export namespace Assert { >Assert : Symbol(Assert, Decl(parserharness.ts, 77, 5)) export var bugIds: string[] = []; @@ -1421,11 +1421,11 @@ module Harness { } // Performance test - export module Perf { + export namespace Perf { >Perf : Symbol(Perf, Decl(parserharness.ts, 495, 5)) - export module Clock { ->Clock : Symbol(Clock, Decl(parserharness.ts, 498, 24)) + export namespace Clock { +>Clock : Symbol(Clock, Decl(parserharness.ts, 498, 27)) export var now: () => number; >now : Symbol(now, Decl(parserharness.ts, 500, 22)) @@ -1433,18 +1433,18 @@ module Harness { export var resolution: number; >resolution : Symbol(resolution, Decl(parserharness.ts, 501, 22)) - declare module WScript { + declare namespace WScript { >WScript : Symbol(WScript, Decl(parserharness.ts, 501, 42)) export function InitializeProjection(); ->InitializeProjection : Symbol(InitializeProjection, Decl(parserharness.ts, 503, 36)) +>InitializeProjection : Symbol(InitializeProjection, Decl(parserharness.ts, 503, 39)) } - declare module TestUtilities { + declare namespace TestUtilities { >TestUtilities : Symbol(TestUtilities, Decl(parserharness.ts, 505, 13)) export function QueryPerformanceCounter(): number; ->QueryPerformanceCounter : Symbol(QueryPerformanceCounter, Decl(parserharness.ts, 507, 42)) +>QueryPerformanceCounter : Symbol(QueryPerformanceCounter, Decl(parserharness.ts, 507, 45)) export function QueryPerformanceFrequency(): number; >QueryPerformanceFrequency : Symbol(QueryPerformanceFrequency, Decl(parserharness.ts, 508, 66)) @@ -1462,9 +1462,9 @@ module Harness { >now : Symbol(now, Decl(parserharness.ts, 500, 22)) return TestUtilities.QueryPerformanceCounter(); ->TestUtilities.QueryPerformanceCounter : Symbol(TestUtilities.QueryPerformanceCounter, Decl(parserharness.ts, 507, 42)) +>TestUtilities.QueryPerformanceCounter : Symbol(TestUtilities.QueryPerformanceCounter, Decl(parserharness.ts, 507, 45)) >TestUtilities : Symbol(TestUtilities, Decl(parserharness.ts, 505, 13)) ->QueryPerformanceCounter : Symbol(TestUtilities.QueryPerformanceCounter, Decl(parserharness.ts, 507, 42)) +>QueryPerformanceCounter : Symbol(TestUtilities.QueryPerformanceCounter, Decl(parserharness.ts, 507, 45)) } resolution = TestUtilities.QueryPerformanceFrequency(); @@ -1510,7 +1510,7 @@ module Harness { >this : Symbol(Timer, Decl(parserharness.ts, 528, 9)) >startTime : Symbol(Timer.startTime, Decl(parserharness.ts, 530, 28)) >Clock.now : Symbol(Clock.now, Decl(parserharness.ts, 500, 22)) ->Clock : Symbol(Clock, Decl(parserharness.ts, 498, 24)) +>Clock : Symbol(Clock, Decl(parserharness.ts, 498, 27)) >now : Symbol(Clock.now, Decl(parserharness.ts, 500, 22)) } @@ -1523,13 +1523,13 @@ module Harness { >this : Symbol(Timer, Decl(parserharness.ts, 528, 9)) >time : Symbol(Timer.time, Decl(parserharness.ts, 531, 29)) >Clock.now : Symbol(Clock.now, Decl(parserharness.ts, 500, 22)) ->Clock : Symbol(Clock, Decl(parserharness.ts, 498, 24)) +>Clock : Symbol(Clock, Decl(parserharness.ts, 498, 27)) >now : Symbol(Clock.now, Decl(parserharness.ts, 500, 22)) >this.startTime : Symbol(Timer.startTime, Decl(parserharness.ts, 530, 28)) >this : Symbol(Timer, Decl(parserharness.ts, 528, 9)) >startTime : Symbol(Timer.startTime, Decl(parserharness.ts, 530, 28)) >Clock.resolution : Symbol(Clock.resolution, Decl(parserharness.ts, 501, 22)) ->Clock : Symbol(Clock, Decl(parserharness.ts, 498, 24)) +>Clock : Symbol(Clock, Decl(parserharness.ts, 498, 27)) >resolution : Symbol(Clock.resolution, Decl(parserharness.ts, 501, 22)) } } @@ -2011,14 +2011,14 @@ module Harness { } /** Functionality for compiling TypeScript code */ - export module Compiler { + export namespace Compiler { >Compiler : Symbol(Compiler, Decl(parserharness.ts, 683, 5)) /** Aggregate various writes into a single array of lines. Useful for passing to the * TypeScript compiler to fill with source code or errors. */ export class WriterAggregator implements ITextWriter { ->WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 28)) +>WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 31)) public lines: string[] = []; >lines : Symbol(WriterAggregator.lines, Decl(parserharness.ts, 690, 62)) @@ -2032,7 +2032,7 @@ module Harness { this.currentLine += str; >this.currentLine : Symbol(WriterAggregator.currentLine, Decl(parserharness.ts, 691, 40)) ->this : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 28)) +>this : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 31)) >currentLine : Symbol(WriterAggregator.currentLine, Decl(parserharness.ts, 691, 40)) >str : Symbol(str, Decl(parserharness.ts, 694, 25)) } @@ -2044,17 +2044,17 @@ module Harness { this.lines.push(this.currentLine + str); >this.lines.push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --)) >this.lines : Symbol(WriterAggregator.lines, Decl(parserharness.ts, 690, 62)) ->this : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 28)) +>this : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 31)) >lines : Symbol(WriterAggregator.lines, Decl(parserharness.ts, 690, 62)) >push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --)) >this.currentLine : Symbol(WriterAggregator.currentLine, Decl(parserharness.ts, 691, 40)) ->this : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 28)) +>this : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 31)) >currentLine : Symbol(WriterAggregator.currentLine, Decl(parserharness.ts, 691, 40)) >str : Symbol(str, Decl(parserharness.ts, 698, 29)) this.currentLine = ""; >this.currentLine : Symbol(WriterAggregator.currentLine, Decl(parserharness.ts, 691, 40)) ->this : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 28)) +>this : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 31)) >currentLine : Symbol(WriterAggregator.currentLine, Decl(parserharness.ts, 691, 40)) } @@ -2064,21 +2064,21 @@ module Harness { if (this.currentLine.length > 0) { this.lines.push(this.currentLine); } >this.currentLine.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --)) >this.currentLine : Symbol(WriterAggregator.currentLine, Decl(parserharness.ts, 691, 40)) ->this : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 28)) +>this : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 31)) >currentLine : Symbol(WriterAggregator.currentLine, Decl(parserharness.ts, 691, 40)) >length : Symbol(String.length, Decl(lib.es5.d.ts, --, --)) >this.lines.push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --)) >this.lines : Symbol(WriterAggregator.lines, Decl(parserharness.ts, 690, 62)) ->this : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 28)) +>this : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 31)) >lines : Symbol(WriterAggregator.lines, Decl(parserharness.ts, 690, 62)) >push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --)) >this.currentLine : Symbol(WriterAggregator.currentLine, Decl(parserharness.ts, 691, 40)) ->this : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 28)) +>this : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 31)) >currentLine : Symbol(WriterAggregator.currentLine, Decl(parserharness.ts, 691, 40)) this.currentLine = ""; >this.currentLine : Symbol(WriterAggregator.currentLine, Decl(parserharness.ts, 691, 40)) ->this : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 28)) +>this : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 31)) >currentLine : Symbol(WriterAggregator.currentLine, Decl(parserharness.ts, 691, 40)) } @@ -2087,12 +2087,12 @@ module Harness { this.lines = []; >this.lines : Symbol(WriterAggregator.lines, Decl(parserharness.ts, 690, 62)) ->this : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 28)) +>this : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 31)) >lines : Symbol(WriterAggregator.lines, Decl(parserharness.ts, 690, 62)) this.currentLine = ""; >this.currentLine : Symbol(WriterAggregator.currentLine, Decl(parserharness.ts, 691, 40)) ->this : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 28)) +>this : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 31)) >currentLine : Symbol(WriterAggregator.currentLine, Decl(parserharness.ts, 691, 40)) } } @@ -2127,11 +2127,11 @@ module Harness { var writer = new Harness.Compiler.WriterAggregator(); >writer : Symbol(writer, Decl(parserharness.ts, 726, 19)) ->Harness.Compiler.WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 28)) +>Harness.Compiler.WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 31)) >Harness.Compiler : Symbol(Compiler, Decl(parserharness.ts, 683, 5)) >Harness : Symbol(Harness, Decl(parserharness.ts, 52, 1)) >Compiler : Symbol(Compiler, Decl(parserharness.ts, 683, 5)) ->WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 28)) +>WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 31)) this.fileCollection[s] = writer; >this.fileCollection : Symbol(EmitterIOHost.fileCollection, Decl(parserharness.ts, 715, 72)) @@ -2171,13 +2171,13 @@ module Harness { >toArray : Symbol(EmitterIOHost.toArray, Decl(parserharness.ts, 735, 56)) >filename : Symbol(filename, Decl(parserharness.ts, 737, 31)) >file : Symbol(file, Decl(parserharness.ts, 737, 49)) ->WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 28)) +>WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 31)) var result: { filename: string; file: WriterAggregator; }[] = []; >result : Symbol(result, Decl(parserharness.ts, 738, 19)) >filename : Symbol(filename, Decl(parserharness.ts, 738, 29)) >file : Symbol(file, Decl(parserharness.ts, 738, 47)) ->WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 28)) +>WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 31)) for (var p in this.fileCollection) { >p : Symbol(p, Decl(parserharness.ts, 740, 24)) @@ -2197,7 +2197,7 @@ module Harness { >current : Symbol(current, Decl(parserharness.ts, 742, 27)) >Harness : Symbol(Harness, Decl(parserharness.ts, 52, 1)) >Compiler : Symbol(Compiler, Decl(parserharness.ts, 683, 5)) ->WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 28)) +>WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 31)) >this.fileCollection : Symbol(EmitterIOHost.fileCollection, Decl(parserharness.ts, 715, 72)) >this : Symbol(EmitterIOHost, Decl(parserharness.ts, 712, 9)) >fileCollection : Symbol(EmitterIOHost.fileCollection, Decl(parserharness.ts, 715, 72)) @@ -2256,7 +2256,7 @@ module Harness { var stderr = new WriterAggregator(); >stderr : Symbol(stderr, Decl(parserharness.ts, 757, 11)) ->WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 28)) +>WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 31)) export function isDeclareFile(filename: string) { >isDeclareFile : Symbol(isDeclareFile, Decl(parserharness.ts, 757, 44)) @@ -3297,11 +3297,11 @@ module Harness { outputs[fn] = new Harness.Compiler.WriterAggregator(); >outputs : Symbol(outputs, Decl(parserharness.ts, 1120, 19)) >fn : Symbol(fn, Decl(parserharness.ts, 1125, 37)) ->Harness.Compiler.WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 28)) +>Harness.Compiler.WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 31)) >Harness.Compiler : Symbol(Compiler, Decl(parserharness.ts, 683, 5)) >Harness : Symbol(Harness, Decl(parserharness.ts, 52, 1)) >Compiler : Symbol(Compiler, Decl(parserharness.ts, 683, 5)) ->WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 28)) +>WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 31)) return outputs[fn]; >outputs : Symbol(outputs, Decl(parserharness.ts, 1120, 19)) @@ -3341,7 +3341,7 @@ module Harness { >writer : Symbol(writer, Decl(parserharness.ts, 1138, 27)) >Harness : Symbol(Harness, Decl(parserharness.ts, 52, 1)) >Compiler : Symbol(Compiler, Decl(parserharness.ts, 683, 5)) ->WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 28)) +>WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 31)) >outputs : Symbol(outputs, Decl(parserharness.ts, 1120, 19)) >fn : Symbol(fn, Decl(parserharness.ts, 1136, 24)) @@ -3434,7 +3434,7 @@ module Harness { >fileResults : Symbol(CompilerResult.fileResults, Decl(parserharness.ts, 1175, 24)) >filename : Symbol(filename, Decl(parserharness.ts, 1175, 45)) >file : Symbol(file, Decl(parserharness.ts, 1175, 63)) ->WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 28)) +>WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 31)) >errorLines : Symbol(errorLines, Decl(parserharness.ts, 1175, 92)) >scripts : Symbol(CompilerResult.scripts, Decl(parserharness.ts, 1175, 114)) >TypeScript : Symbol(TypeScript) @@ -3987,7 +3987,7 @@ module Harness { export function emitToOutfile(outfile: WriterAggregator) { >emitToOutfile : Symbol(emitToOutfile, Decl(parserharness.ts, 1333, 9)) >outfile : Symbol(outfile, Decl(parserharness.ts, 1335, 38)) ->WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 28)) +>WriterAggregator : Symbol(WriterAggregator, Decl(parserharness.ts, 686, 31)) compiler.emitToOutfile(outfile); >compiler : Symbol(compiler, Decl(parserharness.ts, 780, 11)) @@ -4220,12 +4220,12 @@ module Harness { /** Parses the test cases files * extracts options and individual files in a multifile test */ - export module TestCaseParser { + export namespace TestCaseParser { >TestCaseParser : Symbol(TestCaseParser, Decl(parserharness.ts, 1408, 5)) /** all the necesarry information to set the right compiler settings */ export interface CompilerSetting { ->CompilerSetting : Symbol(CompilerSetting, Decl(parserharness.ts, 1413, 34)) +>CompilerSetting : Symbol(CompilerSetting, Decl(parserharness.ts, 1413, 37)) flag: string; >flag : Symbol(CompilerSetting.flag, Decl(parserharness.ts, 1415, 42)) @@ -4263,7 +4263,7 @@ module Harness { function extractCompilerSettings(content: string): CompilerSetting[] { >extractCompilerSettings : Symbol(extractCompilerSettings, Decl(parserharness.ts, 1432, 121)) >content : Symbol(content, Decl(parserharness.ts, 1434, 41)) ->CompilerSetting : Symbol(CompilerSetting, Decl(parserharness.ts, 1413, 34)) +>CompilerSetting : Symbol(CompilerSetting, Decl(parserharness.ts, 1413, 37)) var opts = []; >opts : Symbol(opts, Decl(parserharness.ts, 1436, 15)) @@ -4295,7 +4295,7 @@ module Harness { >code : Symbol(code, Decl(parserharness.ts, 1447, 42)) >filename : Symbol(filename, Decl(parserharness.ts, 1447, 55)) >settings : Symbol(settings, Decl(parserharness.ts, 1447, 76)) ->CompilerSetting : Symbol(CompilerSetting, Decl(parserharness.ts, 1413, 34)) +>CompilerSetting : Symbol(CompilerSetting, Decl(parserharness.ts, 1413, 37)) >testUnitData : Symbol(testUnitData, Decl(parserharness.ts, 1447, 105)) >TestUnitData : Symbol(TestUnitData, Decl(parserharness.ts, 1418, 9)) @@ -5679,11 +5679,11 @@ module Harness { } /** Runs TypeScript or Javascript code. */ - export module Runner { + export namespace Runner { >Runner : Symbol(Runner, Decl(parserharness.ts, 1865, 5)) export function runCollateral(path: string, callback: (error: Error, result: any) => void ) { ->runCollateral : Symbol(runCollateral, Decl(parserharness.ts, 1868, 26)) +>runCollateral : Symbol(runCollateral, Decl(parserharness.ts, 1868, 29)) >path : Symbol(path, Decl(parserharness.ts, 1869, 38)) >callback : Symbol(callback, Decl(parserharness.ts, 1869, 51)) >error : Symbol(error, Decl(parserharness.ts, 1869, 63)) @@ -5811,7 +5811,7 @@ module Harness { } /** Support class for baseline files */ - export module Baseline { + export namespace Baseline { >Baseline : Symbol(Baseline, Decl(parserharness.ts, 1906, 5)) var reportFilename = 'baseline-report.html'; diff --git a/tests/baselines/reference/parserharness.types b/tests/baselines/reference/parserharness.types index 0326d8453ba19..282bc3934f8e7 100644 --- a/tests/baselines/reference/parserharness.types +++ b/tests/baselines/reference/parserharness.types @@ -240,7 +240,7 @@ if (typeof ActiveXObject === "function") { > : ^^^^^^^^^^^^^^^^^ } -declare module process { +declare namespace process { >process : typeof process > : ^^^^^^^^^^^^^^ @@ -259,7 +259,7 @@ declare module process { > : ^^^^^^^^ } -module Harness { +namespace Harness { >Harness : typeof Harness > : ^^^^^^^^^^^^^^ @@ -352,7 +352,7 @@ module Harness { } // Assert functions - export module Assert { + export namespace Assert { >Assert : typeof Assert > : ^^^^^^^^^^^^^ @@ -2949,11 +2949,11 @@ module Harness { } // Performance test - export module Perf { + export namespace Perf { >Perf : typeof Perf > : ^^^^^^^^^^^ - export module Clock { + export namespace Clock { >Clock : typeof Clock > : ^^^^^^^^^^^^ @@ -2965,7 +2965,7 @@ module Harness { >resolution : number > : ^^^^^^ - declare module WScript { + declare namespace WScript { >WScript : typeof WScript > : ^^^^^^^^^^^^^^ @@ -2974,7 +2974,7 @@ module Harness { > : ^^^^^^^^^ } - declare module TestUtilities { + declare namespace TestUtilities { >TestUtilities : typeof TestUtilities > : ^^^^^^^^^^^^^^^^^^^^ @@ -4138,7 +4138,7 @@ module Harness { } /** Functionality for compiling TypeScript code */ - export module Compiler { + export namespace Compiler { >Compiler : typeof Compiler > : ^^^^^^^^^^^^^^^ @@ -9618,7 +9618,7 @@ module Harness { /** Parses the test cases files * extracts options and individual files in a multifile test */ - export module TestCaseParser { + export namespace TestCaseParser { >TestCaseParser : typeof TestCaseParser > : ^^^^^^^^^^^^^^^^^^^^^ @@ -12758,7 +12758,7 @@ module Harness { } /** Runs TypeScript or Javascript code. */ - export module Runner { + export namespace Runner { >Runner : typeof Runner > : ^^^^^^^^^^^^^ @@ -13023,7 +13023,7 @@ module Harness { } /** Support class for baseline files */ - export module Baseline { + export namespace Baseline { >Baseline : typeof Baseline > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/parserindenter.errors.txt b/tests/baselines/reference/parserindenter.errors.txt index 2edf551b1e5c1..3dd71b5cb6e54 100644 --- a/tests/baselines/reference/parserindenter.errors.txt +++ b/tests/baselines/reference/parserindenter.errors.txt @@ -149,7 +149,7 @@ parserindenter.ts(736,38): error TS2304: Cannot find name 'TypeScript'. !!! error TS6053: File 'formatting.ts' not found. - module Formatting { + namespace Formatting { export class Indenter implements ILineIndenationResolver { ~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2304: Cannot find name 'ILineIndenationResolver'. diff --git a/tests/baselines/reference/parserindenter.js b/tests/baselines/reference/parserindenter.js index 47d4b2c2f1726..15d07df1ab895 100644 --- a/tests/baselines/reference/parserindenter.js +++ b/tests/baselines/reference/parserindenter.js @@ -19,7 +19,7 @@ /// -module Formatting { +namespace Formatting { export class Indenter implements ILineIndenationResolver { private indentationBag: IndentationBag; diff --git a/tests/baselines/reference/parserindenter.symbols b/tests/baselines/reference/parserindenter.symbols index 31e3da958f0cb..6b50d9c0f9962 100644 --- a/tests/baselines/reference/parserindenter.symbols +++ b/tests/baselines/reference/parserindenter.symbols @@ -19,11 +19,11 @@ /// -module Formatting { +namespace Formatting { >Formatting : Symbol(Formatting, Decl(parserindenter.ts, 0, 0)) export class Indenter implements ILineIndenationResolver { ->Indenter : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>Indenter : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) private indentationBag: IndentationBag; >indentationBag : Symbol(Indenter.indentationBag, Decl(parserindenter.ts, 19, 63)) @@ -67,45 +67,45 @@ module Formatting { this.indentationBag = new IndentationBag(this.snapshot); >this.indentationBag : Symbol(Indenter.indentationBag, Decl(parserindenter.ts, 19, 63)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >indentationBag : Symbol(Indenter.indentationBag, Decl(parserindenter.ts, 19, 63)) >this.snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) this.scriptBlockBeginLineNumber = -1; >this.scriptBlockBeginLineNumber : Symbol(Indenter.scriptBlockBeginLineNumber, Decl(parserindenter.ts, 21, 47)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >scriptBlockBeginLineNumber : Symbol(Indenter.scriptBlockBeginLineNumber, Decl(parserindenter.ts, 21, 47)) this.offsetIndentationDeltas = new Dictionary_int_int(); // text offset -> indentation delta >this.offsetIndentationDeltas : Symbol(Indenter.offsetIndentationDeltas, Decl(parserindenter.ts, 22, 51)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >offsetIndentationDeltas : Symbol(Indenter.offsetIndentationDeltas, Decl(parserindenter.ts, 22, 51)) // by default the root (program) has zero indendation this.tree.Root.SetIndentationOverride(""); >this.tree : Symbol(Indenter.tree, Decl(parserindenter.ts, 26, 46)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >tree : Symbol(Indenter.tree, Decl(parserindenter.ts, 26, 46)) this.ApplyScriptBlockIndentation(this.languageHostIndentation, this.tree); >this.ApplyScriptBlockIndentation : Symbol(Indenter.ApplyScriptBlockIndentation, Decl(parserindenter.ts, 340, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >ApplyScriptBlockIndentation : Symbol(Indenter.ApplyScriptBlockIndentation, Decl(parserindenter.ts, 340, 9)) >this.languageHostIndentation : Symbol(Indenter.languageHostIndentation, Decl(parserindenter.ts, 28, 43)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >languageHostIndentation : Symbol(Indenter.languageHostIndentation, Decl(parserindenter.ts, 28, 43)) >this.tree : Symbol(Indenter.tree, Decl(parserindenter.ts, 26, 46)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >tree : Symbol(Indenter.tree, Decl(parserindenter.ts, 26, 46)) this.FillInheritedIndentation(this.tree); >this.FillInheritedIndentation : Symbol(Indenter.FillInheritedIndentation, Decl(parserindenter.ts, 568, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >FillInheritedIndentation : Symbol(Indenter.FillInheritedIndentation, Decl(parserindenter.ts, 568, 9)) >this.tree : Symbol(Indenter.tree, Decl(parserindenter.ts, 26, 46)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >tree : Symbol(Indenter.tree, Decl(parserindenter.ts, 26, 46)) } @@ -123,12 +123,12 @@ module Formatting { if (this.logger.information()) { >this.logger : Symbol(Indenter.logger, Decl(parserindenter.ts, 25, 20)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >logger : Symbol(Indenter.logger, Decl(parserindenter.ts, 25, 20)) this.logger.log("GetIndentationEdits(" + >this.logger : Symbol(Indenter.logger, Decl(parserindenter.ts, 25, 20)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >logger : Symbol(Indenter.logger, Decl(parserindenter.ts, 25, 20)) "t1=[" + token.Span.startPosition() + "," + token.Span.endPosition()+ "], " + @@ -146,7 +146,7 @@ module Formatting { var result = this.GetIndentationEditsWorker(token, nextToken, node, sameLineIndent); >result : Symbol(result, Decl(parserindenter.ts, 54, 15)) >this.GetIndentationEditsWorker : Symbol(Indenter.GetIndentationEditsWorker, Decl(parserindenter.ts, 64, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >GetIndentationEditsWorker : Symbol(Indenter.GetIndentationEditsWorker, Decl(parserindenter.ts, 64, 9)) >token : Symbol(token, Decl(parserindenter.ts, 46, 35)) >nextToken : Symbol(nextToken, Decl(parserindenter.ts, 46, 52)) @@ -155,7 +155,7 @@ module Formatting { if (this.logger.information()) { >this.logger : Symbol(Indenter.logger, Decl(parserindenter.ts, 25, 20)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >logger : Symbol(Indenter.logger, Decl(parserindenter.ts, 25, 20)) for (var i = 0; i < result.count() ; i++) { @@ -171,7 +171,7 @@ module Formatting { this.logger.log("edit: minChar=" + edit.position + ", limChar=" + (edit.position + edit.length) + ", text=\"" + TypeScript.stringToLiteral(edit.replaceWith, 30) + "\""); >this.logger : Symbol(Indenter.logger, Decl(parserindenter.ts, 25, 20)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >logger : Symbol(Indenter.logger, Decl(parserindenter.ts, 25, 20)) >edit : Symbol(edit, Decl(parserindenter.ts, 58, 23)) >edit : Symbol(edit, Decl(parserindenter.ts, 58, 23)) @@ -214,7 +214,7 @@ module Formatting { // tokens for nodes outside the span we are formatting. this.AdjustStartOffsetIfNeeded(token, node); >this.AdjustStartOffsetIfNeeded : Symbol(Indenter.AdjustStartOffsetIfNeeded, Decl(parserindenter.ts, 706, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >AdjustStartOffsetIfNeeded : Symbol(Indenter.AdjustStartOffsetIfNeeded, Decl(parserindenter.ts, 706, 9)) >token : Symbol(token, Decl(parserindenter.ts, 66, 41)) >node : Symbol(node, Decl(parserindenter.ts, 66, 80)) @@ -222,7 +222,7 @@ module Formatting { // Don't adjust indentation on the same line of a script block if (this.scriptBlockBeginLineNumber == token.lineNumber()) { >this.scriptBlockBeginLineNumber : Symbol(Indenter.scriptBlockBeginLineNumber, Decl(parserindenter.ts, 21, 47)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >scriptBlockBeginLineNumber : Symbol(Indenter.scriptBlockBeginLineNumber, Decl(parserindenter.ts, 21, 47)) >token : Symbol(token, Decl(parserindenter.ts, 66, 41)) @@ -234,7 +234,7 @@ module Formatting { if (!sameLineIndent && this.IsMultiLineString(token)) { >sameLineIndent : Symbol(sameLineIndent, Decl(parserindenter.ts, 66, 97)) >this.IsMultiLineString : Symbol(Indenter.IsMultiLineString, Decl(parserindenter.ts, 732, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >IsMultiLineString : Symbol(Indenter.IsMultiLineString, Decl(parserindenter.ts, 732, 9)) >token : Symbol(token, Decl(parserindenter.ts, 66, 41)) @@ -246,7 +246,7 @@ module Formatting { indentationInfo = this.GetSpecialCaseIndentation(token, node); >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 68, 15)) >this.GetSpecialCaseIndentation : Symbol(Indenter.GetSpecialCaseIndentation, Decl(parserindenter.ts, 204, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >GetSpecialCaseIndentation : Symbol(Indenter.GetSpecialCaseIndentation, Decl(parserindenter.ts, 204, 9)) >token : Symbol(token, Decl(parserindenter.ts, 66, 41)) >node : Symbol(node, Decl(parserindenter.ts, 66, 80)) @@ -276,7 +276,7 @@ module Formatting { indentationInfo = node.GetEffectiveIndentation(this); >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 68, 15)) >node : Symbol(node, Decl(parserindenter.ts, 66, 80)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) } else { //// Special cases for anything else that is not in the tree and should be indented @@ -297,7 +297,7 @@ module Formatting { indentationInfo = node.GetEffectiveChildrenIndentation(this); >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 68, 15)) >node : Symbol(node, Decl(parserindenter.ts, 66, 80)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) } else { //// Move the token the same indentation-delta that moved its indentable parent @@ -308,7 +308,7 @@ module Formatting { indentationInfo = this.ApplyIndentationDeltaFromParent(token, node); >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 68, 15)) >this.ApplyIndentationDeltaFromParent : Symbol(Indenter.ApplyIndentationDeltaFromParent, Decl(parserindenter.ts, 474, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >ApplyIndentationDeltaFromParent : Symbol(Indenter.ApplyIndentationDeltaFromParent, Decl(parserindenter.ts, 474, 9)) >token : Symbol(token, Decl(parserindenter.ts, 66, 41)) >node : Symbol(node, Decl(parserindenter.ts, 66, 80)) @@ -323,7 +323,7 @@ module Formatting { var edit = this.GetIndentEdit(indentationInfo, token.Span.startPosition(), sameLineIndent); >edit : Symbol(edit, Decl(parserindenter.ts, 132, 19)) >this.GetIndentEdit : Symbol(Indenter.GetIndentEdit, Decl(parserindenter.ts, 393, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >GetIndentEdit : Symbol(Indenter.GetIndentEdit, Decl(parserindenter.ts, 393, 9)) >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 68, 15)) >token : Symbol(token, Decl(parserindenter.ts, 66, 41)) @@ -334,7 +334,7 @@ module Formatting { this.RegisterIndentation(edit, sameLineIndent); >this.RegisterIndentation : Symbol(Indenter.RegisterIndentation, Decl(parserindenter.ts, 683, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >RegisterIndentation : Symbol(Indenter.RegisterIndentation, Decl(parserindenter.ts, 683, 9)) >edit : Symbol(edit, Decl(parserindenter.ts, 132, 19)) >sameLineIndent : Symbol(sameLineIndent, Decl(parserindenter.ts, 66, 97)) @@ -350,7 +350,7 @@ module Formatting { var commentEdits = this.GetCommentIndentationEdits(token); >commentEdits : Symbol(commentEdits, Decl(parserindenter.ts, 140, 27)) >this.GetCommentIndentationEdits : Symbol(Indenter.GetCommentIndentationEdits, Decl(parserindenter.ts, 149, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >GetCommentIndentationEdits : Symbol(Indenter.GetCommentIndentationEdits, Decl(parserindenter.ts, 149, 9)) >token : Symbol(token, Decl(parserindenter.ts, 66, 41)) @@ -389,7 +389,7 @@ module Formatting { var commentLastLineNumber = this.snapshot.GetLineNumberFromPosition(token.Span.endPosition()); >commentLastLineNumber : Symbol(commentLastLineNumber, Decl(parserindenter.ts, 157, 15)) >this.snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) >token : Symbol(token, Decl(parserindenter.ts, 151, 43)) @@ -403,7 +403,7 @@ module Formatting { var commentFirstLineIndentationDelta = this.GetIndentationDelta(token.Span.startPosition(), null); >commentFirstLineIndentationDelta : Symbol(commentFirstLineIndentationDelta, Decl(parserindenter.ts, 161, 15)) >this.GetIndentationDelta : Symbol(Indenter.GetIndentationDelta, Decl(parserindenter.ts, 520, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >GetIndentationDelta : Symbol(Indenter.GetIndentationDelta, Decl(parserindenter.ts, 520, 9)) >token : Symbol(token, Decl(parserindenter.ts, 151, 43)) @@ -421,21 +421,21 @@ module Formatting { var lineStartPosition = this.snapshot.GetLineFromLineNumber(line).startPosition(); >lineStartPosition : Symbol(lineStartPosition, Decl(parserindenter.ts, 164, 23)) >this.snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) >line : Symbol(line, Decl(parserindenter.ts, 163, 24)) var lineIndent = this.GetLineIndentationForOffset(lineStartPosition); >lineIndent : Symbol(lineIndent, Decl(parserindenter.ts, 165, 23)) >this.GetLineIndentationForOffset : Symbol(Indenter.GetLineIndentationForOffset, Decl(parserindenter.ts, 661, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >GetLineIndentationForOffset : Symbol(Indenter.GetLineIndentationForOffset, Decl(parserindenter.ts, 661, 9)) >lineStartPosition : Symbol(lineStartPosition, Decl(parserindenter.ts, 164, 23)) var commentIndentationInfo = this.ApplyIndentationDelta2(lineIndent, commentFirstLineIndentationDelta); >commentIndentationInfo : Symbol(commentIndentationInfo, Decl(parserindenter.ts, 167, 23)) >this.ApplyIndentationDelta2 : Symbol(Indenter.ApplyIndentationDelta2, Decl(parserindenter.ts, 501, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >ApplyIndentationDelta2 : Symbol(Indenter.ApplyIndentationDelta2, Decl(parserindenter.ts, 501, 9)) >lineIndent : Symbol(lineIndent, Decl(parserindenter.ts, 165, 23)) >commentFirstLineIndentationDelta : Symbol(commentFirstLineIndentationDelta, Decl(parserindenter.ts, 161, 15)) @@ -453,7 +453,7 @@ module Formatting { var commentIndentationEdit = this.GetIndentEdit(commentIndentationInfo, tokenStartPosition, false); >commentIndentationEdit : Symbol(commentIndentationEdit, Decl(parserindenter.ts, 170, 27)) >this.GetIndentEdit : Symbol(Indenter.GetIndentEdit, Decl(parserindenter.ts, 393, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >GetIndentEdit : Symbol(Indenter.GetIndentEdit, Decl(parserindenter.ts, 393, 9)) >commentIndentationInfo : Symbol(commentIndentationInfo, Decl(parserindenter.ts, 167, 23)) >tokenStartPosition : Symbol(tokenStartPosition, Decl(parserindenter.ts, 169, 27)) @@ -562,7 +562,7 @@ module Formatting { indentationInfo = this.GetSpecialCaseIndentationForLCurly(node); >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 207, 15)) >this.GetSpecialCaseIndentationForLCurly : Symbol(Indenter.GetSpecialCaseIndentationForLCurly, Decl(parserindenter.ts, 243, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >GetSpecialCaseIndentationForLCurly : Symbol(Indenter.GetSpecialCaseIndentationForLCurly, Decl(parserindenter.ts, 243, 9)) >node : Symbol(node, Decl(parserindenter.ts, 206, 59)) @@ -574,7 +574,7 @@ module Formatting { indentationInfo = node.GetNodeStartLineIndentation(this); >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 207, 15)) >node : Symbol(node, Decl(parserindenter.ts, 206, 59)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) return indentationInfo; >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 207, 15)) @@ -592,7 +592,7 @@ module Formatting { indentationInfo = node.GetNodeStartLineIndentation(this); >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 207, 15)) >node : Symbol(node, Decl(parserindenter.ts, 206, 59)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) return indentationInfo; >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 207, 15)) @@ -604,7 +604,7 @@ module Formatting { indentationInfo = node.GetNodeStartLineIndentation(this); >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 207, 15)) >node : Symbol(node, Decl(parserindenter.ts, 206, 59)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) return indentationInfo; >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 207, 15)) @@ -615,7 +615,7 @@ module Formatting { case AuthorTokenKind.atkSColon: return this.GetSpecialCaseIndentationForSemicolon(token, node); >this.GetSpecialCaseIndentationForSemicolon : Symbol(Indenter.GetSpecialCaseIndentationForSemicolon, Decl(parserindenter.ts, 262, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >GetSpecialCaseIndentationForSemicolon : Symbol(Indenter.GetSpecialCaseIndentationForSemicolon, Decl(parserindenter.ts, 262, 9)) >token : Symbol(token, Decl(parserindenter.ts, 206, 42)) >node : Symbol(node, Decl(parserindenter.ts, 206, 59)) @@ -623,7 +623,7 @@ module Formatting { case AuthorTokenKind.atkComment: return this.GetSpecialCaseIndentationForComment(token, node); >this.GetSpecialCaseIndentationForComment : Symbol(Indenter.GetSpecialCaseIndentationForComment, Decl(parserindenter.ts, 285, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >GetSpecialCaseIndentationForComment : Symbol(Indenter.GetSpecialCaseIndentationForComment, Decl(parserindenter.ts, 285, 9)) >token : Symbol(token, Decl(parserindenter.ts, 206, 42)) >node : Symbol(node, Decl(parserindenter.ts, 206, 59)) @@ -655,7 +655,7 @@ module Formatting { indentationInfo = node.GetNodeStartLineIndentation(this); >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 246, 15)) >node : Symbol(node, Decl(parserindenter.ts, 245, 51)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) return indentationInfo; >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 246, 15)) @@ -672,7 +672,7 @@ module Formatting { indentationInfo = node.GetEffectiveIndentation(this); >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 246, 15)) >node : Symbol(node, Decl(parserindenter.ts, 245, 51)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) return indentationInfo; >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 246, 15)) @@ -692,13 +692,13 @@ module Formatting { if (this.smartIndent) { >this.smartIndent : Symbol(Indenter.smartIndent, Decl(parserindenter.ts, 31, 41)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >smartIndent : Symbol(Indenter.smartIndent, Decl(parserindenter.ts, 31, 41)) indentationInfo = node.GetEffectiveChildrenIndentation(this); >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 265, 15)) >node : Symbol(node, Decl(parserindenter.ts, 264, 71)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) return indentationInfo; >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 265, 15)) @@ -724,7 +724,7 @@ module Formatting { indentationInfo = node.GetEffectiveChildrenIndentation(this); >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 265, 15)) >node : Symbol(node, Decl(parserindenter.ts, 264, 71)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) return indentationInfo; >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 265, 15)) @@ -767,7 +767,7 @@ module Formatting { if (this.CanIndentComment(token, node)) { >this.CanIndentComment : Symbol(Indenter.CanIndentComment, Decl(parserindenter.ts, 305, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >CanIndentComment : Symbol(Indenter.CanIndentComment, Decl(parserindenter.ts, 305, 9)) >token : Symbol(token, Decl(parserindenter.ts, 287, 52)) >node : Symbol(node, Decl(parserindenter.ts, 287, 69)) @@ -775,13 +775,13 @@ module Formatting { indentationInfo = node.GetEffectiveChildrenIndentationForComment(this); >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 288, 15)) >node : Symbol(node, Decl(parserindenter.ts, 287, 69)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) } else { indentationInfo = this.ApplyIndentationDeltaFromParent(token, node); >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 288, 15)) >this.ApplyIndentationDeltaFromParent : Symbol(Indenter.ApplyIndentationDeltaFromParent, Decl(parserindenter.ts, 474, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >ApplyIndentationDeltaFromParent : Symbol(Indenter.ApplyIndentationDeltaFromParent, Decl(parserindenter.ts, 474, 9)) >token : Symbol(token, Decl(parserindenter.ts, 287, 52)) >node : Symbol(node, Decl(parserindenter.ts, 287, 69)) @@ -864,7 +864,7 @@ module Formatting { var scriptBlockIndentation = this.ApplyIndentationLevel(languageHostIndentation, 1); >scriptBlockIndentation : Symbol(scriptBlockIndentation, Decl(parserindenter.ts, 347, 15)) >this.ApplyIndentationLevel : Symbol(Indenter.ApplyIndentationLevel, Decl(parserindenter.ts, 422, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >ApplyIndentationLevel : Symbol(Indenter.ApplyIndentationLevel, Decl(parserindenter.ts, 422, 9)) >languageHostIndentation : Symbol(languageHostIndentation, Decl(parserindenter.ts, 342, 44)) @@ -927,7 +927,7 @@ module Formatting { var indentText = this.ApplyIndentationLevel(indentInfo.Prefix, indentInfo.Level); >indentText : Symbol(indentText, Decl(parserindenter.ts, 396, 15)) >this.ApplyIndentationLevel : Symbol(Indenter.ApplyIndentationLevel, Decl(parserindenter.ts, 422, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >ApplyIndentationLevel : Symbol(Indenter.ApplyIndentationLevel, Decl(parserindenter.ts, 422, 9)) >indentInfo : Symbol(indentInfo, Decl(parserindenter.ts, 395, 30)) >indentInfo : Symbol(indentInfo, Decl(parserindenter.ts, 395, 30)) @@ -943,7 +943,7 @@ module Formatting { var snapshotLine = this.snapshot.GetLineFromPosition(tokenStartPosition); >snapshotLine : Symbol(snapshotLine, Decl(parserindenter.ts, 402, 19)) >this.snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) >tokenStartPosition : Symbol(tokenStartPosition, Decl(parserindenter.ts, 395, 58)) @@ -956,7 +956,7 @@ module Formatting { var currentIndentText = this.snapshot.GetText(currentIndentSpan); >currentIndentText : Symbol(currentIndentText, Decl(parserindenter.ts, 404, 19)) >this.snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) >currentIndentSpan : Symbol(currentIndentSpan, Decl(parserindenter.ts, 403, 19)) @@ -966,7 +966,7 @@ module Formatting { if (this.logger.debug()) { >this.logger : Symbol(Indenter.logger, Decl(parserindenter.ts, 25, 20)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >logger : Symbol(Indenter.logger, Decl(parserindenter.ts, 25, 20)) // Verify that currentIndentText is all whitespaces @@ -1011,19 +1011,19 @@ module Formatting { var indentSize = this.editorOptions.IndentSize; >indentSize : Symbol(indentSize, Decl(parserindenter.ts, 425, 15)) >this.editorOptions : Symbol(Indenter.editorOptions, Decl(parserindenter.ts, 29, 51)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >editorOptions : Symbol(Indenter.editorOptions, Decl(parserindenter.ts, 29, 51)) var tabSize = this.editorOptions.TabSize; >tabSize : Symbol(tabSize, Decl(parserindenter.ts, 426, 15)) >this.editorOptions : Symbol(Indenter.editorOptions, Decl(parserindenter.ts, 29, 51)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >editorOptions : Symbol(Indenter.editorOptions, Decl(parserindenter.ts, 29, 51)) var convertTabsToSpaces = this.editorOptions.ConvertTabsToSpaces; >convertTabsToSpaces : Symbol(convertTabsToSpaces, Decl(parserindenter.ts, 427, 15)) >this.editorOptions : Symbol(Indenter.editorOptions, Decl(parserindenter.ts, 29, 51)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >editorOptions : Symbol(Indenter.editorOptions, Decl(parserindenter.ts, 29, 51)) if (level < 0) { @@ -1066,7 +1066,7 @@ module Formatting { else return this.GetIndentString(null, totalIndent, tabSize, convertTabsToSpaces); >this.GetIndentString : Symbol(Indenter.GetIndentString, Decl(parserindenter.ts, 450, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >GetIndentString : Symbol(Indenter.GetIndentString, Decl(parserindenter.ts, 450, 9)) >totalIndent : Symbol(totalIndent, Decl(parserindenter.ts, 433, 19)) >tabSize : Symbol(tabSize, Decl(parserindenter.ts, 426, 15)) @@ -1080,7 +1080,7 @@ module Formatting { return this.GetIndentString(existingIndentation, totalIndentSize, tabSize, convertTabsToSpaces); >this.GetIndentString : Symbol(Indenter.GetIndentString, Decl(parserindenter.ts, 450, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >GetIndentString : Symbol(Indenter.GetIndentString, Decl(parserindenter.ts, 450, 9)) >existingIndentation : Symbol(existingIndentation, Decl(parserindenter.ts, 424, 38)) >totalIndentSize : Symbol(totalIndentSize, Decl(parserindenter.ts, 448, 15)) @@ -1175,7 +1175,7 @@ module Formatting { var parentIndentationDeltaSize = this.GetIndentationDelta(indentableParent.AuthorNode.Details.StartOffset, token.Span.startPosition()); >parentIndentationDeltaSize : Symbol(parentIndentationDeltaSize, Decl(parserindenter.ts, 484, 19)) >this.GetIndentationDelta : Symbol(Indenter.GetIndentationDelta, Decl(parserindenter.ts, 520, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >GetIndentationDelta : Symbol(Indenter.GetIndentationDelta, Decl(parserindenter.ts, 520, 9)) >indentableParent : Symbol(indentableParent, Decl(parserindenter.ts, 479, 15)) >token : Symbol(token, Decl(parserindenter.ts, 476, 49)) @@ -1187,7 +1187,7 @@ module Formatting { indentationInfo = this.ApplyIndentationDelta1(token.Span.startPosition(), parentIndentationDeltaSize); >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 477, 15)) >this.ApplyIndentationDelta1 : Symbol(Indenter.ApplyIndentationDelta1, Decl(parserindenter.ts, 491, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >ApplyIndentationDelta1 : Symbol(Indenter.ApplyIndentationDelta1, Decl(parserindenter.ts, 491, 9)) >token : Symbol(token, Decl(parserindenter.ts, 476, 49)) >parentIndentationDeltaSize : Symbol(parentIndentationDeltaSize, Decl(parserindenter.ts, 484, 19)) @@ -1208,7 +1208,7 @@ module Formatting { var snapshotLine = this.snapshot.GetLineFromPosition(tokenStartPosition); >snapshotLine : Symbol(snapshotLine, Decl(parserindenter.ts, 495, 15)) >this.snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) >tokenStartPosition : Symbol(tokenStartPosition, Decl(parserindenter.ts, 493, 39)) @@ -1221,14 +1221,14 @@ module Formatting { var currentIndent = this.snapshot.GetText(currentIndentSpan); >currentIndent : Symbol(currentIndent, Decl(parserindenter.ts, 497, 15)) >this.snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) >currentIndentSpan : Symbol(currentIndentSpan, Decl(parserindenter.ts, 496, 15)) // Calculate new indentation from current-indentation and delta return this.ApplyIndentationDelta2(currentIndent, delta); >this.ApplyIndentationDelta2 : Symbol(Indenter.ApplyIndentationDelta2, Decl(parserindenter.ts, 501, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >ApplyIndentationDelta2 : Symbol(Indenter.ApplyIndentationDelta2, Decl(parserindenter.ts, 501, 9)) >currentIndent : Symbol(currentIndent, Decl(parserindenter.ts, 497, 15)) >delta : Symbol(delta, Decl(parserindenter.ts, 493, 66)) @@ -1248,11 +1248,11 @@ module Formatting { var currentIndentSize = Indenter.GetIndentSizeFromIndentText(currentIndent, this.editorOptions); >currentIndentSize : Symbol(currentIndentSize, Decl(parserindenter.ts, 507, 15)) >Indenter.GetIndentSizeFromIndentText : Symbol(Indenter.GetIndentSizeFromIndentText, Decl(parserindenter.ts, 179, 9)) ->Indenter : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>Indenter : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >GetIndentSizeFromIndentText : Symbol(Indenter.GetIndentSizeFromIndentText, Decl(parserindenter.ts, 179, 9)) >currentIndent : Symbol(currentIndent, Decl(parserindenter.ts, 503, 39)) >this.editorOptions : Symbol(Indenter.editorOptions, Decl(parserindenter.ts, 29, 51)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >editorOptions : Symbol(Indenter.editorOptions, Decl(parserindenter.ts, 29, 51)) var newIndentSize = currentIndentSize + delta; @@ -1270,14 +1270,14 @@ module Formatting { var newIndent = this.GetIndentString(null, newIndentSize, this.editorOptions.TabSize, this.editorOptions.ConvertTabsToSpaces); >newIndent : Symbol(newIndent, Decl(parserindenter.ts, 514, 15)) >this.GetIndentString : Symbol(Indenter.GetIndentString, Decl(parserindenter.ts, 450, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >GetIndentString : Symbol(Indenter.GetIndentString, Decl(parserindenter.ts, 450, 9)) >newIndentSize : Symbol(newIndentSize, Decl(parserindenter.ts, 509, 15)) >this.editorOptions : Symbol(Indenter.editorOptions, Decl(parserindenter.ts, 29, 51)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >editorOptions : Symbol(Indenter.editorOptions, Decl(parserindenter.ts, 29, 51)) >this.editorOptions : Symbol(Indenter.editorOptions, Decl(parserindenter.ts, 29, 51)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >editorOptions : Symbol(Indenter.editorOptions, Decl(parserindenter.ts, 29, 51)) if (newIndent != null) { @@ -1302,7 +1302,7 @@ module Formatting { var indentationDeltaSize = this.offsetIndentationDeltas.GetValue(tokenStartPosition); >indentationDeltaSize : Symbol(indentationDeltaSize, Decl(parserindenter.ts, 525, 15)) >this.offsetIndentationDeltas : Symbol(Indenter.offsetIndentationDeltas, Decl(parserindenter.ts, 22, 51)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >offsetIndentationDeltas : Symbol(Indenter.offsetIndentationDeltas, Decl(parserindenter.ts, 22, 51)) >tokenStartPosition : Symbol(tokenStartPosition, Decl(parserindenter.ts, 522, 36)) @@ -1312,7 +1312,7 @@ module Formatting { var indentEditInfo = this.indentationBag.FindIndent(tokenStartPosition); >indentEditInfo : Symbol(indentEditInfo, Decl(parserindenter.ts, 527, 19)) >this.indentationBag : Symbol(Indenter.indentationBag, Decl(parserindenter.ts, 19, 63)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >indentationBag : Symbol(Indenter.indentationBag, Decl(parserindenter.ts, 19, 63)) >tokenStartPosition : Symbol(tokenStartPosition, Decl(parserindenter.ts, 522, 36)) @@ -1325,7 +1325,7 @@ module Formatting { var origIndentText = this.snapshot.GetText(new Span(indentEditInfo.OrigIndentPosition, indentEditInfo.OrigIndentLength())); >origIndentText : Symbol(origIndentText, Decl(parserindenter.ts, 533, 19)) >this.snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) >indentEditInfo : Symbol(indentEditInfo, Decl(parserindenter.ts, 527, 19)) >indentEditInfo : Symbol(indentEditInfo, Decl(parserindenter.ts, 527, 19)) @@ -1337,21 +1337,21 @@ module Formatting { var origIndentSize = Indenter.GetIndentSizeFromText(origIndentText, this.editorOptions, /*includeNonIndentChars*/true); >origIndentSize : Symbol(origIndentSize, Decl(parserindenter.ts, 536, 19)) >Indenter.GetIndentSizeFromText : Symbol(Indenter.GetIndentSizeFromText, Decl(parserindenter.ts, 183, 9)) ->Indenter : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>Indenter : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >GetIndentSizeFromText : Symbol(Indenter.GetIndentSizeFromText, Decl(parserindenter.ts, 183, 9)) >origIndentText : Symbol(origIndentText, Decl(parserindenter.ts, 533, 19)) >this.editorOptions : Symbol(Indenter.editorOptions, Decl(parserindenter.ts, 29, 51)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >editorOptions : Symbol(Indenter.editorOptions, Decl(parserindenter.ts, 29, 51)) var newIndentSize = Indenter.GetIndentSizeFromIndentText(newIndentText, this.editorOptions); >newIndentSize : Symbol(newIndentSize, Decl(parserindenter.ts, 537, 19)) >Indenter.GetIndentSizeFromIndentText : Symbol(Indenter.GetIndentSizeFromIndentText, Decl(parserindenter.ts, 179, 9)) ->Indenter : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>Indenter : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >GetIndentSizeFromIndentText : Symbol(Indenter.GetIndentSizeFromIndentText, Decl(parserindenter.ts, 179, 9)) >newIndentText : Symbol(newIndentText, Decl(parserindenter.ts, 534, 19)) >this.editorOptions : Symbol(Indenter.editorOptions, Decl(parserindenter.ts, 29, 51)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >editorOptions : Symbol(Indenter.editorOptions, Decl(parserindenter.ts, 29, 51)) // Check the child's position whether it's before the parent position @@ -1374,14 +1374,14 @@ module Formatting { var childTokenLineStartPosition = this.snapshot.GetLineFromPosition(childTokenStartPosition).startPosition(); >childTokenLineStartPosition : Symbol(childTokenLineStartPosition, Decl(parserindenter.ts, 554, 23)) >this.snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) >childTokenStartPosition : Symbol(childTokenStartPosition, Decl(parserindenter.ts, 522, 63)) var childIndentText = this.snapshot.GetText(new Span(childTokenLineStartPosition, childTokenStartPosition - childTokenLineStartPosition)); >childIndentText : Symbol(childIndentText, Decl(parserindenter.ts, 555, 23)) >this.snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) >childTokenLineStartPosition : Symbol(childTokenLineStartPosition, Decl(parserindenter.ts, 554, 23)) >childTokenStartPosition : Symbol(childTokenStartPosition, Decl(parserindenter.ts, 522, 63)) @@ -1390,11 +1390,11 @@ module Formatting { var childIndentSize = Indenter.GetIndentSizeFromIndentText(childIndentText, this.editorOptions); >childIndentSize : Symbol(childIndentSize, Decl(parserindenter.ts, 557, 23)) >Indenter.GetIndentSizeFromIndentText : Symbol(Indenter.GetIndentSizeFromIndentText, Decl(parserindenter.ts, 179, 9)) ->Indenter : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>Indenter : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >GetIndentSizeFromIndentText : Symbol(Indenter.GetIndentSizeFromIndentText, Decl(parserindenter.ts, 179, 9)) >childIndentText : Symbol(childIndentText, Decl(parserindenter.ts, 555, 23)) >this.editorOptions : Symbol(Indenter.editorOptions, Decl(parserindenter.ts, 29, 51)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >editorOptions : Symbol(Indenter.editorOptions, Decl(parserindenter.ts, 29, 51)) if (childIndentSize < origIndentSize) @@ -1404,11 +1404,11 @@ module Formatting { origIndentSize = Indenter.GetIndentSizeFromIndentText(origIndentText, this.editorOptions); >origIndentSize : Symbol(origIndentSize, Decl(parserindenter.ts, 536, 19)) >Indenter.GetIndentSizeFromIndentText : Symbol(Indenter.GetIndentSizeFromIndentText, Decl(parserindenter.ts, 179, 9)) ->Indenter : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>Indenter : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >GetIndentSizeFromIndentText : Symbol(Indenter.GetIndentSizeFromIndentText, Decl(parserindenter.ts, 179, 9)) >origIndentText : Symbol(origIndentText, Decl(parserindenter.ts, 533, 19)) >this.editorOptions : Symbol(Indenter.editorOptions, Decl(parserindenter.ts, 29, 51)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >editorOptions : Symbol(Indenter.editorOptions, Decl(parserindenter.ts, 29, 51)) } @@ -1419,7 +1419,7 @@ module Formatting { this.offsetIndentationDeltas.Add(tokenStartPosition, indentationDeltaSize); >this.offsetIndentationDeltas : Symbol(Indenter.offsetIndentationDeltas, Decl(parserindenter.ts, 22, 51)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >offsetIndentationDeltas : Symbol(Indenter.offsetIndentationDeltas, Decl(parserindenter.ts, 22, 51)) >tokenStartPosition : Symbol(tokenStartPosition, Decl(parserindenter.ts, 522, 36)) >indentationDeltaSize : Symbol(indentationDeltaSize, Decl(parserindenter.ts, 525, 15)) @@ -1446,7 +1446,7 @@ module Formatting { if (!this.smartIndent && tree.StartNodePreviousSibling !== null && tree.StartNodeSelf.AuthorNode.Label == 0 && tree.StartNodePreviousSibling.Label == 0) { >this.smartIndent : Symbol(Indenter.smartIndent, Decl(parserindenter.ts, 31, 41)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >smartIndent : Symbol(Indenter.smartIndent, Decl(parserindenter.ts, 31, 41)) >tree : Symbol(tree, Decl(parserindenter.ts, 570, 41)) >tree : Symbol(tree, Decl(parserindenter.ts, 570, 41)) @@ -1467,7 +1467,7 @@ module Formatting { var lineNum = this.snapshot.GetLineNumberFromPosition(offset); >lineNum : Symbol(lineNum, Decl(parserindenter.ts, 584, 23)) >this.snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) >offset : Symbol(offset, Decl(parserindenter.ts, 572, 15)) @@ -1478,7 +1478,7 @@ module Formatting { while (node.Parent != null && this.snapshot.GetLineNumberFromPosition(node.Parent.AuthorNode.Details.StartOffset) == lineNum) { >node : Symbol(node, Decl(parserindenter.ts, 585, 23)) >this.snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) >node : Symbol(node, Decl(parserindenter.ts, 585, 23)) >lineNum : Symbol(lineNum, Decl(parserindenter.ts, 584, 23)) @@ -1507,7 +1507,7 @@ module Formatting { // Otherwise base on parent indentation. if (this.smartIndent) { >this.smartIndent : Symbol(Indenter.smartIndent, Decl(parserindenter.ts, 31, 41)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >smartIndent : Symbol(Indenter.smartIndent, Decl(parserindenter.ts, 31, 41)) // in smartIndent the self node is the parent node since it's the closest node to the new line @@ -1520,7 +1520,7 @@ module Formatting { >parent : Symbol(parent, Decl(parserindenter.ts, 595, 23)) >parent : Symbol(parent, Decl(parserindenter.ts, 595, 23)) >this.firstToken : Symbol(Indenter.firstToken, Decl(parserindenter.ts, 30, 57)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >firstToken : Symbol(Indenter.firstToken, Decl(parserindenter.ts, 30, 57)) parent = parent.Parent; @@ -1532,7 +1532,7 @@ module Formatting { var startNodeLineNumber = this.snapshot.GetLineNumberFromPosition(tree.StartNodeSelf.AuthorNode.Details.StartOffset); >startNodeLineNumber : Symbol(startNodeLineNumber, Decl(parserindenter.ts, 607, 27)) >this.snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) >tree : Symbol(tree, Decl(parserindenter.ts, 570, 41)) @@ -1546,7 +1546,7 @@ module Formatting { startNodeLineNumber == this.snapshot.GetLineNumberFromPosition(parent.AuthorNode.Details.StartOffset)) { >startNodeLineNumber : Symbol(startNodeLineNumber, Decl(parserindenter.ts, 607, 27)) >this.snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) >parent : Symbol(parent, Decl(parserindenter.ts, 595, 23)) @@ -1588,14 +1588,14 @@ module Formatting { var indentOverride = this.GetLineIndentationForOffset(offset); >indentOverride : Symbol(indentOverride, Decl(parserindenter.ts, 629, 19)) >this.GetLineIndentationForOffset : Symbol(Indenter.GetLineIndentationForOffset, Decl(parserindenter.ts, 661, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >GetLineIndentationForOffset : Symbol(Indenter.GetLineIndentationForOffset, Decl(parserindenter.ts, 661, 9)) >offset : Symbol(offset, Decl(parserindenter.ts, 572, 15)) // Set the indentation on all the siblings to be the same as indentNode if (!this.smartIndent && tree.StartNodePreviousSibling !== null && indentNode.Parent != null) { >this.smartIndent : Symbol(Indenter.smartIndent, Decl(parserindenter.ts, 31, 41)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >smartIndent : Symbol(Indenter.smartIndent, Decl(parserindenter.ts, 31, 41)) >tree : Symbol(tree, Decl(parserindenter.ts, 570, 41)) >indentNode : Symbol(indentNode, Decl(parserindenter.ts, 573, 15)) @@ -1625,7 +1625,7 @@ module Formatting { var lastLine = this.snapshot.GetLineNumberFromPosition(indentNode.AuthorNode.Details.StartOffset); >lastLine : Symbol(lastLine, Decl(parserindenter.ts, 643, 19)) >this.snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) >indentNode : Symbol(indentNode, Decl(parserindenter.ts, 573, 15)) @@ -1633,7 +1633,7 @@ module Formatting { var currentLine = this.snapshot.GetLineNumberFromPosition(indentNode.AuthorNode.Details.StartOffset); >currentLine : Symbol(currentLine, Decl(parserindenter.ts, 645, 23)) >this.snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) >indentNode : Symbol(indentNode, Decl(parserindenter.ts, 573, 15)) @@ -1648,7 +1648,7 @@ module Formatting { indentOverride = this.ApplyIndentationLevel(indentOverride, -lastDelta); >indentOverride : Symbol(indentOverride, Decl(parserindenter.ts, 629, 19)) >this.ApplyIndentationLevel : Symbol(Indenter.ApplyIndentationLevel, Decl(parserindenter.ts, 422, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >ApplyIndentationLevel : Symbol(Indenter.ApplyIndentationLevel, Decl(parserindenter.ts, 422, 9)) >indentOverride : Symbol(indentOverride, Decl(parserindenter.ts, 629, 19)) >lastDelta : Symbol(lastDelta, Decl(parserindenter.ts, 642, 19)) @@ -1690,7 +1690,7 @@ module Formatting { indentationEdit = this.indentationBag.FindIndent(offset); >indentationEdit : Symbol(indentationEdit, Decl(parserindenter.ts, 664, 15)) >this.indentationBag : Symbol(Indenter.indentationBag, Decl(parserindenter.ts, 19, 63)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >indentationBag : Symbol(Indenter.indentationBag, Decl(parserindenter.ts, 19, 63)) >offset : Symbol(offset, Decl(parserindenter.ts, 663, 43)) @@ -1705,7 +1705,7 @@ module Formatting { var line = this.snapshot.GetLineFromPosition(offset); >line : Symbol(line, Decl(parserindenter.ts, 673, 19)) >this.snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) >offset : Symbol(offset, Decl(parserindenter.ts, 663, 43)) @@ -1751,7 +1751,7 @@ module Formatting { var lineStartPosition = this.snapshot.GetLineFromPosition(indent.Position).startPosition(); >lineStartPosition : Symbol(lineStartPosition, Decl(parserindenter.ts, 691, 19)) >this.snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) >indent : Symbol(indent, Decl(parserindenter.ts, 685, 36)) @@ -1775,7 +1775,7 @@ module Formatting { this.indentationBag.AddIndent(indentationInfo); >this.indentationBag : Symbol(Indenter.indentationBag, Decl(parserindenter.ts, 19, 63)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >indentationBag : Symbol(Indenter.indentationBag, Decl(parserindenter.ts, 19, 63)) >indentationInfo : Symbol(indentationInfo, Decl(parserindenter.ts, 687, 15)) } @@ -1787,7 +1787,7 @@ module Formatting { { this.RegisterIndentation(new TextEditInfo(position, 0, indent), false); >this.RegisterIndentation : Symbol(Indenter.RegisterIndentation, Decl(parserindenter.ts, 683, 9)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >RegisterIndentation : Symbol(Indenter.RegisterIndentation, Decl(parserindenter.ts, 683, 9)) >position : Symbol(position, Decl(parserindenter.ts, 703, 36)) >indent : Symbol(indent, Decl(parserindenter.ts, 703, 53)) @@ -1853,11 +1853,11 @@ module Formatting { this.snapshot.GetLineNumberFromPosition(token.Span.endPosition()) > this.snapshot.GetLineNumberFromPosition(token.Span.startPosition()); >this.snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) >token : Symbol(token, Decl(parserindenter.ts, 734, 34)) >this.snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) ->this : Symbol(Indenter, Decl(parserindenter.ts, 18, 19)) +>this : Symbol(Indenter, Decl(parserindenter.ts, 18, 22)) >snapshot : Symbol(Indenter.snapshot, Decl(parserindenter.ts, 27, 35)) >token : Symbol(token, Decl(parserindenter.ts, 734, 34)) } diff --git a/tests/baselines/reference/parserindenter.types b/tests/baselines/reference/parserindenter.types index 0d93f460d18e4..73e1cec8843bc 100644 --- a/tests/baselines/reference/parserindenter.types +++ b/tests/baselines/reference/parserindenter.types @@ -19,7 +19,7 @@ /// -module Formatting { +namespace Formatting { >Formatting : typeof Formatting > : ^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/partiallyAmbientClodule.js b/tests/baselines/reference/partiallyAmbientClodule.js index a71b421199e39..840d957dddaa1 100644 --- a/tests/baselines/reference/partiallyAmbientClodule.js +++ b/tests/baselines/reference/partiallyAmbientClodule.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/partiallyAmbientClodule.ts] //// //// [partiallyAmbientClodule.ts] -declare module foo { +declare namespace foo { export function x(): any; } class foo { } // Legal, because module is ambient diff --git a/tests/baselines/reference/partiallyAmbientClodule.symbols b/tests/baselines/reference/partiallyAmbientClodule.symbols index 604245f7e2202..82107e626a707 100644 --- a/tests/baselines/reference/partiallyAmbientClodule.symbols +++ b/tests/baselines/reference/partiallyAmbientClodule.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/partiallyAmbientClodule.ts] //// === partiallyAmbientClodule.ts === -declare module foo { +declare namespace foo { >foo : Symbol(foo, Decl(partiallyAmbientClodule.ts, 0, 0), Decl(partiallyAmbientClodule.ts, 2, 1)) export function x(): any; ->x : Symbol(x, Decl(partiallyAmbientClodule.ts, 0, 20)) +>x : Symbol(x, Decl(partiallyAmbientClodule.ts, 0, 23)) } class foo { } // Legal, because module is ambient >foo : Symbol(foo, Decl(partiallyAmbientClodule.ts, 0, 0), Decl(partiallyAmbientClodule.ts, 2, 1)) diff --git a/tests/baselines/reference/partiallyAmbientClodule.types b/tests/baselines/reference/partiallyAmbientClodule.types index 3d9da9a38779c..f4b5f5cd7de14 100644 --- a/tests/baselines/reference/partiallyAmbientClodule.types +++ b/tests/baselines/reference/partiallyAmbientClodule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/partiallyAmbientClodule.ts] //// === partiallyAmbientClodule.ts === -declare module foo { +declare namespace foo { >foo : typeof foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/partiallyAmbientFundule.js b/tests/baselines/reference/partiallyAmbientFundule.js index fc7f954e7dfa4..0ba97e674db73 100644 --- a/tests/baselines/reference/partiallyAmbientFundule.js +++ b/tests/baselines/reference/partiallyAmbientFundule.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/partiallyAmbientFundule.ts] //// //// [partiallyAmbientFundule.ts] -declare module foo { +declare namespace foo { export function x(): any; } function foo () { } // Legal, because module is ambient diff --git a/tests/baselines/reference/partiallyAmbientFundule.symbols b/tests/baselines/reference/partiallyAmbientFundule.symbols index 292b7a35f1b90..ad0bc1386f8af 100644 --- a/tests/baselines/reference/partiallyAmbientFundule.symbols +++ b/tests/baselines/reference/partiallyAmbientFundule.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/partiallyAmbientFundule.ts] //// === partiallyAmbientFundule.ts === -declare module foo { +declare namespace foo { >foo : Symbol(foo, Decl(partiallyAmbientFundule.ts, 2, 1), Decl(partiallyAmbientFundule.ts, 0, 0)) export function x(): any; ->x : Symbol(x, Decl(partiallyAmbientFundule.ts, 0, 20)) +>x : Symbol(x, Decl(partiallyAmbientFundule.ts, 0, 23)) } function foo () { } // Legal, because module is ambient >foo : Symbol(foo, Decl(partiallyAmbientFundule.ts, 2, 1), Decl(partiallyAmbientFundule.ts, 0, 0)) diff --git a/tests/baselines/reference/partiallyAmbientFundule.types b/tests/baselines/reference/partiallyAmbientFundule.types index 953850b7d047a..720949d1a7b7d 100644 --- a/tests/baselines/reference/partiallyAmbientFundule.types +++ b/tests/baselines/reference/partiallyAmbientFundule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/partiallyAmbientFundule.ts] //// === partiallyAmbientFundule.ts === -declare module foo { +declare namespace foo { >foo : typeof foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/plusOperatorWithAnyOtherType.errors.txt b/tests/baselines/reference/plusOperatorWithAnyOtherType.errors.txt index 1f09f5ef99902..31241c511c6a7 100644 --- a/tests/baselines/reference/plusOperatorWithAnyOtherType.errors.txt +++ b/tests/baselines/reference/plusOperatorWithAnyOtherType.errors.txt @@ -26,7 +26,7 @@ plusOperatorWithAnyOtherType.ts(54,1): error TS2695: Left side of comma operator return a; } } - module M { + namespace M { export var n: any; } var objA = new A(); diff --git a/tests/baselines/reference/plusOperatorWithAnyOtherType.js b/tests/baselines/reference/plusOperatorWithAnyOtherType.js index ce7faa19718fa..1f349e616dcb8 100644 --- a/tests/baselines/reference/plusOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/plusOperatorWithAnyOtherType.js @@ -20,7 +20,7 @@ class A { return a; } } -module M { +namespace M { export var n: any; } var objA = new A(); diff --git a/tests/baselines/reference/plusOperatorWithAnyOtherType.symbols b/tests/baselines/reference/plusOperatorWithAnyOtherType.symbols index 3c6c45281dad7..e6e9bb4786e43 100644 --- a/tests/baselines/reference/plusOperatorWithAnyOtherType.symbols +++ b/tests/baselines/reference/plusOperatorWithAnyOtherType.symbols @@ -47,7 +47,7 @@ class A { >a : Symbol(a, Decl(plusOperatorWithAnyOtherType.ts, 15, 11)) } } -module M { +namespace M { >M : Symbol(M, Decl(plusOperatorWithAnyOtherType.ts, 18, 1)) export var n: any; diff --git a/tests/baselines/reference/plusOperatorWithAnyOtherType.types b/tests/baselines/reference/plusOperatorWithAnyOtherType.types index 1f19877f8bc0f..d0232fc8d9e5b 100644 --- a/tests/baselines/reference/plusOperatorWithAnyOtherType.types +++ b/tests/baselines/reference/plusOperatorWithAnyOtherType.types @@ -76,7 +76,7 @@ class A { > : ^^^ } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/plusOperatorWithBooleanType.errors.txt b/tests/baselines/reference/plusOperatorWithBooleanType.errors.txt index 5492f9a16da33..e9712b5f4b4a7 100644 --- a/tests/baselines/reference/plusOperatorWithBooleanType.errors.txt +++ b/tests/baselines/reference/plusOperatorWithBooleanType.errors.txt @@ -11,7 +11,7 @@ plusOperatorWithBooleanType.ts(33,1): error TS2695: Left side of comma operator public a: boolean; static foo() { return false; } } - module M { + namespace M { export var n: boolean; } diff --git a/tests/baselines/reference/plusOperatorWithBooleanType.js b/tests/baselines/reference/plusOperatorWithBooleanType.js index 7db12b8dde453..fd16e58407d63 100644 --- a/tests/baselines/reference/plusOperatorWithBooleanType.js +++ b/tests/baselines/reference/plusOperatorWithBooleanType.js @@ -10,7 +10,7 @@ class A { public a: boolean; static foo() { return false; } } -module M { +namespace M { export var n: boolean; } diff --git a/tests/baselines/reference/plusOperatorWithBooleanType.symbols b/tests/baselines/reference/plusOperatorWithBooleanType.symbols index d49862af7ae66..175000bd2a9fd 100644 --- a/tests/baselines/reference/plusOperatorWithBooleanType.symbols +++ b/tests/baselines/reference/plusOperatorWithBooleanType.symbols @@ -17,7 +17,7 @@ class A { static foo() { return false; } >foo : Symbol(A.foo, Decl(plusOperatorWithBooleanType.ts, 6, 22)) } -module M { +namespace M { >M : Symbol(M, Decl(plusOperatorWithBooleanType.ts, 8, 1)) export var n: boolean; diff --git a/tests/baselines/reference/plusOperatorWithBooleanType.types b/tests/baselines/reference/plusOperatorWithBooleanType.types index 160423172a396..749a233d53ce8 100644 --- a/tests/baselines/reference/plusOperatorWithBooleanType.types +++ b/tests/baselines/reference/plusOperatorWithBooleanType.types @@ -26,7 +26,7 @@ class A { >false : false > : ^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/plusOperatorWithNumberType.errors.txt b/tests/baselines/reference/plusOperatorWithNumberType.errors.txt index bfb09cd1fed73..ccc2e457c16a4 100644 --- a/tests/baselines/reference/plusOperatorWithNumberType.errors.txt +++ b/tests/baselines/reference/plusOperatorWithNumberType.errors.txt @@ -12,7 +12,7 @@ plusOperatorWithNumberType.ts(41,1): error TS2695: Left side of comma operator i public a: number; static foo() { return 1; } } - module M { + namespace M { export var n: number; } diff --git a/tests/baselines/reference/plusOperatorWithNumberType.js b/tests/baselines/reference/plusOperatorWithNumberType.js index 88161e67dde9f..dae064dedea60 100644 --- a/tests/baselines/reference/plusOperatorWithNumberType.js +++ b/tests/baselines/reference/plusOperatorWithNumberType.js @@ -11,7 +11,7 @@ class A { public a: number; static foo() { return 1; } } -module M { +namespace M { export var n: number; } diff --git a/tests/baselines/reference/plusOperatorWithNumberType.symbols b/tests/baselines/reference/plusOperatorWithNumberType.symbols index 5b8dfbd8ed3f4..e8414cdd61990 100644 --- a/tests/baselines/reference/plusOperatorWithNumberType.symbols +++ b/tests/baselines/reference/plusOperatorWithNumberType.symbols @@ -20,7 +20,7 @@ class A { static foo() { return 1; } >foo : Symbol(A.foo, Decl(plusOperatorWithNumberType.ts, 7, 21)) } -module M { +namespace M { >M : Symbol(M, Decl(plusOperatorWithNumberType.ts, 9, 1)) export var n: number; diff --git a/tests/baselines/reference/plusOperatorWithNumberType.types b/tests/baselines/reference/plusOperatorWithNumberType.types index 57ec667d52bb0..860487df66fc0 100644 --- a/tests/baselines/reference/plusOperatorWithNumberType.types +++ b/tests/baselines/reference/plusOperatorWithNumberType.types @@ -36,7 +36,7 @@ class A { >1 : 1 > : ^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/plusOperatorWithStringType.errors.txt b/tests/baselines/reference/plusOperatorWithStringType.errors.txt index d225fade925f3..738936e19c77b 100644 --- a/tests/baselines/reference/plusOperatorWithStringType.errors.txt +++ b/tests/baselines/reference/plusOperatorWithStringType.errors.txt @@ -12,7 +12,7 @@ plusOperatorWithStringType.ts(40,1): error TS2695: Left side of comma operator i public a: string; static foo() { return ""; } } - module M { + namespace M { export var n: string; } diff --git a/tests/baselines/reference/plusOperatorWithStringType.js b/tests/baselines/reference/plusOperatorWithStringType.js index 524c1a49f0ebf..222c94f425576 100644 --- a/tests/baselines/reference/plusOperatorWithStringType.js +++ b/tests/baselines/reference/plusOperatorWithStringType.js @@ -11,7 +11,7 @@ class A { public a: string; static foo() { return ""; } } -module M { +namespace M { export var n: string; } diff --git a/tests/baselines/reference/plusOperatorWithStringType.symbols b/tests/baselines/reference/plusOperatorWithStringType.symbols index 74d31bd2172f5..3480bd8b443a2 100644 --- a/tests/baselines/reference/plusOperatorWithStringType.symbols +++ b/tests/baselines/reference/plusOperatorWithStringType.symbols @@ -20,7 +20,7 @@ class A { static foo() { return ""; } >foo : Symbol(A.foo, Decl(plusOperatorWithStringType.ts, 7, 21)) } -module M { +namespace M { >M : Symbol(M, Decl(plusOperatorWithStringType.ts, 9, 1)) export var n: string; diff --git a/tests/baselines/reference/plusOperatorWithStringType.types b/tests/baselines/reference/plusOperatorWithStringType.types index ec3d7429ee416..d588036ed2892 100644 --- a/tests/baselines/reference/plusOperatorWithStringType.types +++ b/tests/baselines/reference/plusOperatorWithStringType.types @@ -36,7 +36,7 @@ class A { >"" : "" > : ^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/primaryExpressionMods.errors.txt b/tests/baselines/reference/primaryExpressionMods.errors.txt index 92495911da304..099090c580450 100644 --- a/tests/baselines/reference/primaryExpressionMods.errors.txt +++ b/tests/baselines/reference/primaryExpressionMods.errors.txt @@ -3,7 +3,7 @@ primaryExpressionMods.ts(11,8): error TS2833: Cannot find namespace 'm'. Did you ==== primaryExpressionMods.ts (2 errors) ==== - module M + namespace M { export interface P { x: number; y: number; } export var a = 1; @@ -18,5 +18,5 @@ primaryExpressionMods.ts(11,8): error TS2833: Cannot find namespace 'm'. Did you var q: m.P; // Error ~ !!! error TS2833: Cannot find namespace 'm'. Did you mean 'M'? -!!! related TS2728 primaryExpressionMods.ts:1:8: 'M' is declared here. +!!! related TS2728 primaryExpressionMods.ts:1:11: 'M' is declared here. \ No newline at end of file diff --git a/tests/baselines/reference/primaryExpressionMods.js b/tests/baselines/reference/primaryExpressionMods.js index b951d8a5a56fd..f30ed1792e3ca 100644 --- a/tests/baselines/reference/primaryExpressionMods.js +++ b/tests/baselines/reference/primaryExpressionMods.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/primaryExpressionMods.ts] //// //// [primaryExpressionMods.ts] -module M +namespace M { export interface P { x: number; y: number; } export var a = 1; diff --git a/tests/baselines/reference/primaryExpressionMods.symbols b/tests/baselines/reference/primaryExpressionMods.symbols index 4f135c0bbd0eb..366f6d92c8c07 100644 --- a/tests/baselines/reference/primaryExpressionMods.symbols +++ b/tests/baselines/reference/primaryExpressionMods.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/primaryExpressionMods.ts] //// === primaryExpressionMods.ts === -module M +namespace M >M : Symbol(M, Decl(primaryExpressionMods.ts, 0, 0)) { export interface P { x: number; y: number; } diff --git a/tests/baselines/reference/primaryExpressionMods.types b/tests/baselines/reference/primaryExpressionMods.types index 11cc211066ef1..b19a4422b31eb 100644 --- a/tests/baselines/reference/primaryExpressionMods.types +++ b/tests/baselines/reference/primaryExpressionMods.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/primaryExpressionMods.ts] //// === primaryExpressionMods.ts === -module M +namespace M >M : typeof M > : ^^^^^^^^ { diff --git a/tests/baselines/reference/primitiveTypeAsmoduleName.js b/tests/baselines/reference/primitiveTypeAsmoduleName.js index 7e80398751116..9d460d2d0b050 100644 --- a/tests/baselines/reference/primitiveTypeAsmoduleName.js +++ b/tests/baselines/reference/primitiveTypeAsmoduleName.js @@ -1,6 +1,6 @@ //// [tests/cases/compiler/primitiveTypeAsmoduleName.ts] //// //// [primitiveTypeAsmoduleName.ts] -module string {} +namespace string {} //// [primitiveTypeAsmoduleName.js] diff --git a/tests/baselines/reference/primitiveTypeAsmoduleName.symbols b/tests/baselines/reference/primitiveTypeAsmoduleName.symbols index 6e458b4032ed8..41075f50e62a0 100644 --- a/tests/baselines/reference/primitiveTypeAsmoduleName.symbols +++ b/tests/baselines/reference/primitiveTypeAsmoduleName.symbols @@ -1,6 +1,6 @@ //// [tests/cases/compiler/primitiveTypeAsmoduleName.ts] //// === primitiveTypeAsmoduleName.ts === -module string {} +namespace string {} >string : Symbol(string, Decl(primitiveTypeAsmoduleName.ts, 0, 0)) diff --git a/tests/baselines/reference/primitiveTypeAsmoduleName.types b/tests/baselines/reference/primitiveTypeAsmoduleName.types index 429e2f2a2a3c9..e106fa940a104 100644 --- a/tests/baselines/reference/primitiveTypeAsmoduleName.types +++ b/tests/baselines/reference/primitiveTypeAsmoduleName.types @@ -2,4 +2,4 @@ === primitiveTypeAsmoduleName.ts === -module string {} +namespace string {} diff --git a/tests/baselines/reference/privacyAccessorDeclFile.js b/tests/baselines/reference/privacyAccessorDeclFile.js index 69c0208e5d84f..65ebe27871b20 100644 --- a/tests/baselines/reference/privacyAccessorDeclFile.js +++ b/tests/baselines/reference/privacyAccessorDeclFile.js @@ -203,7 +203,7 @@ class privateClassWithPrivateModuleSetAccessorTypes { } } -export module publicModule { +export namespace publicModule { class privateClass { } @@ -406,7 +406,7 @@ export module publicModule { } } -module privateModule { +namespace privateModule { class privateClass { } @@ -651,14 +651,14 @@ class publicClassInGlobalWithWithPublicSetAccessorTypes { } } -module publicModuleInGlobal { +namespace publicModuleInGlobal { class privateClass { } export class publicClass { } - module privateModule { + namespace privateModule { class privateClass { } diff --git a/tests/baselines/reference/privacyAccessorDeclFile.symbols b/tests/baselines/reference/privacyAccessorDeclFile.symbols index e8658784fcbed..8265f5dd8da95 100644 --- a/tests/baselines/reference/privacyAccessorDeclFile.symbols +++ b/tests/baselines/reference/privacyAccessorDeclFile.symbols @@ -425,11 +425,11 @@ class privateClassWithPrivateModuleSetAccessorTypes { } } -export module publicModule { +export namespace publicModule { >publicModule : Symbol(publicModule, Decl(privacyAccessorDeclFile_externalModule.ts, 200, 1)) class privateClass { ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) } export class publicClass { @@ -440,25 +440,25 @@ export module publicModule { static get myPublicStaticMethod(): privateClass { // Error >myPublicStaticMethod : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPublicStaticMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 208, 61)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) return null; } private static get myPrivateStaticMethod(): privateClass { >myPrivateStaticMethod : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPrivateStaticMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 211, 9)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) return null; } get myPublicMethod(): privateClass { // Error >myPublicMethod : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPublicMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 214, 9)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) return null; } private get myPrivateMethod(): privateClass { >myPrivateMethod : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPrivateMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 217, 9)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) return null; } @@ -466,25 +466,25 @@ export module publicModule { >myPublicStaticMethod1 : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPublicStaticMethod1, Decl(privacyAccessorDeclFile_externalModule.ts, 220, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) } private static get myPrivateStaticMethod1() { >myPrivateStaticMethod1 : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPrivateStaticMethod1, Decl(privacyAccessorDeclFile_externalModule.ts, 223, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) } get myPublicMethod1() { // Error >myPublicMethod1 : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPublicMethod1, Decl(privacyAccessorDeclFile_externalModule.ts, 226, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) } private get myPrivateMethod1() { >myPrivateMethod1 : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPrivateMethod1, Decl(privacyAccessorDeclFile_externalModule.ts, 229, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) } } @@ -546,25 +546,25 @@ export module publicModule { static get myPublicStaticMethod(): privateClass { >myPublicStaticMethod : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPublicStaticMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 262, 55)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) return null; } private static get myPrivateStaticMethod(): privateClass { >myPrivateStaticMethod : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPrivateStaticMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 265, 9)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) return null; } get myPublicMethod(): privateClass { >myPublicMethod : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPublicMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 268, 9)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) return null; } private get myPrivateMethod(): privateClass { >myPrivateMethod : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPrivateMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 271, 9)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) return null; } @@ -572,25 +572,25 @@ export module publicModule { >myPublicStaticMethod1 : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPublicStaticMethod1, Decl(privacyAccessorDeclFile_externalModule.ts, 274, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) } private static get myPrivateStaticMethod1() { >myPrivateStaticMethod1 : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPrivateStaticMethod1, Decl(privacyAccessorDeclFile_externalModule.ts, 277, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) } get myPublicMethod1() { >myPublicMethod1 : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPublicMethod1, Decl(privacyAccessorDeclFile_externalModule.ts, 280, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) } private get myPrivateMethod1() { >myPrivateMethod1 : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPrivateMethod1, Decl(privacyAccessorDeclFile_externalModule.ts, 283, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) } } @@ -653,22 +653,22 @@ export module publicModule { static set myPublicStaticMethod(param: privateClass) { // Error >myPublicStaticMethod : Symbol(publicClassWithWithPrivateSetAccessorTypes.myPublicStaticMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 316, 61)) >param : Symbol(param, Decl(privacyAccessorDeclFile_externalModule.ts, 317, 40)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) } private static set myPrivateStaticMethod(param: privateClass) { >myPrivateStaticMethod : Symbol(publicClassWithWithPrivateSetAccessorTypes.myPrivateStaticMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 318, 9)) >param : Symbol(param, Decl(privacyAccessorDeclFile_externalModule.ts, 319, 49)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) } set myPublicMethod(param: privateClass) { // Error >myPublicMethod : Symbol(publicClassWithWithPrivateSetAccessorTypes.myPublicMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 320, 9)) >param : Symbol(param, Decl(privacyAccessorDeclFile_externalModule.ts, 321, 27)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) } private set myPrivateMethod(param: privateClass) { >myPrivateMethod : Symbol(publicClassWithWithPrivateSetAccessorTypes.myPrivateMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 322, 9)) >param : Symbol(param, Decl(privacyAccessorDeclFile_externalModule.ts, 323, 36)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) } } @@ -703,22 +703,22 @@ export module publicModule { static set myPublicStaticMethod(param: privateClass) { >myPublicStaticMethod : Symbol(privateClassWithWithPrivateSetAccessorTypes.myPublicStaticMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 338, 55)) >param : Symbol(param, Decl(privacyAccessorDeclFile_externalModule.ts, 339, 40)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) } private static set myPrivateStaticMethod(param: privateClass) { >myPrivateStaticMethod : Symbol(privateClassWithWithPrivateSetAccessorTypes.myPrivateStaticMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 340, 9)) >param : Symbol(param, Decl(privacyAccessorDeclFile_externalModule.ts, 341, 49)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) } set myPublicMethod(param: privateClass) { >myPublicMethod : Symbol(privateClassWithWithPrivateSetAccessorTypes.myPublicMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 342, 9)) >param : Symbol(param, Decl(privacyAccessorDeclFile_externalModule.ts, 343, 27)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) } private set myPrivateMethod(param: privateClass) { >myPrivateMethod : Symbol(privateClassWithWithPrivateSetAccessorTypes.myPrivateMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 344, 9)) >param : Symbol(param, Decl(privacyAccessorDeclFile_externalModule.ts, 345, 36)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 28)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 202, 31)) } } @@ -852,11 +852,11 @@ export module publicModule { } } -module privateModule { +namespace privateModule { >privateModule : Symbol(privateModule, Decl(privacyAccessorDeclFile_externalModule.ts, 403, 1)) class privateClass { ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) } export class publicClass { @@ -867,25 +867,25 @@ module privateModule { static get myPublicStaticMethod(): privateClass { >myPublicStaticMethod : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPublicStaticMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 411, 61)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) return null; } private static get myPrivateStaticMethod(): privateClass { >myPrivateStaticMethod : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPrivateStaticMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 414, 9)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) return null; } get myPublicMethod(): privateClass { >myPublicMethod : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPublicMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 417, 9)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) return null; } private get myPrivateMethod(): privateClass { >myPrivateMethod : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPrivateMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 420, 9)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) return null; } @@ -893,25 +893,25 @@ module privateModule { >myPublicStaticMethod1 : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPublicStaticMethod1, Decl(privacyAccessorDeclFile_externalModule.ts, 423, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) } private static get myPrivateStaticMethod1() { >myPrivateStaticMethod1 : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPrivateStaticMethod1, Decl(privacyAccessorDeclFile_externalModule.ts, 426, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) } get myPublicMethod1() { >myPublicMethod1 : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPublicMethod1, Decl(privacyAccessorDeclFile_externalModule.ts, 429, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) } private get myPrivateMethod1() { >myPrivateMethod1 : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPrivateMethod1, Decl(privacyAccessorDeclFile_externalModule.ts, 432, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) } } @@ -973,25 +973,25 @@ module privateModule { static get myPublicStaticMethod(): privateClass { >myPublicStaticMethod : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPublicStaticMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 465, 55)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) return null; } private static get myPrivateStaticMethod(): privateClass { >myPrivateStaticMethod : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPrivateStaticMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 468, 9)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) return null; } get myPublicMethod(): privateClass { >myPublicMethod : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPublicMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 471, 9)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) return null; } private get myPrivateMethod(): privateClass { >myPrivateMethod : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPrivateMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 474, 9)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) return null; } @@ -999,25 +999,25 @@ module privateModule { >myPublicStaticMethod1 : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPublicStaticMethod1, Decl(privacyAccessorDeclFile_externalModule.ts, 477, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) } private static get myPrivateStaticMethod1() { >myPrivateStaticMethod1 : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPrivateStaticMethod1, Decl(privacyAccessorDeclFile_externalModule.ts, 480, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) } get myPublicMethod1() { >myPublicMethod1 : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPublicMethod1, Decl(privacyAccessorDeclFile_externalModule.ts, 483, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) } private get myPrivateMethod1() { >myPrivateMethod1 : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPrivateMethod1, Decl(privacyAccessorDeclFile_externalModule.ts, 486, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) } } @@ -1080,22 +1080,22 @@ module privateModule { static set myPublicStaticMethod(param: privateClass) { >myPublicStaticMethod : Symbol(publicClassWithWithPrivateSetAccessorTypes.myPublicStaticMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 519, 61)) >param : Symbol(param, Decl(privacyAccessorDeclFile_externalModule.ts, 520, 40)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) } private static set myPrivateStaticMethod(param: privateClass) { >myPrivateStaticMethod : Symbol(publicClassWithWithPrivateSetAccessorTypes.myPrivateStaticMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 521, 9)) >param : Symbol(param, Decl(privacyAccessorDeclFile_externalModule.ts, 522, 49)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) } set myPublicMethod(param: privateClass) { >myPublicMethod : Symbol(publicClassWithWithPrivateSetAccessorTypes.myPublicMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 523, 9)) >param : Symbol(param, Decl(privacyAccessorDeclFile_externalModule.ts, 524, 27)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) } private set myPrivateMethod(param: privateClass) { >myPrivateMethod : Symbol(publicClassWithWithPrivateSetAccessorTypes.myPrivateMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 525, 9)) >param : Symbol(param, Decl(privacyAccessorDeclFile_externalModule.ts, 526, 36)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) } } @@ -1130,22 +1130,22 @@ module privateModule { static set myPublicStaticMethod(param: privateClass) { >myPublicStaticMethod : Symbol(privateClassWithWithPrivateSetAccessorTypes.myPublicStaticMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 541, 55)) >param : Symbol(param, Decl(privacyAccessorDeclFile_externalModule.ts, 542, 40)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) } private static set myPrivateStaticMethod(param: privateClass) { >myPrivateStaticMethod : Symbol(privateClassWithWithPrivateSetAccessorTypes.myPrivateStaticMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 543, 9)) >param : Symbol(param, Decl(privacyAccessorDeclFile_externalModule.ts, 544, 49)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) } set myPublicMethod(param: privateClass) { >myPublicMethod : Symbol(privateClassWithWithPrivateSetAccessorTypes.myPublicMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 545, 9)) >param : Symbol(param, Decl(privacyAccessorDeclFile_externalModule.ts, 546, 27)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) } private set myPrivateMethod(param: privateClass) { >myPrivateMethod : Symbol(privateClassWithWithPrivateSetAccessorTypes.myPrivateMethod, Decl(privacyAccessorDeclFile_externalModule.ts, 547, 9)) >param : Symbol(param, Decl(privacyAccessorDeclFile_externalModule.ts, 548, 36)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 22)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_externalModule.ts, 405, 25)) } } @@ -1362,22 +1362,22 @@ class publicClassInGlobalWithWithPublicSetAccessorTypes { } } -module publicModuleInGlobal { +namespace publicModuleInGlobal { >publicModuleInGlobal : Symbol(publicModuleInGlobal, Decl(privacyAccessorDeclFile_GlobalFile.ts, 39, 1)) class privateClass { ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) } export class publicClass { >publicClass : Symbol(publicClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 43, 5)) } - module privateModule { + namespace privateModule { >privateModule : Symbol(privateModule, Decl(privacyAccessorDeclFile_GlobalFile.ts, 46, 5)) class privateClass { ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) } export class publicClass { @@ -1388,25 +1388,25 @@ module publicModuleInGlobal { static get myPublicStaticMethod(): privateClass { >myPublicStaticMethod : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPublicStaticMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 54, 65)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) return null; } private static get myPrivateStaticMethod(): privateClass { >myPrivateStaticMethod : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPrivateStaticMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 57, 13)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) return null; } get myPublicMethod(): privateClass { >myPublicMethod : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPublicMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 60, 13)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) return null; } private get myPrivateMethod(): privateClass { >myPrivateMethod : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPrivateMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 63, 13)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) return null; } @@ -1414,25 +1414,25 @@ module publicModuleInGlobal { >myPublicStaticMethod1 : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPublicStaticMethod1, Decl(privacyAccessorDeclFile_GlobalFile.ts, 66, 13)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) } private static get myPrivateStaticMethod1() { >myPrivateStaticMethod1 : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPrivateStaticMethod1, Decl(privacyAccessorDeclFile_GlobalFile.ts, 69, 13)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) } get myPublicMethod1() { >myPublicMethod1 : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPublicMethod1, Decl(privacyAccessorDeclFile_GlobalFile.ts, 72, 13)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) } private get myPrivateMethod1() { >myPrivateMethod1 : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPrivateMethod1, Decl(privacyAccessorDeclFile_GlobalFile.ts, 75, 13)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) } } @@ -1494,25 +1494,25 @@ module publicModuleInGlobal { static get myPublicStaticMethod(): privateClass { >myPublicStaticMethod : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPublicStaticMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 108, 59)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) return null; } private static get myPrivateStaticMethod(): privateClass { >myPrivateStaticMethod : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPrivateStaticMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 111, 13)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) return null; } get myPublicMethod(): privateClass { >myPublicMethod : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPublicMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 114, 13)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) return null; } private get myPrivateMethod(): privateClass { >myPrivateMethod : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPrivateMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 117, 13)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) return null; } @@ -1520,25 +1520,25 @@ module publicModuleInGlobal { >myPublicStaticMethod1 : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPublicStaticMethod1, Decl(privacyAccessorDeclFile_GlobalFile.ts, 120, 13)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) } private static get myPrivateStaticMethod1() { >myPrivateStaticMethod1 : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPrivateStaticMethod1, Decl(privacyAccessorDeclFile_GlobalFile.ts, 123, 13)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) } get myPublicMethod1() { >myPublicMethod1 : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPublicMethod1, Decl(privacyAccessorDeclFile_GlobalFile.ts, 126, 13)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) } private get myPrivateMethod1() { >myPrivateMethod1 : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPrivateMethod1, Decl(privacyAccessorDeclFile_GlobalFile.ts, 129, 13)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) } } @@ -1601,22 +1601,22 @@ module publicModuleInGlobal { static set myPublicStaticMethod(param: privateClass) { >myPublicStaticMethod : Symbol(publicClassWithWithPrivateSetAccessorTypes.myPublicStaticMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 162, 65)) >param : Symbol(param, Decl(privacyAccessorDeclFile_GlobalFile.ts, 163, 44)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) } private static set myPrivateStaticMethod(param: privateClass) { >myPrivateStaticMethod : Symbol(publicClassWithWithPrivateSetAccessorTypes.myPrivateStaticMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 164, 13)) >param : Symbol(param, Decl(privacyAccessorDeclFile_GlobalFile.ts, 165, 53)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) } set myPublicMethod(param: privateClass) { >myPublicMethod : Symbol(publicClassWithWithPrivateSetAccessorTypes.myPublicMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 166, 13)) >param : Symbol(param, Decl(privacyAccessorDeclFile_GlobalFile.ts, 167, 31)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) } private set myPrivateMethod(param: privateClass) { >myPrivateMethod : Symbol(publicClassWithWithPrivateSetAccessorTypes.myPrivateMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 168, 13)) >param : Symbol(param, Decl(privacyAccessorDeclFile_GlobalFile.ts, 169, 40)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) } } @@ -1651,22 +1651,22 @@ module publicModuleInGlobal { static set myPublicStaticMethod(param: privateClass) { >myPublicStaticMethod : Symbol(privateClassWithWithPrivateSetAccessorTypes.myPublicStaticMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 184, 59)) >param : Symbol(param, Decl(privacyAccessorDeclFile_GlobalFile.ts, 185, 44)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) } private static set myPrivateStaticMethod(param: privateClass) { >myPrivateStaticMethod : Symbol(privateClassWithWithPrivateSetAccessorTypes.myPrivateStaticMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 186, 13)) >param : Symbol(param, Decl(privacyAccessorDeclFile_GlobalFile.ts, 187, 53)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) } set myPublicMethod(param: privateClass) { >myPublicMethod : Symbol(privateClassWithWithPrivateSetAccessorTypes.myPublicMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 188, 13)) >param : Symbol(param, Decl(privacyAccessorDeclFile_GlobalFile.ts, 189, 31)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) } private set myPrivateMethod(param: privateClass) { >myPrivateMethod : Symbol(privateClassWithWithPrivateSetAccessorTypes.myPrivateMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 190, 13)) >param : Symbol(param, Decl(privacyAccessorDeclFile_GlobalFile.ts, 191, 40)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 26)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 48, 29)) } } @@ -1805,25 +1805,25 @@ module publicModuleInGlobal { static get myPublicStaticMethod(): privateClass { // Error >myPublicStaticMethod : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPublicStaticMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 251, 61)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) return null; } private static get myPrivateStaticMethod(): privateClass { >myPrivateStaticMethod : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPrivateStaticMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 254, 9)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) return null; } get myPublicMethod(): privateClass { // Error >myPublicMethod : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPublicMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 257, 9)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) return null; } private get myPrivateMethod(): privateClass { >myPrivateMethod : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPrivateMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 260, 9)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) return null; } @@ -1831,25 +1831,25 @@ module publicModuleInGlobal { >myPublicStaticMethod1 : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPublicStaticMethod1, Decl(privacyAccessorDeclFile_GlobalFile.ts, 263, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) } private static get myPrivateStaticMethod1() { >myPrivateStaticMethod1 : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPrivateStaticMethod1, Decl(privacyAccessorDeclFile_GlobalFile.ts, 266, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) } get myPublicMethod1() { // Error >myPublicMethod1 : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPublicMethod1, Decl(privacyAccessorDeclFile_GlobalFile.ts, 269, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) } private get myPrivateMethod1() { >myPrivateMethod1 : Symbol(publicClassWithWithPrivateGetAccessorTypes.myPrivateMethod1, Decl(privacyAccessorDeclFile_GlobalFile.ts, 272, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) } } @@ -1911,25 +1911,25 @@ module publicModuleInGlobal { static get myPublicStaticMethod(): privateClass { >myPublicStaticMethod : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPublicStaticMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 305, 55)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) return null; } private static get myPrivateStaticMethod(): privateClass { >myPrivateStaticMethod : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPrivateStaticMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 308, 9)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) return null; } get myPublicMethod(): privateClass { >myPublicMethod : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPublicMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 311, 9)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) return null; } private get myPrivateMethod(): privateClass { >myPrivateMethod : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPrivateMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 314, 9)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) return null; } @@ -1937,25 +1937,25 @@ module publicModuleInGlobal { >myPublicStaticMethod1 : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPublicStaticMethod1, Decl(privacyAccessorDeclFile_GlobalFile.ts, 317, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) } private static get myPrivateStaticMethod1() { >myPrivateStaticMethod1 : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPrivateStaticMethod1, Decl(privacyAccessorDeclFile_GlobalFile.ts, 320, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) } get myPublicMethod1() { >myPublicMethod1 : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPublicMethod1, Decl(privacyAccessorDeclFile_GlobalFile.ts, 323, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) } private get myPrivateMethod1() { >myPrivateMethod1 : Symbol(privateClassWithWithPrivateGetAccessorTypes.myPrivateMethod1, Decl(privacyAccessorDeclFile_GlobalFile.ts, 326, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) } } @@ -2018,22 +2018,22 @@ module publicModuleInGlobal { static set myPublicStaticMethod(param: privateClass) { // Error >myPublicStaticMethod : Symbol(publicClassWithWithPrivateSetAccessorTypes.myPublicStaticMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 359, 61)) >param : Symbol(param, Decl(privacyAccessorDeclFile_GlobalFile.ts, 360, 40)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) } private static set myPrivateStaticMethod(param: privateClass) { >myPrivateStaticMethod : Symbol(publicClassWithWithPrivateSetAccessorTypes.myPrivateStaticMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 361, 9)) >param : Symbol(param, Decl(privacyAccessorDeclFile_GlobalFile.ts, 362, 49)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) } set myPublicMethod(param: privateClass) { // Error >myPublicMethod : Symbol(publicClassWithWithPrivateSetAccessorTypes.myPublicMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 363, 9)) >param : Symbol(param, Decl(privacyAccessorDeclFile_GlobalFile.ts, 364, 27)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) } private set myPrivateMethod(param: privateClass) { >myPrivateMethod : Symbol(publicClassWithWithPrivateSetAccessorTypes.myPrivateMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 365, 9)) >param : Symbol(param, Decl(privacyAccessorDeclFile_GlobalFile.ts, 366, 36)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) } } @@ -2068,22 +2068,22 @@ module publicModuleInGlobal { static set myPublicStaticMethod(param: privateClass) { >myPublicStaticMethod : Symbol(privateClassWithWithPrivateSetAccessorTypes.myPublicStaticMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 381, 55)) >param : Symbol(param, Decl(privacyAccessorDeclFile_GlobalFile.ts, 382, 40)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) } private static set myPrivateStaticMethod(param: privateClass) { >myPrivateStaticMethod : Symbol(privateClassWithWithPrivateSetAccessorTypes.myPrivateStaticMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 383, 9)) >param : Symbol(param, Decl(privacyAccessorDeclFile_GlobalFile.ts, 384, 49)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) } set myPublicMethod(param: privateClass) { >myPublicMethod : Symbol(privateClassWithWithPrivateSetAccessorTypes.myPublicMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 385, 9)) >param : Symbol(param, Decl(privacyAccessorDeclFile_GlobalFile.ts, 386, 27)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) } private set myPrivateMethod(param: privateClass) { >myPrivateMethod : Symbol(privateClassWithWithPrivateSetAccessorTypes.myPrivateMethod, Decl(privacyAccessorDeclFile_GlobalFile.ts, 387, 9)) >param : Symbol(param, Decl(privacyAccessorDeclFile_GlobalFile.ts, 388, 36)) ->privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 29)) +>privateClass : Symbol(privateClass, Decl(privacyAccessorDeclFile_GlobalFile.ts, 41, 32)) } } diff --git a/tests/baselines/reference/privacyAccessorDeclFile.types b/tests/baselines/reference/privacyAccessorDeclFile.types index c23f1b88d33f1..3a5b108ed49be 100644 --- a/tests/baselines/reference/privacyAccessorDeclFile.types +++ b/tests/baselines/reference/privacyAccessorDeclFile.types @@ -555,7 +555,7 @@ class privateClassWithPrivateModuleSetAccessorTypes { } } -export module publicModule { +export namespace publicModule { >publicModule : typeof publicModule > : ^^^^^^^^^^^^^^^^^^^ @@ -1113,7 +1113,7 @@ export module publicModule { } } -module privateModule { +namespace privateModule { >privateModule : typeof privateModule > : ^^^^^^^^^^^^^^^^^^^^ @@ -1777,7 +1777,7 @@ class publicClassInGlobalWithWithPublicSetAccessorTypes { } } -module publicModuleInGlobal { +namespace publicModuleInGlobal { >publicModuleInGlobal : typeof publicModuleInGlobal > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1791,7 +1791,7 @@ module publicModuleInGlobal { > : ^^^^^^^^^^^ } - module privateModule { + namespace privateModule { >privateModule : typeof privateModule > : ^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js index afacb29591540..3ae0546561826 100644 --- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js +++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js @@ -7,7 +7,7 @@ declare module "GlobalWidgets" { } export function createWidget3(): Widget3; - export module SpecializedGlobalWidget { + export namespace SpecializedGlobalWidget { export class Widget4 { name: string; } @@ -23,7 +23,7 @@ export function createWidget1() { return new Widget1(); } -export module SpecializedWidget { +export namespace SpecializedWidget { export class Widget2 { name = 'one'; } diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.symbols b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.symbols index 6c8a205907f50..a599808d17f4c 100644 --- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.symbols +++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.symbols @@ -229,18 +229,18 @@ declare module "GlobalWidgets" { >createWidget3 : Symbol(createWidget3, Decl(privacyCannotNameAccessorDeclFile_GlobalWidgets.ts, 3, 5)) >Widget3 : Symbol(Widget3, Decl(privacyCannotNameAccessorDeclFile_GlobalWidgets.ts, 0, 32)) - export module SpecializedGlobalWidget { + export namespace SpecializedGlobalWidget { >SpecializedGlobalWidget : Symbol(SpecializedGlobalWidget, Decl(privacyCannotNameAccessorDeclFile_GlobalWidgets.ts, 4, 45)) export class Widget4 { ->Widget4 : Symbol(Widget4, Decl(privacyCannotNameAccessorDeclFile_GlobalWidgets.ts, 6, 43)) +>Widget4 : Symbol(Widget4, Decl(privacyCannotNameAccessorDeclFile_GlobalWidgets.ts, 6, 46)) name: string; >name : Symbol(Widget4.name, Decl(privacyCannotNameAccessorDeclFile_GlobalWidgets.ts, 7, 30)) } function createWidget4(): Widget4; >createWidget4 : Symbol(createWidget4, Decl(privacyCannotNameAccessorDeclFile_GlobalWidgets.ts, 9, 9)) ->Widget4 : Symbol(Widget4, Decl(privacyCannotNameAccessorDeclFile_GlobalWidgets.ts, 6, 43)) +>Widget4 : Symbol(Widget4, Decl(privacyCannotNameAccessorDeclFile_GlobalWidgets.ts, 6, 46)) } } @@ -258,11 +258,11 @@ export function createWidget1() { >Widget1 : Symbol(Widget1, Decl(privacyCannotNameAccessorDeclFile_Widgets.ts, 0, 0)) } -export module SpecializedWidget { +export namespace SpecializedWidget { >SpecializedWidget : Symbol(SpecializedWidget, Decl(privacyCannotNameAccessorDeclFile_Widgets.ts, 5, 1)) export class Widget2 { ->Widget2 : Symbol(Widget2, Decl(privacyCannotNameAccessorDeclFile_Widgets.ts, 7, 33)) +>Widget2 : Symbol(Widget2, Decl(privacyCannotNameAccessorDeclFile_Widgets.ts, 7, 36)) name = 'one'; >name : Symbol(Widget2.name, Decl(privacyCannotNameAccessorDeclFile_Widgets.ts, 8, 26)) @@ -271,7 +271,7 @@ export module SpecializedWidget { >createWidget2 : Symbol(createWidget2, Decl(privacyCannotNameAccessorDeclFile_Widgets.ts, 10, 5)) return new Widget2(); ->Widget2 : Symbol(Widget2, Decl(privacyCannotNameAccessorDeclFile_Widgets.ts, 7, 33)) +>Widget2 : Symbol(Widget2, Decl(privacyCannotNameAccessorDeclFile_Widgets.ts, 7, 36)) } } diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.types b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.types index c92098be7150c..1a65feb24cd8c 100644 --- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.types +++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.types @@ -381,7 +381,7 @@ declare module "GlobalWidgets" { >createWidget3 : () => Widget3 > : ^^^^^^ - export module SpecializedGlobalWidget { + export namespace SpecializedGlobalWidget { >SpecializedGlobalWidget : typeof SpecializedGlobalWidget > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -421,7 +421,7 @@ export function createWidget1() { > : ^^^^^^^^^^^^^^ } -export module SpecializedWidget { +export namespace SpecializedWidget { >SpecializedWidget : typeof SpecializedWidget > : ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js index 20183ab0cb733..ef84c9ccfd86a 100644 --- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js +++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js @@ -7,7 +7,7 @@ declare module "GlobalWidgets" { } export function createWidget3(): Widget3; - export module SpecializedGlobalWidget { + export namespace SpecializedGlobalWidget { export class Widget4 { name: string; } @@ -23,7 +23,7 @@ export function createWidget1() { return new Widget1(); } -export module SpecializedWidget { +export namespace SpecializedWidget { export class Widget2 { name = 'one'; } diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.symbols b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.symbols index c6d4457164029..dcabea997aa0c 100644 --- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.symbols +++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.symbols @@ -224,18 +224,18 @@ declare module "GlobalWidgets" { >createWidget3 : Symbol(createWidget3, Decl(privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts, 3, 5)) >Widget3 : Symbol(Widget3, Decl(privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts, 0, 32)) - export module SpecializedGlobalWidget { + export namespace SpecializedGlobalWidget { >SpecializedGlobalWidget : Symbol(SpecializedGlobalWidget, Decl(privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts, 4, 45)) export class Widget4 { ->Widget4 : Symbol(Widget4, Decl(privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts, 6, 43)) +>Widget4 : Symbol(Widget4, Decl(privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts, 6, 46)) name: string; >name : Symbol(Widget4.name, Decl(privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts, 7, 30)) } function createWidget4(): Widget4; >createWidget4 : Symbol(createWidget4, Decl(privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts, 9, 9)) ->Widget4 : Symbol(Widget4, Decl(privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts, 6, 43)) +>Widget4 : Symbol(Widget4, Decl(privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts, 6, 46)) } } @@ -253,11 +253,11 @@ export function createWidget1() { >Widget1 : Symbol(Widget1, Decl(privacyCannotNameVarTypeDeclFile_Widgets.ts, 0, 0)) } -export module SpecializedWidget { +export namespace SpecializedWidget { >SpecializedWidget : Symbol(SpecializedWidget, Decl(privacyCannotNameVarTypeDeclFile_Widgets.ts, 5, 1)) export class Widget2 { ->Widget2 : Symbol(Widget2, Decl(privacyCannotNameVarTypeDeclFile_Widgets.ts, 7, 33)) +>Widget2 : Symbol(Widget2, Decl(privacyCannotNameVarTypeDeclFile_Widgets.ts, 7, 36)) name = 'one'; >name : Symbol(Widget2.name, Decl(privacyCannotNameVarTypeDeclFile_Widgets.ts, 8, 26)) @@ -266,7 +266,7 @@ export module SpecializedWidget { >createWidget2 : Symbol(createWidget2, Decl(privacyCannotNameVarTypeDeclFile_Widgets.ts, 10, 5)) return new Widget2(); ->Widget2 : Symbol(Widget2, Decl(privacyCannotNameVarTypeDeclFile_Widgets.ts, 7, 33)) +>Widget2 : Symbol(Widget2, Decl(privacyCannotNameVarTypeDeclFile_Widgets.ts, 7, 36)) } } diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.types b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.types index b2e0c541b9869..906ddde2907be 100644 --- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.types +++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.types @@ -424,7 +424,7 @@ declare module "GlobalWidgets" { >createWidget3 : () => Widget3 > : ^^^^^^ - export module SpecializedGlobalWidget { + export namespace SpecializedGlobalWidget { >SpecializedGlobalWidget : typeof SpecializedGlobalWidget > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -464,7 +464,7 @@ export function createWidget1() { > : ^^^^^^^^^^^^^^ } -export module SpecializedWidget { +export namespace SpecializedWidget { >SpecializedWidget : typeof SpecializedWidget > : ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js index d63e41df8c562..87d0c32e52340 100644 --- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js +++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js @@ -5,7 +5,7 @@ export var x = 1; // Makes this an external module interface Iterator { } -module Query { +namespace Query { export function fromDoWhile(doWhile: (test: Iterator) => boolean): Iterator { return null; } diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.symbols b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.symbols index 02f5702de3ddc..8c06b61ada215 100644 --- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.symbols +++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.symbols @@ -9,11 +9,11 @@ interface Iterator { >T : Symbol(T, Decl(privacyCheckAnonymousFunctionParameter.ts, 1, 19)) } -module Query { +namespace Query { >Query : Symbol(Query, Decl(privacyCheckAnonymousFunctionParameter.ts, 2, 1)) export function fromDoWhile(doWhile: (test: Iterator) => boolean): Iterator { ->fromDoWhile : Symbol(fromDoWhile, Decl(privacyCheckAnonymousFunctionParameter.ts, 4, 14)) +>fromDoWhile : Symbol(fromDoWhile, Decl(privacyCheckAnonymousFunctionParameter.ts, 4, 17)) >T : Symbol(T, Decl(privacyCheckAnonymousFunctionParameter.ts, 5, 32)) >doWhile : Symbol(doWhile, Decl(privacyCheckAnonymousFunctionParameter.ts, 5, 35)) >test : Symbol(test, Decl(privacyCheckAnonymousFunctionParameter.ts, 5, 45)) @@ -29,7 +29,7 @@ module Query { >fromOrderBy : Symbol(fromOrderBy, Decl(privacyCheckAnonymousFunctionParameter.ts, 7, 5)) return fromDoWhile(test => { ->fromDoWhile : Symbol(fromDoWhile, Decl(privacyCheckAnonymousFunctionParameter.ts, 4, 14)) +>fromDoWhile : Symbol(fromDoWhile, Decl(privacyCheckAnonymousFunctionParameter.ts, 4, 17)) >test : Symbol(test, Decl(privacyCheckAnonymousFunctionParameter.ts, 10, 27)) return true; diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types index 121e9703964c8..31d3bae8ed93e 100644 --- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types +++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types @@ -10,7 +10,7 @@ export var x = 1; // Makes this an external module interface Iterator { } -module Query { +namespace Query { >Query : typeof Query > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js index 9e778845bb1e6..80d81ddc67d7c 100644 --- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js +++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js @@ -4,13 +4,13 @@ export var x = 1; // Makes this an external module interface Iterator { x: T } -module Q { +namespace Q { export function foo(x: (a: Iterator) => number) { return x; } } -module Q { +namespace Q { function bar() { foo(null); } diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.symbols b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.symbols index b63a1c0658f34..f2fe371594cc0 100644 --- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.symbols +++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.symbols @@ -10,11 +10,11 @@ interface Iterator { x: T } >x : Symbol(Iterator.x, Decl(privacyCheckAnonymousFunctionParameter2.ts, 1, 23)) >T : Symbol(T, Decl(privacyCheckAnonymousFunctionParameter2.ts, 1, 19)) -module Q { +namespace Q { >Q : Symbol(Q, Decl(privacyCheckAnonymousFunctionParameter2.ts, 1, 30), Decl(privacyCheckAnonymousFunctionParameter2.ts, 7, 1)) export function foo(x: (a: Iterator) => number) { ->foo : Symbol(foo, Decl(privacyCheckAnonymousFunctionParameter2.ts, 3, 10)) +>foo : Symbol(foo, Decl(privacyCheckAnonymousFunctionParameter2.ts, 3, 13)) >T : Symbol(T, Decl(privacyCheckAnonymousFunctionParameter2.ts, 4, 24)) >x : Symbol(x, Decl(privacyCheckAnonymousFunctionParameter2.ts, 4, 27)) >a : Symbol(a, Decl(privacyCheckAnonymousFunctionParameter2.ts, 4, 31)) @@ -26,13 +26,13 @@ module Q { } } -module Q { +namespace Q { >Q : Symbol(Q, Decl(privacyCheckAnonymousFunctionParameter2.ts, 1, 30), Decl(privacyCheckAnonymousFunctionParameter2.ts, 7, 1)) function bar() { ->bar : Symbol(bar, Decl(privacyCheckAnonymousFunctionParameter2.ts, 9, 10)) +>bar : Symbol(bar, Decl(privacyCheckAnonymousFunctionParameter2.ts, 9, 13)) foo(null); ->foo : Symbol(foo, Decl(privacyCheckAnonymousFunctionParameter2.ts, 3, 10)) +>foo : Symbol(foo, Decl(privacyCheckAnonymousFunctionParameter2.ts, 3, 13)) } } diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types index 015287208343b..b52abc8641e87 100644 --- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types +++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types @@ -11,7 +11,7 @@ interface Iterator { x: T } >x : T > : ^ -module Q { +namespace Q { >Q : typeof Q > : ^^^^^^^^ @@ -29,7 +29,7 @@ module Q { } } -module Q { +namespace Q { >Q : typeof Q > : ^^^^^^^^ diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js index d1f649d790d95..0a8e07c9b112d 100644 --- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js +++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.ts] //// //// [privacyCheckExportAssignmentOnExportedGenericInterface1.ts] -module Foo { +namespace Foo { export interface A { } } diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.symbols b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.symbols index 7e4f84c2575db..4f6e1f0c1a800 100644 --- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.symbols +++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.ts] //// === privacyCheckExportAssignmentOnExportedGenericInterface1.ts === -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(privacyCheckExportAssignmentOnExportedGenericInterface1.ts, 0, 0), Decl(privacyCheckExportAssignmentOnExportedGenericInterface1.ts, 3, 1), Decl(privacyCheckExportAssignmentOnExportedGenericInterface1.ts, 6, 3)) export interface A { ->A : Symbol(A, Decl(privacyCheckExportAssignmentOnExportedGenericInterface1.ts, 0, 12)) +>A : Symbol(A, Decl(privacyCheckExportAssignmentOnExportedGenericInterface1.ts, 0, 15)) >T : Symbol(T, Decl(privacyCheckExportAssignmentOnExportedGenericInterface1.ts, 1, 23)) } } @@ -16,7 +16,7 @@ interface Foo { var Foo: new () => Foo.A>; >Foo : Symbol(Foo, Decl(privacyCheckExportAssignmentOnExportedGenericInterface1.ts, 0, 0), Decl(privacyCheckExportAssignmentOnExportedGenericInterface1.ts, 3, 1), Decl(privacyCheckExportAssignmentOnExportedGenericInterface1.ts, 6, 3)) >Foo : Symbol(Foo, Decl(privacyCheckExportAssignmentOnExportedGenericInterface1.ts, 0, 0), Decl(privacyCheckExportAssignmentOnExportedGenericInterface1.ts, 3, 1), Decl(privacyCheckExportAssignmentOnExportedGenericInterface1.ts, 6, 3)) ->A : Symbol(Foo.A, Decl(privacyCheckExportAssignmentOnExportedGenericInterface1.ts, 0, 12)) +>A : Symbol(Foo.A, Decl(privacyCheckExportAssignmentOnExportedGenericInterface1.ts, 0, 15)) >Foo : Symbol(Foo, Decl(privacyCheckExportAssignmentOnExportedGenericInterface1.ts, 0, 0), Decl(privacyCheckExportAssignmentOnExportedGenericInterface1.ts, 3, 1), Decl(privacyCheckExportAssignmentOnExportedGenericInterface1.ts, 6, 3)) export = Foo; diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types index f57a095f28b3f..8f306e7c4db55 100644 --- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types +++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.ts] //// === privacyCheckExportAssignmentOnExportedGenericInterface1.ts === -module Foo { +namespace Foo { export interface A { } } diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js index ecb18d7c2b6c4..324a0e94165dc 100644 --- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js +++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js @@ -10,7 +10,7 @@ function Foo(array: T[]): Foo { return undefined; } -module Foo { +namespace Foo { export var x = "hello"; } diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.symbols b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.symbols index 69cba2ffe36cf..ad665c94ae16c 100644 --- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.symbols +++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.symbols @@ -21,7 +21,7 @@ function Foo(array: T[]): Foo { >undefined : Symbol(undefined) } -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 3, 1), Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 0, 13), Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 7, 1)) export var x = "hello"; diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.types b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.types index 2ee726a139808..26fa9da77487f 100644 --- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.types +++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.types @@ -19,7 +19,7 @@ function Foo(array: T[]): Foo { > : ^^^^^^^^^ } -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.js b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.js index ba5a1fad8140d..08b5d75ef015d 100644 --- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.js +++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts] //// //// [privacyCheckTypeOfInvisibleModuleError.ts] -module Outer { - module Inner { +namespace Outer { + namespace Inner { export var m: typeof Inner; } diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.symbols b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.symbols index 3217f28fc42aa..c8ec665a460ca 100644 --- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.symbols +++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.symbols @@ -1,19 +1,19 @@ //// [tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts] //// === privacyCheckTypeOfInvisibleModuleError.ts === -module Outer { +namespace Outer { >Outer : Symbol(Outer, Decl(privacyCheckTypeOfInvisibleModuleError.ts, 0, 0)) - module Inner { ->Inner : Symbol(Inner, Decl(privacyCheckTypeOfInvisibleModuleError.ts, 0, 14)) + namespace Inner { +>Inner : Symbol(Inner, Decl(privacyCheckTypeOfInvisibleModuleError.ts, 0, 17)) export var m: typeof Inner; >m : Symbol(m, Decl(privacyCheckTypeOfInvisibleModuleError.ts, 2, 18)) ->Inner : Symbol(Inner, Decl(privacyCheckTypeOfInvisibleModuleError.ts, 0, 14)) +>Inner : Symbol(Inner, Decl(privacyCheckTypeOfInvisibleModuleError.ts, 0, 17)) } export var f: typeof Inner; >f : Symbol(f, Decl(privacyCheckTypeOfInvisibleModuleError.ts, 5, 14)) ->Inner : Symbol(Inner, Decl(privacyCheckTypeOfInvisibleModuleError.ts, 0, 14)) +>Inner : Symbol(Inner, Decl(privacyCheckTypeOfInvisibleModuleError.ts, 0, 17)) } diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.types b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.types index 27cff21702db4..5c0af5d3ffca0 100644 --- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.types +++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts] //// === privacyCheckTypeOfInvisibleModuleError.ts === -module Outer { +namespace Outer { >Outer : typeof Outer > : ^^^^^^^^^^^^ - module Inner { + namespace Inner { >Inner : typeof Inner > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js index 8d48438936da2..5dfcac0649acf 100644 --- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js +++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/privacyCheckTypeOfInvisibleModuleNoError.ts] //// //// [privacyCheckTypeOfInvisibleModuleNoError.ts] -module Outer { - module Inner { +namespace Outer { + namespace Inner { export var m: number; } diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.symbols b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.symbols index fd1f1b221581d..2bbe39f43b210 100644 --- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.symbols +++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/privacyCheckTypeOfInvisibleModuleNoError.ts] //// === privacyCheckTypeOfInvisibleModuleNoError.ts === -module Outer { +namespace Outer { >Outer : Symbol(Outer, Decl(privacyCheckTypeOfInvisibleModuleNoError.ts, 0, 0)) - module Inner { ->Inner : Symbol(Inner, Decl(privacyCheckTypeOfInvisibleModuleNoError.ts, 0, 14)) + namespace Inner { +>Inner : Symbol(Inner, Decl(privacyCheckTypeOfInvisibleModuleNoError.ts, 0, 17)) export var m: number; >m : Symbol(m, Decl(privacyCheckTypeOfInvisibleModuleNoError.ts, 2, 18)) @@ -13,6 +13,6 @@ module Outer { export var f: typeof Inner; // Since we dont unwind inner any more, it is error here >f : Symbol(f, Decl(privacyCheckTypeOfInvisibleModuleNoError.ts, 5, 14)) ->Inner : Symbol(Inner, Decl(privacyCheckTypeOfInvisibleModuleNoError.ts, 0, 14)) +>Inner : Symbol(Inner, Decl(privacyCheckTypeOfInvisibleModuleNoError.ts, 0, 17)) } diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.types b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.types index 8529992865d5f..e2a4b788db1be 100644 --- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.types +++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/privacyCheckTypeOfInvisibleModuleNoError.ts] //// === privacyCheckTypeOfInvisibleModuleNoError.ts === -module Outer { +namespace Outer { >Outer : typeof Outer > : ^^^^^^^^^^^^ - module Inner { + namespace Inner { >Inner : typeof Inner > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/privacyClass.js b/tests/baselines/reference/privacyClass.js index e67706dce6d88..dbbf50ec57ee9 100644 --- a/tests/baselines/reference/privacyClass.js +++ b/tests/baselines/reference/privacyClass.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyClass.ts] //// //// [privacyClass.ts] -export module m1 { +export namespace m1 { export interface m1_i_public { } @@ -45,7 +45,7 @@ export module m1 { } -module m2 { +namespace m2 { export interface m2_i_public { } diff --git a/tests/baselines/reference/privacyClass.symbols b/tests/baselines/reference/privacyClass.symbols index 8d8715baf8c4a..3815ae1287c8d 100644 --- a/tests/baselines/reference/privacyClass.symbols +++ b/tests/baselines/reference/privacyClass.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/privacyClass.ts] //// === privacyClass.ts === -export module m1 { +export namespace m1 { >m1 : Symbol(m1, Decl(privacyClass.ts, 0, 0)) export interface m1_i_public { ->m1_i_public : Symbol(m1_i_public, Decl(privacyClass.ts, 0, 18)) +>m1_i_public : Symbol(m1_i_public, Decl(privacyClass.ts, 0, 21)) } interface m1_i_private { @@ -43,7 +43,7 @@ export module m1 { class m1_C5_private implements m1_i_public { >m1_C5_private : Symbol(m1_C5_private, Decl(privacyClass.ts, 22, 5)) ->m1_i_public : Symbol(m1_i_public, Decl(privacyClass.ts, 0, 18)) +>m1_i_public : Symbol(m1_i_public, Decl(privacyClass.ts, 0, 21)) } class m1_C6_private implements m1_i_private { >m1_C6_private : Symbol(m1_C6_private, Decl(privacyClass.ts, 25, 5)) @@ -51,7 +51,7 @@ export module m1 { } export class m1_C7_public implements m1_i_public { >m1_C7_public : Symbol(m1_C7_public, Decl(privacyClass.ts, 27, 5)) ->m1_i_public : Symbol(m1_i_public, Decl(privacyClass.ts, 0, 18)) +>m1_i_public : Symbol(m1_i_public, Decl(privacyClass.ts, 0, 21)) } export class m1_C8_public implements m1_i_private { >m1_C8_public : Symbol(m1_C8_public, Decl(privacyClass.ts, 29, 5)) @@ -62,34 +62,34 @@ export module m1 { >m1_C9_private : Symbol(m1_C9_private, Decl(privacyClass.ts, 31, 5)) >m1_c_public : Symbol(m1_c_public, Decl(privacyClass.ts, 5, 5)) >m1_i_private : Symbol(m1_i_private, Decl(privacyClass.ts, 2, 5)) ->m1_i_public : Symbol(m1_i_public, Decl(privacyClass.ts, 0, 18)) +>m1_i_public : Symbol(m1_i_public, Decl(privacyClass.ts, 0, 21)) } class m1_C10_private extends m1_c_private implements m1_i_private, m1_i_public { >m1_C10_private : Symbol(m1_C10_private, Decl(privacyClass.ts, 34, 5)) >m1_c_private : Symbol(m1_c_private, Decl(privacyClass.ts, 10, 5)) >m1_i_private : Symbol(m1_i_private, Decl(privacyClass.ts, 2, 5)) ->m1_i_public : Symbol(m1_i_public, Decl(privacyClass.ts, 0, 18)) +>m1_i_public : Symbol(m1_i_public, Decl(privacyClass.ts, 0, 21)) } export class m1_C11_public extends m1_c_public implements m1_i_private, m1_i_public { >m1_C11_public : Symbol(m1_C11_public, Decl(privacyClass.ts, 36, 5)) >m1_c_public : Symbol(m1_c_public, Decl(privacyClass.ts, 5, 5)) >m1_i_private : Symbol(m1_i_private, Decl(privacyClass.ts, 2, 5)) ->m1_i_public : Symbol(m1_i_public, Decl(privacyClass.ts, 0, 18)) +>m1_i_public : Symbol(m1_i_public, Decl(privacyClass.ts, 0, 21)) } export class m1_C12_public extends m1_c_private implements m1_i_private, m1_i_public { >m1_C12_public : Symbol(m1_C12_public, Decl(privacyClass.ts, 38, 5)) >m1_c_private : Symbol(m1_c_private, Decl(privacyClass.ts, 10, 5)) >m1_i_private : Symbol(m1_i_private, Decl(privacyClass.ts, 2, 5)) ->m1_i_public : Symbol(m1_i_public, Decl(privacyClass.ts, 0, 18)) +>m1_i_public : Symbol(m1_i_public, Decl(privacyClass.ts, 0, 21)) } } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(privacyClass.ts, 41, 1)) export interface m2_i_public { ->m2_i_public : Symbol(m2_i_public, Decl(privacyClass.ts, 44, 11)) +>m2_i_public : Symbol(m2_i_public, Decl(privacyClass.ts, 44, 14)) } interface m2_i_private { @@ -127,7 +127,7 @@ module m2 { class m2_C5_private implements m2_i_public { >m2_C5_private : Symbol(m2_C5_private, Decl(privacyClass.ts, 66, 5)) ->m2_i_public : Symbol(m2_i_public, Decl(privacyClass.ts, 44, 11)) +>m2_i_public : Symbol(m2_i_public, Decl(privacyClass.ts, 44, 14)) } class m2_C6_private implements m2_i_private { >m2_C6_private : Symbol(m2_C6_private, Decl(privacyClass.ts, 69, 5)) @@ -135,7 +135,7 @@ module m2 { } export class m2_C7_public implements m2_i_public { >m2_C7_public : Symbol(m2_C7_public, Decl(privacyClass.ts, 71, 5)) ->m2_i_public : Symbol(m2_i_public, Decl(privacyClass.ts, 44, 11)) +>m2_i_public : Symbol(m2_i_public, Decl(privacyClass.ts, 44, 14)) } export class m2_C8_public implements m2_i_private { >m2_C8_public : Symbol(m2_C8_public, Decl(privacyClass.ts, 73, 5)) @@ -146,25 +146,25 @@ module m2 { >m2_C9_private : Symbol(m2_C9_private, Decl(privacyClass.ts, 75, 5)) >m2_c_public : Symbol(m2_c_public, Decl(privacyClass.ts, 49, 5)) >m2_i_private : Symbol(m2_i_private, Decl(privacyClass.ts, 46, 5)) ->m2_i_public : Symbol(m2_i_public, Decl(privacyClass.ts, 44, 11)) +>m2_i_public : Symbol(m2_i_public, Decl(privacyClass.ts, 44, 14)) } class m2_C10_private extends m2_c_private implements m2_i_private, m2_i_public { >m2_C10_private : Symbol(m2_C10_private, Decl(privacyClass.ts, 78, 5)) >m2_c_private : Symbol(m2_c_private, Decl(privacyClass.ts, 54, 5)) >m2_i_private : Symbol(m2_i_private, Decl(privacyClass.ts, 46, 5)) ->m2_i_public : Symbol(m2_i_public, Decl(privacyClass.ts, 44, 11)) +>m2_i_public : Symbol(m2_i_public, Decl(privacyClass.ts, 44, 14)) } export class m2_C11_public extends m2_c_public implements m2_i_private, m2_i_public { >m2_C11_public : Symbol(m2_C11_public, Decl(privacyClass.ts, 80, 5)) >m2_c_public : Symbol(m2_c_public, Decl(privacyClass.ts, 49, 5)) >m2_i_private : Symbol(m2_i_private, Decl(privacyClass.ts, 46, 5)) ->m2_i_public : Symbol(m2_i_public, Decl(privacyClass.ts, 44, 11)) +>m2_i_public : Symbol(m2_i_public, Decl(privacyClass.ts, 44, 14)) } export class m2_C12_public extends m2_c_private implements m2_i_private, m2_i_public { >m2_C12_public : Symbol(m2_C12_public, Decl(privacyClass.ts, 82, 5)) >m2_c_private : Symbol(m2_c_private, Decl(privacyClass.ts, 54, 5)) >m2_i_private : Symbol(m2_i_private, Decl(privacyClass.ts, 46, 5)) ->m2_i_public : Symbol(m2_i_public, Decl(privacyClass.ts, 44, 11)) +>m2_i_public : Symbol(m2_i_public, Decl(privacyClass.ts, 44, 14)) } } diff --git a/tests/baselines/reference/privacyClass.types b/tests/baselines/reference/privacyClass.types index 3d262a21470aa..684caf82d0262 100644 --- a/tests/baselines/reference/privacyClass.types +++ b/tests/baselines/reference/privacyClass.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyClass.ts] //// === privacyClass.ts === -export module m1 { +export namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -95,7 +95,7 @@ export module m1 { } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt index 045bd3483869c..28f9955bf733a 100644 --- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt +++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt @@ -3,7 +3,7 @@ privacyClassExtendsClauseDeclFile_externalModule.ts(21,83): error TS2449: Class ==== privacyClassExtendsClauseDeclFile_externalModule.ts (2 errors) ==== - export module publicModule { + export namespace publicModule { export class publicClassInPublicModule { private f1() { } @@ -33,7 +33,7 @@ privacyClassExtendsClauseDeclFile_externalModule.ts(21,83): error TS2449: Class } } - module privateModule { + namespace privateModule { export class publicClassInPrivateModule { private f1() { } @@ -80,7 +80,7 @@ privacyClassExtendsClauseDeclFile_externalModule.ts(21,83): error TS2449: Class } ==== privacyClassExtendsClauseDeclFile_GlobalFile.ts (0 errors) ==== - module publicModuleInGlobal { + namespace publicModuleInGlobal { export class publicClassInPublicModule { private f1() { } diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js index 752adc42fdc04..f84de005ebc8b 100644 --- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js +++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyClassExtendsClauseDeclFile.ts] //// //// [privacyClassExtendsClauseDeclFile_externalModule.ts] -export module publicModule { +export namespace publicModule { export class publicClassInPublicModule { private f1() { } @@ -25,7 +25,7 @@ export module publicModule { } } -module privateModule { +namespace privateModule { export class publicClassInPrivateModule { private f1() { } @@ -72,7 +72,7 @@ export class publicClassExtendingFromPrivateModuleClass extends privateModule.pu } //// [privacyClassExtendsClauseDeclFile_GlobalFile.ts] -module publicModuleInGlobal { +namespace publicModuleInGlobal { export class publicClassInPublicModule { private f1() { } diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.symbols b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.symbols index 60cee04d7c6a3..e945591d17726 100644 --- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.symbols +++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/privacyClassExtendsClauseDeclFile.ts] //// === privacyClassExtendsClauseDeclFile_externalModule.ts === -export module publicModule { +export namespace publicModule { >publicModule : Symbol(publicModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 0, 0)) export class publicClassInPublicModule { ->publicClassInPublicModule : Symbol(publicClassInPublicModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 0, 28)) +>publicClassInPublicModule : Symbol(publicClassInPublicModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 0, 31)) private f1() { >f1 : Symbol(publicClassInPublicModule.f1, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 1, 44)) @@ -18,7 +18,7 @@ export module publicModule { class privateClassExtendingPublicClassInModule extends publicClassInPublicModule { >privateClassExtendingPublicClassInModule : Symbol(privateClassExtendingPublicClassInModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 7, 5)) ->publicClassInPublicModule : Symbol(publicClassInPublicModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 0, 28)) +>publicClassInPublicModule : Symbol(publicClassInPublicModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 0, 31)) } class privateClassExtendingPrivateClassInModule extends privateClassInPublicModule { >privateClassExtendingPrivateClassInModule : Symbol(privateClassExtendingPrivateClassInModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 10, 5)) @@ -26,7 +26,7 @@ export module publicModule { } export class publicClassExtendingPublicClassInModule extends publicClassInPublicModule { >publicClassExtendingPublicClassInModule : Symbol(publicClassExtendingPublicClassInModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 12, 5)) ->publicClassInPublicModule : Symbol(publicClassInPublicModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 0, 28)) +>publicClassInPublicModule : Symbol(publicClassInPublicModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 0, 31)) } export class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule { // Should error >publicClassExtendingPrivateClassInModule : Symbol(publicClassExtendingPrivateClassInModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 14, 5)) @@ -35,23 +35,23 @@ export module publicModule { class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { >privateClassExtendingFromPrivateModuleClass : Symbol(privateClassExtendingFromPrivateModuleClass, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 16, 5)) ->privateModule.publicClassInPrivateModule : Symbol(privateModule.publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 22)) +>privateModule.publicClassInPrivateModule : Symbol(privateModule.publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 25)) >privateModule : Symbol(privateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 22, 1)) ->publicClassInPrivateModule : Symbol(privateModule.publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 22)) +>publicClassInPrivateModule : Symbol(privateModule.publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 25)) } export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { // Should error >publicClassExtendingFromPrivateModuleClass : Symbol(publicClassExtendingFromPrivateModuleClass, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 19, 5)) ->privateModule.publicClassInPrivateModule : Symbol(privateModule.publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 22)) +>privateModule.publicClassInPrivateModule : Symbol(privateModule.publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 25)) >privateModule : Symbol(privateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 22, 1)) ->publicClassInPrivateModule : Symbol(privateModule.publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 22)) +>publicClassInPrivateModule : Symbol(privateModule.publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 25)) } } -module privateModule { +namespace privateModule { >privateModule : Symbol(privateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 22, 1)) export class publicClassInPrivateModule { ->publicClassInPrivateModule : Symbol(publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 22)) +>publicClassInPrivateModule : Symbol(publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 25)) private f1() { >f1 : Symbol(publicClassInPrivateModule.f1, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 25, 45)) @@ -64,7 +64,7 @@ module privateModule { class privateClassExtendingPublicClassInModule extends publicClassInPrivateModule { >privateClassExtendingPublicClassInModule : Symbol(privateClassExtendingPublicClassInModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 31, 5)) ->publicClassInPrivateModule : Symbol(publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 22)) +>publicClassInPrivateModule : Symbol(publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 25)) } class privateClassExtendingPrivateClassInModule extends privateClassInPrivateModule { >privateClassExtendingPrivateClassInModule : Symbol(privateClassExtendingPrivateClassInModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 34, 5)) @@ -72,7 +72,7 @@ module privateModule { } export class publicClassExtendingPublicClassInModule extends publicClassInPrivateModule { >publicClassExtendingPublicClassInModule : Symbol(publicClassExtendingPublicClassInModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 36, 5)) ->publicClassInPrivateModule : Symbol(publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 22)) +>publicClassInPrivateModule : Symbol(publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 25)) } export class publicClassExtendingPrivateClassInModule extends privateClassInPrivateModule { >publicClassExtendingPrivateClassInModule : Symbol(publicClassExtendingPrivateClassInModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 38, 5)) @@ -81,15 +81,15 @@ module privateModule { class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { >privateClassExtendingFromPrivateModuleClass : Symbol(privateClassExtendingFromPrivateModuleClass, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 40, 5)) ->privateModule.publicClassInPrivateModule : Symbol(publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 22)) +>privateModule.publicClassInPrivateModule : Symbol(publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 25)) >privateModule : Symbol(privateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 22, 1)) ->publicClassInPrivateModule : Symbol(publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 22)) +>publicClassInPrivateModule : Symbol(publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 25)) } export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { >publicClassExtendingFromPrivateModuleClass : Symbol(publicClassExtendingFromPrivateModuleClass, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 43, 5)) ->privateModule.publicClassInPrivateModule : Symbol(publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 22)) +>privateModule.publicClassInPrivateModule : Symbol(publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 25)) >privateModule : Symbol(privateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 22, 1)) ->publicClassInPrivateModule : Symbol(publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 22)) +>publicClassInPrivateModule : Symbol(publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 25)) } } @@ -124,23 +124,23 @@ export class publicClassExtendingPrivateClass extends privateClass { // Should e class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { >privateClassExtendingFromPrivateModuleClass : Symbol(privateClassExtendingFromPrivateModuleClass, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 63, 1)) ->privateModule.publicClassInPrivateModule : Symbol(privateModule.publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 22)) +>privateModule.publicClassInPrivateModule : Symbol(privateModule.publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 25)) >privateModule : Symbol(privateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 22, 1)) ->publicClassInPrivateModule : Symbol(privateModule.publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 22)) +>publicClassInPrivateModule : Symbol(privateModule.publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 25)) } export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { // Should error >publicClassExtendingFromPrivateModuleClass : Symbol(publicClassExtendingFromPrivateModuleClass, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 66, 1)) ->privateModule.publicClassInPrivateModule : Symbol(privateModule.publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 22)) +>privateModule.publicClassInPrivateModule : Symbol(privateModule.publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 25)) >privateModule : Symbol(privateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 22, 1)) ->publicClassInPrivateModule : Symbol(privateModule.publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 22)) +>publicClassInPrivateModule : Symbol(privateModule.publicClassInPrivateModule, Decl(privacyClassExtendsClauseDeclFile_externalModule.ts, 24, 25)) } === privacyClassExtendsClauseDeclFile_GlobalFile.ts === -module publicModuleInGlobal { +namespace publicModuleInGlobal { >publicModuleInGlobal : Symbol(publicModuleInGlobal, Decl(privacyClassExtendsClauseDeclFile_GlobalFile.ts, 0, 0)) export class publicClassInPublicModule { ->publicClassInPublicModule : Symbol(publicClassInPublicModule, Decl(privacyClassExtendsClauseDeclFile_GlobalFile.ts, 0, 29)) +>publicClassInPublicModule : Symbol(publicClassInPublicModule, Decl(privacyClassExtendsClauseDeclFile_GlobalFile.ts, 0, 32)) private f1() { >f1 : Symbol(publicClassInPublicModule.f1, Decl(privacyClassExtendsClauseDeclFile_GlobalFile.ts, 1, 44)) @@ -153,7 +153,7 @@ module publicModuleInGlobal { class privateClassExtendingPublicClassInModule extends publicClassInPublicModule { >privateClassExtendingPublicClassInModule : Symbol(privateClassExtendingPublicClassInModule, Decl(privacyClassExtendsClauseDeclFile_GlobalFile.ts, 7, 5)) ->publicClassInPublicModule : Symbol(publicClassInPublicModule, Decl(privacyClassExtendsClauseDeclFile_GlobalFile.ts, 0, 29)) +>publicClassInPublicModule : Symbol(publicClassInPublicModule, Decl(privacyClassExtendsClauseDeclFile_GlobalFile.ts, 0, 32)) } class privateClassExtendingPrivateClassInModule extends privateClassInPublicModule { >privateClassExtendingPrivateClassInModule : Symbol(privateClassExtendingPrivateClassInModule, Decl(privacyClassExtendsClauseDeclFile_GlobalFile.ts, 10, 5)) @@ -161,7 +161,7 @@ module publicModuleInGlobal { } export class publicClassExtendingPublicClassInModule extends publicClassInPublicModule { >publicClassExtendingPublicClassInModule : Symbol(publicClassExtendingPublicClassInModule, Decl(privacyClassExtendsClauseDeclFile_GlobalFile.ts, 12, 5)) ->publicClassInPublicModule : Symbol(publicClassInPublicModule, Decl(privacyClassExtendsClauseDeclFile_GlobalFile.ts, 0, 29)) +>publicClassInPublicModule : Symbol(publicClassInPublicModule, Decl(privacyClassExtendsClauseDeclFile_GlobalFile.ts, 0, 32)) } export class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule { // Should error >publicClassExtendingPrivateClassInModule : Symbol(publicClassExtendingPrivateClassInModule, Decl(privacyClassExtendsClauseDeclFile_GlobalFile.ts, 14, 5)) diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.types b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.types index 2fa1788399974..6298092456426 100644 --- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.types +++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyClassExtendsClauseDeclFile.ts] //// === privacyClassExtendsClauseDeclFile_externalModule.ts === -export module publicModule { +export namespace publicModule { >publicModule : typeof publicModule > : ^^^^^^^^^^^^^^^^^^^ @@ -67,7 +67,7 @@ export module publicModule { } } -module privateModule { +namespace privateModule { >privateModule : typeof privateModule > : ^^^^^^^^^^^^^^^^^^^^ @@ -195,7 +195,7 @@ export class publicClassExtendingFromPrivateModuleClass extends privateModule.pu } === privacyClassExtendsClauseDeclFile_GlobalFile.ts === -module publicModuleInGlobal { +namespace publicModuleInGlobal { >publicModuleInGlobal : typeof publicModuleInGlobal > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js index cc9ea29488e10..3d2087e262ba1 100644 --- a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js +++ b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyClassImplementsClauseDeclFile.ts] //// //// [privacyClassImplementsClauseDeclFile_externalModule.ts] -export module publicModule { +export namespace publicModule { export interface publicInterfaceInPublicModule { } @@ -26,7 +26,7 @@ export module publicModule { } } -module privateModule { +namespace privateModule { export interface publicInterfaceInPrivateModule { } @@ -71,7 +71,7 @@ export class publicClassImplementingFromPrivateModuleInterface implements privat } //// [privacyClassImplementsClauseDeclFile_GlobalFile.ts] -module publicModuleInGlobal { +namespace publicModuleInGlobal { export interface publicInterfaceInPublicModule { } diff --git a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.symbols b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.symbols index 1df7086304b9c..2e67fc580ef58 100644 --- a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.symbols +++ b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/privacyClassImplementsClauseDeclFile.ts] //// === privacyClassImplementsClauseDeclFile_externalModule.ts === -export module publicModule { +export namespace publicModule { >publicModule : Symbol(publicModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 0, 0)) export interface publicInterfaceInPublicModule { ->publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 0, 28)) +>publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 0, 31)) } interface privateInterfaceInPublicModule { @@ -14,7 +14,7 @@ export module publicModule { class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule { >privateClassImplementingPublicInterfaceInModule : Symbol(privateClassImplementingPublicInterfaceInModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 5, 5)) ->publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 0, 28)) +>publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 0, 31)) } class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { >privateClassImplementingPrivateInterfaceInModule : Symbol(privateClassImplementingPrivateInterfaceInModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 8, 5)) @@ -22,7 +22,7 @@ export module publicModule { } export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule { >publicClassImplementingPublicInterfaceInModule : Symbol(publicClassImplementingPublicInterfaceInModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 10, 5)) ->publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 0, 28)) +>publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 0, 31)) } export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { // Should error >publicClassImplementingPrivateInterfaceInModule : Symbol(publicClassImplementingPrivateInterfaceInModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 12, 5)) @@ -31,29 +31,29 @@ export module publicModule { class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { >privateClassImplementingFromPrivateModuleInterface : Symbol(privateClassImplementingFromPrivateModuleInterface, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 14, 5)) ->privateModule.publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 22)) +>privateModule.publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 25)) >privateModule : Symbol(privateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 23, 1)) ->publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 22)) +>publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 25)) } export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { // Should error >publicClassImplementingFromPrivateModuleInterface : Symbol(publicClassImplementingFromPrivateModuleInterface, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 17, 5)) ->privateModule.publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 22)) +>privateModule.publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 25)) >privateModule : Symbol(privateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 23, 1)) ->publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 22)) +>publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 25)) } export class publicClassImplementingPrivateAndPublicInterface implements privateInterfaceInPublicModule, publicInterfaceInPublicModule { // Should error >publicClassImplementingPrivateAndPublicInterface : Symbol(publicClassImplementingPrivateAndPublicInterface, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 19, 5)) >privateInterfaceInPublicModule : Symbol(privateInterfaceInPublicModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 2, 5)) ->publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 0, 28)) +>publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 0, 31)) } } -module privateModule { +namespace privateModule { >privateModule : Symbol(privateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 23, 1)) export interface publicInterfaceInPrivateModule { ->publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 22)) +>publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 25)) } @@ -63,7 +63,7 @@ module privateModule { class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPrivateModule { >privateClassImplementingPublicInterfaceInModule : Symbol(privateClassImplementingPublicInterfaceInModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 31, 5)) ->publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 22)) +>publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 25)) } class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPrivateModule { >privateClassImplementingPrivateInterfaceInModule : Symbol(privateClassImplementingPrivateInterfaceInModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 34, 5)) @@ -71,7 +71,7 @@ module privateModule { } export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPrivateModule { >publicClassImplementingPublicInterfaceInModule : Symbol(publicClassImplementingPublicInterfaceInModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 36, 5)) ->publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 22)) +>publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 25)) } export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPrivateModule { >publicClassImplementingPrivateInterfaceInModule : Symbol(publicClassImplementingPrivateInterfaceInModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 38, 5)) @@ -80,15 +80,15 @@ module privateModule { class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { >privateClassImplementingFromPrivateModuleInterface : Symbol(privateClassImplementingFromPrivateModuleInterface, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 40, 5)) ->privateModule.publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 22)) +>privateModule.publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 25)) >privateModule : Symbol(privateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 23, 1)) ->publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 22)) +>publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 25)) } export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { >publicClassImplementingFromPrivateModuleInterface : Symbol(publicClassImplementingFromPrivateModuleInterface, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 43, 5)) ->privateModule.publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 22)) +>privateModule.publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 25)) >privateModule : Symbol(privateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 23, 1)) ->publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 22)) +>publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 25)) } } @@ -120,23 +120,23 @@ export class publicClassImplementingPrivateInterface implements privateInterface class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { >privateClassImplementingFromPrivateModuleInterface : Symbol(privateClassImplementingFromPrivateModuleInterface, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 62, 1)) ->privateModule.publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 22)) +>privateModule.publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 25)) >privateModule : Symbol(privateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 23, 1)) ->publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 22)) +>publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 25)) } export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { // Should error >publicClassImplementingFromPrivateModuleInterface : Symbol(publicClassImplementingFromPrivateModuleInterface, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 65, 1)) ->privateModule.publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 22)) +>privateModule.publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 25)) >privateModule : Symbol(privateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 23, 1)) ->publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 22)) +>publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyClassImplementsClauseDeclFile_externalModule.ts, 25, 25)) } === privacyClassImplementsClauseDeclFile_GlobalFile.ts === -module publicModuleInGlobal { +namespace publicModuleInGlobal { >publicModuleInGlobal : Symbol(publicModuleInGlobal, Decl(privacyClassImplementsClauseDeclFile_GlobalFile.ts, 0, 0)) export interface publicInterfaceInPublicModule { ->publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyClassImplementsClauseDeclFile_GlobalFile.ts, 0, 29)) +>publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyClassImplementsClauseDeclFile_GlobalFile.ts, 0, 32)) } interface privateInterfaceInPublicModule { @@ -145,7 +145,7 @@ module publicModuleInGlobal { class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule { >privateClassImplementingPublicInterfaceInModule : Symbol(privateClassImplementingPublicInterfaceInModule, Decl(privacyClassImplementsClauseDeclFile_GlobalFile.ts, 5, 5)) ->publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyClassImplementsClauseDeclFile_GlobalFile.ts, 0, 29)) +>publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyClassImplementsClauseDeclFile_GlobalFile.ts, 0, 32)) } class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { >privateClassImplementingPrivateInterfaceInModule : Symbol(privateClassImplementingPrivateInterfaceInModule, Decl(privacyClassImplementsClauseDeclFile_GlobalFile.ts, 8, 5)) @@ -153,7 +153,7 @@ module publicModuleInGlobal { } export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule { >publicClassImplementingPublicInterfaceInModule : Symbol(publicClassImplementingPublicInterfaceInModule, Decl(privacyClassImplementsClauseDeclFile_GlobalFile.ts, 10, 5)) ->publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyClassImplementsClauseDeclFile_GlobalFile.ts, 0, 29)) +>publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyClassImplementsClauseDeclFile_GlobalFile.ts, 0, 32)) } export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { // Should error >publicClassImplementingPrivateInterfaceInModule : Symbol(publicClassImplementingPrivateInterfaceInModule, Decl(privacyClassImplementsClauseDeclFile_GlobalFile.ts, 12, 5)) diff --git a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.types b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.types index 599cbc3c6d212..803bbdc91d5ec 100644 --- a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.types +++ b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyClassImplementsClauseDeclFile.ts] //// === privacyClassImplementsClauseDeclFile_externalModule.ts === -export module publicModule { +export namespace publicModule { >publicModule : typeof publicModule > : ^^^^^^^^^^^^^^^^^^^ @@ -47,7 +47,7 @@ export module publicModule { } } -module privateModule { +namespace privateModule { >privateModule : typeof privateModule > : ^^^^^^^^^^^^^^^^^^^^ @@ -127,7 +127,7 @@ export class publicClassImplementingFromPrivateModuleInterface implements privat } === privacyClassImplementsClauseDeclFile_GlobalFile.ts === -module publicModuleInGlobal { +namespace publicModuleInGlobal { >publicModuleInGlobal : typeof publicModuleInGlobal > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/privacyFunc.js b/tests/baselines/reference/privacyFunc.js index 73f26611b0c65..225b982fda68f 100644 --- a/tests/baselines/reference/privacyFunc.js +++ b/tests/baselines/reference/privacyFunc.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyFunc.ts] //// //// [privacyFunc.ts] -module m1 { +namespace m1 { export class C1_public { private f1() { } diff --git a/tests/baselines/reference/privacyFunc.symbols b/tests/baselines/reference/privacyFunc.symbols index 2e21c00e30834..e30aaf4a8ab43 100644 --- a/tests/baselines/reference/privacyFunc.symbols +++ b/tests/baselines/reference/privacyFunc.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/privacyFunc.ts] //// === privacyFunc.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(privacyFunc.ts, 0, 0)) export class C1_public { ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) private f1() { >f1 : Symbol(C1_public.f1, Decl(privacyFunc.ts, 1, 28)) @@ -21,7 +21,7 @@ module m1 { constructor (m1_c3_c1: C1_public); >m1_c3_c1 : Symbol(m1_c3_c1, Decl(privacyFunc.ts, 10, 21)) ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) constructor (m1_c3_c2: C2_private); //error >m1_c3_c2 : Symbol(m1_c3_c2, Decl(privacyFunc.ts, 11, 21)) @@ -34,13 +34,13 @@ module m1 { private f1_private(m1_c3_f1_arg: C1_public) { >f1_private : Symbol(C3_public.f1_private, Decl(privacyFunc.ts, 13, 9)) >m1_c3_f1_arg : Symbol(m1_c3_f1_arg, Decl(privacyFunc.ts, 15, 27)) ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) } public f2_public(m1_c3_f2_arg: C1_public) { >f2_public : Symbol(C3_public.f2_public, Decl(privacyFunc.ts, 16, 9)) >m1_c3_f2_arg : Symbol(m1_c3_f2_arg, Decl(privacyFunc.ts, 18, 25)) ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) } private f3_private(m1_c3_f3_arg: C2_private) { @@ -59,14 +59,14 @@ module m1 { >f5_private : Symbol(C3_public.f5_private, Decl(privacyFunc.ts, 25, 9)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) } public f6_public() { >f6_public : Symbol(C3_public.f6_public, Decl(privacyFunc.ts, 29, 9)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) } private f7_private() { @@ -85,18 +85,18 @@ module m1 { private f9_private(): C1_public { >f9_private : Symbol(C3_public.f9_private, Decl(privacyFunc.ts, 41, 9)) ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) } public f10_public(): C1_public { >f10_public : Symbol(C3_public.f10_public, Decl(privacyFunc.ts, 45, 9)) ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) } private f11_private(): C2_private { @@ -121,7 +121,7 @@ module m1 { constructor (m1_c4_c1: C1_public); >m1_c4_c1 : Symbol(m1_c4_c1, Decl(privacyFunc.ts, 61, 21)) ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) constructor (m1_c4_c2: C2_private); >m1_c4_c2 : Symbol(m1_c4_c2, Decl(privacyFunc.ts, 62, 21)) @@ -133,13 +133,13 @@ module m1 { private f1_private(m1_c4_f1_arg: C1_public) { >f1_private : Symbol(C4_private.f1_private, Decl(privacyFunc.ts, 64, 9)) >m1_c4_f1_arg : Symbol(m1_c4_f1_arg, Decl(privacyFunc.ts, 65, 27)) ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) } public f2_public(m1_c4_f2_arg: C1_public) { >f2_public : Symbol(C4_private.f2_public, Decl(privacyFunc.ts, 66, 9)) >m1_c4_f2_arg : Symbol(m1_c4_f2_arg, Decl(privacyFunc.ts, 68, 25)) ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) } private f3_private(m1_c4_f3_arg: C2_private) { @@ -159,14 +159,14 @@ module m1 { >f5_private : Symbol(C4_private.f5_private, Decl(privacyFunc.ts, 75, 9)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) } public f6_public() { >f6_public : Symbol(C4_private.f6_public, Decl(privacyFunc.ts, 80, 9)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) } private f7_private() { @@ -186,18 +186,18 @@ module m1 { private f9_private(): C1_public { >f9_private : Symbol(C4_private.f9_private, Decl(privacyFunc.ts, 92, 9)) ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) } public f10_public(): C1_public { >f10_public : Symbol(C4_private.f10_public, Decl(privacyFunc.ts, 97, 9)) ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) } private f11_private(): C2_private { @@ -222,7 +222,7 @@ module m1 { constructor (m1_c5_c: C1_public) { >m1_c5_c : Symbol(m1_c5_c, Decl(privacyFunc.ts, 113, 21)) ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) } } @@ -231,7 +231,7 @@ module m1 { constructor (m1_c6_c: C1_public) { >m1_c6_c : Symbol(m1_c6_c, Decl(privacyFunc.ts, 118, 21)) ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) } } export class C7_public { @@ -255,13 +255,13 @@ module m1 { function f1_public(m1_f1_arg: C1_public) { >f1_public : Symbol(f1_public, Decl(privacyFunc.ts, 129, 5)) >m1_f1_arg : Symbol(m1_f1_arg, Decl(privacyFunc.ts, 131, 23)) ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) } export function f2_public(m1_f2_arg: C1_public) { >f2_public : Symbol(f2_public, Decl(privacyFunc.ts, 132, 5)) >m1_f2_arg : Symbol(m1_f2_arg, Decl(privacyFunc.ts, 134, 30)) ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) } function f3_public(m1_f3_arg: C2_private) { @@ -281,14 +281,14 @@ module m1 { >f5_public : Symbol(f5_public, Decl(privacyFunc.ts, 141, 5)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) } export function f6_public() { >f6_public : Symbol(f6_public, Decl(privacyFunc.ts, 146, 5)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) } function f7_public() { @@ -308,18 +308,18 @@ module m1 { function f9_private(): C1_public { >f9_private : Symbol(f9_private, Decl(privacyFunc.ts, 158, 5)) ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) } export function f10_public(): C1_public { >f10_public : Symbol(f10_public, Decl(privacyFunc.ts, 163, 5)) ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 14)) } function f11_private(): C2_private { diff --git a/tests/baselines/reference/privacyFunc.types b/tests/baselines/reference/privacyFunc.types index 1ca0f4c140a1a..a6e428fd68bdd 100644 --- a/tests/baselines/reference/privacyFunc.types +++ b/tests/baselines/reference/privacyFunc.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyFunc.ts] //// === privacyFunc.ts === -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js index 78b540204a9c3..b69fab29cbcaf 100644 --- a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js +++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js @@ -7,7 +7,7 @@ declare module "GlobalWidgets" { } export function createWidget3(): Widget3; - export module SpecializedGlobalWidget { + export namespace SpecializedGlobalWidget { export class Widget4 { name: string; } @@ -23,7 +23,7 @@ export function createWidget1() { return new Widget1(); } -export module SpecializedWidget { +export namespace SpecializedWidget { export class Widget2 { name = 'one'; } diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.symbols b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.symbols index 4e7452e6c18cf..07fa6d06c77d8 100644 --- a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.symbols +++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.symbols @@ -392,18 +392,18 @@ declare module "GlobalWidgets" { >createWidget3 : Symbol(createWidget3, Decl(privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts, 3, 5)) >Widget3 : Symbol(Widget3, Decl(privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts, 0, 32)) - export module SpecializedGlobalWidget { + export namespace SpecializedGlobalWidget { >SpecializedGlobalWidget : Symbol(SpecializedGlobalWidget, Decl(privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts, 4, 45)) export class Widget4 { ->Widget4 : Symbol(Widget4, Decl(privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts, 6, 43)) +>Widget4 : Symbol(Widget4, Decl(privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts, 6, 46)) name: string; >name : Symbol(Widget4.name, Decl(privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts, 7, 30)) } function createWidget4(): Widget4; >createWidget4 : Symbol(createWidget4, Decl(privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts, 9, 9)) ->Widget4 : Symbol(Widget4, Decl(privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts, 6, 43)) +>Widget4 : Symbol(Widget4, Decl(privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts, 6, 46)) } } @@ -421,11 +421,11 @@ export function createWidget1() { >Widget1 : Symbol(Widget1, Decl(privacyFunctionCannotNameParameterTypeDeclFile_Widgets.ts, 0, 0)) } -export module SpecializedWidget { +export namespace SpecializedWidget { >SpecializedWidget : Symbol(SpecializedWidget, Decl(privacyFunctionCannotNameParameterTypeDeclFile_Widgets.ts, 5, 1)) export class Widget2 { ->Widget2 : Symbol(Widget2, Decl(privacyFunctionCannotNameParameterTypeDeclFile_Widgets.ts, 7, 33)) +>Widget2 : Symbol(Widget2, Decl(privacyFunctionCannotNameParameterTypeDeclFile_Widgets.ts, 7, 36)) name = 'one'; >name : Symbol(Widget2.name, Decl(privacyFunctionCannotNameParameterTypeDeclFile_Widgets.ts, 8, 26)) @@ -434,7 +434,7 @@ export module SpecializedWidget { >createWidget2 : Symbol(createWidget2, Decl(privacyFunctionCannotNameParameterTypeDeclFile_Widgets.ts, 10, 5)) return new Widget2(); ->Widget2 : Symbol(Widget2, Decl(privacyFunctionCannotNameParameterTypeDeclFile_Widgets.ts, 7, 33)) +>Widget2 : Symbol(Widget2, Decl(privacyFunctionCannotNameParameterTypeDeclFile_Widgets.ts, 7, 36)) } } diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.types b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.types index 9a383f11913c1..3ee249ee95511 100644 --- a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.types +++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.types @@ -772,7 +772,7 @@ declare module "GlobalWidgets" { >createWidget3 : () => Widget3 > : ^^^^^^ - export module SpecializedGlobalWidget { + export namespace SpecializedGlobalWidget { >SpecializedGlobalWidget : typeof SpecializedGlobalWidget > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -812,7 +812,7 @@ export function createWidget1() { > : ^^^^^^^^^^^^^^ } -export module SpecializedWidget { +export namespace SpecializedWidget { >SpecializedWidget : typeof SpecializedWidget > : ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js index cf19484879882..bd4cd833c0e90 100644 --- a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js +++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js @@ -7,7 +7,7 @@ declare module "GlobalWidgets" { } export function createWidget3(): Widget3; - export module SpecializedGlobalWidget { + export namespace SpecializedGlobalWidget { export class Widget4 { name: string; } @@ -23,7 +23,7 @@ export function createWidget1() { return new Widget1(); } -export module SpecializedWidget { +export namespace SpecializedWidget { export class Widget2 { name = 'one'; } diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.symbols b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.symbols index 5beb265f1ce70..018b8cde9b003 100644 --- a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.symbols +++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.symbols @@ -295,18 +295,18 @@ declare module "GlobalWidgets" { >createWidget3 : Symbol(createWidget3, Decl(privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts, 3, 5)) >Widget3 : Symbol(Widget3, Decl(privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts, 0, 32)) - export module SpecializedGlobalWidget { + export namespace SpecializedGlobalWidget { >SpecializedGlobalWidget : Symbol(SpecializedGlobalWidget, Decl(privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts, 4, 45)) export class Widget4 { ->Widget4 : Symbol(Widget4, Decl(privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts, 6, 43)) +>Widget4 : Symbol(Widget4, Decl(privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts, 6, 46)) name: string; >name : Symbol(Widget4.name, Decl(privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts, 7, 30)) } function createWidget4(): Widget4; >createWidget4 : Symbol(createWidget4, Decl(privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts, 9, 9)) ->Widget4 : Symbol(Widget4, Decl(privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts, 6, 43)) +>Widget4 : Symbol(Widget4, Decl(privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts, 6, 46)) } } @@ -324,11 +324,11 @@ export function createWidget1() { >Widget1 : Symbol(Widget1, Decl(privacyFunctionReturnTypeDeclFile_Widgets.ts, 0, 0)) } -export module SpecializedWidget { +export namespace SpecializedWidget { >SpecializedWidget : Symbol(SpecializedWidget, Decl(privacyFunctionReturnTypeDeclFile_Widgets.ts, 5, 1)) export class Widget2 { ->Widget2 : Symbol(Widget2, Decl(privacyFunctionReturnTypeDeclFile_Widgets.ts, 7, 33)) +>Widget2 : Symbol(Widget2, Decl(privacyFunctionReturnTypeDeclFile_Widgets.ts, 7, 36)) name = 'one'; >name : Symbol(Widget2.name, Decl(privacyFunctionReturnTypeDeclFile_Widgets.ts, 8, 26)) @@ -337,7 +337,7 @@ export module SpecializedWidget { >createWidget2 : Symbol(createWidget2, Decl(privacyFunctionReturnTypeDeclFile_Widgets.ts, 10, 5)) return new Widget2(); ->Widget2 : Symbol(Widget2, Decl(privacyFunctionReturnTypeDeclFile_Widgets.ts, 7, 33)) +>Widget2 : Symbol(Widget2, Decl(privacyFunctionReturnTypeDeclFile_Widgets.ts, 7, 36)) } } diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.types b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.types index be15fe4428c71..010aff514dab3 100644 --- a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.types +++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.types @@ -495,7 +495,7 @@ declare module "GlobalWidgets" { >createWidget3 : () => Widget3 > : ^^^^^^ - export module SpecializedGlobalWidget { + export namespace SpecializedGlobalWidget { >SpecializedGlobalWidget : typeof SpecializedGlobalWidget > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -535,7 +535,7 @@ export function createWidget1() { > : ^^^^^^^^^^^^^^ } -export module SpecializedWidget { +export namespace SpecializedWidget { >SpecializedWidget : typeof SpecializedWidget > : ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.js b/tests/baselines/reference/privacyFunctionParameterDeclFile.js index 491046c31aa42..e977e4a85b801 100644 --- a/tests/baselines/reference/privacyFunctionParameterDeclFile.js +++ b/tests/baselines/reference/privacyFunctionParameterDeclFile.js @@ -131,7 +131,7 @@ function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.pub } declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; -export module publicModule { +export namespace publicModule { class privateClass { } @@ -265,7 +265,7 @@ export module publicModule { } -module privateModule { +namespace privateModule { class privateClass { } @@ -421,14 +421,14 @@ function publicFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGloba } declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal): void; -module publicModuleInGlobal { +namespace publicModuleInGlobal { class privateClass { } export class publicClass { } - module privateModule { + namespace privateModule { class privateClass { } diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.symbols b/tests/baselines/reference/privacyFunctionParameterDeclFile.symbols index 8f6b15b9a36b7..b2c20f922e06f 100644 --- a/tests/baselines/reference/privacyFunctionParameterDeclFile.symbols +++ b/tests/baselines/reference/privacyFunctionParameterDeclFile.symbols @@ -378,11 +378,11 @@ declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: pr >privateModule : Symbol(privateModule, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 262, 1)) >publicClass : Symbol(privateModule.publicClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 266, 5)) -export module publicModule { +export namespace publicModule { >publicModule : Symbol(publicModule, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 128, 111)) class privateClass { ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) } export class publicClass { @@ -395,18 +395,18 @@ export module publicModule { new (param: privateClass): publicClass; // Error >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 139, 13)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) >publicClass : Symbol(publicClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 132, 5)) (param: privateClass): publicClass; // Error >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 140, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) >publicClass : Symbol(publicClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 132, 5)) myMethod(param: privateClass): void; // Error >myMethod : Symbol(publicInterfaceWithPrivateParmeterTypes.myMethod, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 140, 43)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 141, 17)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) } export interface publicInterfaceWithPublicParmeterTypes { @@ -433,18 +433,18 @@ export module publicModule { new (param: privateClass): privateClass; >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 151, 13)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) (param: privateClass): privateClass; >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 152, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) myMethod(param: privateClass): void; >myMethod : Symbol(privateInterfaceWithPrivateParmeterTypes.myMethod, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 152, 44)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 153, 17)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) } interface privateInterfaceWithPublicParmeterTypes { @@ -472,30 +472,30 @@ export module publicModule { static myPublicStaticMethod(param: privateClass) { // Error >myPublicStaticMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 162, 58)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 163, 36)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) } private static myPrivateStaticMethod(param: privateClass) { >myPrivateStaticMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 164, 9)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 165, 45)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) } myPublicMethod(param: privateClass) { // Error >myPublicMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicMethod, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 166, 9)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 167, 23)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) } private myPrivateMethod(param: privateClass) { >myPrivateMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateMethod, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 168, 9)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 169, 32)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) } constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 171, 20)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) >param1 : Symbol(publicClassWithWithPrivateParmeterTypes.param1, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 171, 40)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) >param2 : Symbol(publicClassWithWithPrivateParmeterTypes.param2, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 171, 70)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) } } @@ -538,30 +538,30 @@ export module publicModule { static myPublicStaticMethod(param: privateClass) { >myPublicStaticMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 188, 52)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 189, 36)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) } private static myPrivateStaticMethod(param: privateClass) { >myPrivateStaticMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 190, 9)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 191, 45)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) } myPublicMethod(param: privateClass) { >myPublicMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicMethod, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 192, 9)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 193, 23)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) } private myPrivateMethod(param: privateClass) { >myPrivateMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateMethod, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 194, 9)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 195, 32)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) } constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 197, 20)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) >param1 : Symbol(privateClassWithWithPrivateParmeterTypes.param1, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 197, 40)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) >param2 : Symbol(privateClassWithWithPrivateParmeterTypes.param2, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 197, 70)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) } } @@ -601,7 +601,7 @@ export module publicModule { export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error >publicFunctionWithPrivateParmeterTypes : Symbol(publicFunctionWithPrivateParmeterTypes, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 212, 5)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 214, 59)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) } export function publicFunctionWithPublicParmeterTypes(param: publicClass) { >publicFunctionWithPublicParmeterTypes : Symbol(publicFunctionWithPublicParmeterTypes, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 215, 5)) @@ -611,7 +611,7 @@ export module publicModule { function privateFunctionWithPrivateParmeterTypes(param: privateClass) { >privateFunctionWithPrivateParmeterTypes : Symbol(privateFunctionWithPrivateParmeterTypes, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 217, 5)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 218, 53)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) } function privateFunctionWithPublicParmeterTypes(param: publicClass) { >privateFunctionWithPublicParmeterTypes : Symbol(privateFunctionWithPublicParmeterTypes, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 219, 5)) @@ -622,7 +622,7 @@ export module publicModule { export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error >publicAmbientFunctionWithPrivateParmeterTypes : Symbol(publicAmbientFunctionWithPrivateParmeterTypes, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 221, 5)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 223, 74)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; >publicAmbientFunctionWithPublicParmeterTypes : Symbol(publicAmbientFunctionWithPublicParmeterTypes, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 223, 101)) @@ -632,7 +632,7 @@ export module publicModule { declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; >privateAmbientFunctionWithPrivateParmeterTypes : Symbol(privateAmbientFunctionWithPrivateParmeterTypes, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 224, 99)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 225, 68)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 130, 31)) declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; >privateAmbientFunctionWithPublicParmeterTypes : Symbol(privateAmbientFunctionWithPublicParmeterTypes, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 225, 95)) @@ -761,11 +761,11 @@ export module publicModule { } -module privateModule { +namespace privateModule { >privateModule : Symbol(privateModule, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 262, 1)) class privateClass { ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) } export class publicClass { @@ -777,18 +777,18 @@ module privateModule { new (param: privateClass): publicClass; >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 272, 13)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) >publicClass : Symbol(publicClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 266, 5)) (param: privateClass): publicClass; >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 273, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) >publicClass : Symbol(publicClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 266, 5)) myMethod(param: privateClass): void; >myMethod : Symbol(publicInterfaceWithPrivateParmeterTypes.myMethod, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 273, 43)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 274, 17)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) } export interface publicInterfaceWithPublicParmeterTypes { @@ -815,18 +815,18 @@ module privateModule { new (param: privateClass): privateClass; >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 284, 13)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) (param: privateClass): privateClass; >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 285, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) myMethod(param: privateClass): void; >myMethod : Symbol(privateInterfaceWithPrivateParmeterTypes.myMethod, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 285, 44)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 286, 17)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) } interface privateInterfaceWithPublicParmeterTypes { @@ -854,30 +854,30 @@ module privateModule { static myPublicStaticMethod(param: privateClass) { >myPublicStaticMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 295, 58)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 296, 36)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) } private static myPrivateStaticMethod(param: privateClass) { >myPrivateStaticMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 297, 9)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 298, 45)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) } myPublicMethod(param: privateClass) { >myPublicMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicMethod, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 299, 9)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 300, 23)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) } private myPrivateMethod(param: privateClass) { >myPrivateMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateMethod, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 301, 9)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 302, 32)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) } constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 304, 20)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) >param1 : Symbol(publicClassWithWithPrivateParmeterTypes.param1, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 304, 40)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) >param2 : Symbol(publicClassWithWithPrivateParmeterTypes.param2, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 304, 70)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) } } @@ -920,30 +920,30 @@ module privateModule { static myPublicStaticMethod(param: privateClass) { >myPublicStaticMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 321, 52)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 322, 36)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) } private static myPrivateStaticMethod(param: privateClass) { >myPrivateStaticMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 323, 9)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 324, 45)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) } myPublicMethod(param: privateClass) { >myPublicMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicMethod, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 325, 9)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 326, 23)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) } private myPrivateMethod(param: privateClass) { >myPrivateMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateMethod, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 327, 9)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 328, 32)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) } constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 330, 20)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) >param1 : Symbol(privateClassWithWithPrivateParmeterTypes.param1, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 330, 40)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) >param2 : Symbol(privateClassWithWithPrivateParmeterTypes.param2, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 330, 70)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) } } @@ -983,7 +983,7 @@ module privateModule { export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { >publicFunctionWithPrivateParmeterTypes : Symbol(publicFunctionWithPrivateParmeterTypes, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 345, 5)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 347, 59)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) } export function publicFunctionWithPublicParmeterTypes(param: publicClass) { >publicFunctionWithPublicParmeterTypes : Symbol(publicFunctionWithPublicParmeterTypes, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 348, 5)) @@ -993,7 +993,7 @@ module privateModule { function privateFunctionWithPrivateParmeterTypes(param: privateClass) { >privateFunctionWithPrivateParmeterTypes : Symbol(privateFunctionWithPrivateParmeterTypes, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 350, 5)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 351, 53)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) } function privateFunctionWithPublicParmeterTypes(param: publicClass) { >privateFunctionWithPublicParmeterTypes : Symbol(privateFunctionWithPublicParmeterTypes, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 352, 5)) @@ -1004,7 +1004,7 @@ module privateModule { export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; >publicAmbientFunctionWithPrivateParmeterTypes : Symbol(publicAmbientFunctionWithPrivateParmeterTypes, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 354, 5)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 356, 74)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; >publicAmbientFunctionWithPublicParmeterTypes : Symbol(publicAmbientFunctionWithPublicParmeterTypes, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 356, 101)) @@ -1014,7 +1014,7 @@ module privateModule { declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; >privateAmbientFunctionWithPrivateParmeterTypes : Symbol(privateAmbientFunctionWithPrivateParmeterTypes, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 357, 99)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 358, 68)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 264, 25)) declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; >privateAmbientFunctionWithPublicParmeterTypes : Symbol(privateAmbientFunctionWithPublicParmeterTypes, Decl(privacyFunctionParameterDeclFile_externalModule.ts, 358, 95)) @@ -1206,22 +1206,22 @@ declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(param: pub >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 21, 70)) >publicClassInGlobal : Symbol(publicClassInGlobal, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 0, 0)) -module publicModuleInGlobal { +namespace publicModuleInGlobal { >publicModuleInGlobal : Symbol(publicModuleInGlobal, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 21, 104)) class privateClass { ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) } export class publicClass { >publicClass : Symbol(publicClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 25, 5)) } - module privateModule { + namespace privateModule { >privateModule : Symbol(privateModule, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 28, 5)) class privateClass { ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) } export class publicClass { @@ -1233,18 +1233,18 @@ module publicModuleInGlobal { new (param: privateClass): publicClass; >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 38, 17)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) >publicClass : Symbol(publicClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 32, 9)) (param: privateClass): publicClass; >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 39, 13)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) >publicClass : Symbol(publicClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 32, 9)) myMethod(param: privateClass): void; >myMethod : Symbol(publicInterfaceWithPrivateParmeterTypes.myMethod, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 39, 47)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 40, 21)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) } export interface publicInterfaceWithPublicParmeterTypes { @@ -1271,18 +1271,18 @@ module publicModuleInGlobal { new (param: privateClass): privateClass; >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 50, 17)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) (param: privateClass): privateClass; >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 51, 13)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) myMethod(param: privateClass): void; >myMethod : Symbol(privateInterfaceWithPrivateParmeterTypes.myMethod, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 51, 48)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 52, 21)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) } interface privateInterfaceWithPublicParmeterTypes { @@ -1310,30 +1310,30 @@ module publicModuleInGlobal { static myPublicStaticMethod(param: privateClass) { >myPublicStaticMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 61, 62)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 62, 40)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) } private static myPrivateStaticMethod(param: privateClass) { >myPrivateStaticMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 63, 13)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 64, 49)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) } myPublicMethod(param: privateClass) { >myPublicMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicMethod, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 65, 13)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 66, 27)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) } private myPrivateMethod(param: privateClass) { >myPrivateMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateMethod, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 67, 13)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 68, 36)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) } constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 70, 24)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) >param1 : Symbol(publicClassWithWithPrivateParmeterTypes.param1, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 70, 44)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) >param2 : Symbol(publicClassWithWithPrivateParmeterTypes.param2, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 70, 74)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) } } @@ -1376,30 +1376,30 @@ module publicModuleInGlobal { static myPublicStaticMethod(param: privateClass) { >myPublicStaticMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 87, 56)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 88, 40)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) } private static myPrivateStaticMethod(param: privateClass) { >myPrivateStaticMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 89, 13)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 90, 49)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) } myPublicMethod(param: privateClass) { >myPublicMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicMethod, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 91, 13)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 92, 27)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) } private myPrivateMethod(param: privateClass) { >myPrivateMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateMethod, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 93, 13)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 94, 36)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) } constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 96, 24)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) >param1 : Symbol(privateClassWithWithPrivateParmeterTypes.param1, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 96, 44)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) >param2 : Symbol(privateClassWithWithPrivateParmeterTypes.param2, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 96, 74)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) } } @@ -1439,7 +1439,7 @@ module publicModuleInGlobal { export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { >publicFunctionWithPrivateParmeterTypes : Symbol(publicFunctionWithPrivateParmeterTypes, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 111, 9)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 113, 63)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) } export function publicFunctionWithPublicParmeterTypes(param: publicClass) { >publicFunctionWithPublicParmeterTypes : Symbol(publicFunctionWithPublicParmeterTypes, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 114, 9)) @@ -1449,7 +1449,7 @@ module publicModuleInGlobal { function privateFunctionWithPrivateParmeterTypes(param: privateClass) { >privateFunctionWithPrivateParmeterTypes : Symbol(privateFunctionWithPrivateParmeterTypes, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 116, 9)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 117, 57)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) } function privateFunctionWithPublicParmeterTypes(param: publicClass) { >privateFunctionWithPublicParmeterTypes : Symbol(privateFunctionWithPublicParmeterTypes, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 118, 9)) @@ -1460,7 +1460,7 @@ module publicModuleInGlobal { export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; >publicAmbientFunctionWithPrivateParmeterTypes : Symbol(publicAmbientFunctionWithPrivateParmeterTypes, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 120, 9)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 122, 78)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; >publicAmbientFunctionWithPublicParmeterTypes : Symbol(publicAmbientFunctionWithPublicParmeterTypes, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 122, 105)) @@ -1470,7 +1470,7 @@ module publicModuleInGlobal { declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; >privateAmbientFunctionWithPrivateParmeterTypes : Symbol(privateAmbientFunctionWithPrivateParmeterTypes, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 123, 103)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 124, 72)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 30, 29)) declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; >privateAmbientFunctionWithPublicParmeterTypes : Symbol(privateAmbientFunctionWithPublicParmeterTypes, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 124, 99)) @@ -1603,18 +1603,18 @@ module publicModuleInGlobal { new (param: privateClass): publicClass; // Error >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 163, 13)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) >publicClass : Symbol(publicClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 25, 5)) (param: privateClass): publicClass; // Error >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 164, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) >publicClass : Symbol(publicClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 25, 5)) myMethod(param: privateClass): void; // Error >myMethod : Symbol(publicInterfaceWithPrivateParmeterTypes.myMethod, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 164, 43)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 165, 17)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) } export interface publicInterfaceWithPublicParmeterTypes { @@ -1641,18 +1641,18 @@ module publicModuleInGlobal { new (param: privateClass): privateClass; >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 175, 13)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) (param: privateClass): privateClass; >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 176, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) myMethod(param: privateClass): void; >myMethod : Symbol(privateInterfaceWithPrivateParmeterTypes.myMethod, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 176, 44)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 177, 17)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) } interface privateInterfaceWithPublicParmeterTypes { @@ -1680,30 +1680,30 @@ module publicModuleInGlobal { static myPublicStaticMethod(param: privateClass) { // Error >myPublicStaticMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 186, 58)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 187, 36)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) } private static myPrivateStaticMethod(param: privateClass) { >myPrivateStaticMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 188, 9)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 189, 45)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) } myPublicMethod(param: privateClass) { // Error >myPublicMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicMethod, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 190, 9)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 191, 23)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) } private myPrivateMethod(param: privateClass) { >myPrivateMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateMethod, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 192, 9)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 193, 32)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) } constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 195, 20)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) >param1 : Symbol(publicClassWithWithPrivateParmeterTypes.param1, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 195, 40)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) >param2 : Symbol(publicClassWithWithPrivateParmeterTypes.param2, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 195, 70)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) } } @@ -1746,30 +1746,30 @@ module publicModuleInGlobal { static myPublicStaticMethod(param: privateClass) { >myPublicStaticMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 212, 52)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 213, 36)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) } private static myPrivateStaticMethod(param: privateClass) { >myPrivateStaticMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 214, 9)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 215, 45)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) } myPublicMethod(param: privateClass) { >myPublicMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicMethod, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 216, 9)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 217, 23)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) } private myPrivateMethod(param: privateClass) { >myPrivateMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateMethod, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 218, 9)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 219, 32)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) } constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 221, 20)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) >param1 : Symbol(privateClassWithWithPrivateParmeterTypes.param1, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 221, 40)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) >param2 : Symbol(privateClassWithWithPrivateParmeterTypes.param2, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 221, 70)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) } } @@ -1809,7 +1809,7 @@ module publicModuleInGlobal { export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error >publicFunctionWithPrivateParmeterTypes : Symbol(publicFunctionWithPrivateParmeterTypes, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 236, 5)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 238, 59)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) } export function publicFunctionWithPublicParmeterTypes(param: publicClass) { >publicFunctionWithPublicParmeterTypes : Symbol(publicFunctionWithPublicParmeterTypes, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 239, 5)) @@ -1819,7 +1819,7 @@ module publicModuleInGlobal { function privateFunctionWithPrivateParmeterTypes(param: privateClass) { >privateFunctionWithPrivateParmeterTypes : Symbol(privateFunctionWithPrivateParmeterTypes, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 241, 5)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 242, 53)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) } function privateFunctionWithPublicParmeterTypes(param: publicClass) { >privateFunctionWithPublicParmeterTypes : Symbol(privateFunctionWithPublicParmeterTypes, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 243, 5)) @@ -1830,7 +1830,7 @@ module publicModuleInGlobal { export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error >publicAmbientFunctionWithPrivateParmeterTypes : Symbol(publicAmbientFunctionWithPrivateParmeterTypes, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 245, 5)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 247, 74)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; >publicAmbientFunctionWithPublicParmeterTypes : Symbol(publicAmbientFunctionWithPublicParmeterTypes, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 247, 101)) @@ -1840,7 +1840,7 @@ module publicModuleInGlobal { declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; >privateAmbientFunctionWithPrivateParmeterTypes : Symbol(privateAmbientFunctionWithPrivateParmeterTypes, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 248, 99)) >param : Symbol(param, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 249, 68)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 23, 32)) declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; >privateAmbientFunctionWithPublicParmeterTypes : Symbol(privateAmbientFunctionWithPublicParmeterTypes, Decl(privacyFunctionParameterDeclFile_GlobalFile.ts, 249, 95)) diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.types b/tests/baselines/reference/privacyFunctionParameterDeclFile.types index cea79455ccbe6..d4049d768c426 100644 --- a/tests/baselines/reference/privacyFunctionParameterDeclFile.types +++ b/tests/baselines/reference/privacyFunctionParameterDeclFile.types @@ -420,7 +420,7 @@ declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: pr >privateModule : any > : ^^^ -export module publicModule { +export namespace publicModule { >publicModule : typeof publicModule > : ^^^^^^^^^^^^^^^^^^^ @@ -846,7 +846,7 @@ export module publicModule { } -module privateModule { +namespace privateModule { >privateModule : typeof privateModule > : ^^^^^^^^^^^^^^^^^^^^ @@ -1339,7 +1339,7 @@ declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(param: pub >param : publicClassInGlobal > : ^^^^^^^^^^^^^^^^^^^ -module publicModuleInGlobal { +namespace publicModuleInGlobal { >publicModuleInGlobal : typeof publicModuleInGlobal > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1353,7 +1353,7 @@ module publicModuleInGlobal { > : ^^^^^^^^^^^ } - module privateModule { + namespace privateModule { >privateModule : typeof privateModule > : ^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js index 66811b21ff5b5..ed09d0e3e4f24 100644 --- a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js +++ b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js @@ -229,7 +229,7 @@ function privateFunctionWithPrivateModuleParameterTypes1() { } declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; -export module publicModule { +export namespace publicModule { class privateClass { } @@ -459,7 +459,7 @@ export module publicModule { declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; } -module privateModule { +namespace privateModule { class privateClass { } @@ -732,14 +732,14 @@ function publicFunctionWithPublicParmeterTypesInGlobal1() { } declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal; -module publicModuleInGlobal { +namespace publicModuleInGlobal { class privateClass { } export class publicClass { } - module privateModule { + namespace privateModule { class privateClass { } diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.symbols b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.symbols index fea8a9f4afe3b..23d9989fb00d8 100644 --- a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.symbols +++ b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.symbols @@ -508,11 +508,11 @@ declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privat >privateModule : Symbol(privateModule, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 456, 1)) >publicClass : Symbol(privateModule.publicClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 460, 5)) -export module publicModule { +export namespace publicModule { >publicModule : Symbol(publicModule, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 226, 100)) class privateClass { ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) } export class publicClass { @@ -523,18 +523,18 @@ export module publicModule { >publicInterfaceWithPrivateParmeterTypes : Symbol(publicInterfaceWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 233, 5)) new (): privateClass; // Error ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) (): privateClass; // Error ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) [x: number]: privateClass; // Error >x : Symbol(x, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 238, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) myMethod(): privateClass; // Error >myMethod : Symbol(publicInterfaceWithPrivateParmeterTypes.myMethod, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 238, 34)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) } export interface publicInterfaceWithPublicParmeterTypes { @@ -559,18 +559,18 @@ export module publicModule { >privateInterfaceWithPrivateParmeterTypes : Symbol(privateInterfaceWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 247, 5)) new (): privateClass; ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) (): privateClass; ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) [x: number]: privateClass; >x : Symbol(x, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 252, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) myMethod(): privateClass; >myMethod : Symbol(privateInterfaceWithPrivateParmeterTypes.myMethod, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 252, 34)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) } interface privateInterfaceWithPublicParmeterTypes { @@ -596,25 +596,25 @@ export module publicModule { static myPublicStaticMethod(): privateClass { // Error >myPublicStaticMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 263, 58)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) return null; } private static myPrivateStaticMethod(): privateClass { >myPrivateStaticMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 266, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) return null; } myPublicMethod(): privateClass { // Error >myPublicMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicMethod, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 269, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) return null; } private myPrivateMethod(): privateClass { >myPrivateMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateMethod, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 272, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) return null; } @@ -622,25 +622,25 @@ export module publicModule { >myPublicStaticMethod1 : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 275, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) } private static myPrivateStaticMethod1() { >myPrivateStaticMethod1 : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 278, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) } myPublicMethod1() { // Error >myPublicMethod1 : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicMethod1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 281, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) } private myPrivateMethod1() { >myPrivateMethod1 : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateMethod1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 284, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) } } @@ -702,25 +702,25 @@ export module publicModule { static myPublicStaticMethod(): privateClass { >myPublicStaticMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 317, 52)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) return null; } private static myPrivateStaticMethod(): privateClass { >myPrivateStaticMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 320, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) return null; } myPublicMethod(): privateClass { >myPublicMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicMethod, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 323, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) return null; } private myPrivateMethod(): privateClass { >myPrivateMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateMethod, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 326, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) return null; } @@ -728,25 +728,25 @@ export module publicModule { >myPublicStaticMethod1 : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 329, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) } private static myPrivateStaticMethod1() { >myPrivateStaticMethod1 : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 332, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) } myPublicMethod1() { >myPublicMethod1 : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicMethod1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 335, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) } private myPrivateMethod1() { >myPrivateMethod1 : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateMethod1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 338, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) } } @@ -805,7 +805,7 @@ export module publicModule { export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error >publicFunctionWithPrivateParmeterTypes : Symbol(publicFunctionWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 369, 5)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) return null; } @@ -817,7 +817,7 @@ export module publicModule { } function privateFunctionWithPrivateParmeterTypes(): privateClass { >privateFunctionWithPrivateParmeterTypes : Symbol(privateFunctionWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 376, 5)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) return null; } @@ -831,7 +831,7 @@ export module publicModule { >publicFunctionWithPrivateParmeterTypes1 : Symbol(publicFunctionWithPrivateParmeterTypes1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 382, 5)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) } export function publicFunctionWithPublicParmeterTypes1() { >publicFunctionWithPublicParmeterTypes1 : Symbol(publicFunctionWithPublicParmeterTypes1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 385, 5)) @@ -843,7 +843,7 @@ export module publicModule { >privateFunctionWithPrivateParmeterTypes1 : Symbol(privateFunctionWithPrivateParmeterTypes1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 388, 5)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) } function privateFunctionWithPublicParmeterTypes1() { >privateFunctionWithPublicParmeterTypes1 : Symbol(privateFunctionWithPublicParmeterTypes1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 391, 5)) @@ -854,7 +854,7 @@ export module publicModule { export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error >publicAmbientFunctionWithPrivateParmeterTypes : Symbol(publicAmbientFunctionWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 394, 5)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; >publicAmbientFunctionWithPublicParmeterTypes : Symbol(publicAmbientFunctionWithPublicParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 396, 90)) @@ -862,7 +862,7 @@ export module publicModule { declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass; >privateAmbientFunctionWithPrivateParmeterTypes : Symbol(privateAmbientFunctionWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 397, 88)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 28)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 228, 31)) declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass; >privateAmbientFunctionWithPublicParmeterTypes : Symbol(privateAmbientFunctionWithPublicParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 398, 84)) @@ -1019,11 +1019,11 @@ export module publicModule { >publicClass : Symbol(privateModule.publicClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 460, 5)) } -module privateModule { +namespace privateModule { >privateModule : Symbol(privateModule, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 456, 1)) class privateClass { ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) } export class publicClass { @@ -1034,18 +1034,18 @@ module privateModule { >publicInterfaceWithPrivateParmeterTypes : Symbol(publicInterfaceWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 463, 5)) new (): privateClass; ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) (): privateClass; ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) [x: number]: privateClass; >x : Symbol(x, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 468, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) myMethod(): privateClass; >myMethod : Symbol(publicInterfaceWithPrivateParmeterTypes.myMethod, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 468, 34)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) } export interface publicInterfaceWithPublicParmeterTypes { @@ -1070,18 +1070,18 @@ module privateModule { >privateInterfaceWithPrivateParmeterTypes : Symbol(privateInterfaceWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 477, 5)) new (): privateClass; ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) (): privateClass; ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) [x: number]: privateClass; >x : Symbol(x, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 482, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) myMethod(): privateClass; >myMethod : Symbol(privateInterfaceWithPrivateParmeterTypes.myMethod, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 482, 34)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) } interface privateInterfaceWithPublicParmeterTypes { @@ -1107,25 +1107,25 @@ module privateModule { static myPublicStaticMethod(): privateClass { >myPublicStaticMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 493, 58)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) return null; } private static myPrivateStaticMethod(): privateClass { >myPrivateStaticMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 496, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) return null; } myPublicMethod(): privateClass { >myPublicMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicMethod, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 499, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) return null; } private myPrivateMethod(): privateClass { >myPrivateMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateMethod, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 502, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) return null; } @@ -1133,25 +1133,25 @@ module privateModule { >myPublicStaticMethod1 : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 505, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) } private static myPrivateStaticMethod1() { >myPrivateStaticMethod1 : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 508, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) } myPublicMethod1() { >myPublicMethod1 : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicMethod1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 511, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) } private myPrivateMethod1() { >myPrivateMethod1 : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateMethod1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 514, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) } } @@ -1213,25 +1213,25 @@ module privateModule { static myPublicStaticMethod(): privateClass { >myPublicStaticMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 547, 52)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) return null; } private static myPrivateStaticMethod(): privateClass { >myPrivateStaticMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 550, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) return null; } myPublicMethod(): privateClass { >myPublicMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicMethod, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 553, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) return null; } private myPrivateMethod(): privateClass { >myPrivateMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateMethod, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 556, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) return null; } @@ -1239,25 +1239,25 @@ module privateModule { >myPublicStaticMethod1 : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 559, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) } private static myPrivateStaticMethod1() { >myPrivateStaticMethod1 : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 562, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) } myPublicMethod1() { >myPublicMethod1 : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicMethod1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 565, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) } private myPrivateMethod1() { >myPrivateMethod1 : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateMethod1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 568, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) } } @@ -1316,7 +1316,7 @@ module privateModule { export function publicFunctionWithPrivateParmeterTypes(): privateClass { >publicFunctionWithPrivateParmeterTypes : Symbol(publicFunctionWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 599, 5)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) return null; } @@ -1328,7 +1328,7 @@ module privateModule { } function privateFunctionWithPrivateParmeterTypes(): privateClass { >privateFunctionWithPrivateParmeterTypes : Symbol(privateFunctionWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 606, 5)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) return null; } @@ -1342,7 +1342,7 @@ module privateModule { >publicFunctionWithPrivateParmeterTypes1 : Symbol(publicFunctionWithPrivateParmeterTypes1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 612, 5)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) } export function publicFunctionWithPublicParmeterTypes1() { >publicFunctionWithPublicParmeterTypes1 : Symbol(publicFunctionWithPublicParmeterTypes1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 615, 5)) @@ -1354,7 +1354,7 @@ module privateModule { >privateFunctionWithPrivateParmeterTypes1 : Symbol(privateFunctionWithPrivateParmeterTypes1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 618, 5)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) } function privateFunctionWithPublicParmeterTypes1() { >privateFunctionWithPublicParmeterTypes1 : Symbol(privateFunctionWithPublicParmeterTypes1, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 621, 5)) @@ -1365,7 +1365,7 @@ module privateModule { export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; >publicAmbientFunctionWithPrivateParmeterTypes : Symbol(publicAmbientFunctionWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 624, 5)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; >publicAmbientFunctionWithPublicParmeterTypes : Symbol(publicAmbientFunctionWithPublicParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 626, 90)) @@ -1373,7 +1373,7 @@ module privateModule { declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass; >privateAmbientFunctionWithPrivateParmeterTypes : Symbol(privateAmbientFunctionWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 627, 88)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 22)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 458, 25)) declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass; >privateAmbientFunctionWithPublicParmeterTypes : Symbol(privateAmbientFunctionWithPublicParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_externalModule.ts, 628, 84)) @@ -1619,22 +1619,22 @@ declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(): publicC >publicAmbientFunctionWithPublicParmeterTypesInGlobal : Symbol(publicAmbientFunctionWithPublicParmeterTypesInGlobal, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 39, 1)) >publicClassInGlobal : Symbol(publicClassInGlobal, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 0, 0)) -module publicModuleInGlobal { +namespace publicModuleInGlobal { >publicModuleInGlobal : Symbol(publicModuleInGlobal, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 40, 93)) class privateClass { ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) } export class publicClass { >publicClass : Symbol(publicClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 44, 5)) } - module privateModule { + namespace privateModule { >privateModule : Symbol(privateModule, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 47, 5)) class privateClass { ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) } export class publicClass { @@ -1645,18 +1645,18 @@ module publicModuleInGlobal { >publicInterfaceWithPrivateParmeterTypes : Symbol(publicInterfaceWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 54, 9)) new (): privateClass; ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) (): privateClass; ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) [x: number]: privateClass; >x : Symbol(x, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 59, 13)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) myMethod(): privateClass; >myMethod : Symbol(publicInterfaceWithPrivateParmeterTypes.myMethod, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 59, 38)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) } export interface publicInterfaceWithPublicParmeterTypes { @@ -1681,18 +1681,18 @@ module publicModuleInGlobal { >privateInterfaceWithPrivateParmeterTypes : Symbol(privateInterfaceWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 68, 9)) new (): privateClass; ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) (): privateClass; ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) [x: number]: privateClass; >x : Symbol(x, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 73, 13)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) myMethod(): privateClass; >myMethod : Symbol(privateInterfaceWithPrivateParmeterTypes.myMethod, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 73, 38)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) } interface privateInterfaceWithPublicParmeterTypes { @@ -1718,25 +1718,25 @@ module publicModuleInGlobal { static myPublicStaticMethod(): privateClass { >myPublicStaticMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 84, 62)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) return null; } private static myPrivateStaticMethod(): privateClass { >myPrivateStaticMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 87, 13)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) return null; } myPublicMethod(): privateClass { >myPublicMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicMethod, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 90, 13)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) return null; } private myPrivateMethod(): privateClass { >myPrivateMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateMethod, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 93, 13)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) return null; } @@ -1744,25 +1744,25 @@ module publicModuleInGlobal { >myPublicStaticMethod1 : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 96, 13)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) } private static myPrivateStaticMethod1() { >myPrivateStaticMethod1 : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 99, 13)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) } myPublicMethod1() { >myPublicMethod1 : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicMethod1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 102, 13)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) } private myPrivateMethod1() { >myPrivateMethod1 : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateMethod1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 105, 13)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) } } @@ -1824,25 +1824,25 @@ module publicModuleInGlobal { static myPublicStaticMethod(): privateClass { >myPublicStaticMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 138, 56)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) return null; } private static myPrivateStaticMethod(): privateClass { >myPrivateStaticMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 141, 13)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) return null; } myPublicMethod(): privateClass { >myPublicMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicMethod, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 144, 13)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) return null; } private myPrivateMethod(): privateClass { >myPrivateMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateMethod, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 147, 13)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) return null; } @@ -1850,25 +1850,25 @@ module publicModuleInGlobal { >myPublicStaticMethod1 : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 150, 13)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) } private static myPrivateStaticMethod1() { >myPrivateStaticMethod1 : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 153, 13)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) } myPublicMethod1() { >myPublicMethod1 : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicMethod1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 156, 13)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) } private myPrivateMethod1() { >myPrivateMethod1 : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateMethod1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 159, 13)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) } } @@ -1927,7 +1927,7 @@ module publicModuleInGlobal { export function publicFunctionWithPrivateParmeterTypes(): privateClass { >publicFunctionWithPrivateParmeterTypes : Symbol(publicFunctionWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 190, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) return null; } @@ -1939,7 +1939,7 @@ module publicModuleInGlobal { } function privateFunctionWithPrivateParmeterTypes(): privateClass { >privateFunctionWithPrivateParmeterTypes : Symbol(privateFunctionWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 197, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) return null; } @@ -1953,7 +1953,7 @@ module publicModuleInGlobal { >publicFunctionWithPrivateParmeterTypes1 : Symbol(publicFunctionWithPrivateParmeterTypes1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 203, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) } export function publicFunctionWithPublicParmeterTypes1() { >publicFunctionWithPublicParmeterTypes1 : Symbol(publicFunctionWithPublicParmeterTypes1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 206, 9)) @@ -1965,7 +1965,7 @@ module publicModuleInGlobal { >privateFunctionWithPrivateParmeterTypes1 : Symbol(privateFunctionWithPrivateParmeterTypes1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 209, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) } function privateFunctionWithPublicParmeterTypes1() { >privateFunctionWithPublicParmeterTypes1 : Symbol(privateFunctionWithPublicParmeterTypes1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 212, 9)) @@ -1976,7 +1976,7 @@ module publicModuleInGlobal { export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; >publicAmbientFunctionWithPrivateParmeterTypes : Symbol(publicAmbientFunctionWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 215, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; >publicAmbientFunctionWithPublicParmeterTypes : Symbol(publicAmbientFunctionWithPublicParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 217, 94)) @@ -1984,7 +1984,7 @@ module publicModuleInGlobal { declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass; >privateAmbientFunctionWithPrivateParmeterTypes : Symbol(privateAmbientFunctionWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 218, 92)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 26)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 49, 29)) declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass; >privateAmbientFunctionWithPublicParmeterTypes : Symbol(privateAmbientFunctionWithPublicParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 219, 88)) @@ -2145,18 +2145,18 @@ module publicModuleInGlobal { >publicInterfaceWithPrivateParmeterTypes : Symbol(publicInterfaceWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 277, 5)) new (): privateClass; // Error ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) (): privateClass; // Error ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) [x: number]: privateClass; // Error >x : Symbol(x, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 282, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) myMethod(): privateClass; // Error >myMethod : Symbol(publicInterfaceWithPrivateParmeterTypes.myMethod, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 282, 34)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) } export interface publicInterfaceWithPublicParmeterTypes { @@ -2181,18 +2181,18 @@ module publicModuleInGlobal { >privateInterfaceWithPrivateParmeterTypes : Symbol(privateInterfaceWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 291, 5)) new (): privateClass; ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) (): privateClass; ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) [x: number]: privateClass; >x : Symbol(x, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 296, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) myMethod(): privateClass; >myMethod : Symbol(privateInterfaceWithPrivateParmeterTypes.myMethod, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 296, 34)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) } interface privateInterfaceWithPublicParmeterTypes { @@ -2218,25 +2218,25 @@ module publicModuleInGlobal { static myPublicStaticMethod(): privateClass { // Error >myPublicStaticMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 307, 58)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) return null; } private static myPrivateStaticMethod(): privateClass { >myPrivateStaticMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 310, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) return null; } myPublicMethod(): privateClass { // Error >myPublicMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicMethod, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 313, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) return null; } private myPrivateMethod(): privateClass { >myPrivateMethod : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateMethod, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 316, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) return null; } @@ -2244,25 +2244,25 @@ module publicModuleInGlobal { >myPublicStaticMethod1 : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 319, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) } private static myPrivateStaticMethod1() { >myPrivateStaticMethod1 : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 322, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) } myPublicMethod1() { // Error >myPublicMethod1 : Symbol(publicClassWithWithPrivateParmeterTypes.myPublicMethod1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 325, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) } private myPrivateMethod1() { >myPrivateMethod1 : Symbol(publicClassWithWithPrivateParmeterTypes.myPrivateMethod1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 328, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) } } @@ -2324,25 +2324,25 @@ module publicModuleInGlobal { static myPublicStaticMethod(): privateClass { >myPublicStaticMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 361, 52)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) return null; } private static myPrivateStaticMethod(): privateClass { >myPrivateStaticMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 364, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) return null; } myPublicMethod(): privateClass { >myPublicMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicMethod, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 367, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) return null; } private myPrivateMethod(): privateClass { >myPrivateMethod : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateMethod, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 370, 9)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) return null; } @@ -2350,25 +2350,25 @@ module publicModuleInGlobal { >myPublicStaticMethod1 : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 373, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) } private static myPrivateStaticMethod1() { >myPrivateStaticMethod1 : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 376, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) } myPublicMethod1() { >myPublicMethod1 : Symbol(privateClassWithWithPrivateParmeterTypes.myPublicMethod1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 379, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) } private myPrivateMethod1() { >myPrivateMethod1 : Symbol(privateClassWithWithPrivateParmeterTypes.myPrivateMethod1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 382, 9)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) } } @@ -2427,7 +2427,7 @@ module publicModuleInGlobal { export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error >publicFunctionWithPrivateParmeterTypes : Symbol(publicFunctionWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 413, 5)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) return null; } @@ -2439,7 +2439,7 @@ module publicModuleInGlobal { } function privateFunctionWithPrivateParmeterTypes(): privateClass { >privateFunctionWithPrivateParmeterTypes : Symbol(privateFunctionWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 420, 5)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) return null; } @@ -2453,7 +2453,7 @@ module publicModuleInGlobal { >publicFunctionWithPrivateParmeterTypes1 : Symbol(publicFunctionWithPrivateParmeterTypes1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 426, 5)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) } export function publicFunctionWithPublicParmeterTypes1() { >publicFunctionWithPublicParmeterTypes1 : Symbol(publicFunctionWithPublicParmeterTypes1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 429, 5)) @@ -2465,7 +2465,7 @@ module publicModuleInGlobal { >privateFunctionWithPrivateParmeterTypes1 : Symbol(privateFunctionWithPrivateParmeterTypes1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 432, 5)) return new privateClass(); ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) } function privateFunctionWithPublicParmeterTypes1() { >privateFunctionWithPublicParmeterTypes1 : Symbol(privateFunctionWithPublicParmeterTypes1, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 435, 5)) @@ -2476,7 +2476,7 @@ module publicModuleInGlobal { export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error >publicAmbientFunctionWithPrivateParmeterTypes : Symbol(publicAmbientFunctionWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 438, 5)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; >publicAmbientFunctionWithPublicParmeterTypes : Symbol(publicAmbientFunctionWithPublicParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 440, 90)) @@ -2484,7 +2484,7 @@ module publicModuleInGlobal { declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass; >privateAmbientFunctionWithPrivateParmeterTypes : Symbol(privateAmbientFunctionWithPrivateParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 441, 88)) ->privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 29)) +>privateClass : Symbol(privateClass, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 42, 32)) declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass; >privateAmbientFunctionWithPublicParmeterTypes : Symbol(privateAmbientFunctionWithPublicParmeterTypes, Decl(privacyFunctionReturnTypeDeclFile_GlobalFile.ts, 442, 84)) diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.types b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.types index 0ec7b5788321d..d14d5a8081177 100644 --- a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.types +++ b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.types @@ -616,7 +616,7 @@ declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privat >privateModule : any > : ^^^ -export module publicModule { +export namespace publicModule { >publicModule : typeof publicModule > : ^^^^^^^^^^^^^^^^^^^ @@ -1236,7 +1236,7 @@ export module publicModule { > : ^^^ } -module privateModule { +namespace privateModule { >privateModule : typeof privateModule > : ^^^^^^^^^^^^^^^^^^^^ @@ -1961,7 +1961,7 @@ declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(): publicC >publicAmbientFunctionWithPublicParmeterTypesInGlobal : () => publicClassInGlobal > : ^^^^^^ -module publicModuleInGlobal { +namespace publicModuleInGlobal { >publicModuleInGlobal : typeof publicModuleInGlobal > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1975,7 +1975,7 @@ module publicModuleInGlobal { > : ^^^^^^^^^^^ } - module privateModule { + namespace privateModule { >privateModule : typeof privateModule > : ^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/privacyGetter.js b/tests/baselines/reference/privacyGetter.js index 28ceb8102fe8d..4f83286e8f0d7 100644 --- a/tests/baselines/reference/privacyGetter.js +++ b/tests/baselines/reference/privacyGetter.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyGetter.ts] //// //// [privacyGetter.ts] -export module m1 { +export namespace m1 { export class C1_public { private f1() { } @@ -71,7 +71,7 @@ export module m1 { } } -module m2 { +namespace m2 { export class m2_C1_public { private f1() { } diff --git a/tests/baselines/reference/privacyGetter.symbols b/tests/baselines/reference/privacyGetter.symbols index 9b7ebfa126307..b66717922bf1e 100644 --- a/tests/baselines/reference/privacyGetter.symbols +++ b/tests/baselines/reference/privacyGetter.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/privacyGetter.ts] //// === privacyGetter.ts === -export module m1 { +export namespace m1 { >m1 : Symbol(m1, Decl(privacyGetter.ts, 0, 0)) export class C1_public { ->C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 21)) private f1() { >f1 : Symbol(C1_public.f1, Decl(privacyGetter.ts, 1, 28)) @@ -23,26 +23,26 @@ export module m1 { >p1_private : Symbol(C3_public.p1_private, Decl(privacyGetter.ts, 9, 28), Decl(privacyGetter.ts, 12, 9)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 21)) } private set p1_private(m1_c3_p1_arg: C1_public) { >p1_private : Symbol(C3_public.p1_private, Decl(privacyGetter.ts, 9, 28), Decl(privacyGetter.ts, 12, 9)) >m1_c3_p1_arg : Symbol(m1_c3_p1_arg, Decl(privacyGetter.ts, 14, 31)) ->C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 21)) } private get p2_private() { >p2_private : Symbol(C3_public.p2_private, Decl(privacyGetter.ts, 15, 9), Decl(privacyGetter.ts, 19, 9)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 21)) } private set p2_private(m1_c3_p2_arg: C1_public) { >p2_private : Symbol(C3_public.p2_private, Decl(privacyGetter.ts, 15, 9), Decl(privacyGetter.ts, 19, 9)) >m1_c3_p2_arg : Symbol(m1_c3_p2_arg, Decl(privacyGetter.ts, 21, 31)) ->C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 21)) } private get p3_private() { @@ -80,26 +80,26 @@ export module m1 { >p1_private : Symbol(C4_private.p1_private, Decl(privacyGetter.ts, 39, 22), Decl(privacyGetter.ts, 42, 9)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 21)) } private set p1_private(m1_c3_p1_arg: C1_public) { >p1_private : Symbol(C4_private.p1_private, Decl(privacyGetter.ts, 39, 22), Decl(privacyGetter.ts, 42, 9)) >m1_c3_p1_arg : Symbol(m1_c3_p1_arg, Decl(privacyGetter.ts, 44, 31)) ->C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 21)) } private get p2_private() { >p2_private : Symbol(C4_private.p2_private, Decl(privacyGetter.ts, 45, 9), Decl(privacyGetter.ts, 49, 9)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 21)) } private set p2_private(m1_c3_p2_arg: C1_public) { >p2_private : Symbol(C4_private.p2_private, Decl(privacyGetter.ts, 45, 9), Decl(privacyGetter.ts, 49, 9)) >m1_c3_p2_arg : Symbol(m1_c3_p2_arg, Decl(privacyGetter.ts, 51, 31)) ->C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 21)) } private get p3_private() { @@ -131,11 +131,11 @@ export module m1 { } } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(privacyGetter.ts, 68, 1)) export class m2_C1_public { ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 14)) private f1() { >f1 : Symbol(m2_C1_public.f1, Decl(privacyGetter.ts, 71, 31)) @@ -153,26 +153,26 @@ module m2 { >p1_private : Symbol(m2_C3_public.p1_private, Decl(privacyGetter.ts, 79, 31), Decl(privacyGetter.ts, 82, 9)) return new m2_C1_public(); ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 14)) } private set p1_private(m2_c3_p1_arg: m2_C1_public) { >p1_private : Symbol(m2_C3_public.p1_private, Decl(privacyGetter.ts, 79, 31), Decl(privacyGetter.ts, 82, 9)) >m2_c3_p1_arg : Symbol(m2_c3_p1_arg, Decl(privacyGetter.ts, 84, 31)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 14)) } private get p2_private() { >p2_private : Symbol(m2_C3_public.p2_private, Decl(privacyGetter.ts, 85, 9), Decl(privacyGetter.ts, 89, 9)) return new m2_C1_public(); ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 14)) } private set p2_private(m2_c3_p2_arg: m2_C1_public) { >p2_private : Symbol(m2_C3_public.p2_private, Decl(privacyGetter.ts, 85, 9), Decl(privacyGetter.ts, 89, 9)) >m2_c3_p2_arg : Symbol(m2_c3_p2_arg, Decl(privacyGetter.ts, 91, 31)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 14)) } private get p3_private() { @@ -210,26 +210,26 @@ module m2 { >p1_private : Symbol(m2_C4_private.p1_private, Decl(privacyGetter.ts, 109, 25), Decl(privacyGetter.ts, 112, 9)) return new m2_C1_public(); ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 14)) } private set p1_private(m2_c3_p1_arg: m2_C1_public) { >p1_private : Symbol(m2_C4_private.p1_private, Decl(privacyGetter.ts, 109, 25), Decl(privacyGetter.ts, 112, 9)) >m2_c3_p1_arg : Symbol(m2_c3_p1_arg, Decl(privacyGetter.ts, 114, 31)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 14)) } private get p2_private() { >p2_private : Symbol(m2_C4_private.p2_private, Decl(privacyGetter.ts, 115, 9), Decl(privacyGetter.ts, 119, 9)) return new m2_C1_public(); ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 14)) } private set p2_private(m2_c3_p2_arg: m2_C1_public) { >p2_private : Symbol(m2_C4_private.p2_private, Decl(privacyGetter.ts, 115, 9), Decl(privacyGetter.ts, 119, 9)) >m2_c3_p2_arg : Symbol(m2_c3_p2_arg, Decl(privacyGetter.ts, 121, 31)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 14)) } private get p3_private() { diff --git a/tests/baselines/reference/privacyGetter.types b/tests/baselines/reference/privacyGetter.types index 3467248a3bf4c..65e21f1a005ce 100644 --- a/tests/baselines/reference/privacyGetter.types +++ b/tests/baselines/reference/privacyGetter.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyGetter.ts] //// === privacyGetter.ts === -export module m1 { +export namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -175,7 +175,7 @@ export module m1 { } } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/privacyGloClass.js b/tests/baselines/reference/privacyGloClass.js index 6ceaafcedc596..82540b591843a 100644 --- a/tests/baselines/reference/privacyGloClass.js +++ b/tests/baselines/reference/privacyGloClass.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyGloClass.ts] //// //// [privacyGloClass.ts] -module m1 { +namespace m1 { export interface m1_i_public { } diff --git a/tests/baselines/reference/privacyGloClass.symbols b/tests/baselines/reference/privacyGloClass.symbols index 8cf7adae66b47..f9c2f9ceb103e 100644 --- a/tests/baselines/reference/privacyGloClass.symbols +++ b/tests/baselines/reference/privacyGloClass.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/privacyGloClass.ts] //// === privacyGloClass.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(privacyGloClass.ts, 0, 0)) export interface m1_i_public { ->m1_i_public : Symbol(m1_i_public, Decl(privacyGloClass.ts, 0, 11)) +>m1_i_public : Symbol(m1_i_public, Decl(privacyGloClass.ts, 0, 14)) } interface m1_i_private { @@ -43,7 +43,7 @@ module m1 { class m1_C5_private implements m1_i_public { >m1_C5_private : Symbol(m1_C5_private, Decl(privacyGloClass.ts, 22, 5)) ->m1_i_public : Symbol(m1_i_public, Decl(privacyGloClass.ts, 0, 11)) +>m1_i_public : Symbol(m1_i_public, Decl(privacyGloClass.ts, 0, 14)) } class m1_C6_private implements m1_i_private { >m1_C6_private : Symbol(m1_C6_private, Decl(privacyGloClass.ts, 25, 5)) @@ -51,7 +51,7 @@ module m1 { } export class m1_C7_public implements m1_i_public { >m1_C7_public : Symbol(m1_C7_public, Decl(privacyGloClass.ts, 27, 5)) ->m1_i_public : Symbol(m1_i_public, Decl(privacyGloClass.ts, 0, 11)) +>m1_i_public : Symbol(m1_i_public, Decl(privacyGloClass.ts, 0, 14)) } export class m1_C8_public implements m1_i_private { >m1_C8_public : Symbol(m1_C8_public, Decl(privacyGloClass.ts, 29, 5)) @@ -62,25 +62,25 @@ module m1 { >m1_C9_private : Symbol(m1_C9_private, Decl(privacyGloClass.ts, 31, 5)) >m1_c_public : Symbol(m1_c_public, Decl(privacyGloClass.ts, 5, 5)) >m1_i_private : Symbol(m1_i_private, Decl(privacyGloClass.ts, 2, 5)) ->m1_i_public : Symbol(m1_i_public, Decl(privacyGloClass.ts, 0, 11)) +>m1_i_public : Symbol(m1_i_public, Decl(privacyGloClass.ts, 0, 14)) } class m1_C10_private extends m1_c_private implements m1_i_private, m1_i_public { >m1_C10_private : Symbol(m1_C10_private, Decl(privacyGloClass.ts, 34, 5)) >m1_c_private : Symbol(m1_c_private, Decl(privacyGloClass.ts, 10, 5)) >m1_i_private : Symbol(m1_i_private, Decl(privacyGloClass.ts, 2, 5)) ->m1_i_public : Symbol(m1_i_public, Decl(privacyGloClass.ts, 0, 11)) +>m1_i_public : Symbol(m1_i_public, Decl(privacyGloClass.ts, 0, 14)) } export class m1_C11_public extends m1_c_public implements m1_i_private, m1_i_public { >m1_C11_public : Symbol(m1_C11_public, Decl(privacyGloClass.ts, 36, 5)) >m1_c_public : Symbol(m1_c_public, Decl(privacyGloClass.ts, 5, 5)) >m1_i_private : Symbol(m1_i_private, Decl(privacyGloClass.ts, 2, 5)) ->m1_i_public : Symbol(m1_i_public, Decl(privacyGloClass.ts, 0, 11)) +>m1_i_public : Symbol(m1_i_public, Decl(privacyGloClass.ts, 0, 14)) } export class m1_C12_public extends m1_c_private implements m1_i_private, m1_i_public { >m1_C12_public : Symbol(m1_C12_public, Decl(privacyGloClass.ts, 38, 5)) >m1_c_private : Symbol(m1_c_private, Decl(privacyGloClass.ts, 10, 5)) >m1_i_private : Symbol(m1_i_private, Decl(privacyGloClass.ts, 2, 5)) ->m1_i_public : Symbol(m1_i_public, Decl(privacyGloClass.ts, 0, 11)) +>m1_i_public : Symbol(m1_i_public, Decl(privacyGloClass.ts, 0, 14)) } } diff --git a/tests/baselines/reference/privacyGloClass.types b/tests/baselines/reference/privacyGloClass.types index 9a8a993c955cd..1ce7543cb37c9 100644 --- a/tests/baselines/reference/privacyGloClass.types +++ b/tests/baselines/reference/privacyGloClass.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyGloClass.ts] //// === privacyGloClass.ts === -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/privacyGloFunc.js b/tests/baselines/reference/privacyGloFunc.js index 7aa2a8e0cd243..509db41d54e25 100644 --- a/tests/baselines/reference/privacyGloFunc.js +++ b/tests/baselines/reference/privacyGloFunc.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyGloFunc.ts] //// //// [privacyGloFunc.ts] -export module m1 { +export namespace m1 { export class C1_public { private f1() { } @@ -179,7 +179,7 @@ export module m1 { } } -module m2 { +namespace m2 { export class m2_C1_public { private f() { } diff --git a/tests/baselines/reference/privacyGloFunc.symbols b/tests/baselines/reference/privacyGloFunc.symbols index 1f54a317b6737..ee72df3d5066a 100644 --- a/tests/baselines/reference/privacyGloFunc.symbols +++ b/tests/baselines/reference/privacyGloFunc.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/privacyGloFunc.ts] //// === privacyGloFunc.ts === -export module m1 { +export namespace m1 { >m1 : Symbol(m1, Decl(privacyGloFunc.ts, 0, 0)) export class C1_public { ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) private f1() { >f1 : Symbol(C1_public.f1, Decl(privacyGloFunc.ts, 1, 28)) @@ -21,7 +21,7 @@ export module m1 { constructor (m1_c3_c1: C1_public); >m1_c3_c1 : Symbol(m1_c3_c1, Decl(privacyGloFunc.ts, 10, 21)) ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) constructor (m1_c3_c2: C2_private); //error >m1_c3_c2 : Symbol(m1_c3_c2, Decl(privacyGloFunc.ts, 11, 21)) @@ -34,13 +34,13 @@ export module m1 { private f1_private(m1_c3_f1_arg: C1_public) { >f1_private : Symbol(C3_public.f1_private, Decl(privacyGloFunc.ts, 13, 9)) >m1_c3_f1_arg : Symbol(m1_c3_f1_arg, Decl(privacyGloFunc.ts, 15, 27)) ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) } public f2_public(m1_c3_f2_arg: C1_public) { >f2_public : Symbol(C3_public.f2_public, Decl(privacyGloFunc.ts, 16, 9)) >m1_c3_f2_arg : Symbol(m1_c3_f2_arg, Decl(privacyGloFunc.ts, 18, 25)) ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) } private f3_private(m1_c3_f3_arg: C2_private) { @@ -59,14 +59,14 @@ export module m1 { >f5_private : Symbol(C3_public.f5_private, Decl(privacyGloFunc.ts, 25, 9)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) } public f6_public() { >f6_public : Symbol(C3_public.f6_public, Decl(privacyGloFunc.ts, 29, 9)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) } private f7_private() { @@ -85,18 +85,18 @@ export module m1 { private f9_private(): C1_public { >f9_private : Symbol(C3_public.f9_private, Decl(privacyGloFunc.ts, 41, 9)) ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) } public f10_public(): C1_public { >f10_public : Symbol(C3_public.f10_public, Decl(privacyGloFunc.ts, 45, 9)) ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) } private f11_private(): C2_private { @@ -121,7 +121,7 @@ export module m1 { constructor (m1_c4_c1: C1_public); >m1_c4_c1 : Symbol(m1_c4_c1, Decl(privacyGloFunc.ts, 61, 21)) ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) constructor (m1_c4_c2: C2_private); >m1_c4_c2 : Symbol(m1_c4_c2, Decl(privacyGloFunc.ts, 62, 21)) @@ -133,13 +133,13 @@ export module m1 { private f1_private(m1_c4_f1_arg: C1_public) { >f1_private : Symbol(C4_private.f1_private, Decl(privacyGloFunc.ts, 64, 9)) >m1_c4_f1_arg : Symbol(m1_c4_f1_arg, Decl(privacyGloFunc.ts, 65, 27)) ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) } public f2_public(m1_c4_f2_arg: C1_public) { >f2_public : Symbol(C4_private.f2_public, Decl(privacyGloFunc.ts, 66, 9)) >m1_c4_f2_arg : Symbol(m1_c4_f2_arg, Decl(privacyGloFunc.ts, 68, 25)) ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) } private f3_private(m1_c4_f3_arg: C2_private) { @@ -159,14 +159,14 @@ export module m1 { >f5_private : Symbol(C4_private.f5_private, Decl(privacyGloFunc.ts, 75, 9)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) } public f6_public() { >f6_public : Symbol(C4_private.f6_public, Decl(privacyGloFunc.ts, 80, 9)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) } private f7_private() { @@ -186,18 +186,18 @@ export module m1 { private f9_private(): C1_public { >f9_private : Symbol(C4_private.f9_private, Decl(privacyGloFunc.ts, 92, 9)) ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) } public f10_public(): C1_public { >f10_public : Symbol(C4_private.f10_public, Decl(privacyGloFunc.ts, 97, 9)) ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) } private f11_private(): C2_private { @@ -222,7 +222,7 @@ export module m1 { constructor (m1_c5_c: C1_public) { >m1_c5_c : Symbol(m1_c5_c, Decl(privacyGloFunc.ts, 113, 21)) ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) } } @@ -231,7 +231,7 @@ export module m1 { constructor (m1_c6_c: C1_public) { >m1_c6_c : Symbol(m1_c6_c, Decl(privacyGloFunc.ts, 118, 21)) ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) } } export class C7_public { @@ -255,13 +255,13 @@ export module m1 { function f1_public(m1_f1_arg: C1_public) { >f1_public : Symbol(f1_public, Decl(privacyGloFunc.ts, 129, 5)) >m1_f1_arg : Symbol(m1_f1_arg, Decl(privacyGloFunc.ts, 131, 23)) ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) } export function f2_public(m1_f2_arg: C1_public) { >f2_public : Symbol(f2_public, Decl(privacyGloFunc.ts, 132, 5)) >m1_f2_arg : Symbol(m1_f2_arg, Decl(privacyGloFunc.ts, 134, 30)) ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) } function f3_public(m1_f3_arg: C2_private) { @@ -281,14 +281,14 @@ export module m1 { >f5_public : Symbol(f5_public, Decl(privacyGloFunc.ts, 141, 5)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) } export function f6_public() { >f6_public : Symbol(f6_public, Decl(privacyGloFunc.ts, 146, 5)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) } function f7_public() { @@ -308,18 +308,18 @@ export module m1 { function f9_private(): C1_public { >f9_private : Symbol(f9_private, Decl(privacyGloFunc.ts, 158, 5)) ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) } export function f10_public(): C1_public { >f10_public : Symbol(f10_public, Decl(privacyGloFunc.ts, 163, 5)) ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 21)) } function f11_private(): C2_private { @@ -339,11 +339,11 @@ export module m1 { } } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(privacyGloFunc.ts, 176, 1)) export class m2_C1_public { ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) private f() { >f : Symbol(m2_C1_public.f, Decl(privacyGloFunc.ts, 179, 31)) @@ -359,7 +359,7 @@ module m2 { constructor (m2_c3_c1: m2_C1_public); >m2_c3_c1 : Symbol(m2_c3_c1, Decl(privacyGloFunc.ts, 188, 21)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) constructor (m2_c3_c2: m2_C2_private); >m2_c3_c2 : Symbol(m2_c3_c2, Decl(privacyGloFunc.ts, 189, 21)) @@ -372,13 +372,13 @@ module m2 { private f1_private(m2_c3_f1_arg: m2_C1_public) { >f1_private : Symbol(m2_C3_public.f1_private, Decl(privacyGloFunc.ts, 191, 9)) >m2_c3_f1_arg : Symbol(m2_c3_f1_arg, Decl(privacyGloFunc.ts, 193, 27)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) } public f2_public(m2_c3_f2_arg: m2_C1_public) { >f2_public : Symbol(m2_C3_public.f2_public, Decl(privacyGloFunc.ts, 194, 9)) >m2_c3_f2_arg : Symbol(m2_c3_f2_arg, Decl(privacyGloFunc.ts, 196, 25)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) } private f3_private(m2_c3_f3_arg: m2_C2_private) { @@ -397,14 +397,14 @@ module m2 { >f5_private : Symbol(m2_C3_public.f5_private, Decl(privacyGloFunc.ts, 203, 9)) return new m2_C1_public(); ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) } public f6_public() { >f6_public : Symbol(m2_C3_public.f6_public, Decl(privacyGloFunc.ts, 207, 9)) return new m2_C1_public(); ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) } private f7_private() { @@ -423,18 +423,18 @@ module m2 { private f9_private(): m2_C1_public { >f9_private : Symbol(m2_C3_public.f9_private, Decl(privacyGloFunc.ts, 219, 9)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) return new m2_C1_public(); ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) } public f10_public(): m2_C1_public { >f10_public : Symbol(m2_C3_public.f10_public, Decl(privacyGloFunc.ts, 223, 9)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) return new m2_C1_public(); ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) } private f11_private(): m2_C2_private { @@ -459,7 +459,7 @@ module m2 { constructor (m2_c4_c1: m2_C1_public); >m2_c4_c1 : Symbol(m2_c4_c1, Decl(privacyGloFunc.ts, 239, 21)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) constructor (m2_c4_c2: m2_C2_private); >m2_c4_c2 : Symbol(m2_c4_c2, Decl(privacyGloFunc.ts, 240, 21)) @@ -472,13 +472,13 @@ module m2 { private f1_private(m2_c4_f1_arg: m2_C1_public) { >f1_private : Symbol(m2_C4_private.f1_private, Decl(privacyGloFunc.ts, 242, 9)) >m2_c4_f1_arg : Symbol(m2_c4_f1_arg, Decl(privacyGloFunc.ts, 244, 27)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) } public f2_public(m2_c4_f2_arg: m2_C1_public) { >f2_public : Symbol(m2_C4_private.f2_public, Decl(privacyGloFunc.ts, 245, 9)) >m2_c4_f2_arg : Symbol(m2_c4_f2_arg, Decl(privacyGloFunc.ts, 247, 25)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) } private f3_private(m2_c4_f3_arg: m2_C2_private) { @@ -498,14 +498,14 @@ module m2 { >f5_private : Symbol(m2_C4_private.f5_private, Decl(privacyGloFunc.ts, 254, 9)) return new m2_C1_public(); ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) } public f6_public() { >f6_public : Symbol(m2_C4_private.f6_public, Decl(privacyGloFunc.ts, 259, 9)) return new m2_C1_public(); ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) } private f7_private() { @@ -525,18 +525,18 @@ module m2 { private f9_private(): m2_C1_public { >f9_private : Symbol(m2_C4_private.f9_private, Decl(privacyGloFunc.ts, 271, 9)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) return new m2_C1_public(); ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) } public f10_public(): m2_C1_public { >f10_public : Symbol(m2_C4_private.f10_public, Decl(privacyGloFunc.ts, 276, 9)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) return new m2_C1_public(); ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) } private f11_private(): m2_C2_private { @@ -561,7 +561,7 @@ module m2 { constructor (m2_c5_c: m2_C1_public) { >m2_c5_c : Symbol(m2_c5_c, Decl(privacyGloFunc.ts, 292, 21)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) } } @@ -570,7 +570,7 @@ module m2 { constructor (m2_c6_c: m2_C1_public) { >m2_c6_c : Symbol(m2_c6_c, Decl(privacyGloFunc.ts, 297, 21)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) } } export class m2_C7_public { @@ -594,13 +594,13 @@ module m2 { function f1_public(m2_f1_arg: m2_C1_public) { >f1_public : Symbol(f1_public, Decl(privacyGloFunc.ts, 308, 5)) >m2_f1_arg : Symbol(m2_f1_arg, Decl(privacyGloFunc.ts, 310, 23)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) } export function f2_public(m2_f2_arg: m2_C1_public) { >f2_public : Symbol(f2_public, Decl(privacyGloFunc.ts, 311, 5)) >m2_f2_arg : Symbol(m2_f2_arg, Decl(privacyGloFunc.ts, 313, 30)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) } function f3_public(m2_f3_arg: m2_C2_private) { @@ -620,14 +620,14 @@ module m2 { >f5_public : Symbol(f5_public, Decl(privacyGloFunc.ts, 320, 5)) return new m2_C1_public(); ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) } export function f6_public() { >f6_public : Symbol(f6_public, Decl(privacyGloFunc.ts, 325, 5)) return new m2_C1_public(); ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) } function f7_public() { @@ -647,18 +647,18 @@ module m2 { function f9_private(): m2_C1_public { >f9_private : Symbol(f9_private, Decl(privacyGloFunc.ts, 337, 5)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) return new m2_C1_public(); ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) } export function f10_public(): m2_C1_public { >f10_public : Symbol(f10_public, Decl(privacyGloFunc.ts, 342, 5)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) return new m2_C1_public(); ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 14)) } function f11_private(): m2_C2_private { diff --git a/tests/baselines/reference/privacyGloFunc.types b/tests/baselines/reference/privacyGloFunc.types index 46a8ca6c38256..b014aa9696281 100644 --- a/tests/baselines/reference/privacyGloFunc.types +++ b/tests/baselines/reference/privacyGloFunc.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyGloFunc.ts] //// === privacyGloFunc.ts === -export module m1 { +export namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -445,7 +445,7 @@ export module m1 { } } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/privacyGloGetter.js b/tests/baselines/reference/privacyGloGetter.js index 5561e174ce87a..96125ec8a4be0 100644 --- a/tests/baselines/reference/privacyGloGetter.js +++ b/tests/baselines/reference/privacyGloGetter.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyGloGetter.ts] //// //// [privacyGloGetter.ts] -module m1 { +namespace m1 { export class C1_public { private f1() { } diff --git a/tests/baselines/reference/privacyGloGetter.symbols b/tests/baselines/reference/privacyGloGetter.symbols index d8ea76adbc7ff..5a668e00256e1 100644 --- a/tests/baselines/reference/privacyGloGetter.symbols +++ b/tests/baselines/reference/privacyGloGetter.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/privacyGloGetter.ts] //// === privacyGloGetter.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(privacyGloGetter.ts, 0, 0)) export class C1_public { ->C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 14)) private f1() { >f1 : Symbol(C1_public.f1, Decl(privacyGloGetter.ts, 1, 28)) @@ -23,26 +23,26 @@ module m1 { >p1_private : Symbol(C3_public.p1_private, Decl(privacyGloGetter.ts, 9, 28), Decl(privacyGloGetter.ts, 12, 9)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 14)) } private set p1_private(m1_c3_p1_arg: C1_public) { >p1_private : Symbol(C3_public.p1_private, Decl(privacyGloGetter.ts, 9, 28), Decl(privacyGloGetter.ts, 12, 9)) >m1_c3_p1_arg : Symbol(m1_c3_p1_arg, Decl(privacyGloGetter.ts, 14, 31)) ->C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 14)) } private get p2_private() { >p2_private : Symbol(C3_public.p2_private, Decl(privacyGloGetter.ts, 15, 9), Decl(privacyGloGetter.ts, 19, 9)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 14)) } private set p2_private(m1_c3_p2_arg: C1_public) { >p2_private : Symbol(C3_public.p2_private, Decl(privacyGloGetter.ts, 15, 9), Decl(privacyGloGetter.ts, 19, 9)) >m1_c3_p2_arg : Symbol(m1_c3_p2_arg, Decl(privacyGloGetter.ts, 21, 31)) ->C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 14)) } private get p3_private() { @@ -80,26 +80,26 @@ module m1 { >p1_private : Symbol(C4_private.p1_private, Decl(privacyGloGetter.ts, 39, 22), Decl(privacyGloGetter.ts, 42, 9)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 14)) } private set p1_private(m1_c3_p1_arg: C1_public) { >p1_private : Symbol(C4_private.p1_private, Decl(privacyGloGetter.ts, 39, 22), Decl(privacyGloGetter.ts, 42, 9)) >m1_c3_p1_arg : Symbol(m1_c3_p1_arg, Decl(privacyGloGetter.ts, 44, 31)) ->C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 14)) } private get p2_private() { >p2_private : Symbol(C4_private.p2_private, Decl(privacyGloGetter.ts, 45, 9), Decl(privacyGloGetter.ts, 49, 9)) return new C1_public(); ->C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 14)) } private set p2_private(m1_c3_p2_arg: C1_public) { >p2_private : Symbol(C4_private.p2_private, Decl(privacyGloGetter.ts, 45, 9), Decl(privacyGloGetter.ts, 49, 9)) >m1_c3_p2_arg : Symbol(m1_c3_p2_arg, Decl(privacyGloGetter.ts, 51, 31)) ->C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 14)) } private get p3_private() { diff --git a/tests/baselines/reference/privacyGloGetter.types b/tests/baselines/reference/privacyGloGetter.types index 3fac4d930f154..1ddcabd7be5c5 100644 --- a/tests/baselines/reference/privacyGloGetter.types +++ b/tests/baselines/reference/privacyGloGetter.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyGloGetter.ts] //// === privacyGloGetter.ts === -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/privacyGloImport.js b/tests/baselines/reference/privacyGloImport.js index d99ccda06e2c3..41b462e7b6091 100644 --- a/tests/baselines/reference/privacyGloImport.js +++ b/tests/baselines/reference/privacyGloImport.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/privacyGloImport.ts] //// //// [privacyGloImport.ts] -module m1 { - export module m1_M1_public { +namespace m1 { + export namespace m1_M1_public { export class c1 { } export function f1() { @@ -12,7 +12,7 @@ module m1 { export var v2: c1; } - module m1_M2_private { + namespace m1_M2_private { export class c1 { } export function f1() { @@ -85,7 +85,7 @@ module m1 { //export import m1_im4_public = require("m1_M4_private"); } -module glo_M1_public { +namespace glo_M1_public { export class c1 { } export function f1() { @@ -120,11 +120,11 @@ declare module "use_glo_M1_public" { var use_glo_M2_public_v2_private: typeof use_glo_M2_public; var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1; - module m2 { + namespace m2 { //import errorImport = require("glo_M2_public"); import nonerrorImport = glo_M1_public; - module m5 { + namespace m5 { //import m5_errorImport = require("glo_M2_public"); import m5_nonerrorImport = glo_M1_public; } @@ -132,12 +132,12 @@ declare module "use_glo_M1_public" { } declare module "anotherParseError" { - module m2 { + namespace m2 { //declare module "abc" { //} } - module m2 { + namespace m2 { //module "abc2" { //} } @@ -145,9 +145,9 @@ declare module "anotherParseError" { //} } -module m2 { +namespace m2 { //import m3 = require("use_glo_M1_public"); - module m4 { + namespace m4 { var a = 10; //import m2 = require("use_glo_M1_public"); } diff --git a/tests/baselines/reference/privacyGloImport.symbols b/tests/baselines/reference/privacyGloImport.symbols index acb71de01a9a1..891b1f8033c8e 100644 --- a/tests/baselines/reference/privacyGloImport.symbols +++ b/tests/baselines/reference/privacyGloImport.symbols @@ -1,49 +1,49 @@ //// [tests/cases/compiler/privacyGloImport.ts] //// === privacyGloImport.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(privacyGloImport.ts, 0, 0)) - export module m1_M1_public { ->m1_M1_public : Symbol(m1_M1_public, Decl(privacyGloImport.ts, 0, 11)) + export namespace m1_M1_public { +>m1_M1_public : Symbol(m1_M1_public, Decl(privacyGloImport.ts, 0, 14)) export class c1 { ->c1 : Symbol(c1, Decl(privacyGloImport.ts, 1, 32)) +>c1 : Symbol(c1, Decl(privacyGloImport.ts, 1, 35)) } export function f1() { >f1 : Symbol(f1, Decl(privacyGloImport.ts, 3, 9)) return new c1; ->c1 : Symbol(c1, Decl(privacyGloImport.ts, 1, 32)) +>c1 : Symbol(c1, Decl(privacyGloImport.ts, 1, 35)) } export var v1 = c1; >v1 : Symbol(v1, Decl(privacyGloImport.ts, 7, 18)) ->c1 : Symbol(c1, Decl(privacyGloImport.ts, 1, 32)) +>c1 : Symbol(c1, Decl(privacyGloImport.ts, 1, 35)) export var v2: c1; >v2 : Symbol(v2, Decl(privacyGloImport.ts, 8, 18)) ->c1 : Symbol(c1, Decl(privacyGloImport.ts, 1, 32)) +>c1 : Symbol(c1, Decl(privacyGloImport.ts, 1, 35)) } - module m1_M2_private { + namespace m1_M2_private { >m1_M2_private : Symbol(m1_M2_private, Decl(privacyGloImport.ts, 9, 5)) export class c1 { ->c1 : Symbol(c1, Decl(privacyGloImport.ts, 11, 26)) +>c1 : Symbol(c1, Decl(privacyGloImport.ts, 11, 29)) } export function f1() { >f1 : Symbol(f1, Decl(privacyGloImport.ts, 13, 9)) return new c1; ->c1 : Symbol(c1, Decl(privacyGloImport.ts, 11, 26)) +>c1 : Symbol(c1, Decl(privacyGloImport.ts, 11, 29)) } export var v1 = c1; >v1 : Symbol(v1, Decl(privacyGloImport.ts, 17, 18)) ->c1 : Symbol(c1, Decl(privacyGloImport.ts, 11, 26)) +>c1 : Symbol(c1, Decl(privacyGloImport.ts, 11, 29)) export var v2: c1; >v2 : Symbol(v2, Decl(privacyGloImport.ts, 18, 18)) ->c1 : Symbol(c1, Decl(privacyGloImport.ts, 11, 26)) +>c1 : Symbol(c1, Decl(privacyGloImport.ts, 11, 29)) } //export declare module "m1_M3_public" { @@ -64,19 +64,19 @@ module m1 { import m1_im1_private = m1_M1_public; >m1_im1_private : Symbol(m1_im1_private, Decl(privacyGloImport.ts, 19, 5)) ->m1_M1_public : Symbol(m1_M1_public, Decl(privacyGloImport.ts, 0, 11)) +>m1_M1_public : Symbol(m1_M1_public, Decl(privacyGloImport.ts, 0, 14)) export var m1_im1_private_v1_public = m1_im1_private.c1; >m1_im1_private_v1_public : Symbol(m1_im1_private_v1_public, Decl(privacyGloImport.ts, 38, 14)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImport.ts, 1, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImport.ts, 1, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyGloImport.ts, 19, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImport.ts, 1, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImport.ts, 1, 35)) export var m1_im1_private_v2_public = new m1_im1_private.c1(); >m1_im1_private_v2_public : Symbol(m1_im1_private_v2_public, Decl(privacyGloImport.ts, 39, 14)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImport.ts, 1, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImport.ts, 1, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyGloImport.ts, 19, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImport.ts, 1, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImport.ts, 1, 35)) export var m1_im1_private_v3_public = m1_im1_private.f1; >m1_im1_private_v3_public : Symbol(m1_im1_private_v3_public, Decl(privacyGloImport.ts, 40, 14)) @@ -92,15 +92,15 @@ module m1 { var m1_im1_private_v1_private = m1_im1_private.c1; >m1_im1_private_v1_private : Symbol(m1_im1_private_v1_private, Decl(privacyGloImport.ts, 42, 7)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImport.ts, 1, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImport.ts, 1, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyGloImport.ts, 19, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImport.ts, 1, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImport.ts, 1, 35)) var m1_im1_private_v2_private = new m1_im1_private.c1(); >m1_im1_private_v2_private : Symbol(m1_im1_private_v2_private, Decl(privacyGloImport.ts, 43, 7)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImport.ts, 1, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImport.ts, 1, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyGloImport.ts, 19, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImport.ts, 1, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImport.ts, 1, 35)) var m1_im1_private_v3_private = m1_im1_private.f1; >m1_im1_private_v3_private : Symbol(m1_im1_private_v3_private, Decl(privacyGloImport.ts, 44, 7)) @@ -121,15 +121,15 @@ module m1 { export var m1_im2_private_v1_public = m1_im2_private.c1; >m1_im2_private_v1_public : Symbol(m1_im2_private_v1_public, Decl(privacyGloImport.ts, 49, 14)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImport.ts, 11, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImport.ts, 11, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyGloImport.ts, 45, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImport.ts, 11, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImport.ts, 11, 29)) export var m1_im2_private_v2_public = new m1_im2_private.c1(); >m1_im2_private_v2_public : Symbol(m1_im2_private_v2_public, Decl(privacyGloImport.ts, 50, 14)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImport.ts, 11, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImport.ts, 11, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyGloImport.ts, 45, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImport.ts, 11, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImport.ts, 11, 29)) export var m1_im2_private_v3_public = m1_im2_private.f1; >m1_im2_private_v3_public : Symbol(m1_im2_private_v3_public, Decl(privacyGloImport.ts, 51, 14)) @@ -145,15 +145,15 @@ module m1 { var m1_im2_private_v1_private = m1_im2_private.c1; >m1_im2_private_v1_private : Symbol(m1_im2_private_v1_private, Decl(privacyGloImport.ts, 53, 7)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImport.ts, 11, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImport.ts, 11, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyGloImport.ts, 45, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImport.ts, 11, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImport.ts, 11, 29)) var m1_im2_private_v2_private = new m1_im2_private.c1(); >m1_im2_private_v2_private : Symbol(m1_im2_private_v2_private, Decl(privacyGloImport.ts, 54, 7)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImport.ts, 11, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImport.ts, 11, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyGloImport.ts, 45, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImport.ts, 11, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImport.ts, 11, 29)) var m1_im2_private_v3_private = m1_im2_private.f1; >m1_im2_private_v3_private : Symbol(m1_im2_private_v3_private, Decl(privacyGloImport.ts, 55, 7)) @@ -189,7 +189,7 @@ module m1 { export import m1_im1_public = m1_M1_public; >m1_im1_public : Symbol(m1_im1_public, Decl(privacyGloImport.ts, 56, 56)) ->m1_M1_public : Symbol(m1_M1_public, Decl(privacyGloImport.ts, 0, 11)) +>m1_M1_public : Symbol(m1_M1_public, Decl(privacyGloImport.ts, 0, 14)) export import m1_im2_public = m1_M2_private; >m1_im2_public : Symbol(m1_im2_public, Decl(privacyGloImport.ts, 78, 47)) @@ -199,25 +199,25 @@ module m1 { //export import m1_im4_public = require("m1_M4_private"); } -module glo_M1_public { +namespace glo_M1_public { >glo_M1_public : Symbol(glo_M1_public, Decl(privacyGloImport.ts, 82, 1)) export class c1 { ->c1 : Symbol(c1, Decl(privacyGloImport.ts, 84, 22)) +>c1 : Symbol(c1, Decl(privacyGloImport.ts, 84, 25)) } export function f1() { >f1 : Symbol(f1, Decl(privacyGloImport.ts, 86, 5)) return new c1; ->c1 : Symbol(c1, Decl(privacyGloImport.ts, 84, 22)) +>c1 : Symbol(c1, Decl(privacyGloImport.ts, 84, 25)) } export var v1 = c1; >v1 : Symbol(v1, Decl(privacyGloImport.ts, 90, 14)) ->c1 : Symbol(c1, Decl(privacyGloImport.ts, 84, 22)) +>c1 : Symbol(c1, Decl(privacyGloImport.ts, 84, 25)) export var v2: c1; >v2 : Symbol(v2, Decl(privacyGloImport.ts, 91, 14)) ->c1 : Symbol(c1, Decl(privacyGloImport.ts, 84, 22)) +>c1 : Symbol(c1, Decl(privacyGloImport.ts, 84, 25)) } declare module "glo_M2_public" { @@ -248,7 +248,7 @@ declare module "use_glo_M1_public" { export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; }; >use_glo_M1_public_v1_public : Symbol(use_glo_M1_public_v1_public, Decl(privacyGloImport.ts, 104, 14)) >use_glo_M1_public : Symbol(use_glo_M1_public, Decl(privacyGloImport.ts, 102, 36)) ->c1 : Symbol(use_glo_M1_public.c1, Decl(privacyGloImport.ts, 84, 22)) +>c1 : Symbol(use_glo_M1_public.c1, Decl(privacyGloImport.ts, 84, 25)) export var use_glo_M1_public_v2_public: typeof use_glo_M1_public; >use_glo_M1_public_v2_public : Symbol(use_glo_M1_public_v2_public, Decl(privacyGloImport.ts, 105, 14)) @@ -257,12 +257,12 @@ declare module "use_glo_M1_public" { export var use_glo_M1_public_v3_public: ()=> use_glo_M1_public.c1; >use_glo_M1_public_v3_public : Symbol(use_glo_M1_public_v3_public, Decl(privacyGloImport.ts, 106, 14)) >use_glo_M1_public : Symbol(use_glo_M1_public, Decl(privacyGloImport.ts, 102, 36)) ->c1 : Symbol(use_glo_M1_public.c1, Decl(privacyGloImport.ts, 84, 22)) +>c1 : Symbol(use_glo_M1_public.c1, Decl(privacyGloImport.ts, 84, 25)) var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; }; >use_glo_M1_public_v1_private : Symbol(use_glo_M1_public_v1_private, Decl(privacyGloImport.ts, 107, 7)) >use_glo_M1_public : Symbol(use_glo_M1_public, Decl(privacyGloImport.ts, 102, 36)) ->c1 : Symbol(use_glo_M1_public.c1, Decl(privacyGloImport.ts, 84, 22)) +>c1 : Symbol(use_glo_M1_public.c1, Decl(privacyGloImport.ts, 84, 25)) var use_glo_M1_public_v2_private: typeof use_glo_M1_public; >use_glo_M1_public_v2_private : Symbol(use_glo_M1_public_v2_private, Decl(privacyGloImport.ts, 108, 7)) @@ -271,7 +271,7 @@ declare module "use_glo_M1_public" { var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1; >use_glo_M1_public_v3_private : Symbol(use_glo_M1_public_v3_private, Decl(privacyGloImport.ts, 109, 7)) >use_glo_M1_public : Symbol(use_glo_M1_public, Decl(privacyGloImport.ts, 102, 36)) ->c1 : Symbol(use_glo_M1_public.c1, Decl(privacyGloImport.ts, 84, 22)) +>c1 : Symbol(use_glo_M1_public.c1, Decl(privacyGloImport.ts, 84, 25)) import use_glo_M2_public = require("glo_M2_public"); >use_glo_M2_public : Symbol(use_glo_M2_public, Decl(privacyGloImport.ts, 109, 65)) @@ -304,20 +304,20 @@ declare module "use_glo_M1_public" { >use_glo_M2_public : Symbol(use_glo_M2_public, Decl(privacyGloImport.ts, 109, 65)) >c1 : Symbol(use_glo_M2_public.c1, Decl(privacyGloImport.ts, 95, 25)) - module m2 { + namespace m2 { >m2 : Symbol(m2, Decl(privacyGloImport.ts, 117, 65)) //import errorImport = require("glo_M2_public"); import nonerrorImport = glo_M1_public; ->nonerrorImport : Symbol(nonerrorImport, Decl(privacyGloImport.ts, 119, 15)) +>nonerrorImport : Symbol(nonerrorImport, Decl(privacyGloImport.ts, 119, 18)) >glo_M1_public : Symbol(nonerrorImport, Decl(privacyGloImport.ts, 82, 1)) - module m5 { + namespace m5 { >m5 : Symbol(m5, Decl(privacyGloImport.ts, 121, 46)) //import m5_errorImport = require("glo_M2_public"); import m5_nonerrorImport = glo_M1_public; ->m5_nonerrorImport : Symbol(m5_nonerrorImport, Decl(privacyGloImport.ts, 123, 19)) +>m5_nonerrorImport : Symbol(m5_nonerrorImport, Decl(privacyGloImport.ts, 123, 22)) >glo_M1_public : Symbol(m5_nonerrorImport, Decl(privacyGloImport.ts, 82, 1)) } } @@ -326,14 +326,14 @@ declare module "use_glo_M1_public" { declare module "anotherParseError" { >"anotherParseError" : Symbol("anotherParseError", Decl(privacyGloImport.ts, 128, 1)) - module m2 { + namespace m2 { >m2 : Symbol(m2, Decl(privacyGloImport.ts, 130, 36), Decl(privacyGloImport.ts, 134, 5)) //declare module "abc" { //} } - module m2 { + namespace m2 { >m2 : Symbol(m2, Decl(privacyGloImport.ts, 130, 36), Decl(privacyGloImport.ts, 134, 5)) //module "abc2" { @@ -343,12 +343,12 @@ declare module "anotherParseError" { //} } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(privacyGloImport.ts, 142, 1)) //import m3 = require("use_glo_M1_public"); - module m4 { ->m4 : Symbol(m4, Decl(privacyGloImport.ts, 144, 11)) + namespace m4 { +>m4 : Symbol(m4, Decl(privacyGloImport.ts, 144, 14)) var a = 10; >a : Symbol(a, Decl(privacyGloImport.ts, 147, 11)) diff --git a/tests/baselines/reference/privacyGloImport.types b/tests/baselines/reference/privacyGloImport.types index 9fcd7f19e0722..2a6f63905a334 100644 --- a/tests/baselines/reference/privacyGloImport.types +++ b/tests/baselines/reference/privacyGloImport.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/privacyGloImport.ts] //// === privacyGloImport.ts === -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ - export module m1_M1_public { + export namespace m1_M1_public { >m1_M1_public : typeof m1_M1_public > : ^^^^^^^^^^^^^^^^^^^ @@ -34,7 +34,7 @@ module m1 { > : ^^ } - module m1_M2_private { + namespace m1_M2_private { >m1_M2_private : typeof m1_M2_private > : ^^^^^^^^^^^^^^^^^^^^ @@ -304,7 +304,7 @@ module m1 { //export import m1_im4_public = require("m1_M4_private"); } -module glo_M1_public { +namespace glo_M1_public { >glo_M1_public : typeof glo_M1_public > : ^^^^^^^^^^^^^^^^^^^^ @@ -440,7 +440,7 @@ declare module "use_glo_M1_public" { >use_glo_M2_public : any > : ^^^ - module m2 { + namespace m2 { //import errorImport = require("glo_M2_public"); import nonerrorImport = glo_M1_public; >nonerrorImport : typeof nonerrorImport @@ -448,7 +448,7 @@ declare module "use_glo_M1_public" { >glo_M1_public : typeof nonerrorImport > : ^^^^^^^^^^^^^^^^^^^^^ - module m5 { + namespace m5 { //import m5_errorImport = require("glo_M2_public"); import m5_nonerrorImport = glo_M1_public; >m5_nonerrorImport : typeof m5_nonerrorImport @@ -463,12 +463,12 @@ declare module "anotherParseError" { >"anotherParseError" : typeof import("anotherParseError") > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - module m2 { + namespace m2 { //declare module "abc" { //} } - module m2 { + namespace m2 { //module "abc2" { //} } @@ -476,12 +476,12 @@ declare module "anotherParseError" { //} } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ //import m3 = require("use_glo_M1_public"); - module m4 { + namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/privacyGloImportParseErrors.errors.txt b/tests/baselines/reference/privacyGloImportParseErrors.errors.txt index 358f2ba95a5f6..87bb39c246b3f 100644 --- a/tests/baselines/reference/privacyGloImportParseErrors.errors.txt +++ b/tests/baselines/reference/privacyGloImportParseErrors.errors.txt @@ -17,8 +17,8 @@ privacyGloImportParseErrors.ts(149,29): error TS1147: Import declarations in a n ==== privacyGloImportParseErrors.ts (16 errors) ==== - module m1 { - export module m1_M1_public { + namespace m1 { + export namespace m1_M1_public { export class c1 { } export function f1() { @@ -28,7 +28,7 @@ privacyGloImportParseErrors.ts(149,29): error TS1147: Import declarations in a n export var v2: c1; } - module m1_M2_private { + namespace m1_M2_private { export class c1 { } export function f1() { @@ -119,7 +119,7 @@ privacyGloImportParseErrors.ts(149,29): error TS1147: Import declarations in a n !!! error TS1147: Import declarations in a namespace cannot reference a module. } - module glo_M1_public { + namespace glo_M1_public { export class c1 { } export function f1() { @@ -154,13 +154,13 @@ privacyGloImportParseErrors.ts(149,29): error TS1147: Import declarations in a n var use_glo_M2_public_v2_private: typeof use_glo_M2_public; var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1; - module m2 { + namespace m2 { import errorImport = require("glo_M2_public"); ~~~~~~~~~~~~~~~ !!! error TS1147: Import declarations in a namespace cannot reference a module. import nonerrorImport = glo_M1_public; - module m5 { + namespace m5 { import m5_errorImport = require("glo_M2_public"); ~~~~~~~~~~~~~~~ !!! error TS1147: Import declarations in a namespace cannot reference a module. @@ -170,7 +170,7 @@ privacyGloImportParseErrors.ts(149,29): error TS1147: Import declarations in a n } declare module "anotherParseError" { - module m2 { + namespace m2 { declare module "abc" { ~~~~~~~ !!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. @@ -179,7 +179,7 @@ privacyGloImportParseErrors.ts(149,29): error TS1147: Import declarations in a n } } - module m2 { + namespace m2 { module "abc2" { ~~~~~~ !!! error TS2435: Ambient modules cannot be nested in other modules or namespaces. @@ -189,11 +189,11 @@ privacyGloImportParseErrors.ts(149,29): error TS1147: Import declarations in a n } } - module m2 { + namespace m2 { import m3 = require("use_glo_M1_public"); ~~~~~~~~~~~~~~~~~~~ !!! error TS1147: Import declarations in a namespace cannot reference a module. - module m4 { + namespace m4 { var a = 10; import m2 = require("use_glo_M1_public"); ~~~~~~~~~~~~~~~~~~~ diff --git a/tests/baselines/reference/privacyGloImportParseErrors.js b/tests/baselines/reference/privacyGloImportParseErrors.js index 1a1252819e394..fcd45dc195662 100644 --- a/tests/baselines/reference/privacyGloImportParseErrors.js +++ b/tests/baselines/reference/privacyGloImportParseErrors.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/privacyGloImportParseErrors.ts] //// //// [privacyGloImportParseErrors.ts] -module m1 { - export module m1_M1_public { +namespace m1 { + export namespace m1_M1_public { export class c1 { } export function f1() { @@ -12,7 +12,7 @@ module m1 { export var v2: c1; } - module m1_M2_private { + namespace m1_M2_private { export class c1 { } export function f1() { @@ -85,7 +85,7 @@ module m1 { export import m1_im4_public = require("m1_M4_private"); } -module glo_M1_public { +namespace glo_M1_public { export class c1 { } export function f1() { @@ -120,11 +120,11 @@ declare module "use_glo_M1_public" { var use_glo_M2_public_v2_private: typeof use_glo_M2_public; var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1; - module m2 { + namespace m2 { import errorImport = require("glo_M2_public"); import nonerrorImport = glo_M1_public; - module m5 { + namespace m5 { import m5_errorImport = require("glo_M2_public"); import m5_nonerrorImport = glo_M1_public; } @@ -132,12 +132,12 @@ declare module "use_glo_M1_public" { } declare module "anotherParseError" { - module m2 { + namespace m2 { declare module "abc" { } } - module m2 { + namespace m2 { module "abc2" { } } @@ -145,9 +145,9 @@ declare module "anotherParseError" { } } -module m2 { +namespace m2 { import m3 = require("use_glo_M1_public"); - module m4 { + namespace m4 { var a = 10; import m2 = require("use_glo_M1_public"); } diff --git a/tests/baselines/reference/privacyGloImportParseErrors.symbols b/tests/baselines/reference/privacyGloImportParseErrors.symbols index a9f966dbb728c..89d4c3be5858f 100644 --- a/tests/baselines/reference/privacyGloImportParseErrors.symbols +++ b/tests/baselines/reference/privacyGloImportParseErrors.symbols @@ -1,49 +1,49 @@ //// [tests/cases/compiler/privacyGloImportParseErrors.ts] //// === privacyGloImportParseErrors.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(privacyGloImportParseErrors.ts, 0, 0)) - export module m1_M1_public { ->m1_M1_public : Symbol(m1_M1_public, Decl(privacyGloImportParseErrors.ts, 0, 11)) + export namespace m1_M1_public { +>m1_M1_public : Symbol(m1_M1_public, Decl(privacyGloImportParseErrors.ts, 0, 14)) export class c1 { ->c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 1, 32)) +>c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 1, 35)) } export function f1() { >f1 : Symbol(f1, Decl(privacyGloImportParseErrors.ts, 3, 9)) return new c1; ->c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 1, 32)) +>c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 1, 35)) } export var v1 = c1; >v1 : Symbol(v1, Decl(privacyGloImportParseErrors.ts, 7, 18)) ->c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 1, 32)) +>c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 1, 35)) export var v2: c1; >v2 : Symbol(v2, Decl(privacyGloImportParseErrors.ts, 8, 18)) ->c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 1, 32)) +>c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 1, 35)) } - module m1_M2_private { + namespace m1_M2_private { >m1_M2_private : Symbol(m1_M2_private, Decl(privacyGloImportParseErrors.ts, 9, 5)) export class c1 { ->c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 11, 26)) +>c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 11, 29)) } export function f1() { >f1 : Symbol(f1, Decl(privacyGloImportParseErrors.ts, 13, 9)) return new c1; ->c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 11, 26)) +>c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 11, 29)) } export var v1 = c1; >v1 : Symbol(v1, Decl(privacyGloImportParseErrors.ts, 17, 18)) ->c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 11, 26)) +>c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 11, 29)) export var v2: c1; >v2 : Symbol(v2, Decl(privacyGloImportParseErrors.ts, 18, 18)) ->c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 11, 26)) +>c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 11, 29)) } export declare module "m1_M3_public" { @@ -84,19 +84,19 @@ module m1 { import m1_im1_private = m1_M1_public; >m1_im1_private : Symbol(m1_im1_private, Decl(privacyGloImportParseErrors.ts, 35, 5)) ->m1_M1_public : Symbol(m1_M1_public, Decl(privacyGloImportParseErrors.ts, 0, 11)) +>m1_M1_public : Symbol(m1_M1_public, Decl(privacyGloImportParseErrors.ts, 0, 14)) export var m1_im1_private_v1_public = m1_im1_private.c1; >m1_im1_private_v1_public : Symbol(m1_im1_private_v1_public, Decl(privacyGloImportParseErrors.ts, 38, 14)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImportParseErrors.ts, 1, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImportParseErrors.ts, 1, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyGloImportParseErrors.ts, 35, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImportParseErrors.ts, 1, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImportParseErrors.ts, 1, 35)) export var m1_im1_private_v2_public = new m1_im1_private.c1(); >m1_im1_private_v2_public : Symbol(m1_im1_private_v2_public, Decl(privacyGloImportParseErrors.ts, 39, 14)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImportParseErrors.ts, 1, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImportParseErrors.ts, 1, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyGloImportParseErrors.ts, 35, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImportParseErrors.ts, 1, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImportParseErrors.ts, 1, 35)) export var m1_im1_private_v3_public = m1_im1_private.f1; >m1_im1_private_v3_public : Symbol(m1_im1_private_v3_public, Decl(privacyGloImportParseErrors.ts, 40, 14)) @@ -112,15 +112,15 @@ module m1 { var m1_im1_private_v1_private = m1_im1_private.c1; >m1_im1_private_v1_private : Symbol(m1_im1_private_v1_private, Decl(privacyGloImportParseErrors.ts, 42, 7)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImportParseErrors.ts, 1, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImportParseErrors.ts, 1, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyGloImportParseErrors.ts, 35, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImportParseErrors.ts, 1, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImportParseErrors.ts, 1, 35)) var m1_im1_private_v2_private = new m1_im1_private.c1(); >m1_im1_private_v2_private : Symbol(m1_im1_private_v2_private, Decl(privacyGloImportParseErrors.ts, 43, 7)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImportParseErrors.ts, 1, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImportParseErrors.ts, 1, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyGloImportParseErrors.ts, 35, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImportParseErrors.ts, 1, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyGloImportParseErrors.ts, 1, 35)) var m1_im1_private_v3_private = m1_im1_private.f1; >m1_im1_private_v3_private : Symbol(m1_im1_private_v3_private, Decl(privacyGloImportParseErrors.ts, 44, 7)) @@ -141,15 +141,15 @@ module m1 { export var m1_im2_private_v1_public = m1_im2_private.c1; >m1_im2_private_v1_public : Symbol(m1_im2_private_v1_public, Decl(privacyGloImportParseErrors.ts, 49, 14)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImportParseErrors.ts, 11, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImportParseErrors.ts, 11, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyGloImportParseErrors.ts, 45, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImportParseErrors.ts, 11, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImportParseErrors.ts, 11, 29)) export var m1_im2_private_v2_public = new m1_im2_private.c1(); >m1_im2_private_v2_public : Symbol(m1_im2_private_v2_public, Decl(privacyGloImportParseErrors.ts, 50, 14)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImportParseErrors.ts, 11, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImportParseErrors.ts, 11, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyGloImportParseErrors.ts, 45, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImportParseErrors.ts, 11, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImportParseErrors.ts, 11, 29)) export var m1_im2_private_v3_public = m1_im2_private.f1; >m1_im2_private_v3_public : Symbol(m1_im2_private_v3_public, Decl(privacyGloImportParseErrors.ts, 51, 14)) @@ -165,15 +165,15 @@ module m1 { var m1_im2_private_v1_private = m1_im2_private.c1; >m1_im2_private_v1_private : Symbol(m1_im2_private_v1_private, Decl(privacyGloImportParseErrors.ts, 53, 7)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImportParseErrors.ts, 11, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImportParseErrors.ts, 11, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyGloImportParseErrors.ts, 45, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImportParseErrors.ts, 11, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImportParseErrors.ts, 11, 29)) var m1_im2_private_v2_private = new m1_im2_private.c1(); >m1_im2_private_v2_private : Symbol(m1_im2_private_v2_private, Decl(privacyGloImportParseErrors.ts, 54, 7)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImportParseErrors.ts, 11, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImportParseErrors.ts, 11, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyGloImportParseErrors.ts, 45, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImportParseErrors.ts, 11, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyGloImportParseErrors.ts, 11, 29)) var m1_im2_private_v3_private = m1_im2_private.f1; >m1_im2_private_v3_private : Symbol(m1_im2_private_v3_private, Decl(privacyGloImportParseErrors.ts, 55, 7)) @@ -259,7 +259,7 @@ module m1 { export import m1_im1_public = m1_M1_public; >m1_im1_public : Symbol(m1_im1_public, Decl(privacyGloImportParseErrors.ts, 76, 56)) ->m1_M1_public : Symbol(m1_M1_public, Decl(privacyGloImportParseErrors.ts, 0, 11)) +>m1_M1_public : Symbol(m1_M1_public, Decl(privacyGloImportParseErrors.ts, 0, 14)) export import m1_im2_public = m1_M2_private; >m1_im2_public : Symbol(m1_im2_public, Decl(privacyGloImportParseErrors.ts, 78, 47)) @@ -272,25 +272,25 @@ module m1 { >m1_im4_public : Symbol(m1_im4_public, Decl(privacyGloImportParseErrors.ts, 80, 58)) } -module glo_M1_public { +namespace glo_M1_public { >glo_M1_public : Symbol(glo_M1_public, Decl(privacyGloImportParseErrors.ts, 82, 1)) export class c1 { ->c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 84, 22)) +>c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 84, 25)) } export function f1() { >f1 : Symbol(f1, Decl(privacyGloImportParseErrors.ts, 86, 5)) return new c1; ->c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 84, 22)) +>c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 84, 25)) } export var v1 = c1; >v1 : Symbol(v1, Decl(privacyGloImportParseErrors.ts, 90, 14)) ->c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 84, 22)) +>c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 84, 25)) export var v2: c1; >v2 : Symbol(v2, Decl(privacyGloImportParseErrors.ts, 91, 14)) ->c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 84, 22)) +>c1 : Symbol(c1, Decl(privacyGloImportParseErrors.ts, 84, 25)) } declare module "glo_M2_public" { @@ -321,7 +321,7 @@ declare module "use_glo_M1_public" { export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; }; >use_glo_M1_public_v1_public : Symbol(use_glo_M1_public_v1_public, Decl(privacyGloImportParseErrors.ts, 104, 14)) >use_glo_M1_public : Symbol(use_glo_M1_public, Decl(privacyGloImportParseErrors.ts, 102, 36)) ->c1 : Symbol(use_glo_M1_public.c1, Decl(privacyGloImportParseErrors.ts, 84, 22)) +>c1 : Symbol(use_glo_M1_public.c1, Decl(privacyGloImportParseErrors.ts, 84, 25)) export var use_glo_M1_public_v2_public: typeof use_glo_M1_public; >use_glo_M1_public_v2_public : Symbol(use_glo_M1_public_v2_public, Decl(privacyGloImportParseErrors.ts, 105, 14)) @@ -330,12 +330,12 @@ declare module "use_glo_M1_public" { export var use_glo_M1_public_v3_public: ()=> use_glo_M1_public.c1; >use_glo_M1_public_v3_public : Symbol(use_glo_M1_public_v3_public, Decl(privacyGloImportParseErrors.ts, 106, 14)) >use_glo_M1_public : Symbol(use_glo_M1_public, Decl(privacyGloImportParseErrors.ts, 102, 36)) ->c1 : Symbol(use_glo_M1_public.c1, Decl(privacyGloImportParseErrors.ts, 84, 22)) +>c1 : Symbol(use_glo_M1_public.c1, Decl(privacyGloImportParseErrors.ts, 84, 25)) var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; }; >use_glo_M1_public_v1_private : Symbol(use_glo_M1_public_v1_private, Decl(privacyGloImportParseErrors.ts, 107, 7)) >use_glo_M1_public : Symbol(use_glo_M1_public, Decl(privacyGloImportParseErrors.ts, 102, 36)) ->c1 : Symbol(use_glo_M1_public.c1, Decl(privacyGloImportParseErrors.ts, 84, 22)) +>c1 : Symbol(use_glo_M1_public.c1, Decl(privacyGloImportParseErrors.ts, 84, 25)) var use_glo_M1_public_v2_private: typeof use_glo_M1_public; >use_glo_M1_public_v2_private : Symbol(use_glo_M1_public_v2_private, Decl(privacyGloImportParseErrors.ts, 108, 7)) @@ -344,7 +344,7 @@ declare module "use_glo_M1_public" { var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1; >use_glo_M1_public_v3_private : Symbol(use_glo_M1_public_v3_private, Decl(privacyGloImportParseErrors.ts, 109, 7)) >use_glo_M1_public : Symbol(use_glo_M1_public, Decl(privacyGloImportParseErrors.ts, 102, 36)) ->c1 : Symbol(use_glo_M1_public.c1, Decl(privacyGloImportParseErrors.ts, 84, 22)) +>c1 : Symbol(use_glo_M1_public.c1, Decl(privacyGloImportParseErrors.ts, 84, 25)) import use_glo_M2_public = require("glo_M2_public"); >use_glo_M2_public : Symbol(use_glo_M2_public, Decl(privacyGloImportParseErrors.ts, 109, 65)) @@ -377,21 +377,21 @@ declare module "use_glo_M1_public" { >use_glo_M2_public : Symbol(use_glo_M2_public, Decl(privacyGloImportParseErrors.ts, 109, 65)) >c1 : Symbol(use_glo_M2_public.c1, Decl(privacyGloImportParseErrors.ts, 95, 25)) - module m2 { + namespace m2 { >m2 : Symbol(m2, Decl(privacyGloImportParseErrors.ts, 117, 65)) import errorImport = require("glo_M2_public"); ->errorImport : Symbol(errorImport, Decl(privacyGloImportParseErrors.ts, 119, 15)) +>errorImport : Symbol(errorImport, Decl(privacyGloImportParseErrors.ts, 119, 18)) import nonerrorImport = glo_M1_public; >nonerrorImport : Symbol(nonerrorImport, Decl(privacyGloImportParseErrors.ts, 120, 54)) >glo_M1_public : Symbol(nonerrorImport, Decl(privacyGloImportParseErrors.ts, 82, 1)) - module m5 { + namespace m5 { >m5 : Symbol(m5, Decl(privacyGloImportParseErrors.ts, 121, 46)) import m5_errorImport = require("glo_M2_public"); ->m5_errorImport : Symbol(m5_errorImport, Decl(privacyGloImportParseErrors.ts, 123, 19)) +>m5_errorImport : Symbol(m5_errorImport, Decl(privacyGloImportParseErrors.ts, 123, 22)) import m5_nonerrorImport = glo_M1_public; >m5_nonerrorImport : Symbol(m5_nonerrorImport, Decl(privacyGloImportParseErrors.ts, 124, 61)) @@ -403,19 +403,19 @@ declare module "use_glo_M1_public" { declare module "anotherParseError" { >"anotherParseError" : Symbol("anotherParseError", Decl(privacyGloImportParseErrors.ts, 128, 1)) - module m2 { + namespace m2 { >m2 : Symbol(m2, Decl(privacyGloImportParseErrors.ts, 130, 36), Decl(privacyGloImportParseErrors.ts, 134, 5)) declare module "abc" { ->"abc" : Symbol("abc", Decl(privacyGloImportParseErrors.ts, 131, 15)) +>"abc" : Symbol("abc", Decl(privacyGloImportParseErrors.ts, 131, 18)) } } - module m2 { + namespace m2 { >m2 : Symbol(m2, Decl(privacyGloImportParseErrors.ts, 130, 36), Decl(privacyGloImportParseErrors.ts, 134, 5)) module "abc2" { ->"abc2" : Symbol("abc2", Decl(privacyGloImportParseErrors.ts, 136, 15)) +>"abc2" : Symbol("abc2", Decl(privacyGloImportParseErrors.ts, 136, 18)) } } module "abc3" { @@ -423,13 +423,13 @@ declare module "anotherParseError" { } } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(privacyGloImportParseErrors.ts, 142, 1)) import m3 = require("use_glo_M1_public"); ->m3 : Symbol(m3, Decl(privacyGloImportParseErrors.ts, 144, 11)) +>m3 : Symbol(m3, Decl(privacyGloImportParseErrors.ts, 144, 14)) - module m4 { + namespace m4 { >m4 : Symbol(m4, Decl(privacyGloImportParseErrors.ts, 145, 45)) var a = 10; diff --git a/tests/baselines/reference/privacyGloImportParseErrors.types b/tests/baselines/reference/privacyGloImportParseErrors.types index c6ce20ae105d4..7d97325e42ff3 100644 --- a/tests/baselines/reference/privacyGloImportParseErrors.types +++ b/tests/baselines/reference/privacyGloImportParseErrors.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/privacyGloImportParseErrors.ts] //// === privacyGloImportParseErrors.ts === -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ - export module m1_M1_public { + export namespace m1_M1_public { >m1_M1_public : typeof m1_M1_public > : ^^^^^^^^^^^^^^^^^^^ @@ -34,7 +34,7 @@ module m1 { > : ^^ } - module m1_M2_private { + namespace m1_M2_private { >m1_M2_private : typeof m1_M2_private > : ^^^^^^^^^^^^^^^^^^^^ @@ -499,7 +499,7 @@ module m1 { > : ^^^ } -module glo_M1_public { +namespace glo_M1_public { >glo_M1_public : typeof glo_M1_public > : ^^^^^^^^^^^^^^^^^^^^ @@ -635,7 +635,7 @@ declare module "use_glo_M1_public" { >use_glo_M2_public : any > : ^^^ - module m2 { + namespace m2 { import errorImport = require("glo_M2_public"); >errorImport : typeof errorImport > : ^^^^^^^^^^^^^^^^^^ @@ -646,7 +646,7 @@ declare module "use_glo_M1_public" { >glo_M1_public : typeof nonerrorImport > : ^^^^^^^^^^^^^^^^^^^^^ - module m5 { + namespace m5 { import m5_errorImport = require("glo_M2_public"); >m5_errorImport : typeof m5_errorImport > : ^^^^^^^^^^^^^^^^^^^^^ @@ -664,14 +664,14 @@ declare module "anotherParseError" { >"anotherParseError" : typeof import("anotherParseError") > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - module m2 { + namespace m2 { declare module "abc" { >"abc" : typeof import("abc") > : ^^^^^^^^^^^^^^^^^^^^ } } - module m2 { + namespace m2 { module "abc2" { >"abc2" : typeof import("abc2") > : ^^^^^^^^^^^^^^^^^^^^^ @@ -683,7 +683,7 @@ declare module "anotherParseError" { } } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -691,7 +691,7 @@ module m2 { >m3 : typeof m3 > : ^^^^^^^^^ - module m4 { + namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/privacyGloInterface.js b/tests/baselines/reference/privacyGloInterface.js index 0f47db28c8524..16a0d9ec8db7e 100644 --- a/tests/baselines/reference/privacyGloInterface.js +++ b/tests/baselines/reference/privacyGloInterface.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyGloInterface.ts] //// //// [privacyGloInterface.ts] -module m1 { +namespace m1 { export class C1_public { private f1() { } @@ -89,7 +89,7 @@ interface C7_public { f3(): C5_public; } -module m3 { +namespace m3 { export interface m3_i_public { f1(): number; } diff --git a/tests/baselines/reference/privacyGloInterface.symbols b/tests/baselines/reference/privacyGloInterface.symbols index 64ff7dc51c159..737f916381816 100644 --- a/tests/baselines/reference/privacyGloInterface.symbols +++ b/tests/baselines/reference/privacyGloInterface.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/privacyGloInterface.ts] //// === privacyGloInterface.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(privacyGloInterface.ts, 0, 0)) export class C1_public { ->C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 14)) private f1() { >f1 : Symbol(C1_public.f1, Decl(privacyGloInterface.ts, 1, 28)) @@ -22,14 +22,14 @@ module m1 { (c1: C1_public); >c1 : Symbol(c1, Decl(privacyGloInterface.ts, 11, 9)) ->C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 14)) (c1: C2_private); >c1 : Symbol(c1, Decl(privacyGloInterface.ts, 12, 9)) >C2_private : Symbol(C2_private, Decl(privacyGloInterface.ts, 4, 5)) (): C1_public; ->C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 14)) (c2: number): C2_private; >c2 : Symbol(c2, Decl(privacyGloInterface.ts, 14, 9)) @@ -37,14 +37,14 @@ module m1 { new (c1: C1_public); >c1 : Symbol(c1, Decl(privacyGloInterface.ts, 16, 13)) ->C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 14)) new (c1: C2_private); >c1 : Symbol(c1, Decl(privacyGloInterface.ts, 17, 13)) >C2_private : Symbol(C2_private, Decl(privacyGloInterface.ts, 4, 5)) new (): C1_public; ->C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 14)) new (c2: number): C2_private; >c2 : Symbol(c2, Decl(privacyGloInterface.ts, 19, 13)) @@ -52,7 +52,7 @@ module m1 { [c: number]: C1_public; >c : Symbol(c, Decl(privacyGloInterface.ts, 21, 9)) ->C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 14)) [c: string]: C2_private; >c : Symbol(c, Decl(privacyGloInterface.ts, 22, 9)) @@ -60,7 +60,7 @@ module m1 { x: C1_public; >x : Symbol(C3_public.x, Decl(privacyGloInterface.ts, 22, 32)) ->C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 14)) y: C2_private; >y : Symbol(C3_public.y, Decl(privacyGloInterface.ts, 24, 21)) @@ -68,7 +68,7 @@ module m1 { a?: C1_public; >a : Symbol(C3_public.a, Decl(privacyGloInterface.ts, 25, 22)) ->C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 14)) b?: C2_private; >b : Symbol(C3_public.b, Decl(privacyGloInterface.ts, 27, 22)) @@ -77,7 +77,7 @@ module m1 { f1(a1: C1_public); >f1 : Symbol(C3_public.f1, Decl(privacyGloInterface.ts, 28, 23)) >a1 : Symbol(a1, Decl(privacyGloInterface.ts, 30, 11)) ->C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 14)) f2(a1: C2_private); >f2 : Symbol(C3_public.f2, Decl(privacyGloInterface.ts, 30, 26)) @@ -86,7 +86,7 @@ module m1 { f3(): C1_public; >f3 : Symbol(C3_public.f3, Decl(privacyGloInterface.ts, 31, 27)) ->C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 14)) f4(): C2_private; >f4 : Symbol(C3_public.f4, Decl(privacyGloInterface.ts, 32, 24)) @@ -99,14 +99,14 @@ module m1 { (c1: C1_public); >c1 : Symbol(c1, Decl(privacyGloInterface.ts, 38, 9)) ->C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 14)) (c1: C2_private); >c1 : Symbol(c1, Decl(privacyGloInterface.ts, 39, 9)) >C2_private : Symbol(C2_private, Decl(privacyGloInterface.ts, 4, 5)) (): C1_public; ->C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 14)) (c2: number): C2_private; >c2 : Symbol(c2, Decl(privacyGloInterface.ts, 41, 9)) @@ -114,14 +114,14 @@ module m1 { new (c1: C1_public); >c1 : Symbol(c1, Decl(privacyGloInterface.ts, 43, 13)) ->C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 14)) new (c1: C2_private); >c1 : Symbol(c1, Decl(privacyGloInterface.ts, 44, 13)) >C2_private : Symbol(C2_private, Decl(privacyGloInterface.ts, 4, 5)) new (): C1_public; ->C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 14)) new (c2: number): C2_private; >c2 : Symbol(c2, Decl(privacyGloInterface.ts, 46, 13)) @@ -129,7 +129,7 @@ module m1 { [c: number]: C1_public; >c : Symbol(c, Decl(privacyGloInterface.ts, 48, 9)) ->C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 14)) [c: string]: C2_private; >c : Symbol(c, Decl(privacyGloInterface.ts, 49, 9)) @@ -137,7 +137,7 @@ module m1 { x: C1_public; >x : Symbol(C4_private.x, Decl(privacyGloInterface.ts, 49, 32)) ->C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 14)) y: C2_private; >y : Symbol(C4_private.y, Decl(privacyGloInterface.ts, 51, 21)) @@ -145,7 +145,7 @@ module m1 { a?: C1_public; >a : Symbol(C4_private.a, Decl(privacyGloInterface.ts, 52, 22)) ->C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 14)) b?: C2_private; >b : Symbol(C4_private.b, Decl(privacyGloInterface.ts, 54, 22)) @@ -154,7 +154,7 @@ module m1 { f1(a1: C1_public); >f1 : Symbol(C4_private.f1, Decl(privacyGloInterface.ts, 55, 23)) >a1 : Symbol(a1, Decl(privacyGloInterface.ts, 57, 11)) ->C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 14)) f2(a1: C2_private); >f2 : Symbol(C4_private.f2, Decl(privacyGloInterface.ts, 57, 26)) @@ -163,7 +163,7 @@ module m1 { f3(): C1_public; >f3 : Symbol(C4_private.f3, Decl(privacyGloInterface.ts, 58, 27)) ->C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 14)) f4(): C2_private; >f4 : Symbol(C4_private.f4, Decl(privacyGloInterface.ts, 59, 24)) @@ -220,11 +220,11 @@ interface C7_public { >C5_public : Symbol(C5_public, Decl(privacyGloInterface.ts, 63, 1)) } -module m3 { +namespace m3 { >m3 : Symbol(m3, Decl(privacyGloInterface.ts, 86, 1)) export interface m3_i_public { ->m3_i_public : Symbol(m3_i_public, Decl(privacyGloInterface.ts, 88, 11)) +>m3_i_public : Symbol(m3_i_public, Decl(privacyGloInterface.ts, 88, 14)) f1(): number; >f1 : Symbol(m3_i_public.f1, Decl(privacyGloInterface.ts, 89, 34)) @@ -239,7 +239,7 @@ module m3 { interface m3_C1_private extends m3_i_public { >m3_C1_private : Symbol(m3_C1_private, Decl(privacyGloInterface.ts, 95, 5)) ->m3_i_public : Symbol(m3_i_public, Decl(privacyGloInterface.ts, 88, 11)) +>m3_i_public : Symbol(m3_i_public, Decl(privacyGloInterface.ts, 88, 14)) } interface m3_C2_private extends m3_i_private { >m3_C2_private : Symbol(m3_C2_private, Decl(privacyGloInterface.ts, 98, 5)) @@ -247,7 +247,7 @@ module m3 { } export interface m3_C3_public extends m3_i_public { >m3_C3_public : Symbol(m3_C3_public, Decl(privacyGloInterface.ts, 100, 5)) ->m3_i_public : Symbol(m3_i_public, Decl(privacyGloInterface.ts, 88, 11)) +>m3_i_public : Symbol(m3_i_public, Decl(privacyGloInterface.ts, 88, 14)) } export interface m3_C4_public extends m3_i_private { >m3_C4_public : Symbol(m3_C4_public, Decl(privacyGloInterface.ts, 102, 5)) @@ -257,12 +257,12 @@ module m3 { interface m3_C5_private extends m3_i_private, m3_i_public { >m3_C5_private : Symbol(m3_C5_private, Decl(privacyGloInterface.ts, 104, 5)) >m3_i_private : Symbol(m3_i_private, Decl(privacyGloInterface.ts, 91, 5)) ->m3_i_public : Symbol(m3_i_public, Decl(privacyGloInterface.ts, 88, 11)) +>m3_i_public : Symbol(m3_i_public, Decl(privacyGloInterface.ts, 88, 14)) } export interface m3_C6_public extends m3_i_private, m3_i_public { >m3_C6_public : Symbol(m3_C6_public, Decl(privacyGloInterface.ts, 107, 5)) >m3_i_private : Symbol(m3_i_private, Decl(privacyGloInterface.ts, 91, 5)) ->m3_i_public : Symbol(m3_i_public, Decl(privacyGloInterface.ts, 88, 11)) +>m3_i_public : Symbol(m3_i_public, Decl(privacyGloInterface.ts, 88, 14)) } } diff --git a/tests/baselines/reference/privacyGloInterface.types b/tests/baselines/reference/privacyGloInterface.types index b4377d6f41509..385018ae416a3 100644 --- a/tests/baselines/reference/privacyGloInterface.types +++ b/tests/baselines/reference/privacyGloInterface.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyGloInterface.ts] //// === privacyGloInterface.ts === -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -215,7 +215,7 @@ interface C7_public { > : ^^^^^^ } -module m3 { +namespace m3 { export interface m3_i_public { f1(): number; >f1 : () => number diff --git a/tests/baselines/reference/privacyGloVar.js b/tests/baselines/reference/privacyGloVar.js index 8720b5c97e73c..17ebfd2fb26e0 100644 --- a/tests/baselines/reference/privacyGloVar.js +++ b/tests/baselines/reference/privacyGloVar.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyGloVar.ts] //// //// [privacyGloVar.ts] -module m1 { +namespace m1 { export class C1_public { private f1() { } diff --git a/tests/baselines/reference/privacyGloVar.symbols b/tests/baselines/reference/privacyGloVar.symbols index 4e2d2cb18fa86..07dd00526f969 100644 --- a/tests/baselines/reference/privacyGloVar.symbols +++ b/tests/baselines/reference/privacyGloVar.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/privacyGloVar.ts] //// === privacyGloVar.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(privacyGloVar.ts, 0, 0)) export class C1_public { ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) private f1() { >f1 : Symbol(C1_public.f1, Decl(privacyGloVar.ts, 1, 28)) @@ -21,11 +21,11 @@ module m1 { private C3_v1_private: C1_public; >C3_v1_private : Symbol(C3_public.C3_v1_private, Decl(privacyGloVar.ts, 9, 28)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) public C3_v2_public: C1_public; >C3_v2_public : Symbol(C3_public.C3_v2_public, Decl(privacyGloVar.ts, 10, 41)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) private C3_v3_private: C2_private; >C3_v3_private : Symbol(C3_public.C3_v3_private, Decl(privacyGloVar.ts, 11, 39)) @@ -37,11 +37,11 @@ module m1 { private C3_v11_private = new C1_public(); >C3_v11_private : Symbol(C3_public.C3_v11_private, Decl(privacyGloVar.ts, 13, 40)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) public C3_v12_public = new C1_public(); >C3_v12_public : Symbol(C3_public.C3_v12_public, Decl(privacyGloVar.ts, 15, 49)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) private C3_v13_private = new C2_private(); >C3_v13_private : Symbol(C3_public.C3_v13_private, Decl(privacyGloVar.ts, 16, 47)) @@ -53,13 +53,13 @@ module m1 { private C3_v21_private: C1_public = new C1_public(); >C3_v21_private : Symbol(C3_public.C3_v21_private, Decl(privacyGloVar.ts, 18, 48)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) public C3_v22_public: C1_public = new C1_public(); >C3_v22_public : Symbol(C3_public.C3_v22_public, Decl(privacyGloVar.ts, 20, 60)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) private C3_v23_private: C2_private = new C2_private(); >C3_v23_private : Symbol(C3_public.C3_v23_private, Decl(privacyGloVar.ts, 21, 58)) @@ -77,11 +77,11 @@ module m1 { private C4_v1_private: C1_public; >C4_v1_private : Symbol(C4_public.C4_v1_private, Decl(privacyGloVar.ts, 26, 21)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) public C4_v2_public: C1_public; >C4_v2_public : Symbol(C4_public.C4_v2_public, Decl(privacyGloVar.ts, 27, 41)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) private C4_v3_private: C2_private; >C4_v3_private : Symbol(C4_public.C4_v3_private, Decl(privacyGloVar.ts, 28, 39)) @@ -93,11 +93,11 @@ module m1 { private C4_v11_private = new C1_public(); >C4_v11_private : Symbol(C4_public.C4_v11_private, Decl(privacyGloVar.ts, 30, 40)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) public C4_v12_public = new C1_public(); >C4_v12_public : Symbol(C4_public.C4_v12_public, Decl(privacyGloVar.ts, 32, 49)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) private C4_v13_private = new C2_private(); >C4_v13_private : Symbol(C4_public.C4_v13_private, Decl(privacyGloVar.ts, 33, 47)) @@ -109,13 +109,13 @@ module m1 { private C4_v21_private: C1_public = new C1_public(); >C4_v21_private : Symbol(C4_public.C4_v21_private, Decl(privacyGloVar.ts, 35, 48)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) public C4_v22_public: C1_public = new C1_public(); >C4_v22_public : Symbol(C4_public.C4_v22_public, Decl(privacyGloVar.ts, 37, 60)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) private C4_v23_private: C2_private = new C2_private(); >C4_v23_private : Symbol(C4_public.C4_v23_private, Decl(privacyGloVar.ts, 38, 58)) @@ -130,11 +130,11 @@ module m1 { var m1_v1_private: C1_public; >m1_v1_private : Symbol(m1_v1_private, Decl(privacyGloVar.ts, 43, 7)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) export var m1_v2_public: C1_public; >m1_v2_public : Symbol(m1_v2_public, Decl(privacyGloVar.ts, 44, 14)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) var m1_v3_private: C2_private; >m1_v3_private : Symbol(m1_v3_private, Decl(privacyGloVar.ts, 45, 7)) @@ -146,11 +146,11 @@ module m1 { var m1_v11_private = new C1_public(); >m1_v11_private : Symbol(m1_v11_private, Decl(privacyGloVar.ts, 48, 7)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) export var m1_v12_public = new C1_public(); >m1_v12_public : Symbol(m1_v12_public, Decl(privacyGloVar.ts, 49, 14)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) var m1_v13_private = new C2_private(); >m1_v13_private : Symbol(m1_v13_private, Decl(privacyGloVar.ts, 50, 7)) @@ -162,13 +162,13 @@ module m1 { var m1_v21_private: C1_public = new C1_public(); >m1_v21_private : Symbol(m1_v21_private, Decl(privacyGloVar.ts, 53, 7)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) export var m1_v22_public: C1_public = new C1_public(); >m1_v22_public : Symbol(m1_v22_public, Decl(privacyGloVar.ts, 54, 14)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) ->C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) +>C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 14)) var m1_v23_private: C2_private = new C2_private(); >m1_v23_private : Symbol(m1_v23_private, Decl(privacyGloVar.ts, 55, 7)) diff --git a/tests/baselines/reference/privacyGloVar.types b/tests/baselines/reference/privacyGloVar.types index 48e324a2a4ff3..5377c31b81f1d 100644 --- a/tests/baselines/reference/privacyGloVar.types +++ b/tests/baselines/reference/privacyGloVar.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyGloVar.ts] //// === privacyGloVar.ts === -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/privacyImport.js b/tests/baselines/reference/privacyImport.js index 0681c429ff05f..7c5f5181832a3 100644 --- a/tests/baselines/reference/privacyImport.js +++ b/tests/baselines/reference/privacyImport.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/privacyImport.ts] //// //// [privacyImport.ts] -export module m1 { - export module m1_M1_public { +export namespace m1 { + export namespace m1_M1_public { export class c1 { } export function f1() { @@ -12,7 +12,7 @@ export module m1 { export var v2: c1; } - module m1_M2_private { + namespace m1_M2_private { export class c1 { } export function f1() { @@ -85,8 +85,8 @@ export module m1 { //export import m1_im4_public = require("m1_M4_private"); } -module m2 { - export module m2_M1_public { +namespace m2 { + export namespace m2_M1_public { export class c1 { } export function f1() { @@ -96,7 +96,7 @@ module m2 { export var v2: c1; } - module m2_M2_private { + namespace m2_M2_private { export class c1 { } export function f1() { @@ -170,7 +170,7 @@ module m2 { //export import m1_im4_public = require("m2_M4_private"); } -export module glo_M1_public { +export namespace glo_M1_public { export class c1 { } export function f1() { @@ -188,7 +188,7 @@ export module glo_M1_public { // export var v2: c1; //} -export module glo_M3_private { +export namespace glo_M3_private { export class c1 { } export function f1() { @@ -340,18 +340,18 @@ export import glo_im2_public = glo_M3_private; // } //} -module m2 { +namespace m2 { //import m3 = require("use_glo_M1_public"); - module m4 { + namespace m4 { var a = 10; //import m2 = require("use_glo_M1_public"); } } -export module m3 { +export namespace m3 { //import m3 = require("use_glo_M1_public"); - module m4 { + namespace m4 { var a = 10; //import m2 = require("use_glo_M1_public"); } diff --git a/tests/baselines/reference/privacyImport.symbols b/tests/baselines/reference/privacyImport.symbols index 91a4803afeee9..cd517dfc52af1 100644 --- a/tests/baselines/reference/privacyImport.symbols +++ b/tests/baselines/reference/privacyImport.symbols @@ -1,49 +1,49 @@ //// [tests/cases/compiler/privacyImport.ts] //// === privacyImport.ts === -export module m1 { +export namespace m1 { >m1 : Symbol(m1, Decl(privacyImport.ts, 0, 0)) - export module m1_M1_public { ->m1_M1_public : Symbol(m1_M1_public, Decl(privacyImport.ts, 0, 18)) + export namespace m1_M1_public { +>m1_M1_public : Symbol(m1_M1_public, Decl(privacyImport.ts, 0, 21)) export class c1 { ->c1 : Symbol(c1, Decl(privacyImport.ts, 1, 32)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 1, 35)) } export function f1() { >f1 : Symbol(f1, Decl(privacyImport.ts, 3, 9)) return new c1; ->c1 : Symbol(c1, Decl(privacyImport.ts, 1, 32)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 1, 35)) } export var v1 = c1; >v1 : Symbol(v1, Decl(privacyImport.ts, 7, 18)) ->c1 : Symbol(c1, Decl(privacyImport.ts, 1, 32)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 1, 35)) export var v2: c1; >v2 : Symbol(v2, Decl(privacyImport.ts, 8, 18)) ->c1 : Symbol(c1, Decl(privacyImport.ts, 1, 32)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 1, 35)) } - module m1_M2_private { + namespace m1_M2_private { >m1_M2_private : Symbol(m1_M2_private, Decl(privacyImport.ts, 9, 5)) export class c1 { ->c1 : Symbol(c1, Decl(privacyImport.ts, 11, 26)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 11, 29)) } export function f1() { >f1 : Symbol(f1, Decl(privacyImport.ts, 13, 9)) return new c1; ->c1 : Symbol(c1, Decl(privacyImport.ts, 11, 26)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 11, 29)) } export var v1 = c1; >v1 : Symbol(v1, Decl(privacyImport.ts, 17, 18)) ->c1 : Symbol(c1, Decl(privacyImport.ts, 11, 26)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 11, 29)) export var v2: c1; >v2 : Symbol(v2, Decl(privacyImport.ts, 18, 18)) ->c1 : Symbol(c1, Decl(privacyImport.ts, 11, 26)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 11, 29)) } //export declare module "m1_M3_public" { @@ -64,19 +64,19 @@ export module m1 { import m1_im1_private = m1_M1_public; >m1_im1_private : Symbol(m1_im1_private, Decl(privacyImport.ts, 19, 5)) ->m1_M1_public : Symbol(m1_M1_public, Decl(privacyImport.ts, 0, 18)) +>m1_M1_public : Symbol(m1_M1_public, Decl(privacyImport.ts, 0, 21)) export var m1_im1_private_v1_public = m1_im1_private.c1; >m1_im1_private_v1_public : Symbol(m1_im1_private_v1_public, Decl(privacyImport.ts, 38, 14)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 1, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 1, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyImport.ts, 19, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 1, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 1, 35)) export var m1_im1_private_v2_public = new m1_im1_private.c1(); >m1_im1_private_v2_public : Symbol(m1_im1_private_v2_public, Decl(privacyImport.ts, 39, 14)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 1, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 1, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyImport.ts, 19, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 1, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 1, 35)) export var m1_im1_private_v3_public = m1_im1_private.f1; >m1_im1_private_v3_public : Symbol(m1_im1_private_v3_public, Decl(privacyImport.ts, 40, 14)) @@ -92,15 +92,15 @@ export module m1 { var m1_im1_private_v1_private = m1_im1_private.c1; >m1_im1_private_v1_private : Symbol(m1_im1_private_v1_private, Decl(privacyImport.ts, 42, 7)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 1, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 1, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyImport.ts, 19, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 1, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 1, 35)) var m1_im1_private_v2_private = new m1_im1_private.c1(); >m1_im1_private_v2_private : Symbol(m1_im1_private_v2_private, Decl(privacyImport.ts, 43, 7)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 1, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 1, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyImport.ts, 19, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 1, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 1, 35)) var m1_im1_private_v3_private = m1_im1_private.f1; >m1_im1_private_v3_private : Symbol(m1_im1_private_v3_private, Decl(privacyImport.ts, 44, 7)) @@ -121,15 +121,15 @@ export module m1 { export var m1_im2_private_v1_public = m1_im2_private.c1; >m1_im2_private_v1_public : Symbol(m1_im2_private_v1_public, Decl(privacyImport.ts, 49, 14)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 11, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 11, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyImport.ts, 45, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 11, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 11, 29)) export var m1_im2_private_v2_public = new m1_im2_private.c1(); >m1_im2_private_v2_public : Symbol(m1_im2_private_v2_public, Decl(privacyImport.ts, 50, 14)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 11, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 11, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyImport.ts, 45, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 11, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 11, 29)) export var m1_im2_private_v3_public = m1_im2_private.f1; >m1_im2_private_v3_public : Symbol(m1_im2_private_v3_public, Decl(privacyImport.ts, 51, 14)) @@ -145,15 +145,15 @@ export module m1 { var m1_im2_private_v1_private = m1_im2_private.c1; >m1_im2_private_v1_private : Symbol(m1_im2_private_v1_private, Decl(privacyImport.ts, 53, 7)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 11, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 11, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyImport.ts, 45, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 11, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 11, 29)) var m1_im2_private_v2_private = new m1_im2_private.c1(); >m1_im2_private_v2_private : Symbol(m1_im2_private_v2_private, Decl(privacyImport.ts, 54, 7)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 11, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 11, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyImport.ts, 45, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 11, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 11, 29)) var m1_im2_private_v3_private = m1_im2_private.f1; >m1_im2_private_v3_private : Symbol(m1_im2_private_v3_private, Decl(privacyImport.ts, 55, 7)) @@ -189,7 +189,7 @@ export module m1 { export import m1_im1_public = m1_M1_public; >m1_im1_public : Symbol(m1_im1_public, Decl(privacyImport.ts, 56, 56)) ->m1_M1_public : Symbol(m1_M1_public, Decl(privacyImport.ts, 0, 18)) +>m1_M1_public : Symbol(m1_M1_public, Decl(privacyImport.ts, 0, 21)) export import m1_im2_public = m1_M2_private; >m1_im2_public : Symbol(m1_im2_public, Decl(privacyImport.ts, 78, 47)) @@ -199,49 +199,49 @@ export module m1 { //export import m1_im4_public = require("m1_M4_private"); } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(privacyImport.ts, 82, 1), Decl(privacyImport.ts, 249, 46)) - export module m2_M1_public { ->m2_M1_public : Symbol(m2_M1_public, Decl(privacyImport.ts, 84, 11)) + export namespace m2_M1_public { +>m2_M1_public : Symbol(m2_M1_public, Decl(privacyImport.ts, 84, 14)) export class c1 { ->c1 : Symbol(c1, Decl(privacyImport.ts, 85, 32)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 85, 35)) } export function f1() { >f1 : Symbol(f1, Decl(privacyImport.ts, 87, 9)) return new c1; ->c1 : Symbol(c1, Decl(privacyImport.ts, 85, 32)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 85, 35)) } export var v1 = c1; >v1 : Symbol(v1, Decl(privacyImport.ts, 91, 18)) ->c1 : Symbol(c1, Decl(privacyImport.ts, 85, 32)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 85, 35)) export var v2: c1; >v2 : Symbol(v2, Decl(privacyImport.ts, 92, 18)) ->c1 : Symbol(c1, Decl(privacyImport.ts, 85, 32)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 85, 35)) } - module m2_M2_private { + namespace m2_M2_private { >m2_M2_private : Symbol(m2_M2_private, Decl(privacyImport.ts, 93, 5)) export class c1 { ->c1 : Symbol(c1, Decl(privacyImport.ts, 95, 26)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 95, 29)) } export function f1() { >f1 : Symbol(f1, Decl(privacyImport.ts, 97, 9)) return new c1; ->c1 : Symbol(c1, Decl(privacyImport.ts, 95, 26)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 95, 29)) } export var v1 = c1; >v1 : Symbol(v1, Decl(privacyImport.ts, 101, 18)) ->c1 : Symbol(c1, Decl(privacyImport.ts, 95, 26)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 95, 29)) export var v2: c1; >v2 : Symbol(v2, Decl(privacyImport.ts, 102, 18)) ->c1 : Symbol(c1, Decl(privacyImport.ts, 95, 26)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 95, 29)) } //export declare module "m2_M3_public" { @@ -262,19 +262,19 @@ module m2 { import m1_im1_private = m2_M1_public; >m1_im1_private : Symbol(m1_im1_private, Decl(privacyImport.ts, 103, 5)) ->m2_M1_public : Symbol(m2_M1_public, Decl(privacyImport.ts, 84, 11)) +>m2_M1_public : Symbol(m2_M1_public, Decl(privacyImport.ts, 84, 14)) export var m1_im1_private_v1_public = m1_im1_private.c1; >m1_im1_private_v1_public : Symbol(m1_im1_private_v1_public, Decl(privacyImport.ts, 122, 14)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 85, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 85, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyImport.ts, 103, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 85, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 85, 35)) export var m1_im1_private_v2_public = new m1_im1_private.c1(); >m1_im1_private_v2_public : Symbol(m1_im1_private_v2_public, Decl(privacyImport.ts, 123, 14)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 85, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 85, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyImport.ts, 103, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 85, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 85, 35)) export var m1_im1_private_v3_public = m1_im1_private.f1; >m1_im1_private_v3_public : Symbol(m1_im1_private_v3_public, Decl(privacyImport.ts, 124, 14)) @@ -290,15 +290,15 @@ module m2 { var m1_im1_private_v1_private = m1_im1_private.c1; >m1_im1_private_v1_private : Symbol(m1_im1_private_v1_private, Decl(privacyImport.ts, 126, 7)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 85, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 85, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyImport.ts, 103, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 85, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 85, 35)) var m1_im1_private_v2_private = new m1_im1_private.c1(); >m1_im1_private_v2_private : Symbol(m1_im1_private_v2_private, Decl(privacyImport.ts, 127, 7)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 85, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 85, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyImport.ts, 103, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 85, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyImport.ts, 85, 35)) var m1_im1_private_v3_private = m1_im1_private.f1; >m1_im1_private_v3_private : Symbol(m1_im1_private_v3_private, Decl(privacyImport.ts, 128, 7)) @@ -319,15 +319,15 @@ module m2 { export var m1_im2_private_v1_public = m1_im2_private.c1; >m1_im2_private_v1_public : Symbol(m1_im2_private_v1_public, Decl(privacyImport.ts, 133, 14)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 95, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 95, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyImport.ts, 129, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 95, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 95, 29)) export var m1_im2_private_v2_public = new m1_im2_private.c1(); >m1_im2_private_v2_public : Symbol(m1_im2_private_v2_public, Decl(privacyImport.ts, 134, 14)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 95, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 95, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyImport.ts, 129, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 95, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 95, 29)) export var m1_im2_private_v3_public = m1_im2_private.f1; >m1_im2_private_v3_public : Symbol(m1_im2_private_v3_public, Decl(privacyImport.ts, 135, 14)) @@ -343,15 +343,15 @@ module m2 { var m1_im2_private_v1_private = m1_im2_private.c1; >m1_im2_private_v1_private : Symbol(m1_im2_private_v1_private, Decl(privacyImport.ts, 137, 7)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 95, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 95, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyImport.ts, 129, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 95, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 95, 29)) var m1_im2_private_v2_private = new m1_im2_private.c1(); >m1_im2_private_v2_private : Symbol(m1_im2_private_v2_private, Decl(privacyImport.ts, 138, 7)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 95, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 95, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyImport.ts, 129, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 95, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyImport.ts, 95, 29)) var m1_im2_private_v3_private = m1_im2_private.f1; >m1_im2_private_v3_private : Symbol(m1_im2_private_v3_private, Decl(privacyImport.ts, 139, 7)) @@ -388,7 +388,7 @@ module m2 { // Parse error to export module export import m1_im1_public = m2_M1_public; >m1_im1_public : Symbol(m1_im1_public, Decl(privacyImport.ts, 140, 56)) ->m2_M1_public : Symbol(m2_M1_public, Decl(privacyImport.ts, 84, 11)) +>m2_M1_public : Symbol(m2_M1_public, Decl(privacyImport.ts, 84, 14)) export import m1_im2_public = m2_M2_private; >m1_im2_public : Symbol(m1_im2_public, Decl(privacyImport.ts, 163, 47)) @@ -398,25 +398,25 @@ module m2 { //export import m1_im4_public = require("m2_M4_private"); } -export module glo_M1_public { +export namespace glo_M1_public { >glo_M1_public : Symbol(glo_M1_public, Decl(privacyImport.ts, 167, 1)) export class c1 { ->c1 : Symbol(c1, Decl(privacyImport.ts, 169, 29)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 169, 32)) } export function f1() { >f1 : Symbol(f1, Decl(privacyImport.ts, 171, 5)) return new c1; ->c1 : Symbol(c1, Decl(privacyImport.ts, 169, 29)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 169, 32)) } export var v1 = c1; >v1 : Symbol(v1, Decl(privacyImport.ts, 175, 14)) ->c1 : Symbol(c1, Decl(privacyImport.ts, 169, 29)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 169, 32)) export var v2: c1; >v2 : Symbol(v2, Decl(privacyImport.ts, 176, 14)) ->c1 : Symbol(c1, Decl(privacyImport.ts, 169, 29)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 169, 32)) } //export declare module "glo_M2_public" { @@ -427,25 +427,25 @@ export module glo_M1_public { // export var v2: c1; //} -export module glo_M3_private { +export namespace glo_M3_private { >glo_M3_private : Symbol(glo_M3_private, Decl(privacyImport.ts, 177, 1)) export class c1 { ->c1 : Symbol(c1, Decl(privacyImport.ts, 187, 30)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 187, 33)) } export function f1() { >f1 : Symbol(f1, Decl(privacyImport.ts, 189, 5)) return new c1; ->c1 : Symbol(c1, Decl(privacyImport.ts, 187, 30)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 187, 33)) } export var v1 = c1; >v1 : Symbol(v1, Decl(privacyImport.ts, 193, 14)) ->c1 : Symbol(c1, Decl(privacyImport.ts, 187, 30)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 187, 33)) export var v2: c1; >v2 : Symbol(v2, Decl(privacyImport.ts, 194, 14)) ->c1 : Symbol(c1, Decl(privacyImport.ts, 187, 30)) +>c1 : Symbol(c1, Decl(privacyImport.ts, 187, 33)) } //export declare module "glo_M4_private" { @@ -463,15 +463,15 @@ import glo_im1_private = glo_M1_public; export var glo_im1_private_v1_public = glo_im1_private.c1; >glo_im1_private_v1_public : Symbol(glo_im1_private_v1_public, Decl(privacyImport.ts, 207, 10)) ->glo_im1_private.c1 : Symbol(glo_im1_private.c1, Decl(privacyImport.ts, 169, 29)) +>glo_im1_private.c1 : Symbol(glo_im1_private.c1, Decl(privacyImport.ts, 169, 32)) >glo_im1_private : Symbol(glo_im1_private, Decl(privacyImport.ts, 195, 1)) ->c1 : Symbol(glo_im1_private.c1, Decl(privacyImport.ts, 169, 29)) +>c1 : Symbol(glo_im1_private.c1, Decl(privacyImport.ts, 169, 32)) export var glo_im1_private_v2_public = new glo_im1_private.c1(); >glo_im1_private_v2_public : Symbol(glo_im1_private_v2_public, Decl(privacyImport.ts, 208, 10)) ->glo_im1_private.c1 : Symbol(glo_im1_private.c1, Decl(privacyImport.ts, 169, 29)) +>glo_im1_private.c1 : Symbol(glo_im1_private.c1, Decl(privacyImport.ts, 169, 32)) >glo_im1_private : Symbol(glo_im1_private, Decl(privacyImport.ts, 195, 1)) ->c1 : Symbol(glo_im1_private.c1, Decl(privacyImport.ts, 169, 29)) +>c1 : Symbol(glo_im1_private.c1, Decl(privacyImport.ts, 169, 32)) export var glo_im1_private_v3_public = glo_im1_private.f1; >glo_im1_private_v3_public : Symbol(glo_im1_private_v3_public, Decl(privacyImport.ts, 209, 10)) @@ -487,15 +487,15 @@ export var glo_im1_private_v4_public = glo_im1_private.f1(); var glo_im1_private_v1_private = glo_im1_private.c1; >glo_im1_private_v1_private : Symbol(glo_im1_private_v1_private, Decl(privacyImport.ts, 211, 3)) ->glo_im1_private.c1 : Symbol(glo_im1_private.c1, Decl(privacyImport.ts, 169, 29)) +>glo_im1_private.c1 : Symbol(glo_im1_private.c1, Decl(privacyImport.ts, 169, 32)) >glo_im1_private : Symbol(glo_im1_private, Decl(privacyImport.ts, 195, 1)) ->c1 : Symbol(glo_im1_private.c1, Decl(privacyImport.ts, 169, 29)) +>c1 : Symbol(glo_im1_private.c1, Decl(privacyImport.ts, 169, 32)) var glo_im1_private_v2_private = new glo_im1_private.c1(); >glo_im1_private_v2_private : Symbol(glo_im1_private_v2_private, Decl(privacyImport.ts, 212, 3)) ->glo_im1_private.c1 : Symbol(glo_im1_private.c1, Decl(privacyImport.ts, 169, 29)) +>glo_im1_private.c1 : Symbol(glo_im1_private.c1, Decl(privacyImport.ts, 169, 32)) >glo_im1_private : Symbol(glo_im1_private, Decl(privacyImport.ts, 195, 1)) ->c1 : Symbol(glo_im1_private.c1, Decl(privacyImport.ts, 169, 29)) +>c1 : Symbol(glo_im1_private.c1, Decl(privacyImport.ts, 169, 32)) var glo_im1_private_v3_private = glo_im1_private.f1; >glo_im1_private_v3_private : Symbol(glo_im1_private_v3_private, Decl(privacyImport.ts, 213, 3)) @@ -526,15 +526,15 @@ import glo_im3_private = glo_M3_private; export var glo_im3_private_v1_public = glo_im3_private.c1; >glo_im3_private_v1_public : Symbol(glo_im3_private_v1_public, Decl(privacyImport.ts, 228, 10)) ->glo_im3_private.c1 : Symbol(glo_im3_private.c1, Decl(privacyImport.ts, 187, 30)) +>glo_im3_private.c1 : Symbol(glo_im3_private.c1, Decl(privacyImport.ts, 187, 33)) >glo_im3_private : Symbol(glo_im3_private, Decl(privacyImport.ts, 214, 54)) ->c1 : Symbol(glo_im3_private.c1, Decl(privacyImport.ts, 187, 30)) +>c1 : Symbol(glo_im3_private.c1, Decl(privacyImport.ts, 187, 33)) export var glo_im3_private_v2_public = new glo_im3_private.c1(); >glo_im3_private_v2_public : Symbol(glo_im3_private_v2_public, Decl(privacyImport.ts, 229, 10)) ->glo_im3_private.c1 : Symbol(glo_im3_private.c1, Decl(privacyImport.ts, 187, 30)) +>glo_im3_private.c1 : Symbol(glo_im3_private.c1, Decl(privacyImport.ts, 187, 33)) >glo_im3_private : Symbol(glo_im3_private, Decl(privacyImport.ts, 214, 54)) ->c1 : Symbol(glo_im3_private.c1, Decl(privacyImport.ts, 187, 30)) +>c1 : Symbol(glo_im3_private.c1, Decl(privacyImport.ts, 187, 33)) export var glo_im3_private_v3_public = glo_im3_private.f1; >glo_im3_private_v3_public : Symbol(glo_im3_private_v3_public, Decl(privacyImport.ts, 230, 10)) @@ -550,15 +550,15 @@ export var glo_im3_private_v4_public = glo_im3_private.f1(); var glo_im3_private_v1_private = glo_im3_private.c1; >glo_im3_private_v1_private : Symbol(glo_im3_private_v1_private, Decl(privacyImport.ts, 232, 3)) ->glo_im3_private.c1 : Symbol(glo_im3_private.c1, Decl(privacyImport.ts, 187, 30)) +>glo_im3_private.c1 : Symbol(glo_im3_private.c1, Decl(privacyImport.ts, 187, 33)) >glo_im3_private : Symbol(glo_im3_private, Decl(privacyImport.ts, 214, 54)) ->c1 : Symbol(glo_im3_private.c1, Decl(privacyImport.ts, 187, 30)) +>c1 : Symbol(glo_im3_private.c1, Decl(privacyImport.ts, 187, 33)) var glo_im3_private_v2_private = new glo_im3_private.c1(); >glo_im3_private_v2_private : Symbol(glo_im3_private_v2_private, Decl(privacyImport.ts, 233, 3)) ->glo_im3_private.c1 : Symbol(glo_im3_private.c1, Decl(privacyImport.ts, 187, 30)) +>glo_im3_private.c1 : Symbol(glo_im3_private.c1, Decl(privacyImport.ts, 187, 33)) >glo_im3_private : Symbol(glo_im3_private, Decl(privacyImport.ts, 214, 54)) ->c1 : Symbol(glo_im3_private.c1, Decl(privacyImport.ts, 187, 30)) +>c1 : Symbol(glo_im3_private.c1, Decl(privacyImport.ts, 187, 33)) var glo_im3_private_v3_private = glo_im3_private.f1; >glo_im3_private_v3_private : Symbol(glo_im3_private_v3_private, Decl(privacyImport.ts, 234, 3)) @@ -680,12 +680,12 @@ export import glo_im2_public = glo_M3_private; // } //} -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(privacyImport.ts, 82, 1), Decl(privacyImport.ts, 249, 46)) //import m3 = require("use_glo_M1_public"); - module m4 { ->m4 : Symbol(m4, Decl(privacyImport.ts, 339, 11)) + namespace m4 { +>m4 : Symbol(m4, Decl(privacyImport.ts, 339, 14)) var a = 10; >a : Symbol(a, Decl(privacyImport.ts, 342, 11)) @@ -695,12 +695,12 @@ module m2 { } -export module m3 { +export namespace m3 { >m3 : Symbol(m3, Decl(privacyImport.ts, 346, 1)) //import m3 = require("use_glo_M1_public"); - module m4 { ->m4 : Symbol(m4, Decl(privacyImport.ts, 348, 18)) + namespace m4 { +>m4 : Symbol(m4, Decl(privacyImport.ts, 348, 21)) var a = 10; >a : Symbol(a, Decl(privacyImport.ts, 351, 11)) diff --git a/tests/baselines/reference/privacyImport.types b/tests/baselines/reference/privacyImport.types index 415eb41ab59e0..88bf687a6110f 100644 --- a/tests/baselines/reference/privacyImport.types +++ b/tests/baselines/reference/privacyImport.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/privacyImport.ts] //// === privacyImport.ts === -export module m1 { +export namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ - export module m1_M1_public { + export namespace m1_M1_public { >m1_M1_public : typeof m1_M1_public > : ^^^^^^^^^^^^^^^^^^^ @@ -34,7 +34,7 @@ export module m1 { > : ^^ } - module m1_M2_private { + namespace m1_M2_private { >m1_M2_private : typeof m1_M2_private > : ^^^^^^^^^^^^^^^^^^^^ @@ -304,11 +304,11 @@ export module m1 { //export import m1_im4_public = require("m1_M4_private"); } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ - export module m2_M1_public { + export namespace m2_M1_public { >m2_M1_public : typeof m2_M1_public > : ^^^^^^^^^^^^^^^^^^^ @@ -337,7 +337,7 @@ module m2 { > : ^^ } - module m2_M2_private { + namespace m2_M2_private { >m2_M2_private : typeof m2_M2_private > : ^^^^^^^^^^^^^^^^^^^^ @@ -608,7 +608,7 @@ module m2 { //export import m1_im4_public = require("m2_M4_private"); } -export module glo_M1_public { +export namespace glo_M1_public { >glo_M1_public : typeof glo_M1_public > : ^^^^^^^^^^^^^^^^^^^^ @@ -645,7 +645,7 @@ export module glo_M1_public { // export var v2: c1; //} -export module glo_M3_private { +export namespace glo_M3_private { >glo_M3_private : typeof glo_M3_private > : ^^^^^^^^^^^^^^^^^^^^^ @@ -994,12 +994,12 @@ export import glo_im2_public = glo_M3_private; // } //} -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ //import m3 = require("use_glo_M1_public"); - module m4 { + namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ @@ -1014,12 +1014,12 @@ module m2 { } -export module m3 { +export namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ //import m3 = require("use_glo_M1_public"); - module m4 { + namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/privacyImportParseErrors.errors.txt b/tests/baselines/reference/privacyImportParseErrors.errors.txt index 83b3fd5b490e9..3cb6bc26e40c8 100644 --- a/tests/baselines/reference/privacyImportParseErrors.errors.txt +++ b/tests/baselines/reference/privacyImportParseErrors.errors.txt @@ -56,8 +56,8 @@ privacyImportParseErrors.ts(353,29): error TS1147: Import declarations in a name ==== privacyImportParseErrors.ts (55 errors) ==== - export module m1 { - export module m1_M1_public { + export namespace m1 { + export namespace m1_M1_public { export class c1 { } export function f1() { @@ -67,7 +67,7 @@ privacyImportParseErrors.ts(353,29): error TS1147: Import declarations in a name export var v2: c1; } - module m1_M2_private { + namespace m1_M2_private { export class c1 { } export function f1() { @@ -158,8 +158,8 @@ privacyImportParseErrors.ts(353,29): error TS1147: Import declarations in a name !!! error TS1147: Import declarations in a namespace cannot reference a module. } - module m2 { - export module m2_M1_public { + namespace m2 { + export namespace m2_M1_public { export class c1 { } export function f1() { @@ -169,7 +169,7 @@ privacyImportParseErrors.ts(353,29): error TS1147: Import declarations in a name export var v2: c1; } - module m2_M2_private { + namespace m2_M2_private { export class c1 { } export function f1() { @@ -261,7 +261,7 @@ privacyImportParseErrors.ts(353,29): error TS1147: Import declarations in a name !!! error TS1147: Import declarations in a namespace cannot reference a module. } - export module glo_M1_public { + export namespace glo_M1_public { export class c1 { } export function f1() { @@ -283,7 +283,7 @@ privacyImportParseErrors.ts(353,29): error TS1147: Import declarations in a name export var v2: c1; } - export module glo_M3_private { + export namespace glo_M3_private { export class c1 { } export function f1() { @@ -389,13 +389,13 @@ privacyImportParseErrors.ts(353,29): error TS1147: Import declarations in a name var use_glo_M2_public_v2_private: use_glo_M2_public; var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1; - module m2 { + namespace m2 { import errorImport = require("glo_M2_public"); ~~~~~~~~~~~~~~~ !!! error TS1147: Import declarations in a namespace cannot reference a module. import nonerrorImport = glo_M1_public; - module m5 { + namespace m5 { import m5_errorImport = require("glo_M2_public"); ~~~~~~~~~~~~~~~ !!! error TS1147: Import declarations in a namespace cannot reference a module. @@ -430,13 +430,13 @@ privacyImportParseErrors.ts(353,29): error TS1147: Import declarations in a name var use_glo_M4_private_v2_private: use_glo_M4_private; var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1; - module m2 { + namespace m2 { import errorImport = require("glo_M4_private"); ~~~~~~~~~~~~~~~~ !!! error TS1147: Import declarations in a namespace cannot reference a module. import nonerrorImport = glo_M3_private; - module m5 { + namespace m5 { import m5_errorImport = require("glo_M4_private"); ~~~~~~~~~~~~~~~~ !!! error TS1147: Import declarations in a namespace cannot reference a module. @@ -448,7 +448,7 @@ privacyImportParseErrors.ts(353,29): error TS1147: Import declarations in a name declare module "anotherParseError" { ~~~~~~~~~~~~~~~~~~~ !!! error TS2664: Invalid module name in augmentation, module 'anotherParseError' cannot be found. - module m2 { + namespace m2 { declare module "abc" { ~~~~~~~ !!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. @@ -457,7 +457,7 @@ privacyImportParseErrors.ts(353,29): error TS1147: Import declarations in a name } } - module m2 { + namespace m2 { module "abc2" { ~~~~~~ !!! error TS2435: Ambient modules cannot be nested in other modules or namespaces. @@ -476,7 +476,7 @@ privacyImportParseErrors.ts(353,29): error TS1147: Import declarations in a name !!! error TS1029: 'export' modifier must precede 'declare' modifier. ~~~~~~~~~~~~~~~~~~~~ !!! error TS2664: Invalid module name in augmentation, module 'anotherParseError2' cannot be found. - module m2 { + namespace m2 { declare module "abc" { ~~~~~~~ !!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. @@ -485,7 +485,7 @@ privacyImportParseErrors.ts(353,29): error TS1147: Import declarations in a name } } - module m2 { + namespace m2 { module "abc2" { ~~~~~~ !!! error TS2435: Ambient modules cannot be nested in other modules or namespaces. @@ -497,11 +497,11 @@ privacyImportParseErrors.ts(353,29): error TS1147: Import declarations in a name } } - module m2 { + namespace m2 { import m3 = require("use_glo_M1_public"); ~~~~~~~~~~~~~~~~~~~ !!! error TS1147: Import declarations in a namespace cannot reference a module. - module m4 { + namespace m4 { var a = 10; import m2 = require("use_glo_M1_public"); ~~~~~~~~~~~~~~~~~~~ @@ -510,11 +510,11 @@ privacyImportParseErrors.ts(353,29): error TS1147: Import declarations in a name } - export module m3 { + export namespace m3 { import m3 = require("use_glo_M1_public"); ~~~~~~~~~~~~~~~~~~~ !!! error TS1147: Import declarations in a namespace cannot reference a module. - module m4 { + namespace m4 { var a = 10; import m2 = require("use_glo_M1_public"); ~~~~~~~~~~~~~~~~~~~ diff --git a/tests/baselines/reference/privacyImportParseErrors.js b/tests/baselines/reference/privacyImportParseErrors.js index 3658ae88d0c7a..458384c146172 100644 --- a/tests/baselines/reference/privacyImportParseErrors.js +++ b/tests/baselines/reference/privacyImportParseErrors.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/privacyImportParseErrors.ts] //// //// [privacyImportParseErrors.ts] -export module m1 { - export module m1_M1_public { +export namespace m1 { + export namespace m1_M1_public { export class c1 { } export function f1() { @@ -12,7 +12,7 @@ export module m1 { export var v2: c1; } - module m1_M2_private { + namespace m1_M2_private { export class c1 { } export function f1() { @@ -85,8 +85,8 @@ export module m1 { export import m1_im4_public = require("m1_M4_private"); } -module m2 { - export module m2_M1_public { +namespace m2 { + export namespace m2_M1_public { export class c1 { } export function f1() { @@ -96,7 +96,7 @@ module m2 { export var v2: c1; } - module m2_M2_private { + namespace m2_M2_private { export class c1 { } export function f1() { @@ -170,7 +170,7 @@ module m2 { export import m1_im4_public = require("m2_M4_private"); } -export module glo_M1_public { +export namespace glo_M1_public { export class c1 { } export function f1() { @@ -188,7 +188,7 @@ export declare module "glo_M2_public" { export var v2: c1; } -export module glo_M3_private { +export namespace glo_M3_private { export class c1 { } export function f1() { @@ -272,11 +272,11 @@ export declare module "use_glo_M1_public" { var use_glo_M2_public_v2_private: use_glo_M2_public; var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1; - module m2 { + namespace m2 { import errorImport = require("glo_M2_public"); import nonerrorImport = glo_M1_public; - module m5 { + namespace m5 { import m5_errorImport = require("glo_M2_public"); import m5_nonerrorImport = glo_M1_public; } @@ -301,11 +301,11 @@ declare module "use_glo_M3_private" { var use_glo_M4_private_v2_private: use_glo_M4_private; var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1; - module m2 { + namespace m2 { import errorImport = require("glo_M4_private"); import nonerrorImport = glo_M3_private; - module m5 { + namespace m5 { import m5_errorImport = require("glo_M4_private"); import m5_nonerrorImport = glo_M3_private; } @@ -313,12 +313,12 @@ declare module "use_glo_M3_private" { } declare module "anotherParseError" { - module m2 { + namespace m2 { declare module "abc" { } } - module m2 { + namespace m2 { module "abc2" { } } @@ -327,12 +327,12 @@ declare module "anotherParseError" { } declare export module "anotherParseError2" { - module m2 { + namespace m2 { declare module "abc" { } } - module m2 { + namespace m2 { module "abc2" { } } @@ -340,18 +340,18 @@ declare export module "anotherParseError2" { } } -module m2 { +namespace m2 { import m3 = require("use_glo_M1_public"); - module m4 { + namespace m4 { var a = 10; import m2 = require("use_glo_M1_public"); } } -export module m3 { +export namespace m3 { import m3 = require("use_glo_M1_public"); - module m4 { + namespace m4 { var a = 10; import m2 = require("use_glo_M1_public"); } diff --git a/tests/baselines/reference/privacyImportParseErrors.symbols b/tests/baselines/reference/privacyImportParseErrors.symbols index 745bafe105dc5..a9d522b359b96 100644 --- a/tests/baselines/reference/privacyImportParseErrors.symbols +++ b/tests/baselines/reference/privacyImportParseErrors.symbols @@ -1,49 +1,49 @@ //// [tests/cases/compiler/privacyImportParseErrors.ts] //// === privacyImportParseErrors.ts === -export module m1 { +export namespace m1 { >m1 : Symbol(m1, Decl(privacyImportParseErrors.ts, 0, 0)) - export module m1_M1_public { ->m1_M1_public : Symbol(m1_M1_public, Decl(privacyImportParseErrors.ts, 0, 18)) + export namespace m1_M1_public { +>m1_M1_public : Symbol(m1_M1_public, Decl(privacyImportParseErrors.ts, 0, 21)) export class c1 { ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 1, 32)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 1, 35)) } export function f1() { >f1 : Symbol(f1, Decl(privacyImportParseErrors.ts, 3, 9)) return new c1; ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 1, 32)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 1, 35)) } export var v1 = c1; >v1 : Symbol(v1, Decl(privacyImportParseErrors.ts, 7, 18)) ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 1, 32)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 1, 35)) export var v2: c1; >v2 : Symbol(v2, Decl(privacyImportParseErrors.ts, 8, 18)) ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 1, 32)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 1, 35)) } - module m1_M2_private { + namespace m1_M2_private { >m1_M2_private : Symbol(m1_M2_private, Decl(privacyImportParseErrors.ts, 9, 5)) export class c1 { ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 11, 26)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 11, 29)) } export function f1() { >f1 : Symbol(f1, Decl(privacyImportParseErrors.ts, 13, 9)) return new c1; ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 11, 26)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 11, 29)) } export var v1 = c1; >v1 : Symbol(v1, Decl(privacyImportParseErrors.ts, 17, 18)) ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 11, 26)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 11, 29)) export var v2: c1; >v2 : Symbol(v2, Decl(privacyImportParseErrors.ts, 18, 18)) ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 11, 26)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 11, 29)) } export declare module "m1_M3_public" { @@ -84,19 +84,19 @@ export module m1 { import m1_im1_private = m1_M1_public; >m1_im1_private : Symbol(m1_im1_private, Decl(privacyImportParseErrors.ts, 35, 5)) ->m1_M1_public : Symbol(m1_M1_public, Decl(privacyImportParseErrors.ts, 0, 18)) +>m1_M1_public : Symbol(m1_M1_public, Decl(privacyImportParseErrors.ts, 0, 21)) export var m1_im1_private_v1_public = m1_im1_private.c1; >m1_im1_private_v1_public : Symbol(m1_im1_private_v1_public, Decl(privacyImportParseErrors.ts, 38, 14)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 1, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 1, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyImportParseErrors.ts, 35, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 1, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 1, 35)) export var m1_im1_private_v2_public = new m1_im1_private.c1(); >m1_im1_private_v2_public : Symbol(m1_im1_private_v2_public, Decl(privacyImportParseErrors.ts, 39, 14)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 1, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 1, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyImportParseErrors.ts, 35, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 1, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 1, 35)) export var m1_im1_private_v3_public = m1_im1_private.f1; >m1_im1_private_v3_public : Symbol(m1_im1_private_v3_public, Decl(privacyImportParseErrors.ts, 40, 14)) @@ -112,15 +112,15 @@ export module m1 { var m1_im1_private_v1_private = m1_im1_private.c1; >m1_im1_private_v1_private : Symbol(m1_im1_private_v1_private, Decl(privacyImportParseErrors.ts, 42, 7)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 1, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 1, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyImportParseErrors.ts, 35, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 1, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 1, 35)) var m1_im1_private_v2_private = new m1_im1_private.c1(); >m1_im1_private_v2_private : Symbol(m1_im1_private_v2_private, Decl(privacyImportParseErrors.ts, 43, 7)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 1, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 1, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyImportParseErrors.ts, 35, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 1, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 1, 35)) var m1_im1_private_v3_private = m1_im1_private.f1; >m1_im1_private_v3_private : Symbol(m1_im1_private_v3_private, Decl(privacyImportParseErrors.ts, 44, 7)) @@ -141,15 +141,15 @@ export module m1 { export var m1_im2_private_v1_public = m1_im2_private.c1; >m1_im2_private_v1_public : Symbol(m1_im2_private_v1_public, Decl(privacyImportParseErrors.ts, 49, 14)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 11, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 11, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyImportParseErrors.ts, 45, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 11, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 11, 29)) export var m1_im2_private_v2_public = new m1_im2_private.c1(); >m1_im2_private_v2_public : Symbol(m1_im2_private_v2_public, Decl(privacyImportParseErrors.ts, 50, 14)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 11, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 11, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyImportParseErrors.ts, 45, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 11, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 11, 29)) export var m1_im2_private_v3_public = m1_im2_private.f1; >m1_im2_private_v3_public : Symbol(m1_im2_private_v3_public, Decl(privacyImportParseErrors.ts, 51, 14)) @@ -165,15 +165,15 @@ export module m1 { var m1_im2_private_v1_private = m1_im2_private.c1; >m1_im2_private_v1_private : Symbol(m1_im2_private_v1_private, Decl(privacyImportParseErrors.ts, 53, 7)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 11, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 11, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyImportParseErrors.ts, 45, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 11, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 11, 29)) var m1_im2_private_v2_private = new m1_im2_private.c1(); >m1_im2_private_v2_private : Symbol(m1_im2_private_v2_private, Decl(privacyImportParseErrors.ts, 54, 7)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 11, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 11, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyImportParseErrors.ts, 45, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 11, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 11, 29)) var m1_im2_private_v3_private = m1_im2_private.f1; >m1_im2_private_v3_private : Symbol(m1_im2_private_v3_private, Decl(privacyImportParseErrors.ts, 55, 7)) @@ -259,7 +259,7 @@ export module m1 { export import m1_im1_public = m1_M1_public; >m1_im1_public : Symbol(m1_im1_public, Decl(privacyImportParseErrors.ts, 76, 56)) ->m1_M1_public : Symbol(m1_M1_public, Decl(privacyImportParseErrors.ts, 0, 18)) +>m1_M1_public : Symbol(m1_M1_public, Decl(privacyImportParseErrors.ts, 0, 21)) export import m1_im2_public = m1_M2_private; >m1_im2_public : Symbol(m1_im2_public, Decl(privacyImportParseErrors.ts, 78, 47)) @@ -272,49 +272,49 @@ export module m1 { >m1_im4_public : Symbol(m1_im4_public, Decl(privacyImportParseErrors.ts, 80, 58)) } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(privacyImportParseErrors.ts, 82, 1), Decl(privacyImportParseErrors.ts, 337, 1)) - export module m2_M1_public { ->m2_M1_public : Symbol(m2_M1_public, Decl(privacyImportParseErrors.ts, 84, 11)) + export namespace m2_M1_public { +>m2_M1_public : Symbol(m2_M1_public, Decl(privacyImportParseErrors.ts, 84, 14)) export class c1 { ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 85, 32)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 85, 35)) } export function f1() { >f1 : Symbol(f1, Decl(privacyImportParseErrors.ts, 87, 9)) return new c1; ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 85, 32)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 85, 35)) } export var v1 = c1; >v1 : Symbol(v1, Decl(privacyImportParseErrors.ts, 91, 18)) ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 85, 32)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 85, 35)) export var v2: c1; >v2 : Symbol(v2, Decl(privacyImportParseErrors.ts, 92, 18)) ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 85, 32)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 85, 35)) } - module m2_M2_private { + namespace m2_M2_private { >m2_M2_private : Symbol(m2_M2_private, Decl(privacyImportParseErrors.ts, 93, 5)) export class c1 { ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 95, 26)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 95, 29)) } export function f1() { >f1 : Symbol(f1, Decl(privacyImportParseErrors.ts, 97, 9)) return new c1; ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 95, 26)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 95, 29)) } export var v1 = c1; >v1 : Symbol(v1, Decl(privacyImportParseErrors.ts, 101, 18)) ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 95, 26)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 95, 29)) export var v2: c1; >v2 : Symbol(v2, Decl(privacyImportParseErrors.ts, 102, 18)) ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 95, 26)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 95, 29)) } export declare module "m2_M3_public" { @@ -355,19 +355,19 @@ module m2 { import m1_im1_private = m2_M1_public; >m1_im1_private : Symbol(m1_im1_private, Decl(privacyImportParseErrors.ts, 119, 5)) ->m2_M1_public : Symbol(m2_M1_public, Decl(privacyImportParseErrors.ts, 84, 11)) +>m2_M1_public : Symbol(m2_M1_public, Decl(privacyImportParseErrors.ts, 84, 14)) export var m1_im1_private_v1_public = m1_im1_private.c1; >m1_im1_private_v1_public : Symbol(m1_im1_private_v1_public, Decl(privacyImportParseErrors.ts, 122, 14)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 85, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 85, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyImportParseErrors.ts, 119, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 85, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 85, 35)) export var m1_im1_private_v2_public = new m1_im1_private.c1(); >m1_im1_private_v2_public : Symbol(m1_im1_private_v2_public, Decl(privacyImportParseErrors.ts, 123, 14)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 85, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 85, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyImportParseErrors.ts, 119, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 85, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 85, 35)) export var m1_im1_private_v3_public = m1_im1_private.f1; >m1_im1_private_v3_public : Symbol(m1_im1_private_v3_public, Decl(privacyImportParseErrors.ts, 124, 14)) @@ -383,15 +383,15 @@ module m2 { var m1_im1_private_v1_private = m1_im1_private.c1; >m1_im1_private_v1_private : Symbol(m1_im1_private_v1_private, Decl(privacyImportParseErrors.ts, 126, 7)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 85, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 85, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyImportParseErrors.ts, 119, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 85, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 85, 35)) var m1_im1_private_v2_private = new m1_im1_private.c1(); >m1_im1_private_v2_private : Symbol(m1_im1_private_v2_private, Decl(privacyImportParseErrors.ts, 127, 7)) ->m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 85, 32)) +>m1_im1_private.c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 85, 35)) >m1_im1_private : Symbol(m1_im1_private, Decl(privacyImportParseErrors.ts, 119, 5)) ->c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 85, 32)) +>c1 : Symbol(m1_im1_private.c1, Decl(privacyImportParseErrors.ts, 85, 35)) var m1_im1_private_v3_private = m1_im1_private.f1; >m1_im1_private_v3_private : Symbol(m1_im1_private_v3_private, Decl(privacyImportParseErrors.ts, 128, 7)) @@ -412,15 +412,15 @@ module m2 { export var m1_im2_private_v1_public = m1_im2_private.c1; >m1_im2_private_v1_public : Symbol(m1_im2_private_v1_public, Decl(privacyImportParseErrors.ts, 133, 14)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 95, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 95, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyImportParseErrors.ts, 129, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 95, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 95, 29)) export var m1_im2_private_v2_public = new m1_im2_private.c1(); >m1_im2_private_v2_public : Symbol(m1_im2_private_v2_public, Decl(privacyImportParseErrors.ts, 134, 14)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 95, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 95, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyImportParseErrors.ts, 129, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 95, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 95, 29)) export var m1_im2_private_v3_public = m1_im2_private.f1; >m1_im2_private_v3_public : Symbol(m1_im2_private_v3_public, Decl(privacyImportParseErrors.ts, 135, 14)) @@ -436,15 +436,15 @@ module m2 { var m1_im2_private_v1_private = m1_im2_private.c1; >m1_im2_private_v1_private : Symbol(m1_im2_private_v1_private, Decl(privacyImportParseErrors.ts, 137, 7)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 95, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 95, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyImportParseErrors.ts, 129, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 95, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 95, 29)) var m1_im2_private_v2_private = new m1_im2_private.c1(); >m1_im2_private_v2_private : Symbol(m1_im2_private_v2_private, Decl(privacyImportParseErrors.ts, 138, 7)) ->m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 95, 26)) +>m1_im2_private.c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 95, 29)) >m1_im2_private : Symbol(m1_im2_private, Decl(privacyImportParseErrors.ts, 129, 56)) ->c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 95, 26)) +>c1 : Symbol(m1_im2_private.c1, Decl(privacyImportParseErrors.ts, 95, 29)) var m1_im2_private_v3_private = m1_im2_private.f1; >m1_im2_private_v3_private : Symbol(m1_im2_private_v3_private, Decl(privacyImportParseErrors.ts, 139, 7)) @@ -531,7 +531,7 @@ module m2 { // Parse error to export module export import m1_im1_public = m2_M1_public; >m1_im1_public : Symbol(m1_im1_public, Decl(privacyImportParseErrors.ts, 160, 56)) ->m2_M1_public : Symbol(m2_M1_public, Decl(privacyImportParseErrors.ts, 84, 11)) +>m2_M1_public : Symbol(m2_M1_public, Decl(privacyImportParseErrors.ts, 84, 14)) export import m1_im2_public = m2_M2_private; >m1_im2_public : Symbol(m1_im2_public, Decl(privacyImportParseErrors.ts, 163, 47)) @@ -544,25 +544,25 @@ module m2 { >m1_im4_public : Symbol(m1_im4_public, Decl(privacyImportParseErrors.ts, 165, 58)) } -export module glo_M1_public { +export namespace glo_M1_public { >glo_M1_public : Symbol(glo_M1_public, Decl(privacyImportParseErrors.ts, 167, 1)) export class c1 { ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 169, 29)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 169, 32)) } export function f1() { >f1 : Symbol(f1, Decl(privacyImportParseErrors.ts, 171, 5)) return new c1; ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 169, 29)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 169, 32)) } export var v1 = c1; >v1 : Symbol(v1, Decl(privacyImportParseErrors.ts, 175, 14)) ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 169, 29)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 169, 32)) export var v2: c1; >v2 : Symbol(v2, Decl(privacyImportParseErrors.ts, 176, 14)) ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 169, 29)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 169, 32)) } export declare module "glo_M2_public" { @@ -583,25 +583,25 @@ export declare module "glo_M2_public" { >c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 180, 25)) } -export module glo_M3_private { +export namespace glo_M3_private { >glo_M3_private : Symbol(glo_M3_private, Decl(privacyImportParseErrors.ts, 185, 1)) export class c1 { ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 187, 30)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 187, 33)) } export function f1() { >f1 : Symbol(f1, Decl(privacyImportParseErrors.ts, 189, 5)) return new c1; ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 187, 30)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 187, 33)) } export var v1 = c1; >v1 : Symbol(v1, Decl(privacyImportParseErrors.ts, 193, 14)) ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 187, 30)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 187, 33)) export var v2: c1; >v2 : Symbol(v2, Decl(privacyImportParseErrors.ts, 194, 14)) ->c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 187, 30)) +>c1 : Symbol(c1, Decl(privacyImportParseErrors.ts, 187, 33)) } export declare module "glo_M4_private" { @@ -629,15 +629,15 @@ import glo_im1_private = glo_M1_public; export var glo_im1_private_v1_public = glo_im1_private.c1; >glo_im1_private_v1_public : Symbol(glo_im1_private_v1_public, Decl(privacyImportParseErrors.ts, 207, 10)) ->glo_im1_private.c1 : Symbol(glo_im1_private.c1, Decl(privacyImportParseErrors.ts, 169, 29)) +>glo_im1_private.c1 : Symbol(glo_im1_private.c1, Decl(privacyImportParseErrors.ts, 169, 32)) >glo_im1_private : Symbol(glo_im1_private, Decl(privacyImportParseErrors.ts, 203, 1)) ->c1 : Symbol(glo_im1_private.c1, Decl(privacyImportParseErrors.ts, 169, 29)) +>c1 : Symbol(glo_im1_private.c1, Decl(privacyImportParseErrors.ts, 169, 32)) export var glo_im1_private_v2_public = new glo_im1_private.c1(); >glo_im1_private_v2_public : Symbol(glo_im1_private_v2_public, Decl(privacyImportParseErrors.ts, 208, 10)) ->glo_im1_private.c1 : Symbol(glo_im1_private.c1, Decl(privacyImportParseErrors.ts, 169, 29)) +>glo_im1_private.c1 : Symbol(glo_im1_private.c1, Decl(privacyImportParseErrors.ts, 169, 32)) >glo_im1_private : Symbol(glo_im1_private, Decl(privacyImportParseErrors.ts, 203, 1)) ->c1 : Symbol(glo_im1_private.c1, Decl(privacyImportParseErrors.ts, 169, 29)) +>c1 : Symbol(glo_im1_private.c1, Decl(privacyImportParseErrors.ts, 169, 32)) export var glo_im1_private_v3_public = glo_im1_private.f1; >glo_im1_private_v3_public : Symbol(glo_im1_private_v3_public, Decl(privacyImportParseErrors.ts, 209, 10)) @@ -653,15 +653,15 @@ export var glo_im1_private_v4_public = glo_im1_private.f1(); var glo_im1_private_v1_private = glo_im1_private.c1; >glo_im1_private_v1_private : Symbol(glo_im1_private_v1_private, Decl(privacyImportParseErrors.ts, 211, 3)) ->glo_im1_private.c1 : Symbol(glo_im1_private.c1, Decl(privacyImportParseErrors.ts, 169, 29)) +>glo_im1_private.c1 : Symbol(glo_im1_private.c1, Decl(privacyImportParseErrors.ts, 169, 32)) >glo_im1_private : Symbol(glo_im1_private, Decl(privacyImportParseErrors.ts, 203, 1)) ->c1 : Symbol(glo_im1_private.c1, Decl(privacyImportParseErrors.ts, 169, 29)) +>c1 : Symbol(glo_im1_private.c1, Decl(privacyImportParseErrors.ts, 169, 32)) var glo_im1_private_v2_private = new glo_im1_private.c1(); >glo_im1_private_v2_private : Symbol(glo_im1_private_v2_private, Decl(privacyImportParseErrors.ts, 212, 3)) ->glo_im1_private.c1 : Symbol(glo_im1_private.c1, Decl(privacyImportParseErrors.ts, 169, 29)) +>glo_im1_private.c1 : Symbol(glo_im1_private.c1, Decl(privacyImportParseErrors.ts, 169, 32)) >glo_im1_private : Symbol(glo_im1_private, Decl(privacyImportParseErrors.ts, 203, 1)) ->c1 : Symbol(glo_im1_private.c1, Decl(privacyImportParseErrors.ts, 169, 29)) +>c1 : Symbol(glo_im1_private.c1, Decl(privacyImportParseErrors.ts, 169, 32)) var glo_im1_private_v3_private = glo_im1_private.f1; >glo_im1_private_v3_private : Symbol(glo_im1_private_v3_private, Decl(privacyImportParseErrors.ts, 213, 3)) @@ -717,15 +717,15 @@ import glo_im3_private = glo_M3_private; export var glo_im3_private_v1_public = glo_im3_private.c1; >glo_im3_private_v1_public : Symbol(glo_im3_private_v1_public, Decl(privacyImportParseErrors.ts, 228, 10)) ->glo_im3_private.c1 : Symbol(glo_im3_private.c1, Decl(privacyImportParseErrors.ts, 187, 30)) +>glo_im3_private.c1 : Symbol(glo_im3_private.c1, Decl(privacyImportParseErrors.ts, 187, 33)) >glo_im3_private : Symbol(glo_im3_private, Decl(privacyImportParseErrors.ts, 225, 54)) ->c1 : Symbol(glo_im3_private.c1, Decl(privacyImportParseErrors.ts, 187, 30)) +>c1 : Symbol(glo_im3_private.c1, Decl(privacyImportParseErrors.ts, 187, 33)) export var glo_im3_private_v2_public = new glo_im3_private.c1(); >glo_im3_private_v2_public : Symbol(glo_im3_private_v2_public, Decl(privacyImportParseErrors.ts, 229, 10)) ->glo_im3_private.c1 : Symbol(glo_im3_private.c1, Decl(privacyImportParseErrors.ts, 187, 30)) +>glo_im3_private.c1 : Symbol(glo_im3_private.c1, Decl(privacyImportParseErrors.ts, 187, 33)) >glo_im3_private : Symbol(glo_im3_private, Decl(privacyImportParseErrors.ts, 225, 54)) ->c1 : Symbol(glo_im3_private.c1, Decl(privacyImportParseErrors.ts, 187, 30)) +>c1 : Symbol(glo_im3_private.c1, Decl(privacyImportParseErrors.ts, 187, 33)) export var glo_im3_private_v3_public = glo_im3_private.f1; >glo_im3_private_v3_public : Symbol(glo_im3_private_v3_public, Decl(privacyImportParseErrors.ts, 230, 10)) @@ -741,15 +741,15 @@ export var glo_im3_private_v4_public = glo_im3_private.f1(); var glo_im3_private_v1_private = glo_im3_private.c1; >glo_im3_private_v1_private : Symbol(glo_im3_private_v1_private, Decl(privacyImportParseErrors.ts, 232, 3)) ->glo_im3_private.c1 : Symbol(glo_im3_private.c1, Decl(privacyImportParseErrors.ts, 187, 30)) +>glo_im3_private.c1 : Symbol(glo_im3_private.c1, Decl(privacyImportParseErrors.ts, 187, 33)) >glo_im3_private : Symbol(glo_im3_private, Decl(privacyImportParseErrors.ts, 225, 54)) ->c1 : Symbol(glo_im3_private.c1, Decl(privacyImportParseErrors.ts, 187, 30)) +>c1 : Symbol(glo_im3_private.c1, Decl(privacyImportParseErrors.ts, 187, 33)) var glo_im3_private_v2_private = new glo_im3_private.c1(); >glo_im3_private_v2_private : Symbol(glo_im3_private_v2_private, Decl(privacyImportParseErrors.ts, 233, 3)) ->glo_im3_private.c1 : Symbol(glo_im3_private.c1, Decl(privacyImportParseErrors.ts, 187, 30)) +>glo_im3_private.c1 : Symbol(glo_im3_private.c1, Decl(privacyImportParseErrors.ts, 187, 33)) >glo_im3_private : Symbol(glo_im3_private, Decl(privacyImportParseErrors.ts, 225, 54)) ->c1 : Symbol(glo_im3_private.c1, Decl(privacyImportParseErrors.ts, 187, 30)) +>c1 : Symbol(glo_im3_private.c1, Decl(privacyImportParseErrors.ts, 187, 33)) var glo_im3_private_v3_private = glo_im3_private.f1; >glo_im3_private_v3_private : Symbol(glo_im3_private_v3_private, Decl(privacyImportParseErrors.ts, 234, 3)) @@ -824,7 +824,7 @@ export declare module "use_glo_M1_public" { export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; }; >use_glo_M1_public_v1_public : Symbol(use_glo_M1_public_v1_public, Decl(privacyImportParseErrors.ts, 256, 14)) >use_glo_M1_public : Symbol(use_glo_M1_public, Decl(privacyImportParseErrors.ts, 254, 43)) ->c1 : Symbol(use_glo_M1_public.c1, Decl(privacyImportParseErrors.ts, 169, 29)) +>c1 : Symbol(use_glo_M1_public.c1, Decl(privacyImportParseErrors.ts, 169, 32)) export var use_glo_M1_public_v2_public: use_glo_M1_public; >use_glo_M1_public_v2_public : Symbol(use_glo_M1_public_v2_public, Decl(privacyImportParseErrors.ts, 257, 14)) @@ -833,12 +833,12 @@ export declare module "use_glo_M1_public" { export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1; >use_glo_M1_public_v3_public : Symbol(use_glo_M1_public_v3_public, Decl(privacyImportParseErrors.ts, 258, 14)) >use_glo_M1_public : Symbol(use_glo_M1_public, Decl(privacyImportParseErrors.ts, 254, 43)) ->c1 : Symbol(use_glo_M1_public.c1, Decl(privacyImportParseErrors.ts, 169, 29)) +>c1 : Symbol(use_glo_M1_public.c1, Decl(privacyImportParseErrors.ts, 169, 32)) var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; }; >use_glo_M1_public_v1_private : Symbol(use_glo_M1_public_v1_private, Decl(privacyImportParseErrors.ts, 259, 7)) >use_glo_M1_public : Symbol(use_glo_M1_public, Decl(privacyImportParseErrors.ts, 254, 43)) ->c1 : Symbol(use_glo_M1_public.c1, Decl(privacyImportParseErrors.ts, 169, 29)) +>c1 : Symbol(use_glo_M1_public.c1, Decl(privacyImportParseErrors.ts, 169, 32)) var use_glo_M1_public_v2_private: use_glo_M1_public; >use_glo_M1_public_v2_private : Symbol(use_glo_M1_public_v2_private, Decl(privacyImportParseErrors.ts, 260, 7)) @@ -847,7 +847,7 @@ export declare module "use_glo_M1_public" { var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1; >use_glo_M1_public_v3_private : Symbol(use_glo_M1_public_v3_private, Decl(privacyImportParseErrors.ts, 261, 7)) >use_glo_M1_public : Symbol(use_glo_M1_public, Decl(privacyImportParseErrors.ts, 254, 43)) ->c1 : Symbol(use_glo_M1_public.c1, Decl(privacyImportParseErrors.ts, 169, 29)) +>c1 : Symbol(use_glo_M1_public.c1, Decl(privacyImportParseErrors.ts, 169, 32)) import use_glo_M2_public = require("glo_M2_public"); >use_glo_M2_public : Symbol(use_glo_M2_public, Decl(privacyImportParseErrors.ts, 261, 65)) @@ -880,21 +880,21 @@ export declare module "use_glo_M1_public" { >use_glo_M2_public : Symbol(use_glo_M2_public, Decl(privacyImportParseErrors.ts, 261, 65)) >c1 : Symbol(use_glo_M2_public.c1) - module m2 { + namespace m2 { >m2 : Symbol(m2, Decl(privacyImportParseErrors.ts, 269, 65)) import errorImport = require("glo_M2_public"); ->errorImport : Symbol(errorImport, Decl(privacyImportParseErrors.ts, 271, 15)) +>errorImport : Symbol(errorImport, Decl(privacyImportParseErrors.ts, 271, 18)) import nonerrorImport = glo_M1_public; >nonerrorImport : Symbol(nonerrorImport, Decl(privacyImportParseErrors.ts, 272, 54)) >glo_M1_public : Symbol(nonerrorImport, Decl(privacyImportParseErrors.ts, 167, 1)) - module m5 { + namespace m5 { >m5 : Symbol(m5, Decl(privacyImportParseErrors.ts, 273, 46)) import m5_errorImport = require("glo_M2_public"); ->m5_errorImport : Symbol(m5_errorImport, Decl(privacyImportParseErrors.ts, 275, 19)) +>m5_errorImport : Symbol(m5_errorImport, Decl(privacyImportParseErrors.ts, 275, 22)) import m5_nonerrorImport = glo_M1_public; >m5_nonerrorImport : Symbol(m5_nonerrorImport, Decl(privacyImportParseErrors.ts, 276, 61)) @@ -914,7 +914,7 @@ declare module "use_glo_M3_private" { export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; }; >use_glo_M3_private_v1_public : Symbol(use_glo_M3_private_v1_public, Decl(privacyImportParseErrors.ts, 285, 14)) >use_glo_M3_private : Symbol(use_glo_M3_private, Decl(privacyImportParseErrors.ts, 283, 37)) ->c1 : Symbol(use_glo_M3_private.c1, Decl(privacyImportParseErrors.ts, 187, 30)) +>c1 : Symbol(use_glo_M3_private.c1, Decl(privacyImportParseErrors.ts, 187, 33)) export var use_glo_M3_private_v2_public: use_glo_M3_private; >use_glo_M3_private_v2_public : Symbol(use_glo_M3_private_v2_public, Decl(privacyImportParseErrors.ts, 286, 14)) @@ -923,12 +923,12 @@ declare module "use_glo_M3_private" { export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1; >use_glo_M3_private_v3_public : Symbol(use_glo_M3_private_v3_public, Decl(privacyImportParseErrors.ts, 287, 14)) >use_glo_M3_private : Symbol(use_glo_M3_private, Decl(privacyImportParseErrors.ts, 283, 37)) ->c1 : Symbol(use_glo_M3_private.c1, Decl(privacyImportParseErrors.ts, 187, 30)) +>c1 : Symbol(use_glo_M3_private.c1, Decl(privacyImportParseErrors.ts, 187, 33)) var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; }; >use_glo_M3_private_v1_private : Symbol(use_glo_M3_private_v1_private, Decl(privacyImportParseErrors.ts, 288, 7)) >use_glo_M3_private : Symbol(use_glo_M3_private, Decl(privacyImportParseErrors.ts, 283, 37)) ->c1 : Symbol(use_glo_M3_private.c1, Decl(privacyImportParseErrors.ts, 187, 30)) +>c1 : Symbol(use_glo_M3_private.c1, Decl(privacyImportParseErrors.ts, 187, 33)) var use_glo_M3_private_v2_private: use_glo_M3_private; >use_glo_M3_private_v2_private : Symbol(use_glo_M3_private_v2_private, Decl(privacyImportParseErrors.ts, 289, 7)) @@ -937,7 +937,7 @@ declare module "use_glo_M3_private" { var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1; >use_glo_M3_private_v3_private : Symbol(use_glo_M3_private_v3_private, Decl(privacyImportParseErrors.ts, 290, 7)) >use_glo_M3_private : Symbol(use_glo_M3_private, Decl(privacyImportParseErrors.ts, 283, 37)) ->c1 : Symbol(use_glo_M3_private.c1, Decl(privacyImportParseErrors.ts, 187, 30)) +>c1 : Symbol(use_glo_M3_private.c1, Decl(privacyImportParseErrors.ts, 187, 33)) import use_glo_M4_private = require("glo_M4_private"); >use_glo_M4_private : Symbol(use_glo_M4_private, Decl(privacyImportParseErrors.ts, 290, 67)) @@ -970,21 +970,21 @@ declare module "use_glo_M3_private" { >use_glo_M4_private : Symbol(use_glo_M4_private, Decl(privacyImportParseErrors.ts, 290, 67)) >c1 : Symbol(use_glo_M4_private.c1) - module m2 { + namespace m2 { >m2 : Symbol(m2, Decl(privacyImportParseErrors.ts, 298, 67)) import errorImport = require("glo_M4_private"); ->errorImport : Symbol(errorImport, Decl(privacyImportParseErrors.ts, 300, 15)) +>errorImport : Symbol(errorImport, Decl(privacyImportParseErrors.ts, 300, 18)) import nonerrorImport = glo_M3_private; >nonerrorImport : Symbol(nonerrorImport, Decl(privacyImportParseErrors.ts, 301, 55)) >glo_M3_private : Symbol(nonerrorImport, Decl(privacyImportParseErrors.ts, 185, 1)) - module m5 { + namespace m5 { >m5 : Symbol(m5, Decl(privacyImportParseErrors.ts, 302, 47)) import m5_errorImport = require("glo_M4_private"); ->m5_errorImport : Symbol(m5_errorImport, Decl(privacyImportParseErrors.ts, 304, 19)) +>m5_errorImport : Symbol(m5_errorImport, Decl(privacyImportParseErrors.ts, 304, 22)) import m5_nonerrorImport = glo_M3_private; >m5_nonerrorImport : Symbol(m5_nonerrorImport, Decl(privacyImportParseErrors.ts, 305, 62)) @@ -996,19 +996,19 @@ declare module "use_glo_M3_private" { declare module "anotherParseError" { >"anotherParseError" : Symbol("anotherParseError", Decl(privacyImportParseErrors.ts, 309, 1)) - module m2 { + namespace m2 { >m2 : Symbol(m2, Decl(privacyImportParseErrors.ts, 311, 36), Decl(privacyImportParseErrors.ts, 315, 5)) declare module "abc" { ->"abc" : Symbol("abc", Decl(privacyImportParseErrors.ts, 312, 15)) +>"abc" : Symbol("abc", Decl(privacyImportParseErrors.ts, 312, 18)) } } - module m2 { + namespace m2 { >m2 : Symbol(m2, Decl(privacyImportParseErrors.ts, 311, 36), Decl(privacyImportParseErrors.ts, 315, 5)) module "abc2" { ->"abc2" : Symbol("abc2", Decl(privacyImportParseErrors.ts, 317, 15)) +>"abc2" : Symbol("abc2", Decl(privacyImportParseErrors.ts, 317, 18)) } } module "abc3" { @@ -1019,19 +1019,19 @@ declare module "anotherParseError" { declare export module "anotherParseError2" { >"anotherParseError2" : Symbol("anotherParseError2", Decl(privacyImportParseErrors.ts, 323, 1)) - module m2 { + namespace m2 { >m2 : Symbol(m2, Decl(privacyImportParseErrors.ts, 325, 44), Decl(privacyImportParseErrors.ts, 329, 5)) declare module "abc" { ->"abc" : Symbol("abc", Decl(privacyImportParseErrors.ts, 326, 15)) +>"abc" : Symbol("abc", Decl(privacyImportParseErrors.ts, 326, 18)) } } - module m2 { + namespace m2 { >m2 : Symbol(m2, Decl(privacyImportParseErrors.ts, 325, 44), Decl(privacyImportParseErrors.ts, 329, 5)) module "abc2" { ->"abc2" : Symbol("abc2", Decl(privacyImportParseErrors.ts, 331, 15)) +>"abc2" : Symbol("abc2", Decl(privacyImportParseErrors.ts, 331, 18)) } } module "abc3" { @@ -1039,13 +1039,13 @@ declare export module "anotherParseError2" { } } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(privacyImportParseErrors.ts, 82, 1), Decl(privacyImportParseErrors.ts, 337, 1)) import m3 = require("use_glo_M1_public"); ->m3 : Symbol(m3, Decl(privacyImportParseErrors.ts, 339, 11)) +>m3 : Symbol(m3, Decl(privacyImportParseErrors.ts, 339, 14)) - module m4 { + namespace m4 { >m4 : Symbol(m4, Decl(privacyImportParseErrors.ts, 340, 45)) var a = 10; @@ -1057,13 +1057,13 @@ module m2 { } -export module m3 { +export namespace m3 { >m3 : Symbol(m3, Decl(privacyImportParseErrors.ts, 346, 1)) import m3 = require("use_glo_M1_public"); ->m3 : Symbol(m3, Decl(privacyImportParseErrors.ts, 348, 18)) +>m3 : Symbol(m3, Decl(privacyImportParseErrors.ts, 348, 21)) - module m4 { + namespace m4 { >m4 : Symbol(m4, Decl(privacyImportParseErrors.ts, 349, 45)) var a = 10; diff --git a/tests/baselines/reference/privacyImportParseErrors.types b/tests/baselines/reference/privacyImportParseErrors.types index b7365ddb1c871..d485b262b9fa3 100644 --- a/tests/baselines/reference/privacyImportParseErrors.types +++ b/tests/baselines/reference/privacyImportParseErrors.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/privacyImportParseErrors.ts] //// === privacyImportParseErrors.ts === -export module m1 { +export namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ - export module m1_M1_public { + export namespace m1_M1_public { >m1_M1_public : typeof m1_M1_public > : ^^^^^^^^^^^^^^^^^^^ @@ -34,7 +34,7 @@ export module m1 { > : ^^ } - module m1_M2_private { + namespace m1_M2_private { >m1_M2_private : typeof m1_M2_private > : ^^^^^^^^^^^^^^^^^^^^ @@ -499,11 +499,11 @@ export module m1 { > : ^^^ } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ - export module m2_M1_public { + export namespace m2_M1_public { >m2_M1_public : typeof m2_M1_public > : ^^^^^^^^^^^^^^^^^^^ @@ -532,7 +532,7 @@ module m2 { > : ^^ } - module m2_M2_private { + namespace m2_M2_private { >m2_M2_private : typeof m2_M2_private > : ^^^^^^^^^^^^^^^^^^^^ @@ -998,7 +998,7 @@ module m2 { > : ^^^ } -export module glo_M1_public { +export namespace glo_M1_public { >glo_M1_public : typeof glo_M1_public > : ^^^^^^^^^^^^^^^^^^^^ @@ -1048,7 +1048,7 @@ export declare module "glo_M2_public" { > : ^^ } -export module glo_M3_private { +export namespace glo_M3_private { >glo_M3_private : typeof glo_M3_private > : ^^^^^^^^^^^^^^^^^^^^^ @@ -1572,7 +1572,7 @@ export declare module "use_glo_M1_public" { >use_glo_M2_public : any > : ^^^ - module m2 { + namespace m2 { import errorImport = require("glo_M2_public"); >errorImport : any > : ^^^ @@ -1583,7 +1583,7 @@ export declare module "use_glo_M1_public" { >glo_M1_public : typeof nonerrorImport > : ^^^^^^^^^^^^^^^^^^^^^ - module m5 { + namespace m5 { import m5_errorImport = require("glo_M2_public"); >m5_errorImport : any > : ^^^ @@ -1676,7 +1676,7 @@ declare module "use_glo_M3_private" { >use_glo_M4_private : any > : ^^^ - module m2 { + namespace m2 { import errorImport = require("glo_M4_private"); >errorImport : any > : ^^^ @@ -1687,7 +1687,7 @@ declare module "use_glo_M3_private" { >glo_M3_private : typeof nonerrorImport > : ^^^^^^^^^^^^^^^^^^^^^ - module m5 { + namespace m5 { import m5_errorImport = require("glo_M4_private"); >m5_errorImport : any > : ^^^ @@ -1705,14 +1705,14 @@ declare module "anotherParseError" { >"anotherParseError" : any > : ^^^ - module m2 { + namespace m2 { declare module "abc" { >"abc" : typeof import("abc") > : ^^^^^^^^^^^^^^^^^^^^ } } - module m2 { + namespace m2 { module "abc2" { >"abc2" : typeof import("abc2") > : ^^^^^^^^^^^^^^^^^^^^^ @@ -1728,14 +1728,14 @@ declare export module "anotherParseError2" { >"anotherParseError2" : any > : ^^^ - module m2 { + namespace m2 { declare module "abc" { >"abc" : typeof import("abc") > : ^^^^^^^^^^^^^^^^^^^^ } } - module m2 { + namespace m2 { module "abc2" { >"abc2" : typeof import("abc2") > : ^^^^^^^^^^^^^^^^^^^^^ @@ -1747,7 +1747,7 @@ declare export module "anotherParseError2" { } } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -1755,7 +1755,7 @@ module m2 { >m3 : any > : ^^^ - module m4 { + namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ @@ -1772,7 +1772,7 @@ module m2 { } -export module m3 { +export namespace m3 { >m3 : typeof import("privacyImportParseErrors").m3 > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1780,7 +1780,7 @@ export module m3 { >m3 : any > : ^^^ - module m4 { + namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/privacyInterface.js b/tests/baselines/reference/privacyInterface.js index 13bd81df78af4..c353510c26575 100644 --- a/tests/baselines/reference/privacyInterface.js +++ b/tests/baselines/reference/privacyInterface.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyInterface.ts] //// //// [privacyInterface.ts] -export module m1 { +export namespace m1 { export class C1_public { private f1() { } @@ -67,7 +67,7 @@ export module m1 { } -module m2 { +namespace m2 { export class C1_public { private f1() { } @@ -195,7 +195,7 @@ interface C8_private { } -export module m3 { +export namespace m3 { export interface m3_i_public { f1(): number; } @@ -220,7 +220,7 @@ export module m3 { } -module m4 { +namespace m4 { export interface m4_i_public { f1(): number; } diff --git a/tests/baselines/reference/privacyInterface.symbols b/tests/baselines/reference/privacyInterface.symbols index 64469a963a561..2499c102eebeb 100644 --- a/tests/baselines/reference/privacyInterface.symbols +++ b/tests/baselines/reference/privacyInterface.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/privacyInterface.ts] //// === privacyInterface.ts === -export module m1 { +export namespace m1 { >m1 : Symbol(m1, Decl(privacyInterface.ts, 0, 0)) export class C1_public { ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 21)) private f1() { >f1 : Symbol(C1_public.f1, Decl(privacyInterface.ts, 1, 28)) @@ -22,14 +22,14 @@ export module m1 { (c1: C1_public); >c1 : Symbol(c1, Decl(privacyInterface.ts, 11, 9)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 21)) (c1: C2_private); >c1 : Symbol(c1, Decl(privacyInterface.ts, 12, 9)) >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 4, 5)) (): C1_public; ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 21)) (c2: number): C2_private; >c2 : Symbol(c2, Decl(privacyInterface.ts, 14, 9)) @@ -37,14 +37,14 @@ export module m1 { new (c1: C1_public); >c1 : Symbol(c1, Decl(privacyInterface.ts, 16, 13)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 21)) new (c1: C2_private); >c1 : Symbol(c1, Decl(privacyInterface.ts, 17, 13)) >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 4, 5)) new (): C1_public; ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 21)) new (c2: number): C2_private; >c2 : Symbol(c2, Decl(privacyInterface.ts, 19, 13)) @@ -52,7 +52,7 @@ export module m1 { [c: number]: C1_public; >c : Symbol(c, Decl(privacyInterface.ts, 21, 9)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 21)) [c: string]: C2_private; >c : Symbol(c, Decl(privacyInterface.ts, 22, 9)) @@ -60,7 +60,7 @@ export module m1 { x: C1_public; >x : Symbol(C3_public.x, Decl(privacyInterface.ts, 22, 32)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 21)) y: C2_private; >y : Symbol(C3_public.y, Decl(privacyInterface.ts, 24, 21)) @@ -68,7 +68,7 @@ export module m1 { a?: C1_public; >a : Symbol(C3_public.a, Decl(privacyInterface.ts, 25, 22)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 21)) b?: C2_private; >b : Symbol(C3_public.b, Decl(privacyInterface.ts, 27, 22)) @@ -77,7 +77,7 @@ export module m1 { f1(a1: C1_public); >f1 : Symbol(C3_public.f1, Decl(privacyInterface.ts, 28, 23)) >a1 : Symbol(a1, Decl(privacyInterface.ts, 30, 11)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 21)) f2(a1: C2_private); >f2 : Symbol(C3_public.f2, Decl(privacyInterface.ts, 30, 26)) @@ -86,7 +86,7 @@ export module m1 { f3(): C1_public; >f3 : Symbol(C3_public.f3, Decl(privacyInterface.ts, 31, 27)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 21)) f4(): C2_private; >f4 : Symbol(C3_public.f4, Decl(privacyInterface.ts, 32, 24)) @@ -99,14 +99,14 @@ export module m1 { (c1: C1_public); >c1 : Symbol(c1, Decl(privacyInterface.ts, 38, 9)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 21)) (c1: C2_private); >c1 : Symbol(c1, Decl(privacyInterface.ts, 39, 9)) >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 4, 5)) (): C1_public; ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 21)) (c2: number): C2_private; >c2 : Symbol(c2, Decl(privacyInterface.ts, 41, 9)) @@ -114,14 +114,14 @@ export module m1 { new (c1: C1_public); >c1 : Symbol(c1, Decl(privacyInterface.ts, 43, 13)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 21)) new (c1: C2_private); >c1 : Symbol(c1, Decl(privacyInterface.ts, 44, 13)) >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 4, 5)) new (): C1_public; ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 21)) new (c2: number): C2_private; >c2 : Symbol(c2, Decl(privacyInterface.ts, 46, 13)) @@ -129,7 +129,7 @@ export module m1 { [c: number]: C1_public; >c : Symbol(c, Decl(privacyInterface.ts, 48, 9)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 21)) [c: string]: C2_private; >c : Symbol(c, Decl(privacyInterface.ts, 49, 9)) @@ -137,7 +137,7 @@ export module m1 { x: C1_public; >x : Symbol(C4_private.x, Decl(privacyInterface.ts, 49, 32)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 21)) y: C2_private; >y : Symbol(C4_private.y, Decl(privacyInterface.ts, 51, 21)) @@ -145,7 +145,7 @@ export module m1 { a?: C1_public; >a : Symbol(C4_private.a, Decl(privacyInterface.ts, 52, 22)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 21)) b?: C2_private; >b : Symbol(C4_private.b, Decl(privacyInterface.ts, 54, 22)) @@ -154,7 +154,7 @@ export module m1 { f1(a1: C1_public); >f1 : Symbol(C4_private.f1, Decl(privacyInterface.ts, 55, 23)) >a1 : Symbol(a1, Decl(privacyInterface.ts, 57, 11)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 21)) f2(a1: C2_private); >f2 : Symbol(C4_private.f2, Decl(privacyInterface.ts, 57, 26)) @@ -163,7 +163,7 @@ export module m1 { f3(): C1_public; >f3 : Symbol(C4_private.f3, Decl(privacyInterface.ts, 58, 27)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 21)) f4(): C2_private; >f4 : Symbol(C4_private.f4, Decl(privacyInterface.ts, 59, 24)) @@ -173,11 +173,11 @@ export module m1 { } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(privacyInterface.ts, 63, 1)) export class C1_public { ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 14)) private f1() { >f1 : Symbol(C1_public.f1, Decl(privacyInterface.ts, 67, 28)) @@ -194,14 +194,14 @@ module m2 { (c1: C1_public); >c1 : Symbol(c1, Decl(privacyInterface.ts, 77, 9)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 14)) (c1: C2_private); >c1 : Symbol(c1, Decl(privacyInterface.ts, 78, 9)) >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 70, 5)) (): C1_public; ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 14)) (c2: number): C2_private; >c2 : Symbol(c2, Decl(privacyInterface.ts, 80, 9)) @@ -209,14 +209,14 @@ module m2 { new (c1: C1_public); >c1 : Symbol(c1, Decl(privacyInterface.ts, 82, 13)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 14)) new (c1: C2_private); >c1 : Symbol(c1, Decl(privacyInterface.ts, 83, 13)) >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 70, 5)) new (): C1_public; ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 14)) new (c2: number): C2_private; >c2 : Symbol(c2, Decl(privacyInterface.ts, 85, 13)) @@ -224,7 +224,7 @@ module m2 { [c: number]: C1_public; >c : Symbol(c, Decl(privacyInterface.ts, 87, 9)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 14)) [c: string]: C2_private; >c : Symbol(c, Decl(privacyInterface.ts, 88, 9)) @@ -232,7 +232,7 @@ module m2 { x: C1_public; >x : Symbol(C3_public.x, Decl(privacyInterface.ts, 88, 32)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 14)) y: C2_private; >y : Symbol(C3_public.y, Decl(privacyInterface.ts, 90, 21)) @@ -240,7 +240,7 @@ module m2 { a?: C1_public; >a : Symbol(C3_public.a, Decl(privacyInterface.ts, 91, 22)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 14)) b?: C2_private; >b : Symbol(C3_public.b, Decl(privacyInterface.ts, 93, 22)) @@ -249,7 +249,7 @@ module m2 { f1(a1: C1_public); >f1 : Symbol(C3_public.f1, Decl(privacyInterface.ts, 94, 23)) >a1 : Symbol(a1, Decl(privacyInterface.ts, 96, 11)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 14)) f2(a1: C2_private); >f2 : Symbol(C3_public.f2, Decl(privacyInterface.ts, 96, 26)) @@ -258,7 +258,7 @@ module m2 { f3(): C1_public; >f3 : Symbol(C3_public.f3, Decl(privacyInterface.ts, 97, 27)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 14)) f4(): C2_private; >f4 : Symbol(C3_public.f4, Decl(privacyInterface.ts, 98, 24)) @@ -271,14 +271,14 @@ module m2 { (c1: C1_public); >c1 : Symbol(c1, Decl(privacyInterface.ts, 104, 9)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 14)) (c1: C2_private); >c1 : Symbol(c1, Decl(privacyInterface.ts, 105, 9)) >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 70, 5)) (): C1_public; ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 14)) (c2: number): C2_private; >c2 : Symbol(c2, Decl(privacyInterface.ts, 107, 9)) @@ -286,14 +286,14 @@ module m2 { new (c1: C1_public); >c1 : Symbol(c1, Decl(privacyInterface.ts, 109, 13)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 14)) new (c1: C2_private); >c1 : Symbol(c1, Decl(privacyInterface.ts, 110, 13)) >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 70, 5)) new (): C1_public; ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 14)) new (c2: number): C2_private; >c2 : Symbol(c2, Decl(privacyInterface.ts, 112, 13)) @@ -301,7 +301,7 @@ module m2 { [c: number]: C1_public; >c : Symbol(c, Decl(privacyInterface.ts, 114, 9)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 14)) [c: string]: C2_private; >c : Symbol(c, Decl(privacyInterface.ts, 115, 9)) @@ -309,7 +309,7 @@ module m2 { x: C1_public; >x : Symbol(C4_private.x, Decl(privacyInterface.ts, 115, 32)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 14)) y: C2_private; >y : Symbol(C4_private.y, Decl(privacyInterface.ts, 117, 21)) @@ -317,7 +317,7 @@ module m2 { a?: C1_public; >a : Symbol(C4_private.a, Decl(privacyInterface.ts, 118, 22)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 14)) b?: C2_private; >b : Symbol(C4_private.b, Decl(privacyInterface.ts, 120, 22)) @@ -326,7 +326,7 @@ module m2 { f1(a1: C1_public); >f1 : Symbol(C4_private.f1, Decl(privacyInterface.ts, 121, 23)) >a1 : Symbol(a1, Decl(privacyInterface.ts, 123, 11)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 14)) f2(a1: C2_private); >f2 : Symbol(C4_private.f2, Decl(privacyInterface.ts, 123, 26)) @@ -335,7 +335,7 @@ module m2 { f3(): C1_public; >f3 : Symbol(C4_private.f3, Decl(privacyInterface.ts, 124, 27)) ->C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11)) +>C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 14)) f4(): C2_private; >f4 : Symbol(C4_private.f4, Decl(privacyInterface.ts, 125, 24)) @@ -511,11 +511,11 @@ interface C8_private { } -export module m3 { +export namespace m3 { >m3 : Symbol(m3, Decl(privacyInterface.ts, 192, 1)) export interface m3_i_public { ->m3_i_public : Symbol(m3_i_public, Decl(privacyInterface.ts, 194, 18)) +>m3_i_public : Symbol(m3_i_public, Decl(privacyInterface.ts, 194, 21)) f1(): number; >f1 : Symbol(m3_i_public.f1, Decl(privacyInterface.ts, 195, 34)) @@ -530,7 +530,7 @@ export module m3 { interface m3_C1_private extends m3_i_public { >m3_C1_private : Symbol(m3_C1_private, Decl(privacyInterface.ts, 201, 5)) ->m3_i_public : Symbol(m3_i_public, Decl(privacyInterface.ts, 194, 18)) +>m3_i_public : Symbol(m3_i_public, Decl(privacyInterface.ts, 194, 21)) } interface m3_C2_private extends m3_i_private { >m3_C2_private : Symbol(m3_C2_private, Decl(privacyInterface.ts, 204, 5)) @@ -538,7 +538,7 @@ export module m3 { } export interface m3_C3_public extends m3_i_public { >m3_C3_public : Symbol(m3_C3_public, Decl(privacyInterface.ts, 206, 5)) ->m3_i_public : Symbol(m3_i_public, Decl(privacyInterface.ts, 194, 18)) +>m3_i_public : Symbol(m3_i_public, Decl(privacyInterface.ts, 194, 21)) } export interface m3_C4_public extends m3_i_private { >m3_C4_public : Symbol(m3_C4_public, Decl(privacyInterface.ts, 208, 5)) @@ -548,21 +548,21 @@ export module m3 { interface m3_C5_private extends m3_i_private, m3_i_public { >m3_C5_private : Symbol(m3_C5_private, Decl(privacyInterface.ts, 210, 5)) >m3_i_private : Symbol(m3_i_private, Decl(privacyInterface.ts, 197, 5)) ->m3_i_public : Symbol(m3_i_public, Decl(privacyInterface.ts, 194, 18)) +>m3_i_public : Symbol(m3_i_public, Decl(privacyInterface.ts, 194, 21)) } export interface m3_C6_public extends m3_i_private, m3_i_public { >m3_C6_public : Symbol(m3_C6_public, Decl(privacyInterface.ts, 213, 5)) >m3_i_private : Symbol(m3_i_private, Decl(privacyInterface.ts, 197, 5)) ->m3_i_public : Symbol(m3_i_public, Decl(privacyInterface.ts, 194, 18)) +>m3_i_public : Symbol(m3_i_public, Decl(privacyInterface.ts, 194, 21)) } } -module m4 { +namespace m4 { >m4 : Symbol(m4, Decl(privacyInterface.ts, 216, 1)) export interface m4_i_public { ->m4_i_public : Symbol(m4_i_public, Decl(privacyInterface.ts, 219, 11)) +>m4_i_public : Symbol(m4_i_public, Decl(privacyInterface.ts, 219, 14)) f1(): number; >f1 : Symbol(m4_i_public.f1, Decl(privacyInterface.ts, 220, 34)) @@ -577,7 +577,7 @@ module m4 { interface m4_C1_private extends m4_i_public { >m4_C1_private : Symbol(m4_C1_private, Decl(privacyInterface.ts, 226, 5)) ->m4_i_public : Symbol(m4_i_public, Decl(privacyInterface.ts, 219, 11)) +>m4_i_public : Symbol(m4_i_public, Decl(privacyInterface.ts, 219, 14)) } interface m4_C2_private extends m4_i_private { >m4_C2_private : Symbol(m4_C2_private, Decl(privacyInterface.ts, 229, 5)) @@ -585,7 +585,7 @@ module m4 { } export interface m4_C3_public extends m4_i_public { >m4_C3_public : Symbol(m4_C3_public, Decl(privacyInterface.ts, 231, 5)) ->m4_i_public : Symbol(m4_i_public, Decl(privacyInterface.ts, 219, 11)) +>m4_i_public : Symbol(m4_i_public, Decl(privacyInterface.ts, 219, 14)) } export interface m4_C4_public extends m4_i_private { >m4_C4_public : Symbol(m4_C4_public, Decl(privacyInterface.ts, 233, 5)) @@ -595,12 +595,12 @@ module m4 { interface m4_C5_private extends m4_i_private, m4_i_public { >m4_C5_private : Symbol(m4_C5_private, Decl(privacyInterface.ts, 235, 5)) >m4_i_private : Symbol(m4_i_private, Decl(privacyInterface.ts, 222, 5)) ->m4_i_public : Symbol(m4_i_public, Decl(privacyInterface.ts, 219, 11)) +>m4_i_public : Symbol(m4_i_public, Decl(privacyInterface.ts, 219, 14)) } export interface m4_C6_public extends m4_i_private, m4_i_public { >m4_C6_public : Symbol(m4_C6_public, Decl(privacyInterface.ts, 238, 5)) >m4_i_private : Symbol(m4_i_private, Decl(privacyInterface.ts, 222, 5)) ->m4_i_public : Symbol(m4_i_public, Decl(privacyInterface.ts, 219, 11)) +>m4_i_public : Symbol(m4_i_public, Decl(privacyInterface.ts, 219, 14)) } } diff --git a/tests/baselines/reference/privacyInterface.types b/tests/baselines/reference/privacyInterface.types index a424f7bde5296..17c9eb99ac2e1 100644 --- a/tests/baselines/reference/privacyInterface.types +++ b/tests/baselines/reference/privacyInterface.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyInterface.ts] //// === privacyInterface.ts === -export module m1 { +export namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -169,7 +169,7 @@ export module m1 { } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -498,7 +498,7 @@ interface C8_private { } -export module m3 { +export namespace m3 { export interface m3_i_public { f1(): number; >f1 : () => number @@ -527,7 +527,7 @@ export module m3 { } -module m4 { +namespace m4 { export interface m4_i_public { f1(): number; >f1 : () => number diff --git a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js index 84a2b3ad52b17..b3fd02d95c5c2 100644 --- a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js +++ b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts] //// //// [privacyInterfaceExtendsClauseDeclFile_externalModule.ts] -export module publicModule { +export namespace publicModule { export interface publicInterfaceInPublicModule { } @@ -26,7 +26,7 @@ export module publicModule { } } -module privateModule { +namespace privateModule { export interface publicInterfaceInPrivateModule { } @@ -71,7 +71,7 @@ export interface publicInterfaceImplementingFromPrivateModuleInterface extends p } //// [privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts] -module publicModuleInGlobal { +namespace publicModuleInGlobal { export interface publicInterfaceInPublicModule { } diff --git a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.symbols b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.symbols index 3acd3305235e2..4c1daac07239c 100644 --- a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.symbols +++ b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts] //// === privacyInterfaceExtendsClauseDeclFile_externalModule.ts === -export module publicModule { +export namespace publicModule { >publicModule : Symbol(publicModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 0, 0)) export interface publicInterfaceInPublicModule { ->publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 0, 28)) +>publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 0, 31)) } interface privateInterfaceInPublicModule { @@ -14,7 +14,7 @@ export module publicModule { interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule { >privateInterfaceImplementingPublicInterfaceInModule : Symbol(privateInterfaceImplementingPublicInterfaceInModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 5, 5)) ->publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 0, 28)) +>publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 0, 31)) } interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { >privateInterfaceImplementingPrivateInterfaceInModule : Symbol(privateInterfaceImplementingPrivateInterfaceInModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 8, 5)) @@ -22,7 +22,7 @@ export module publicModule { } export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule { >publicInterfaceImplementingPublicInterfaceInModule : Symbol(publicInterfaceImplementingPublicInterfaceInModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 10, 5)) ->publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 0, 28)) +>publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 0, 31)) } export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { // Should error >publicInterfaceImplementingPrivateInterfaceInModule : Symbol(publicInterfaceImplementingPrivateInterfaceInModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 12, 5)) @@ -31,29 +31,29 @@ export module publicModule { interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { >privateInterfaceImplementingFromPrivateModuleInterface : Symbol(privateInterfaceImplementingFromPrivateModuleInterface, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 14, 5)) ->privateModule.publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 22)) +>privateModule.publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 25)) >privateModule : Symbol(privateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 23, 1)) ->publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 22)) +>publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 25)) } export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { // Should error >publicInterfaceImplementingFromPrivateModuleInterface : Symbol(publicInterfaceImplementingFromPrivateModuleInterface, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 17, 5)) ->privateModule.publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 22)) +>privateModule.publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 25)) >privateModule : Symbol(privateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 23, 1)) ->publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 22)) +>publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 25)) } export interface publicInterfaceImplementingPrivateAndPublicInterface extends privateInterfaceInPublicModule, publicInterfaceInPublicModule { // Should error >publicInterfaceImplementingPrivateAndPublicInterface : Symbol(publicInterfaceImplementingPrivateAndPublicInterface, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 19, 5)) >privateInterfaceInPublicModule : Symbol(privateInterfaceInPublicModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 2, 5)) ->publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 0, 28)) +>publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 0, 31)) } } -module privateModule { +namespace privateModule { >privateModule : Symbol(privateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 23, 1)) export interface publicInterfaceInPrivateModule { ->publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 22)) +>publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 25)) } @@ -63,7 +63,7 @@ module privateModule { interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPrivateModule { >privateInterfaceImplementingPublicInterfaceInModule : Symbol(privateInterfaceImplementingPublicInterfaceInModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 31, 5)) ->publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 22)) +>publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 25)) } interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPrivateModule { >privateInterfaceImplementingPrivateInterfaceInModule : Symbol(privateInterfaceImplementingPrivateInterfaceInModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 34, 5)) @@ -71,7 +71,7 @@ module privateModule { } export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPrivateModule { >publicInterfaceImplementingPublicInterfaceInModule : Symbol(publicInterfaceImplementingPublicInterfaceInModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 36, 5)) ->publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 22)) +>publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 25)) } export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPrivateModule { >publicInterfaceImplementingPrivateInterfaceInModule : Symbol(publicInterfaceImplementingPrivateInterfaceInModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 38, 5)) @@ -80,15 +80,15 @@ module privateModule { interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { >privateInterfaceImplementingFromPrivateModuleInterface : Symbol(privateInterfaceImplementingFromPrivateModuleInterface, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 40, 5)) ->privateModule.publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 22)) +>privateModule.publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 25)) >privateModule : Symbol(privateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 23, 1)) ->publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 22)) +>publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 25)) } export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { >publicInterfaceImplementingFromPrivateModuleInterface : Symbol(publicInterfaceImplementingFromPrivateModuleInterface, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 43, 5)) ->privateModule.publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 22)) +>privateModule.publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 25)) >privateModule : Symbol(privateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 23, 1)) ->publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 22)) +>publicInterfaceInPrivateModule : Symbol(publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 25)) } } @@ -120,23 +120,23 @@ export interface publicInterfaceImplementingPrivateInterface extends privateInte interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { >privateInterfaceImplementingFromPrivateModuleInterface : Symbol(privateInterfaceImplementingFromPrivateModuleInterface, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 62, 1)) ->privateModule.publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 22)) +>privateModule.publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 25)) >privateModule : Symbol(privateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 23, 1)) ->publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 22)) +>publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 25)) } export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { // Should error >publicInterfaceImplementingFromPrivateModuleInterface : Symbol(publicInterfaceImplementingFromPrivateModuleInterface, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 65, 1)) ->privateModule.publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 22)) +>privateModule.publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 25)) >privateModule : Symbol(privateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 23, 1)) ->publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 22)) +>publicInterfaceInPrivateModule : Symbol(privateModule.publicInterfaceInPrivateModule, Decl(privacyInterfaceExtendsClauseDeclFile_externalModule.ts, 25, 25)) } === privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts === -module publicModuleInGlobal { +namespace publicModuleInGlobal { >publicModuleInGlobal : Symbol(publicModuleInGlobal, Decl(privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts, 0, 0)) export interface publicInterfaceInPublicModule { ->publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts, 0, 29)) +>publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts, 0, 32)) } interface privateInterfaceInPublicModule { @@ -145,7 +145,7 @@ module publicModuleInGlobal { interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule { >privateInterfaceImplementingPublicInterfaceInModule : Symbol(privateInterfaceImplementingPublicInterfaceInModule, Decl(privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts, 5, 5)) ->publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts, 0, 29)) +>publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts, 0, 32)) } interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { >privateInterfaceImplementingPrivateInterfaceInModule : Symbol(privateInterfaceImplementingPrivateInterfaceInModule, Decl(privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts, 8, 5)) @@ -153,7 +153,7 @@ module publicModuleInGlobal { } export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule { >publicInterfaceImplementingPublicInterfaceInModule : Symbol(publicInterfaceImplementingPublicInterfaceInModule, Decl(privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts, 10, 5)) ->publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts, 0, 29)) +>publicInterfaceInPublicModule : Symbol(publicInterfaceInPublicModule, Decl(privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts, 0, 32)) } export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { // Should error >publicInterfaceImplementingPrivateInterfaceInModule : Symbol(publicInterfaceImplementingPrivateInterfaceInModule, Decl(privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts, 12, 5)) diff --git a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.types b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.types index dfe960c0308c8..817e4016ade87 100644 --- a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.types +++ b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts] //// === privacyInterfaceExtendsClauseDeclFile_externalModule.ts === -export module publicModule { +export namespace publicModule { export interface publicInterfaceInPublicModule { } @@ -30,7 +30,7 @@ export module publicModule { } } -module privateModule { +namespace privateModule { export interface publicInterfaceInPrivateModule { } @@ -84,7 +84,7 @@ export interface publicInterfaceImplementingFromPrivateModuleInterface extends p === privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts === -module publicModuleInGlobal { +namespace publicModuleInGlobal { export interface publicInterfaceInPublicModule { } diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js index 5ce9646b771d1..fc16a7d6eb120 100644 --- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js +++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js @@ -2,7 +2,7 @@ //// [privacyLocalInternalReferenceImportWithExport.ts] // private elements -module m_private { +namespace m_private { export class c_private { } export enum e_private { @@ -15,18 +15,18 @@ module m_private { export var v_private = new c_private(); export interface i_private { } - export module mi_private { + export namespace mi_private { export class c { } } - export module mu_private { + export namespace mu_private { export interface i { } } } // Public elements -export module m_public { +export namespace m_public { export class c_public { } export enum e_public { @@ -39,17 +39,17 @@ export module m_public { export var v_public = 10; export interface i_public { } - export module mi_public { + export namespace mi_public { export class c { } } - export module mu_public { + export namespace mu_public { export interface i { } } } -export module import_public { +export namespace import_public { // Privacy errors - importing private elements export import im_public_c_private = m_private.c_private; export import im_public_e_private = m_private.e_private; @@ -102,7 +102,7 @@ export module import_public { export var publicUse_im_public_mu_public: im_public_mu_public.i; } -module import_private { +namespace import_private { // No Privacy errors - importing private elements export import im_private_c_private = m_private.c_private; export import im_private_e_private = m_private.e_private; diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.symbols b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.symbols index 5882f9441c7e9..9bfde86442ada 100644 --- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.symbols +++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.symbols @@ -2,11 +2,11 @@ === privacyLocalInternalReferenceImportWithExport.ts === // private elements -module m_private { +namespace m_private { >m_private : Symbol(m_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 0, 0)) export class c_private { ->c_private : Symbol(c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 1, 18)) +>c_private : Symbol(c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 1, 21)) } export enum e_private { >e_private : Symbol(e_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 3, 5)) @@ -21,37 +21,37 @@ module m_private { >f_private : Symbol(f_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 7, 5)) return new c_private(); ->c_private : Symbol(c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 1, 18)) +>c_private : Symbol(c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 1, 21)) } export var v_private = new c_private(); >v_private : Symbol(v_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 11, 14)) ->c_private : Symbol(c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 1, 18)) +>c_private : Symbol(c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 1, 21)) export interface i_private { >i_private : Symbol(i_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 11, 43)) } - export module mi_private { + export namespace mi_private { >mi_private : Symbol(mi_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 13, 5)) export class c { ->c : Symbol(c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 14, 30)) +>c : Symbol(c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 14, 33)) } } - export module mu_private { + export namespace mu_private { >mu_private : Symbol(mu_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 17, 5)) export interface i { ->i : Symbol(i, Decl(privacyLocalInternalReferenceImportWithExport.ts, 18, 30)) +>i : Symbol(i, Decl(privacyLocalInternalReferenceImportWithExport.ts, 18, 33)) } } } // Public elements -export module m_public { +export namespace m_public { >m_public : Symbol(m_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 22, 1)) export class c_public { ->c_public : Symbol(c_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 25, 24)) +>c_public : Symbol(c_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 25, 27)) } export enum e_public { >e_public : Symbol(e_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 27, 5)) @@ -66,7 +66,7 @@ export module m_public { >f_public : Symbol(f_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 31, 5)) return new c_public(); ->c_public : Symbol(c_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 25, 24)) +>c_public : Symbol(c_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 25, 27)) } export var v_public = 10; >v_public : Symbol(v_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 35, 14)) @@ -74,30 +74,30 @@ export module m_public { export interface i_public { >i_public : Symbol(i_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 35, 29)) } - export module mi_public { + export namespace mi_public { >mi_public : Symbol(mi_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 37, 5)) export class c { ->c : Symbol(c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 38, 29)) +>c : Symbol(c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 38, 32)) } } - export module mu_public { + export namespace mu_public { >mu_public : Symbol(mu_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 41, 5)) export interface i { ->i : Symbol(i, Decl(privacyLocalInternalReferenceImportWithExport.ts, 42, 29)) +>i : Symbol(i, Decl(privacyLocalInternalReferenceImportWithExport.ts, 42, 32)) } } } -export module import_public { +export namespace import_public { >import_public : Symbol(import_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 46, 1)) // Privacy errors - importing private elements export import im_public_c_private = m_private.c_private; ->im_public_c_private : Symbol(im_public_c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 48, 29)) +>im_public_c_private : Symbol(im_public_c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 48, 32)) >m_private : Symbol(m_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 0, 0)) ->c_private : Symbol(im_public_c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 1, 18)) +>c_private : Symbol(im_public_c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 1, 21)) export import im_public_e_private = m_private.e_private; >im_public_e_private : Symbol(im_public_e_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 50, 60)) @@ -132,11 +132,11 @@ export module import_public { // Usage of privacy error imports var privateUse_im_public_c_private = new im_public_c_private(); >privateUse_im_public_c_private : Symbol(privateUse_im_public_c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 59, 7)) ->im_public_c_private : Symbol(im_public_c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 48, 29)) +>im_public_c_private : Symbol(im_public_c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 48, 32)) export var publicUse_im_public_c_private = new im_public_c_private(); >publicUse_im_public_c_private : Symbol(publicUse_im_public_c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 60, 14)) ->im_public_c_private : Symbol(im_public_c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 48, 29)) +>im_public_c_private : Symbol(im_public_c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 48, 32)) var privateUse_im_public_e_private = im_public_e_private.Happy; >privateUse_im_public_e_private : Symbol(privateUse_im_public_e_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 61, 7)) @@ -176,32 +176,32 @@ export module import_public { var privateUse_im_public_mi_private = new im_public_mi_private.c(); >privateUse_im_public_mi_private : Symbol(privateUse_im_public_mi_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 69, 7)) ->im_public_mi_private.c : Symbol(im_public_mi_private.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 14, 30)) +>im_public_mi_private.c : Symbol(im_public_mi_private.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 14, 33)) >im_public_mi_private : Symbol(im_public_mi_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 54, 60)) ->c : Symbol(im_public_mi_private.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 14, 30)) +>c : Symbol(im_public_mi_private.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 14, 33)) export var publicUse_im_public_mi_private = new im_public_mi_private.c(); >publicUse_im_public_mi_private : Symbol(publicUse_im_public_mi_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 70, 14)) ->im_public_mi_private.c : Symbol(im_public_mi_private.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 14, 30)) +>im_public_mi_private.c : Symbol(im_public_mi_private.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 14, 33)) >im_public_mi_private : Symbol(im_public_mi_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 54, 60)) ->c : Symbol(im_public_mi_private.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 14, 30)) +>c : Symbol(im_public_mi_private.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 14, 33)) var privateUse_im_public_mu_private: im_public_mu_private.i; >privateUse_im_public_mu_private : Symbol(privateUse_im_public_mu_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 71, 7)) >im_public_mu_private : Symbol(im_public_mu_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 55, 62)) ->i : Symbol(im_public_mu_private.i, Decl(privacyLocalInternalReferenceImportWithExport.ts, 18, 30)) +>i : Symbol(im_public_mu_private.i, Decl(privacyLocalInternalReferenceImportWithExport.ts, 18, 33)) export var publicUse_im_public_mu_private: im_public_mu_private.i; >publicUse_im_public_mu_private : Symbol(publicUse_im_public_mu_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 72, 14)) >im_public_mu_private : Symbol(im_public_mu_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 55, 62)) ->i : Symbol(im_public_mu_private.i, Decl(privacyLocalInternalReferenceImportWithExport.ts, 18, 30)) +>i : Symbol(im_public_mu_private.i, Decl(privacyLocalInternalReferenceImportWithExport.ts, 18, 33)) // No Privacy errors - importing public elements export import im_public_c_public = m_public.c_public; >im_public_c_public : Symbol(im_public_c_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 72, 70)) >m_public : Symbol(m_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 22, 1)) ->c_public : Symbol(im_public_c_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 25, 24)) +>c_public : Symbol(im_public_c_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 25, 27)) export import im_public_e_public = m_public.e_public; >im_public_e_public : Symbol(im_public_e_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 76, 57)) @@ -280,35 +280,35 @@ export module import_public { var privateUse_im_public_mi_public = new im_public_mi_public.c(); >privateUse_im_public_mi_public : Symbol(privateUse_im_public_mi_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 95, 7)) ->im_public_mi_public.c : Symbol(im_public_mi_public.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 38, 29)) +>im_public_mi_public.c : Symbol(im_public_mi_public.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 38, 32)) >im_public_mi_public : Symbol(im_public_mi_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 80, 57)) ->c : Symbol(im_public_mi_public.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 38, 29)) +>c : Symbol(im_public_mi_public.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 38, 32)) export var publicUse_im_public_mi_public = new im_public_mi_public.c(); >publicUse_im_public_mi_public : Symbol(publicUse_im_public_mi_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 96, 14)) ->im_public_mi_public.c : Symbol(im_public_mi_public.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 38, 29)) +>im_public_mi_public.c : Symbol(im_public_mi_public.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 38, 32)) >im_public_mi_public : Symbol(im_public_mi_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 80, 57)) ->c : Symbol(im_public_mi_public.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 38, 29)) +>c : Symbol(im_public_mi_public.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 38, 32)) var privateUse_im_public_mu_public: im_public_mu_public.i; >privateUse_im_public_mu_public : Symbol(privateUse_im_public_mu_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 97, 7)) >im_public_mu_public : Symbol(im_public_mu_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 81, 59)) ->i : Symbol(im_public_mu_public.i, Decl(privacyLocalInternalReferenceImportWithExport.ts, 42, 29)) +>i : Symbol(im_public_mu_public.i, Decl(privacyLocalInternalReferenceImportWithExport.ts, 42, 32)) export var publicUse_im_public_mu_public: im_public_mu_public.i; >publicUse_im_public_mu_public : Symbol(publicUse_im_public_mu_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 98, 14)) >im_public_mu_public : Symbol(im_public_mu_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 81, 59)) ->i : Symbol(im_public_mu_public.i, Decl(privacyLocalInternalReferenceImportWithExport.ts, 42, 29)) +>i : Symbol(im_public_mu_public.i, Decl(privacyLocalInternalReferenceImportWithExport.ts, 42, 32)) } -module import_private { +namespace import_private { >import_private : Symbol(import_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 99, 1)) // No Privacy errors - importing private elements export import im_private_c_private = m_private.c_private; ->im_private_c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 101, 23)) +>im_private_c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 101, 26)) >m_private : Symbol(m_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 0, 0)) ->c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 1, 18)) +>c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 1, 21)) export import im_private_e_private = m_private.e_private; >im_private_e_private : Symbol(im_private_e_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 103, 61)) @@ -343,11 +343,11 @@ module import_private { // Usage of above decls var privateUse_im_private_c_private = new im_private_c_private(); >privateUse_im_private_c_private : Symbol(privateUse_im_private_c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 112, 7)) ->im_private_c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 101, 23)) +>im_private_c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 101, 26)) export var publicUse_im_private_c_private = new im_private_c_private(); >publicUse_im_private_c_private : Symbol(publicUse_im_private_c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 113, 14)) ->im_private_c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 101, 23)) +>im_private_c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 101, 26)) var privateUse_im_private_e_private = im_private_e_private.Happy; >privateUse_im_private_e_private : Symbol(privateUse_im_private_e_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 114, 7)) @@ -387,31 +387,31 @@ module import_private { var privateUse_im_private_mi_private = new im_private_mi_private.c(); >privateUse_im_private_mi_private : Symbol(privateUse_im_private_mi_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 122, 7)) ->im_private_mi_private.c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 14, 30)) +>im_private_mi_private.c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 14, 33)) >im_private_mi_private : Symbol(im_private_mi_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 107, 61)) ->c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 14, 30)) +>c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 14, 33)) export var publicUse_im_private_mi_private = new im_private_mi_private.c(); >publicUse_im_private_mi_private : Symbol(publicUse_im_private_mi_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 123, 14)) ->im_private_mi_private.c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 14, 30)) +>im_private_mi_private.c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 14, 33)) >im_private_mi_private : Symbol(im_private_mi_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 107, 61)) ->c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 14, 30)) +>c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 14, 33)) var privateUse_im_private_mu_private: im_private_mu_private.i; >privateUse_im_private_mu_private : Symbol(privateUse_im_private_mu_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 124, 7)) >im_private_mu_private : Symbol(im_private_mu_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 108, 63)) ->i : Symbol(im_private_mu_private.i, Decl(privacyLocalInternalReferenceImportWithExport.ts, 18, 30)) +>i : Symbol(im_private_mu_private.i, Decl(privacyLocalInternalReferenceImportWithExport.ts, 18, 33)) export var publicUse_im_private_mu_private: im_private_mu_private.i; >publicUse_im_private_mu_private : Symbol(publicUse_im_private_mu_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 125, 14)) >im_private_mu_private : Symbol(im_private_mu_private, Decl(privacyLocalInternalReferenceImportWithExport.ts, 108, 63)) ->i : Symbol(im_private_mu_private.i, Decl(privacyLocalInternalReferenceImportWithExport.ts, 18, 30)) +>i : Symbol(im_private_mu_private.i, Decl(privacyLocalInternalReferenceImportWithExport.ts, 18, 33)) // No privacy Error - importing public elements export import im_private_c_public = m_public.c_public; >im_private_c_public : Symbol(im_private_c_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 125, 72)) >m_public : Symbol(m_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 22, 1)) ->c_public : Symbol(im_private_c_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 25, 24)) +>c_public : Symbol(im_private_c_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 25, 27)) export import im_private_e_public = m_public.e_public; >im_private_e_public : Symbol(im_private_e_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 128, 58)) @@ -490,23 +490,23 @@ module import_private { var privateUse_im_private_mi_public = new im_private_mi_public.c(); >privateUse_im_private_mi_public : Symbol(privateUse_im_private_mi_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 147, 7)) ->im_private_mi_public.c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 38, 29)) +>im_private_mi_public.c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 38, 32)) >im_private_mi_public : Symbol(im_private_mi_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 132, 58)) ->c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 38, 29)) +>c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 38, 32)) export var publicUse_im_private_mi_public = new im_private_mi_public.c(); >publicUse_im_private_mi_public : Symbol(publicUse_im_private_mi_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 148, 14)) ->im_private_mi_public.c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 38, 29)) +>im_private_mi_public.c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 38, 32)) >im_private_mi_public : Symbol(im_private_mi_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 132, 58)) ->c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 38, 29)) +>c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithExport.ts, 38, 32)) var privateUse_im_private_mu_public: im_private_mu_public.i; >privateUse_im_private_mu_public : Symbol(privateUse_im_private_mu_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 149, 7)) >im_private_mu_public : Symbol(im_private_mu_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 133, 60)) ->i : Symbol(im_private_mu_public.i, Decl(privacyLocalInternalReferenceImportWithExport.ts, 42, 29)) +>i : Symbol(im_private_mu_public.i, Decl(privacyLocalInternalReferenceImportWithExport.ts, 42, 32)) export var publicUse_im_private_mu_public: im_private_mu_public.i; >publicUse_im_private_mu_public : Symbol(publicUse_im_private_mu_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 150, 14)) >im_private_mu_public : Symbol(im_private_mu_public, Decl(privacyLocalInternalReferenceImportWithExport.ts, 133, 60)) ->i : Symbol(im_private_mu_public.i, Decl(privacyLocalInternalReferenceImportWithExport.ts, 42, 29)) +>i : Symbol(im_private_mu_public.i, Decl(privacyLocalInternalReferenceImportWithExport.ts, 42, 32)) } diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.types b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.types index cae53fff72a2c..2d32da435dec6 100644 --- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.types +++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.types @@ -2,7 +2,7 @@ === privacyLocalInternalReferenceImportWithExport.ts === // private elements -module m_private { +namespace m_private { >m_private : typeof m_private > : ^^^^^^^^^^^^^^^^ @@ -42,7 +42,7 @@ module m_private { export interface i_private { } - export module mi_private { + export namespace mi_private { >mi_private : typeof mi_private > : ^^^^^^^^^^^^^^^^^ @@ -51,14 +51,14 @@ module m_private { > : ^ } } - export module mu_private { + export namespace mu_private { export interface i { } } } // Public elements -export module m_public { +export namespace m_public { >m_public : typeof m_public > : ^^^^^^^^^^^^^^^ @@ -96,7 +96,7 @@ export module m_public { export interface i_public { } - export module mi_public { + export namespace mi_public { >mi_public : typeof mi_public > : ^^^^^^^^^^^^^^^^ @@ -105,13 +105,13 @@ export module m_public { > : ^ } } - export module mu_public { + export namespace mu_public { export interface i { } } } -export module import_public { +export namespace import_public { >import_public : typeof import_public > : ^^^^^^^^^^^^^^^^^^^^ @@ -449,7 +449,7 @@ export module import_public { > : ^^^ } -module import_private { +namespace import_private { >import_private : typeof import_private > : ^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js index 9b88c75388c4f..d881af27eee43 100644 --- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js +++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js @@ -2,7 +2,7 @@ //// [privacyLocalInternalReferenceImportWithoutExport.ts] // private elements -module m_private { +namespace m_private { export class c_private { } export enum e_private { @@ -15,18 +15,18 @@ module m_private { export var v_private = new c_private(); export interface i_private { } - export module mi_private { + export namespace mi_private { export class c { } } - export module mu_private { + export namespace mu_private { export interface i { } } } // Public elements -export module m_public { +export namespace m_public { export class c_public { } export enum e_public { @@ -39,17 +39,17 @@ export module m_public { export var v_public = 10; export interface i_public { } - export module mi_public { + export namespace mi_public { export class c { } } - export module mu_public { + export namespace mu_public { export interface i { } } } -export module import_public { +export namespace import_public { // No Privacy errors - importing private elements import im_private_c_private = m_private.c_private; import im_private_e_private = m_private.e_private; @@ -102,7 +102,7 @@ export module import_public { export var publicUse_im_private_mu_public: im_private_mu_public.i; } -module import_private { +namespace import_private { // No Privacy errors - importing private elements import im_private_c_private = m_private.c_private; import im_private_e_private = m_private.e_private; diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.symbols b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.symbols index a690cbc4a2225..43349f58e578d 100644 --- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.symbols +++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.symbols @@ -2,11 +2,11 @@ === privacyLocalInternalReferenceImportWithoutExport.ts === // private elements -module m_private { +namespace m_private { >m_private : Symbol(m_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 0, 0)) export class c_private { ->c_private : Symbol(c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 1, 18)) +>c_private : Symbol(c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 1, 21)) } export enum e_private { >e_private : Symbol(e_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 3, 5)) @@ -21,37 +21,37 @@ module m_private { >f_private : Symbol(f_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 7, 5)) return new c_private(); ->c_private : Symbol(c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 1, 18)) +>c_private : Symbol(c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 1, 21)) } export var v_private = new c_private(); >v_private : Symbol(v_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 11, 14)) ->c_private : Symbol(c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 1, 18)) +>c_private : Symbol(c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 1, 21)) export interface i_private { >i_private : Symbol(i_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 11, 43)) } - export module mi_private { + export namespace mi_private { >mi_private : Symbol(mi_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 13, 5)) export class c { ->c : Symbol(c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 14, 30)) +>c : Symbol(c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 14, 33)) } } - export module mu_private { + export namespace mu_private { >mu_private : Symbol(mu_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 17, 5)) export interface i { ->i : Symbol(i, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 18, 30)) +>i : Symbol(i, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 18, 33)) } } } // Public elements -export module m_public { +export namespace m_public { >m_public : Symbol(m_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 22, 1)) export class c_public { ->c_public : Symbol(c_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 25, 24)) +>c_public : Symbol(c_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 25, 27)) } export enum e_public { >e_public : Symbol(e_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 27, 5)) @@ -66,7 +66,7 @@ export module m_public { >f_public : Symbol(f_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 31, 5)) return new c_public(); ->c_public : Symbol(c_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 25, 24)) +>c_public : Symbol(c_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 25, 27)) } export var v_public = 10; >v_public : Symbol(v_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 35, 14)) @@ -74,30 +74,30 @@ export module m_public { export interface i_public { >i_public : Symbol(i_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 35, 29)) } - export module mi_public { + export namespace mi_public { >mi_public : Symbol(mi_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 37, 5)) export class c { ->c : Symbol(c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 38, 29)) +>c : Symbol(c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 38, 32)) } } - export module mu_public { + export namespace mu_public { >mu_public : Symbol(mu_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 41, 5)) export interface i { ->i : Symbol(i, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 42, 29)) +>i : Symbol(i, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 42, 32)) } } } -export module import_public { +export namespace import_public { >import_public : Symbol(import_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 46, 1)) // No Privacy errors - importing private elements import im_private_c_private = m_private.c_private; ->im_private_c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 48, 29)) +>im_private_c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 48, 32)) >m_private : Symbol(m_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 0, 0)) ->c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 1, 18)) +>c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 1, 21)) import im_private_e_private = m_private.e_private; >im_private_e_private : Symbol(im_private_e_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 50, 54)) @@ -132,11 +132,11 @@ export module import_public { // Usage of above decls var privateUse_im_private_c_private = new im_private_c_private(); >privateUse_im_private_c_private : Symbol(privateUse_im_private_c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 59, 7)) ->im_private_c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 48, 29)) +>im_private_c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 48, 32)) export var publicUse_im_private_c_private = new im_private_c_private(); >publicUse_im_private_c_private : Symbol(publicUse_im_private_c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 60, 14)) ->im_private_c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 48, 29)) +>im_private_c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 48, 32)) var privateUse_im_private_e_private = im_private_e_private.Happy; >privateUse_im_private_e_private : Symbol(privateUse_im_private_e_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 61, 7)) @@ -176,32 +176,32 @@ export module import_public { var privateUse_im_private_mi_private = new im_private_mi_private.c(); >privateUse_im_private_mi_private : Symbol(privateUse_im_private_mi_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 69, 7)) ->im_private_mi_private.c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 14, 30)) +>im_private_mi_private.c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 14, 33)) >im_private_mi_private : Symbol(im_private_mi_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 54, 54)) ->c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 14, 30)) +>c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 14, 33)) export var publicUse_im_private_mi_private = new im_private_mi_private.c(); >publicUse_im_private_mi_private : Symbol(publicUse_im_private_mi_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 70, 14)) ->im_private_mi_private.c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 14, 30)) +>im_private_mi_private.c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 14, 33)) >im_private_mi_private : Symbol(im_private_mi_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 54, 54)) ->c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 14, 30)) +>c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 14, 33)) var privateUse_im_private_mu_private: im_private_mu_private.i; >privateUse_im_private_mu_private : Symbol(privateUse_im_private_mu_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 71, 7)) >im_private_mu_private : Symbol(im_private_mu_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 55, 56)) ->i : Symbol(im_private_mu_private.i, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 18, 30)) +>i : Symbol(im_private_mu_private.i, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 18, 33)) export var publicUse_im_private_mu_private: im_private_mu_private.i; >publicUse_im_private_mu_private : Symbol(publicUse_im_private_mu_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 72, 14)) >im_private_mu_private : Symbol(im_private_mu_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 55, 56)) ->i : Symbol(im_private_mu_private.i, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 18, 30)) +>i : Symbol(im_private_mu_private.i, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 18, 33)) // No Privacy errors - importing public elements import im_private_c_public = m_public.c_public; >im_private_c_public : Symbol(im_private_c_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 72, 72)) >m_public : Symbol(m_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 22, 1)) ->c_public : Symbol(im_private_c_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 25, 24)) +>c_public : Symbol(im_private_c_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 25, 27)) import im_private_e_public = m_public.e_public; >im_private_e_public : Symbol(im_private_e_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 76, 51)) @@ -280,35 +280,35 @@ export module import_public { var privateUse_im_private_mi_public = new im_private_mi_public.c(); >privateUse_im_private_mi_public : Symbol(privateUse_im_private_mi_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 95, 7)) ->im_private_mi_public.c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 38, 29)) +>im_private_mi_public.c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 38, 32)) >im_private_mi_public : Symbol(im_private_mi_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 80, 51)) ->c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 38, 29)) +>c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 38, 32)) export var publicUse_im_private_mi_public = new im_private_mi_public.c(); >publicUse_im_private_mi_public : Symbol(publicUse_im_private_mi_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 96, 14)) ->im_private_mi_public.c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 38, 29)) +>im_private_mi_public.c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 38, 32)) >im_private_mi_public : Symbol(im_private_mi_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 80, 51)) ->c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 38, 29)) +>c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 38, 32)) var privateUse_im_private_mu_public: im_private_mu_public.i; >privateUse_im_private_mu_public : Symbol(privateUse_im_private_mu_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 97, 7)) >im_private_mu_public : Symbol(im_private_mu_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 81, 53)) ->i : Symbol(im_private_mu_public.i, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 42, 29)) +>i : Symbol(im_private_mu_public.i, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 42, 32)) export var publicUse_im_private_mu_public: im_private_mu_public.i; >publicUse_im_private_mu_public : Symbol(publicUse_im_private_mu_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 98, 14)) >im_private_mu_public : Symbol(im_private_mu_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 81, 53)) ->i : Symbol(im_private_mu_public.i, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 42, 29)) +>i : Symbol(im_private_mu_public.i, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 42, 32)) } -module import_private { +namespace import_private { >import_private : Symbol(import_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 99, 1)) // No Privacy errors - importing private elements import im_private_c_private = m_private.c_private; ->im_private_c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 101, 23)) +>im_private_c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 101, 26)) >m_private : Symbol(m_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 0, 0)) ->c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 1, 18)) +>c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 1, 21)) import im_private_e_private = m_private.e_private; >im_private_e_private : Symbol(im_private_e_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 103, 54)) @@ -343,11 +343,11 @@ module import_private { // Usage of above decls var privateUse_im_private_c_private = new im_private_c_private(); >privateUse_im_private_c_private : Symbol(privateUse_im_private_c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 112, 7)) ->im_private_c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 101, 23)) +>im_private_c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 101, 26)) export var publicUse_im_private_c_private = new im_private_c_private(); >publicUse_im_private_c_private : Symbol(publicUse_im_private_c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 113, 14)) ->im_private_c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 101, 23)) +>im_private_c_private : Symbol(im_private_c_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 101, 26)) var privateUse_im_private_e_private = im_private_e_private.Happy; >privateUse_im_private_e_private : Symbol(privateUse_im_private_e_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 114, 7)) @@ -387,31 +387,31 @@ module import_private { var privateUse_im_private_mi_private = new im_private_mi_private.c(); >privateUse_im_private_mi_private : Symbol(privateUse_im_private_mi_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 122, 7)) ->im_private_mi_private.c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 14, 30)) +>im_private_mi_private.c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 14, 33)) >im_private_mi_private : Symbol(im_private_mi_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 107, 54)) ->c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 14, 30)) +>c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 14, 33)) export var publicUse_im_private_mi_private = new im_private_mi_private.c(); >publicUse_im_private_mi_private : Symbol(publicUse_im_private_mi_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 123, 14)) ->im_private_mi_private.c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 14, 30)) +>im_private_mi_private.c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 14, 33)) >im_private_mi_private : Symbol(im_private_mi_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 107, 54)) ->c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 14, 30)) +>c : Symbol(im_private_mi_private.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 14, 33)) var privateUse_im_private_mu_private: im_private_mu_private.i; >privateUse_im_private_mu_private : Symbol(privateUse_im_private_mu_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 124, 7)) >im_private_mu_private : Symbol(im_private_mu_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 108, 56)) ->i : Symbol(im_private_mu_private.i, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 18, 30)) +>i : Symbol(im_private_mu_private.i, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 18, 33)) export var publicUse_im_private_mu_private: im_private_mu_private.i; >publicUse_im_private_mu_private : Symbol(publicUse_im_private_mu_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 125, 14)) >im_private_mu_private : Symbol(im_private_mu_private, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 108, 56)) ->i : Symbol(im_private_mu_private.i, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 18, 30)) +>i : Symbol(im_private_mu_private.i, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 18, 33)) // No privacy Error - importing public elements import im_private_c_public = m_public.c_public; >im_private_c_public : Symbol(im_private_c_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 125, 72)) >m_public : Symbol(m_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 22, 1)) ->c_public : Symbol(im_private_c_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 25, 24)) +>c_public : Symbol(im_private_c_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 25, 27)) import im_private_e_public = m_public.e_public; >im_private_e_public : Symbol(im_private_e_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 128, 51)) @@ -490,23 +490,23 @@ module import_private { var privateUse_im_private_mi_public = new im_private_mi_public.c(); >privateUse_im_private_mi_public : Symbol(privateUse_im_private_mi_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 147, 7)) ->im_private_mi_public.c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 38, 29)) +>im_private_mi_public.c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 38, 32)) >im_private_mi_public : Symbol(im_private_mi_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 132, 51)) ->c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 38, 29)) +>c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 38, 32)) export var publicUse_im_private_mi_public = new im_private_mi_public.c(); >publicUse_im_private_mi_public : Symbol(publicUse_im_private_mi_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 148, 14)) ->im_private_mi_public.c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 38, 29)) +>im_private_mi_public.c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 38, 32)) >im_private_mi_public : Symbol(im_private_mi_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 132, 51)) ->c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 38, 29)) +>c : Symbol(im_private_mi_public.c, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 38, 32)) var privateUse_im_private_mu_public: im_private_mu_public.i; >privateUse_im_private_mu_public : Symbol(privateUse_im_private_mu_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 149, 7)) >im_private_mu_public : Symbol(im_private_mu_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 133, 53)) ->i : Symbol(im_private_mu_public.i, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 42, 29)) +>i : Symbol(im_private_mu_public.i, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 42, 32)) export var publicUse_im_private_mu_public: im_private_mu_public.i; >publicUse_im_private_mu_public : Symbol(publicUse_im_private_mu_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 150, 14)) >im_private_mu_public : Symbol(im_private_mu_public, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 133, 53)) ->i : Symbol(im_private_mu_public.i, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 42, 29)) +>i : Symbol(im_private_mu_public.i, Decl(privacyLocalInternalReferenceImportWithoutExport.ts, 42, 32)) } diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.types b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.types index 7d8ba4e1b2e10..b22d88bd84141 100644 --- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.types +++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.types @@ -2,7 +2,7 @@ === privacyLocalInternalReferenceImportWithoutExport.ts === // private elements -module m_private { +namespace m_private { >m_private : typeof m_private > : ^^^^^^^^^^^^^^^^ @@ -42,7 +42,7 @@ module m_private { export interface i_private { } - export module mi_private { + export namespace mi_private { >mi_private : typeof mi_private > : ^^^^^^^^^^^^^^^^^ @@ -51,14 +51,14 @@ module m_private { > : ^ } } - export module mu_private { + export namespace mu_private { export interface i { } } } // Public elements -export module m_public { +export namespace m_public { >m_public : typeof m_public > : ^^^^^^^^^^^^^^^ @@ -96,7 +96,7 @@ export module m_public { export interface i_public { } - export module mi_public { + export namespace mi_public { >mi_public : typeof mi_public > : ^^^^^^^^^^^^^^^^ @@ -105,13 +105,13 @@ export module m_public { > : ^ } } - export module mu_public { + export namespace mu_public { export interface i { } } } -export module import_public { +export namespace import_public { >import_public : typeof import_public > : ^^^^^^^^^^^^^^^^^^^^ @@ -449,7 +449,7 @@ export module import_public { > : ^^^ } -module import_private { +namespace import_private { >import_private : typeof import_private > : ^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js index 99397be4c408e..d36644ab87b09 100644 --- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js @@ -2,7 +2,7 @@ //// [privacyTopLevelInternalReferenceImportWithExport.ts] // private elements -module m_private { +namespace m_private { export class c_private { } export enum e_private { @@ -15,18 +15,18 @@ module m_private { export var v_private = new c_private(); export interface i_private { } - export module mi_private { + export namespace mi_private { export class c { } } - export module mu_private { + export namespace mu_private { export interface i { } } } // Public elements -export module m_public { +export namespace m_public { export class c_public { } export enum e_public { @@ -39,11 +39,11 @@ export module m_public { export var v_public = 10; export interface i_public { } - export module mi_public { + export namespace mi_public { export class c { } } - export module mu_public { + export namespace mu_public { export interface i { } } diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.symbols b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.symbols index fdd107a84ffde..e3e53fca8aab1 100644 --- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.symbols +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.symbols @@ -2,11 +2,11 @@ === privacyTopLevelInternalReferenceImportWithExport.ts === // private elements -module m_private { +namespace m_private { >m_private : Symbol(m_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 0, 0)) export class c_private { ->c_private : Symbol(c_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 1, 18)) +>c_private : Symbol(c_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 1, 21)) } export enum e_private { >e_private : Symbol(e_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 3, 5)) @@ -21,37 +21,37 @@ module m_private { >f_private : Symbol(f_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 7, 5)) return new c_private(); ->c_private : Symbol(c_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 1, 18)) +>c_private : Symbol(c_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 1, 21)) } export var v_private = new c_private(); >v_private : Symbol(v_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 11, 14)) ->c_private : Symbol(c_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 1, 18)) +>c_private : Symbol(c_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 1, 21)) export interface i_private { >i_private : Symbol(i_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 11, 43)) } - export module mi_private { + export namespace mi_private { >mi_private : Symbol(mi_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 13, 5)) export class c { ->c : Symbol(c, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 14, 30)) +>c : Symbol(c, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 14, 33)) } } - export module mu_private { + export namespace mu_private { >mu_private : Symbol(mu_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 17, 5)) export interface i { ->i : Symbol(i, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 18, 30)) +>i : Symbol(i, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 18, 33)) } } } // Public elements -export module m_public { +export namespace m_public { >m_public : Symbol(m_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 22, 1)) export class c_public { ->c_public : Symbol(c_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 25, 24)) +>c_public : Symbol(c_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 25, 27)) } export enum e_public { >e_public : Symbol(e_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 27, 5)) @@ -66,7 +66,7 @@ export module m_public { >f_public : Symbol(f_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 31, 5)) return new c_public(); ->c_public : Symbol(c_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 25, 24)) +>c_public : Symbol(c_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 25, 27)) } export var v_public = 10; >v_public : Symbol(v_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 35, 14)) @@ -74,18 +74,18 @@ export module m_public { export interface i_public { >i_public : Symbol(i_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 35, 29)) } - export module mi_public { + export namespace mi_public { >mi_public : Symbol(mi_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 37, 5)) export class c { ->c : Symbol(c, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 38, 29)) +>c : Symbol(c, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 38, 32)) } } - export module mu_public { + export namespace mu_public { >mu_public : Symbol(mu_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 41, 5)) export interface i { ->i : Symbol(i, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 42, 29)) +>i : Symbol(i, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 42, 32)) } } } @@ -94,7 +94,7 @@ export module m_public { export import im_public_c_private = m_private.c_private; >im_public_c_private : Symbol(im_public_c_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 46, 1)) >m_private : Symbol(m_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 0, 0)) ->c_private : Symbol(im_public_c_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 1, 18)) +>c_private : Symbol(im_public_c_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 1, 21)) export import im_public_e_private = m_private.e_private; >im_public_e_private : Symbol(im_public_e_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 49, 56)) @@ -173,32 +173,32 @@ export var publicUse_im_public_i_private: im_public_i_private; var privateUse_im_public_mi_private = new im_public_mi_private.c(); >privateUse_im_public_mi_private : Symbol(privateUse_im_public_mi_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 68, 3)) ->im_public_mi_private.c : Symbol(im_public_mi_private.c, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 14, 30)) +>im_public_mi_private.c : Symbol(im_public_mi_private.c, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 14, 33)) >im_public_mi_private : Symbol(im_public_mi_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 53, 56)) ->c : Symbol(im_public_mi_private.c, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 14, 30)) +>c : Symbol(im_public_mi_private.c, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 14, 33)) export var publicUse_im_public_mi_private = new im_public_mi_private.c(); >publicUse_im_public_mi_private : Symbol(publicUse_im_public_mi_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 69, 10)) ->im_public_mi_private.c : Symbol(im_public_mi_private.c, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 14, 30)) +>im_public_mi_private.c : Symbol(im_public_mi_private.c, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 14, 33)) >im_public_mi_private : Symbol(im_public_mi_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 53, 56)) ->c : Symbol(im_public_mi_private.c, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 14, 30)) +>c : Symbol(im_public_mi_private.c, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 14, 33)) var privateUse_im_public_mu_private: im_public_mu_private.i; >privateUse_im_public_mu_private : Symbol(privateUse_im_public_mu_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 70, 3)) >im_public_mu_private : Symbol(im_public_mu_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 54, 58)) ->i : Symbol(im_public_mu_private.i, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 18, 30)) +>i : Symbol(im_public_mu_private.i, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 18, 33)) export var publicUse_im_public_mu_private: im_public_mu_private.i; >publicUse_im_public_mu_private : Symbol(publicUse_im_public_mu_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 71, 10)) >im_public_mu_private : Symbol(im_public_mu_private, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 54, 58)) ->i : Symbol(im_public_mu_private.i, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 18, 30)) +>i : Symbol(im_public_mu_private.i, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 18, 33)) // No Privacy errors - importing public elements export import im_public_c_public = m_public.c_public; >im_public_c_public : Symbol(im_public_c_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 71, 66)) >m_public : Symbol(m_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 22, 1)) ->c_public : Symbol(im_public_c_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 25, 24)) +>c_public : Symbol(im_public_c_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 25, 27)) export import im_public_e_public = m_public.e_public; >im_public_e_public : Symbol(im_public_e_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 75, 53)) @@ -277,23 +277,23 @@ export var publicUse_im_public_i_public: im_public_i_public; var privateUse_im_public_mi_public = new im_public_mi_public.c(); >privateUse_im_public_mi_public : Symbol(privateUse_im_public_mi_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 94, 3)) ->im_public_mi_public.c : Symbol(im_public_mi_public.c, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 38, 29)) +>im_public_mi_public.c : Symbol(im_public_mi_public.c, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 38, 32)) >im_public_mi_public : Symbol(im_public_mi_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 79, 53)) ->c : Symbol(im_public_mi_public.c, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 38, 29)) +>c : Symbol(im_public_mi_public.c, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 38, 32)) export var publicUse_im_public_mi_public = new im_public_mi_public.c(); >publicUse_im_public_mi_public : Symbol(publicUse_im_public_mi_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 95, 10)) ->im_public_mi_public.c : Symbol(im_public_mi_public.c, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 38, 29)) +>im_public_mi_public.c : Symbol(im_public_mi_public.c, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 38, 32)) >im_public_mi_public : Symbol(im_public_mi_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 79, 53)) ->c : Symbol(im_public_mi_public.c, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 38, 29)) +>c : Symbol(im_public_mi_public.c, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 38, 32)) var privateUse_im_public_mu_public: im_public_mu_public.i; >privateUse_im_public_mu_public : Symbol(privateUse_im_public_mu_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 96, 3)) >im_public_mu_public : Symbol(im_public_mu_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 80, 55)) ->i : Symbol(im_public_mu_public.i, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 42, 29)) +>i : Symbol(im_public_mu_public.i, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 42, 32)) export var publicUse_im_public_mu_public: im_public_mu_public.i; >publicUse_im_public_mu_public : Symbol(publicUse_im_public_mu_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 97, 10)) >im_public_mu_public : Symbol(im_public_mu_public, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 80, 55)) ->i : Symbol(im_public_mu_public.i, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 42, 29)) +>i : Symbol(im_public_mu_public.i, Decl(privacyTopLevelInternalReferenceImportWithExport.ts, 42, 32)) diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.types b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.types index 77a8b71e71b9b..7f49a14752255 100644 --- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.types +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.types @@ -2,7 +2,7 @@ === privacyTopLevelInternalReferenceImportWithExport.ts === // private elements -module m_private { +namespace m_private { >m_private : typeof m_private > : ^^^^^^^^^^^^^^^^ @@ -42,7 +42,7 @@ module m_private { export interface i_private { } - export module mi_private { + export namespace mi_private { >mi_private : typeof mi_private > : ^^^^^^^^^^^^^^^^^ @@ -51,14 +51,14 @@ module m_private { > : ^ } } - export module mu_private { + export namespace mu_private { export interface i { } } } // Public elements -export module m_public { +export namespace m_public { >m_public : typeof m_public > : ^^^^^^^^^^^^^^^ @@ -96,7 +96,7 @@ export module m_public { export interface i_public { } - export module mi_public { + export namespace mi_public { >mi_public : typeof mi_public > : ^^^^^^^^^^^^^^^^ @@ -105,7 +105,7 @@ export module m_public { > : ^ } } - export module mu_public { + export namespace mu_public { export interface i { } } diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js index a7158320d678c..b710e5dd7f956 100644 --- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js @@ -2,7 +2,7 @@ //// [privacyTopLevelInternalReferenceImportWithoutExport.ts] // private elements -module m_private { +namespace m_private { export class c_private { } export enum e_private { @@ -15,18 +15,18 @@ module m_private { export var v_private = new c_private(); export interface i_private { } - export module mi_private { + export namespace mi_private { export class c { } } - export module mu_private { + export namespace mu_private { export interface i { } } } // Public elements -export module m_public { +export namespace m_public { export class c_public { } export enum e_public { @@ -39,11 +39,11 @@ export module m_public { export var v_public = 10; export interface i_public { } - export module mi_public { + export namespace mi_public { export class c { } } - export module mu_public { + export namespace mu_public { export interface i { } } diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.symbols b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.symbols index b1da6f125b6a0..f67b722355304 100644 --- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.symbols +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.symbols @@ -2,11 +2,11 @@ === privacyTopLevelInternalReferenceImportWithoutExport.ts === // private elements -module m_private { +namespace m_private { >m_private : Symbol(m_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 0, 0)) export class c_private { ->c_private : Symbol(c_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 1, 18)) +>c_private : Symbol(c_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 1, 21)) } export enum e_private { >e_private : Symbol(e_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 3, 5)) @@ -21,37 +21,37 @@ module m_private { >f_private : Symbol(f_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 7, 5)) return new c_private(); ->c_private : Symbol(c_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 1, 18)) +>c_private : Symbol(c_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 1, 21)) } export var v_private = new c_private(); >v_private : Symbol(v_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 11, 14)) ->c_private : Symbol(c_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 1, 18)) +>c_private : Symbol(c_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 1, 21)) export interface i_private { >i_private : Symbol(i_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 11, 43)) } - export module mi_private { + export namespace mi_private { >mi_private : Symbol(mi_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 13, 5)) export class c { ->c : Symbol(c, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 14, 30)) +>c : Symbol(c, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 14, 33)) } } - export module mu_private { + export namespace mu_private { >mu_private : Symbol(mu_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 17, 5)) export interface i { ->i : Symbol(i, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 18, 30)) +>i : Symbol(i, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 18, 33)) } } } // Public elements -export module m_public { +export namespace m_public { >m_public : Symbol(m_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 22, 1)) export class c_public { ->c_public : Symbol(c_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 25, 24)) +>c_public : Symbol(c_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 25, 27)) } export enum e_public { >e_public : Symbol(e_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 27, 5)) @@ -66,7 +66,7 @@ export module m_public { >f_public : Symbol(f_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 31, 5)) return new c_public(); ->c_public : Symbol(c_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 25, 24)) +>c_public : Symbol(c_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 25, 27)) } export var v_public = 10; >v_public : Symbol(v_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 35, 14)) @@ -74,18 +74,18 @@ export module m_public { export interface i_public { >i_public : Symbol(i_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 35, 29)) } - export module mi_public { + export namespace mi_public { >mi_public : Symbol(mi_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 37, 5)) export class c { ->c : Symbol(c, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 38, 29)) +>c : Symbol(c, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 38, 32)) } } - export module mu_public { + export namespace mu_public { >mu_public : Symbol(mu_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 41, 5)) export interface i { ->i : Symbol(i, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 42, 29)) +>i : Symbol(i, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 42, 32)) } } } @@ -94,7 +94,7 @@ export module m_public { import im_private_c_private = m_private.c_private; >im_private_c_private : Symbol(im_private_c_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 46, 1)) >m_private : Symbol(m_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 0, 0)) ->c_private : Symbol(im_private_c_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 1, 18)) +>c_private : Symbol(im_private_c_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 1, 21)) import im_private_e_private = m_private.e_private; >im_private_e_private : Symbol(im_private_e_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 49, 50)) @@ -173,32 +173,32 @@ export var publicUse_im_private_i_private: im_private_i_private; var privateUse_im_private_mi_private = new im_private_mi_private.c(); >privateUse_im_private_mi_private : Symbol(privateUse_im_private_mi_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 68, 3)) ->im_private_mi_private.c : Symbol(im_private_mi_private.c, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 14, 30)) +>im_private_mi_private.c : Symbol(im_private_mi_private.c, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 14, 33)) >im_private_mi_private : Symbol(im_private_mi_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 53, 50)) ->c : Symbol(im_private_mi_private.c, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 14, 30)) +>c : Symbol(im_private_mi_private.c, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 14, 33)) export var publicUse_im_private_mi_private = new im_private_mi_private.c(); >publicUse_im_private_mi_private : Symbol(publicUse_im_private_mi_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 69, 10)) ->im_private_mi_private.c : Symbol(im_private_mi_private.c, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 14, 30)) +>im_private_mi_private.c : Symbol(im_private_mi_private.c, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 14, 33)) >im_private_mi_private : Symbol(im_private_mi_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 53, 50)) ->c : Symbol(im_private_mi_private.c, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 14, 30)) +>c : Symbol(im_private_mi_private.c, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 14, 33)) var privateUse_im_private_mu_private: im_private_mu_private.i; >privateUse_im_private_mu_private : Symbol(privateUse_im_private_mu_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 70, 3)) >im_private_mu_private : Symbol(im_private_mu_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 54, 52)) ->i : Symbol(im_private_mu_private.i, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 18, 30)) +>i : Symbol(im_private_mu_private.i, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 18, 33)) export var publicUse_im_private_mu_private: im_private_mu_private.i; >publicUse_im_private_mu_private : Symbol(publicUse_im_private_mu_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 71, 10)) >im_private_mu_private : Symbol(im_private_mu_private, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 54, 52)) ->i : Symbol(im_private_mu_private.i, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 18, 30)) +>i : Symbol(im_private_mu_private.i, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 18, 33)) // No Privacy errors - importing public elements import im_private_c_public = m_public.c_public; >im_private_c_public : Symbol(im_private_c_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 71, 68)) >m_public : Symbol(m_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 22, 1)) ->c_public : Symbol(im_private_c_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 25, 24)) +>c_public : Symbol(im_private_c_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 25, 27)) import im_private_e_public = m_public.e_public; >im_private_e_public : Symbol(im_private_e_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 75, 47)) @@ -277,23 +277,23 @@ export var publicUse_im_private_i_public: im_private_i_public; var privateUse_im_private_mi_public = new im_private_mi_public.c(); >privateUse_im_private_mi_public : Symbol(privateUse_im_private_mi_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 94, 3)) ->im_private_mi_public.c : Symbol(im_private_mi_public.c, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 38, 29)) +>im_private_mi_public.c : Symbol(im_private_mi_public.c, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 38, 32)) >im_private_mi_public : Symbol(im_private_mi_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 79, 47)) ->c : Symbol(im_private_mi_public.c, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 38, 29)) +>c : Symbol(im_private_mi_public.c, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 38, 32)) export var publicUse_im_private_mi_public = new im_private_mi_public.c(); >publicUse_im_private_mi_public : Symbol(publicUse_im_private_mi_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 95, 10)) ->im_private_mi_public.c : Symbol(im_private_mi_public.c, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 38, 29)) +>im_private_mi_public.c : Symbol(im_private_mi_public.c, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 38, 32)) >im_private_mi_public : Symbol(im_private_mi_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 79, 47)) ->c : Symbol(im_private_mi_public.c, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 38, 29)) +>c : Symbol(im_private_mi_public.c, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 38, 32)) var privateUse_im_private_mu_public: im_private_mu_public.i; >privateUse_im_private_mu_public : Symbol(privateUse_im_private_mu_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 96, 3)) >im_private_mu_public : Symbol(im_private_mu_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 80, 49)) ->i : Symbol(im_private_mu_public.i, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 42, 29)) +>i : Symbol(im_private_mu_public.i, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 42, 32)) export var publicUse_im_private_mu_public: im_private_mu_public.i; >publicUse_im_private_mu_public : Symbol(publicUse_im_private_mu_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 97, 10)) >im_private_mu_public : Symbol(im_private_mu_public, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 80, 49)) ->i : Symbol(im_private_mu_public.i, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 42, 29)) +>i : Symbol(im_private_mu_public.i, Decl(privacyTopLevelInternalReferenceImportWithoutExport.ts, 42, 32)) diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.types b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.types index 3c14c77d3f95c..4a65cf696e692 100644 --- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.types +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.types @@ -2,7 +2,7 @@ === privacyTopLevelInternalReferenceImportWithoutExport.ts === // private elements -module m_private { +namespace m_private { >m_private : typeof m_private > : ^^^^^^^^^^^^^^^^ @@ -42,7 +42,7 @@ module m_private { export interface i_private { } - export module mi_private { + export namespace mi_private { >mi_private : typeof mi_private > : ^^^^^^^^^^^^^^^^^ @@ -51,14 +51,14 @@ module m_private { > : ^ } } - export module mu_private { + export namespace mu_private { export interface i { } } } // Public elements -export module m_public { +export namespace m_public { >m_public : typeof m_public > : ^^^^^^^^^^^^^^^ @@ -96,7 +96,7 @@ export module m_public { export interface i_public { } - export module mi_public { + export namespace mi_public { >mi_public : typeof mi_public > : ^^^^^^^^^^^^^^^^ @@ -105,7 +105,7 @@ export module m_public { > : ^ } } - export module mu_public { + export namespace mu_public { export interface i { } } diff --git a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js index 51071a186f786..3134039dcac4d 100644 --- a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js +++ b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js @@ -156,7 +156,7 @@ function privateFunctionWithPrivateMopduleTypeParameterspublicModule : Symbol(publicModule, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 152, 1)) class privateClass { ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) } export class publicClass { @@ -412,19 +412,19 @@ export module publicModule { new (): privateClass; // Error >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 163, 13)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) (): privateClass; // Error >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 164, 9)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) myMethod(): privateClass; // Error >myMethod : Symbol(publicInterfaceWithPrivateTypeParameters.myMethod, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 164, 49)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 165, 17)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) } export interface publicInterfaceWithPublicTypeParameters { @@ -452,19 +452,19 @@ export module publicModule { new (): privateClass; >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 175, 13)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) (): privateClass; >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 176, 9)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) myMethod(): privateClass; >myMethod : Symbol(privateInterfaceWithPrivateTypeParameters.myMethod, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 176, 49)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 177, 17)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) } interface privateInterfaceWithPublicTypeParameters { @@ -493,22 +493,22 @@ export module publicModule { static myPublicStaticMethod() { // Error >myPublicStaticMethod : Symbol(publicClassWithWithPrivateTypeParameters.myPublicStaticMethod, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 186, 59)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 187, 36)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) } private static myPrivateStaticMethod() { >myPrivateStaticMethod : Symbol(publicClassWithWithPrivateTypeParameters.myPrivateStaticMethod, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 188, 9)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 189, 45)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) } myPublicMethod() { // Error >myPublicMethod : Symbol(publicClassWithWithPrivateTypeParameters.myPublicMethod, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 190, 9)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 191, 23)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) } private myPrivateMethod() { >myPrivateMethod : Symbol(publicClassWithWithPrivateTypeParameters.myPrivateMethod, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 192, 9)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 193, 32)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) } } @@ -543,22 +543,22 @@ export module publicModule { static myPublicStaticMethod() { >myPublicStaticMethod : Symbol(privateClassWithWithPrivateTypeParameters.myPublicStaticMethod, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 208, 53)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 209, 36)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) } private static myPrivateStaticMethod() { >myPrivateStaticMethod : Symbol(privateClassWithWithPrivateTypeParameters.myPrivateStaticMethod, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 210, 9)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 211, 45)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) } myPublicMethod() { >myPublicMethod : Symbol(privateClassWithWithPrivateTypeParameters.myPublicMethod, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 212, 9)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 213, 23)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) } private myPrivateMethod() { >myPrivateMethod : Symbol(privateClassWithWithPrivateTypeParameters.myPrivateMethod, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 214, 9)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 215, 32)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) } } @@ -590,7 +590,7 @@ export module publicModule { export function publicFunctionWithPrivateTypeParameters() { // Error >publicFunctionWithPrivateTypeParameters : Symbol(publicFunctionWithPrivateTypeParameters, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 228, 5)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 230, 60)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) } export function publicFunctionWithPublicTypeParameters() { @@ -602,7 +602,7 @@ export module publicModule { function privateFunctionWithPrivateTypeParameters() { >privateFunctionWithPrivateTypeParameters : Symbol(privateFunctionWithPrivateTypeParameters, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 234, 5)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 236, 54)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 28)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 155, 31)) } function privateFunctionWithPublicTypeParameters() { @@ -795,11 +795,11 @@ export module publicModule { } -module privateModule { +namespace privateModule { >privateModule : Symbol(privateModule, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 310, 1)) class privateClass { ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) } export class publicClass { @@ -811,19 +811,19 @@ module privateModule { new (): privateClass; >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 320, 13)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) (): privateClass; >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 321, 9)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) myMethod(): privateClass; >myMethod : Symbol(publicInterfaceWithPrivateTypeParameters.myMethod, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 321, 49)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 322, 17)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) } export interface publicInterfaceWithPublicTypeParameters { @@ -851,19 +851,19 @@ module privateModule { new (): privateClass; >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 332, 13)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) (): privateClass; >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 333, 9)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) myMethod(): privateClass; >myMethod : Symbol(privateInterfaceWithPrivateTypeParameters.myMethod, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 333, 49)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 334, 17)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) } interface privateInterfaceWithPublicTypeParameters { @@ -892,22 +892,22 @@ module privateModule { static myPublicStaticMethod() { >myPublicStaticMethod : Symbol(publicClassWithWithPrivateTypeParameters.myPublicStaticMethod, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 343, 59)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 344, 36)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) } private static myPrivateStaticMethod() { >myPrivateStaticMethod : Symbol(publicClassWithWithPrivateTypeParameters.myPrivateStaticMethod, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 345, 9)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 346, 45)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) } myPublicMethod() { >myPublicMethod : Symbol(publicClassWithWithPrivateTypeParameters.myPublicMethod, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 347, 9)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 348, 23)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) } private myPrivateMethod() { >myPrivateMethod : Symbol(publicClassWithWithPrivateTypeParameters.myPrivateMethod, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 349, 9)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 350, 32)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) } } @@ -942,22 +942,22 @@ module privateModule { static myPublicStaticMethod() { >myPublicStaticMethod : Symbol(privateClassWithWithPrivateTypeParameters.myPublicStaticMethod, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 365, 53)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 366, 36)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) } private static myPrivateStaticMethod() { >myPrivateStaticMethod : Symbol(privateClassWithWithPrivateTypeParameters.myPrivateStaticMethod, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 367, 9)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 368, 45)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) } myPublicMethod() { >myPublicMethod : Symbol(privateClassWithWithPrivateTypeParameters.myPublicMethod, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 369, 9)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 370, 23)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) } private myPrivateMethod() { >myPrivateMethod : Symbol(privateClassWithWithPrivateTypeParameters.myPrivateMethod, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 371, 9)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 372, 32)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) } } @@ -989,7 +989,7 @@ module privateModule { export function publicFunctionWithPrivateTypeParameters() { >publicFunctionWithPrivateTypeParameters : Symbol(publicFunctionWithPrivateTypeParameters, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 385, 5)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 387, 60)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) } export function publicFunctionWithPublicTypeParameters() { @@ -1001,7 +1001,7 @@ module privateModule { function privateFunctionWithPrivateTypeParameters() { >privateFunctionWithPrivateTypeParameters : Symbol(privateFunctionWithPrivateTypeParameters, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 391, 5)) >T : Symbol(T, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 393, 54)) ->privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 22)) +>privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunctionDeclFile.ts, 312, 25)) } function privateFunctionWithPublicTypeParameters() { diff --git a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.types b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.types index 91e0d2ce003bd..24ea9187d8c29 100644 --- a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.types +++ b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.types @@ -312,7 +312,7 @@ function privateFunctionWithPrivateMopduleTypeParameterspublicModule : typeof publicModule > : ^^^^^^^^^^^^^^^^^^^ @@ -628,7 +628,7 @@ export module publicModule { } -module privateModule { +namespace privateModule { >privateModule : typeof privateModule > : ^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js index a0c721acc99f4..6accdafc0ad05 100644 --- a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js +++ b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js @@ -55,7 +55,7 @@ class privateClassWithTypeParametersFromPrivateModulepublicModule : Symbol(publicModule, Decl(privacyTypeParametersOfClassDeclFile.ts, 52, 1)) class privateClassInPublicModule { ->privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfClassDeclFile.ts, 54, 28)) +>privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfClassDeclFile.ts, 54, 31)) } export class publicClassInPublicModule { @@ -151,7 +151,7 @@ export module publicModule { export class publicClassWithPrivateTypeParameters { // Error >publicClassWithPrivateTypeParameters : Symbol(publicClassWithPrivateTypeParameters, Decl(privacyTypeParametersOfClassDeclFile.ts, 59, 5)) >T : Symbol(T, Decl(privacyTypeParametersOfClassDeclFile.ts, 61, 54)) ->privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfClassDeclFile.ts, 54, 28)) +>privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfClassDeclFile.ts, 54, 31)) myMethod(val: T): T { >myMethod : Symbol(publicClassWithPrivateTypeParameters.myMethod, Decl(privacyTypeParametersOfClassDeclFile.ts, 61, 93)) @@ -183,7 +183,7 @@ export module publicModule { class privateClassWithPrivateTypeParameters { >privateClassWithPrivateTypeParameters : Symbol(privateClassWithPrivateTypeParameters, Decl(privacyTypeParametersOfClassDeclFile.ts, 71, 5)) >T : Symbol(T, Decl(privacyTypeParametersOfClassDeclFile.ts, 73, 48)) ->privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfClassDeclFile.ts, 54, 28)) +>privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfClassDeclFile.ts, 54, 31)) myMethod(val: T): T { >myMethod : Symbol(privateClassWithPrivateTypeParameters.myMethod, Decl(privacyTypeParametersOfClassDeclFile.ts, 73, 87)) @@ -277,11 +277,11 @@ export module publicModule { } } -module privateModule { +namespace privateModule { >privateModule : Symbol(privateModule, Decl(privacyTypeParametersOfClassDeclFile.ts, 108, 1)) class privateClassInPrivateModule { ->privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfClassDeclFile.ts, 110, 22)) +>privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfClassDeclFile.ts, 110, 25)) } export class publicClassInPrivateModule { @@ -291,7 +291,7 @@ module privateModule { export class publicClassWithPrivateTypeParameters { >publicClassWithPrivateTypeParameters : Symbol(publicClassWithPrivateTypeParameters, Decl(privacyTypeParametersOfClassDeclFile.ts, 115, 5)) >T : Symbol(T, Decl(privacyTypeParametersOfClassDeclFile.ts, 117, 54)) ->privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfClassDeclFile.ts, 110, 22)) +>privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfClassDeclFile.ts, 110, 25)) myMethod(val: T): T { >myMethod : Symbol(publicClassWithPrivateTypeParameters.myMethod, Decl(privacyTypeParametersOfClassDeclFile.ts, 117, 94)) @@ -323,7 +323,7 @@ module privateModule { class privateClassWithPrivateTypeParameters { >privateClassWithPrivateTypeParameters : Symbol(privateClassWithPrivateTypeParameters, Decl(privacyTypeParametersOfClassDeclFile.ts, 127, 5)) >T : Symbol(T, Decl(privacyTypeParametersOfClassDeclFile.ts, 129, 48)) ->privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfClassDeclFile.ts, 110, 22)) +>privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfClassDeclFile.ts, 110, 25)) myMethod(val: T): T { >myMethod : Symbol(privateClassWithPrivateTypeParameters.myMethod, Decl(privacyTypeParametersOfClassDeclFile.ts, 129, 88)) diff --git a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.types b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.types index 780f243a8cd34..50c2d1ea147e6 100644 --- a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.types +++ b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.types @@ -143,7 +143,7 @@ class privateClassWithTypeParametersFromPrivateModulepublicModule : typeof publicModule > : ^^^^^^^^^^^^^^^^^^^ @@ -290,7 +290,7 @@ export module publicModule { } } -module privateModule { +namespace privateModule { >privateModule : typeof privateModule > : ^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js index 66f07c0dcc677..b2c3d9db65c23 100644 --- a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js +++ b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js @@ -66,7 +66,7 @@ export interface publicInterfaceWithPrivateModuleTypeParameterConstraints { // Error } -export module publicModule { +export namespace publicModule { class privateClassInPublicModule { } @@ -132,7 +132,7 @@ export module publicModule { } } -module privateModule { +namespace privateModule { class privateClassInPrivateModule { } diff --git a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.symbols b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.symbols index f17ae54bea227..ee3a334cf3600 100644 --- a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.symbols +++ b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.symbols @@ -214,11 +214,11 @@ interface privateInterfaceWithPrivateModuleTypeParameterConstraintspublicClassInPrivateModule : Symbol(privateModule.publicClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 133, 5)) } -export module publicModule { +export namespace publicModule { >publicModule : Symbol(publicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 63, 1)) class privateClassInPublicModule { ->privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 65, 28)) +>privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 65, 31)) } export class publicClassInPublicModule { @@ -238,7 +238,7 @@ export module publicModule { export interface publicInterfaceWithPrivateTypeParameters { // Error >publicInterfaceWithPrivateTypeParameters : Symbol(publicInterfaceWithPrivateTypeParameters, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 76, 5)) >T : Symbol(T, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 78, 62)) ->privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 65, 28)) +>privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 65, 31)) myMethod(val: T): T; >myMethod : Symbol(publicInterfaceWithPrivateTypeParameters.myMethod, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 78, 101)) @@ -254,7 +254,7 @@ export module publicModule { myMethod1(): privateClassInPublicModuleT; >myMethod1 : Symbol(publicInterfaceWithPrivateTypeParameters.myMethod1, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 80, 51)) >privateClassInPublicModuleT : Symbol(privateClassInPublicModuleT, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 70, 5)) ->privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 65, 28)) +>privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 65, 31)) myMethod2(): privateClassInPublicModuleT; >myMethod2 : Symbol(publicInterfaceWithPrivateTypeParameters.myMethod2, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 81, 77)) @@ -264,7 +264,7 @@ export module publicModule { myMethod3(): publicClassInPublicModuleT; >myMethod3 : Symbol(publicInterfaceWithPrivateTypeParameters.myMethod3, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 82, 76)) >publicClassInPublicModuleT : Symbol(publicClassInPublicModuleT, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 73, 5)) ->privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 65, 28)) +>privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 65, 31)) myMethod4(): publicClassInPublicModuleT; >myMethod4 : Symbol(publicInterfaceWithPrivateTypeParameters.myMethod4, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 83, 76)) @@ -291,7 +291,7 @@ export module publicModule { myMethod1(): privateClassInPublicModuleT; >myMethod1 : Symbol(publicInterfaceWithPublicTypeParameters.myMethod1, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 89, 50)) >privateClassInPublicModuleT : Symbol(privateClassInPublicModuleT, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 70, 5)) ->privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 65, 28)) +>privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 65, 31)) myMethod2(): privateClassInPublicModuleT; >myMethod2 : Symbol(publicInterfaceWithPublicTypeParameters.myMethod2, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 90, 77)) @@ -301,7 +301,7 @@ export module publicModule { myMethod3(): publicClassInPublicModuleT; >myMethod3 : Symbol(publicInterfaceWithPublicTypeParameters.myMethod3, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 91, 76)) >publicClassInPublicModuleT : Symbol(publicClassInPublicModuleT, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 73, 5)) ->privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 65, 28)) +>privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 65, 31)) myMethod4(): publicClassInPublicModuleT; >myMethod4 : Symbol(publicInterfaceWithPublicTypeParameters.myMethod4, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 92, 76)) @@ -312,7 +312,7 @@ export module publicModule { interface privateInterfaceWithPrivateTypeParameters { >privateInterfaceWithPrivateTypeParameters : Symbol(privateInterfaceWithPrivateTypeParameters, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 94, 5)) >T : Symbol(T, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 96, 56)) ->privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 65, 28)) +>privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 65, 31)) myMethod(val: T): T; >myMethod : Symbol(privateInterfaceWithPrivateTypeParameters.myMethod, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 96, 95)) @@ -328,7 +328,7 @@ export module publicModule { myMethod1(): privateClassInPublicModuleT; >myMethod1 : Symbol(privateInterfaceWithPrivateTypeParameters.myMethod1, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 98, 51)) >privateClassInPublicModuleT : Symbol(privateClassInPublicModuleT, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 70, 5)) ->privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 65, 28)) +>privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 65, 31)) myMethod2(): privateClassInPublicModuleT; >myMethod2 : Symbol(privateInterfaceWithPrivateTypeParameters.myMethod2, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 99, 77)) @@ -338,7 +338,7 @@ export module publicModule { myMethod3(): publicClassInPublicModuleT; >myMethod3 : Symbol(privateInterfaceWithPrivateTypeParameters.myMethod3, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 100, 76)) >publicClassInPublicModuleT : Symbol(publicClassInPublicModuleT, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 73, 5)) ->privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 65, 28)) +>privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 65, 31)) myMethod4(): publicClassInPublicModuleT; >myMethod4 : Symbol(privateInterfaceWithPrivateTypeParameters.myMethod4, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 101, 76)) @@ -365,7 +365,7 @@ export module publicModule { myMethod1(): privateClassInPublicModuleT; >myMethod1 : Symbol(privateInterfaceWithPublicTypeParameters.myMethod1, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 107, 51)) >privateClassInPublicModuleT : Symbol(privateClassInPublicModuleT, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 70, 5)) ->privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 65, 28)) +>privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 65, 31)) myMethod2(): privateClassInPublicModuleT; >myMethod2 : Symbol(privateInterfaceWithPublicTypeParameters.myMethod2, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 108, 77)) @@ -375,7 +375,7 @@ export module publicModule { myMethod3(): publicClassInPublicModuleT; >myMethod3 : Symbol(privateInterfaceWithPublicTypeParameters.myMethod3, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 109, 76)) >publicClassInPublicModuleT : Symbol(publicClassInPublicModuleT, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 73, 5)) ->privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 65, 28)) +>privateClassInPublicModule : Symbol(privateClassInPublicModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 65, 31)) myMethod4(): publicClassInPublicModuleT; >myMethod4 : Symbol(privateInterfaceWithPublicTypeParameters.myMethod4, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 110, 76)) @@ -430,11 +430,11 @@ export module publicModule { } } -module privateModule { +namespace privateModule { >privateModule : Symbol(privateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 129, 1)) class privateClassInPrivateModule { ->privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 131, 22)) +>privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 131, 25)) } export class publicClassInPrivateModule { @@ -454,7 +454,7 @@ module privateModule { export interface publicInterfaceWithPrivateTypeParameters { >publicInterfaceWithPrivateTypeParameters : Symbol(publicInterfaceWithPrivateTypeParameters, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 142, 5)) >T : Symbol(T, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 144, 62)) ->privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 131, 22)) +>privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 131, 25)) myMethod(val: T): T; >myMethod : Symbol(publicInterfaceWithPrivateTypeParameters.myMethod, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 144, 102)) @@ -470,7 +470,7 @@ module privateModule { myMethod1(): privateClassInPrivateModuleT; >myMethod1 : Symbol(publicInterfaceWithPrivateTypeParameters.myMethod1, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 146, 52)) >privateClassInPrivateModuleT : Symbol(privateClassInPrivateModuleT, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 136, 5)) ->privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 131, 22)) +>privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 131, 25)) myMethod2(): privateClassInPrivateModuleT; >myMethod2 : Symbol(publicInterfaceWithPrivateTypeParameters.myMethod2, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 147, 79)) @@ -480,7 +480,7 @@ module privateModule { myMethod3(): publicClassInPrivateModuleT; >myMethod3 : Symbol(publicInterfaceWithPrivateTypeParameters.myMethod3, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 148, 78)) >publicClassInPrivateModuleT : Symbol(publicClassInPrivateModuleT, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 139, 5)) ->privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 131, 22)) +>privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 131, 25)) myMethod4(): publicClassInPrivateModuleT; >myMethod4 : Symbol(publicInterfaceWithPrivateTypeParameters.myMethod4, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 149, 78)) @@ -507,7 +507,7 @@ module privateModule { myMethod1(): privateClassInPrivateModuleT; >myMethod1 : Symbol(publicInterfaceWithPublicTypeParameters.myMethod1, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 155, 51)) >privateClassInPrivateModuleT : Symbol(privateClassInPrivateModuleT, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 136, 5)) ->privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 131, 22)) +>privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 131, 25)) myMethod2(): privateClassInPrivateModuleT; >myMethod2 : Symbol(publicInterfaceWithPublicTypeParameters.myMethod2, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 156, 79)) @@ -517,7 +517,7 @@ module privateModule { myMethod3(): publicClassInPrivateModuleT; >myMethod3 : Symbol(publicInterfaceWithPublicTypeParameters.myMethod3, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 157, 78)) >publicClassInPrivateModuleT : Symbol(publicClassInPrivateModuleT, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 139, 5)) ->privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 131, 22)) +>privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 131, 25)) myMethod4(): publicClassInPrivateModuleT; >myMethod4 : Symbol(publicInterfaceWithPublicTypeParameters.myMethod4, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 158, 78)) @@ -528,7 +528,7 @@ module privateModule { interface privateInterfaceWithPrivateTypeParameters { >privateInterfaceWithPrivateTypeParameters : Symbol(privateInterfaceWithPrivateTypeParameters, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 160, 5)) >T : Symbol(T, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 162, 56)) ->privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 131, 22)) +>privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 131, 25)) myMethod(val: T): T; >myMethod : Symbol(privateInterfaceWithPrivateTypeParameters.myMethod, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 162, 96)) @@ -544,7 +544,7 @@ module privateModule { myMethod1(): privateClassInPrivateModuleT; >myMethod1 : Symbol(privateInterfaceWithPrivateTypeParameters.myMethod1, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 164, 52)) >privateClassInPrivateModuleT : Symbol(privateClassInPrivateModuleT, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 136, 5)) ->privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 131, 22)) +>privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 131, 25)) myMethod2(): privateClassInPrivateModuleT; >myMethod2 : Symbol(privateInterfaceWithPrivateTypeParameters.myMethod2, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 165, 79)) @@ -554,7 +554,7 @@ module privateModule { myMethod3(): publicClassInPrivateModuleT; >myMethod3 : Symbol(privateInterfaceWithPrivateTypeParameters.myMethod3, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 166, 78)) >publicClassInPrivateModuleT : Symbol(publicClassInPrivateModuleT, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 139, 5)) ->privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 131, 22)) +>privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 131, 25)) myMethod4(): publicClassInPrivateModuleT; >myMethod4 : Symbol(privateInterfaceWithPrivateTypeParameters.myMethod4, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 167, 78)) @@ -581,7 +581,7 @@ module privateModule { myMethod1(): privateClassInPrivateModuleT; >myMethod1 : Symbol(privateInterfaceWithPublicTypeParameters.myMethod1, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 173, 52)) >privateClassInPrivateModuleT : Symbol(privateClassInPrivateModuleT, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 136, 5)) ->privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 131, 22)) +>privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 131, 25)) myMethod2(): privateClassInPrivateModuleT; >myMethod2 : Symbol(privateInterfaceWithPublicTypeParameters.myMethod2, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 174, 79)) @@ -591,7 +591,7 @@ module privateModule { myMethod3(): publicClassInPrivateModuleT; >myMethod3 : Symbol(privateInterfaceWithPublicTypeParameters.myMethod3, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 175, 78)) >publicClassInPrivateModuleT : Symbol(publicClassInPrivateModuleT, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 139, 5)) ->privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 131, 22)) +>privateClassInPrivateModule : Symbol(privateClassInPrivateModule, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 131, 25)) myMethod4(): publicClassInPrivateModuleT; >myMethod4 : Symbol(privateInterfaceWithPublicTypeParameters.myMethod4, Decl(privacyTypeParametersOfInterfaceDeclFile.ts, 176, 78)) diff --git a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.types b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.types index 32667f92a1308..e51ef80372fd6 100644 --- a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.types +++ b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.types @@ -168,7 +168,7 @@ interface privateInterfaceWithPrivateModuleTypeParameterConstraints : ^^^ } -export module publicModule { +export namespace publicModule { >publicModule : typeof publicModule > : ^^^^^^^^^^^^^^^^^^^ @@ -339,7 +339,7 @@ export module publicModule { } } -module privateModule { +namespace privateModule { >privateModule : typeof privateModule > : ^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/privacyVar.js b/tests/baselines/reference/privacyVar.js index 3cbcf1010be49..5d3e0c6ca5fcc 100644 --- a/tests/baselines/reference/privacyVar.js +++ b/tests/baselines/reference/privacyVar.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyVar.ts] //// //// [privacyVar.ts] -export module m1 { +export namespace m1 { export class C1_public { private f1() { } @@ -60,7 +60,7 @@ export module m1 { export var m1_v24_public: C2_private = new C2_private(); // error } -module m2 { +namespace m2 { export class m2_C1_public { private f1() { } diff --git a/tests/baselines/reference/privacyVar.symbols b/tests/baselines/reference/privacyVar.symbols index 355d18e8c3bcf..13ab34a61b255 100644 --- a/tests/baselines/reference/privacyVar.symbols +++ b/tests/baselines/reference/privacyVar.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/privacyVar.ts] //// === privacyVar.ts === -export module m1 { +export namespace m1 { >m1 : Symbol(m1, Decl(privacyVar.ts, 0, 0)) export class C1_public { ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) private f1() { >f1 : Symbol(C1_public.f1, Decl(privacyVar.ts, 1, 28)) @@ -21,11 +21,11 @@ export module m1 { private C3_v1_private: C1_public; >C3_v1_private : Symbol(C3_public.C3_v1_private, Decl(privacyVar.ts, 9, 28)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) public C3_v2_public: C1_public; >C3_v2_public : Symbol(C3_public.C3_v2_public, Decl(privacyVar.ts, 10, 41)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) private C3_v3_private: C2_private; >C3_v3_private : Symbol(C3_public.C3_v3_private, Decl(privacyVar.ts, 11, 39)) @@ -37,11 +37,11 @@ export module m1 { private C3_v11_private = new C1_public(); >C3_v11_private : Symbol(C3_public.C3_v11_private, Decl(privacyVar.ts, 13, 40)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) public C3_v12_public = new C1_public(); >C3_v12_public : Symbol(C3_public.C3_v12_public, Decl(privacyVar.ts, 15, 49)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) private C3_v13_private = new C2_private(); >C3_v13_private : Symbol(C3_public.C3_v13_private, Decl(privacyVar.ts, 16, 47)) @@ -53,13 +53,13 @@ export module m1 { private C3_v21_private: C1_public = new C1_public(); >C3_v21_private : Symbol(C3_public.C3_v21_private, Decl(privacyVar.ts, 18, 48)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) public C3_v22_public: C1_public = new C1_public(); >C3_v22_public : Symbol(C3_public.C3_v22_public, Decl(privacyVar.ts, 20, 60)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) private C3_v23_private: C2_private = new C2_private(); >C3_v23_private : Symbol(C3_public.C3_v23_private, Decl(privacyVar.ts, 21, 58)) @@ -77,11 +77,11 @@ export module m1 { private C4_v1_private: C1_public; >C4_v1_private : Symbol(C4_public.C4_v1_private, Decl(privacyVar.ts, 26, 21)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) public C4_v2_public: C1_public; >C4_v2_public : Symbol(C4_public.C4_v2_public, Decl(privacyVar.ts, 27, 41)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) private C4_v3_private: C2_private; >C4_v3_private : Symbol(C4_public.C4_v3_private, Decl(privacyVar.ts, 28, 39)) @@ -93,11 +93,11 @@ export module m1 { private C4_v11_private = new C1_public(); >C4_v11_private : Symbol(C4_public.C4_v11_private, Decl(privacyVar.ts, 30, 40)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) public C4_v12_public = new C1_public(); >C4_v12_public : Symbol(C4_public.C4_v12_public, Decl(privacyVar.ts, 32, 49)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) private C4_v13_private = new C2_private(); >C4_v13_private : Symbol(C4_public.C4_v13_private, Decl(privacyVar.ts, 33, 47)) @@ -109,13 +109,13 @@ export module m1 { private C4_v21_private: C1_public = new C1_public(); >C4_v21_private : Symbol(C4_public.C4_v21_private, Decl(privacyVar.ts, 35, 48)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) public C4_v22_public: C1_public = new C1_public(); >C4_v22_public : Symbol(C4_public.C4_v22_public, Decl(privacyVar.ts, 37, 60)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) private C4_v23_private: C2_private = new C2_private(); >C4_v23_private : Symbol(C4_public.C4_v23_private, Decl(privacyVar.ts, 38, 58)) @@ -130,11 +130,11 @@ export module m1 { var m1_v1_private: C1_public; >m1_v1_private : Symbol(m1_v1_private, Decl(privacyVar.ts, 43, 7)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) export var m1_v2_public: C1_public; >m1_v2_public : Symbol(m1_v2_public, Decl(privacyVar.ts, 44, 14)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) var m1_v3_private: C2_private; >m1_v3_private : Symbol(m1_v3_private, Decl(privacyVar.ts, 45, 7)) @@ -146,11 +146,11 @@ export module m1 { var m1_v11_private = new C1_public(); >m1_v11_private : Symbol(m1_v11_private, Decl(privacyVar.ts, 48, 7)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) export var m1_v12_public = new C1_public(); >m1_v12_public : Symbol(m1_v12_public, Decl(privacyVar.ts, 49, 14)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) var m1_v13_private = new C2_private(); >m1_v13_private : Symbol(m1_v13_private, Decl(privacyVar.ts, 50, 7)) @@ -162,13 +162,13 @@ export module m1 { var m1_v21_private: C1_public = new C1_public(); >m1_v21_private : Symbol(m1_v21_private, Decl(privacyVar.ts, 53, 7)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) export var m1_v22_public: C1_public = new C1_public(); >m1_v22_public : Symbol(m1_v22_public, Decl(privacyVar.ts, 54, 14)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) ->C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) +>C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 21)) var m1_v23_private: C2_private = new C2_private(); >m1_v23_private : Symbol(m1_v23_private, Decl(privacyVar.ts, 55, 7)) @@ -181,11 +181,11 @@ export module m1 { >C2_private : Symbol(C2_private, Decl(privacyVar.ts, 4, 5)) } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(privacyVar.ts, 57, 1)) export class m2_C1_public { ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) private f1() { >f1 : Symbol(m2_C1_public.f1, Decl(privacyVar.ts, 60, 31)) @@ -201,11 +201,11 @@ module m2 { private m2_C3_v1_private: m2_C1_public; >m2_C3_v1_private : Symbol(m2_C3_public.m2_C3_v1_private, Decl(privacyVar.ts, 68, 31)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) public m2_C3_v2_public: m2_C1_public; >m2_C3_v2_public : Symbol(m2_C3_public.m2_C3_v2_public, Decl(privacyVar.ts, 69, 47)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) private m2_C3_v3_private: m2_C2_private; >m2_C3_v3_private : Symbol(m2_C3_public.m2_C3_v3_private, Decl(privacyVar.ts, 70, 45)) @@ -217,11 +217,11 @@ module m2 { private m2_C3_v11_private = new m2_C1_public(); >m2_C3_v11_private : Symbol(m2_C3_public.m2_C3_v11_private, Decl(privacyVar.ts, 72, 46)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) public m2_C3_v12_public = new m2_C1_public(); >m2_C3_v12_public : Symbol(m2_C3_public.m2_C3_v12_public, Decl(privacyVar.ts, 74, 55)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) private m2_C3_v13_private = new m2_C2_private(); >m2_C3_v13_private : Symbol(m2_C3_public.m2_C3_v13_private, Decl(privacyVar.ts, 75, 53)) @@ -233,13 +233,13 @@ module m2 { private m2_C3_v21_private: m2_C1_public = new m2_C1_public(); >m2_C3_v21_private : Symbol(m2_C3_public.m2_C3_v21_private, Decl(privacyVar.ts, 77, 54)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) public m2_C3_v22_public: m2_C1_public = new m2_C1_public(); >m2_C3_v22_public : Symbol(m2_C3_public.m2_C3_v22_public, Decl(privacyVar.ts, 79, 69)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) private m2_C3_v23_private: m2_C2_private = new m2_C2_private(); >m2_C3_v23_private : Symbol(m2_C3_public.m2_C3_v23_private, Decl(privacyVar.ts, 80, 67)) @@ -257,11 +257,11 @@ module m2 { private m2_C4_v1_private: m2_C1_public; >m2_C4_v1_private : Symbol(m2_C4_public.m2_C4_v1_private, Decl(privacyVar.ts, 85, 24)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) public m2_C4_v2_public: m2_C1_public; >m2_C4_v2_public : Symbol(m2_C4_public.m2_C4_v2_public, Decl(privacyVar.ts, 86, 47)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) private m2_C4_v3_private: m2_C2_private; >m2_C4_v3_private : Symbol(m2_C4_public.m2_C4_v3_private, Decl(privacyVar.ts, 87, 45)) @@ -273,11 +273,11 @@ module m2 { private m2_C4_v11_private = new m2_C1_public(); >m2_C4_v11_private : Symbol(m2_C4_public.m2_C4_v11_private, Decl(privacyVar.ts, 89, 46)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) public m2_C4_v12_public = new m2_C1_public(); >m2_C4_v12_public : Symbol(m2_C4_public.m2_C4_v12_public, Decl(privacyVar.ts, 91, 55)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) private m2_C4_v13_private = new m2_C2_private(); >m2_C4_v13_private : Symbol(m2_C4_public.m2_C4_v13_private, Decl(privacyVar.ts, 92, 53)) @@ -289,13 +289,13 @@ module m2 { private m2_C4_v21_private: m2_C1_public = new m2_C1_public(); >m2_C4_v21_private : Symbol(m2_C4_public.m2_C4_v21_private, Decl(privacyVar.ts, 94, 54)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) public m2_C4_v22_public: m2_C1_public = new m2_C1_public(); >m2_C4_v22_public : Symbol(m2_C4_public.m2_C4_v22_public, Decl(privacyVar.ts, 96, 69)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) private m2_C4_v23_private: m2_C2_private = new m2_C2_private(); >m2_C4_v23_private : Symbol(m2_C4_public.m2_C4_v23_private, Decl(privacyVar.ts, 97, 67)) @@ -310,11 +310,11 @@ module m2 { var m2_v1_private: m2_C1_public; >m2_v1_private : Symbol(m2_v1_private, Decl(privacyVar.ts, 102, 7)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) export var m2_v2_public: m2_C1_public; >m2_v2_public : Symbol(m2_v2_public, Decl(privacyVar.ts, 103, 14)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) var m2_v3_private: m2_C2_private; >m2_v3_private : Symbol(m2_v3_private, Decl(privacyVar.ts, 104, 7)) @@ -326,11 +326,11 @@ module m2 { var m2_v11_private = new m2_C1_public(); >m2_v11_private : Symbol(m2_v11_private, Decl(privacyVar.ts, 107, 7)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) export var m2_v12_public = new m2_C1_public(); >m2_v12_public : Symbol(m2_v12_public, Decl(privacyVar.ts, 108, 14)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) var m2_v13_private = new m2_C2_private(); >m2_v13_private : Symbol(m2_v13_private, Decl(privacyVar.ts, 109, 7)) @@ -342,13 +342,13 @@ module m2 { var m2_v21_private: m2_C1_public = new m2_C1_public(); >m2_v21_private : Symbol(m2_v21_private, Decl(privacyVar.ts, 112, 7)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) export var m2_v22_public: m2_C1_public = new m2_C1_public(); >m2_v22_public : Symbol(m2_v22_public, Decl(privacyVar.ts, 113, 14)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) ->m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) +>m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 14)) var m2_v23_private: m2_C2_private = new m2_C2_private(); >m2_v23_private : Symbol(m2_v23_private, Decl(privacyVar.ts, 114, 7)) diff --git a/tests/baselines/reference/privacyVar.types b/tests/baselines/reference/privacyVar.types index d134b285c9382..3102802a8b038 100644 --- a/tests/baselines/reference/privacyVar.types +++ b/tests/baselines/reference/privacyVar.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privacyVar.ts] //// === privacyVar.ts === -export module m1 { +export namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -271,7 +271,7 @@ export module m1 { > : ^^^^^^^^^^^^^^^^^ } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/privacyVarDeclFile.js b/tests/baselines/reference/privacyVarDeclFile.js index 83f6ef53f1aea..254ae0dd777da 100644 --- a/tests/baselines/reference/privacyVarDeclFile.js +++ b/tests/baselines/reference/privacyVarDeclFile.js @@ -81,7 +81,7 @@ class privateClassWithPrivateModulePropertyTypes { var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass; declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; -export module publicModule { +export namespace publicModule { class privateClass { } @@ -163,7 +163,7 @@ export module publicModule { declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; } -module privateModule { +namespace privateModule { class privateClass { } @@ -260,14 +260,14 @@ class publicClassWithWithPublicPropertyTypesInGlobal { var publicVarWithPublicPropertyTypesInGlobal: publicClassInGlobal; declare var publicAmbientVarWithPublicPropertyTypesInGlobal: publicClassInGlobal; -module publicModuleInGlobal { +namespace publicModuleInGlobal { class privateClass { } export class publicClass { } - module privateModule { + namespace privateModule { class privateClass { } diff --git a/tests/baselines/reference/privacyVarDeclFile.symbols b/tests/baselines/reference/privacyVarDeclFile.symbols index 544830d0b8462..89bcc5dbb5509 100644 --- a/tests/baselines/reference/privacyVarDeclFile.symbols +++ b/tests/baselines/reference/privacyVarDeclFile.symbols @@ -215,11 +215,11 @@ declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publi >privateModule : Symbol(privateModule, Decl(privacyVarDeclFile_externalModule.ts, 160, 1)) >publicClass : Symbol(privateModule.publicClass, Decl(privacyVarDeclFile_externalModule.ts, 164, 5)) -export module publicModule { +export namespace publicModule { >publicModule : Symbol(publicModule, Decl(privacyVarDeclFile_externalModule.ts, 78, 87)) class privateClass { ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 28)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 31)) } export class publicClass { @@ -231,7 +231,7 @@ export module publicModule { myProperty: privateClass; // Error >myProperty : Symbol(publicInterfaceWithPrivatePropertyTypes.myProperty, Decl(privacyVarDeclFile_externalModule.ts, 87, 62)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 28)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 31)) } export interface publicInterfaceWithPublicPropertyTypes { @@ -247,7 +247,7 @@ export module publicModule { myProperty: privateClass; >myProperty : Symbol(privateInterfaceWithPrivatePropertyTypes.myProperty, Decl(privacyVarDeclFile_externalModule.ts, 95, 56)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 28)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 31)) } interface privateInterfaceWithPublicPropertyTypes { @@ -263,19 +263,19 @@ export module publicModule { static myPublicStaticProperty: privateClass; // Error >myPublicStaticProperty : Symbol(publicClassWithWithPrivatePropertyTypes.myPublicStaticProperty, Decl(privacyVarDeclFile_externalModule.ts, 103, 58)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 28)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 31)) private static myPrivateStaticProperty: privateClass; >myPrivateStaticProperty : Symbol(publicClassWithWithPrivatePropertyTypes.myPrivateStaticProperty, Decl(privacyVarDeclFile_externalModule.ts, 104, 52)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 28)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 31)) myPublicProperty: privateClass; // Error >myPublicProperty : Symbol(publicClassWithWithPrivatePropertyTypes.myPublicProperty, Decl(privacyVarDeclFile_externalModule.ts, 105, 61)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 28)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 31)) private myPrivateProperty: privateClass; >myPrivateProperty : Symbol(publicClassWithWithPrivatePropertyTypes.myPrivateProperty, Decl(privacyVarDeclFile_externalModule.ts, 106, 39)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 28)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 31)) } export class publicClassWithWithPublicPropertyTypes { @@ -303,19 +303,19 @@ export module publicModule { static myPublicStaticProperty: privateClass; >myPublicStaticProperty : Symbol(privateClassWithWithPrivatePropertyTypes.myPublicStaticProperty, Decl(privacyVarDeclFile_externalModule.ts, 117, 52)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 28)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 31)) private static myPrivateStaticProperty: privateClass; >myPrivateStaticProperty : Symbol(privateClassWithWithPrivatePropertyTypes.myPrivateStaticProperty, Decl(privacyVarDeclFile_externalModule.ts, 118, 52)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 28)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 31)) myPublicProperty: privateClass; >myPublicProperty : Symbol(privateClassWithWithPrivatePropertyTypes.myPublicProperty, Decl(privacyVarDeclFile_externalModule.ts, 119, 61)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 28)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 31)) private myPrivateProperty: privateClass; >myPrivateProperty : Symbol(privateClassWithWithPrivatePropertyTypes.myPrivateProperty, Decl(privacyVarDeclFile_externalModule.ts, 120, 39)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 28)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 31)) } class privateClassWithWithPublicPropertyTypes { @@ -340,7 +340,7 @@ export module publicModule { export var publicVarWithPrivatePropertyTypes: privateClass; // Error >publicVarWithPrivatePropertyTypes : Symbol(publicVarWithPrivatePropertyTypes, Decl(privacyVarDeclFile_externalModule.ts, 131, 14)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 28)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 31)) export var publicVarWithPublicPropertyTypes: publicClass; >publicVarWithPublicPropertyTypes : Symbol(publicVarWithPublicPropertyTypes, Decl(privacyVarDeclFile_externalModule.ts, 132, 14)) @@ -348,7 +348,7 @@ export module publicModule { var privateVarWithPrivatePropertyTypes: privateClass; >privateVarWithPrivatePropertyTypes : Symbol(privateVarWithPrivatePropertyTypes, Decl(privacyVarDeclFile_externalModule.ts, 133, 7)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 28)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 31)) var privateVarWithPublicPropertyTypes: publicClass; >privateVarWithPublicPropertyTypes : Symbol(privateVarWithPublicPropertyTypes, Decl(privacyVarDeclFile_externalModule.ts, 134, 7)) @@ -356,7 +356,7 @@ export module publicModule { export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error >publicAmbientVarWithPrivatePropertyTypes : Symbol(publicAmbientVarWithPrivatePropertyTypes, Decl(privacyVarDeclFile_externalModule.ts, 136, 22)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 28)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 31)) export declare var publicAmbientVarWithPublicPropertyTypes: publicClass; >publicAmbientVarWithPublicPropertyTypes : Symbol(publicAmbientVarWithPublicPropertyTypes, Decl(privacyVarDeclFile_externalModule.ts, 137, 22)) @@ -364,7 +364,7 @@ export module publicModule { declare var privateAmbientVarWithPrivatePropertyTypes: privateClass; >privateAmbientVarWithPrivatePropertyTypes : Symbol(privateAmbientVarWithPrivatePropertyTypes, Decl(privacyVarDeclFile_externalModule.ts, 138, 15)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 28)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 80, 31)) declare var privateAmbientVarWithPublicPropertyTypes: publicClass; >privateAmbientVarWithPublicPropertyTypes : Symbol(privateAmbientVarWithPublicPropertyTypes, Decl(privacyVarDeclFile_externalModule.ts, 139, 15)) @@ -433,11 +433,11 @@ export module publicModule { >publicClass : Symbol(privateModule.publicClass, Decl(privacyVarDeclFile_externalModule.ts, 164, 5)) } -module privateModule { +namespace privateModule { >privateModule : Symbol(privateModule, Decl(privacyVarDeclFile_externalModule.ts, 160, 1)) class privateClass { ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 22)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 25)) } export class publicClass { @@ -449,7 +449,7 @@ module privateModule { myProperty: privateClass; >myProperty : Symbol(publicInterfaceWithPrivatePropertyTypes.myProperty, Decl(privacyVarDeclFile_externalModule.ts, 169, 62)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 22)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 25)) } export interface publicInterfaceWithPublicPropertyTypes { @@ -465,7 +465,7 @@ module privateModule { myProperty: privateClass; >myProperty : Symbol(privateInterfaceWithPrivatePropertyTypes.myProperty, Decl(privacyVarDeclFile_externalModule.ts, 177, 56)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 22)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 25)) } interface privateInterfaceWithPublicPropertyTypes { @@ -481,19 +481,19 @@ module privateModule { static myPublicStaticProperty: privateClass; >myPublicStaticProperty : Symbol(publicClassWithWithPrivatePropertyTypes.myPublicStaticProperty, Decl(privacyVarDeclFile_externalModule.ts, 185, 58)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 22)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 25)) private static myPrivateStaticProperty: privateClass; >myPrivateStaticProperty : Symbol(publicClassWithWithPrivatePropertyTypes.myPrivateStaticProperty, Decl(privacyVarDeclFile_externalModule.ts, 186, 52)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 22)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 25)) myPublicProperty: privateClass; >myPublicProperty : Symbol(publicClassWithWithPrivatePropertyTypes.myPublicProperty, Decl(privacyVarDeclFile_externalModule.ts, 187, 61)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 22)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 25)) private myPrivateProperty: privateClass; >myPrivateProperty : Symbol(publicClassWithWithPrivatePropertyTypes.myPrivateProperty, Decl(privacyVarDeclFile_externalModule.ts, 188, 39)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 22)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 25)) } export class publicClassWithWithPublicPropertyTypes { @@ -521,19 +521,19 @@ module privateModule { static myPublicStaticProperty: privateClass; >myPublicStaticProperty : Symbol(privateClassWithWithPrivatePropertyTypes.myPublicStaticProperty, Decl(privacyVarDeclFile_externalModule.ts, 199, 52)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 22)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 25)) private static myPrivateStaticProperty: privateClass; >myPrivateStaticProperty : Symbol(privateClassWithWithPrivatePropertyTypes.myPrivateStaticProperty, Decl(privacyVarDeclFile_externalModule.ts, 200, 52)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 22)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 25)) myPublicProperty: privateClass; >myPublicProperty : Symbol(privateClassWithWithPrivatePropertyTypes.myPublicProperty, Decl(privacyVarDeclFile_externalModule.ts, 201, 61)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 22)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 25)) private myPrivateProperty: privateClass; >myPrivateProperty : Symbol(privateClassWithWithPrivatePropertyTypes.myPrivateProperty, Decl(privacyVarDeclFile_externalModule.ts, 202, 39)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 22)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 25)) } class privateClassWithWithPublicPropertyTypes { @@ -558,7 +558,7 @@ module privateModule { export var publicVarWithPrivatePropertyTypes: privateClass; >publicVarWithPrivatePropertyTypes : Symbol(publicVarWithPrivatePropertyTypes, Decl(privacyVarDeclFile_externalModule.ts, 213, 14)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 22)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 25)) export var publicVarWithPublicPropertyTypes: publicClass; >publicVarWithPublicPropertyTypes : Symbol(publicVarWithPublicPropertyTypes, Decl(privacyVarDeclFile_externalModule.ts, 214, 14)) @@ -566,7 +566,7 @@ module privateModule { var privateVarWithPrivatePropertyTypes: privateClass; >privateVarWithPrivatePropertyTypes : Symbol(privateVarWithPrivatePropertyTypes, Decl(privacyVarDeclFile_externalModule.ts, 215, 7)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 22)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 25)) var privateVarWithPublicPropertyTypes: publicClass; >privateVarWithPublicPropertyTypes : Symbol(privateVarWithPublicPropertyTypes, Decl(privacyVarDeclFile_externalModule.ts, 216, 7)) @@ -574,7 +574,7 @@ module privateModule { export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; >publicAmbientVarWithPrivatePropertyTypes : Symbol(publicAmbientVarWithPrivatePropertyTypes, Decl(privacyVarDeclFile_externalModule.ts, 218, 22)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 22)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 25)) export declare var publicAmbientVarWithPublicPropertyTypes: publicClass; >publicAmbientVarWithPublicPropertyTypes : Symbol(publicAmbientVarWithPublicPropertyTypes, Decl(privacyVarDeclFile_externalModule.ts, 219, 22)) @@ -582,7 +582,7 @@ module privateModule { declare var privateAmbientVarWithPrivatePropertyTypes: privateClass; >privateAmbientVarWithPrivatePropertyTypes : Symbol(privateAmbientVarWithPrivatePropertyTypes, Decl(privacyVarDeclFile_externalModule.ts, 220, 15)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 22)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_externalModule.ts, 162, 25)) declare var privateAmbientVarWithPublicPropertyTypes: publicClass; >privateAmbientVarWithPublicPropertyTypes : Symbol(privateAmbientVarWithPublicPropertyTypes, Decl(privacyVarDeclFile_externalModule.ts, 221, 15)) @@ -689,22 +689,22 @@ declare var publicAmbientVarWithPublicPropertyTypesInGlobal: publicClassInGlobal >publicAmbientVarWithPublicPropertyTypesInGlobal : Symbol(publicAmbientVarWithPublicPropertyTypesInGlobal, Decl(privacyVarDeclFile_GlobalFile.ts, 12, 11)) >publicClassInGlobal : Symbol(publicClassInGlobal, Decl(privacyVarDeclFile_GlobalFile.ts, 0, 0)) -module publicModuleInGlobal { +namespace publicModuleInGlobal { >publicModuleInGlobal : Symbol(publicModuleInGlobal, Decl(privacyVarDeclFile_GlobalFile.ts, 12, 81)) class privateClass { ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 29)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 32)) } export class publicClass { >publicClass : Symbol(publicClass, Decl(privacyVarDeclFile_GlobalFile.ts, 16, 5)) } - module privateModule { + namespace privateModule { >privateModule : Symbol(privateModule, Decl(privacyVarDeclFile_GlobalFile.ts, 19, 5)) class privateClass { ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 26)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 29)) } export class publicClass { @@ -716,7 +716,7 @@ module publicModuleInGlobal { myProperty: privateClass; >myProperty : Symbol(publicInterfaceWithPrivatePropertyTypes.myProperty, Decl(privacyVarDeclFile_GlobalFile.ts, 28, 66)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 26)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 29)) } export interface publicInterfaceWithPublicPropertyTypes { @@ -732,7 +732,7 @@ module publicModuleInGlobal { myProperty: privateClass; >myProperty : Symbol(privateInterfaceWithPrivatePropertyTypes.myProperty, Decl(privacyVarDeclFile_GlobalFile.ts, 36, 60)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 26)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 29)) } interface privateInterfaceWithPublicPropertyTypes { @@ -748,19 +748,19 @@ module publicModuleInGlobal { static myPublicStaticProperty: privateClass; >myPublicStaticProperty : Symbol(publicClassWithWithPrivatePropertyTypes.myPublicStaticProperty, Decl(privacyVarDeclFile_GlobalFile.ts, 44, 62)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 26)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 29)) private static myPrivateStaticProperty: privateClass; >myPrivateStaticProperty : Symbol(publicClassWithWithPrivatePropertyTypes.myPrivateStaticProperty, Decl(privacyVarDeclFile_GlobalFile.ts, 45, 56)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 26)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 29)) myPublicProperty: privateClass; >myPublicProperty : Symbol(publicClassWithWithPrivatePropertyTypes.myPublicProperty, Decl(privacyVarDeclFile_GlobalFile.ts, 46, 65)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 26)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 29)) private myPrivateProperty: privateClass; >myPrivateProperty : Symbol(publicClassWithWithPrivatePropertyTypes.myPrivateProperty, Decl(privacyVarDeclFile_GlobalFile.ts, 47, 43)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 26)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 29)) } export class publicClassWithWithPublicPropertyTypes { @@ -788,19 +788,19 @@ module publicModuleInGlobal { static myPublicStaticProperty: privateClass; >myPublicStaticProperty : Symbol(privateClassWithWithPrivatePropertyTypes.myPublicStaticProperty, Decl(privacyVarDeclFile_GlobalFile.ts, 58, 56)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 26)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 29)) private static myPrivateStaticProperty: privateClass; >myPrivateStaticProperty : Symbol(privateClassWithWithPrivatePropertyTypes.myPrivateStaticProperty, Decl(privacyVarDeclFile_GlobalFile.ts, 59, 56)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 26)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 29)) myPublicProperty: privateClass; >myPublicProperty : Symbol(privateClassWithWithPrivatePropertyTypes.myPublicProperty, Decl(privacyVarDeclFile_GlobalFile.ts, 60, 65)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 26)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 29)) private myPrivateProperty: privateClass; >myPrivateProperty : Symbol(privateClassWithWithPrivatePropertyTypes.myPrivateProperty, Decl(privacyVarDeclFile_GlobalFile.ts, 61, 43)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 26)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 29)) } class privateClassWithWithPublicPropertyTypes { @@ -825,7 +825,7 @@ module publicModuleInGlobal { export var publicVarWithPrivatePropertyTypes: privateClass; >publicVarWithPrivatePropertyTypes : Symbol(publicVarWithPrivatePropertyTypes, Decl(privacyVarDeclFile_GlobalFile.ts, 72, 18)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 26)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 29)) export var publicVarWithPublicPropertyTypes: publicClass; >publicVarWithPublicPropertyTypes : Symbol(publicVarWithPublicPropertyTypes, Decl(privacyVarDeclFile_GlobalFile.ts, 73, 18)) @@ -833,7 +833,7 @@ module publicModuleInGlobal { var privateVarWithPrivatePropertyTypes: privateClass; >privateVarWithPrivatePropertyTypes : Symbol(privateVarWithPrivatePropertyTypes, Decl(privacyVarDeclFile_GlobalFile.ts, 74, 11)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 26)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 29)) var privateVarWithPublicPropertyTypes: publicClass; >privateVarWithPublicPropertyTypes : Symbol(privateVarWithPublicPropertyTypes, Decl(privacyVarDeclFile_GlobalFile.ts, 75, 11)) @@ -841,7 +841,7 @@ module publicModuleInGlobal { export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; >publicAmbientVarWithPrivatePropertyTypes : Symbol(publicAmbientVarWithPrivatePropertyTypes, Decl(privacyVarDeclFile_GlobalFile.ts, 77, 26)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 26)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 29)) export declare var publicAmbientVarWithPublicPropertyTypes: publicClass; >publicAmbientVarWithPublicPropertyTypes : Symbol(publicAmbientVarWithPublicPropertyTypes, Decl(privacyVarDeclFile_GlobalFile.ts, 78, 26)) @@ -849,7 +849,7 @@ module publicModuleInGlobal { declare var privateAmbientVarWithPrivatePropertyTypes: privateClass; >privateAmbientVarWithPrivatePropertyTypes : Symbol(privateAmbientVarWithPrivatePropertyTypes, Decl(privacyVarDeclFile_GlobalFile.ts, 79, 19)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 26)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 21, 29)) declare var privateAmbientVarWithPublicPropertyTypes: publicClass; >privateAmbientVarWithPublicPropertyTypes : Symbol(privateAmbientVarWithPublicPropertyTypes, Decl(privacyVarDeclFile_GlobalFile.ts, 80, 19)) @@ -923,7 +923,7 @@ module publicModuleInGlobal { myProperty: privateClass; // Error >myProperty : Symbol(publicInterfaceWithPrivatePropertyTypes.myProperty, Decl(privacyVarDeclFile_GlobalFile.ts, 103, 62)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 29)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 32)) } export interface publicInterfaceWithPublicPropertyTypes { @@ -939,7 +939,7 @@ module publicModuleInGlobal { myProperty: privateClass; >myProperty : Symbol(privateInterfaceWithPrivatePropertyTypes.myProperty, Decl(privacyVarDeclFile_GlobalFile.ts, 111, 56)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 29)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 32)) } interface privateInterfaceWithPublicPropertyTypes { @@ -955,19 +955,19 @@ module publicModuleInGlobal { static myPublicStaticProperty: privateClass; // Error >myPublicStaticProperty : Symbol(publicClassWithWithPrivatePropertyTypes.myPublicStaticProperty, Decl(privacyVarDeclFile_GlobalFile.ts, 119, 58)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 29)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 32)) private static myPrivateStaticProperty: privateClass; >myPrivateStaticProperty : Symbol(publicClassWithWithPrivatePropertyTypes.myPrivateStaticProperty, Decl(privacyVarDeclFile_GlobalFile.ts, 120, 52)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 29)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 32)) myPublicProperty: privateClass; // Error >myPublicProperty : Symbol(publicClassWithWithPrivatePropertyTypes.myPublicProperty, Decl(privacyVarDeclFile_GlobalFile.ts, 121, 61)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 29)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 32)) private myPrivateProperty: privateClass; >myPrivateProperty : Symbol(publicClassWithWithPrivatePropertyTypes.myPrivateProperty, Decl(privacyVarDeclFile_GlobalFile.ts, 122, 39)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 29)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 32)) } export class publicClassWithWithPublicPropertyTypes { @@ -995,19 +995,19 @@ module publicModuleInGlobal { static myPublicStaticProperty: privateClass; >myPublicStaticProperty : Symbol(privateClassWithWithPrivatePropertyTypes.myPublicStaticProperty, Decl(privacyVarDeclFile_GlobalFile.ts, 133, 52)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 29)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 32)) private static myPrivateStaticProperty: privateClass; >myPrivateStaticProperty : Symbol(privateClassWithWithPrivatePropertyTypes.myPrivateStaticProperty, Decl(privacyVarDeclFile_GlobalFile.ts, 134, 52)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 29)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 32)) myPublicProperty: privateClass; >myPublicProperty : Symbol(privateClassWithWithPrivatePropertyTypes.myPublicProperty, Decl(privacyVarDeclFile_GlobalFile.ts, 135, 61)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 29)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 32)) private myPrivateProperty: privateClass; >myPrivateProperty : Symbol(privateClassWithWithPrivatePropertyTypes.myPrivateProperty, Decl(privacyVarDeclFile_GlobalFile.ts, 136, 39)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 29)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 32)) } class privateClassWithWithPublicPropertyTypes { @@ -1032,7 +1032,7 @@ module publicModuleInGlobal { export var publicVarWithPrivatePropertyTypes: privateClass; // Error >publicVarWithPrivatePropertyTypes : Symbol(publicVarWithPrivatePropertyTypes, Decl(privacyVarDeclFile_GlobalFile.ts, 147, 14)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 29)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 32)) export var publicVarWithPublicPropertyTypes: publicClass; >publicVarWithPublicPropertyTypes : Symbol(publicVarWithPublicPropertyTypes, Decl(privacyVarDeclFile_GlobalFile.ts, 148, 14)) @@ -1040,7 +1040,7 @@ module publicModuleInGlobal { var privateVarWithPrivatePropertyTypes: privateClass; >privateVarWithPrivatePropertyTypes : Symbol(privateVarWithPrivatePropertyTypes, Decl(privacyVarDeclFile_GlobalFile.ts, 149, 7)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 29)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 32)) var privateVarWithPublicPropertyTypes: publicClass; >privateVarWithPublicPropertyTypes : Symbol(privateVarWithPublicPropertyTypes, Decl(privacyVarDeclFile_GlobalFile.ts, 150, 7)) @@ -1048,7 +1048,7 @@ module publicModuleInGlobal { export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error >publicAmbientVarWithPrivatePropertyTypes : Symbol(publicAmbientVarWithPrivatePropertyTypes, Decl(privacyVarDeclFile_GlobalFile.ts, 152, 22)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 29)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 32)) export declare var publicAmbientVarWithPublicPropertyTypes: publicClass; >publicAmbientVarWithPublicPropertyTypes : Symbol(publicAmbientVarWithPublicPropertyTypes, Decl(privacyVarDeclFile_GlobalFile.ts, 153, 22)) @@ -1056,7 +1056,7 @@ module publicModuleInGlobal { declare var privateAmbientVarWithPrivatePropertyTypes: privateClass; >privateAmbientVarWithPrivatePropertyTypes : Symbol(privateAmbientVarWithPrivatePropertyTypes, Decl(privacyVarDeclFile_GlobalFile.ts, 154, 15)) ->privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 29)) +>privateClass : Symbol(privateClass, Decl(privacyVarDeclFile_GlobalFile.ts, 14, 32)) declare var privateAmbientVarWithPublicPropertyTypes: publicClass; >privateAmbientVarWithPublicPropertyTypes : Symbol(privateAmbientVarWithPublicPropertyTypes, Decl(privacyVarDeclFile_GlobalFile.ts, 155, 15)) diff --git a/tests/baselines/reference/privacyVarDeclFile.types b/tests/baselines/reference/privacyVarDeclFile.types index e75ff20a1fae4..9e6d4cde66cd6 100644 --- a/tests/baselines/reference/privacyVarDeclFile.types +++ b/tests/baselines/reference/privacyVarDeclFile.types @@ -221,7 +221,7 @@ declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publi >privateModule : any > : ^^^ -export module publicModule { +export namespace publicModule { >publicModule : typeof publicModule > : ^^^^^^^^^^^^^^^^^^^ @@ -446,7 +446,7 @@ export module publicModule { > : ^^^ } -module privateModule { +namespace privateModule { >privateModule : typeof privateModule > : ^^^^^^^^^^^^^^^^^^^^ @@ -709,7 +709,7 @@ declare var publicAmbientVarWithPublicPropertyTypesInGlobal: publicClassInGlobal >publicAmbientVarWithPublicPropertyTypesInGlobal : publicClassInGlobal > : ^^^^^^^^^^^^^^^^^^^ -module publicModuleInGlobal { +namespace publicModuleInGlobal { >publicModuleInGlobal : typeof publicModuleInGlobal > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -723,7 +723,7 @@ module publicModuleInGlobal { > : ^^^^^^^^^^^ } - module privateModule { + namespace privateModule { >privateModule : typeof privateModule > : ^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/privateInstanceVisibility.js b/tests/baselines/reference/privateInstanceVisibility.js index f85c6cb6118f6..e1ca4a6356f3f 100644 --- a/tests/baselines/reference/privateInstanceVisibility.js +++ b/tests/baselines/reference/privateInstanceVisibility.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privateInstanceVisibility.ts] //// //// [privateInstanceVisibility.ts] -module Test { +namespace Test { export class Example { diff --git a/tests/baselines/reference/privateInstanceVisibility.symbols b/tests/baselines/reference/privateInstanceVisibility.symbols index a8c73516ebe32..55a0d315e9dcd 100644 --- a/tests/baselines/reference/privateInstanceVisibility.symbols +++ b/tests/baselines/reference/privateInstanceVisibility.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/privateInstanceVisibility.ts] //// === privateInstanceVisibility.ts === -module Test { +namespace Test { >Test : Symbol(Test, Decl(privateInstanceVisibility.ts, 0, 0)) export class Example { ->Example : Symbol(Example, Decl(privateInstanceVisibility.ts, 0, 13)) +>Example : Symbol(Example, Decl(privateInstanceVisibility.ts, 0, 16)) private someNumber: number; >someNumber : Symbol(Example.someNumber, Decl(privateInstanceVisibility.ts, 2, 26)) @@ -17,7 +17,7 @@ module Test { var that = this; >that : Symbol(that, Decl(privateInstanceVisibility.ts, 10, 15)) ->this : Symbol(Example, Decl(privateInstanceVisibility.ts, 0, 13)) +>this : Symbol(Example, Decl(privateInstanceVisibility.ts, 0, 16)) function innerFunction() { >innerFunction : Symbol(innerFunction, Decl(privateInstanceVisibility.ts, 10, 28)) diff --git a/tests/baselines/reference/privateInstanceVisibility.types b/tests/baselines/reference/privateInstanceVisibility.types index 03d6632fc8ea4..8d9a6c731376c 100644 --- a/tests/baselines/reference/privateInstanceVisibility.types +++ b/tests/baselines/reference/privateInstanceVisibility.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/privateInstanceVisibility.ts] //// === privateInstanceVisibility.ts === -module Test { +namespace Test { >Test : typeof Test > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/privateStaticNotAccessibleInClodule.errors.txt b/tests/baselines/reference/privateStaticNotAccessibleInClodule.errors.txt index 0ed8e38749e82..c7a01eae0fbe8 100644 --- a/tests/baselines/reference/privateStaticNotAccessibleInClodule.errors.txt +++ b/tests/baselines/reference/privateStaticNotAccessibleInClodule.errors.txt @@ -9,7 +9,7 @@ privateStaticNotAccessibleInClodule.ts(9,22): error TS2341: Property 'bar' is pr private static bar: string; } - module C { + namespace C { export var y = C.bar; // error ~~~ !!! error TS2341: Property 'bar' is private and only accessible within class 'C'. diff --git a/tests/baselines/reference/privateStaticNotAccessibleInClodule.js b/tests/baselines/reference/privateStaticNotAccessibleInClodule.js index 97d5ecbffe3be..c25aef0cd02c5 100644 --- a/tests/baselines/reference/privateStaticNotAccessibleInClodule.js +++ b/tests/baselines/reference/privateStaticNotAccessibleInClodule.js @@ -8,7 +8,7 @@ class C { private static bar: string; } -module C { +namespace C { export var y = C.bar; // error } diff --git a/tests/baselines/reference/privateStaticNotAccessibleInClodule.symbols b/tests/baselines/reference/privateStaticNotAccessibleInClodule.symbols index 4682e62122274..c5162fc2c21e9 100644 --- a/tests/baselines/reference/privateStaticNotAccessibleInClodule.symbols +++ b/tests/baselines/reference/privateStaticNotAccessibleInClodule.symbols @@ -13,7 +13,7 @@ class C { >bar : Symbol(C.bar, Decl(privateStaticNotAccessibleInClodule.ts, 3, 24)) } -module C { +namespace C { >C : Symbol(C, Decl(privateStaticNotAccessibleInClodule.ts, 0, 0), Decl(privateStaticNotAccessibleInClodule.ts, 5, 1)) export var y = C.bar; // error diff --git a/tests/baselines/reference/privateStaticNotAccessibleInClodule.types b/tests/baselines/reference/privateStaticNotAccessibleInClodule.types index 4e8a7be8da46f..4f7edde49e092 100644 --- a/tests/baselines/reference/privateStaticNotAccessibleInClodule.types +++ b/tests/baselines/reference/privateStaticNotAccessibleInClodule.types @@ -16,7 +16,7 @@ class C { > : ^^^^^^ } -module C { +namespace C { >C : typeof C > : ^^^^^^^^ diff --git a/tests/baselines/reference/privateStaticNotAccessibleInClodule2.errors.txt b/tests/baselines/reference/privateStaticNotAccessibleInClodule2.errors.txt index ee6e9339f479c..2f29fe3124b04 100644 --- a/tests/baselines/reference/privateStaticNotAccessibleInClodule2.errors.txt +++ b/tests/baselines/reference/privateStaticNotAccessibleInClodule2.errors.txt @@ -13,7 +13,7 @@ privateStaticNotAccessibleInClodule2.ts(13,22): error TS2341: Property 'bar' is baz: number; } - module D { + namespace D { export var y = D.bar; // error ~~~ !!! error TS2341: Property 'bar' is private and only accessible within class 'C'. diff --git a/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js b/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js index 49004095674d6..ef957389d41fb 100644 --- a/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js +++ b/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js @@ -12,7 +12,7 @@ class D extends C { baz: number; } -module D { +namespace D { export var y = D.bar; // error } diff --git a/tests/baselines/reference/privateStaticNotAccessibleInClodule2.symbols b/tests/baselines/reference/privateStaticNotAccessibleInClodule2.symbols index 65bbdc4f86ec5..218346104df0a 100644 --- a/tests/baselines/reference/privateStaticNotAccessibleInClodule2.symbols +++ b/tests/baselines/reference/privateStaticNotAccessibleInClodule2.symbols @@ -21,7 +21,7 @@ class D extends C { >baz : Symbol(D.baz, Decl(privateStaticNotAccessibleInClodule2.ts, 7, 19)) } -module D { +namespace D { >D : Symbol(D, Decl(privateStaticNotAccessibleInClodule2.ts, 5, 1), Decl(privateStaticNotAccessibleInClodule2.ts, 9, 1)) export var y = D.bar; // error diff --git a/tests/baselines/reference/privateStaticNotAccessibleInClodule2.types b/tests/baselines/reference/privateStaticNotAccessibleInClodule2.types index 6d356988e41cb..67c1ecaba73fe 100644 --- a/tests/baselines/reference/privateStaticNotAccessibleInClodule2.types +++ b/tests/baselines/reference/privateStaticNotAccessibleInClodule2.types @@ -27,7 +27,7 @@ class D extends C { > : ^^^^^^ } -module D { +namespace D { >D : typeof D > : ^^^^^^^^ diff --git a/tests/baselines/reference/privateVisibility.errors.txt b/tests/baselines/reference/privateVisibility.errors.txt index 8166a1df9b3d3..4dcac11c73e62 100644 --- a/tests/baselines/reference/privateVisibility.errors.txt +++ b/tests/baselines/reference/privateVisibility.errors.txt @@ -22,7 +22,7 @@ privateVisibility.ts(24,3): error TS2341: Property 'priv' is private and only ac f.pubMeth(); // should work f.pubProp; // should work - module M { + namespace M { export class C { public pub = 0; private priv = 1; } export var V = 0; } diff --git a/tests/baselines/reference/privateVisibility.js b/tests/baselines/reference/privateVisibility.js index 89292cb2bd529..e57dc1a640196 100644 --- a/tests/baselines/reference/privateVisibility.js +++ b/tests/baselines/reference/privateVisibility.js @@ -15,7 +15,7 @@ f.privProp; // should not work f.pubMeth(); // should work f.pubProp; // should work -module M { +namespace M { export class C { public pub = 0; private priv = 1; } export var V = 0; } diff --git a/tests/baselines/reference/privateVisibility.symbols b/tests/baselines/reference/privateVisibility.symbols index 1dcb645c05345..e610335477846 100644 --- a/tests/baselines/reference/privateVisibility.symbols +++ b/tests/baselines/reference/privateVisibility.symbols @@ -44,11 +44,11 @@ f.pubProp; // should work >f : Symbol(f, Decl(privateVisibility.ts, 7, 3)) >pubProp : Symbol(Foo.pubProp, Decl(privateVisibility.ts, 2, 22)) -module M { +namespace M { >M : Symbol(M, Decl(privateVisibility.ts, 12, 10)) export class C { public pub = 0; private priv = 1; } ->C : Symbol(C, Decl(privateVisibility.ts, 14, 10)) +>C : Symbol(C, Decl(privateVisibility.ts, 14, 13)) >pub : Symbol(C.pub, Decl(privateVisibility.ts, 15, 20)) >priv : Symbol(C.priv, Decl(privateVisibility.ts, 15, 36)) @@ -59,9 +59,9 @@ module M { var c = new M.C(); >c : Symbol(c, Decl(privateVisibility.ts, 20, 3)) ->M.C : Symbol(M.C, Decl(privateVisibility.ts, 14, 10)) +>M.C : Symbol(M.C, Decl(privateVisibility.ts, 14, 13)) >M : Symbol(M, Decl(privateVisibility.ts, 12, 10)) ->C : Symbol(M.C, Decl(privateVisibility.ts, 14, 10)) +>C : Symbol(M.C, Decl(privateVisibility.ts, 14, 13)) c.pub; // should work >c.pub : Symbol(M.C.pub, Decl(privateVisibility.ts, 15, 20)) diff --git a/tests/baselines/reference/privateVisibility.types b/tests/baselines/reference/privateVisibility.types index 70c7577963326..7ec8ce1b22891 100644 --- a/tests/baselines/reference/privateVisibility.types +++ b/tests/baselines/reference/privateVisibility.types @@ -78,7 +78,7 @@ f.pubProp; // should work >pubProp : number > : ^^^^^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/project/declarationsExportNamespace/amd/declarationsExportNamespace.errors.txt b/tests/baselines/reference/project/declarationsExportNamespace/amd/declarationsExportNamespace.errors.txt new file mode 100644 index 0000000000000..fa733273309bf --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportNamespace/amd/declarationsExportNamespace.errors.txt @@ -0,0 +1,16 @@ +useModule.ts(1,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== decl.d.ts (0 errors) ==== + export interface A { + b: number; + } + export as namespace moduleA; +==== useModule.ts (1 errors) ==== + module moduleB { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export interface IUseModuleA { + a: moduleA.A; + } + } \ No newline at end of file diff --git a/tests/baselines/reference/project/declarationsExportNamespace/node/declarationsExportNamespace.errors.txt b/tests/baselines/reference/project/declarationsExportNamespace/node/declarationsExportNamespace.errors.txt new file mode 100644 index 0000000000000..fa733273309bf --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportNamespace/node/declarationsExportNamespace.errors.txt @@ -0,0 +1,16 @@ +useModule.ts(1,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== decl.d.ts (0 errors) ==== + export interface A { + b: number; + } + export as namespace moduleA; +==== useModule.ts (1 errors) ==== + module moduleB { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export interface IUseModuleA { + a: moduleA.A; + } + } \ No newline at end of file diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/declarationsMultipleTimesMultipleImport.errors.txt b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/declarationsMultipleTimesMultipleImport.errors.txt new file mode 100644 index 0000000000000..b524866dd5d12 --- /dev/null +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/declarationsMultipleTimesMultipleImport.errors.txt @@ -0,0 +1,37 @@ +useModule.ts(6,8): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== m4.ts (0 errors) ==== + export class d { + }; + export var x: d; + export function foo() { + return new d(); + } + +==== m5.ts (0 errors) ==== + import m4 = require("m4"); // Emit used + export function foo2() { + return new m4.d(); + } +==== useModule.ts (1 errors) ==== + import m4 = require("m4"); // Emit used + export var x4 = m4.x; + export var d4 = m4.d; + export var f4 = m4.foo(); + + export module m1 { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export var x2 = m4.x; + export var d2 = m4.d; + export var f2 = m4.foo(); + + var x3 = m4.x; + var d3 = m4.d; + var f3 = m4.foo(); + } + + // Do not emit unused import + import m5 = require("m5"); + export var d = m5.foo2(); \ No newline at end of file diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/declarationsMultipleTimesMultipleImport.errors.txt b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/declarationsMultipleTimesMultipleImport.errors.txt new file mode 100644 index 0000000000000..b524866dd5d12 --- /dev/null +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/declarationsMultipleTimesMultipleImport.errors.txt @@ -0,0 +1,37 @@ +useModule.ts(6,8): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== m4.ts (0 errors) ==== + export class d { + }; + export var x: d; + export function foo() { + return new d(); + } + +==== m5.ts (0 errors) ==== + import m4 = require("m4"); // Emit used + export function foo2() { + return new m4.d(); + } +==== useModule.ts (1 errors) ==== + import m4 = require("m4"); // Emit used + export var x4 = m4.x; + export var d4 = m4.d; + export var f4 = m4.foo(); + + export module m1 { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export var x2 = m4.x; + export var d2 = m4.d; + export var f2 = m4.foo(); + + var x3 = m4.x; + var d3 = m4.d; + var f3 = m4.foo(); + } + + // Do not emit unused import + import m5 = require("m5"); + export var d = m5.foo2(); \ No newline at end of file diff --git a/tests/baselines/reference/project/declareVariableCollision/amd/declareVariableCollision.errors.txt b/tests/baselines/reference/project/declareVariableCollision/amd/declareVariableCollision.errors.txt index 73d3a86d014bc..2ab7cd3685bed 100644 --- a/tests/baselines/reference/project/declareVariableCollision/amd/declareVariableCollision.errors.txt +++ b/tests/baselines/reference/project/declareVariableCollision/amd/declareVariableCollision.errors.txt @@ -5,12 +5,12 @@ in2.d.ts(1,8): error TS2300: Duplicate identifier 'a'. ==== decl.d.ts (0 errors) ==== // bug 535531: duplicate identifier error reported for "import" declarations in separate files - declare module A + declare namespace A { class MyRoot { } - export module B + export namespace B { class MyClass{ } } diff --git a/tests/baselines/reference/project/declareVariableCollision/node/declareVariableCollision.errors.txt b/tests/baselines/reference/project/declareVariableCollision/node/declareVariableCollision.errors.txt index 73d3a86d014bc..2ab7cd3685bed 100644 --- a/tests/baselines/reference/project/declareVariableCollision/node/declareVariableCollision.errors.txt +++ b/tests/baselines/reference/project/declareVariableCollision/node/declareVariableCollision.errors.txt @@ -5,12 +5,12 @@ in2.d.ts(1,8): error TS2300: Duplicate identifier 'a'. ==== decl.d.ts (0 errors) ==== // bug 535531: duplicate identifier error reported for "import" declarations in separate files - declare module A + declare namespace A { class MyRoot { } - export module B + export namespace B { class MyClass{ } } diff --git a/tests/baselines/reference/project/intReferencingExtAndInt/amd/intReferencingExtAndInt.errors.txt b/tests/baselines/reference/project/intReferencingExtAndInt/amd/intReferencingExtAndInt.errors.txt index 5bdeea3038458..4d0524e49b483 100644 --- a/tests/baselines/reference/project/intReferencingExtAndInt/amd/intReferencingExtAndInt.errors.txt +++ b/tests/baselines/reference/project/intReferencingExtAndInt/amd/intReferencingExtAndInt.errors.txt @@ -3,7 +3,7 @@ internal2.ts(2,21): error TS2792: Cannot find module 'external2'. Did you mean t ==== internal2.ts (2 errors) ==== - module outer { + namespace outer { import g = require("external2") ~~~~~~~~~~~ !!! error TS1147: Import declarations in a namespace cannot reference a module. diff --git a/tests/baselines/reference/project/intReferencingExtAndInt/node/intReferencingExtAndInt.errors.txt b/tests/baselines/reference/project/intReferencingExtAndInt/node/intReferencingExtAndInt.errors.txt index 5bdeea3038458..4d0524e49b483 100644 --- a/tests/baselines/reference/project/intReferencingExtAndInt/node/intReferencingExtAndInt.errors.txt +++ b/tests/baselines/reference/project/intReferencingExtAndInt/node/intReferencingExtAndInt.errors.txt @@ -3,7 +3,7 @@ internal2.ts(2,21): error TS2792: Cannot find module 'external2'. Did you mean t ==== internal2.ts (2 errors) ==== - module outer { + namespace outer { import g = require("external2") ~~~~~~~~~~~ !!! error TS1147: Import declarations in a namespace cannot reference a module. diff --git a/tests/baselines/reference/project/nestedLocalModuleSimpleCase/amd/nestedLocalModuleSimpleCase.errors.txt b/tests/baselines/reference/project/nestedLocalModuleSimpleCase/amd/nestedLocalModuleSimpleCase.errors.txt index 2b17a05139aff..55588f39d5425 100644 --- a/tests/baselines/reference/project/nestedLocalModuleSimpleCase/amd/nestedLocalModuleSimpleCase.errors.txt +++ b/tests/baselines/reference/project/nestedLocalModuleSimpleCase/amd/nestedLocalModuleSimpleCase.errors.txt @@ -2,7 +2,7 @@ test1.ts(2,23): error TS1147: Import declarations in a namespace cannot referenc ==== test1.ts (1 errors) ==== - export module myModule { + export namespace myModule { import foo = require("test2"); ~~~~~~~ !!! error TS1147: Import declarations in a namespace cannot reference a module. diff --git a/tests/baselines/reference/project/nestedLocalModuleSimpleCase/node/nestedLocalModuleSimpleCase.errors.txt b/tests/baselines/reference/project/nestedLocalModuleSimpleCase/node/nestedLocalModuleSimpleCase.errors.txt index 2b17a05139aff..55588f39d5425 100644 --- a/tests/baselines/reference/project/nestedLocalModuleSimpleCase/node/nestedLocalModuleSimpleCase.errors.txt +++ b/tests/baselines/reference/project/nestedLocalModuleSimpleCase/node/nestedLocalModuleSimpleCase.errors.txt @@ -2,7 +2,7 @@ test1.ts(2,23): error TS1147: Import declarations in a namespace cannot referenc ==== test1.ts (1 errors) ==== - export module myModule { + export namespace myModule { import foo = require("test2"); ~~~~~~~ !!! error TS1147: Import declarations in a namespace cannot reference a module. diff --git a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/amd/nestedLocalModuleWithRecursiveTypecheck.errors.txt b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/amd/nestedLocalModuleWithRecursiveTypecheck.errors.txt index f42b5a7fc941a..82636696b5dfe 100644 --- a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/amd/nestedLocalModuleWithRecursiveTypecheck.errors.txt +++ b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/amd/nestedLocalModuleWithRecursiveTypecheck.errors.txt @@ -3,7 +3,7 @@ test1.ts(3,23): error TS2792: Cannot find module 'test2'. Did you mean to set th ==== test1.ts (2 errors) ==== - module myModule { + namespace myModule { import foo = require("test2"); ~~~~~~~ diff --git a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.errors.txt b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.errors.txt index f42b5a7fc941a..82636696b5dfe 100644 --- a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.errors.txt +++ b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.errors.txt @@ -3,7 +3,7 @@ test1.ts(3,23): error TS2792: Cannot find module 'test2'. Did you mean to set th ==== test1.ts (2 errors) ==== - module myModule { + namespace myModule { import foo = require("test2"); ~~~~~~~ diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt index f644b2a3a90d3..0ca4f7ce17672 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt @@ -5,7 +5,7 @@ testGlo.ts(21,35): error TS2792: Cannot find module 'mNonExported'. Did you mean ==== testGlo.ts (4 errors) ==== - module m2 { + namespace m2 { export import mExported = require("mExported"); ~~~~~~~~~~~ !!! error TS1147: Import declarations in a namespace cannot reference a module. diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt index f644b2a3a90d3..0ca4f7ce17672 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt @@ -5,7 +5,7 @@ testGlo.ts(21,35): error TS2792: Cannot find module 'mNonExported'. Did you mean ==== testGlo.ts (4 errors) ==== - module m2 { + namespace m2 { export import mExported = require("mExported"); ~~~~~~~~~~~ !!! error TS1147: Import declarations in a namespace cannot reference a module. diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/amd/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/amd/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt index 61ae9d8331704..c3458f201e26d 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/amd/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/amd/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt @@ -5,10 +5,10 @@ test.ts(24,35): error TS2792: Cannot find module 'mNonExported'. Did you mean to ==== test.ts (4 errors) ==== - export module m1 { + export namespace m1 { } - module m2 { + namespace m2 { export import mExported = require("mExported"); ~~~~~~~~~~~ !!! error TS1147: Import declarations in a namespace cannot reference a module. diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt index 61ae9d8331704..c3458f201e26d 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt @@ -5,10 +5,10 @@ test.ts(24,35): error TS2792: Cannot find module 'mNonExported'. Did you mean to ==== test.ts (4 errors) ==== - export module m1 { + export namespace m1 { } - module m2 { + namespace m2 { export import mExported = require("mExported"); ~~~~~~~~~~~ !!! error TS1147: Import declarations in a namespace cannot reference a module. diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt index a454af4a3fed9..30d923b82171b 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt @@ -5,14 +5,14 @@ test.ts(42,35): error TS2792: Cannot find module 'mNonExported'. Did you mean to ==== test.ts (4 errors) ==== - export module m2 { + export namespace m2 { export import mExported = require("mExported"); ~~~~~~~~~~~ !!! error TS1147: Import declarations in a namespace cannot reference a module. ~~~~~~~~~~~ !!! error TS2792: Cannot find module 'mExported'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? - module Internal_M1 { + namespace Internal_M1 { export var c1 = new mExported.me.class1; export function f1() { return new mExported.me.class1(); @@ -31,7 +31,7 @@ test.ts(42,35): error TS2792: Cannot find module 'mNonExported'. Did you mean to } } - export module Internal_M2 { + export namespace Internal_M2 { export var c1 = new mExported.me.class1; export function f1() { return new mExported.me.class1(); @@ -55,7 +55,7 @@ test.ts(42,35): error TS2792: Cannot find module 'mNonExported'. Did you mean to !!! error TS1147: Import declarations in a namespace cannot reference a module. ~~~~~~~~~~~~~~ !!! error TS2792: Cannot find module 'mNonExported'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? - module Internal_M3 { + namespace Internal_M3 { export var c3 = new mNonExported.mne.class1; export function f3() { return new mNonExported.mne.class1(); @@ -75,7 +75,7 @@ test.ts(42,35): error TS2792: Cannot find module 'mNonExported'. Did you mean to } } - export module Internal_M4 { + export namespace Internal_M4 { export var c3 = new mNonExported.mne.class1; export function f3() { return new mNonExported.mne.class1(); diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/node/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/node/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt index a454af4a3fed9..30d923b82171b 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/node/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/node/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt @@ -5,14 +5,14 @@ test.ts(42,35): error TS2792: Cannot find module 'mNonExported'. Did you mean to ==== test.ts (4 errors) ==== - export module m2 { + export namespace m2 { export import mExported = require("mExported"); ~~~~~~~~~~~ !!! error TS1147: Import declarations in a namespace cannot reference a module. ~~~~~~~~~~~ !!! error TS2792: Cannot find module 'mExported'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? - module Internal_M1 { + namespace Internal_M1 { export var c1 = new mExported.me.class1; export function f1() { return new mExported.me.class1(); @@ -31,7 +31,7 @@ test.ts(42,35): error TS2792: Cannot find module 'mNonExported'. Did you mean to } } - export module Internal_M2 { + export namespace Internal_M2 { export var c1 = new mExported.me.class1; export function f1() { return new mExported.me.class1(); @@ -55,7 +55,7 @@ test.ts(42,35): error TS2792: Cannot find module 'mNonExported'. Did you mean to !!! error TS1147: Import declarations in a namespace cannot reference a module. ~~~~~~~~~~~~~~ !!! error TS2792: Cannot find module 'mNonExported'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? - module Internal_M3 { + namespace Internal_M3 { export var c3 = new mNonExported.mne.class1; export function f3() { return new mNonExported.mne.class1(); @@ -75,7 +75,7 @@ test.ts(42,35): error TS2792: Cannot find module 'mNonExported'. Did you mean to } } - export module Internal_M4 { + export namespace Internal_M4 { export var c3 = new mNonExported.mne.class1; export function f3() { return new mNonExported.mne.class1(); diff --git a/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt b/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt index ef77af7372ee7..31dfc62b1de14 100644 --- a/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt +++ b/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt @@ -8,7 +8,7 @@ error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile. ==== __extends.ts (0 errors) ==== // class inheritance to ensure __extends is emitted - module m { + namespace m { export class base {} export class child extends base {} } \ No newline at end of file diff --git a/tests/baselines/reference/propertyNamesWithStringLiteral.js b/tests/baselines/reference/propertyNamesWithStringLiteral.js index b3b96cdf41220..be2000da4870c 100644 --- a/tests/baselines/reference/propertyNamesWithStringLiteral.js +++ b/tests/baselines/reference/propertyNamesWithStringLiteral.js @@ -10,7 +10,7 @@ interface NamedColors { "blue": _Color; "pale blue": _Color; } -module Color { +namespace Color { export var namedColors: NamedColors; } var a = Color.namedColors["azure"]; diff --git a/tests/baselines/reference/propertyNamesWithStringLiteral.symbols b/tests/baselines/reference/propertyNamesWithStringLiteral.symbols index f47437941d428..abc6b29dd0ef7 100644 --- a/tests/baselines/reference/propertyNamesWithStringLiteral.symbols +++ b/tests/baselines/reference/propertyNamesWithStringLiteral.symbols @@ -26,7 +26,7 @@ interface NamedColors { >"pale blue" : Symbol(NamedColors["pale blue"], Decl(propertyNamesWithStringLiteral.ts, 6, 19)) >_Color : Symbol(_Color, Decl(propertyNamesWithStringLiteral.ts, 0, 0)) } -module Color { +namespace Color { >Color : Symbol(Color, Decl(propertyNamesWithStringLiteral.ts, 8, 1)) export var namedColors: NamedColors; diff --git a/tests/baselines/reference/propertyNamesWithStringLiteral.types b/tests/baselines/reference/propertyNamesWithStringLiteral.types index 793dbbe90f5e1..ba13f4f65edc5 100644 --- a/tests/baselines/reference/propertyNamesWithStringLiteral.types +++ b/tests/baselines/reference/propertyNamesWithStringLiteral.types @@ -29,7 +29,7 @@ interface NamedColors { >"pale blue" : _Color > : ^^^^^^ } -module Color { +namespace Color { >Color : typeof Color > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/protectedStaticNotAccessibleInClodule.errors.txt b/tests/baselines/reference/protectedStaticNotAccessibleInClodule.errors.txt index 9e23438a337e4..4dd2f39368a3b 100644 --- a/tests/baselines/reference/protectedStaticNotAccessibleInClodule.errors.txt +++ b/tests/baselines/reference/protectedStaticNotAccessibleInClodule.errors.txt @@ -9,7 +9,7 @@ protectedStaticNotAccessibleInClodule.ts(10,22): error TS2445: Property 'bar' is protected static bar: string; } - module C { + namespace C { export var f = C.foo; // OK export var b = C.bar; // error ~~~ diff --git a/tests/baselines/reference/protectedStaticNotAccessibleInClodule.js b/tests/baselines/reference/protectedStaticNotAccessibleInClodule.js index adae70fa99ffe..45a09859939bd 100644 --- a/tests/baselines/reference/protectedStaticNotAccessibleInClodule.js +++ b/tests/baselines/reference/protectedStaticNotAccessibleInClodule.js @@ -8,7 +8,7 @@ class C { protected static bar: string; } -module C { +namespace C { export var f = C.foo; // OK export var b = C.bar; // error } diff --git a/tests/baselines/reference/protectedStaticNotAccessibleInClodule.symbols b/tests/baselines/reference/protectedStaticNotAccessibleInClodule.symbols index 8a33c7e4e3e76..30f47579e26bc 100644 --- a/tests/baselines/reference/protectedStaticNotAccessibleInClodule.symbols +++ b/tests/baselines/reference/protectedStaticNotAccessibleInClodule.symbols @@ -13,7 +13,7 @@ class C { >bar : Symbol(C.bar, Decl(protectedStaticNotAccessibleInClodule.ts, 3, 30)) } -module C { +namespace C { >C : Symbol(C, Decl(protectedStaticNotAccessibleInClodule.ts, 0, 0), Decl(protectedStaticNotAccessibleInClodule.ts, 5, 1)) export var f = C.foo; // OK diff --git a/tests/baselines/reference/protectedStaticNotAccessibleInClodule.types b/tests/baselines/reference/protectedStaticNotAccessibleInClodule.types index fd0071bf4962b..448f8775773db 100644 --- a/tests/baselines/reference/protectedStaticNotAccessibleInClodule.types +++ b/tests/baselines/reference/protectedStaticNotAccessibleInClodule.types @@ -16,7 +16,7 @@ class C { > : ^^^^^^ } -module C { +namespace C { >C : typeof C > : ^^^^^^^^ diff --git a/tests/baselines/reference/qualifiedModuleLocals.errors.txt b/tests/baselines/reference/qualifiedModuleLocals.errors.txt index cb58cd72e18a4..75b9fd28f57a6 100644 --- a/tests/baselines/reference/qualifiedModuleLocals.errors.txt +++ b/tests/baselines/reference/qualifiedModuleLocals.errors.txt @@ -2,7 +2,7 @@ qualifiedModuleLocals.ts(5,27): error TS2339: Property 'b' does not exist on typ ==== qualifiedModuleLocals.ts (1 errors) ==== - module A { + namespace A { function b() {} diff --git a/tests/baselines/reference/qualifiedModuleLocals.js b/tests/baselines/reference/qualifiedModuleLocals.js index c94ff2f4caed6..b9d7412e79dd7 100644 --- a/tests/baselines/reference/qualifiedModuleLocals.js +++ b/tests/baselines/reference/qualifiedModuleLocals.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/qualifiedModuleLocals.ts] //// //// [qualifiedModuleLocals.ts] -module A { +namespace A { function b() {} diff --git a/tests/baselines/reference/qualifiedModuleLocals.symbols b/tests/baselines/reference/qualifiedModuleLocals.symbols index 64aa1510a6f99..7724445844c1d 100644 --- a/tests/baselines/reference/qualifiedModuleLocals.symbols +++ b/tests/baselines/reference/qualifiedModuleLocals.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/qualifiedModuleLocals.ts] //// === qualifiedModuleLocals.ts === -module A { +namespace A { >A : Symbol(A, Decl(qualifiedModuleLocals.ts, 0, 0)) function b() {} ->b : Symbol(b, Decl(qualifiedModuleLocals.ts, 0, 10)) +>b : Symbol(b, Decl(qualifiedModuleLocals.ts, 0, 13)) export function a(){ A.b(); } // A.b should be an unresolved symbol error >a : Symbol(a, Decl(qualifiedModuleLocals.ts, 2, 17)) diff --git a/tests/baselines/reference/qualifiedModuleLocals.types b/tests/baselines/reference/qualifiedModuleLocals.types index 94986a33629a8..a5690c18e5093 100644 --- a/tests/baselines/reference/qualifiedModuleLocals.types +++ b/tests/baselines/reference/qualifiedModuleLocals.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/qualifiedModuleLocals.ts] //// === qualifiedModuleLocals.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.js b/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.js index 80d9dbc477e88..4ee1d474bb574 100644 --- a/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.js +++ b/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.ts] //// //// [qualifiedName_ImportDeclarations-entity-names-referencing-a-var.ts] -module Alpha { +namespace Alpha { export var x = 100; } -module Beta { +namespace Beta { import p = Alpha.x; } diff --git a/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.symbols b/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.symbols index 65442389a3a41..ebce3d35ccedb 100644 --- a/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.symbols +++ b/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.symbols @@ -1,18 +1,18 @@ //// [tests/cases/compiler/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.ts] //// === qualifiedName_ImportDeclarations-entity-names-referencing-a-var.ts === -module Alpha { +namespace Alpha { >Alpha : Symbol(Alpha, Decl(qualifiedName_ImportDeclarations-entity-names-referencing-a-var.ts, 0, 0)) export var x = 100; >x : Symbol(x, Decl(qualifiedName_ImportDeclarations-entity-names-referencing-a-var.ts, 1, 14)) } -module Beta { +namespace Beta { >Beta : Symbol(Beta, Decl(qualifiedName_ImportDeclarations-entity-names-referencing-a-var.ts, 2, 1)) import p = Alpha.x; ->p : Symbol(p, Decl(qualifiedName_ImportDeclarations-entity-names-referencing-a-var.ts, 4, 13)) +>p : Symbol(p, Decl(qualifiedName_ImportDeclarations-entity-names-referencing-a-var.ts, 4, 16)) >Alpha : Symbol(Alpha, Decl(qualifiedName_ImportDeclarations-entity-names-referencing-a-var.ts, 0, 0)) >x : Symbol(p, Decl(qualifiedName_ImportDeclarations-entity-names-referencing-a-var.ts, 1, 14)) } diff --git a/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.types b/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.types index 980de0a7c1db9..08d0280d11ca9 100644 --- a/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.types +++ b/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.ts] //// === qualifiedName_ImportDeclarations-entity-names-referencing-a-var.ts === -module Alpha { +namespace Alpha { >Alpha : typeof Alpha > : ^^^^^^^^^^^^ @@ -12,7 +12,7 @@ module Alpha { > : ^^^ } -module Beta { +namespace Beta { import p = Alpha.x; >p : number > : ^^^^^^ diff --git a/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.errors.txt b/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.errors.txt index c00b1baace4b4..b7c08845fb297 100644 --- a/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.errors.txt +++ b/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.errors.txt @@ -2,7 +2,7 @@ qualifiedName_entity-name-resolution-does-not-affect-class-heritage.ts(5,20): er ==== qualifiedName_entity-name-resolution-does-not-affect-class-heritage.ts (1 errors) ==== - module Alpha { + namespace Alpha { export var x = 100; } diff --git a/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.js b/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.js index ee45e5455e9e8..d60839279a472 100644 --- a/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.js +++ b/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.ts] //// //// [qualifiedName_entity-name-resolution-does-not-affect-class-heritage.ts] -module Alpha { +namespace Alpha { export var x = 100; } diff --git a/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.symbols b/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.symbols index ea8dc3e878ea1..eaf6113e5c788 100644 --- a/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.symbols +++ b/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.ts] //// === qualifiedName_entity-name-resolution-does-not-affect-class-heritage.ts === -module Alpha { +namespace Alpha { >Alpha : Symbol(Alpha, Decl(qualifiedName_entity-name-resolution-does-not-affect-class-heritage.ts, 0, 0)) export var x = 100; diff --git a/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.types b/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.types index 5680abf41100c..3f9d2bc65d7c2 100644 --- a/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.types +++ b/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.ts] //// === qualifiedName_entity-name-resolution-does-not-affect-class-heritage.ts === -module Alpha { +namespace Alpha { >Alpha : typeof Alpha > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/qualify.errors.txt b/tests/baselines/reference/qualify.errors.txt index e1e3b3218758f..9ea38bbcad652 100644 --- a/tests/baselines/reference/qualify.errors.txt +++ b/tests/baselines/reference/qualify.errors.txt @@ -11,26 +11,26 @@ qualify.ts(58,5): error TS2741: Property 'p' is missing in type 'I' but required ==== qualify.ts (8 errors) ==== - module M { + namespace M { export var m=0; - export module N { + export namespace N { export var n=1; } } - module M { - export module N { + namespace M { + export namespace N { var y=m; var x=n+y; } } - module T { + namespace T { export interface I { p; } - export module U { + export namespace U { var z:I=3; ~ !!! error TS2322: Type 'number' is not assignable to type 'I'. @@ -40,21 +40,21 @@ qualify.ts(58,5): error TS2741: Property 'p' is missing in type 'I' but required } } - module Peer { - export module U2 { + namespace Peer { + export namespace U2 { var z:T.U.I2=3; ~ !!! error TS2322: Type 'number' is not assignable to type 'I2'. } } - module Everest { - export module K1 { + namespace Everest { + export namespace K1 { export interface I3 { zeep; } } - export module K2 { + export namespace K2 { export interface I4 { z; } diff --git a/tests/baselines/reference/qualify.js b/tests/baselines/reference/qualify.js index 02510c5961076..8b9c2249b1f13 100644 --- a/tests/baselines/reference/qualify.js +++ b/tests/baselines/reference/qualify.js @@ -1,26 +1,26 @@ //// [tests/cases/compiler/qualify.ts] //// //// [qualify.ts] -module M { +namespace M { export var m=0; - export module N { + export namespace N { export var n=1; } } -module M { - export module N { +namespace M { + export namespace N { var y=m; var x=n+y; } } -module T { +namespace T { export interface I { p; } - export module U { + export namespace U { var z:I=3; export interface I2 { q; @@ -28,19 +28,19 @@ module T { } } -module Peer { - export module U2 { +namespace Peer { + export namespace U2 { var z:T.U.I2=3; } } -module Everest { - export module K1 { +namespace Everest { + export namespace K1 { export interface I3 { zeep; } } - export module K2 { + export namespace K2 { export interface I4 { z; } diff --git a/tests/baselines/reference/qualify.symbols b/tests/baselines/reference/qualify.symbols index dda3333987798..078425a3152d4 100644 --- a/tests/baselines/reference/qualify.symbols +++ b/tests/baselines/reference/qualify.symbols @@ -1,25 +1,25 @@ //// [tests/cases/compiler/qualify.ts] //// === qualify.ts === -module M { +namespace M { >M : Symbol(M, Decl(qualify.ts, 0, 0), Decl(qualify.ts, 5, 1)) export var m=0; >m : Symbol(m, Decl(qualify.ts, 1, 14)) - export module N { ->N : Symbol(N, Decl(qualify.ts, 1, 19), Decl(qualify.ts, 7, 10)) + export namespace N { +>N : Symbol(N, Decl(qualify.ts, 1, 19), Decl(qualify.ts, 7, 13)) export var n=1; >n : Symbol(n, Decl(qualify.ts, 3, 18)) } } -module M { +namespace M { >M : Symbol(M, Decl(qualify.ts, 0, 0), Decl(qualify.ts, 5, 1)) - export module N { ->N : Symbol(N, Decl(qualify.ts, 1, 19), Decl(qualify.ts, 7, 10)) + export namespace N { +>N : Symbol(N, Decl(qualify.ts, 1, 19), Decl(qualify.ts, 7, 13)) var y=m; >y : Symbol(y, Decl(qualify.ts, 9, 11)) @@ -33,21 +33,21 @@ module M { } -module T { +namespace T { >T : Symbol(T, Decl(qualify.ts, 12, 1)) export interface I { ->I : Symbol(I, Decl(qualify.ts, 15, 10)) +>I : Symbol(I, Decl(qualify.ts, 15, 13)) p; >p : Symbol(I.p, Decl(qualify.ts, 16, 24)) } - export module U { + export namespace U { >U : Symbol(U, Decl(qualify.ts, 18, 5)) var z:I=3; >z : Symbol(z, Decl(qualify.ts, 20, 11)) ->I : Symbol(I, Decl(qualify.ts, 15, 10)) +>I : Symbol(I, Decl(qualify.ts, 15, 13)) export interface I2 { >I2 : Symbol(I2, Decl(qualify.ts, 20, 18)) @@ -58,11 +58,11 @@ module T { } } -module Peer { +namespace Peer { >Peer : Symbol(Peer, Decl(qualify.ts, 25, 1)) - export module U2 { ->U2 : Symbol(U2, Decl(qualify.ts, 27, 13)) + export namespace U2 { +>U2 : Symbol(U2, Decl(qualify.ts, 27, 16)) var z:T.U.I2=3; >z : Symbol(z, Decl(qualify.ts, 29, 11)) @@ -72,62 +72,62 @@ module Peer { } } -module Everest { +namespace Everest { >Everest : Symbol(Everest, Decl(qualify.ts, 31, 1)) - export module K1 { ->K1 : Symbol(K1, Decl(qualify.ts, 33, 16)) + export namespace K1 { +>K1 : Symbol(K1, Decl(qualify.ts, 33, 19)) export interface I3 { ->I3 : Symbol(I3, Decl(qualify.ts, 34, 22)) +>I3 : Symbol(I3, Decl(qualify.ts, 34, 25)) zeep; >zeep : Symbol(I3.zeep, Decl(qualify.ts, 35, 29)) } } - export module K2 { + export namespace K2 { >K2 : Symbol(K2, Decl(qualify.ts, 38, 5)) export interface I4 { ->I4 : Symbol(I4, Decl(qualify.ts, 39, 22)) +>I4 : Symbol(I4, Decl(qualify.ts, 39, 25)) z; >z : Symbol(I4.z, Decl(qualify.ts, 40, 29)) } var v1:I4; >v1 : Symbol(v1, Decl(qualify.ts, 43, 11)) ->I4 : Symbol(I4, Decl(qualify.ts, 39, 22)) +>I4 : Symbol(I4, Decl(qualify.ts, 39, 25)) var v2:K1.I3=v1; >v2 : Symbol(v2, Decl(qualify.ts, 44, 11)) ->K1 : Symbol(K1, Decl(qualify.ts, 33, 16)) ->I3 : Symbol(K1.I3, Decl(qualify.ts, 34, 22)) +>K1 : Symbol(K1, Decl(qualify.ts, 33, 19)) +>I3 : Symbol(K1.I3, Decl(qualify.ts, 34, 25)) >v1 : Symbol(v1, Decl(qualify.ts, 43, 11)) var v3:K1.I3[]=v1; >v3 : Symbol(v3, Decl(qualify.ts, 45, 11)) ->K1 : Symbol(K1, Decl(qualify.ts, 33, 16)) ->I3 : Symbol(K1.I3, Decl(qualify.ts, 34, 22)) +>K1 : Symbol(K1, Decl(qualify.ts, 33, 19)) +>I3 : Symbol(K1.I3, Decl(qualify.ts, 34, 25)) >v1 : Symbol(v1, Decl(qualify.ts, 43, 11)) var v4:()=>K1.I3=v1; >v4 : Symbol(v4, Decl(qualify.ts, 46, 11)) ->K1 : Symbol(K1, Decl(qualify.ts, 33, 16)) ->I3 : Symbol(K1.I3, Decl(qualify.ts, 34, 22)) +>K1 : Symbol(K1, Decl(qualify.ts, 33, 19)) +>I3 : Symbol(K1.I3, Decl(qualify.ts, 34, 25)) >v1 : Symbol(v1, Decl(qualify.ts, 43, 11)) var v5:(k:K1.I3)=>void=v1; >v5 : Symbol(v5, Decl(qualify.ts, 47, 11)) >k : Symbol(k, Decl(qualify.ts, 47, 16)) ->K1 : Symbol(K1, Decl(qualify.ts, 33, 16)) ->I3 : Symbol(K1.I3, Decl(qualify.ts, 34, 22)) +>K1 : Symbol(K1, Decl(qualify.ts, 33, 19)) +>I3 : Symbol(K1.I3, Decl(qualify.ts, 34, 25)) >v1 : Symbol(v1, Decl(qualify.ts, 43, 11)) var v6:{k:K1.I3;}=v1; >v6 : Symbol(v6, Decl(qualify.ts, 48, 11)) >k : Symbol(k, Decl(qualify.ts, 48, 16)) ->K1 : Symbol(K1, Decl(qualify.ts, 33, 16)) ->I3 : Symbol(K1.I3, Decl(qualify.ts, 34, 22)) +>K1 : Symbol(K1, Decl(qualify.ts, 33, 19)) +>I3 : Symbol(K1.I3, Decl(qualify.ts, 34, 25)) >v1 : Symbol(v1, Decl(qualify.ts, 43, 11)) } } @@ -146,7 +146,7 @@ var y:I; var x:T.I=y; >x : Symbol(x, Decl(qualify.ts, 57, 3)) >T : Symbol(T, Decl(qualify.ts, 12, 1)) ->I : Symbol(T.I, Decl(qualify.ts, 15, 10)) +>I : Symbol(T.I, Decl(qualify.ts, 15, 13)) >y : Symbol(y, Decl(qualify.ts, 56, 3)) diff --git a/tests/baselines/reference/qualify.types b/tests/baselines/reference/qualify.types index 30848af6bbd61..4e4198308e632 100644 --- a/tests/baselines/reference/qualify.types +++ b/tests/baselines/reference/qualify.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/qualify.ts] //// === qualify.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -11,7 +11,7 @@ module M { >0 : 0 > : ^ - export module N { + export namespace N { >N : typeof N > : ^^^^^^^^ @@ -23,11 +23,11 @@ module M { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ - export module N { + export namespace N { >N : typeof N > : ^^^^^^^^ @@ -50,7 +50,7 @@ module M { } -module T { +namespace T { >T : typeof T > : ^^^^^^^^ @@ -59,7 +59,7 @@ module T { >p : any > : ^^^ } - export module U { + export namespace U { >U : typeof U > : ^^^^^^^^ @@ -77,11 +77,11 @@ module T { } } -module Peer { +namespace Peer { >Peer : typeof Peer > : ^^^^^^^^^^^ - export module U2 { + export namespace U2 { >U2 : typeof U2 > : ^^^^^^^^^ @@ -97,18 +97,18 @@ module Peer { } } -module Everest { +namespace Everest { >Everest : typeof Everest > : ^^^^^^^^^^^^^^ - export module K1 { + export namespace K1 { export interface I3 { zeep; >zeep : any > : ^^^ } } - export module K2 { + export namespace K2 { >K2 : typeof K2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/reExportAliasMakesInstantiated.js b/tests/baselines/reference/reExportAliasMakesInstantiated.js index 397f1e7adb0fb..68c5109e91b8f 100644 --- a/tests/baselines/reference/reExportAliasMakesInstantiated.js +++ b/tests/baselines/reference/reExportAliasMakesInstantiated.js @@ -1,21 +1,21 @@ //// [tests/cases/conformance/internalModules/moduleDeclarations/reExportAliasMakesInstantiated.ts] //// //// [reExportAliasMakesInstantiated.ts] -declare module pack1 { +declare namespace pack1 { const test1: string; export { test1 }; } -declare module pack2 { +declare namespace pack2 { import test1 = pack1.test1; export { test1 }; } export import test1 = pack2.test1; -declare module mod1 { +declare namespace mod1 { type test1 = string; export { test1 }; } -declare module mod2 { +declare namespace mod2 { import test1 = mod1.test1; export { test1 }; } diff --git a/tests/baselines/reference/reExportAliasMakesInstantiated.symbols b/tests/baselines/reference/reExportAliasMakesInstantiated.symbols index ac450cb7861ad..5fbfaf7a8d7b1 100644 --- a/tests/baselines/reference/reExportAliasMakesInstantiated.symbols +++ b/tests/baselines/reference/reExportAliasMakesInstantiated.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/moduleDeclarations/reExportAliasMakesInstantiated.ts] //// === reExportAliasMakesInstantiated.ts === -declare module pack1 { +declare namespace pack1 { >pack1 : Symbol(pack1, Decl(reExportAliasMakesInstantiated.ts, 0, 0)) const test1: string; @@ -10,11 +10,11 @@ declare module pack1 { export { test1 }; >test1 : Symbol(test1, Decl(reExportAliasMakesInstantiated.ts, 2, 10)) } -declare module pack2 { +declare namespace pack2 { >pack2 : Symbol(pack2, Decl(reExportAliasMakesInstantiated.ts, 3, 1)) import test1 = pack1.test1; ->test1 : Symbol(test1, Decl(reExportAliasMakesInstantiated.ts, 4, 22)) +>test1 : Symbol(test1, Decl(reExportAliasMakesInstantiated.ts, 4, 25)) >pack1 : Symbol(pack1, Decl(reExportAliasMakesInstantiated.ts, 0, 0)) >test1 : Symbol(pack1.test1, Decl(reExportAliasMakesInstantiated.ts, 2, 10)) @@ -26,20 +26,20 @@ export import test1 = pack2.test1; >pack2 : Symbol(pack2, Decl(reExportAliasMakesInstantiated.ts, 3, 1)) >test1 : Symbol(pack2.test1, Decl(reExportAliasMakesInstantiated.ts, 6, 10)) -declare module mod1 { +declare namespace mod1 { >mod1 : Symbol(mod1, Decl(reExportAliasMakesInstantiated.ts, 8, 34)) type test1 = string; ->test1 : Symbol(test1, Decl(reExportAliasMakesInstantiated.ts, 10, 21)) +>test1 : Symbol(test1, Decl(reExportAliasMakesInstantiated.ts, 10, 24)) export { test1 }; >test1 : Symbol(test1, Decl(reExportAliasMakesInstantiated.ts, 12, 10)) } -declare module mod2 { +declare namespace mod2 { >mod2 : Symbol(mod2, Decl(reExportAliasMakesInstantiated.ts, 13, 1)) import test1 = mod1.test1; ->test1 : Symbol(test1, Decl(reExportAliasMakesInstantiated.ts, 14, 21)) +>test1 : Symbol(test1, Decl(reExportAliasMakesInstantiated.ts, 14, 24)) >mod1 : Symbol(mod1, Decl(reExportAliasMakesInstantiated.ts, 8, 34)) >test1 : Symbol(mod1.test1, Decl(reExportAliasMakesInstantiated.ts, 12, 10)) diff --git a/tests/baselines/reference/reExportAliasMakesInstantiated.types b/tests/baselines/reference/reExportAliasMakesInstantiated.types index 20a90e477b90e..cfe3f6f43de13 100644 --- a/tests/baselines/reference/reExportAliasMakesInstantiated.types +++ b/tests/baselines/reference/reExportAliasMakesInstantiated.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/internalModules/moduleDeclarations/reExportAliasMakesInstantiated.ts] //// === reExportAliasMakesInstantiated.ts === -declare module pack1 { +declare namespace pack1 { >pack1 : typeof pack1 > : ^^^^^^^^^^^^ @@ -13,7 +13,7 @@ declare module pack1 { >test1 : string > : ^^^^^^ } -declare module pack2 { +declare namespace pack2 { >pack2 : typeof pack2 > : ^^^^^^^^^^^^ @@ -37,7 +37,7 @@ export import test1 = pack2.test1; >test1 : string > : ^^^^^^ -declare module mod1 { +declare namespace mod1 { type test1 = string; >test1 : string > : ^^^^^^ @@ -46,7 +46,7 @@ declare module mod1 { >test1 : any > : ^^^ } -declare module mod2 { +declare namespace mod2 { >mod2 : typeof mod2 > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/reachabilityChecks1.errors.txt b/tests/baselines/reference/reachabilityChecks1.errors.txt index d25977a05b774..8220dd8a921b3 100644 --- a/tests/baselines/reference/reachabilityChecks1.errors.txt +++ b/tests/baselines/reference/reachabilityChecks1.errors.txt @@ -13,24 +13,24 @@ reachabilityChecks1.ts(69,5): error TS7027: Unreachable code detected. ~~~~~~~~~~ !!! error TS7027: Unreachable code detected. - module A { + namespace A { while (true); let x; ~~~~~~ !!! error TS7027: Unreachable code detected. } - module A1 { + namespace A1 { do {} while(true); - module A { + namespace A { interface F {} } } - module A2 { + namespace A2 { while (true); - module A { - ~~~~~~~~~~ + namespace A { + ~~~~~~~~~~~~~ var x = 1; ~~~~~~~~~~~~~~~~~~ } @@ -38,15 +38,15 @@ reachabilityChecks1.ts(69,5): error TS7027: Unreachable code detected. !!! error TS7027: Unreachable code detected. } - module A3 { + namespace A3 { while (true); type T = string; } - module A4 { + namespace A4 { while (true); - module A { - ~~~~~~~~~~ + namespace A { + ~~~~~~~~~~~~~ const enum E { X } ~~~~~~~~~~~~~~~~~~~~~~~~~~ } @@ -73,9 +73,9 @@ reachabilityChecks1.ts(69,5): error TS7027: Unreachable code detected. !!! error TS7027: Unreachable code detected. } - module B { + namespace B { for (; ;); - module C { + namespace C { } } diff --git a/tests/baselines/reference/reachabilityChecks1.js b/tests/baselines/reference/reachabilityChecks1.js index badcdf9fc121d..6b5f69a059164 100644 --- a/tests/baselines/reference/reachabilityChecks1.js +++ b/tests/baselines/reference/reachabilityChecks1.js @@ -4,33 +4,33 @@ while (true); var x = 1; -module A { +namespace A { while (true); let x; } -module A1 { +namespace A1 { do {} while(true); - module A { + namespace A { interface F {} } } -module A2 { +namespace A2 { while (true); - module A { + namespace A { var x = 1; } } -module A3 { +namespace A3 { while (true); type T = string; } -module A4 { +namespace A4 { while (true); - module A { + namespace A { const enum E { X } } } @@ -51,9 +51,9 @@ function f2() { } } -module B { +namespace B { for (; ;); - module C { + namespace C { } } diff --git a/tests/baselines/reference/reachabilityChecks1.symbols b/tests/baselines/reference/reachabilityChecks1.symbols index 2743a628fca34..9084143b33df9 100644 --- a/tests/baselines/reference/reachabilityChecks1.symbols +++ b/tests/baselines/reference/reachabilityChecks1.symbols @@ -5,7 +5,7 @@ while (true); var x = 1; >x : Symbol(x, Decl(reachabilityChecks1.ts, 1, 3)) -module A { +namespace A { >A : Symbol(A, Decl(reachabilityChecks1.ts, 1, 10)) while (true); @@ -13,23 +13,23 @@ module A { >x : Symbol(x, Decl(reachabilityChecks1.ts, 5, 7)) } -module A1 { +namespace A1 { >A1 : Symbol(A1, Decl(reachabilityChecks1.ts, 6, 1)) do {} while(true); - module A { + namespace A { >A : Symbol(A, Decl(reachabilityChecks1.ts, 9, 22)) interface F {} ->F : Symbol(F, Decl(reachabilityChecks1.ts, 10, 14)) +>F : Symbol(F, Decl(reachabilityChecks1.ts, 10, 17)) } } -module A2 { +namespace A2 { >A2 : Symbol(A2, Decl(reachabilityChecks1.ts, 13, 1)) while (true); - module A { + namespace A { >A : Symbol(A, Decl(reachabilityChecks1.ts, 16, 17)) var x = 1; @@ -37,7 +37,7 @@ module A2 { } } -module A3 { +namespace A3 { >A3 : Symbol(A3, Decl(reachabilityChecks1.ts, 20, 1)) while (true); @@ -45,15 +45,15 @@ module A3 { >T : Symbol(T, Decl(reachabilityChecks1.ts, 23, 17)) } -module A4 { +namespace A4 { >A4 : Symbol(A4, Decl(reachabilityChecks1.ts, 25, 1)) while (true); - module A { + namespace A { >A : Symbol(A, Decl(reachabilityChecks1.ts, 28, 17)) const enum E { X } ->E : Symbol(E, Decl(reachabilityChecks1.ts, 29, 14)) +>E : Symbol(E, Decl(reachabilityChecks1.ts, 29, 17)) >X : Symbol(E.X, Decl(reachabilityChecks1.ts, 30, 22)) } } @@ -84,11 +84,11 @@ function f2() { } } -module B { +namespace B { >B : Symbol(B, Decl(reachabilityChecks1.ts, 48, 1)) for (; ;); - module C { + namespace C { >C : Symbol(C, Decl(reachabilityChecks1.ts, 51, 14)) } } diff --git a/tests/baselines/reference/reachabilityChecks1.types b/tests/baselines/reference/reachabilityChecks1.types index ae9446f9dbb22..0e58b02fb801f 100644 --- a/tests/baselines/reference/reachabilityChecks1.types +++ b/tests/baselines/reference/reachabilityChecks1.types @@ -11,7 +11,7 @@ var x = 1; >1 : 1 > : ^ -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -24,7 +24,7 @@ module A { > : ^^^ } -module A1 { +namespace A1 { >A1 : typeof A1 > : ^^^^^^^^^ @@ -32,12 +32,12 @@ module A1 { >true : true > : ^^^^ - module A { + namespace A { interface F {} } } -module A2 { +namespace A2 { >A2 : typeof A2 > : ^^^^^^^^^ @@ -45,7 +45,7 @@ module A2 { >true : true > : ^^^^ - module A { + namespace A { >A : typeof A > : ^^^^^^^^ @@ -57,7 +57,7 @@ module A2 { } } -module A3 { +namespace A3 { >A3 : typeof A3 > : ^^^^^^^^^ @@ -70,7 +70,7 @@ module A3 { > : ^^^^^^ } -module A4 { +namespace A4 { >A4 : typeof A4 > : ^^^^^^^^^ @@ -78,7 +78,7 @@ module A4 { >true : true > : ^^^^ - module A { + namespace A { const enum E { X } >E : E > : ^ @@ -124,12 +124,12 @@ function f2() { } } -module B { +namespace B { >B : typeof B > : ^^^^^^^^ for (; ;); - module C { + namespace C { } } diff --git a/tests/baselines/reference/reachabilityChecks2.errors.txt b/tests/baselines/reference/reachabilityChecks2.errors.txt index 28d29d72eed30..06d455e376231 100644 --- a/tests/baselines/reference/reachabilityChecks2.errors.txt +++ b/tests/baselines/reference/reachabilityChecks2.errors.txt @@ -5,12 +5,12 @@ reachabilityChecks2.ts(4,1): error TS7027: Unreachable code detected. while (true) { } const enum E { X } - module A4 { - ~~~~~~~~~~~ + namespace A4 { + ~~~~~~~~~~~~~~ while (true); ~~~~~~~~~~~~~~~~~ - module A { - ~~~~~~~~~~~~~~ + namespace A { + ~~~~~~~~~~~~~~~~~ const enum E { X } ~~~~~~~~~~~~~~~~~~~~~~~~~~ } diff --git a/tests/baselines/reference/reachabilityChecks2.js b/tests/baselines/reference/reachabilityChecks2.js index 184ec36be71ec..177f73c4ffce2 100644 --- a/tests/baselines/reference/reachabilityChecks2.js +++ b/tests/baselines/reference/reachabilityChecks2.js @@ -4,9 +4,9 @@ while (true) { } const enum E { X } -module A4 { +namespace A4 { while (true); - module A { + namespace A { const enum E { X } } } diff --git a/tests/baselines/reference/reachabilityChecks2.symbols b/tests/baselines/reference/reachabilityChecks2.symbols index 82ebef565a912..5e7b85c6abfb0 100644 --- a/tests/baselines/reference/reachabilityChecks2.symbols +++ b/tests/baselines/reference/reachabilityChecks2.symbols @@ -6,15 +6,15 @@ const enum E { X } >E : Symbol(E, Decl(reachabilityChecks2.ts, 0, 16)) >X : Symbol(E.X, Decl(reachabilityChecks2.ts, 1, 14)) -module A4 { +namespace A4 { >A4 : Symbol(A4, Decl(reachabilityChecks2.ts, 1, 18)) while (true); - module A { + namespace A { >A : Symbol(A, Decl(reachabilityChecks2.ts, 4, 17)) const enum E { X } ->E : Symbol(E, Decl(reachabilityChecks2.ts, 5, 14)) +>E : Symbol(E, Decl(reachabilityChecks2.ts, 5, 17)) >X : Symbol(E.X, Decl(reachabilityChecks2.ts, 6, 22)) } } diff --git a/tests/baselines/reference/reachabilityChecks2.types b/tests/baselines/reference/reachabilityChecks2.types index 1c27119c293eb..6f0da43764e44 100644 --- a/tests/baselines/reference/reachabilityChecks2.types +++ b/tests/baselines/reference/reachabilityChecks2.types @@ -11,7 +11,7 @@ const enum E { X } >X : E.X > : ^^^ -module A4 { +namespace A4 { >A4 : typeof A4 > : ^^^^^^^^^ @@ -19,7 +19,7 @@ module A4 { >true : true > : ^^^^ - module A { + namespace A { const enum E { X } >E : E > : ^ diff --git a/tests/baselines/reference/reboundBaseClassSymbol.js b/tests/baselines/reference/reboundBaseClassSymbol.js index fe2cd3b915d2f..df8840a629e0a 100644 --- a/tests/baselines/reference/reboundBaseClassSymbol.js +++ b/tests/baselines/reference/reboundBaseClassSymbol.js @@ -2,7 +2,7 @@ //// [reboundBaseClassSymbol.ts] interface A { a: number; } -module Foo { +namespace Foo { var A = 1; interface B extends A { b: string; } } diff --git a/tests/baselines/reference/reboundBaseClassSymbol.symbols b/tests/baselines/reference/reboundBaseClassSymbol.symbols index c4feaec290ae1..5461ea576d257 100644 --- a/tests/baselines/reference/reboundBaseClassSymbol.symbols +++ b/tests/baselines/reference/reboundBaseClassSymbol.symbols @@ -5,7 +5,7 @@ interface A { a: number; } >A : Symbol(A, Decl(reboundBaseClassSymbol.ts, 0, 0)) >a : Symbol(A.a, Decl(reboundBaseClassSymbol.ts, 0, 13)) -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(reboundBaseClassSymbol.ts, 0, 26)) var A = 1; diff --git a/tests/baselines/reference/reboundBaseClassSymbol.types b/tests/baselines/reference/reboundBaseClassSymbol.types index 5356622ff54aa..f9c88a0863bd7 100644 --- a/tests/baselines/reference/reboundBaseClassSymbol.types +++ b/tests/baselines/reference/reboundBaseClassSymbol.types @@ -5,7 +5,7 @@ interface A { a: number; } >a : number > : ^^^^^^ -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/reboundIdentifierOnImportAlias.errors.txt b/tests/baselines/reference/reboundIdentifierOnImportAlias.errors.txt index 302f7d27e9be4..9130554a18e69 100644 --- a/tests/baselines/reference/reboundIdentifierOnImportAlias.errors.txt +++ b/tests/baselines/reference/reboundIdentifierOnImportAlias.errors.txt @@ -2,10 +2,10 @@ reboundIdentifierOnImportAlias.ts(6,16): error TS2437: Module 'Foo' is hidden by ==== reboundIdentifierOnImportAlias.ts (1 errors) ==== - module Foo { + namespace Foo { export var x = "hello"; } - module Bar { + namespace Bar { var Foo = 1; import F = Foo; ~~~ diff --git a/tests/baselines/reference/reboundIdentifierOnImportAlias.js b/tests/baselines/reference/reboundIdentifierOnImportAlias.js index 3fec53fa7090f..c7b6f8dc9ae0c 100644 --- a/tests/baselines/reference/reboundIdentifierOnImportAlias.js +++ b/tests/baselines/reference/reboundIdentifierOnImportAlias.js @@ -1,10 +1,10 @@ //// [tests/cases/compiler/reboundIdentifierOnImportAlias.ts] //// //// [reboundIdentifierOnImportAlias.ts] -module Foo { +namespace Foo { export var x = "hello"; } -module Bar { +namespace Bar { var Foo = 1; import F = Foo; } diff --git a/tests/baselines/reference/reboundIdentifierOnImportAlias.symbols b/tests/baselines/reference/reboundIdentifierOnImportAlias.symbols index 2f698814bc614..5ec2ad775655b 100644 --- a/tests/baselines/reference/reboundIdentifierOnImportAlias.symbols +++ b/tests/baselines/reference/reboundIdentifierOnImportAlias.symbols @@ -1,13 +1,13 @@ //// [tests/cases/compiler/reboundIdentifierOnImportAlias.ts] //// === reboundIdentifierOnImportAlias.ts === -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(reboundIdentifierOnImportAlias.ts, 0, 0)) export var x = "hello"; >x : Symbol(x, Decl(reboundIdentifierOnImportAlias.ts, 1, 14)) } -module Bar { +namespace Bar { >Bar : Symbol(Bar, Decl(reboundIdentifierOnImportAlias.ts, 2, 1)) var Foo = 1; diff --git a/tests/baselines/reference/reboundIdentifierOnImportAlias.types b/tests/baselines/reference/reboundIdentifierOnImportAlias.types index b65f209ef63f7..cda31ff248d3e 100644 --- a/tests/baselines/reference/reboundIdentifierOnImportAlias.types +++ b/tests/baselines/reference/reboundIdentifierOnImportAlias.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/reboundIdentifierOnImportAlias.ts] //// === reboundIdentifierOnImportAlias.ts === -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ @@ -11,7 +11,7 @@ module Foo { >"hello" : "hello" > : ^^^^^^^ } -module Bar { +namespace Bar { >Bar : typeof Bar > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/rectype.js b/tests/baselines/reference/rectype.js index 2f66e2d566b9d..89a799c19fed3 100644 --- a/tests/baselines/reference/rectype.js +++ b/tests/baselines/reference/rectype.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/rectype.ts] //// //// [rectype.ts] -module M { +namespace M { interface I { (i:I):I; } export function f(p: I) { return f }; diff --git a/tests/baselines/reference/rectype.symbols b/tests/baselines/reference/rectype.symbols index eff32accaa7c5..57c13b11539e4 100644 --- a/tests/baselines/reference/rectype.symbols +++ b/tests/baselines/reference/rectype.symbols @@ -1,24 +1,24 @@ //// [tests/cases/compiler/rectype.ts] //// === rectype.ts === -module M { +namespace M { >M : Symbol(M, Decl(rectype.ts, 0, 0)) interface I { (i:I):I; } ->I : Symbol(I, Decl(rectype.ts, 0, 10)) +>I : Symbol(I, Decl(rectype.ts, 0, 13)) >i : Symbol(i, Decl(rectype.ts, 1, 19)) ->I : Symbol(I, Decl(rectype.ts, 0, 10)) ->I : Symbol(I, Decl(rectype.ts, 0, 10)) +>I : Symbol(I, Decl(rectype.ts, 0, 13)) +>I : Symbol(I, Decl(rectype.ts, 0, 13)) export function f(p: I) { return f }; >f : Symbol(f, Decl(rectype.ts, 1, 28)) >p : Symbol(p, Decl(rectype.ts, 3, 22)) ->I : Symbol(I, Decl(rectype.ts, 0, 10)) +>I : Symbol(I, Decl(rectype.ts, 0, 13)) >f : Symbol(f, Decl(rectype.ts, 1, 28)) var i:I; >i : Symbol(i, Decl(rectype.ts, 5, 7)) ->I : Symbol(I, Decl(rectype.ts, 0, 10)) +>I : Symbol(I, Decl(rectype.ts, 0, 13)) f(i); >f : Symbol(f, Decl(rectype.ts, 1, 28)) diff --git a/tests/baselines/reference/rectype.types b/tests/baselines/reference/rectype.types index d6dd4a79d2417..12b0f350f4f4c 100644 --- a/tests/baselines/reference/rectype.types +++ b/tests/baselines/reference/rectype.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/rectype.ts] //// === rectype.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/recursiveBaseCheck.errors.txt b/tests/baselines/reference/recursiveBaseCheck.errors.txt index 25e999d547bd7..b298e11b3d7a3 100644 --- a/tests/baselines/reference/recursiveBaseCheck.errors.txt +++ b/tests/baselines/reference/recursiveBaseCheck.errors.txt @@ -6,7 +6,7 @@ recursiveBaseCheck.ts(10,18): error TS2506: 'D' is referenced directly or indire ==== recursiveBaseCheck.ts (5 errors) ==== - declare module Module { + declare namespace Module { class C extends D { ~ !!! error TS2506: 'C' is referenced directly or indirectly in its own base expression. diff --git a/tests/baselines/reference/recursiveBaseCheck.js b/tests/baselines/reference/recursiveBaseCheck.js index f9fa6e07c0e42..0f79fd8a079eb 100644 --- a/tests/baselines/reference/recursiveBaseCheck.js +++ b/tests/baselines/reference/recursiveBaseCheck.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/recursiveBaseCheck.ts] //// //// [recursiveBaseCheck.ts] -declare module Module { +declare namespace Module { class C extends D { } export class B extends Module.C { diff --git a/tests/baselines/reference/recursiveBaseCheck.symbols b/tests/baselines/reference/recursiveBaseCheck.symbols index ef06df386a9d0..31e074336d573 100644 --- a/tests/baselines/reference/recursiveBaseCheck.symbols +++ b/tests/baselines/reference/recursiveBaseCheck.symbols @@ -1,18 +1,18 @@ //// [tests/cases/compiler/recursiveBaseCheck.ts] //// === recursiveBaseCheck.ts === -declare module Module { +declare namespace Module { >Module : Symbol(Module, Decl(recursiveBaseCheck.ts, 0, 0)) class C extends D { ->C : Symbol(C, Decl(recursiveBaseCheck.ts, 0, 23)) +>C : Symbol(C, Decl(recursiveBaseCheck.ts, 0, 26)) >D : Symbol(D, Decl(recursiveBaseCheck.ts, 8, 5)) } export class B extends Module.C { >B : Symbol(B, Decl(recursiveBaseCheck.ts, 2, 5)) ->Module.C : Symbol(C, Decl(recursiveBaseCheck.ts, 0, 23)) +>Module.C : Symbol(C, Decl(recursiveBaseCheck.ts, 0, 26)) >Module : Symbol(Module, Decl(recursiveBaseCheck.ts, 0, 0)) ->C : Symbol(C, Decl(recursiveBaseCheck.ts, 0, 23)) +>C : Symbol(C, Decl(recursiveBaseCheck.ts, 0, 26)) } export class A extends Module.B { >A : Symbol(A, Decl(recursiveBaseCheck.ts, 4, 5)) diff --git a/tests/baselines/reference/recursiveBaseCheck.types b/tests/baselines/reference/recursiveBaseCheck.types index 76159149019e7..18a0682a164c8 100644 --- a/tests/baselines/reference/recursiveBaseCheck.types +++ b/tests/baselines/reference/recursiveBaseCheck.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/recursiveBaseCheck.ts] //// === recursiveBaseCheck.ts === -declare module Module { +declare namespace Module { >Module : typeof Module > : ^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/recursiveBaseCheck2.errors.txt b/tests/baselines/reference/recursiveBaseCheck2.errors.txt index 043d805a779b4..5083b7a5284e5 100644 --- a/tests/baselines/reference/recursiveBaseCheck2.errors.txt +++ b/tests/baselines/reference/recursiveBaseCheck2.errors.txt @@ -1,9 +1,20 @@ +recursiveBaseCheck2.ts(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +recursiveBaseCheck2.ts(1,22): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +recursiveBaseCheck2.ts(1,32): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. recursiveBaseCheck2.ts(2,18): error TS2506: 'b2CircleShape' is referenced directly or indirectly in its own base expression. recursiveBaseCheck2.ts(4,18): error TS2506: 'b2Shape' is referenced directly or indirectly in its own base expression. +recursiveBaseCheck2.ts(7,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +recursiveBaseCheck2.ts(7,22): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. -==== recursiveBaseCheck2.ts (2 errors) ==== +==== recursiveBaseCheck2.ts (7 errors) ==== declare module Box2D.Collision.Shapes { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. export class b2CircleShape extends b2Shape { ~~~~~~~~~~~~~ !!! error TS2506: 'b2CircleShape' is referenced directly or indirectly in its own base expression. @@ -14,6 +25,10 @@ recursiveBaseCheck2.ts(4,18): error TS2506: 'b2Shape' is referenced directly or } } declare module Box2D.Dynamics { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. export class b2ContactListener extends Box2D.Collision.Shapes.b2Shape { } export class b2FixtureDef extends Box2D.Dynamics.b2ContactListener { diff --git a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js index 61335cd196edc..7d399b9fa628e 100644 --- a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js +++ b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/recursiveClassInstantiationsWithDefaultConstructors.ts] //// //// [recursiveClassInstantiationsWithDefaultConstructors.ts] -module TypeScript2 { +namespace TypeScript2 { export class MemberName { public prefix: string = ""; } diff --git a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.symbols b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.symbols index 874a4f0583d62..ba208a7bca4e1 100644 --- a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.symbols +++ b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.symbols @@ -1,18 +1,18 @@ //// [tests/cases/compiler/recursiveClassInstantiationsWithDefaultConstructors.ts] //// === recursiveClassInstantiationsWithDefaultConstructors.ts === -module TypeScript2 { +namespace TypeScript2 { >TypeScript2 : Symbol(TypeScript2, Decl(recursiveClassInstantiationsWithDefaultConstructors.ts, 0, 0)) export class MemberName { ->MemberName : Symbol(MemberName, Decl(recursiveClassInstantiationsWithDefaultConstructors.ts, 0, 20)) +>MemberName : Symbol(MemberName, Decl(recursiveClassInstantiationsWithDefaultConstructors.ts, 0, 23)) public prefix: string = ""; >prefix : Symbol(MemberName.prefix, Decl(recursiveClassInstantiationsWithDefaultConstructors.ts, 1, 29)) } export class MemberNameArray extends MemberName { >MemberNameArray : Symbol(MemberNameArray, Decl(recursiveClassInstantiationsWithDefaultConstructors.ts, 3, 5)) ->MemberName : Symbol(MemberName, Decl(recursiveClassInstantiationsWithDefaultConstructors.ts, 0, 20)) +>MemberName : Symbol(MemberName, Decl(recursiveClassInstantiationsWithDefaultConstructors.ts, 0, 23)) } } diff --git a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.types b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.types index 01cfdd9a01ebf..82f525b44cfb8 100644 --- a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.types +++ b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/recursiveClassInstantiationsWithDefaultConstructors.ts] //// === recursiveClassInstantiationsWithDefaultConstructors.ts === -module TypeScript2 { +namespace TypeScript2 { >TypeScript2 : typeof TypeScript2 > : ^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/recursiveClassReferenceTest.errors.txt b/tests/baselines/reference/recursiveClassReferenceTest.errors.txt index 06fffd62af382..bf92f62449ac7 100644 --- a/tests/baselines/reference/recursiveClassReferenceTest.errors.txt +++ b/tests/baselines/reference/recursiveClassReferenceTest.errors.txt @@ -1,3 +1,5 @@ +recursiveClassReferenceTest.ts(6,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +recursiveClassReferenceTest.ts(6,23): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. recursiveClassReferenceTest.ts(16,19): error TS2304: Cannot find name 'Element'. recursiveClassReferenceTest.ts(56,11): error TS2663: Cannot find name 'domNode'. Did you mean the instance member 'this.domNode'? recursiveClassReferenceTest.ts(88,36): error TS2663: Cannot find name 'mode'. Did you mean the instance member 'this.mode'? @@ -5,13 +7,17 @@ recursiveClassReferenceTest.ts(95,21): error TS2345: Argument of type 'Window' i Property 'getInitialState' is missing in type 'Window' but required in type 'IMode'. -==== recursiveClassReferenceTest.ts (4 errors) ==== +==== recursiveClassReferenceTest.ts (6 errors) ==== // Scenario 1: Test reqursive function call with "this" parameter // Scenario 2: Test recursive function call with cast and "this" parameter declare module Sample.Thing { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. export interface IWidget { getDomNode(): any; @@ -39,7 +45,7 @@ recursiveClassReferenceTest.ts(95,21): error TS2345: Argument of type 'Window' i } } - module Sample.Actions.Thing.Find { + namespace Sample.Actions.Thing.Find { export class StartFindAction implements Sample.Thing.IAction { public getId() { return "yo"; } @@ -51,7 +57,7 @@ recursiveClassReferenceTest.ts(95,21): error TS2345: Argument of type 'Window' i } } - module Sample.Thing.Widgets { + namespace Sample.Thing.Widgets { export class FindWidget implements Sample.Thing.IWidget { public gar(runner:(widget:Sample.Thing.IWidget)=>any) { if (true) {return runner(this);}} @@ -85,7 +91,7 @@ recursiveClassReferenceTest.ts(95,21): error TS2345: Argument of type 'Window' i } declare var self: Window; - module Sample.Thing.Languages.PlainText { + namespace Sample.Thing.Languages.PlainText { export class State implements IState { constructor(private mode: IMode) { } diff --git a/tests/baselines/reference/recursiveClassReferenceTest.js b/tests/baselines/reference/recursiveClassReferenceTest.js index b4e90b29337b0..d9eab15c1afd7 100644 --- a/tests/baselines/reference/recursiveClassReferenceTest.js +++ b/tests/baselines/reference/recursiveClassReferenceTest.js @@ -32,7 +32,7 @@ declare module Sample.Thing { } } -module Sample.Actions.Thing.Find { +namespace Sample.Actions.Thing.Find { export class StartFindAction implements Sample.Thing.IAction { public getId() { return "yo"; } @@ -44,7 +44,7 @@ module Sample.Actions.Thing.Find { } } -module Sample.Thing.Widgets { +namespace Sample.Thing.Widgets { export class FindWidget implements Sample.Thing.IWidget { public gar(runner:(widget:Sample.Thing.IWidget)=>any) { if (true) {return runner(this);}} @@ -76,7 +76,7 @@ interface Window { } declare var self: Window; -module Sample.Thing.Languages.PlainText { +namespace Sample.Thing.Languages.PlainText { export class State implements IState { constructor(private mode: IMode) { } diff --git a/tests/baselines/reference/recursiveClassReferenceTest.js.map b/tests/baselines/reference/recursiveClassReferenceTest.js.map index 880ecdb49e03f..f67ac2f7ca3b7 100644 --- a/tests/baselines/reference/recursiveClassReferenceTest.js.map +++ b/tests/baselines/reference/recursiveClassReferenceTest.js.map @@ -1,3 +1,3 @@ //// [recursiveClassReferenceTest.js.map] -{"version":3,"file":"recursiveClassReferenceTest.js","sourceRoot":"","sources":["recursiveClassReferenceTest.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,0EAA0E;;;;;;;;;;;;;;;;AA8B1E,IAAO,MAAM,CAUZ;AAVD,WAAO,MAAM;IAAC,IAAA,OAAO,CAUpB;IAVa,WAAA,OAAO;QAAC,IAAA,KAAK,CAU1B;QAVqB,WAAA,OAAK;YAAC,IAAA,IAAI,CAU/B;YAV2B,WAAA,IAAI;gBAC/B;oBAAA;oBAQA,CAAC;oBANO,+BAAK,GAAZ,cAAiB,OAAO,IAAI,CAAC,CAAC,CAAC;oBAExB,6BAAG,GAAV,UAAW,KAA6B;wBAEvC,OAAO,IAAI,CAAC;oBACb,CAAC;oBACF,sBAAC;gBAAD,CAAC,AARD,IAQC;gBARY,oBAAe,kBAQ3B,CAAA;YACF,CAAC,EAV2B,IAAI,GAAJ,YAAI,KAAJ,YAAI,QAU/B;QAAD,CAAC,EAVqB,KAAK,GAAL,aAAK,KAAL,aAAK,QAU1B;IAAD,CAAC,EAVa,OAAO,GAAP,cAAO,KAAP,cAAO,QAUpB;AAAD,CAAC,EAVM,MAAM,KAAN,MAAM,QAUZ;AAED,WAAO,MAAM;IAAC,IAAA,KAAK,CAoBlB;IApBa,WAAA,KAAK;QAAC,IAAA,OAAO,CAoB1B;QApBmB,WAAA,OAAO;YAC1B;gBAKC,oBAAoB,SAAkC;oBAAlC,cAAS,GAAT,SAAS,CAAyB;oBAD9C,YAAO,GAAO,IAAI,CAAC;oBAEvB,aAAa;oBACb,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;gBAC3C,CAAC;gBANM,wBAAG,GAAV,UAAW,MAAyC,IAAI,IAAI,IAAI,EAAE,CAAC;oBAAA,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;gBAAA,CAAC,CAAA,CAAC;gBAQlF,+BAAU,GAAjB;oBACC,OAAO,OAAO,CAAC;gBAChB,CAAC;gBAEM,4BAAO,GAAd;gBAEA,CAAC;gBAEF,iBAAC;YAAD,CAAC,AAlBD,IAkBC;YAlBY,kBAAU,aAkBtB,CAAA;QACF,CAAC,EApBmB,OAAO,GAAP,aAAO,KAAP,aAAO,QAoB1B;IAAD,CAAC,EApBa,KAAK,GAAL,YAAK,KAAL,YAAK,QAoBlB;AAAD,CAAC,EApBM,MAAM,KAAN,MAAM,QAoBZ;AAGD;IAAA;IAAuF,CAAC;IAA3C,sCAAe,GAAtB,cAAmC,OAAO,IAAI,CAAC,CAAA,CAAC;IAAC,mBAAC;AAAD,CAAC,AAAxF,IAAwF;AASxF,WAAO,MAAM;IAAC,IAAA,KAAK,CAwBlB;IAxBa,WAAA,KAAK;QAAC,IAAA,SAAS,CAwB5B;QAxBmB,WAAA,SAAS;YAAC,IAAA,SAAS,CAwBtC;YAxB6B,WAAA,SAAS;gBAEtC;oBACO,eAAoB,IAAW;wBAAX,SAAI,GAAJ,IAAI,CAAO;oBAAI,CAAC;oBACnC,qBAAK,GAAZ;wBACC,OAAO,IAAI,CAAC;oBACb,CAAC;oBAEM,sBAAM,GAAb,UAAc,KAAY;wBACzB,OAAO,IAAI,KAAK,KAAK,CAAC;oBACvB,CAAC;oBAEM,uBAAO,GAAd,cAA0B,OAAO,IAAI,CAAC,CAAC,CAAC;oBACzC,YAAC;gBAAD,CAAC,AAXD,IAWC;gBAXY,eAAK,QAWjB,CAAA;gBAED;oBAA0B,wBAAY;oBAAtC;;oBAQA,CAAC;oBANA,aAAa;oBACN,8BAAe,GAAtB;wBACC,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;oBACxB,CAAC;oBAGF,WAAC;gBAAD,CAAC,AARD,CAA0B,YAAY,GAQrC;gBARY,cAAI,OAQhB,CAAA;YACF,CAAC,EAxB6B,SAAS,GAAT,mBAAS,KAAT,mBAAS,QAwBtC;QAAD,CAAC,EAxBmB,SAAS,GAAT,eAAS,KAAT,eAAS,QAwB5B;IAAD,CAAC,EAxBa,KAAK,GAAL,YAAK,KAAL,YAAK,QAwBlB;AAAD,CAAC,EAxBM,MAAM,KAAN,MAAM,QAwBZ"} -//// https://sokra.github.io/source-map-visualization#base64,Ly8gU2NlbmFyaW8gMTogVGVzdCByZXF1cnNpdmUgZnVuY3Rpb24gY2FsbCB3aXRoICJ0aGlzIiBwYXJhbWV0ZXINCi8vIFNjZW5hcmlvIDI6IFRlc3QgcmVjdXJzaXZlIGZ1bmN0aW9uIGNhbGwgd2l0aCBjYXN0IGFuZCAidGhpcyIgcGFyYW1ldGVyDQp2YXIgX19leHRlbmRzID0gKHRoaXMgJiYgdGhpcy5fX2V4dGVuZHMpIHx8IChmdW5jdGlvbiAoKSB7DQogICAgdmFyIGV4dGVuZFN0YXRpY3MgPSBmdW5jdGlvbiAoZCwgYikgew0KICAgICAgICBleHRlbmRTdGF0aWNzID0gT2JqZWN0LnNldFByb3RvdHlwZU9mIHx8DQogICAgICAgICAgICAoeyBfX3Byb3RvX186IFtdIH0gaW5zdGFuY2VvZiBBcnJheSAmJiBmdW5jdGlvbiAoZCwgYikgeyBkLl9fcHJvdG9fXyA9IGI7IH0pIHx8DQogICAgICAgICAgICBmdW5jdGlvbiAoZCwgYikgeyBmb3IgKHZhciBwIGluIGIpIGlmIChPYmplY3QucHJvdG90eXBlLmhhc093blByb3BlcnR5LmNhbGwoYiwgcCkpIGRbcF0gPSBiW3BdOyB9Ow0KICAgICAgICByZXR1cm4gZXh0ZW5kU3RhdGljcyhkLCBiKTsNCiAgICB9Ow0KICAgIHJldHVybiBmdW5jdGlvbiAoZCwgYikgew0KICAgICAgICBpZiAodHlwZW9mIGIgIT09ICJmdW5jdGlvbiIgJiYgYiAhPT0gbnVsbCkNCiAgICAgICAgICAgIHRocm93IG5ldyBUeXBlRXJyb3IoIkNsYXNzIGV4dGVuZHMgdmFsdWUgIiArIFN0cmluZyhiKSArICIgaXMgbm90IGEgY29uc3RydWN0b3Igb3IgbnVsbCIpOw0KICAgICAgICBleHRlbmRTdGF0aWNzKGQsIGIpOw0KICAgICAgICBmdW5jdGlvbiBfXygpIHsgdGhpcy5jb25zdHJ1Y3RvciA9IGQ7IH0NCiAgICAgICAgZC5wcm90b3R5cGUgPSBiID09PSBudWxsID8gT2JqZWN0LmNyZWF0ZShiKSA6IChfXy5wcm90b3R5cGUgPSBiLnByb3RvdHlwZSwgbmV3IF9fKCkpOw0KICAgIH07DQp9KSgpOw0KdmFyIFNhbXBsZTsNCihmdW5jdGlvbiAoU2FtcGxlKSB7DQogICAgdmFyIEFjdGlvbnM7DQogICAgKGZ1bmN0aW9uIChBY3Rpb25zKSB7DQogICAgICAgIHZhciBUaGluZzsNCiAgICAgICAgKGZ1bmN0aW9uIChUaGluZ18xKSB7DQogICAgICAgICAgICB2YXIgRmluZDsNCiAgICAgICAgICAgIChmdW5jdGlvbiAoRmluZCkgew0KICAgICAgICAgICAgICAgIHZhciBTdGFydEZpbmRBY3Rpb24gPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgICAgICAgICAgICAgICAgIGZ1bmN0aW9uIFN0YXJ0RmluZEFjdGlvbigpIHsNCiAgICAgICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgICAgICBTdGFydEZpbmRBY3Rpb24ucHJvdG90eXBlLmdldElkID0gZnVuY3Rpb24gKCkgeyByZXR1cm4gInlvIjsgfTsNCiAgICAgICAgICAgICAgICAgICAgU3RhcnRGaW5kQWN0aW9uLnByb3RvdHlwZS5ydW4gPSBmdW5jdGlvbiAoVGhpbmcpIHsNCiAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOw0KICAgICAgICAgICAgICAgICAgICB9Ow0KICAgICAgICAgICAgICAgICAgICByZXR1cm4gU3RhcnRGaW5kQWN0aW9uOw0KICAgICAgICAgICAgICAgIH0oKSk7DQogICAgICAgICAgICAgICAgRmluZC5TdGFydEZpbmRBY3Rpb24gPSBTdGFydEZpbmRBY3Rpb247DQogICAgICAgICAgICB9KShGaW5kID0gVGhpbmdfMS5GaW5kIHx8IChUaGluZ18xLkZpbmQgPSB7fSkpOw0KICAgICAgICB9KShUaGluZyA9IEFjdGlvbnMuVGhpbmcgfHwgKEFjdGlvbnMuVGhpbmcgPSB7fSkpOw0KICAgIH0pKEFjdGlvbnMgPSBTYW1wbGUuQWN0aW9ucyB8fCAoU2FtcGxlLkFjdGlvbnMgPSB7fSkpOw0KfSkoU2FtcGxlIHx8IChTYW1wbGUgPSB7fSkpOw0KKGZ1bmN0aW9uIChTYW1wbGUpIHsNCiAgICB2YXIgVGhpbmc7DQogICAgKGZ1bmN0aW9uIChUaGluZykgew0KICAgICAgICB2YXIgV2lkZ2V0czsNCiAgICAgICAgKGZ1bmN0aW9uIChXaWRnZXRzKSB7DQogICAgICAgICAgICB2YXIgRmluZFdpZGdldCA9IC8qKiBAY2xhc3MgKi8gKGZ1bmN0aW9uICgpIHsNCiAgICAgICAgICAgICAgICBmdW5jdGlvbiBGaW5kV2lkZ2V0KGNvZGVUaGluZykgew0KICAgICAgICAgICAgICAgICAgICB0aGlzLmNvZGVUaGluZyA9IGNvZGVUaGluZzsNCiAgICAgICAgICAgICAgICAgICAgdGhpcy5kb21Ob2RlID0gbnVsbDsNCiAgICAgICAgICAgICAgICAgICAgLy8gc2NlbmFyaW8gMQ0KICAgICAgICAgICAgICAgICAgICBjb2RlVGhpbmcuYWRkV2lkZ2V0KCJhZGRXaWRnZXQiLCB0aGlzKTsNCiAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICAgICAgRmluZFdpZGdldC5wcm90b3R5cGUuZ2FyID0gZnVuY3Rpb24gKHJ1bm5lcikgeyBpZiAodHJ1ZSkgew0KICAgICAgICAgICAgICAgICAgICByZXR1cm4gcnVubmVyKHRoaXMpOw0KICAgICAgICAgICAgICAgIH0gfTsNCiAgICAgICAgICAgICAgICBGaW5kV2lkZ2V0LnByb3RvdHlwZS5nZXREb21Ob2RlID0gZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgICAgICAgICByZXR1cm4gZG9tTm9kZTsNCiAgICAgICAgICAgICAgICB9Ow0KICAgICAgICAgICAgICAgIEZpbmRXaWRnZXQucHJvdG90eXBlLmRlc3Ryb3kgPSBmdW5jdGlvbiAoKSB7DQogICAgICAgICAgICAgICAgfTsNCiAgICAgICAgICAgICAgICByZXR1cm4gRmluZFdpZGdldDsNCiAgICAgICAgICAgIH0oKSk7DQogICAgICAgICAgICBXaWRnZXRzLkZpbmRXaWRnZXQgPSBGaW5kV2lkZ2V0Ow0KICAgICAgICB9KShXaWRnZXRzID0gVGhpbmcuV2lkZ2V0cyB8fCAoVGhpbmcuV2lkZ2V0cyA9IHt9KSk7DQogICAgfSkoVGhpbmcgPSBTYW1wbGUuVGhpbmcgfHwgKFNhbXBsZS5UaGluZyA9IHt9KSk7DQp9KShTYW1wbGUgfHwgKFNhbXBsZSA9IHt9KSk7DQp2YXIgQWJzdHJhY3RNb2RlID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgIGZ1bmN0aW9uIEFic3RyYWN0TW9kZSgpIHsNCiAgICB9DQogICAgQWJzdHJhY3RNb2RlLnByb3RvdHlwZS5nZXRJbml0aWFsU3RhdGUgPSBmdW5jdGlvbiAoKSB7IHJldHVybiBudWxsOyB9Ow0KICAgIHJldHVybiBBYnN0cmFjdE1vZGU7DQp9KCkpOw0KKGZ1bmN0aW9uIChTYW1wbGUpIHsNCiAgICB2YXIgVGhpbmc7DQogICAgKGZ1bmN0aW9uIChUaGluZykgew0KICAgICAgICB2YXIgTGFuZ3VhZ2VzOw0KICAgICAgICAoZnVuY3Rpb24gKExhbmd1YWdlcykgew0KICAgICAgICAgICAgdmFyIFBsYWluVGV4dDsNCiAgICAgICAgICAgIChmdW5jdGlvbiAoUGxhaW5UZXh0KSB7DQogICAgICAgICAgICAgICAgdmFyIFN0YXRlID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgICAgICAgICBmdW5jdGlvbiBTdGF0ZShtb2RlKSB7DQogICAgICAgICAgICAgICAgICAgICAgICB0aGlzLm1vZGUgPSBtb2RlOw0KICAgICAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICAgICAgICAgIFN0YXRlLnByb3RvdHlwZS5jbG9uZSA9IGZ1bmN0aW9uICgpIHsNCiAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiB0aGlzOw0KICAgICAgICAgICAgICAgICAgICB9Ow0KICAgICAgICAgICAgICAgICAgICBTdGF0ZS5wcm90b3R5cGUuZXF1YWxzID0gZnVuY3Rpb24gKG90aGVyKSB7DQogICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gdGhpcyA9PT0gb3RoZXI7DQogICAgICAgICAgICAgICAgICAgIH07DQogICAgICAgICAgICAgICAgICAgIFN0YXRlLnByb3RvdHlwZS5nZXRNb2RlID0gZnVuY3Rpb24gKCkgeyByZXR1cm4gbW9kZTsgfTsNCiAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFN0YXRlOw0KICAgICAgICAgICAgICAgIH0oKSk7DQogICAgICAgICAgICAgICAgUGxhaW5UZXh0LlN0YXRlID0gU3RhdGU7DQogICAgICAgICAgICAgICAgdmFyIE1vZGUgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoX3N1cGVyKSB7DQogICAgICAgICAgICAgICAgICAgIF9fZXh0ZW5kcyhNb2RlLCBfc3VwZXIpOw0KICAgICAgICAgICAgICAgICAgICBmdW5jdGlvbiBNb2RlKCkgew0KICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIF9zdXBlciAhPT0gbnVsbCAmJiBfc3VwZXIuYXBwbHkodGhpcywgYXJndW1lbnRzKSB8fCB0aGlzOw0KICAgICAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICAgICAgICAgIC8vIHNjZW5hcmlvIDINCiAgICAgICAgICAgICAgICAgICAgTW9kZS5wcm90b3R5cGUuZ2V0SW5pdGlhbFN0YXRlID0gZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIG5ldyBTdGF0ZShzZWxmKTsNCiAgICAgICAgICAgICAgICAgICAgfTsNCiAgICAgICAgICAgICAgICAgICAgcmV0dXJuIE1vZGU7DQogICAgICAgICAgICAgICAgfShBYnN0cmFjdE1vZGUpKTsNCiAgICAgICAgICAgICAgICBQbGFpblRleHQuTW9kZSA9IE1vZGU7DQogICAgICAgICAgICB9KShQbGFpblRleHQgPSBMYW5ndWFnZXMuUGxhaW5UZXh0IHx8IChMYW5ndWFnZXMuUGxhaW5UZXh0ID0ge30pKTsNCiAgICAgICAgfSkoTGFuZ3VhZ2VzID0gVGhpbmcuTGFuZ3VhZ2VzIHx8IChUaGluZy5MYW5ndWFnZXMgPSB7fSkpOw0KICAgIH0pKFRoaW5nID0gU2FtcGxlLlRoaW5nIHx8IChTYW1wbGUuVGhpbmcgPSB7fSkpOw0KfSkoU2FtcGxlIHx8IChTYW1wbGUgPSB7fSkpOw0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9cmVjdXJzaXZlQ2xhc3NSZWZlcmVuY2VUZXN0LmpzLm1hcA==,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVjdXJzaXZlQ2xhc3NSZWZlcmVuY2VUZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsicmVjdXJzaXZlQ2xhc3NSZWZlcmVuY2VUZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGlFQUFpRTtBQUNqRSwwRUFBMEU7Ozs7Ozs7Ozs7Ozs7Ozs7QUE4QjFFLElBQU8sTUFBTSxDQVVaO0FBVkQsV0FBTyxNQUFNO0lBQUMsSUFBQSxPQUFPLENBVXBCO0lBVmEsV0FBQSxPQUFPO1FBQUMsSUFBQSxLQUFLLENBVTFCO1FBVnFCLFdBQUEsT0FBSztZQUFDLElBQUEsSUFBSSxDQVUvQjtZQVYyQixXQUFBLElBQUk7Z0JBQy9CO29CQUFBO29CQVFBLENBQUM7b0JBTk8sK0JBQUssR0FBWixjQUFpQixPQUFPLElBQUksQ0FBQyxDQUFDLENBQUM7b0JBRXhCLDZCQUFHLEdBQVYsVUFBVyxLQUE2Qjt3QkFFdkMsT0FBTyxJQUFJLENBQUM7b0JBQ2IsQ0FBQztvQkFDRixzQkFBQztnQkFBRCxDQUFDLEFBUkQsSUFRQztnQkFSWSxvQkFBZSxrQkFRM0IsQ0FBQTtZQUNGLENBQUMsRUFWMkIsSUFBSSxHQUFKLFlBQUksS0FBSixZQUFJLFFBVS9CO1FBQUQsQ0FBQyxFQVZxQixLQUFLLEdBQUwsYUFBSyxLQUFMLGFBQUssUUFVMUI7SUFBRCxDQUFDLEVBVmEsT0FBTyxHQUFQLGNBQU8sS0FBUCxjQUFPLFFBVXBCO0FBQUQsQ0FBQyxFQVZNLE1BQU0sS0FBTixNQUFNLFFBVVo7QUFFRCxXQUFPLE1BQU07SUFBQyxJQUFBLEtBQUssQ0FvQmxCO0lBcEJhLFdBQUEsS0FBSztRQUFDLElBQUEsT0FBTyxDQW9CMUI7UUFwQm1CLFdBQUEsT0FBTztZQUMxQjtnQkFLQyxvQkFBb0IsU0FBa0M7b0JBQWxDLGNBQVMsR0FBVCxTQUFTLENBQXlCO29CQUQ5QyxZQUFPLEdBQU8sSUFBSSxDQUFDO29CQUV2QixhQUFhO29CQUNiLFNBQVMsQ0FBQyxTQUFTLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxDQUFDO2dCQUMzQyxDQUFDO2dCQU5NLHdCQUFHLEdBQVYsVUFBVyxNQUF5QyxJQUFJLElBQUksSUFBSSxFQUFFLENBQUM7b0JBQUEsT0FBTyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQUEsQ0FBQyxDQUFBLENBQUM7Z0JBUWxGLCtCQUFVLEdBQWpCO29CQUNDLE9BQU8sT0FBTyxDQUFDO2dCQUNoQixDQUFDO2dCQUVNLDRCQUFPLEdBQWQ7Z0JBRUEsQ0FBQztnQkFFRixpQkFBQztZQUFELENBQUMsQUFsQkQsSUFrQkM7WUFsQlksa0JBQVUsYUFrQnRCLENBQUE7UUFDRixDQUFDLEVBcEJtQixPQUFPLEdBQVAsYUFBTyxLQUFQLGFBQU8sUUFvQjFCO0lBQUQsQ0FBQyxFQXBCYSxLQUFLLEdBQUwsWUFBSyxLQUFMLFlBQUssUUFvQmxCO0FBQUQsQ0FBQyxFQXBCTSxNQUFNLEtBQU4sTUFBTSxRQW9CWjtBQUdEO0lBQUE7SUFBdUYsQ0FBQztJQUEzQyxzQ0FBZSxHQUF0QixjQUFtQyxPQUFPLElBQUksQ0FBQyxDQUFBLENBQUM7SUFBQyxtQkFBQztBQUFELENBQUMsQUFBeEYsSUFBd0Y7QUFTeEYsV0FBTyxNQUFNO0lBQUMsSUFBQSxLQUFLLENBd0JsQjtJQXhCYSxXQUFBLEtBQUs7UUFBQyxJQUFBLFNBQVMsQ0F3QjVCO1FBeEJtQixXQUFBLFNBQVM7WUFBQyxJQUFBLFNBQVMsQ0F3QnRDO1lBeEI2QixXQUFBLFNBQVM7Z0JBRXRDO29CQUNPLGVBQW9CLElBQVc7d0JBQVgsU0FBSSxHQUFKLElBQUksQ0FBTztvQkFBSSxDQUFDO29CQUNuQyxxQkFBSyxHQUFaO3dCQUNDLE9BQU8sSUFBSSxDQUFDO29CQUNiLENBQUM7b0JBRU0sc0JBQU0sR0FBYixVQUFjLEtBQVk7d0JBQ3pCLE9BQU8sSUFBSSxLQUFLLEtBQUssQ0FBQztvQkFDdkIsQ0FBQztvQkFFTSx1QkFBTyxHQUFkLGNBQTBCLE9BQU8sSUFBSSxDQUFDLENBQUMsQ0FBQztvQkFDekMsWUFBQztnQkFBRCxDQUFDLEFBWEQsSUFXQztnQkFYWSxlQUFLLFFBV2pCLENBQUE7Z0JBRUQ7b0JBQTBCLHdCQUFZO29CQUF0Qzs7b0JBUUEsQ0FBQztvQkFOQSxhQUFhO29CQUNOLDhCQUFlLEdBQXRCO3dCQUNDLE9BQU8sSUFBSSxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7b0JBQ3hCLENBQUM7b0JBR0YsV0FBQztnQkFBRCxDQUFDLEFBUkQsQ0FBMEIsWUFBWSxHQVFyQztnQkFSWSxjQUFJLE9BUWhCLENBQUE7WUFDRixDQUFDLEVBeEI2QixTQUFTLEdBQVQsbUJBQVMsS0FBVCxtQkFBUyxRQXdCdEM7UUFBRCxDQUFDLEVBeEJtQixTQUFTLEdBQVQsZUFBUyxLQUFULGVBQVMsUUF3QjVCO0lBQUQsQ0FBQyxFQXhCYSxLQUFLLEdBQUwsWUFBSyxLQUFMLFlBQUssUUF3QmxCO0FBQUQsQ0FBQyxFQXhCTSxNQUFNLEtBQU4sTUFBTSxRQXdCWiJ9,Ly8gU2NlbmFyaW8gMTogVGVzdCByZXF1cnNpdmUgZnVuY3Rpb24gY2FsbCB3aXRoICJ0aGlzIiBwYXJhbWV0ZXIKLy8gU2NlbmFyaW8gMjogVGVzdCByZWN1cnNpdmUgZnVuY3Rpb24gY2FsbCB3aXRoIGNhc3QgYW5kICJ0aGlzIiBwYXJhbWV0ZXIKCgoKZGVjbGFyZSBtb2R1bGUgU2FtcGxlLlRoaW5nIHsKCglleHBvcnQgaW50ZXJmYWNlIElXaWRnZXQgewoJCWdldERvbU5vZGUoKTogYW55OwoJCWRlc3Ryb3koKTsKCQlnYXIocnVubmVyOih3aWRnZXQ6U2FtcGxlLlRoaW5nLklXaWRnZXQpPT5hbnkpOmFueTsKCX0KCglleHBvcnQgaW50ZXJmYWNlIElDb2RlVGhpbmcgewogIAogIAkJZ2V0RG9tTm9kZSgpOiBFbGVtZW50OwoJCQoJCWFkZFdpZGdldCh3aWRnZXRJZDpzdHJpbmcsIHdpZGdldDpJV2lkZ2V0KTsKCgkJCgkJZm9jdXMoKTsgCgkJCgkJLy9hZGRXaWRnZXQod2lkZ2V0OiBTYW1wbGUuVGhpbmcuV2lkZ2V0cy5JV2lkZ2V0KTsKCX0KCglleHBvcnQgaW50ZXJmYWNlIElBY3Rpb24gewoJCXJ1bihUaGluZzpJQ29kZVRoaW5nKTpib29sZWFuOwoJCWdldElkKCk6c3RyaW5nOwoJfQkKfQoKbW9kdWxlIFNhbXBsZS5BY3Rpb25zLlRoaW5nLkZpbmQgewoJZXhwb3J0IGNsYXNzIFN0YXJ0RmluZEFjdGlvbiBpbXBsZW1lbnRzIFNhbXBsZS5UaGluZy5JQWN0aW9uIHsKCQkKCQlwdWJsaWMgZ2V0SWQoKSB7IHJldHVybiAieW8iOyB9CgkJCgkJcHVibGljIHJ1bihUaGluZzpTYW1wbGUuVGhpbmcuSUNvZGVUaGluZyk6Ym9vbGVhbiB7CgoJCQlyZXR1cm4gdHJ1ZTsKCQl9Cgl9Cn0KCm1vZHVsZSBTYW1wbGUuVGhpbmcuV2lkZ2V0cyB7CglleHBvcnQgY2xhc3MgRmluZFdpZGdldCBpbXBsZW1lbnRzIFNhbXBsZS5UaGluZy5JV2lkZ2V0IHsKCgkJcHVibGljIGdhcihydW5uZXI6KHdpZGdldDpTYW1wbGUuVGhpbmcuSVdpZGdldCk9PmFueSkgeyBpZiAodHJ1ZSkge3JldHVybiBydW5uZXIodGhpcyk7fX0KCQkJCgkJcHJpdmF0ZSBkb21Ob2RlOmFueSA9IG51bGw7CgkJY29uc3RydWN0b3IocHJpdmF0ZSBjb2RlVGhpbmc6IFNhbXBsZS5UaGluZy5JQ29kZVRoaW5nKSB7CgkJICAgIC8vIHNjZW5hcmlvIDEKCQkgICAgY29kZVRoaW5nLmFkZFdpZGdldCgiYWRkV2lkZ2V0IiwgdGhpcyk7CgkJfQoJCQoJCXB1YmxpYyBnZXREb21Ob2RlKCkgewoJCQlyZXR1cm4gZG9tTm9kZTsKCQl9CgkJCgkJcHVibGljIGRlc3Ryb3koKSB7CgoJCX0KCgl9Cn0KCmludGVyZmFjZSBJTW9kZSB7IGdldEluaXRpYWxTdGF0ZSgpOiBJU3RhdGU7fSAKY2xhc3MgQWJzdHJhY3RNb2RlIGltcGxlbWVudHMgSU1vZGUgeyBwdWJsaWMgZ2V0SW5pdGlhbFN0YXRlKCk6IElTdGF0ZSB7IHJldHVybiBudWxsO30gfQoKaW50ZXJmYWNlIElTdGF0ZSB7fQoKaW50ZXJmYWNlIFdpbmRvdyB7CiAgICBvcGVuZXI6IFdpbmRvdzsKfQpkZWNsYXJlIHZhciBzZWxmOiBXaW5kb3c7Cgptb2R1bGUgU2FtcGxlLlRoaW5nLkxhbmd1YWdlcy5QbGFpblRleHQgewoJCglleHBvcnQgY2xhc3MgU3RhdGUgaW1wbGVtZW50cyBJU3RhdGUgewkJCiAgICAgICAgY29uc3RydWN0b3IocHJpdmF0ZSBtb2RlOiBJTW9kZSkgeyB9CgkJcHVibGljIGNsb25lKCk6SVN0YXRlIHsKCQkJcmV0dXJuIHRoaXM7CgkJfQoKCQlwdWJsaWMgZXF1YWxzKG90aGVyOklTdGF0ZSk6Ym9vbGVhbiB7CgkJCXJldHVybiB0aGlzID09PSBvdGhlcjsKCQl9CgkJCgkJcHVibGljIGdldE1vZGUoKTogSU1vZGUgeyByZXR1cm4gbW9kZTsgfQoJfQoJCglleHBvcnQgY2xhc3MgTW9kZSBleHRlbmRzIEFic3RyYWN0TW9kZSB7CgoJCS8vIHNjZW5hcmlvIDIKCQlwdWJsaWMgZ2V0SW5pdGlhbFN0YXRlKCk6IElTdGF0ZSB7CgkJCXJldHVybiBuZXcgU3RhdGUoc2VsZik7CgkJfQoKCgl9Cn0KCg== +{"version":3,"file":"recursiveClassReferenceTest.js","sourceRoot":"","sources":["recursiveClassReferenceTest.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,0EAA0E;;;;;;;;;;;;;;;;AA8B1E,IAAU,MAAM,CAUf;AAVD,WAAU,MAAM;IAAC,IAAA,OAAO,CAUvB;IAVgB,WAAA,OAAO;QAAC,IAAA,KAAK,CAU7B;QAVwB,WAAA,OAAK;YAAC,IAAA,IAAI,CAUlC;YAV8B,WAAA,IAAI;gBAClC;oBAAA;oBAQA,CAAC;oBANO,+BAAK,GAAZ,cAAiB,OAAO,IAAI,CAAC,CAAC,CAAC;oBAExB,6BAAG,GAAV,UAAW,KAA6B;wBAEvC,OAAO,IAAI,CAAC;oBACb,CAAC;oBACF,sBAAC;gBAAD,CAAC,AARD,IAQC;gBARY,oBAAe,kBAQ3B,CAAA;YACF,CAAC,EAV8B,IAAI,GAAJ,YAAI,KAAJ,YAAI,QAUlC;QAAD,CAAC,EAVwB,KAAK,GAAL,aAAK,KAAL,aAAK,QAU7B;IAAD,CAAC,EAVgB,OAAO,GAAP,cAAO,KAAP,cAAO,QAUvB;AAAD,CAAC,EAVS,MAAM,KAAN,MAAM,QAUf;AAED,WAAU,MAAM;IAAC,IAAA,KAAK,CAoBrB;IApBgB,WAAA,KAAK;QAAC,IAAA,OAAO,CAoB7B;QApBsB,WAAA,OAAO;YAC7B;gBAKC,oBAAoB,SAAkC;oBAAlC,cAAS,GAAT,SAAS,CAAyB;oBAD9C,YAAO,GAAO,IAAI,CAAC;oBAEvB,aAAa;oBACb,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;gBAC3C,CAAC;gBANM,wBAAG,GAAV,UAAW,MAAyC,IAAI,IAAI,IAAI,EAAE,CAAC;oBAAA,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;gBAAA,CAAC,CAAA,CAAC;gBAQlF,+BAAU,GAAjB;oBACC,OAAO,OAAO,CAAC;gBAChB,CAAC;gBAEM,4BAAO,GAAd;gBAEA,CAAC;gBAEF,iBAAC;YAAD,CAAC,AAlBD,IAkBC;YAlBY,kBAAU,aAkBtB,CAAA;QACF,CAAC,EApBsB,OAAO,GAAP,aAAO,KAAP,aAAO,QAoB7B;IAAD,CAAC,EApBgB,KAAK,GAAL,YAAK,KAAL,YAAK,QAoBrB;AAAD,CAAC,EApBS,MAAM,KAAN,MAAM,QAoBf;AAGD;IAAA;IAAuF,CAAC;IAA3C,sCAAe,GAAtB,cAAmC,OAAO,IAAI,CAAC,CAAA,CAAC;IAAC,mBAAC;AAAD,CAAC,AAAxF,IAAwF;AASxF,WAAU,MAAM;IAAC,IAAA,KAAK,CAwBrB;IAxBgB,WAAA,KAAK;QAAC,IAAA,SAAS,CAwB/B;QAxBsB,WAAA,SAAS;YAAC,IAAA,SAAS,CAwBzC;YAxBgC,WAAA,SAAS;gBAEzC;oBACO,eAAoB,IAAW;wBAAX,SAAI,GAAJ,IAAI,CAAO;oBAAI,CAAC;oBACnC,qBAAK,GAAZ;wBACC,OAAO,IAAI,CAAC;oBACb,CAAC;oBAEM,sBAAM,GAAb,UAAc,KAAY;wBACzB,OAAO,IAAI,KAAK,KAAK,CAAC;oBACvB,CAAC;oBAEM,uBAAO,GAAd,cAA0B,OAAO,IAAI,CAAC,CAAC,CAAC;oBACzC,YAAC;gBAAD,CAAC,AAXD,IAWC;gBAXY,eAAK,QAWjB,CAAA;gBAED;oBAA0B,wBAAY;oBAAtC;;oBAQA,CAAC;oBANA,aAAa;oBACN,8BAAe,GAAtB;wBACC,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;oBACxB,CAAC;oBAGF,WAAC;gBAAD,CAAC,AARD,CAA0B,YAAY,GAQrC;gBARY,cAAI,OAQhB,CAAA;YACF,CAAC,EAxBgC,SAAS,GAAT,mBAAS,KAAT,mBAAS,QAwBzC;QAAD,CAAC,EAxBsB,SAAS,GAAT,eAAS,KAAT,eAAS,QAwB/B;IAAD,CAAC,EAxBgB,KAAK,GAAL,YAAK,KAAL,YAAK,QAwBrB;AAAD,CAAC,EAxBS,MAAM,KAAN,MAAM,QAwBf"} +//// https://sokra.github.io/source-map-visualization#base64,Ly8gU2NlbmFyaW8gMTogVGVzdCByZXF1cnNpdmUgZnVuY3Rpb24gY2FsbCB3aXRoICJ0aGlzIiBwYXJhbWV0ZXINCi8vIFNjZW5hcmlvIDI6IFRlc3QgcmVjdXJzaXZlIGZ1bmN0aW9uIGNhbGwgd2l0aCBjYXN0IGFuZCAidGhpcyIgcGFyYW1ldGVyDQp2YXIgX19leHRlbmRzID0gKHRoaXMgJiYgdGhpcy5fX2V4dGVuZHMpIHx8IChmdW5jdGlvbiAoKSB7DQogICAgdmFyIGV4dGVuZFN0YXRpY3MgPSBmdW5jdGlvbiAoZCwgYikgew0KICAgICAgICBleHRlbmRTdGF0aWNzID0gT2JqZWN0LnNldFByb3RvdHlwZU9mIHx8DQogICAgICAgICAgICAoeyBfX3Byb3RvX186IFtdIH0gaW5zdGFuY2VvZiBBcnJheSAmJiBmdW5jdGlvbiAoZCwgYikgeyBkLl9fcHJvdG9fXyA9IGI7IH0pIHx8DQogICAgICAgICAgICBmdW5jdGlvbiAoZCwgYikgeyBmb3IgKHZhciBwIGluIGIpIGlmIChPYmplY3QucHJvdG90eXBlLmhhc093blByb3BlcnR5LmNhbGwoYiwgcCkpIGRbcF0gPSBiW3BdOyB9Ow0KICAgICAgICByZXR1cm4gZXh0ZW5kU3RhdGljcyhkLCBiKTsNCiAgICB9Ow0KICAgIHJldHVybiBmdW5jdGlvbiAoZCwgYikgew0KICAgICAgICBpZiAodHlwZW9mIGIgIT09ICJmdW5jdGlvbiIgJiYgYiAhPT0gbnVsbCkNCiAgICAgICAgICAgIHRocm93IG5ldyBUeXBlRXJyb3IoIkNsYXNzIGV4dGVuZHMgdmFsdWUgIiArIFN0cmluZyhiKSArICIgaXMgbm90IGEgY29uc3RydWN0b3Igb3IgbnVsbCIpOw0KICAgICAgICBleHRlbmRTdGF0aWNzKGQsIGIpOw0KICAgICAgICBmdW5jdGlvbiBfXygpIHsgdGhpcy5jb25zdHJ1Y3RvciA9IGQ7IH0NCiAgICAgICAgZC5wcm90b3R5cGUgPSBiID09PSBudWxsID8gT2JqZWN0LmNyZWF0ZShiKSA6IChfXy5wcm90b3R5cGUgPSBiLnByb3RvdHlwZSwgbmV3IF9fKCkpOw0KICAgIH07DQp9KSgpOw0KdmFyIFNhbXBsZTsNCihmdW5jdGlvbiAoU2FtcGxlKSB7DQogICAgdmFyIEFjdGlvbnM7DQogICAgKGZ1bmN0aW9uIChBY3Rpb25zKSB7DQogICAgICAgIHZhciBUaGluZzsNCiAgICAgICAgKGZ1bmN0aW9uIChUaGluZ18xKSB7DQogICAgICAgICAgICB2YXIgRmluZDsNCiAgICAgICAgICAgIChmdW5jdGlvbiAoRmluZCkgew0KICAgICAgICAgICAgICAgIHZhciBTdGFydEZpbmRBY3Rpb24gPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgICAgICAgICAgICAgICAgIGZ1bmN0aW9uIFN0YXJ0RmluZEFjdGlvbigpIHsNCiAgICAgICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgICAgICBTdGFydEZpbmRBY3Rpb24ucHJvdG90eXBlLmdldElkID0gZnVuY3Rpb24gKCkgeyByZXR1cm4gInlvIjsgfTsNCiAgICAgICAgICAgICAgICAgICAgU3RhcnRGaW5kQWN0aW9uLnByb3RvdHlwZS5ydW4gPSBmdW5jdGlvbiAoVGhpbmcpIHsNCiAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOw0KICAgICAgICAgICAgICAgICAgICB9Ow0KICAgICAgICAgICAgICAgICAgICByZXR1cm4gU3RhcnRGaW5kQWN0aW9uOw0KICAgICAgICAgICAgICAgIH0oKSk7DQogICAgICAgICAgICAgICAgRmluZC5TdGFydEZpbmRBY3Rpb24gPSBTdGFydEZpbmRBY3Rpb247DQogICAgICAgICAgICB9KShGaW5kID0gVGhpbmdfMS5GaW5kIHx8IChUaGluZ18xLkZpbmQgPSB7fSkpOw0KICAgICAgICB9KShUaGluZyA9IEFjdGlvbnMuVGhpbmcgfHwgKEFjdGlvbnMuVGhpbmcgPSB7fSkpOw0KICAgIH0pKEFjdGlvbnMgPSBTYW1wbGUuQWN0aW9ucyB8fCAoU2FtcGxlLkFjdGlvbnMgPSB7fSkpOw0KfSkoU2FtcGxlIHx8IChTYW1wbGUgPSB7fSkpOw0KKGZ1bmN0aW9uIChTYW1wbGUpIHsNCiAgICB2YXIgVGhpbmc7DQogICAgKGZ1bmN0aW9uIChUaGluZykgew0KICAgICAgICB2YXIgV2lkZ2V0czsNCiAgICAgICAgKGZ1bmN0aW9uIChXaWRnZXRzKSB7DQogICAgICAgICAgICB2YXIgRmluZFdpZGdldCA9IC8qKiBAY2xhc3MgKi8gKGZ1bmN0aW9uICgpIHsNCiAgICAgICAgICAgICAgICBmdW5jdGlvbiBGaW5kV2lkZ2V0KGNvZGVUaGluZykgew0KICAgICAgICAgICAgICAgICAgICB0aGlzLmNvZGVUaGluZyA9IGNvZGVUaGluZzsNCiAgICAgICAgICAgICAgICAgICAgdGhpcy5kb21Ob2RlID0gbnVsbDsNCiAgICAgICAgICAgICAgICAgICAgLy8gc2NlbmFyaW8gMQ0KICAgICAgICAgICAgICAgICAgICBjb2RlVGhpbmcuYWRkV2lkZ2V0KCJhZGRXaWRnZXQiLCB0aGlzKTsNCiAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICAgICAgRmluZFdpZGdldC5wcm90b3R5cGUuZ2FyID0gZnVuY3Rpb24gKHJ1bm5lcikgeyBpZiAodHJ1ZSkgew0KICAgICAgICAgICAgICAgICAgICByZXR1cm4gcnVubmVyKHRoaXMpOw0KICAgICAgICAgICAgICAgIH0gfTsNCiAgICAgICAgICAgICAgICBGaW5kV2lkZ2V0LnByb3RvdHlwZS5nZXREb21Ob2RlID0gZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgICAgICAgICByZXR1cm4gZG9tTm9kZTsNCiAgICAgICAgICAgICAgICB9Ow0KICAgICAgICAgICAgICAgIEZpbmRXaWRnZXQucHJvdG90eXBlLmRlc3Ryb3kgPSBmdW5jdGlvbiAoKSB7DQogICAgICAgICAgICAgICAgfTsNCiAgICAgICAgICAgICAgICByZXR1cm4gRmluZFdpZGdldDsNCiAgICAgICAgICAgIH0oKSk7DQogICAgICAgICAgICBXaWRnZXRzLkZpbmRXaWRnZXQgPSBGaW5kV2lkZ2V0Ow0KICAgICAgICB9KShXaWRnZXRzID0gVGhpbmcuV2lkZ2V0cyB8fCAoVGhpbmcuV2lkZ2V0cyA9IHt9KSk7DQogICAgfSkoVGhpbmcgPSBTYW1wbGUuVGhpbmcgfHwgKFNhbXBsZS5UaGluZyA9IHt9KSk7DQp9KShTYW1wbGUgfHwgKFNhbXBsZSA9IHt9KSk7DQp2YXIgQWJzdHJhY3RNb2RlID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgIGZ1bmN0aW9uIEFic3RyYWN0TW9kZSgpIHsNCiAgICB9DQogICAgQWJzdHJhY3RNb2RlLnByb3RvdHlwZS5nZXRJbml0aWFsU3RhdGUgPSBmdW5jdGlvbiAoKSB7IHJldHVybiBudWxsOyB9Ow0KICAgIHJldHVybiBBYnN0cmFjdE1vZGU7DQp9KCkpOw0KKGZ1bmN0aW9uIChTYW1wbGUpIHsNCiAgICB2YXIgVGhpbmc7DQogICAgKGZ1bmN0aW9uIChUaGluZykgew0KICAgICAgICB2YXIgTGFuZ3VhZ2VzOw0KICAgICAgICAoZnVuY3Rpb24gKExhbmd1YWdlcykgew0KICAgICAgICAgICAgdmFyIFBsYWluVGV4dDsNCiAgICAgICAgICAgIChmdW5jdGlvbiAoUGxhaW5UZXh0KSB7DQogICAgICAgICAgICAgICAgdmFyIFN0YXRlID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgICAgICAgICBmdW5jdGlvbiBTdGF0ZShtb2RlKSB7DQogICAgICAgICAgICAgICAgICAgICAgICB0aGlzLm1vZGUgPSBtb2RlOw0KICAgICAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICAgICAgICAgIFN0YXRlLnByb3RvdHlwZS5jbG9uZSA9IGZ1bmN0aW9uICgpIHsNCiAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiB0aGlzOw0KICAgICAgICAgICAgICAgICAgICB9Ow0KICAgICAgICAgICAgICAgICAgICBTdGF0ZS5wcm90b3R5cGUuZXF1YWxzID0gZnVuY3Rpb24gKG90aGVyKSB7DQogICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gdGhpcyA9PT0gb3RoZXI7DQogICAgICAgICAgICAgICAgICAgIH07DQogICAgICAgICAgICAgICAgICAgIFN0YXRlLnByb3RvdHlwZS5nZXRNb2RlID0gZnVuY3Rpb24gKCkgeyByZXR1cm4gbW9kZTsgfTsNCiAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFN0YXRlOw0KICAgICAgICAgICAgICAgIH0oKSk7DQogICAgICAgICAgICAgICAgUGxhaW5UZXh0LlN0YXRlID0gU3RhdGU7DQogICAgICAgICAgICAgICAgdmFyIE1vZGUgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoX3N1cGVyKSB7DQogICAgICAgICAgICAgICAgICAgIF9fZXh0ZW5kcyhNb2RlLCBfc3VwZXIpOw0KICAgICAgICAgICAgICAgICAgICBmdW5jdGlvbiBNb2RlKCkgew0KICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIF9zdXBlciAhPT0gbnVsbCAmJiBfc3VwZXIuYXBwbHkodGhpcywgYXJndW1lbnRzKSB8fCB0aGlzOw0KICAgICAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICAgICAgICAgIC8vIHNjZW5hcmlvIDINCiAgICAgICAgICAgICAgICAgICAgTW9kZS5wcm90b3R5cGUuZ2V0SW5pdGlhbFN0YXRlID0gZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIG5ldyBTdGF0ZShzZWxmKTsNCiAgICAgICAgICAgICAgICAgICAgfTsNCiAgICAgICAgICAgICAgICAgICAgcmV0dXJuIE1vZGU7DQogICAgICAgICAgICAgICAgfShBYnN0cmFjdE1vZGUpKTsNCiAgICAgICAgICAgICAgICBQbGFpblRleHQuTW9kZSA9IE1vZGU7DQogICAgICAgICAgICB9KShQbGFpblRleHQgPSBMYW5ndWFnZXMuUGxhaW5UZXh0IHx8IChMYW5ndWFnZXMuUGxhaW5UZXh0ID0ge30pKTsNCiAgICAgICAgfSkoTGFuZ3VhZ2VzID0gVGhpbmcuTGFuZ3VhZ2VzIHx8IChUaGluZy5MYW5ndWFnZXMgPSB7fSkpOw0KICAgIH0pKFRoaW5nID0gU2FtcGxlLlRoaW5nIHx8IChTYW1wbGUuVGhpbmcgPSB7fSkpOw0KfSkoU2FtcGxlIHx8IChTYW1wbGUgPSB7fSkpOw0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9cmVjdXJzaXZlQ2xhc3NSZWZlcmVuY2VUZXN0LmpzLm1hcA==,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVjdXJzaXZlQ2xhc3NSZWZlcmVuY2VUZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsicmVjdXJzaXZlQ2xhc3NSZWZlcmVuY2VUZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGlFQUFpRTtBQUNqRSwwRUFBMEU7Ozs7Ozs7Ozs7Ozs7Ozs7QUE4QjFFLElBQVUsTUFBTSxDQVVmO0FBVkQsV0FBVSxNQUFNO0lBQUMsSUFBQSxPQUFPLENBVXZCO0lBVmdCLFdBQUEsT0FBTztRQUFDLElBQUEsS0FBSyxDQVU3QjtRQVZ3QixXQUFBLE9BQUs7WUFBQyxJQUFBLElBQUksQ0FVbEM7WUFWOEIsV0FBQSxJQUFJO2dCQUNsQztvQkFBQTtvQkFRQSxDQUFDO29CQU5PLCtCQUFLLEdBQVosY0FBaUIsT0FBTyxJQUFJLENBQUMsQ0FBQyxDQUFDO29CQUV4Qiw2QkFBRyxHQUFWLFVBQVcsS0FBNkI7d0JBRXZDLE9BQU8sSUFBSSxDQUFDO29CQUNiLENBQUM7b0JBQ0Ysc0JBQUM7Z0JBQUQsQ0FBQyxBQVJELElBUUM7Z0JBUlksb0JBQWUsa0JBUTNCLENBQUE7WUFDRixDQUFDLEVBVjhCLElBQUksR0FBSixZQUFJLEtBQUosWUFBSSxRQVVsQztRQUFELENBQUMsRUFWd0IsS0FBSyxHQUFMLGFBQUssS0FBTCxhQUFLLFFBVTdCO0lBQUQsQ0FBQyxFQVZnQixPQUFPLEdBQVAsY0FBTyxLQUFQLGNBQU8sUUFVdkI7QUFBRCxDQUFDLEVBVlMsTUFBTSxLQUFOLE1BQU0sUUFVZjtBQUVELFdBQVUsTUFBTTtJQUFDLElBQUEsS0FBSyxDQW9CckI7SUFwQmdCLFdBQUEsS0FBSztRQUFDLElBQUEsT0FBTyxDQW9CN0I7UUFwQnNCLFdBQUEsT0FBTztZQUM3QjtnQkFLQyxvQkFBb0IsU0FBa0M7b0JBQWxDLGNBQVMsR0FBVCxTQUFTLENBQXlCO29CQUQ5QyxZQUFPLEdBQU8sSUFBSSxDQUFDO29CQUV2QixhQUFhO29CQUNiLFNBQVMsQ0FBQyxTQUFTLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxDQUFDO2dCQUMzQyxDQUFDO2dCQU5NLHdCQUFHLEdBQVYsVUFBVyxNQUF5QyxJQUFJLElBQUksSUFBSSxFQUFFLENBQUM7b0JBQUEsT0FBTyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQUEsQ0FBQyxDQUFBLENBQUM7Z0JBUWxGLCtCQUFVLEdBQWpCO29CQUNDLE9BQU8sT0FBTyxDQUFDO2dCQUNoQixDQUFDO2dCQUVNLDRCQUFPLEdBQWQ7Z0JBRUEsQ0FBQztnQkFFRixpQkFBQztZQUFELENBQUMsQUFsQkQsSUFrQkM7WUFsQlksa0JBQVUsYUFrQnRCLENBQUE7UUFDRixDQUFDLEVBcEJzQixPQUFPLEdBQVAsYUFBTyxLQUFQLGFBQU8sUUFvQjdCO0lBQUQsQ0FBQyxFQXBCZ0IsS0FBSyxHQUFMLFlBQUssS0FBTCxZQUFLLFFBb0JyQjtBQUFELENBQUMsRUFwQlMsTUFBTSxLQUFOLE1BQU0sUUFvQmY7QUFHRDtJQUFBO0lBQXVGLENBQUM7SUFBM0Msc0NBQWUsR0FBdEIsY0FBbUMsT0FBTyxJQUFJLENBQUMsQ0FBQSxDQUFDO0lBQUMsbUJBQUM7QUFBRCxDQUFDLEFBQXhGLElBQXdGO0FBU3hGLFdBQVUsTUFBTTtJQUFDLElBQUEsS0FBSyxDQXdCckI7SUF4QmdCLFdBQUEsS0FBSztRQUFDLElBQUEsU0FBUyxDQXdCL0I7UUF4QnNCLFdBQUEsU0FBUztZQUFDLElBQUEsU0FBUyxDQXdCekM7WUF4QmdDLFdBQUEsU0FBUztnQkFFekM7b0JBQ08sZUFBb0IsSUFBVzt3QkFBWCxTQUFJLEdBQUosSUFBSSxDQUFPO29CQUFJLENBQUM7b0JBQ25DLHFCQUFLLEdBQVo7d0JBQ0MsT0FBTyxJQUFJLENBQUM7b0JBQ2IsQ0FBQztvQkFFTSxzQkFBTSxHQUFiLFVBQWMsS0FBWTt3QkFDekIsT0FBTyxJQUFJLEtBQUssS0FBSyxDQUFDO29CQUN2QixDQUFDO29CQUVNLHVCQUFPLEdBQWQsY0FBMEIsT0FBTyxJQUFJLENBQUMsQ0FBQyxDQUFDO29CQUN6QyxZQUFDO2dCQUFELENBQUMsQUFYRCxJQVdDO2dCQVhZLGVBQUssUUFXakIsQ0FBQTtnQkFFRDtvQkFBMEIsd0JBQVk7b0JBQXRDOztvQkFRQSxDQUFDO29CQU5BLGFBQWE7b0JBQ04sOEJBQWUsR0FBdEI7d0JBQ0MsT0FBTyxJQUFJLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztvQkFDeEIsQ0FBQztvQkFHRixXQUFDO2dCQUFELENBQUMsQUFSRCxDQUEwQixZQUFZLEdBUXJDO2dCQVJZLGNBQUksT0FRaEIsQ0FBQTtZQUNGLENBQUMsRUF4QmdDLFNBQVMsR0FBVCxtQkFBUyxLQUFULG1CQUFTLFFBd0J6QztRQUFELENBQUMsRUF4QnNCLFNBQVMsR0FBVCxlQUFTLEtBQVQsZUFBUyxRQXdCL0I7SUFBRCxDQUFDLEVBeEJnQixLQUFLLEdBQUwsWUFBSyxLQUFMLFlBQUssUUF3QnJCO0FBQUQsQ0FBQyxFQXhCUyxNQUFNLEtBQU4sTUFBTSxRQXdCZiJ9,Ly8gU2NlbmFyaW8gMTogVGVzdCByZXF1cnNpdmUgZnVuY3Rpb24gY2FsbCB3aXRoICJ0aGlzIiBwYXJhbWV0ZXIKLy8gU2NlbmFyaW8gMjogVGVzdCByZWN1cnNpdmUgZnVuY3Rpb24gY2FsbCB3aXRoIGNhc3QgYW5kICJ0aGlzIiBwYXJhbWV0ZXIKCgoKZGVjbGFyZSBtb2R1bGUgU2FtcGxlLlRoaW5nIHsKCglleHBvcnQgaW50ZXJmYWNlIElXaWRnZXQgewoJCWdldERvbU5vZGUoKTogYW55OwoJCWRlc3Ryb3koKTsKCQlnYXIocnVubmVyOih3aWRnZXQ6U2FtcGxlLlRoaW5nLklXaWRnZXQpPT5hbnkpOmFueTsKCX0KCglleHBvcnQgaW50ZXJmYWNlIElDb2RlVGhpbmcgewogIAogIAkJZ2V0RG9tTm9kZSgpOiBFbGVtZW50OwoJCQoJCWFkZFdpZGdldCh3aWRnZXRJZDpzdHJpbmcsIHdpZGdldDpJV2lkZ2V0KTsKCgkJCgkJZm9jdXMoKTsgCgkJCgkJLy9hZGRXaWRnZXQod2lkZ2V0OiBTYW1wbGUuVGhpbmcuV2lkZ2V0cy5JV2lkZ2V0KTsKCX0KCglleHBvcnQgaW50ZXJmYWNlIElBY3Rpb24gewoJCXJ1bihUaGluZzpJQ29kZVRoaW5nKTpib29sZWFuOwoJCWdldElkKCk6c3RyaW5nOwoJfQkKfQoKbmFtZXNwYWNlIFNhbXBsZS5BY3Rpb25zLlRoaW5nLkZpbmQgewoJZXhwb3J0IGNsYXNzIFN0YXJ0RmluZEFjdGlvbiBpbXBsZW1lbnRzIFNhbXBsZS5UaGluZy5JQWN0aW9uIHsKCQkKCQlwdWJsaWMgZ2V0SWQoKSB7IHJldHVybiAieW8iOyB9CgkJCgkJcHVibGljIHJ1bihUaGluZzpTYW1wbGUuVGhpbmcuSUNvZGVUaGluZyk6Ym9vbGVhbiB7CgoJCQlyZXR1cm4gdHJ1ZTsKCQl9Cgl9Cn0KCm5hbWVzcGFjZSBTYW1wbGUuVGhpbmcuV2lkZ2V0cyB7CglleHBvcnQgY2xhc3MgRmluZFdpZGdldCBpbXBsZW1lbnRzIFNhbXBsZS5UaGluZy5JV2lkZ2V0IHsKCgkJcHVibGljIGdhcihydW5uZXI6KHdpZGdldDpTYW1wbGUuVGhpbmcuSVdpZGdldCk9PmFueSkgeyBpZiAodHJ1ZSkge3JldHVybiBydW5uZXIodGhpcyk7fX0KCQkJCgkJcHJpdmF0ZSBkb21Ob2RlOmFueSA9IG51bGw7CgkJY29uc3RydWN0b3IocHJpdmF0ZSBjb2RlVGhpbmc6IFNhbXBsZS5UaGluZy5JQ29kZVRoaW5nKSB7CgkJICAgIC8vIHNjZW5hcmlvIDEKCQkgICAgY29kZVRoaW5nLmFkZFdpZGdldCgiYWRkV2lkZ2V0IiwgdGhpcyk7CgkJfQoJCQoJCXB1YmxpYyBnZXREb21Ob2RlKCkgewoJCQlyZXR1cm4gZG9tTm9kZTsKCQl9CgkJCgkJcHVibGljIGRlc3Ryb3koKSB7CgoJCX0KCgl9Cn0KCmludGVyZmFjZSBJTW9kZSB7IGdldEluaXRpYWxTdGF0ZSgpOiBJU3RhdGU7fSAKY2xhc3MgQWJzdHJhY3RNb2RlIGltcGxlbWVudHMgSU1vZGUgeyBwdWJsaWMgZ2V0SW5pdGlhbFN0YXRlKCk6IElTdGF0ZSB7IHJldHVybiBudWxsO30gfQoKaW50ZXJmYWNlIElTdGF0ZSB7fQoKaW50ZXJmYWNlIFdpbmRvdyB7CiAgICBvcGVuZXI6IFdpbmRvdzsKfQpkZWNsYXJlIHZhciBzZWxmOiBXaW5kb3c7CgpuYW1lc3BhY2UgU2FtcGxlLlRoaW5nLkxhbmd1YWdlcy5QbGFpblRleHQgewoJCglleHBvcnQgY2xhc3MgU3RhdGUgaW1wbGVtZW50cyBJU3RhdGUgewkJCiAgICAgICAgY29uc3RydWN0b3IocHJpdmF0ZSBtb2RlOiBJTW9kZSkgeyB9CgkJcHVibGljIGNsb25lKCk6SVN0YXRlIHsKCQkJcmV0dXJuIHRoaXM7CgkJfQoKCQlwdWJsaWMgZXF1YWxzKG90aGVyOklTdGF0ZSk6Ym9vbGVhbiB7CgkJCXJldHVybiB0aGlzID09PSBvdGhlcjsKCQl9CgkJCgkJcHVibGljIGdldE1vZGUoKTogSU1vZGUgeyByZXR1cm4gbW9kZTsgfQoJfQoJCglleHBvcnQgY2xhc3MgTW9kZSBleHRlbmRzIEFic3RyYWN0TW9kZSB7CgoJCS8vIHNjZW5hcmlvIDIKCQlwdWJsaWMgZ2V0SW5pdGlhbFN0YXRlKCk6IElTdGF0ZSB7CgkJCXJldHVybiBuZXcgU3RhdGUoc2VsZik7CgkJfQoKCgl9Cn0KCg== diff --git a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt index 02e3ed57537f5..aee6812e2deb9 100644 --- a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt +++ b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt @@ -78,7 +78,7 @@ sourceFile:recursiveClassReferenceTest.ts >} > > -2 >module +2 >namespace 3 > Sample 4 > .Actions.Thing.Find { > export class StartFindAction implements Sample.Thing.IAction { @@ -92,8 +92,8 @@ sourceFile:recursiveClassReferenceTest.ts > } > } 1 >Emitted(18, 1) Source(32, 1) + SourceIndex(0) -2 >Emitted(18, 5) Source(32, 8) + SourceIndex(0) -3 >Emitted(18, 11) Source(32, 14) + SourceIndex(0) +2 >Emitted(18, 5) Source(32, 11) + SourceIndex(0) +3 >Emitted(18, 11) Source(32, 17) + SourceIndex(0) 4 >Emitted(18, 12) Source(42, 2) + SourceIndex(0) --- >>>(function (Sample) { @@ -101,11 +101,11 @@ sourceFile:recursiveClassReferenceTest.ts 2 >^^^^^^^^^^^ 3 > ^^^^^^ 1-> -2 >module +2 >namespace 3 > Sample 1->Emitted(19, 1) Source(32, 1) + SourceIndex(0) -2 >Emitted(19, 12) Source(32, 8) + SourceIndex(0) -3 >Emitted(19, 18) Source(32, 14) + SourceIndex(0) +2 >Emitted(19, 12) Source(32, 11) + SourceIndex(0) +3 >Emitted(19, 18) Source(32, 17) + SourceIndex(0) --- >>> var Actions; 1 >^^^^ @@ -127,9 +127,9 @@ sourceFile:recursiveClassReferenceTest.ts > } > } > } -1 >Emitted(20, 5) Source(32, 15) + SourceIndex(0) -2 >Emitted(20, 9) Source(32, 15) + SourceIndex(0) -3 >Emitted(20, 16) Source(32, 22) + SourceIndex(0) +1 >Emitted(20, 5) Source(32, 18) + SourceIndex(0) +2 >Emitted(20, 9) Source(32, 18) + SourceIndex(0) +3 >Emitted(20, 16) Source(32, 25) + SourceIndex(0) 4 >Emitted(20, 17) Source(42, 2) + SourceIndex(0) --- >>> (function (Actions) { @@ -139,9 +139,9 @@ sourceFile:recursiveClassReferenceTest.ts 1-> 2 > 3 > Actions -1->Emitted(21, 5) Source(32, 15) + SourceIndex(0) -2 >Emitted(21, 16) Source(32, 15) + SourceIndex(0) -3 >Emitted(21, 23) Source(32, 22) + SourceIndex(0) +1->Emitted(21, 5) Source(32, 18) + SourceIndex(0) +2 >Emitted(21, 16) Source(32, 18) + SourceIndex(0) +3 >Emitted(21, 23) Source(32, 25) + SourceIndex(0) --- >>> var Thing; 1 >^^^^^^^^ @@ -163,9 +163,9 @@ sourceFile:recursiveClassReferenceTest.ts > } > } > } -1 >Emitted(22, 9) Source(32, 23) + SourceIndex(0) -2 >Emitted(22, 13) Source(32, 23) + SourceIndex(0) -3 >Emitted(22, 18) Source(32, 28) + SourceIndex(0) +1 >Emitted(22, 9) Source(32, 26) + SourceIndex(0) +2 >Emitted(22, 13) Source(32, 26) + SourceIndex(0) +3 >Emitted(22, 18) Source(32, 31) + SourceIndex(0) 4 >Emitted(22, 19) Source(42, 2) + SourceIndex(0) --- >>> (function (Thing_1) { @@ -175,9 +175,9 @@ sourceFile:recursiveClassReferenceTest.ts 1-> 2 > 3 > Thing -1->Emitted(23, 9) Source(32, 23) + SourceIndex(0) -2 >Emitted(23, 20) Source(32, 23) + SourceIndex(0) -3 >Emitted(23, 27) Source(32, 28) + SourceIndex(0) +1->Emitted(23, 9) Source(32, 26) + SourceIndex(0) +2 >Emitted(23, 20) Source(32, 26) + SourceIndex(0) +3 >Emitted(23, 27) Source(32, 31) + SourceIndex(0) --- >>> var Find; 1 >^^^^^^^^^^^^ @@ -199,9 +199,9 @@ sourceFile:recursiveClassReferenceTest.ts > } > } > } -1 >Emitted(24, 13) Source(32, 29) + SourceIndex(0) -2 >Emitted(24, 17) Source(32, 29) + SourceIndex(0) -3 >Emitted(24, 21) Source(32, 33) + SourceIndex(0) +1 >Emitted(24, 13) Source(32, 32) + SourceIndex(0) +2 >Emitted(24, 17) Source(32, 32) + SourceIndex(0) +3 >Emitted(24, 21) Source(32, 36) + SourceIndex(0) 4 >Emitted(24, 22) Source(42, 2) + SourceIndex(0) --- >>> (function (Find) { @@ -212,9 +212,9 @@ sourceFile:recursiveClassReferenceTest.ts 1-> 2 > 3 > Find -1->Emitted(25, 13) Source(32, 29) + SourceIndex(0) -2 >Emitted(25, 24) Source(32, 29) + SourceIndex(0) -3 >Emitted(25, 28) Source(32, 33) + SourceIndex(0) +1->Emitted(25, 13) Source(32, 32) + SourceIndex(0) +2 >Emitted(25, 24) Source(32, 32) + SourceIndex(0) +3 >Emitted(25, 28) Source(32, 36) + SourceIndex(0) --- >>> var StartFindAction = /** @class */ (function () { 1->^^^^^^^^^^^^^^^^ @@ -407,12 +407,12 @@ sourceFile:recursiveClassReferenceTest.ts > } 1->Emitted(36, 13) Source(42, 1) + SourceIndex(0) 2 >Emitted(36, 14) Source(42, 2) + SourceIndex(0) -3 >Emitted(36, 16) Source(32, 29) + SourceIndex(0) -4 >Emitted(36, 20) Source(32, 33) + SourceIndex(0) -5 >Emitted(36, 23) Source(32, 29) + SourceIndex(0) -6 >Emitted(36, 35) Source(32, 33) + SourceIndex(0) -7 >Emitted(36, 40) Source(32, 29) + SourceIndex(0) -8 >Emitted(36, 52) Source(32, 33) + SourceIndex(0) +3 >Emitted(36, 16) Source(32, 32) + SourceIndex(0) +4 >Emitted(36, 20) Source(32, 36) + SourceIndex(0) +5 >Emitted(36, 23) Source(32, 32) + SourceIndex(0) +6 >Emitted(36, 35) Source(32, 36) + SourceIndex(0) +7 >Emitted(36, 40) Source(32, 32) + SourceIndex(0) +8 >Emitted(36, 52) Source(32, 36) + SourceIndex(0) 9 >Emitted(36, 60) Source(42, 2) + SourceIndex(0) --- >>> })(Thing = Actions.Thing || (Actions.Thing = {})); @@ -447,12 +447,12 @@ sourceFile:recursiveClassReferenceTest.ts > } 1 >Emitted(37, 9) Source(42, 1) + SourceIndex(0) 2 >Emitted(37, 10) Source(42, 2) + SourceIndex(0) -3 >Emitted(37, 12) Source(32, 23) + SourceIndex(0) -4 >Emitted(37, 17) Source(32, 28) + SourceIndex(0) -5 >Emitted(37, 20) Source(32, 23) + SourceIndex(0) -6 >Emitted(37, 33) Source(32, 28) + SourceIndex(0) -7 >Emitted(37, 38) Source(32, 23) + SourceIndex(0) -8 >Emitted(37, 51) Source(32, 28) + SourceIndex(0) +3 >Emitted(37, 12) Source(32, 26) + SourceIndex(0) +4 >Emitted(37, 17) Source(32, 31) + SourceIndex(0) +5 >Emitted(37, 20) Source(32, 26) + SourceIndex(0) +6 >Emitted(37, 33) Source(32, 31) + SourceIndex(0) +7 >Emitted(37, 38) Source(32, 26) + SourceIndex(0) +8 >Emitted(37, 51) Source(32, 31) + SourceIndex(0) 9 >Emitted(37, 59) Source(42, 2) + SourceIndex(0) --- >>> })(Actions = Sample.Actions || (Sample.Actions = {})); @@ -486,12 +486,12 @@ sourceFile:recursiveClassReferenceTest.ts > } 1->Emitted(38, 5) Source(42, 1) + SourceIndex(0) 2 >Emitted(38, 6) Source(42, 2) + SourceIndex(0) -3 >Emitted(38, 8) Source(32, 15) + SourceIndex(0) -4 >Emitted(38, 15) Source(32, 22) + SourceIndex(0) -5 >Emitted(38, 18) Source(32, 15) + SourceIndex(0) -6 >Emitted(38, 32) Source(32, 22) + SourceIndex(0) -7 >Emitted(38, 37) Source(32, 15) + SourceIndex(0) -8 >Emitted(38, 51) Source(32, 22) + SourceIndex(0) +3 >Emitted(38, 8) Source(32, 18) + SourceIndex(0) +4 >Emitted(38, 15) Source(32, 25) + SourceIndex(0) +5 >Emitted(38, 18) Source(32, 18) + SourceIndex(0) +6 >Emitted(38, 32) Source(32, 25) + SourceIndex(0) +7 >Emitted(38, 37) Source(32, 18) + SourceIndex(0) +8 >Emitted(38, 51) Source(32, 25) + SourceIndex(0) 9 >Emitted(38, 59) Source(42, 2) + SourceIndex(0) --- >>>})(Sample || (Sample = {})); @@ -521,10 +521,10 @@ sourceFile:recursiveClassReferenceTest.ts > } 1 >Emitted(39, 1) Source(42, 1) + SourceIndex(0) 2 >Emitted(39, 2) Source(42, 2) + SourceIndex(0) -3 >Emitted(39, 4) Source(32, 8) + SourceIndex(0) -4 >Emitted(39, 10) Source(32, 14) + SourceIndex(0) -5 >Emitted(39, 15) Source(32, 8) + SourceIndex(0) -6 >Emitted(39, 21) Source(32, 14) + SourceIndex(0) +3 >Emitted(39, 4) Source(32, 11) + SourceIndex(0) +4 >Emitted(39, 10) Source(32, 17) + SourceIndex(0) +5 >Emitted(39, 15) Source(32, 11) + SourceIndex(0) +6 >Emitted(39, 21) Source(32, 17) + SourceIndex(0) 7 >Emitted(39, 29) Source(42, 2) + SourceIndex(0) --- >>>(function (Sample) { @@ -534,11 +534,11 @@ sourceFile:recursiveClassReferenceTest.ts 1 > > > -2 >module +2 >namespace 3 > Sample 1 >Emitted(40, 1) Source(44, 1) + SourceIndex(0) -2 >Emitted(40, 12) Source(44, 8) + SourceIndex(0) -3 >Emitted(40, 18) Source(44, 14) + SourceIndex(0) +2 >Emitted(40, 12) Source(44, 11) + SourceIndex(0) +3 >Emitted(40, 18) Source(44, 17) + SourceIndex(0) --- >>> var Thing; 1 >^^^^ @@ -570,9 +570,9 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1 >Emitted(41, 5) Source(44, 15) + SourceIndex(0) -2 >Emitted(41, 9) Source(44, 15) + SourceIndex(0) -3 >Emitted(41, 14) Source(44, 20) + SourceIndex(0) +1 >Emitted(41, 5) Source(44, 18) + SourceIndex(0) +2 >Emitted(41, 9) Source(44, 18) + SourceIndex(0) +3 >Emitted(41, 14) Source(44, 23) + SourceIndex(0) 4 >Emitted(41, 15) Source(64, 2) + SourceIndex(0) --- >>> (function (Thing) { @@ -583,9 +583,9 @@ sourceFile:recursiveClassReferenceTest.ts 1-> 2 > 3 > Thing -1->Emitted(42, 5) Source(44, 15) + SourceIndex(0) -2 >Emitted(42, 16) Source(44, 15) + SourceIndex(0) -3 >Emitted(42, 21) Source(44, 20) + SourceIndex(0) +1->Emitted(42, 5) Source(44, 18) + SourceIndex(0) +2 >Emitted(42, 16) Source(44, 18) + SourceIndex(0) +3 >Emitted(42, 21) Source(44, 23) + SourceIndex(0) --- >>> var Widgets; 1->^^^^^^^^ @@ -617,9 +617,9 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1->Emitted(43, 9) Source(44, 21) + SourceIndex(0) -2 >Emitted(43, 13) Source(44, 21) + SourceIndex(0) -3 >Emitted(43, 20) Source(44, 28) + SourceIndex(0) +1->Emitted(43, 9) Source(44, 24) + SourceIndex(0) +2 >Emitted(43, 13) Source(44, 24) + SourceIndex(0) +3 >Emitted(43, 20) Source(44, 31) + SourceIndex(0) 4 >Emitted(43, 21) Source(64, 2) + SourceIndex(0) --- >>> (function (Widgets) { @@ -630,9 +630,9 @@ sourceFile:recursiveClassReferenceTest.ts 1-> 2 > 3 > Widgets -1->Emitted(44, 9) Source(44, 21) + SourceIndex(0) -2 >Emitted(44, 20) Source(44, 21) + SourceIndex(0) -3 >Emitted(44, 27) Source(44, 28) + SourceIndex(0) +1->Emitted(44, 9) Source(44, 24) + SourceIndex(0) +2 >Emitted(44, 20) Source(44, 24) + SourceIndex(0) +3 >Emitted(44, 27) Source(44, 31) + SourceIndex(0) --- >>> var FindWidget = /** @class */ (function () { 1->^^^^^^^^^^^^ @@ -1002,12 +1002,12 @@ sourceFile:recursiveClassReferenceTest.ts > } 1->Emitted(63, 9) Source(64, 1) + SourceIndex(0) 2 >Emitted(63, 10) Source(64, 2) + SourceIndex(0) -3 >Emitted(63, 12) Source(44, 21) + SourceIndex(0) -4 >Emitted(63, 19) Source(44, 28) + SourceIndex(0) -5 >Emitted(63, 22) Source(44, 21) + SourceIndex(0) -6 >Emitted(63, 35) Source(44, 28) + SourceIndex(0) -7 >Emitted(63, 40) Source(44, 21) + SourceIndex(0) -8 >Emitted(63, 53) Source(44, 28) + SourceIndex(0) +3 >Emitted(63, 12) Source(44, 24) + SourceIndex(0) +4 >Emitted(63, 19) Source(44, 31) + SourceIndex(0) +5 >Emitted(63, 22) Source(44, 24) + SourceIndex(0) +6 >Emitted(63, 35) Source(44, 31) + SourceIndex(0) +7 >Emitted(63, 40) Source(44, 24) + SourceIndex(0) +8 >Emitted(63, 53) Source(44, 31) + SourceIndex(0) 9 >Emitted(63, 61) Source(64, 2) + SourceIndex(0) --- >>> })(Thing = Sample.Thing || (Sample.Thing = {})); @@ -1051,12 +1051,12 @@ sourceFile:recursiveClassReferenceTest.ts > } 1 >Emitted(64, 5) Source(64, 1) + SourceIndex(0) 2 >Emitted(64, 6) Source(64, 2) + SourceIndex(0) -3 >Emitted(64, 8) Source(44, 15) + SourceIndex(0) -4 >Emitted(64, 13) Source(44, 20) + SourceIndex(0) -5 >Emitted(64, 16) Source(44, 15) + SourceIndex(0) -6 >Emitted(64, 28) Source(44, 20) + SourceIndex(0) -7 >Emitted(64, 33) Source(44, 15) + SourceIndex(0) -8 >Emitted(64, 45) Source(44, 20) + SourceIndex(0) +3 >Emitted(64, 8) Source(44, 18) + SourceIndex(0) +4 >Emitted(64, 13) Source(44, 23) + SourceIndex(0) +5 >Emitted(64, 16) Source(44, 18) + SourceIndex(0) +6 >Emitted(64, 28) Source(44, 23) + SourceIndex(0) +7 >Emitted(64, 33) Source(44, 18) + SourceIndex(0) +8 >Emitted(64, 45) Source(44, 23) + SourceIndex(0) 9 >Emitted(64, 53) Source(64, 2) + SourceIndex(0) --- >>>})(Sample || (Sample = {})); @@ -1097,10 +1097,10 @@ sourceFile:recursiveClassReferenceTest.ts > } 1 >Emitted(65, 1) Source(64, 1) + SourceIndex(0) 2 >Emitted(65, 2) Source(64, 2) + SourceIndex(0) -3 >Emitted(65, 4) Source(44, 8) + SourceIndex(0) -4 >Emitted(65, 10) Source(44, 14) + SourceIndex(0) -5 >Emitted(65, 15) Source(44, 8) + SourceIndex(0) -6 >Emitted(65, 21) Source(44, 14) + SourceIndex(0) +3 >Emitted(65, 4) Source(44, 11) + SourceIndex(0) +4 >Emitted(65, 10) Source(44, 17) + SourceIndex(0) +5 >Emitted(65, 15) Source(44, 11) + SourceIndex(0) +6 >Emitted(65, 21) Source(44, 17) + SourceIndex(0) 7 >Emitted(65, 29) Source(64, 2) + SourceIndex(0) --- >>>var AbstractMode = /** @class */ (function () { @@ -1193,11 +1193,11 @@ sourceFile:recursiveClassReferenceTest.ts >declare var self: Window; > > -2 >module +2 >namespace 3 > Sample 1->Emitted(72, 1) Source(76, 1) + SourceIndex(0) -2 >Emitted(72, 12) Source(76, 8) + SourceIndex(0) -3 >Emitted(72, 18) Source(76, 14) + SourceIndex(0) +2 >Emitted(72, 12) Source(76, 11) + SourceIndex(0) +3 >Emitted(72, 18) Source(76, 17) + SourceIndex(0) --- >>> var Thing; 1 >^^^^ @@ -1233,9 +1233,9 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1 >Emitted(73, 5) Source(76, 15) + SourceIndex(0) -2 >Emitted(73, 9) Source(76, 15) + SourceIndex(0) -3 >Emitted(73, 14) Source(76, 20) + SourceIndex(0) +1 >Emitted(73, 5) Source(76, 18) + SourceIndex(0) +2 >Emitted(73, 9) Source(76, 18) + SourceIndex(0) +3 >Emitted(73, 14) Source(76, 23) + SourceIndex(0) 4 >Emitted(73, 15) Source(100, 2) + SourceIndex(0) --- >>> (function (Thing) { @@ -1246,9 +1246,9 @@ sourceFile:recursiveClassReferenceTest.ts 1-> 2 > 3 > Thing -1->Emitted(74, 5) Source(76, 15) + SourceIndex(0) -2 >Emitted(74, 16) Source(76, 15) + SourceIndex(0) -3 >Emitted(74, 21) Source(76, 20) + SourceIndex(0) +1->Emitted(74, 5) Source(76, 18) + SourceIndex(0) +2 >Emitted(74, 16) Source(76, 18) + SourceIndex(0) +3 >Emitted(74, 21) Source(76, 23) + SourceIndex(0) --- >>> var Languages; 1->^^^^^^^^ @@ -1284,9 +1284,9 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1->Emitted(75, 9) Source(76, 21) + SourceIndex(0) -2 >Emitted(75, 13) Source(76, 21) + SourceIndex(0) -3 >Emitted(75, 22) Source(76, 30) + SourceIndex(0) +1->Emitted(75, 9) Source(76, 24) + SourceIndex(0) +2 >Emitted(75, 13) Source(76, 24) + SourceIndex(0) +3 >Emitted(75, 22) Source(76, 33) + SourceIndex(0) 4 >Emitted(75, 23) Source(100, 2) + SourceIndex(0) --- >>> (function (Languages) { @@ -1296,9 +1296,9 @@ sourceFile:recursiveClassReferenceTest.ts 1-> 2 > 3 > Languages -1->Emitted(76, 9) Source(76, 21) + SourceIndex(0) -2 >Emitted(76, 20) Source(76, 21) + SourceIndex(0) -3 >Emitted(76, 29) Source(76, 30) + SourceIndex(0) +1->Emitted(76, 9) Source(76, 24) + SourceIndex(0) +2 >Emitted(76, 20) Source(76, 24) + SourceIndex(0) +3 >Emitted(76, 29) Source(76, 33) + SourceIndex(0) --- >>> var PlainText; 1 >^^^^^^^^^^^^ @@ -1334,9 +1334,9 @@ sourceFile:recursiveClassReferenceTest.ts > > } > } -1 >Emitted(77, 13) Source(76, 31) + SourceIndex(0) -2 >Emitted(77, 17) Source(76, 31) + SourceIndex(0) -3 >Emitted(77, 26) Source(76, 40) + SourceIndex(0) +1 >Emitted(77, 13) Source(76, 34) + SourceIndex(0) +2 >Emitted(77, 17) Source(76, 34) + SourceIndex(0) +3 >Emitted(77, 26) Source(76, 43) + SourceIndex(0) 4 >Emitted(77, 27) Source(100, 2) + SourceIndex(0) --- >>> (function (PlainText) { @@ -1347,9 +1347,9 @@ sourceFile:recursiveClassReferenceTest.ts 1-> 2 > 3 > PlainText -1->Emitted(78, 13) Source(76, 31) + SourceIndex(0) -2 >Emitted(78, 24) Source(76, 31) + SourceIndex(0) -3 >Emitted(78, 33) Source(76, 40) + SourceIndex(0) +1->Emitted(78, 13) Source(76, 34) + SourceIndex(0) +2 >Emitted(78, 24) Source(76, 34) + SourceIndex(0) +3 >Emitted(78, 33) Source(76, 43) + SourceIndex(0) --- >>> var State = /** @class */ (function () { 1->^^^^^^^^^^^^^^^^ @@ -1785,12 +1785,12 @@ sourceFile:recursiveClassReferenceTest.ts > } 1->Emitted(105, 13) Source(100, 1) + SourceIndex(0) 2 >Emitted(105, 14) Source(100, 2) + SourceIndex(0) -3 >Emitted(105, 16) Source(76, 31) + SourceIndex(0) -4 >Emitted(105, 25) Source(76, 40) + SourceIndex(0) -5 >Emitted(105, 28) Source(76, 31) + SourceIndex(0) -6 >Emitted(105, 47) Source(76, 40) + SourceIndex(0) -7 >Emitted(105, 52) Source(76, 31) + SourceIndex(0) -8 >Emitted(105, 71) Source(76, 40) + SourceIndex(0) +3 >Emitted(105, 16) Source(76, 34) + SourceIndex(0) +4 >Emitted(105, 25) Source(76, 43) + SourceIndex(0) +5 >Emitted(105, 28) Source(76, 34) + SourceIndex(0) +6 >Emitted(105, 47) Source(76, 43) + SourceIndex(0) +7 >Emitted(105, 52) Source(76, 34) + SourceIndex(0) +8 >Emitted(105, 71) Source(76, 43) + SourceIndex(0) 9 >Emitted(105, 79) Source(100, 2) + SourceIndex(0) --- >>> })(Languages = Thing.Languages || (Thing.Languages = {})); @@ -1838,12 +1838,12 @@ sourceFile:recursiveClassReferenceTest.ts > } 1 >Emitted(106, 9) Source(100, 1) + SourceIndex(0) 2 >Emitted(106, 10) Source(100, 2) + SourceIndex(0) -3 >Emitted(106, 12) Source(76, 21) + SourceIndex(0) -4 >Emitted(106, 21) Source(76, 30) + SourceIndex(0) -5 >Emitted(106, 24) Source(76, 21) + SourceIndex(0) -6 >Emitted(106, 39) Source(76, 30) + SourceIndex(0) -7 >Emitted(106, 44) Source(76, 21) + SourceIndex(0) -8 >Emitted(106, 59) Source(76, 30) + SourceIndex(0) +3 >Emitted(106, 12) Source(76, 24) + SourceIndex(0) +4 >Emitted(106, 21) Source(76, 33) + SourceIndex(0) +5 >Emitted(106, 24) Source(76, 24) + SourceIndex(0) +6 >Emitted(106, 39) Source(76, 33) + SourceIndex(0) +7 >Emitted(106, 44) Source(76, 24) + SourceIndex(0) +8 >Emitted(106, 59) Source(76, 33) + SourceIndex(0) 9 >Emitted(106, 67) Source(100, 2) + SourceIndex(0) --- >>> })(Thing = Sample.Thing || (Sample.Thing = {})); @@ -1891,12 +1891,12 @@ sourceFile:recursiveClassReferenceTest.ts > } 1 >Emitted(107, 5) Source(100, 1) + SourceIndex(0) 2 >Emitted(107, 6) Source(100, 2) + SourceIndex(0) -3 >Emitted(107, 8) Source(76, 15) + SourceIndex(0) -4 >Emitted(107, 13) Source(76, 20) + SourceIndex(0) -5 >Emitted(107, 16) Source(76, 15) + SourceIndex(0) -6 >Emitted(107, 28) Source(76, 20) + SourceIndex(0) -7 >Emitted(107, 33) Source(76, 15) + SourceIndex(0) -8 >Emitted(107, 45) Source(76, 20) + SourceIndex(0) +3 >Emitted(107, 8) Source(76, 18) + SourceIndex(0) +4 >Emitted(107, 13) Source(76, 23) + SourceIndex(0) +5 >Emitted(107, 16) Source(76, 18) + SourceIndex(0) +6 >Emitted(107, 28) Source(76, 23) + SourceIndex(0) +7 >Emitted(107, 33) Source(76, 18) + SourceIndex(0) +8 >Emitted(107, 45) Source(76, 23) + SourceIndex(0) 9 >Emitted(107, 53) Source(100, 2) + SourceIndex(0) --- >>>})(Sample || (Sample = {})); @@ -1941,10 +1941,10 @@ sourceFile:recursiveClassReferenceTest.ts > } 1 >Emitted(108, 1) Source(100, 1) + SourceIndex(0) 2 >Emitted(108, 2) Source(100, 2) + SourceIndex(0) -3 >Emitted(108, 4) Source(76, 8) + SourceIndex(0) -4 >Emitted(108, 10) Source(76, 14) + SourceIndex(0) -5 >Emitted(108, 15) Source(76, 8) + SourceIndex(0) -6 >Emitted(108, 21) Source(76, 14) + SourceIndex(0) +3 >Emitted(108, 4) Source(76, 11) + SourceIndex(0) +4 >Emitted(108, 10) Source(76, 17) + SourceIndex(0) +5 >Emitted(108, 15) Source(76, 11) + SourceIndex(0) +6 >Emitted(108, 21) Source(76, 17) + SourceIndex(0) 7 >Emitted(108, 29) Source(100, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=recursiveClassReferenceTest.js.map \ No newline at end of file diff --git a/tests/baselines/reference/recursiveClassReferenceTest.symbols b/tests/baselines/reference/recursiveClassReferenceTest.symbols index e0080ae9ac780..d01e0d03ce650 100644 --- a/tests/baselines/reference/recursiveClassReferenceTest.symbols +++ b/tests/baselines/reference/recursiveClassReferenceTest.symbols @@ -8,7 +8,7 @@ declare module Sample.Thing { >Sample : Symbol(Sample, Decl(recursiveClassReferenceTest.ts, 0, 0), Decl(recursiveClassReferenceTest.ts, 29, 1), Decl(recursiveClassReferenceTest.ts, 41, 1), Decl(recursiveClassReferenceTest.ts, 73, 25)) ->Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 5, 22), Decl(recursiveClassReferenceTest.ts, 43, 14), Decl(recursiveClassReferenceTest.ts, 75, 14)) +>Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 5, 22), Decl(recursiveClassReferenceTest.ts, 43, 17), Decl(recursiveClassReferenceTest.ts, 75, 17)) export interface IWidget { >IWidget : Symbol(IWidget, Decl(recursiveClassReferenceTest.ts, 5, 29)) @@ -24,7 +24,7 @@ declare module Sample.Thing { >runner : Symbol(runner, Decl(recursiveClassReferenceTest.ts, 10, 6)) >widget : Symbol(widget, Decl(recursiveClassReferenceTest.ts, 10, 14)) >Sample : Symbol(Sample, Decl(recursiveClassReferenceTest.ts, 0, 0), Decl(recursiveClassReferenceTest.ts, 29, 1), Decl(recursiveClassReferenceTest.ts, 41, 1), Decl(recursiveClassReferenceTest.ts, 73, 25)) ->Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 5, 22), Decl(recursiveClassReferenceTest.ts, 43, 14), Decl(recursiveClassReferenceTest.ts, 75, 14)) +>Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 5, 22), Decl(recursiveClassReferenceTest.ts, 43, 17), Decl(recursiveClassReferenceTest.ts, 75, 17)) >IWidget : Symbol(IWidget, Decl(recursiveClassReferenceTest.ts, 5, 29)) } @@ -61,18 +61,18 @@ declare module Sample.Thing { } } -module Sample.Actions.Thing.Find { +namespace Sample.Actions.Thing.Find { >Sample : Symbol(Sample, Decl(recursiveClassReferenceTest.ts, 0, 0), Decl(recursiveClassReferenceTest.ts, 29, 1), Decl(recursiveClassReferenceTest.ts, 41, 1), Decl(recursiveClassReferenceTest.ts, 73, 25)) ->Actions : Symbol(Actions, Decl(recursiveClassReferenceTest.ts, 31, 14)) ->Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 31, 22)) ->Find : Symbol(Find, Decl(recursiveClassReferenceTest.ts, 31, 28)) +>Actions : Symbol(Actions, Decl(recursiveClassReferenceTest.ts, 31, 17)) +>Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 31, 25)) +>Find : Symbol(Find, Decl(recursiveClassReferenceTest.ts, 31, 31)) export class StartFindAction implements Sample.Thing.IAction { ->StartFindAction : Symbol(StartFindAction, Decl(recursiveClassReferenceTest.ts, 31, 34)) +>StartFindAction : Symbol(StartFindAction, Decl(recursiveClassReferenceTest.ts, 31, 37)) >Sample.Thing.IAction : Symbol(Sample.Thing.IAction, Decl(recursiveClassReferenceTest.ts, 23, 2)) ->Sample.Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 5, 22), Decl(recursiveClassReferenceTest.ts, 43, 14), Decl(recursiveClassReferenceTest.ts, 75, 14)) +>Sample.Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 5, 22), Decl(recursiveClassReferenceTest.ts, 43, 17), Decl(recursiveClassReferenceTest.ts, 75, 17)) >Sample : Symbol(Sample, Decl(recursiveClassReferenceTest.ts, 0, 0), Decl(recursiveClassReferenceTest.ts, 29, 1), Decl(recursiveClassReferenceTest.ts, 41, 1), Decl(recursiveClassReferenceTest.ts, 73, 25)) ->Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 5, 22), Decl(recursiveClassReferenceTest.ts, 43, 14), Decl(recursiveClassReferenceTest.ts, 75, 14)) +>Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 5, 22), Decl(recursiveClassReferenceTest.ts, 43, 17), Decl(recursiveClassReferenceTest.ts, 75, 17)) >IAction : Symbol(Sample.Thing.IAction, Decl(recursiveClassReferenceTest.ts, 23, 2)) public getId() { return "yo"; } @@ -82,7 +82,7 @@ module Sample.Actions.Thing.Find { >run : Symbol(StartFindAction.run, Decl(recursiveClassReferenceTest.ts, 34, 33)) >Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 36, 13)) >Sample : Symbol(Sample, Decl(recursiveClassReferenceTest.ts, 0, 0), Decl(recursiveClassReferenceTest.ts, 29, 1), Decl(recursiveClassReferenceTest.ts, 41, 1), Decl(recursiveClassReferenceTest.ts, 73, 25)) ->Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 5, 22), Decl(recursiveClassReferenceTest.ts, 43, 14), Decl(recursiveClassReferenceTest.ts, 75, 14)) +>Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 5, 22), Decl(recursiveClassReferenceTest.ts, 43, 17), Decl(recursiveClassReferenceTest.ts, 75, 17)) >ICodeThing : Symbol(Sample.Thing.ICodeThing, Decl(recursiveClassReferenceTest.ts, 11, 2)) return true; @@ -90,17 +90,17 @@ module Sample.Actions.Thing.Find { } } -module Sample.Thing.Widgets { +namespace Sample.Thing.Widgets { >Sample : Symbol(Sample, Decl(recursiveClassReferenceTest.ts, 0, 0), Decl(recursiveClassReferenceTest.ts, 29, 1), Decl(recursiveClassReferenceTest.ts, 41, 1), Decl(recursiveClassReferenceTest.ts, 73, 25)) ->Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 5, 22), Decl(recursiveClassReferenceTest.ts, 43, 14), Decl(recursiveClassReferenceTest.ts, 75, 14)) ->Widgets : Symbol(Widgets, Decl(recursiveClassReferenceTest.ts, 43, 20)) +>Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 5, 22), Decl(recursiveClassReferenceTest.ts, 43, 17), Decl(recursiveClassReferenceTest.ts, 75, 17)) +>Widgets : Symbol(Widgets, Decl(recursiveClassReferenceTest.ts, 43, 23)) export class FindWidget implements Sample.Thing.IWidget { ->FindWidget : Symbol(FindWidget, Decl(recursiveClassReferenceTest.ts, 43, 29)) +>FindWidget : Symbol(FindWidget, Decl(recursiveClassReferenceTest.ts, 43, 32)) >Sample.Thing.IWidget : Symbol(IWidget, Decl(recursiveClassReferenceTest.ts, 5, 29)) ->Sample.Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 5, 22), Decl(recursiveClassReferenceTest.ts, 43, 14), Decl(recursiveClassReferenceTest.ts, 75, 14)) +>Sample.Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 5, 22), Decl(recursiveClassReferenceTest.ts, 43, 17), Decl(recursiveClassReferenceTest.ts, 75, 17)) >Sample : Symbol(Sample, Decl(recursiveClassReferenceTest.ts, 0, 0), Decl(recursiveClassReferenceTest.ts, 29, 1), Decl(recursiveClassReferenceTest.ts, 41, 1), Decl(recursiveClassReferenceTest.ts, 73, 25)) ->Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 5, 22), Decl(recursiveClassReferenceTest.ts, 43, 14), Decl(recursiveClassReferenceTest.ts, 75, 14)) +>Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 5, 22), Decl(recursiveClassReferenceTest.ts, 43, 17), Decl(recursiveClassReferenceTest.ts, 75, 17)) >IWidget : Symbol(IWidget, Decl(recursiveClassReferenceTest.ts, 5, 29)) public gar(runner:(widget:Sample.Thing.IWidget)=>any) { if (true) {return runner(this);}} @@ -108,10 +108,10 @@ module Sample.Thing.Widgets { >runner : Symbol(runner, Decl(recursiveClassReferenceTest.ts, 46, 13)) >widget : Symbol(widget, Decl(recursiveClassReferenceTest.ts, 46, 21)) >Sample : Symbol(Sample, Decl(recursiveClassReferenceTest.ts, 0, 0), Decl(recursiveClassReferenceTest.ts, 29, 1), Decl(recursiveClassReferenceTest.ts, 41, 1), Decl(recursiveClassReferenceTest.ts, 73, 25)) ->Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 5, 22), Decl(recursiveClassReferenceTest.ts, 43, 14), Decl(recursiveClassReferenceTest.ts, 75, 14)) +>Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 5, 22), Decl(recursiveClassReferenceTest.ts, 43, 17), Decl(recursiveClassReferenceTest.ts, 75, 17)) >IWidget : Symbol(IWidget, Decl(recursiveClassReferenceTest.ts, 5, 29)) >runner : Symbol(runner, Decl(recursiveClassReferenceTest.ts, 46, 13)) ->this : Symbol(FindWidget, Decl(recursiveClassReferenceTest.ts, 43, 29)) +>this : Symbol(FindWidget, Decl(recursiveClassReferenceTest.ts, 43, 32)) private domNode:any = null; >domNode : Symbol(FindWidget.domNode, Decl(recursiveClassReferenceTest.ts, 46, 91)) @@ -119,7 +119,7 @@ module Sample.Thing.Widgets { constructor(private codeThing: Sample.Thing.ICodeThing) { >codeThing : Symbol(FindWidget.codeThing, Decl(recursiveClassReferenceTest.ts, 49, 14)) >Sample : Symbol(Sample, Decl(recursiveClassReferenceTest.ts, 0, 0), Decl(recursiveClassReferenceTest.ts, 29, 1), Decl(recursiveClassReferenceTest.ts, 41, 1), Decl(recursiveClassReferenceTest.ts, 73, 25)) ->Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 5, 22), Decl(recursiveClassReferenceTest.ts, 43, 14), Decl(recursiveClassReferenceTest.ts, 75, 14)) +>Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 5, 22), Decl(recursiveClassReferenceTest.ts, 43, 17), Decl(recursiveClassReferenceTest.ts, 75, 17)) >ICodeThing : Symbol(ICodeThing, Decl(recursiveClassReferenceTest.ts, 11, 2)) // scenario 1 @@ -127,7 +127,7 @@ module Sample.Thing.Widgets { >codeThing.addWidget : Symbol(ICodeThing.addWidget, Decl(recursiveClassReferenceTest.ts, 15, 26)) >codeThing : Symbol(codeThing, Decl(recursiveClassReferenceTest.ts, 49, 14)) >addWidget : Symbol(ICodeThing.addWidget, Decl(recursiveClassReferenceTest.ts, 15, 26)) ->this : Symbol(FindWidget, Decl(recursiveClassReferenceTest.ts, 43, 29)) +>this : Symbol(FindWidget, Decl(recursiveClassReferenceTest.ts, 43, 32)) } public getDomNode() { @@ -169,14 +169,14 @@ declare var self: Window; >self : Symbol(self, Decl(recursiveClassReferenceTest.ts, 73, 11)) >Window : Symbol(Window, Decl(recursiveClassReferenceTest.ts, 68, 19)) -module Sample.Thing.Languages.PlainText { +namespace Sample.Thing.Languages.PlainText { >Sample : Symbol(Sample, Decl(recursiveClassReferenceTest.ts, 0, 0), Decl(recursiveClassReferenceTest.ts, 29, 1), Decl(recursiveClassReferenceTest.ts, 41, 1), Decl(recursiveClassReferenceTest.ts, 73, 25)) ->Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 5, 22), Decl(recursiveClassReferenceTest.ts, 43, 14), Decl(recursiveClassReferenceTest.ts, 75, 14)) ->Languages : Symbol(Languages, Decl(recursiveClassReferenceTest.ts, 75, 20)) ->PlainText : Symbol(PlainText, Decl(recursiveClassReferenceTest.ts, 75, 30)) +>Thing : Symbol(Thing, Decl(recursiveClassReferenceTest.ts, 5, 22), Decl(recursiveClassReferenceTest.ts, 43, 17), Decl(recursiveClassReferenceTest.ts, 75, 17)) +>Languages : Symbol(Languages, Decl(recursiveClassReferenceTest.ts, 75, 23)) +>PlainText : Symbol(PlainText, Decl(recursiveClassReferenceTest.ts, 75, 33)) export class State implements IState { ->State : Symbol(State, Decl(recursiveClassReferenceTest.ts, 75, 41)) +>State : Symbol(State, Decl(recursiveClassReferenceTest.ts, 75, 44)) >IState : Symbol(IState, Decl(recursiveClassReferenceTest.ts, 66, 88)) constructor(private mode: IMode) { } @@ -188,7 +188,7 @@ module Sample.Thing.Languages.PlainText { >IState : Symbol(IState, Decl(recursiveClassReferenceTest.ts, 66, 88)) return this; ->this : Symbol(State, Decl(recursiveClassReferenceTest.ts, 75, 41)) +>this : Symbol(State, Decl(recursiveClassReferenceTest.ts, 75, 44)) } public equals(other:IState):boolean { @@ -197,7 +197,7 @@ module Sample.Thing.Languages.PlainText { >IState : Symbol(IState, Decl(recursiveClassReferenceTest.ts, 66, 88)) return this === other; ->this : Symbol(State, Decl(recursiveClassReferenceTest.ts, 75, 41)) +>this : Symbol(State, Decl(recursiveClassReferenceTest.ts, 75, 44)) >other : Symbol(other, Decl(recursiveClassReferenceTest.ts, 83, 16)) } @@ -216,7 +216,7 @@ module Sample.Thing.Languages.PlainText { >IState : Symbol(IState, Decl(recursiveClassReferenceTest.ts, 66, 88)) return new State(self); ->State : Symbol(State, Decl(recursiveClassReferenceTest.ts, 75, 41)) +>State : Symbol(State, Decl(recursiveClassReferenceTest.ts, 75, 44)) >self : Symbol(self, Decl(recursiveClassReferenceTest.ts, 73, 11)) } diff --git a/tests/baselines/reference/recursiveClassReferenceTest.types b/tests/baselines/reference/recursiveClassReferenceTest.types index 092de33da333b..288ef7dade8da 100644 --- a/tests/baselines/reference/recursiveClassReferenceTest.types +++ b/tests/baselines/reference/recursiveClassReferenceTest.types @@ -65,7 +65,7 @@ declare module Sample.Thing { } } -module Sample.Actions.Thing.Find { +namespace Sample.Actions.Thing.Find { >Sample : typeof Sample > : ^^^^^^^^^^^^^ >Actions : typeof Actions @@ -108,7 +108,7 @@ module Sample.Actions.Thing.Find { } } -module Sample.Thing.Widgets { +namespace Sample.Thing.Widgets { >Sample : typeof Sample > : ^^^^^^^^^^^^^ >Thing : typeof Thing @@ -213,7 +213,7 @@ declare var self: Window; >self : Window > : ^^^^^^ -module Sample.Thing.Languages.PlainText { +namespace Sample.Thing.Languages.PlainText { >Sample : typeof Sample > : ^^^^^^^^^^^^^ >Thing : typeof Thing diff --git a/tests/baselines/reference/recursiveCloduleReference.js b/tests/baselines/reference/recursiveCloduleReference.js index da1d0d91f8e3b..312f4b97b0434 100644 --- a/tests/baselines/reference/recursiveCloduleReference.js +++ b/tests/baselines/reference/recursiveCloduleReference.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/recursiveCloduleReference.ts] //// //// [recursiveCloduleReference.ts] -module M +namespace M { export class C { } - export module C { + export namespace C { export var C = M.C }; }; diff --git a/tests/baselines/reference/recursiveCloduleReference.symbols b/tests/baselines/reference/recursiveCloduleReference.symbols index 84f9034686159..51e44627cf578 100644 --- a/tests/baselines/reference/recursiveCloduleReference.symbols +++ b/tests/baselines/reference/recursiveCloduleReference.symbols @@ -1,13 +1,13 @@ //// [tests/cases/compiler/recursiveCloduleReference.ts] //// === recursiveCloduleReference.ts === -module M +namespace M >M : Symbol(M, Decl(recursiveCloduleReference.ts, 0, 0)) { export class C { >C : Symbol(C, Decl(recursiveCloduleReference.ts, 1, 1), Decl(recursiveCloduleReference.ts, 3, 3)) } - export module C { + export namespace C { >C : Symbol(C, Decl(recursiveCloduleReference.ts, 1, 1), Decl(recursiveCloduleReference.ts, 3, 3)) export var C = M.C diff --git a/tests/baselines/reference/recursiveCloduleReference.types b/tests/baselines/reference/recursiveCloduleReference.types index 3f0d339fde736..c257ab04ccb9a 100644 --- a/tests/baselines/reference/recursiveCloduleReference.types +++ b/tests/baselines/reference/recursiveCloduleReference.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/recursiveCloduleReference.ts] //// === recursiveCloduleReference.ts === -module M +namespace M >M : typeof M > : ^^^^^^^^ { @@ -9,7 +9,7 @@ module M >C : C > : ^ } - export module C { + export namespace C { >C : typeof M.C > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/recursiveGenericUnionType1.js b/tests/baselines/reference/recursiveGenericUnionType1.js index dcc378f20accb..a3a035e8c34be 100644 --- a/tests/baselines/reference/recursiveGenericUnionType1.js +++ b/tests/baselines/reference/recursiveGenericUnionType1.js @@ -1,14 +1,14 @@ //// [tests/cases/compiler/recursiveGenericUnionType1.ts] //// //// [recursiveGenericUnionType1.ts] -declare module Test1 { +declare namespace Test1 { export type Container = T | { [i: string]: Container; }; export type IStringContainer = Container; } -declare module Test2 { +declare namespace Test2 { export type Container = T | { [i: string]: Container; }; diff --git a/tests/baselines/reference/recursiveGenericUnionType1.symbols b/tests/baselines/reference/recursiveGenericUnionType1.symbols index ca5205d79653e..896350ddf7e35 100644 --- a/tests/baselines/reference/recursiveGenericUnionType1.symbols +++ b/tests/baselines/reference/recursiveGenericUnionType1.symbols @@ -1,48 +1,48 @@ //// [tests/cases/compiler/recursiveGenericUnionType1.ts] //// === recursiveGenericUnionType1.ts === -declare module Test1 { +declare namespace Test1 { >Test1 : Symbol(Test1, Decl(recursiveGenericUnionType1.ts, 0, 0)) export type Container = T | { ->Container : Symbol(Container, Decl(recursiveGenericUnionType1.ts, 0, 22)) +>Container : Symbol(Container, Decl(recursiveGenericUnionType1.ts, 0, 25)) >T : Symbol(T, Decl(recursiveGenericUnionType1.ts, 1, 26)) >T : Symbol(T, Decl(recursiveGenericUnionType1.ts, 1, 26)) [i: string]: Container; >i : Symbol(i, Decl(recursiveGenericUnionType1.ts, 2, 9)) ->Container : Symbol(Container, Decl(recursiveGenericUnionType1.ts, 0, 22)) +>Container : Symbol(Container, Decl(recursiveGenericUnionType1.ts, 0, 25)) >T : Symbol(T, Decl(recursiveGenericUnionType1.ts, 1, 26)) }; export type IStringContainer = Container; >IStringContainer : Symbol(IStringContainer, Decl(recursiveGenericUnionType1.ts, 3, 6)) ->Container : Symbol(Container, Decl(recursiveGenericUnionType1.ts, 0, 22)) +>Container : Symbol(Container, Decl(recursiveGenericUnionType1.ts, 0, 25)) } -declare module Test2 { +declare namespace Test2 { >Test2 : Symbol(Test2, Decl(recursiveGenericUnionType1.ts, 5, 1)) export type Container = T | { ->Container : Symbol(Container, Decl(recursiveGenericUnionType1.ts, 7, 22)) +>Container : Symbol(Container, Decl(recursiveGenericUnionType1.ts, 7, 25)) >T : Symbol(T, Decl(recursiveGenericUnionType1.ts, 8, 26)) >T : Symbol(T, Decl(recursiveGenericUnionType1.ts, 8, 26)) [i: string]: Container; >i : Symbol(i, Decl(recursiveGenericUnionType1.ts, 9, 9)) ->Container : Symbol(Container, Decl(recursiveGenericUnionType1.ts, 7, 22)) +>Container : Symbol(Container, Decl(recursiveGenericUnionType1.ts, 7, 25)) >T : Symbol(T, Decl(recursiveGenericUnionType1.ts, 8, 26)) }; export type IStringContainer = Container; >IStringContainer : Symbol(IStringContainer, Decl(recursiveGenericUnionType1.ts, 10, 6)) ->Container : Symbol(Container, Decl(recursiveGenericUnionType1.ts, 7, 22)) +>Container : Symbol(Container, Decl(recursiveGenericUnionType1.ts, 7, 25)) } var x: Test1.Container; >x : Symbol(x, Decl(recursiveGenericUnionType1.ts, 14, 3)) >Test1 : Symbol(Test1, Decl(recursiveGenericUnionType1.ts, 0, 0)) ->Container : Symbol(Test1.Container, Decl(recursiveGenericUnionType1.ts, 0, 22)) +>Container : Symbol(Test1.Container, Decl(recursiveGenericUnionType1.ts, 0, 25)) var s1: Test1.IStringContainer; >s1 : Symbol(s1, Decl(recursiveGenericUnionType1.ts, 16, 3)) diff --git a/tests/baselines/reference/recursiveGenericUnionType1.types b/tests/baselines/reference/recursiveGenericUnionType1.types index aee0eb121051c..ae9d57346c9c8 100644 --- a/tests/baselines/reference/recursiveGenericUnionType1.types +++ b/tests/baselines/reference/recursiveGenericUnionType1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/recursiveGenericUnionType1.ts] //// === recursiveGenericUnionType1.ts === -declare module Test1 { +declare namespace Test1 { export type Container = T | { >Container : Container > : ^^^^^^^^^^^^ @@ -16,7 +16,7 @@ declare module Test1 { > : ^^^^^^^^^^^^^^^^ } -declare module Test2 { +declare namespace Test2 { export type Container = T | { >Container : Container > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/recursiveGenericUnionType2.js b/tests/baselines/reference/recursiveGenericUnionType2.js index 3f460784b009d..66ba2e984d603 100644 --- a/tests/baselines/reference/recursiveGenericUnionType2.js +++ b/tests/baselines/reference/recursiveGenericUnionType2.js @@ -1,14 +1,14 @@ //// [tests/cases/compiler/recursiveGenericUnionType2.ts] //// //// [recursiveGenericUnionType2.ts] -declare module Test1 { +declare namespace Test1 { export type Container = T | { [i: string]: Container[]; }; export type IStringContainer = Container; } -declare module Test2 { +declare namespace Test2 { export type Container = T | { [i: string]: Container[]; }; diff --git a/tests/baselines/reference/recursiveGenericUnionType2.symbols b/tests/baselines/reference/recursiveGenericUnionType2.symbols index a31af0f95d95e..067012e3b55e8 100644 --- a/tests/baselines/reference/recursiveGenericUnionType2.symbols +++ b/tests/baselines/reference/recursiveGenericUnionType2.symbols @@ -1,48 +1,48 @@ //// [tests/cases/compiler/recursiveGenericUnionType2.ts] //// === recursiveGenericUnionType2.ts === -declare module Test1 { +declare namespace Test1 { >Test1 : Symbol(Test1, Decl(recursiveGenericUnionType2.ts, 0, 0)) export type Container = T | { ->Container : Symbol(Container, Decl(recursiveGenericUnionType2.ts, 0, 22)) +>Container : Symbol(Container, Decl(recursiveGenericUnionType2.ts, 0, 25)) >T : Symbol(T, Decl(recursiveGenericUnionType2.ts, 1, 26)) >T : Symbol(T, Decl(recursiveGenericUnionType2.ts, 1, 26)) [i: string]: Container[]; >i : Symbol(i, Decl(recursiveGenericUnionType2.ts, 2, 9)) ->Container : Symbol(Container, Decl(recursiveGenericUnionType2.ts, 0, 22)) +>Container : Symbol(Container, Decl(recursiveGenericUnionType2.ts, 0, 25)) >T : Symbol(T, Decl(recursiveGenericUnionType2.ts, 1, 26)) }; export type IStringContainer = Container; >IStringContainer : Symbol(IStringContainer, Decl(recursiveGenericUnionType2.ts, 3, 6)) ->Container : Symbol(Container, Decl(recursiveGenericUnionType2.ts, 0, 22)) +>Container : Symbol(Container, Decl(recursiveGenericUnionType2.ts, 0, 25)) } -declare module Test2 { +declare namespace Test2 { >Test2 : Symbol(Test2, Decl(recursiveGenericUnionType2.ts, 5, 1)) export type Container = T | { ->Container : Symbol(Container, Decl(recursiveGenericUnionType2.ts, 7, 22)) +>Container : Symbol(Container, Decl(recursiveGenericUnionType2.ts, 7, 25)) >T : Symbol(T, Decl(recursiveGenericUnionType2.ts, 8, 26)) >T : Symbol(T, Decl(recursiveGenericUnionType2.ts, 8, 26)) [i: string]: Container[]; >i : Symbol(i, Decl(recursiveGenericUnionType2.ts, 9, 9)) ->Container : Symbol(Container, Decl(recursiveGenericUnionType2.ts, 7, 22)) +>Container : Symbol(Container, Decl(recursiveGenericUnionType2.ts, 7, 25)) >T : Symbol(T, Decl(recursiveGenericUnionType2.ts, 8, 26)) }; export type IStringContainer = Container; >IStringContainer : Symbol(IStringContainer, Decl(recursiveGenericUnionType2.ts, 10, 6)) ->Container : Symbol(Container, Decl(recursiveGenericUnionType2.ts, 7, 22)) +>Container : Symbol(Container, Decl(recursiveGenericUnionType2.ts, 7, 25)) } var x: Test1.Container; >x : Symbol(x, Decl(recursiveGenericUnionType2.ts, 14, 3)) >Test1 : Symbol(Test1, Decl(recursiveGenericUnionType2.ts, 0, 0)) ->Container : Symbol(Test1.Container, Decl(recursiveGenericUnionType2.ts, 0, 22)) +>Container : Symbol(Test1.Container, Decl(recursiveGenericUnionType2.ts, 0, 25)) var s1: Test1.IStringContainer; >s1 : Symbol(s1, Decl(recursiveGenericUnionType2.ts, 16, 3)) diff --git a/tests/baselines/reference/recursiveGenericUnionType2.types b/tests/baselines/reference/recursiveGenericUnionType2.types index fccab1d849c52..d70978c9d87a0 100644 --- a/tests/baselines/reference/recursiveGenericUnionType2.types +++ b/tests/baselines/reference/recursiveGenericUnionType2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/recursiveGenericUnionType2.ts] //// === recursiveGenericUnionType2.ts === -declare module Test1 { +declare namespace Test1 { export type Container = T | { >Container : Container > : ^^^^^^^^^^^^ @@ -16,7 +16,7 @@ declare module Test1 { > : ^^^^^^^^^^^^^^^^ } -declare module Test2 { +declare namespace Test2 { export type Container = T | { >Container : Container > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/recursiveIdenticalOverloadResolution.js b/tests/baselines/reference/recursiveIdenticalOverloadResolution.js index f96198350e7a1..af7b32ba7d4a0 100644 --- a/tests/baselines/reference/recursiveIdenticalOverloadResolution.js +++ b/tests/baselines/reference/recursiveIdenticalOverloadResolution.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/recursiveIdenticalOverloadResolution.ts] //// //// [recursiveIdenticalOverloadResolution.ts] -module M { +namespace M { interface I { (i: I): I; } diff --git a/tests/baselines/reference/recursiveIdenticalOverloadResolution.symbols b/tests/baselines/reference/recursiveIdenticalOverloadResolution.symbols index 21fd10fb74f08..1deb3481f1afe 100644 --- a/tests/baselines/reference/recursiveIdenticalOverloadResolution.symbols +++ b/tests/baselines/reference/recursiveIdenticalOverloadResolution.symbols @@ -1,24 +1,24 @@ //// [tests/cases/compiler/recursiveIdenticalOverloadResolution.ts] //// === recursiveIdenticalOverloadResolution.ts === -module M { +namespace M { >M : Symbol(M, Decl(recursiveIdenticalOverloadResolution.ts, 0, 0)) interface I { (i: I): I; } ->I : Symbol(I, Decl(recursiveIdenticalOverloadResolution.ts, 0, 10)) +>I : Symbol(I, Decl(recursiveIdenticalOverloadResolution.ts, 0, 13)) >i : Symbol(i, Decl(recursiveIdenticalOverloadResolution.ts, 2, 18)) ->I : Symbol(I, Decl(recursiveIdenticalOverloadResolution.ts, 0, 10)) ->I : Symbol(I, Decl(recursiveIdenticalOverloadResolution.ts, 0, 10)) +>I : Symbol(I, Decl(recursiveIdenticalOverloadResolution.ts, 0, 13)) +>I : Symbol(I, Decl(recursiveIdenticalOverloadResolution.ts, 0, 13)) function f(p: I) { return f }; >f : Symbol(f, Decl(recursiveIdenticalOverloadResolution.ts, 2, 29)) >p : Symbol(p, Decl(recursiveIdenticalOverloadResolution.ts, 4, 14)) ->I : Symbol(I, Decl(recursiveIdenticalOverloadResolution.ts, 0, 10)) +>I : Symbol(I, Decl(recursiveIdenticalOverloadResolution.ts, 0, 13)) >f : Symbol(f, Decl(recursiveIdenticalOverloadResolution.ts, 2, 29)) var i: I; >i : Symbol(i, Decl(recursiveIdenticalOverloadResolution.ts, 6, 6)) ->I : Symbol(I, Decl(recursiveIdenticalOverloadResolution.ts, 0, 10)) +>I : Symbol(I, Decl(recursiveIdenticalOverloadResolution.ts, 0, 13)) f(i); >f : Symbol(f, Decl(recursiveIdenticalOverloadResolution.ts, 2, 29)) diff --git a/tests/baselines/reference/recursiveIdenticalOverloadResolution.types b/tests/baselines/reference/recursiveIdenticalOverloadResolution.types index 8f1471cd4c5e2..fb1252c0837b3 100644 --- a/tests/baselines/reference/recursiveIdenticalOverloadResolution.types +++ b/tests/baselines/reference/recursiveIdenticalOverloadResolution.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/recursiveIdenticalOverloadResolution.ts] //// === recursiveIdenticalOverloadResolution.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/recursiveMods.js b/tests/baselines/reference/recursiveMods.js index 5d251048bb10f..20095e6083b93 100644 --- a/tests/baselines/reference/recursiveMods.js +++ b/tests/baselines/reference/recursiveMods.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/recursiveMods.ts] //// //// [recursiveMods.ts] -export module Foo { +export namespace Foo { export class C {} } -export module Foo { +export namespace Foo { function Bar() : C { if (true) { return Bar();} diff --git a/tests/baselines/reference/recursiveMods.symbols b/tests/baselines/reference/recursiveMods.symbols index 45bbcd6dba5fa..7e28808ee870b 100644 --- a/tests/baselines/reference/recursiveMods.symbols +++ b/tests/baselines/reference/recursiveMods.symbols @@ -1,37 +1,37 @@ //// [tests/cases/compiler/recursiveMods.ts] //// === recursiveMods.ts === -export module Foo { +export namespace Foo { >Foo : Symbol(Foo, Decl(recursiveMods.ts, 0, 0), Decl(recursiveMods.ts, 2, 1)) export class C {} ->C : Symbol(C, Decl(recursiveMods.ts, 0, 19)) +>C : Symbol(C, Decl(recursiveMods.ts, 0, 22)) } -export module Foo { +export namespace Foo { >Foo : Symbol(Foo, Decl(recursiveMods.ts, 0, 0), Decl(recursiveMods.ts, 2, 1)) function Bar() : C { ->Bar : Symbol(Bar, Decl(recursiveMods.ts, 4, 19)) ->C : Symbol(C, Decl(recursiveMods.ts, 0, 19)) +>Bar : Symbol(Bar, Decl(recursiveMods.ts, 4, 22)) +>C : Symbol(C, Decl(recursiveMods.ts, 0, 22)) if (true) { return Bar();} ->Bar : Symbol(Bar, Decl(recursiveMods.ts, 4, 19)) +>Bar : Symbol(Bar, Decl(recursiveMods.ts, 4, 22)) return new C(); ->C : Symbol(C, Decl(recursiveMods.ts, 0, 19)) +>C : Symbol(C, Decl(recursiveMods.ts, 0, 22)) } function Baz() : C { >Baz : Symbol(Baz, Decl(recursiveMods.ts, 9, 2)) ->C : Symbol(C, Decl(recursiveMods.ts, 0, 19)) +>C : Symbol(C, Decl(recursiveMods.ts, 0, 22)) var c = Baz(); >c : Symbol(c, Decl(recursiveMods.ts, 12, 5)) >Baz : Symbol(Baz, Decl(recursiveMods.ts, 9, 2)) return Bar(); ->Bar : Symbol(Bar, Decl(recursiveMods.ts, 4, 19)) +>Bar : Symbol(Bar, Decl(recursiveMods.ts, 4, 22)) } function Gar() { @@ -39,7 +39,7 @@ export module Foo { var c : C = Baz(); >c : Symbol(c, Decl(recursiveMods.ts, 17, 5)) ->C : Symbol(C, Decl(recursiveMods.ts, 0, 19)) +>C : Symbol(C, Decl(recursiveMods.ts, 0, 22)) >Baz : Symbol(Baz, Decl(recursiveMods.ts, 9, 2)) return; diff --git a/tests/baselines/reference/recursiveMods.types b/tests/baselines/reference/recursiveMods.types index 06cc172732100..631065cd4bbf8 100644 --- a/tests/baselines/reference/recursiveMods.types +++ b/tests/baselines/reference/recursiveMods.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/recursiveMods.ts] //// === recursiveMods.ts === -export module Foo { +export namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ @@ -10,7 +10,7 @@ export module Foo { > : ^ } -export module Foo { +export namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/recursiveTypeComparison2.errors.txt b/tests/baselines/reference/recursiveTypeComparison2.errors.txt index 799776a7f34fc..6f601eed676ea 100644 --- a/tests/baselines/reference/recursiveTypeComparison2.errors.txt +++ b/tests/baselines/reference/recursiveTypeComparison2.errors.txt @@ -4,7 +4,7 @@ recursiveTypeComparison2.ts(13,80): error TS2304: Cannot find name 'StateValue'. ==== recursiveTypeComparison2.ts (1 errors) ==== // Before fix this would cause compiler to hang (#1170) - declare module Bacon { + declare namespace Bacon { interface Event { } interface Error extends Event { diff --git a/tests/baselines/reference/recursiveTypeComparison2.js b/tests/baselines/reference/recursiveTypeComparison2.js index 91ef344d477a0..ace40616722fb 100644 --- a/tests/baselines/reference/recursiveTypeComparison2.js +++ b/tests/baselines/reference/recursiveTypeComparison2.js @@ -3,7 +3,7 @@ //// [recursiveTypeComparison2.ts] // Before fix this would cause compiler to hang (#1170) -declare module Bacon { +declare namespace Bacon { interface Event { } interface Error extends Event { diff --git a/tests/baselines/reference/recursiveTypeComparison2.symbols b/tests/baselines/reference/recursiveTypeComparison2.symbols index 6d6b1e8e8eff2..6a029fadadef0 100644 --- a/tests/baselines/reference/recursiveTypeComparison2.symbols +++ b/tests/baselines/reference/recursiveTypeComparison2.symbols @@ -3,17 +3,17 @@ === recursiveTypeComparison2.ts === // Before fix this would cause compiler to hang (#1170) -declare module Bacon { +declare namespace Bacon { >Bacon : Symbol(Bacon, Decl(recursiveTypeComparison2.ts, 0, 0)) interface Event { ->Event : Symbol(Event, Decl(recursiveTypeComparison2.ts, 2, 22)) +>Event : Symbol(Event, Decl(recursiveTypeComparison2.ts, 2, 25)) >T : Symbol(T, Decl(recursiveTypeComparison2.ts, 3, 20)) } interface Error extends Event { >Error : Symbol(Error, Decl(recursiveTypeComparison2.ts, 4, 5)) >T : Symbol(T, Decl(recursiveTypeComparison2.ts, 5, 20)) ->Event : Symbol(Event, Decl(recursiveTypeComparison2.ts, 2, 22)) +>Event : Symbol(Event, Decl(recursiveTypeComparison2.ts, 2, 25)) >T : Symbol(T, Decl(recursiveTypeComparison2.ts, 5, 20)) } interface Observable { @@ -74,7 +74,7 @@ declare module Bacon { >state : Symbol(state, Decl(recursiveTypeComparison2.ts, 12, 49)) >U : Symbol(U, Decl(recursiveTypeComparison2.ts, 12, 25)) >event : Symbol(event, Decl(recursiveTypeComparison2.ts, 12, 58)) ->Event : Symbol(Event, Decl(recursiveTypeComparison2.ts, 2, 22)) +>Event : Symbol(Event, Decl(recursiveTypeComparison2.ts, 2, 25)) >T : Symbol(T, Decl(recursiveTypeComparison2.ts, 7, 25)) >StateValue : Symbol(StateValue) >U : Symbol(U, Decl(recursiveTypeComparison2.ts, 12, 25)) @@ -108,7 +108,7 @@ declare module Bacon { >withHandler : Symbol(Observable.withHandler, Decl(recursiveTypeComparison2.ts, 15, 61)) >f : Symbol(f, Decl(recursiveTypeComparison2.ts, 16, 20)) >event : Symbol(event, Decl(recursiveTypeComparison2.ts, 16, 24)) ->Event : Symbol(Event, Decl(recursiveTypeComparison2.ts, 2, 22)) +>Event : Symbol(Event, Decl(recursiveTypeComparison2.ts, 2, 25)) >T : Symbol(T, Decl(recursiveTypeComparison2.ts, 7, 25)) >Observable : Symbol(Observable, Decl(recursiveTypeComparison2.ts, 6, 5)) >T : Symbol(T, Decl(recursiveTypeComparison2.ts, 7, 25)) diff --git a/tests/baselines/reference/recursiveTypeComparison2.types b/tests/baselines/reference/recursiveTypeComparison2.types index 9f8d4d2de2a60..1b94c3756412a 100644 --- a/tests/baselines/reference/recursiveTypeComparison2.types +++ b/tests/baselines/reference/recursiveTypeComparison2.types @@ -3,7 +3,7 @@ === recursiveTypeComparison2.ts === // Before fix this would cause compiler to hang (#1170) -declare module Bacon { +declare namespace Bacon { >Bacon : typeof Bacon > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js index 7deb3a732977c..07c9759f6f50d 100644 --- a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js +++ b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/recursivelySpecializedConstructorDeclaration.ts] //// //// [recursivelySpecializedConstructorDeclaration.ts] -module MsPortal.Controls.Base.ItemList { +namespace MsPortal.Controls.Base.ItemList { export interface Interface { // Removing this line fixes the constructor of ItemValue diff --git a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.symbols b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.symbols index 921de169cbf1c..c6fe9b985126d 100644 --- a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.symbols +++ b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.symbols @@ -1,14 +1,14 @@ //// [tests/cases/compiler/recursivelySpecializedConstructorDeclaration.ts] //// === recursivelySpecializedConstructorDeclaration.ts === -module MsPortal.Controls.Base.ItemList { +namespace MsPortal.Controls.Base.ItemList { >MsPortal : Symbol(MsPortal, Decl(recursivelySpecializedConstructorDeclaration.ts, 0, 0)) ->Controls : Symbol(Controls, Decl(recursivelySpecializedConstructorDeclaration.ts, 0, 16)) ->Base : Symbol(Base, Decl(recursivelySpecializedConstructorDeclaration.ts, 0, 25)) ->ItemList : Symbol(ItemList, Decl(recursivelySpecializedConstructorDeclaration.ts, 0, 30)) +>Controls : Symbol(Controls, Decl(recursivelySpecializedConstructorDeclaration.ts, 0, 19)) +>Base : Symbol(Base, Decl(recursivelySpecializedConstructorDeclaration.ts, 0, 28)) +>ItemList : Symbol(ItemList, Decl(recursivelySpecializedConstructorDeclaration.ts, 0, 33)) export interface Interface { ->Interface : Symbol(Interface, Decl(recursivelySpecializedConstructorDeclaration.ts, 0, 40)) +>Interface : Symbol(Interface, Decl(recursivelySpecializedConstructorDeclaration.ts, 0, 43)) >TValue : Symbol(TValue, Decl(recursivelySpecializedConstructorDeclaration.ts, 2, 31)) // Removing this line fixes the constructor of ItemValue diff --git a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.types b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.types index 0c4af04bbc046..2224b68cb664e 100644 --- a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.types +++ b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/recursivelySpecializedConstructorDeclaration.ts] //// === recursivelySpecializedConstructorDeclaration.ts === -module MsPortal.Controls.Base.ItemList { +namespace MsPortal.Controls.Base.ItemList { >MsPortal : typeof MsPortal > : ^^^^^^^^^^^^^^^ >Controls : typeof Controls diff --git a/tests/baselines/reference/relativePathToDeclarationFile.js b/tests/baselines/reference/relativePathToDeclarationFile.js index ddc7a2710c8d5..336a7b49de38c 100644 --- a/tests/baselines/reference/relativePathToDeclarationFile.js +++ b/tests/baselines/reference/relativePathToDeclarationFile.js @@ -1,12 +1,12 @@ //// [tests/cases/conformance/externalModules/relativePathToDeclarationFile.ts] //// //// [foo.d.ts] -export declare module M2 { +export declare namespace M2 { export var x: boolean; } //// [other.d.ts] -export declare module M2 { +export declare namespace M2 { export var x: string; } diff --git a/tests/baselines/reference/relativePathToDeclarationFile.symbols b/tests/baselines/reference/relativePathToDeclarationFile.symbols index e4fa22520ae71..c0298a0ced51b 100644 --- a/tests/baselines/reference/relativePathToDeclarationFile.symbols +++ b/tests/baselines/reference/relativePathToDeclarationFile.symbols @@ -30,7 +30,7 @@ if(foo.M2.x){ } === test/foo.d.ts === -export declare module M2 { +export declare namespace M2 { >M2 : Symbol(M2, Decl(foo.d.ts, 0, 0)) export var x: boolean; @@ -38,7 +38,7 @@ export declare module M2 { } === test/other.d.ts === -export declare module M2 { +export declare namespace M2 { >M2 : Symbol(M2, Decl(other.d.ts, 0, 0)) export var x: string; diff --git a/tests/baselines/reference/relativePathToDeclarationFile.types b/tests/baselines/reference/relativePathToDeclarationFile.types index dbe995b668fb3..6af5c2a28297f 100644 --- a/tests/baselines/reference/relativePathToDeclarationFile.types +++ b/tests/baselines/reference/relativePathToDeclarationFile.types @@ -53,7 +53,7 @@ if(foo.M2.x){ } === test/foo.d.ts === -export declare module M2 { +export declare namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ @@ -63,7 +63,7 @@ export declare module M2 { } === test/other.d.ts === -export declare module M2 { +export declare namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/requireEmitSemicolon.js b/tests/baselines/reference/requireEmitSemicolon.js index ceed6361f40eb..efdefc00005d8 100644 --- a/tests/baselines/reference/requireEmitSemicolon.js +++ b/tests/baselines/reference/requireEmitSemicolon.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/requireEmitSemicolon.ts] //// //// [requireEmitSemicolon_0.ts] -export module Models { +export namespace Models { export class Person { constructor(name: string) { } } @@ -11,7 +11,7 @@ export module Models { /// import P = require("requireEmitSemicolon_0"); // bug was we were not emitting a ; here and causing runtime failures in node -export module Database { +export namespace Database { export class DB { public findPerson(id: number): P.Models.Person { return new P.Models.Person("Rock"); diff --git a/tests/baselines/reference/requireEmitSemicolon.symbols b/tests/baselines/reference/requireEmitSemicolon.symbols index 322e84908f8c3..b8f9d28b2b29c 100644 --- a/tests/baselines/reference/requireEmitSemicolon.symbols +++ b/tests/baselines/reference/requireEmitSemicolon.symbols @@ -5,34 +5,34 @@ import P = require("requireEmitSemicolon_0"); // bug was we were not emitting a ; here and causing runtime failures in node >P : Symbol(P, Decl(requireEmitSemicolon_1.ts, 0, 0)) -export module Database { +export namespace Database { >Database : Symbol(Database, Decl(requireEmitSemicolon_1.ts, 1, 45)) export class DB { ->DB : Symbol(DB, Decl(requireEmitSemicolon_1.ts, 3, 24)) +>DB : Symbol(DB, Decl(requireEmitSemicolon_1.ts, 3, 27)) public findPerson(id: number): P.Models.Person { >findPerson : Symbol(DB.findPerson, Decl(requireEmitSemicolon_1.ts, 4, 18)) >id : Symbol(id, Decl(requireEmitSemicolon_1.ts, 5, 23)) >P : Symbol(P, Decl(requireEmitSemicolon_1.ts, 0, 0)) >Models : Symbol(P.Models, Decl(requireEmitSemicolon_0.ts, 0, 0)) ->Person : Symbol(P.Models.Person, Decl(requireEmitSemicolon_0.ts, 0, 22)) +>Person : Symbol(P.Models.Person, Decl(requireEmitSemicolon_0.ts, 0, 25)) return new P.Models.Person("Rock"); ->P.Models.Person : Symbol(P.Models.Person, Decl(requireEmitSemicolon_0.ts, 0, 22)) +>P.Models.Person : Symbol(P.Models.Person, Decl(requireEmitSemicolon_0.ts, 0, 25)) >P.Models : Symbol(P.Models, Decl(requireEmitSemicolon_0.ts, 0, 0)) >P : Symbol(P, Decl(requireEmitSemicolon_1.ts, 0, 0)) >Models : Symbol(P.Models, Decl(requireEmitSemicolon_0.ts, 0, 0)) ->Person : Symbol(P.Models.Person, Decl(requireEmitSemicolon_0.ts, 0, 22)) +>Person : Symbol(P.Models.Person, Decl(requireEmitSemicolon_0.ts, 0, 25)) } } } === requireEmitSemicolon_0.ts === -export module Models { +export namespace Models { >Models : Symbol(Models, Decl(requireEmitSemicolon_0.ts, 0, 0)) export class Person { ->Person : Symbol(Person, Decl(requireEmitSemicolon_0.ts, 0, 22)) +>Person : Symbol(Person, Decl(requireEmitSemicolon_0.ts, 0, 25)) constructor(name: string) { } >name : Symbol(name, Decl(requireEmitSemicolon_0.ts, 2, 20)) diff --git a/tests/baselines/reference/requireEmitSemicolon.types b/tests/baselines/reference/requireEmitSemicolon.types index 052fc709fa198..f77d8c8f4c698 100644 --- a/tests/baselines/reference/requireEmitSemicolon.types +++ b/tests/baselines/reference/requireEmitSemicolon.types @@ -6,7 +6,7 @@ import P = require("requireEmitSemicolon_0"); // bug was we were not emitting a >P : typeof P > : ^^^^^^^^ -export module Database { +export namespace Database { >Database : typeof Database > : ^^^^^^^^^^^^^^^ @@ -43,7 +43,7 @@ export module Database { } } === requireEmitSemicolon_0.ts === -export module Models { +export namespace Models { >Models : typeof Models > : ^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/reservedNameOnInterfaceImport.errors.txt b/tests/baselines/reference/reservedNameOnInterfaceImport.errors.txt index 2f044a77a9201..017b0787a7c7b 100644 --- a/tests/baselines/reference/reservedNameOnInterfaceImport.errors.txt +++ b/tests/baselines/reference/reservedNameOnInterfaceImport.errors.txt @@ -2,7 +2,7 @@ reservedNameOnInterfaceImport.ts(5,12): error TS2438: Import name cannot be 'str ==== reservedNameOnInterfaceImport.ts (1 errors) ==== - declare module test { + declare namespace test { interface istring { } // Should error; 'test.istring' is a type, so this import conflicts with the 'string' type. diff --git a/tests/baselines/reference/reservedNameOnInterfaceImport.js b/tests/baselines/reference/reservedNameOnInterfaceImport.js index feab0aa2b07e7..22561e862f172 100644 --- a/tests/baselines/reference/reservedNameOnInterfaceImport.js +++ b/tests/baselines/reference/reservedNameOnInterfaceImport.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/reservedNameOnInterfaceImport.ts] //// //// [reservedNameOnInterfaceImport.ts] -declare module test { +declare namespace test { interface istring { } // Should error; 'test.istring' is a type, so this import conflicts with the 'string' type. diff --git a/tests/baselines/reference/reservedNameOnInterfaceImport.symbols b/tests/baselines/reference/reservedNameOnInterfaceImport.symbols index 23102f1721971..2c3e37e0ea2b8 100644 --- a/tests/baselines/reference/reservedNameOnInterfaceImport.symbols +++ b/tests/baselines/reference/reservedNameOnInterfaceImport.symbols @@ -1,16 +1,16 @@ //// [tests/cases/compiler/reservedNameOnInterfaceImport.ts] //// === reservedNameOnInterfaceImport.ts === -declare module test { +declare namespace test { >test : Symbol(test, Decl(reservedNameOnInterfaceImport.ts, 0, 0)) interface istring { } ->istring : Symbol(istring, Decl(reservedNameOnInterfaceImport.ts, 0, 21)) +>istring : Symbol(istring, Decl(reservedNameOnInterfaceImport.ts, 0, 24)) // Should error; 'test.istring' is a type, so this import conflicts with the 'string' type. import string = test.istring; >string : Symbol(string, Decl(reservedNameOnInterfaceImport.ts, 1, 25)) >test : Symbol(test, Decl(reservedNameOnInterfaceImport.ts, 0, 0)) ->istring : Symbol(istring, Decl(reservedNameOnInterfaceImport.ts, 0, 21)) +>istring : Symbol(istring, Decl(reservedNameOnInterfaceImport.ts, 0, 24)) } diff --git a/tests/baselines/reference/reservedNameOnInterfaceImport.types b/tests/baselines/reference/reservedNameOnInterfaceImport.types index aa6c4cdea0438..051db6fc85c3c 100644 --- a/tests/baselines/reference/reservedNameOnInterfaceImport.types +++ b/tests/baselines/reference/reservedNameOnInterfaceImport.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/reservedNameOnInterfaceImport.ts] //// === reservedNameOnInterfaceImport.ts === -declare module test { +declare namespace test { interface istring { } // Should error; 'test.istring' is a type, so this import conflicts with the 'string' type. diff --git a/tests/baselines/reference/reservedNameOnModuleImport.js b/tests/baselines/reference/reservedNameOnModuleImport.js index 67264d5260854..1135c162f1149 100644 --- a/tests/baselines/reference/reservedNameOnModuleImport.js +++ b/tests/baselines/reference/reservedNameOnModuleImport.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/reservedNameOnModuleImport.ts] //// //// [reservedNameOnModuleImport.ts] -declare module test { - module mstring { } +declare namespace test { + namespace mstring { } // Should be fine; this does not clobber any declared values. export import string = mstring; diff --git a/tests/baselines/reference/reservedNameOnModuleImport.symbols b/tests/baselines/reference/reservedNameOnModuleImport.symbols index 7e204df328c44..4a7054d7fef4f 100644 --- a/tests/baselines/reference/reservedNameOnModuleImport.symbols +++ b/tests/baselines/reference/reservedNameOnModuleImport.symbols @@ -1,15 +1,15 @@ //// [tests/cases/compiler/reservedNameOnModuleImport.ts] //// === reservedNameOnModuleImport.ts === -declare module test { +declare namespace test { >test : Symbol(test, Decl(reservedNameOnModuleImport.ts, 0, 0)) - module mstring { } ->mstring : Symbol(mstring, Decl(reservedNameOnModuleImport.ts, 0, 21)) + namespace mstring { } +>mstring : Symbol(mstring, Decl(reservedNameOnModuleImport.ts, 0, 24)) // Should be fine; this does not clobber any declared values. export import string = mstring; ->string : Symbol(string, Decl(reservedNameOnModuleImport.ts, 1, 22)) ->mstring : Symbol(mstring, Decl(reservedNameOnModuleImport.ts, 0, 21)) +>string : Symbol(string, Decl(reservedNameOnModuleImport.ts, 1, 25)) +>mstring : Symbol(mstring, Decl(reservedNameOnModuleImport.ts, 0, 24)) } diff --git a/tests/baselines/reference/reservedNameOnModuleImport.types b/tests/baselines/reference/reservedNameOnModuleImport.types index c98bb89a099dd..a3a078eb51313 100644 --- a/tests/baselines/reference/reservedNameOnModuleImport.types +++ b/tests/baselines/reference/reservedNameOnModuleImport.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/reservedNameOnModuleImport.ts] //// === reservedNameOnModuleImport.ts === -declare module test { +declare namespace test { >test : typeof test > : ^^^^^^^^^^^ - module mstring { } + namespace mstring { } // Should be fine; this does not clobber any declared values. export import string = mstring; diff --git a/tests/baselines/reference/reservedNameOnModuleImportWithInterface.errors.txt b/tests/baselines/reference/reservedNameOnModuleImportWithInterface.errors.txt index 8840f387c6b5d..e75be7e049b7b 100644 --- a/tests/baselines/reference/reservedNameOnModuleImportWithInterface.errors.txt +++ b/tests/baselines/reference/reservedNameOnModuleImportWithInterface.errors.txt @@ -2,9 +2,9 @@ reservedNameOnModuleImportWithInterface.ts(6,12): error TS2438: Import name cann ==== reservedNameOnModuleImportWithInterface.ts (1 errors) ==== - declare module test { + declare namespace test { interface mi_string { } - module mi_string { } + namespace mi_string { } // Should error; imports both a type and a module, which means it conflicts with the 'string' type. import string = mi_string; diff --git a/tests/baselines/reference/reservedNameOnModuleImportWithInterface.js b/tests/baselines/reference/reservedNameOnModuleImportWithInterface.js index aff25a42ed307..0ef159f4ad20b 100644 --- a/tests/baselines/reference/reservedNameOnModuleImportWithInterface.js +++ b/tests/baselines/reference/reservedNameOnModuleImportWithInterface.js @@ -1,9 +1,9 @@ //// [tests/cases/compiler/reservedNameOnModuleImportWithInterface.ts] //// //// [reservedNameOnModuleImportWithInterface.ts] -declare module test { +declare namespace test { interface mi_string { } - module mi_string { } + namespace mi_string { } // Should error; imports both a type and a module, which means it conflicts with the 'string' type. import string = mi_string; diff --git a/tests/baselines/reference/reservedNameOnModuleImportWithInterface.symbols b/tests/baselines/reference/reservedNameOnModuleImportWithInterface.symbols index 5db50cca6fdd4..a46bd40cfde9e 100644 --- a/tests/baselines/reference/reservedNameOnModuleImportWithInterface.symbols +++ b/tests/baselines/reference/reservedNameOnModuleImportWithInterface.symbols @@ -1,18 +1,18 @@ //// [tests/cases/compiler/reservedNameOnModuleImportWithInterface.ts] //// === reservedNameOnModuleImportWithInterface.ts === -declare module test { +declare namespace test { >test : Symbol(test, Decl(reservedNameOnModuleImportWithInterface.ts, 0, 0)) interface mi_string { } ->mi_string : Symbol(mi_string, Decl(reservedNameOnModuleImportWithInterface.ts, 0, 21), Decl(reservedNameOnModuleImportWithInterface.ts, 1, 27)) +>mi_string : Symbol(mi_string, Decl(reservedNameOnModuleImportWithInterface.ts, 0, 24), Decl(reservedNameOnModuleImportWithInterface.ts, 1, 27)) - module mi_string { } ->mi_string : Symbol(mi_string, Decl(reservedNameOnModuleImportWithInterface.ts, 0, 21), Decl(reservedNameOnModuleImportWithInterface.ts, 1, 27)) + namespace mi_string { } +>mi_string : Symbol(mi_string, Decl(reservedNameOnModuleImportWithInterface.ts, 0, 24), Decl(reservedNameOnModuleImportWithInterface.ts, 1, 27)) // Should error; imports both a type and a module, which means it conflicts with the 'string' type. import string = mi_string; ->string : Symbol(string, Decl(reservedNameOnModuleImportWithInterface.ts, 2, 24)) ->mi_string : Symbol(mi_string, Decl(reservedNameOnModuleImportWithInterface.ts, 0, 21), Decl(reservedNameOnModuleImportWithInterface.ts, 1, 27)) +>string : Symbol(string, Decl(reservedNameOnModuleImportWithInterface.ts, 2, 27)) +>mi_string : Symbol(mi_string, Decl(reservedNameOnModuleImportWithInterface.ts, 0, 24), Decl(reservedNameOnModuleImportWithInterface.ts, 1, 27)) } diff --git a/tests/baselines/reference/reservedNameOnModuleImportWithInterface.types b/tests/baselines/reference/reservedNameOnModuleImportWithInterface.types index 91f7550724052..f79d6197e1dc7 100644 --- a/tests/baselines/reference/reservedNameOnModuleImportWithInterface.types +++ b/tests/baselines/reference/reservedNameOnModuleImportWithInterface.types @@ -1,9 +1,9 @@ //// [tests/cases/compiler/reservedNameOnModuleImportWithInterface.ts] //// === reservedNameOnModuleImportWithInterface.ts === -declare module test { +declare namespace test { interface mi_string { } - module mi_string { } + namespace mi_string { } // Should error; imports both a type and a module, which means it conflicts with the 'string' type. import string = mi_string; diff --git a/tests/baselines/reference/reservedWords2.errors.txt b/tests/baselines/reference/reservedWords2.errors.txt index 4686d7ff69204..7dea580e5ae8d 100644 --- a/tests/baselines/reference/reservedWords2.errors.txt +++ b/tests/baselines/reference/reservedWords2.errors.txt @@ -14,8 +14,8 @@ reservedWords2.ts(5,9): error TS2300: Duplicate identifier '(Missing)'. reservedWords2.ts(5,9): error TS2567: Enum declarations can only merge with namespace or other enum declarations. reservedWords2.ts(5,10): error TS1359: Identifier expected. 'throw' is a reserved word that cannot be used here. reservedWords2.ts(5,18): error TS1005: '=>' expected. -reservedWords2.ts(6,1): error TS2580: Cannot find name 'module'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`. -reservedWords2.ts(6,8): error TS2819: Namespace name cannot be 'void'. +reservedWords2.ts(6,1): error TS2304: Cannot find name 'namespace'. +reservedWords2.ts(6,11): error TS2819: Namespace name cannot be 'void'. reservedWords2.ts(7,11): error TS2300: Duplicate identifier '(Missing)'. reservedWords2.ts(7,11): error TS1005: ':' expected. reservedWords2.ts(7,19): error TS2300: Duplicate identifier '(Missing)'. @@ -73,10 +73,10 @@ reservedWords2.ts(12,17): error TS1138: Parameter declaration expected. !!! error TS1359: Identifier expected. 'throw' is a reserved word that cannot be used here. ~ !!! error TS1005: '=>' expected. - module void {} - ~~~~~~ -!!! error TS2580: Cannot find name 'module'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`. - ~~~~ + namespace void {} + ~~~~~~~~~ +!!! error TS2304: Cannot find name 'namespace'. + ~~~~ !!! error TS2819: Namespace name cannot be 'void'. var {while, return} = { while: 1, return: 2 }; diff --git a/tests/baselines/reference/reservedWords2.js b/tests/baselines/reference/reservedWords2.js index 359cf52fea3cd..74828ac143a39 100644 --- a/tests/baselines/reference/reservedWords2.js +++ b/tests/baselines/reference/reservedWords2.js @@ -6,7 +6,7 @@ import * as while from "foo" var typeof = 10; function throw() {} -module void {} +namespace void {} var {while, return} = { while: 1, return: 2 }; var {this, switch: { continue} } = { this: 1, switch: { continue: 2 }}; var [debugger, if] = [1, 2]; @@ -28,7 +28,7 @@ typeof ; 10; function () { } throw function () { }; -module; +namespace; void {}; var _a = { while: 1, return: 2 }, = _a.while, = _a.return; var _b = { this: 1, switch: { continue: 2 } }, = _b.this, = _b.switch.continue; diff --git a/tests/baselines/reference/reservedWords2.symbols b/tests/baselines/reference/reservedWords2.symbols index 45878aa846b4a..280f2823cefa8 100644 --- a/tests/baselines/reference/reservedWords2.symbols +++ b/tests/baselines/reference/reservedWords2.symbols @@ -9,7 +9,7 @@ var typeof = 10; function throw() {} > : Symbol((Missing), Decl(reservedWords2.ts, 3, 16), Decl(reservedWords2.ts, 1, 6)) -module void {} +namespace void {} var {while, return} = { while: 1, return: 2 }; >while : Symbol(while, Decl(reservedWords2.ts, 6, 23)) > : Symbol((Missing), Decl(reservedWords2.ts, 6, 5)) diff --git a/tests/baselines/reference/reservedWords2.types b/tests/baselines/reference/reservedWords2.types index ffe5b6cc689e3..de43496851821 100644 --- a/tests/baselines/reference/reservedWords2.types +++ b/tests/baselines/reference/reservedWords2.types @@ -39,9 +39,9 @@ function throw() {} >() {} : () => void > : ^^^^^^^^^^ -module void {} ->module : any -> : ^^^ +namespace void {} +>namespace : any +> : ^^^ >void {} : undefined > : ^^^^^^^^^ >{} : {} diff --git a/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName1.js b/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName1.js index 82053cd4be4e8..d64dc3b98b633 100644 --- a/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName1.js +++ b/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/resolveModuleNameWithSameLetDeclarationName1.ts] //// //// [resolveModuleNameWithSameLetDeclarationName1.ts] -declare module foo { +declare namespace foo { interface Bar { diff --git a/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName1.symbols b/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName1.symbols index 75a532f6ed238..184287c139f33 100644 --- a/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName1.symbols +++ b/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName1.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/resolveModuleNameWithSameLetDeclarationName1.ts] //// === resolveModuleNameWithSameLetDeclarationName1.ts === -declare module foo { +declare namespace foo { >foo : Symbol(foo, Decl(resolveModuleNameWithSameLetDeclarationName1.ts, 0, 0), Decl(resolveModuleNameWithSameLetDeclarationName1.ts, 7, 3)) interface Bar { ->Bar : Symbol(Bar, Decl(resolveModuleNameWithSameLetDeclarationName1.ts, 0, 20)) +>Bar : Symbol(Bar, Decl(resolveModuleNameWithSameLetDeclarationName1.ts, 0, 23)) } } @@ -13,5 +13,5 @@ declare module foo { let foo: foo.Bar; >foo : Symbol(foo, Decl(resolveModuleNameWithSameLetDeclarationName1.ts, 0, 0), Decl(resolveModuleNameWithSameLetDeclarationName1.ts, 7, 3)) >foo : Symbol(foo, Decl(resolveModuleNameWithSameLetDeclarationName1.ts, 0, 0), Decl(resolveModuleNameWithSameLetDeclarationName1.ts, 7, 3)) ->Bar : Symbol(foo.Bar, Decl(resolveModuleNameWithSameLetDeclarationName1.ts, 0, 20)) +>Bar : Symbol(foo.Bar, Decl(resolveModuleNameWithSameLetDeclarationName1.ts, 0, 23)) diff --git a/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName1.types b/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName1.types index 9c0d227ae4d45..71f92266ce1cf 100644 --- a/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName1.types +++ b/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/resolveModuleNameWithSameLetDeclarationName1.ts] //// === resolveModuleNameWithSameLetDeclarationName1.ts === -declare module foo { +declare namespace foo { interface Bar { diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.errors.txt b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.errors.txt index 299438f52428c..6ec9e9b8d5c28 100644 --- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.errors.txt +++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.errors.txt @@ -25,7 +25,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas ==== resolvingClassDeclarationWhenInBaseTypeResolution.ts (24 errors) ==== - module rionegrensis { + namespace rionegrensis { export class caniventer extends Lanthanum.nitidus { ~~~~~~~ !!! error TS2449: Class 'nitidus' used before its declaration. @@ -47,7 +47,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas nivicola() : samarensis.pallidus { var x : samarensis.pallidus; () => { var y = this; }; return x; } } } - module julianae { + namespace julianae { export class steerii { } export class nudicaudus { @@ -141,13 +141,13 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas phrudus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; } } } - module ruatanica { + namespace ruatanica { export class hector { humulis() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; } eurycerus() : panamensis.linulus, lavali.wilsoni> { var x : panamensis.linulus, lavali.wilsoni>; () => { var y = this; }; return x; } } } - module Lanthanum { + namespace Lanthanum { export class suillus { spilosoma() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; } tumbalensis() : caurinus.megaphyllus { var x : caurinus.megaphyllus; () => { var y = this; }; return x; } @@ -198,7 +198,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas ileile() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; } } } - module rendalli { + namespace rendalli { export class zuluensis extends julianae.steerii { telfairi() : argurus.wetmorei { var x : argurus.wetmorei; () => { var y = this; }; return x; } keyensis() : quasiater.wattsi { var x : quasiater.wattsi; () => { var y = this; }; return x; } @@ -236,7 +236,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas edax() : lutreolus.cor>, rionegrensis.caniventer> { var x : lutreolus.cor>, rionegrensis.caniventer>; () => { var y = this; }; return x; } } } - module trivirgatus { + namespace trivirgatus { export class tumidifrons { nivalis() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; } vestitus() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; } @@ -289,7 +289,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas ralli() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; } } } - module quasiater { + namespace quasiater { export class bobrinskoi { crassicaudatus() : samarensis.cahirinus { var x : samarensis.cahirinus; () => { var y = this; }; return x; } mulatta() : argurus.oreas { var x : argurus.oreas; () => { var y = this; }; return x; } @@ -297,7 +297,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas Copper() : argurus.netscheri { var x : argurus.netscheri; () => { var y = this; }; return x; } } } - module ruatanica { + namespace ruatanica { export class americanus extends imperfecta.ciliolabrum { ~~~~~~~~~~~ !!! error TS2449: Class 'ciliolabrum' used before its declaration. @@ -308,7 +308,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas tumidus() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; } } } - module lavali { + namespace lavali { export class wilsoni extends Lanthanum.nitidus { setiger() : nigra.thalia { var x : nigra.thalia; () => { var y = this; }; return x; } lorentzii() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; } @@ -376,7 +376,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas aequalis() : sagitta.cinereus>, petrophilus.minutilla>, Lanthanum.jugularis> { var x : sagitta.cinereus>, petrophilus.minutilla>, Lanthanum.jugularis>; () => { var y = this; }; return x; } } } - module dogramacii { + namespace dogramacii { export class robustulus extends lavali.wilsoni { fossor() : minutus.inez { var x : minutus.inez; () => { var y = this; }; return x; } humboldti() : sagitta.cinereus { var x : sagitta.cinereus; () => { var y = this; }; return x; } @@ -417,7 +417,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas erythromos() : caurinus.johorensis, nigra.dolichurus> { var x : caurinus.johorensis, nigra.dolichurus>; () => { var y = this; }; return x; } } } - module lutreolus { + namespace lutreolus { export class schlegeli extends lavali.beisa { mittendorfi() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; } blicki() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; } @@ -435,7 +435,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas dispar() : panamensis.linulus { var x : panamensis.linulus; () => { var y = this; }; return x; } } } - module argurus { + namespace argurus { export class dauricus { chinensis() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; } duodecimcostatus() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; } @@ -450,7 +450,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas misionensis() : macrorhinos.marmosurus, gabriellae.echinatus> { var x : macrorhinos.marmosurus, gabriellae.echinatus>; () => { var y = this; }; return x; } } } - module nigra { + namespace nigra { export class dolichurus { solomonis() : panglima.abidi, argurus.netscheri, julianae.oralis>>> { var x : panglima.abidi, argurus.netscheri, julianae.oralis>>>; () => { var y = this; }; return x; } alfredi() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; } @@ -462,7 +462,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas sagei() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; } } } - module panglima { + namespace panglima { export class amphibius extends caurinus.johorensis, Lanthanum.jugularis> { ~~~~~~~~~~ !!! error TS2449: Class 'johorensis' used before its declaration. @@ -487,7 +487,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas ega(): imperfecta.lasiurus> { var x: imperfecta.lasiurus>; () => { var y = this; }; return x; } } } - module quasiater { + namespace quasiater { export class carolinensis { concinna(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; } aeneus(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; } @@ -498,7 +498,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas patrizii(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; } } } - module minutus { + namespace minutus { export class himalayana extends lutreolus.punicus { ~~~~~~~ !!! error TS2449: Class 'punicus' used before its declaration. @@ -517,7 +517,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas olympus(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; } } } - module caurinus { + namespace caurinus { export class mahaganus extends panglima.fundatus { martiniquensis(): ruatanica.hector>> { var x: ruatanica.hector>>; () => { var y = this; }; return x; } devius(): samarensis.pelurus, trivirgatus.falconeri>> { var x: samarensis.pelurus, trivirgatus.falconeri>>; () => { var y = this; }; return x; } @@ -529,12 +529,12 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas acticola(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; } } } - module macrorhinos { + namespace macrorhinos { export class marmosurus { tansaniana(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; } } } - module howi { + namespace howi { export class angulatus extends sagitta.stolzmanni { ~~~~~~~~~~ !!! error TS2449: Class 'stolzmanni' used before its declaration. @@ -542,11 +542,11 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas pennatus(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; } } } - module daubentonii { + namespace daubentonii { export class nesiotes { } } - module nigra { + namespace nigra { export class thalia { dichotomus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } arnuxii(): panamensis.linulus, lavali.beisa> { var x: panamensis.linulus, lavali.beisa>; () => { var y = this; }; return x; } @@ -558,7 +558,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas brucei(): chrysaeolus.sarasinorum { var x: chrysaeolus.sarasinorum; () => { var y = this; }; return x; } } } - module sagitta { + namespace sagitta { export class walkeri extends minutus.portoricensis { ~~~~~~~~~~~~~ !!! error TS2449: Class 'portoricensis' used before its declaration. @@ -566,7 +566,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas maracajuensis(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } } } - module minutus { + namespace minutus { export class inez extends samarensis.pelurus { ~~~~~~~ !!! error TS2449: Class 'pelurus' used before its declaration. @@ -574,14 +574,14 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas vexillaris(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } } } - module macrorhinos { + namespace macrorhinos { export class konganensis extends imperfecta.lasiurus { ~~~~~~~~ !!! error TS2449: Class 'lasiurus' used before its declaration. !!! related TS2728 resolvingClassDeclarationWhenInBaseTypeResolution.ts:788:18: 'lasiurus' is declared here. } } - module panamensis { + namespace panamensis { export class linulus extends ruatanica.hector> { goslingi(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } taki(): patas.uralensis { var x: patas.uralensis; () => { var y = this; }; return x; } @@ -594,7 +594,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas gomantongensis(): rionegrensis.veraecrucis> { var x: rionegrensis.veraecrucis>; () => { var y = this; }; return x; } } } - module nigra { + namespace nigra { export class gracilis { weddellii(): nigra.dolichurus { var x: nigra.dolichurus; () => { var y = this; }; return x; } echinothrix(): Lanthanum.nitidus, argurus.oreas> { var x: Lanthanum.nitidus, argurus.oreas>; () => { var y = this; }; return x; } @@ -611,7 +611,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas ramirohitra(): panglima.amphibius { var x: panglima.amphibius; () => { var y = this; }; return x; } } } - module samarensis { + namespace samarensis { export class pelurus extends sagitta.stolzmanni { ~~~~~~~~~~ !!! error TS2449: Class 'stolzmanni' used before its declaration. @@ -663,7 +663,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas saussurei(): rendalli.crenulata, argurus.netscheri, julianae.oralis>> { var x: rendalli.crenulata, argurus.netscheri, julianae.oralis>>; () => { var y = this; }; return x; } } } - module sagitta { + namespace sagitta { export class leptoceros extends caurinus.johorensis> { ~~~~~~~~~~ !!! error TS2449: Class 'johorensis' used before its declaration. @@ -675,7 +675,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas bolami(): trivirgatus.tumidifrons { var x: trivirgatus.tumidifrons; () => { var y = this; }; return x; } } } - module daubentonii { + namespace daubentonii { export class nigricans extends sagitta.stolzmanni { ~~~~~~~~~~ !!! error TS2449: Class 'stolzmanni' used before its declaration. @@ -683,18 +683,18 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas woosnami(): dogramacii.robustulus { var x: dogramacii.robustulus; () => { var y = this; }; return x; } } } - module dammermani { + namespace dammermani { export class siberu { } } - module argurus { + namespace argurus { export class pygmaea extends rendalli.moojeni { pajeros(): gabriellae.echinatus { var x: gabriellae.echinatus; () => { var y = this; }; return x; } capucinus(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; } cuvieri(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; } } } - module chrysaeolus { + namespace chrysaeolus { export class sarasinorum extends caurinus.psilurus { ~~~~~~~~ !!! error TS2449: Class 'psilurus' used before its declaration. @@ -708,7 +708,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas princeps(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; } } } - module argurus { + namespace argurus { export class wetmorei { leucoptera(): petrophilus.rosalia { var x: petrophilus.rosalia; () => { var y = this; }; return x; } ochraventer(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; } @@ -719,7 +719,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas mayori(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; } } } - module argurus { + namespace argurus { export class oreas extends lavali.wilsoni { salamonis(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; } paniscus(): ruatanica.Praseodymium { var x: ruatanica.Praseodymium; () => { var y = this; }; return x; } @@ -731,7 +731,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas univittatus(): argurus.peninsulae { var x: argurus.peninsulae; () => { var y = this; }; return x; } } } - module daubentonii { + namespace daubentonii { export class arboreus { capreolus(): rendalli.crenulata, lavali.wilsoni> { var x: rendalli.crenulata, lavali.wilsoni>; () => { var y = this; }; return x; } moreni(): panglima.abidi { var x: panglima.abidi; () => { var y = this; }; return x; } @@ -747,7 +747,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas tianshanica(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; } } } - module patas { + namespace patas { export class uralensis { cartilagonodus(): Lanthanum.nitidus { var x: Lanthanum.nitidus; () => { var y = this; }; return x; } pyrrhinus(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; } @@ -764,19 +764,19 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas albiventer(): rendalli.crenulata { var x: rendalli.crenulata; () => { var y = this; }; return x; } } } - module provocax { + namespace provocax { export class melanoleuca extends lavali.wilsoni { Neodymium(): macrorhinos.marmosurus, lutreolus.foina> { var x: macrorhinos.marmosurus, lutreolus.foina>; () => { var y = this; }; return x; } baeri(): imperfecta.lasiurus { var x: imperfecta.lasiurus; () => { var y = this; }; return x; } } } - module sagitta { + namespace sagitta { export class sicarius { Chlorine(): samarensis.cahirinus, dogramacii.robustulus> { var x: samarensis.cahirinus, dogramacii.robustulus>; () => { var y = this; }; return x; } simulator(): macrorhinos.marmosurus, macrorhinos.marmosurus, gabriellae.echinatus>, sagitta.stolzmanni>> { var x: macrorhinos.marmosurus, macrorhinos.marmosurus, gabriellae.echinatus>, sagitta.stolzmanni>>; () => { var y = this; }; return x; } } } - module howi { + namespace howi { export class marcanoi extends Lanthanum.megalonyx { formosae(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; } dudui(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; } @@ -794,7 +794,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas hyaena(): julianae.oralis { var x: julianae.oralis; () => { var y = this; }; return x; } } } - module argurus { + namespace argurus { export class gilbertii { nasutus(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; } poecilops(): julianae.steerii { var x: julianae.steerii; () => { var y = this; }; return x; } @@ -810,11 +810,11 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas amurensis(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } } } - module petrophilus { + namespace petrophilus { export class minutilla { } } - module lutreolus { + namespace lutreolus { export class punicus { strandi(): gabriellae.klossii { var x: gabriellae.klossii; () => { var y = this; }; return x; } lar(): caurinus.mahaganus { var x: caurinus.mahaganus; () => { var y = this; }; return x; } @@ -831,7 +831,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas Helium(): julianae.acariensis { var x: julianae.acariensis; () => { var y = this; }; return x; } } } - module macrorhinos { + namespace macrorhinos { export class daphaenodon { bredanensis(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; } othus(): howi.coludo { var x: howi.coludo; () => { var y = this; }; return x; } @@ -841,7 +841,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas callosus(): trivirgatus.lotor { var x: trivirgatus.lotor; () => { var y = this; }; return x; } } } - module sagitta { + namespace sagitta { export class cinereus { zunigae(): rendalli.crenulata> { var x: rendalli.crenulata>; () => { var y = this; }; return x; } microps(): daubentonii.nigricans> { var x: daubentonii.nigricans>; () => { var y = this; }; return x; } @@ -857,11 +857,11 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas pittieri(): samarensis.fuscus { var x: samarensis.fuscus; () => { var y = this; }; return x; } } } - module nigra { + namespace nigra { export class caucasica { } } - module gabriellae { + namespace gabriellae { export class klossii extends imperfecta.lasiurus { ~~~~~~~~ !!! error TS2449: Class 'lasiurus' used before its declaration. @@ -883,7 +883,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas tenuipes(): howi.coludo> { var x: howi.coludo>; () => { var y = this; }; return x; } } } - module imperfecta { + namespace imperfecta { export class lasiurus { marisae(): lavali.thaeleri { var x: lavali.thaeleri; () => { var y = this; }; return x; } fulvus(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; } @@ -911,7 +911,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas sinicus(): macrorhinos.marmosurus { var x: macrorhinos.marmosurus; () => { var y = this; }; return x; } } } - module quasiater { + namespace quasiater { export class wattsi { lagotis(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; } hussoni(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; } @@ -919,9 +919,9 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas cabrerae(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; } } } - module butleri { + namespace butleri { } - module petrophilus { + namespace petrophilus { export class sodyi extends quasiater.bobrinskoi { saundersiae(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; } imberbis(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } @@ -934,7 +934,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas bairdii(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; } } } - module caurinus { + namespace caurinus { export class megaphyllus extends imperfecta.lasiurus> { montana(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; } amatus(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; } @@ -946,14 +946,14 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas cirrhosus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } } } - module minutus { + namespace minutus { export class portoricensis { relictus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } aequatorianus(): gabriellae.klossii { var x: gabriellae.klossii; () => { var y = this; }; return x; } rhinogradoides(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } } } - module lutreolus { + namespace lutreolus { export class foina { tarfayensis(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; } Promethium(): samarensis.pelurus { var x: samarensis.pelurus; () => { var y = this; }; return x; } @@ -970,7 +970,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas argentiventer(): trivirgatus.mixtus { var x: trivirgatus.mixtus; () => { var y = this; }; return x; } } } - module lutreolus { + namespace lutreolus { export class cor extends panglima.fundatus, lavali.beisa>, dammermani.melanops> { antinorii(): petrophilus.sodyi { var x: petrophilus.sodyi; () => { var y = this; }; return x; } voi(): caurinus.johorensis { var x: caurinus.johorensis; () => { var y = this; }; return x; } @@ -984,19 +984,19 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas castroviejoi(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; } } } - module howi { + namespace howi { export class coludo { bernhardi(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; } isseli(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; } } } - module argurus { + namespace argurus { export class germaini extends gabriellae.amicus { sharpei(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; } palmarum(): macrorhinos.marmosurus { var x: macrorhinos.marmosurus; () => { var y = this; }; return x; } } } - module sagitta { + namespace sagitta { export class stolzmanni { riparius(): nigra.dolichurus { var x: nigra.dolichurus; () => { var y = this; }; return x; } dhofarensis(): lutreolus.foina { var x: lutreolus.foina; () => { var y = this; }; return x; } @@ -1011,7 +1011,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas florium(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; } } } - module dammermani { + namespace dammermani { export class melanops extends minutus.inez { blarina(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; } harwoodi(): rionegrensis.veraecrucis, lavali.wilsoni> { var x: rionegrensis.veraecrucis, lavali.wilsoni>; () => { var y = this; }; return x; } @@ -1028,7 +1028,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas bocagei(): julianae.albidens { var x: julianae.albidens; () => { var y = this; }; return x; } } } - module argurus { + namespace argurus { export class peninsulae extends patas.uralensis { aitkeni(): trivirgatus.mixtus, panglima.amphibius> { var x: trivirgatus.mixtus, panglima.amphibius>; () => { var y = this; }; return x; } novaeangliae(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; } @@ -1040,7 +1040,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas cavernarum(): minutus.inez { var x: minutus.inez; () => { var y = this; }; return x; } } } - module argurus { + namespace argurus { export class netscheri { gravis(): nigra.caucasica, dogramacii.kaiseri> { var x: nigra.caucasica, dogramacii.kaiseri>; () => { var y = this; }; return x; } ruschii(): imperfecta.lasiurus> { var x: imperfecta.lasiurus>; () => { var y = this; }; return x; } @@ -1057,7 +1057,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas ruemmleri(): panglima.amphibius, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum> { var x: panglima.amphibius, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum>; () => { var y = this; }; return x; } } } - module ruatanica { + namespace ruatanica { export class Praseodymium extends ruatanica.hector { clara(): panglima.amphibius, argurus.dauricus> { var x: panglima.amphibius, argurus.dauricus>; () => { var y = this; }; return x; } spectabilis(): petrophilus.sodyi { var x: petrophilus.sodyi; () => { var y = this; }; return x; } @@ -1074,17 +1074,17 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas soricinus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } } } - module caurinus { + namespace caurinus { export class johorensis extends lutreolus.punicus { maini(): ruatanica.Praseodymium { var x: ruatanica.Praseodymium; () => { var y = this; }; return x; } } } - module argurus { + namespace argurus { export class luctuosa { loriae(): rendalli.moojeni, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus> { var x: rendalli.moojeni, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus>; () => { var y = this; }; return x; } } } - module panamensis { + namespace panamensis { export class setulosus { duthieae(): caurinus.mahaganus, dogramacii.aurata> { var x: caurinus.mahaganus, dogramacii.aurata>; () => { var y = this; }; return x; } guereza(): howi.coludo { var x: howi.coludo; () => { var y = this; }; return x; } @@ -1096,7 +1096,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas vampyrus(): julianae.oralis { var x: julianae.oralis; () => { var y = this; }; return x; } } } - module petrophilus { + namespace petrophilus { export class rosalia { palmeri(): panglima.amphibius>, trivirgatus.mixtus, panglima.amphibius>> { var x: panglima.amphibius>, trivirgatus.mixtus, panglima.amphibius>>; () => { var y = this; }; return x; } baeops(): Lanthanum.nitidus { var x: Lanthanum.nitidus; () => { var y = this; }; return x; } @@ -1105,7 +1105,7 @@ resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Clas montivaga(): panamensis.setulosus> { var x: panamensis.setulosus>; () => { var y = this; }; return x; } } } - module caurinus { + namespace caurinus { export class psilurus extends lutreolus.punicus { socialis(): panglima.amphibius { var x: panglima.amphibius; () => { var y = this; }; return x; } lundi(): petrophilus.sodyi { var x: petrophilus.sodyi; () => { var y = this; }; return x; } diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js index 931c4aed0cb99..4eafd567e4a31 100644 --- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js +++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts] //// //// [resolvingClassDeclarationWhenInBaseTypeResolution.ts] -module rionegrensis { +namespace rionegrensis { export class caniventer extends Lanthanum.nitidus { salomonseni() : caniventer { var x : caniventer; () => { var y = this; }; return x; } uchidai() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; } @@ -17,7 +17,7 @@ module rionegrensis { nivicola() : samarensis.pallidus { var x : samarensis.pallidus; () => { var y = this; }; return x; } } } -module julianae { +namespace julianae { export class steerii { } export class nudicaudus { @@ -102,13 +102,13 @@ module julianae { phrudus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; } } } -module ruatanica { +namespace ruatanica { export class hector { humulis() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; } eurycerus() : panamensis.linulus, lavali.wilsoni> { var x : panamensis.linulus, lavali.wilsoni>; () => { var y = this; }; return x; } } } -module Lanthanum { +namespace Lanthanum { export class suillus { spilosoma() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; } tumbalensis() : caurinus.megaphyllus { var x : caurinus.megaphyllus; () => { var y = this; }; return x; } @@ -153,7 +153,7 @@ module Lanthanum { ileile() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; } } } -module rendalli { +namespace rendalli { export class zuluensis extends julianae.steerii { telfairi() : argurus.wetmorei { var x : argurus.wetmorei; () => { var y = this; }; return x; } keyensis() : quasiater.wattsi { var x : quasiater.wattsi; () => { var y = this; }; return x; } @@ -188,7 +188,7 @@ module rendalli { edax() : lutreolus.cor>, rionegrensis.caniventer> { var x : lutreolus.cor>, rionegrensis.caniventer>; () => { var y = this; }; return x; } } } -module trivirgatus { +namespace trivirgatus { export class tumidifrons { nivalis() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; } vestitus() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; } @@ -238,7 +238,7 @@ module trivirgatus { ralli() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; } } } -module quasiater { +namespace quasiater { export class bobrinskoi { crassicaudatus() : samarensis.cahirinus { var x : samarensis.cahirinus; () => { var y = this; }; return x; } mulatta() : argurus.oreas { var x : argurus.oreas; () => { var y = this; }; return x; } @@ -246,7 +246,7 @@ module quasiater { Copper() : argurus.netscheri { var x : argurus.netscheri; () => { var y = this; }; return x; } } } -module ruatanica { +namespace ruatanica { export class americanus extends imperfecta.ciliolabrum { nasoloi() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; } mystacalis() : howi.angulatus { var x : howi.angulatus; () => { var y = this; }; return x; } @@ -254,7 +254,7 @@ module ruatanica { tumidus() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; } } } -module lavali { +namespace lavali { export class wilsoni extends Lanthanum.nitidus { setiger() : nigra.thalia { var x : nigra.thalia; () => { var y = this; }; return x; } lorentzii() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; } @@ -316,7 +316,7 @@ module lavali { aequalis() : sagitta.cinereus>, petrophilus.minutilla>, Lanthanum.jugularis> { var x : sagitta.cinereus>, petrophilus.minutilla>, Lanthanum.jugularis>; () => { var y = this; }; return x; } } } -module dogramacii { +namespace dogramacii { export class robustulus extends lavali.wilsoni { fossor() : minutus.inez { var x : minutus.inez; () => { var y = this; }; return x; } humboldti() : sagitta.cinereus { var x : sagitta.cinereus; () => { var y = this; }; return x; } @@ -357,7 +357,7 @@ module dogramacii { erythromos() : caurinus.johorensis, nigra.dolichurus> { var x : caurinus.johorensis, nigra.dolichurus>; () => { var y = this; }; return x; } } } -module lutreolus { +namespace lutreolus { export class schlegeli extends lavali.beisa { mittendorfi() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; } blicki() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; } @@ -375,7 +375,7 @@ module lutreolus { dispar() : panamensis.linulus { var x : panamensis.linulus; () => { var y = this; }; return x; } } } -module argurus { +namespace argurus { export class dauricus { chinensis() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; } duodecimcostatus() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; } @@ -390,7 +390,7 @@ module argurus { misionensis() : macrorhinos.marmosurus, gabriellae.echinatus> { var x : macrorhinos.marmosurus, gabriellae.echinatus>; () => { var y = this; }; return x; } } } -module nigra { +namespace nigra { export class dolichurus { solomonis() : panglima.abidi, argurus.netscheri, julianae.oralis>>> { var x : panglima.abidi, argurus.netscheri, julianae.oralis>>>; () => { var y = this; }; return x; } alfredi() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; } @@ -402,7 +402,7 @@ module nigra { sagei() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; } } } -module panglima { +namespace panglima { export class amphibius extends caurinus.johorensis, Lanthanum.jugularis> { bottegi(): macrorhinos.marmosurus, gabriellae.echinatus>, sagitta.stolzmanni> { var x: macrorhinos.marmosurus, gabriellae.echinatus>, sagitta.stolzmanni>; () => { var y = this; }; return x; } jerdoni(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; } @@ -424,7 +424,7 @@ module panglima { ega(): imperfecta.lasiurus> { var x: imperfecta.lasiurus>; () => { var y = this; }; return x; } } } -module quasiater { +namespace quasiater { export class carolinensis { concinna(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; } aeneus(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; } @@ -435,7 +435,7 @@ module quasiater { patrizii(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; } } } -module minutus { +namespace minutus { export class himalayana extends lutreolus.punicus { simoni(): argurus.netscheri> { var x: argurus.netscheri>; () => { var y = this; }; return x; } lobata(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; } @@ -451,7 +451,7 @@ module minutus { olympus(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; } } } -module caurinus { +namespace caurinus { export class mahaganus extends panglima.fundatus { martiniquensis(): ruatanica.hector>> { var x: ruatanica.hector>>; () => { var y = this; }; return x; } devius(): samarensis.pelurus, trivirgatus.falconeri>> { var x: samarensis.pelurus, trivirgatus.falconeri>>; () => { var y = this; }; return x; } @@ -463,21 +463,21 @@ module caurinus { acticola(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; } } } -module macrorhinos { +namespace macrorhinos { export class marmosurus { tansaniana(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; } } } -module howi { +namespace howi { export class angulatus extends sagitta.stolzmanni { pennatus(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; } } } -module daubentonii { +namespace daubentonii { export class nesiotes { } } -module nigra { +namespace nigra { export class thalia { dichotomus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } arnuxii(): panamensis.linulus, lavali.beisa> { var x: panamensis.linulus, lavali.beisa>; () => { var y = this; }; return x; } @@ -489,21 +489,21 @@ module nigra { brucei(): chrysaeolus.sarasinorum { var x: chrysaeolus.sarasinorum; () => { var y = this; }; return x; } } } -module sagitta { +namespace sagitta { export class walkeri extends minutus.portoricensis { maracajuensis(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } } } -module minutus { +namespace minutus { export class inez extends samarensis.pelurus { vexillaris(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } } } -module macrorhinos { +namespace macrorhinos { export class konganensis extends imperfecta.lasiurus { } } -module panamensis { +namespace panamensis { export class linulus extends ruatanica.hector> { goslingi(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } taki(): patas.uralensis { var x: patas.uralensis; () => { var y = this; }; return x; } @@ -516,7 +516,7 @@ module panamensis { gomantongensis(): rionegrensis.veraecrucis> { var x: rionegrensis.veraecrucis>; () => { var y = this; }; return x; } } } -module nigra { +namespace nigra { export class gracilis { weddellii(): nigra.dolichurus { var x: nigra.dolichurus; () => { var y = this; }; return x; } echinothrix(): Lanthanum.nitidus, argurus.oreas> { var x: Lanthanum.nitidus, argurus.oreas>; () => { var y = this; }; return x; } @@ -533,7 +533,7 @@ module nigra { ramirohitra(): panglima.amphibius { var x: panglima.amphibius; () => { var y = this; }; return x; } } } -module samarensis { +namespace samarensis { export class pelurus extends sagitta.stolzmanni { Palladium(): panamensis.linulus { var x: panamensis.linulus; () => { var y = this; }; return x; } castanea(): argurus.netscheri, julianae.oralis> { var x: argurus.netscheri, julianae.oralis>; () => { var y = this; }; return x; } @@ -579,7 +579,7 @@ module samarensis { saussurei(): rendalli.crenulata, argurus.netscheri, julianae.oralis>> { var x: rendalli.crenulata, argurus.netscheri, julianae.oralis>>; () => { var y = this; }; return x; } } } -module sagitta { +namespace sagitta { export class leptoceros extends caurinus.johorensis> { victus(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; } hoplomyoides(): panglima.fundatus, nigra.gracilis> { var x: panglima.fundatus, nigra.gracilis>; () => { var y = this; }; return x; } @@ -588,23 +588,23 @@ module sagitta { bolami(): trivirgatus.tumidifrons { var x: trivirgatus.tumidifrons; () => { var y = this; }; return x; } } } -module daubentonii { +namespace daubentonii { export class nigricans extends sagitta.stolzmanni { woosnami(): dogramacii.robustulus { var x: dogramacii.robustulus; () => { var y = this; }; return x; } } } -module dammermani { +namespace dammermani { export class siberu { } } -module argurus { +namespace argurus { export class pygmaea extends rendalli.moojeni { pajeros(): gabriellae.echinatus { var x: gabriellae.echinatus; () => { var y = this; }; return x; } capucinus(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; } cuvieri(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; } } } -module chrysaeolus { +namespace chrysaeolus { export class sarasinorum extends caurinus.psilurus { belzebul(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; } hinpoon(): nigra.caucasica { var x: nigra.caucasica; () => { var y = this; }; return x; } @@ -615,7 +615,7 @@ module chrysaeolus { princeps(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; } } } -module argurus { +namespace argurus { export class wetmorei { leucoptera(): petrophilus.rosalia { var x: petrophilus.rosalia; () => { var y = this; }; return x; } ochraventer(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; } @@ -626,7 +626,7 @@ module argurus { mayori(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; } } } -module argurus { +namespace argurus { export class oreas extends lavali.wilsoni { salamonis(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; } paniscus(): ruatanica.Praseodymium { var x: ruatanica.Praseodymium; () => { var y = this; }; return x; } @@ -638,7 +638,7 @@ module argurus { univittatus(): argurus.peninsulae { var x: argurus.peninsulae; () => { var y = this; }; return x; } } } -module daubentonii { +namespace daubentonii { export class arboreus { capreolus(): rendalli.crenulata, lavali.wilsoni> { var x: rendalli.crenulata, lavali.wilsoni>; () => { var y = this; }; return x; } moreni(): panglima.abidi { var x: panglima.abidi; () => { var y = this; }; return x; } @@ -654,7 +654,7 @@ module daubentonii { tianshanica(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; } } } -module patas { +namespace patas { export class uralensis { cartilagonodus(): Lanthanum.nitidus { var x: Lanthanum.nitidus; () => { var y = this; }; return x; } pyrrhinus(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; } @@ -671,19 +671,19 @@ module patas { albiventer(): rendalli.crenulata { var x: rendalli.crenulata; () => { var y = this; }; return x; } } } -module provocax { +namespace provocax { export class melanoleuca extends lavali.wilsoni { Neodymium(): macrorhinos.marmosurus, lutreolus.foina> { var x: macrorhinos.marmosurus, lutreolus.foina>; () => { var y = this; }; return x; } baeri(): imperfecta.lasiurus { var x: imperfecta.lasiurus; () => { var y = this; }; return x; } } } -module sagitta { +namespace sagitta { export class sicarius { Chlorine(): samarensis.cahirinus, dogramacii.robustulus> { var x: samarensis.cahirinus, dogramacii.robustulus>; () => { var y = this; }; return x; } simulator(): macrorhinos.marmosurus, macrorhinos.marmosurus, gabriellae.echinatus>, sagitta.stolzmanni>> { var x: macrorhinos.marmosurus, macrorhinos.marmosurus, gabriellae.echinatus>, sagitta.stolzmanni>>; () => { var y = this; }; return x; } } } -module howi { +namespace howi { export class marcanoi extends Lanthanum.megalonyx { formosae(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; } dudui(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; } @@ -701,7 +701,7 @@ module howi { hyaena(): julianae.oralis { var x: julianae.oralis; () => { var y = this; }; return x; } } } -module argurus { +namespace argurus { export class gilbertii { nasutus(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; } poecilops(): julianae.steerii { var x: julianae.steerii; () => { var y = this; }; return x; } @@ -717,11 +717,11 @@ module argurus { amurensis(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } } } -module petrophilus { +namespace petrophilus { export class minutilla { } } -module lutreolus { +namespace lutreolus { export class punicus { strandi(): gabriellae.klossii { var x: gabriellae.klossii; () => { var y = this; }; return x; } lar(): caurinus.mahaganus { var x: caurinus.mahaganus; () => { var y = this; }; return x; } @@ -738,7 +738,7 @@ module lutreolus { Helium(): julianae.acariensis { var x: julianae.acariensis; () => { var y = this; }; return x; } } } -module macrorhinos { +namespace macrorhinos { export class daphaenodon { bredanensis(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; } othus(): howi.coludo { var x: howi.coludo; () => { var y = this; }; return x; } @@ -748,7 +748,7 @@ module macrorhinos { callosus(): trivirgatus.lotor { var x: trivirgatus.lotor; () => { var y = this; }; return x; } } } -module sagitta { +namespace sagitta { export class cinereus { zunigae(): rendalli.crenulata> { var x: rendalli.crenulata>; () => { var y = this; }; return x; } microps(): daubentonii.nigricans> { var x: daubentonii.nigricans>; () => { var y = this; }; return x; } @@ -764,11 +764,11 @@ module sagitta { pittieri(): samarensis.fuscus { var x: samarensis.fuscus; () => { var y = this; }; return x; } } } -module nigra { +namespace nigra { export class caucasica { } } -module gabriellae { +namespace gabriellae { export class klossii extends imperfecta.lasiurus { } export class amicus { @@ -787,7 +787,7 @@ module gabriellae { tenuipes(): howi.coludo> { var x: howi.coludo>; () => { var y = this; }; return x; } } } -module imperfecta { +namespace imperfecta { export class lasiurus { marisae(): lavali.thaeleri { var x: lavali.thaeleri; () => { var y = this; }; return x; } fulvus(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; } @@ -815,7 +815,7 @@ module imperfecta { sinicus(): macrorhinos.marmosurus { var x: macrorhinos.marmosurus; () => { var y = this; }; return x; } } } -module quasiater { +namespace quasiater { export class wattsi { lagotis(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; } hussoni(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; } @@ -823,9 +823,9 @@ module quasiater { cabrerae(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; } } } -module butleri { +namespace butleri { } -module petrophilus { +namespace petrophilus { export class sodyi extends quasiater.bobrinskoi { saundersiae(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; } imberbis(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } @@ -838,7 +838,7 @@ module petrophilus { bairdii(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; } } } -module caurinus { +namespace caurinus { export class megaphyllus extends imperfecta.lasiurus> { montana(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; } amatus(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; } @@ -850,14 +850,14 @@ module caurinus { cirrhosus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } } } -module minutus { +namespace minutus { export class portoricensis { relictus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } aequatorianus(): gabriellae.klossii { var x: gabriellae.klossii; () => { var y = this; }; return x; } rhinogradoides(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } } } -module lutreolus { +namespace lutreolus { export class foina { tarfayensis(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; } Promethium(): samarensis.pelurus { var x: samarensis.pelurus; () => { var y = this; }; return x; } @@ -874,7 +874,7 @@ module lutreolus { argentiventer(): trivirgatus.mixtus { var x: trivirgatus.mixtus; () => { var y = this; }; return x; } } } -module lutreolus { +namespace lutreolus { export class cor extends panglima.fundatus, lavali.beisa>, dammermani.melanops> { antinorii(): petrophilus.sodyi { var x: petrophilus.sodyi; () => { var y = this; }; return x; } voi(): caurinus.johorensis { var x: caurinus.johorensis; () => { var y = this; }; return x; } @@ -888,19 +888,19 @@ module lutreolus { castroviejoi(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; } } } -module howi { +namespace howi { export class coludo { bernhardi(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; } isseli(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; } } } -module argurus { +namespace argurus { export class germaini extends gabriellae.amicus { sharpei(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; } palmarum(): macrorhinos.marmosurus { var x: macrorhinos.marmosurus; () => { var y = this; }; return x; } } } -module sagitta { +namespace sagitta { export class stolzmanni { riparius(): nigra.dolichurus { var x: nigra.dolichurus; () => { var y = this; }; return x; } dhofarensis(): lutreolus.foina { var x: lutreolus.foina; () => { var y = this; }; return x; } @@ -915,7 +915,7 @@ module sagitta { florium(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; } } } -module dammermani { +namespace dammermani { export class melanops extends minutus.inez { blarina(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; } harwoodi(): rionegrensis.veraecrucis, lavali.wilsoni> { var x: rionegrensis.veraecrucis, lavali.wilsoni>; () => { var y = this; }; return x; } @@ -932,7 +932,7 @@ module dammermani { bocagei(): julianae.albidens { var x: julianae.albidens; () => { var y = this; }; return x; } } } -module argurus { +namespace argurus { export class peninsulae extends patas.uralensis { aitkeni(): trivirgatus.mixtus, panglima.amphibius> { var x: trivirgatus.mixtus, panglima.amphibius>; () => { var y = this; }; return x; } novaeangliae(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; } @@ -944,7 +944,7 @@ module argurus { cavernarum(): minutus.inez { var x: minutus.inez; () => { var y = this; }; return x; } } } -module argurus { +namespace argurus { export class netscheri { gravis(): nigra.caucasica, dogramacii.kaiseri> { var x: nigra.caucasica, dogramacii.kaiseri>; () => { var y = this; }; return x; } ruschii(): imperfecta.lasiurus> { var x: imperfecta.lasiurus>; () => { var y = this; }; return x; } @@ -961,7 +961,7 @@ module argurus { ruemmleri(): panglima.amphibius, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum> { var x: panglima.amphibius, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum>; () => { var y = this; }; return x; } } } -module ruatanica { +namespace ruatanica { export class Praseodymium extends ruatanica.hector { clara(): panglima.amphibius, argurus.dauricus> { var x: panglima.amphibius, argurus.dauricus>; () => { var y = this; }; return x; } spectabilis(): petrophilus.sodyi { var x: petrophilus.sodyi; () => { var y = this; }; return x; } @@ -978,17 +978,17 @@ module ruatanica { soricinus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } } } -module caurinus { +namespace caurinus { export class johorensis extends lutreolus.punicus { maini(): ruatanica.Praseodymium { var x: ruatanica.Praseodymium; () => { var y = this; }; return x; } } } -module argurus { +namespace argurus { export class luctuosa { loriae(): rendalli.moojeni, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus> { var x: rendalli.moojeni, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus>; () => { var y = this; }; return x; } } } -module panamensis { +namespace panamensis { export class setulosus { duthieae(): caurinus.mahaganus, dogramacii.aurata> { var x: caurinus.mahaganus, dogramacii.aurata>; () => { var y = this; }; return x; } guereza(): howi.coludo { var x: howi.coludo; () => { var y = this; }; return x; } @@ -1000,7 +1000,7 @@ module panamensis { vampyrus(): julianae.oralis { var x: julianae.oralis; () => { var y = this; }; return x; } } } -module petrophilus { +namespace petrophilus { export class rosalia { palmeri(): panglima.amphibius>, trivirgatus.mixtus, panglima.amphibius>> { var x: panglima.amphibius>, trivirgatus.mixtus, panglima.amphibius>>; () => { var y = this; }; return x; } baeops(): Lanthanum.nitidus { var x: Lanthanum.nitidus; () => { var y = this; }; return x; } @@ -1009,7 +1009,7 @@ module petrophilus { montivaga(): panamensis.setulosus> { var x: panamensis.setulosus>; () => { var y = this; }; return x; } } } -module caurinus { +namespace caurinus { export class psilurus extends lutreolus.punicus { socialis(): panglima.amphibius { var x: panglima.amphibius; () => { var y = this; }; return x; } lundi(): petrophilus.sodyi { var x: petrophilus.sodyi; () => { var y = this; }; return x; } diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.symbols b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.symbols index 1384c4b3d7817..d13a23467a82c 100644 --- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.symbols +++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.symbols @@ -1,26 +1,26 @@ //// [tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts] //// === resolvingClassDeclarationWhenInBaseTypeResolution.ts === -module rionegrensis { +namespace rionegrensis { >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) export class caniventer extends Lanthanum.nitidus { ->caniventer : Symbol(caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >Lanthanum.nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) salomonseni() : caniventer { var x : caniventer; () => { var y = this; }; return x; } >salomonseni : Symbol(caniventer.salomonseni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1, 96)) ->caniventer : Symbol(caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 2, 36)) ->caniventer : Symbol(caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 2, 64)) ->this : Symbol(caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>this : Symbol(caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 2, 36)) uchidai() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; } @@ -31,7 +31,7 @@ module rionegrensis { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 3, 80)) ->this : Symbol(caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>this : Symbol(caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 3, 42)) raffrayana() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; } @@ -42,34 +42,34 @@ module rionegrensis { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 4, 67)) ->this : Symbol(caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>this : Symbol(caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 4, 37)) Uranium() : minutus.inez, trivirgatus.falconeri> { var x : minutus.inez, trivirgatus.falconeri>; () => { var y = this; }; return x; } >Uranium : Symbol(caniventer.Uranium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 4, 92)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 5, 112)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 5, 220)) ->this : Symbol(caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>this : Symbol(caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 5, 112)) nayaur() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; } @@ -80,7 +80,7 @@ module rionegrensis { >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 6, 73)) ->this : Symbol(caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>this : Symbol(caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 6, 38)) } export class veraecrucis extends trivirgatus.mixtus { @@ -93,31 +93,31 @@ module rionegrensis { >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) naso() : panamensis.setulosus> { var x : panamensis.setulosus>; () => { var y = this; }; return x; } >naso : Symbol(veraecrucis.naso, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 8, 101)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 9, 115)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 9, 229)) >this : Symbol(veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 9, 115)) @@ -127,16 +127,16 @@ module rionegrensis { >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 10, 86)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 10, 161)) >this : Symbol(veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 10, 86)) @@ -144,34 +144,34 @@ module rionegrensis { africana() : argurus.gilbertii, sagitta.cinereus> { var x : argurus.gilbertii, sagitta.cinereus>; () => { var y = this; }; return x; } >africana : Symbol(veraecrucis.africana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 10, 186)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->gilbertii : Symbol(argurus.gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>gilbertii : Symbol(argurus.gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 11, 147)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->gilbertii : Symbol(argurus.gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>gilbertii : Symbol(argurus.gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 11, 289)) >this : Symbol(veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 11, 147)) @@ -199,11 +199,11 @@ module rionegrensis { >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 13, 42)) } } -module julianae { +namespace julianae { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) export class steerii { ->steerii : Symbol(steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) } export class nudicaudus { >nudicaudus : Symbol(nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) @@ -211,10 +211,10 @@ module julianae { brandtii() : argurus.germaini { var x : argurus.germaini; () => { var y = this; }; return x; } >brandtii : Symbol(nudicaudus.brandtii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 19, 27)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 20, 39)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 20, 73)) >this : Symbol(nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 20, 39)) @@ -222,18 +222,18 @@ module julianae { maxwellii() : ruatanica.Praseodymium { var x : ruatanica.Praseodymium; () => { var y = this; }; return x; } >maxwellii : Symbol(nudicaudus.maxwellii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 20, 98)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 21, 88)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 21, 170)) >this : Symbol(nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 21, 88)) @@ -245,14 +245,14 @@ module julianae { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 22, 70)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 22, 138)) >this : Symbol(nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 22, 70)) @@ -260,10 +260,10 @@ module julianae { venezuelae() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; } >venezuelae : Symbol(nudicaudus.venezuelae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 22, 163)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 23, 38)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 23, 69)) >this : Symbol(nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 23, 38)) @@ -271,10 +271,10 @@ module julianae { zamicrus() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; } >zamicrus : Symbol(nudicaudus.zamicrus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 23, 94)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 24, 46)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 24, 87)) >this : Symbol(nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 24, 46)) @@ -285,18 +285,18 @@ module julianae { isabellae() : panglima.amphibius { var x : panglima.amphibius; () => { var y = this; }; return x; } >isabellae : Symbol(galapagoensis.isabellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 26, 30)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 27, 84)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 27, 162)) >this : Symbol(galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 27, 84)) @@ -304,10 +304,10 @@ module julianae { rueppellii() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } >rueppellii : Symbol(galapagoensis.rueppellii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 27, 187)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 28, 45)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 28, 83)) >this : Symbol(galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 28, 45)) @@ -326,18 +326,18 @@ module julianae { gliroides() : howi.coludo { var x : howi.coludo; () => { var y = this; }; return x; } >gliroides : Symbol(galapagoensis.gliroides, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 29, 103)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 30, 66)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 30, 126)) >this : Symbol(galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 30, 66)) @@ -345,10 +345,10 @@ module julianae { banakrisi() : macrorhinos.daphaenodon { var x : macrorhinos.daphaenodon; () => { var y = this; }; return x; } >banakrisi : Symbol(galapagoensis.banakrisi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 30, 151)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 31, 47)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 31, 88)) >this : Symbol(galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 31, 47)) @@ -356,10 +356,10 @@ module julianae { rozendaali() : lutreolus.foina { var x : lutreolus.foina; () => { var y = this; }; return x; } >rozendaali : Symbol(galapagoensis.rozendaali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 31, 113)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 32, 40)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 32, 73)) >this : Symbol(galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 32, 40)) @@ -367,18 +367,18 @@ module julianae { stuhlmanni() : panamensis.linulus { var x : panamensis.linulus; () => { var y = this; }; return x; } >stuhlmanni : Symbol(galapagoensis.stuhlmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 32, 98)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 33, 87)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 33, 167)) >this : Symbol(galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 33, 87)) @@ -393,9 +393,9 @@ module julianae { >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >fuscus : Symbol(samarensis.fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) @@ -404,9 +404,9 @@ module julianae { >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >fuscus : Symbol(samarensis.fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) @@ -417,9 +417,9 @@ module julianae { Astatine() : steerii { var x : steerii; () => { var y = this; }; return x; } >Astatine : Symbol(albidens.Astatine, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 36, 272)) ->steerii : Symbol(steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 37, 30)) ->steerii : Symbol(steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 37, 55)) >this : Symbol(albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 37, 30)) @@ -427,18 +427,18 @@ module julianae { vincenti() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } >vincenti : Symbol(albidens.vincenti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 37, 80)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 38, 81)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 38, 157)) >this : Symbol(albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 38, 81)) @@ -466,10 +466,10 @@ module julianae { macrophyllum() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; } >macrophyllum : Symbol(albidens.macrophyllum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 40, 85)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 41, 40)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 41, 71)) >this : Symbol(albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 41, 40)) @@ -477,10 +477,10 @@ module julianae { porcellus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } >porcellus : Symbol(albidens.porcellus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 41, 96)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 42, 44)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 42, 82)) >this : Symbol(albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 42, 44)) @@ -489,17 +489,17 @@ module julianae { >oralis : Symbol(oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 44, 22)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 44, 25)) ->caurinus.psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>caurinus.psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) cepapi() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; } >cepapi : Symbol(oralis.cepapi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 44, 57)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 45, 38)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 45, 73)) >this : Symbol(oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 45, 38)) @@ -518,26 +518,26 @@ module julianae { bindi() : caurinus.mahaganus> { var x : caurinus.mahaganus>; () => { var y = this; }; return x; } >bindi : Symbol(oralis.bindi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 46, 95)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 47, 119)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 47, 236)) >this : Symbol(oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 47, 119)) @@ -545,10 +545,10 @@ module julianae { puda() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; } >puda : Symbol(oralis.puda, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 47, 261)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 48, 37)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 48, 73)) >this : Symbol(oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 48, 37)) @@ -567,24 +567,24 @@ module julianae { ignitus() : petrophilus.rosalia, lavali.wilsoni> { var x : petrophilus.rosalia, lavali.wilsoni>; () => { var y = this; }; return x; } >ignitus : Symbol(oralis.ignitus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 49, 111)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20)) +>rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 23)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) ->steerii : Symbol(steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 50, 110)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20)) +>rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 23)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) ->steerii : Symbol(steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 50, 216)) >this : Symbol(oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 50, 110)) @@ -612,30 +612,30 @@ module julianae { unalascensis() : minutus.inez, gabriellae.echinatus>, dogramacii.aurata> { var x : minutus.inez, gabriellae.echinatus>, dogramacii.aurata>; () => { var y = this; }; return x; } >unalascensis : Symbol(oralis.unalascensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 52, 107)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 53, 160)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) @@ -647,26 +647,26 @@ module julianae { wuchihensis() : howi.angulatus, petrophilus.minutilla> { var x : howi.angulatus, petrophilus.minutilla>; () => { var y = this; }; return x; } >wuchihensis : Symbol(oralis.wuchihensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 53, 336)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13)) +>angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 16)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 54, 123)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13)) +>angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 16)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 54, 238)) >this : Symbol(oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 54, 123)) @@ -685,18 +685,18 @@ module julianae { ordii() : daubentonii.arboreus { var x : daubentonii.arboreus; () => { var y = this; }; return x; } >ordii : Symbol(oralis.ordii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 55, 90)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 56, 78)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 56, 154)) >this : Symbol(oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 56, 78)) @@ -704,10 +704,10 @@ module julianae { eisentrauti() : rendalli.zuluensis { var x : rendalli.zuluensis; () => { var y = this; }; return x; } >eisentrauti : Symbol(oralis.eisentrauti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 56, 179)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 57, 44)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 57, 80)) >this : Symbol(oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 57, 44)) @@ -721,18 +721,18 @@ module julianae { wolffsohni() : Lanthanum.suillus { var x : Lanthanum.suillus; () => { var y = this; }; return x; } >wolffsohni : Symbol(sumatrana.wolffsohni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 59, 54)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) ->suillus : Symbol(Lanthanum.suillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 107, 18)) +>suillus : Symbol(Lanthanum.suillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 107, 21)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 60, 87)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) ->suillus : Symbol(Lanthanum.suillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 107, 18)) +>suillus : Symbol(Lanthanum.suillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 107, 21)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 60, 167)) >this : Symbol(sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 60, 87)) @@ -740,16 +740,16 @@ module julianae { geata() : ruatanica.hector { var x : ruatanica.hector; () => { var y = this; }; return x; } >geata : Symbol(sumatrana.geata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 60, 192)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18)) +>hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) >sumatrana : Symbol(sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 61, 69)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18)) +>hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) >sumatrana : Symbol(sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 61, 136)) >this : Symbol(sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 61, 69)) @@ -757,10 +757,10 @@ module julianae { awashensis() : petrophilus.minutilla { var x : petrophilus.minutilla; () => { var y = this; }; return x; } >awashensis : Symbol(sumatrana.awashensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 61, 161)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 62, 46)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 62, 85)) >this : Symbol(sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 62, 46)) @@ -768,13 +768,13 @@ module julianae { sturdeei() : lutreolus.cor { var x : lutreolus.cor; () => { var y = this; }; return x; } >sturdeei : Symbol(sumatrana.sturdeei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 62, 110)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->cor : Symbol(lutreolus.cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 18)) +>cor : Symbol(lutreolus.cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 21)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >galapagoensis : Symbol(galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 63, 72)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->cor : Symbol(lutreolus.cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 18)) +>cor : Symbol(lutreolus.cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 21)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >galapagoensis : Symbol(galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) @@ -785,24 +785,24 @@ module julianae { pachyurus() : howi.angulatus> { var x : howi.angulatus>; () => { var y = this; }; return x; } >pachyurus : Symbol(sumatrana.pachyurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 63, 164)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13)) +>angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 16)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >gerbillus : Symbol(gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 64, 109)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13)) +>angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 16)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >gerbillus : Symbol(gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 64, 212)) >this : Symbol(sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 64, 109)) @@ -810,10 +810,10 @@ module julianae { lyelli() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; } >lyelli : Symbol(sumatrana.lyelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 64, 237)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 65, 41)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 65, 79)) >this : Symbol(sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 65, 41)) @@ -821,16 +821,16 @@ module julianae { neohibernicus() : dammermani.siberu { var x : dammermani.siberu; () => { var y = this; }; return x; } >neohibernicus : Symbol(sumatrana.neohibernicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 65, 104)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 66, 83)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 66, 156)) @@ -845,18 +845,18 @@ module julianae { pundti() : sagitta.sicarius { var x : sagitta.sicarius; () => { var y = this; }; return x; } >pundti : Symbol(gerbillus.pundti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 68, 34)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->sicarius : Symbol(sagitta.sicarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 676, 16)) +>sicarius : Symbol(sagitta.sicarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 676, 19)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 69, 78)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->sicarius : Symbol(sagitta.sicarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 676, 16)) +>sicarius : Symbol(sagitta.sicarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 676, 19)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 69, 153)) >this : Symbol(gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 69, 78)) @@ -864,10 +864,10 @@ module julianae { tristrami() : petrophilus.minutilla { var x : petrophilus.minutilla; () => { var y = this; }; return x; } >tristrami : Symbol(gerbillus.tristrami, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 69, 178)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 70, 45)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 70, 84)) >this : Symbol(gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 70, 45)) @@ -875,10 +875,10 @@ module julianae { swarthi() : lutreolus.foina { var x : lutreolus.foina; () => { var y = this; }; return x; } >swarthi : Symbol(gerbillus.swarthi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 70, 109)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 71, 37)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 71, 70)) >this : Symbol(gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 71, 37)) @@ -897,18 +897,18 @@ module julianae { diazi() : imperfecta.lasiurus { var x : imperfecta.lasiurus; () => { var y = this; }; return x; } >diazi : Symbol(gerbillus.diazi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 72, 111)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 73, 77)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 73, 152)) >this : Symbol(gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 73, 77)) @@ -916,10 +916,10 @@ module julianae { rennelli() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; } >rennelli : Symbol(gerbillus.rennelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 73, 177)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 74, 39)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 74, 73)) >this : Symbol(gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 74, 39)) @@ -938,18 +938,18 @@ module julianae { muscina() : daubentonii.arboreus { var x : daubentonii.arboreus; () => { var y = this; }; return x; } >muscina : Symbol(gerbillus.muscina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 75, 96)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 76, 85)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 76, 166)) >this : Symbol(gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 76, 85)) @@ -957,16 +957,16 @@ module julianae { pelengensis() : sagitta.leptoceros { var x : sagitta.leptoceros; () => { var y = this; }; return x; } >pelengensis : Symbol(gerbillus.pelengensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 76, 191)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 16)) +>leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 19)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 77, 85)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 16)) +>leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 19)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 77, 162)) @@ -987,10 +987,10 @@ module julianae { reevesi() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; } >reevesi : Symbol(gerbillus.reevesi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 78, 95)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 79, 42)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 79, 80)) >this : Symbol(gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 79, 42)) @@ -1012,16 +1012,16 @@ module julianae { minous() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } >minous : Symbol(acariensis.minous, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 82, 96)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 83, 75)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 83, 147)) @@ -1031,16 +1031,16 @@ module julianae { cinereiventer() : panamensis.setulosus { var x : panamensis.setulosus; () => { var y = this; }; return x; } >cinereiventer : Symbol(acariensis.cinereiventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 83, 172)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 84, 79)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 84, 148)) @@ -1050,21 +1050,21 @@ module julianae { longicaudatus() : macrorhinos.marmosurus> { var x : macrorhinos.marmosurus>; () => { var y = this; }; return x; } >longicaudatus : Symbol(acariensis.longicaudatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 84, 173)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >nudicaudus : Symbol(nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 85, 117)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >nudicaudus : Symbol(nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) @@ -1075,26 +1075,26 @@ module julianae { baeodon() : argurus.netscheri, argurus.luctuosa> { var x : argurus.netscheri, argurus.luctuosa>; () => { var y = this; }; return x; } >baeodon : Symbol(acariensis.baeodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 85, 249)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 86, 114)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 86, 224)) >this : Symbol(acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 86, 114)) @@ -1102,10 +1102,10 @@ module julianae { soricoides() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; } >soricoides : Symbol(acariensis.soricoides, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 86, 249)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 87, 41)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 87, 75)) >this : Symbol(acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 87, 41)) @@ -1113,26 +1113,26 @@ module julianae { datae() : daubentonii.arboreus> { var x : daubentonii.arboreus>; () => { var y = this; }; return x; } >datae : Symbol(acariensis.datae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 87, 100)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 88, 124)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 88, 246)) >this : Symbol(acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 88, 124)) @@ -1151,10 +1151,10 @@ module julianae { anakuma() : lavali.wilsoni { var x : lavali.wilsoni; () => { var y = this; }; return x; } >anakuma : Symbol(acariensis.anakuma, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 89, 108)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 90, 36)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 90, 68)) >this : Symbol(acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 90, 36)) @@ -1162,18 +1162,18 @@ module julianae { kihaulei() : panglima.amphibius { var x : panglima.amphibius; () => { var y = this; }; return x; } >kihaulei : Symbol(acariensis.kihaulei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 90, 93)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 91, 89)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 91, 173)) >this : Symbol(acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 91, 89)) @@ -1181,10 +1181,10 @@ module julianae { gymnura() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; } >gymnura : Symbol(acariensis.gymnura, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 91, 198)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 92, 44)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 92, 84)) >this : Symbol(acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 92, 44)) @@ -1196,14 +1196,14 @@ module julianae { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 93, 89)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 93, 170)) >this : Symbol(acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 93, 89)) @@ -1217,18 +1217,18 @@ module julianae { Californium() : panamensis.setulosus { var x : panamensis.setulosus; () => { var y = this; }; return x; } >Californium : Symbol(durangae.Californium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 95, 51)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 96, 86)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 96, 164)) >this : Symbol(durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 96, 86)) @@ -1236,16 +1236,16 @@ module julianae { Flerovium() : howi.angulatus { var x : howi.angulatus; () => { var y = this; }; return x; } >Flerovium : Symbol(durangae.Flerovium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 96, 189)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13)) +>angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 16)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 97, 83)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13)) +>angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 16)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 97, 160)) @@ -1255,122 +1255,122 @@ module julianae { phrudus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; } >phrudus : Symbol(durangae.phrudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 97, 185)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 98, 40)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 98, 76)) >this : Symbol(durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 98, 40)) } } -module ruatanica { +namespace ruatanica { >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) export class hector { ->hector : Symbol(hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18)) +>hector : Symbol(hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 102, 22)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 102, 25)) humulis() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; } >humulis : Symbol(hector.humulis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 102, 31)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 103, 38)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 103, 72)) ->this : Symbol(hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18)) +>this : Symbol(hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 103, 38)) eurycerus() : panamensis.linulus, lavali.wilsoni> { var x : panamensis.linulus, lavali.wilsoni>; () => { var y = this; }; return x; } >eurycerus : Symbol(hector.eurycerus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 103, 97)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->Praseodymium : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>Praseodymium : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 104, 124)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->Praseodymium : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>Praseodymium : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 104, 242)) ->this : Symbol(hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18)) +>this : Symbol(hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 104, 124)) } } -module Lanthanum { +namespace Lanthanum { >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) export class suillus { ->suillus : Symbol(suillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 107, 18)) +>suillus : Symbol(suillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 107, 21)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 108, 23)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 108, 26)) spilosoma() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; } >spilosoma : Symbol(suillus.spilosoma, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 108, 32)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 109, 46)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 109, 86)) ->this : Symbol(suillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 107, 18)) +>this : Symbol(suillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 107, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 109, 46)) tumbalensis() : caurinus.megaphyllus { var x : caurinus.megaphyllus; () => { var y = this; }; return x; } >tumbalensis : Symbol(suillus.tumbalensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 109, 111)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 110, 46)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 110, 84)) ->this : Symbol(suillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 107, 18)) +>this : Symbol(suillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 107, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 110, 46)) anatolicus() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; } >anatolicus : Symbol(suillus.anatolicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 110, 109)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 111, 41)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 111, 75)) ->this : Symbol(suillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 107, 18)) +>this : Symbol(suillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 107, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 111, 41)) } export class nitidus extends argurus.gilbertii { >nitidus : Symbol(nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 113, 23)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 113, 26)) ->argurus.gilbertii : Symbol(argurus.gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>argurus.gilbertii : Symbol(argurus.gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->gilbertii : Symbol(argurus.gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>gilbertii : Symbol(argurus.gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) granatensis() : quasiater.bobrinskoi { var x : quasiater.bobrinskoi; () => { var y = this; }; return x; } >granatensis : Symbol(nitidus.granatensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 113, 94)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 114, 46)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 114, 84)) >this : Symbol(nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 114, 46)) @@ -1378,18 +1378,18 @@ module Lanthanum { negligens() : minutus.inez { var x : minutus.inez; () => { var y = this; }; return x; } >negligens : Symbol(nitidus.negligens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 114, 109)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 115, 68)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 115, 130)) >this : Symbol(nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 115, 68)) @@ -1401,14 +1401,14 @@ module Lanthanum { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 116, 73)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >oralis : Symbol(julianae.oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 116, 143)) >this : Symbol(nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 116, 73)) @@ -1416,16 +1416,16 @@ module Lanthanum { arge() : chrysaeolus.sarasinorum { var x : chrysaeolus.sarasinorum; () => { var y = this; }; return x; } >arge : Symbol(nitidus.arge, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 116, 168)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 117, 86)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 117, 171)) @@ -1435,10 +1435,10 @@ module Lanthanum { dominicensis() : dammermani.melanops { var x : dammermani.melanops; () => { var y = this; }; return x; } >dominicensis : Symbol(nitidus.dominicensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 117, 196)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 118, 46)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 118, 83)) >this : Symbol(nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 118, 46)) @@ -1446,10 +1446,10 @@ module Lanthanum { taurus() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; } >taurus : Symbol(nitidus.taurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 118, 108)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 119, 44)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 119, 85)) >this : Symbol(nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 119, 44)) @@ -1457,14 +1457,14 @@ module Lanthanum { tonganus() : argurus.netscheri { var x : argurus.netscheri; () => { var y = this; }; return x; } >tonganus : Symbol(nitidus.tonganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 119, 110)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 120, 78)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) @@ -1516,21 +1516,21 @@ module Lanthanum { } export class megalonyx extends caurinus.johorensis { >megalonyx : Symbol(megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) ->caurinus.johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>caurinus.johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) phillipsii() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; } >phillipsii : Symbol(megalonyx.phillipsii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 125, 94)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 126, 48)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 126, 89)) >this : Symbol(megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 126, 48)) @@ -1542,14 +1542,14 @@ module Lanthanum { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 127, 98)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 127, 187)) >this : Symbol(megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 127, 98)) @@ -1558,13 +1558,13 @@ module Lanthanum { >elaphus : Symbol(megalonyx.elaphus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 127, 212)) >nitidus : Symbol(nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 128, 72)) >nitidus : Symbol(nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 128, 140)) @@ -1585,10 +1585,10 @@ module Lanthanum { ourebi() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; } >ourebi : Symbol(megalonyx.ourebi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 129, 94)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 130, 41)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 130, 79)) >this : Symbol(megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 130, 41)) @@ -1600,7 +1600,7 @@ module Lanthanum { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) @@ -1611,7 +1611,7 @@ module Lanthanum { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) @@ -1634,15 +1634,15 @@ module Lanthanum { albipes() : quasiater.wattsi { var x : quasiater.wattsi; () => { var y = this; }; return x; } >albipes : Symbol(megalonyx.albipes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 132, 103)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >megalonyx : Symbol(megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 133, 70)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >megalonyx : Symbol(megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 133, 136)) >this : Symbol(megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) @@ -1654,18 +1654,18 @@ module Lanthanum { torrei() : petrophilus.sodyi { var x : petrophilus.sodyi; () => { var y = this; }; return x; } >torrei : Symbol(jugularis.torrei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 135, 26)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 136, 78)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 136, 153)) >this : Symbol(jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 136, 78)) @@ -1673,10 +1673,10 @@ module Lanthanum { revoili() : lavali.wilsoni { var x : lavali.wilsoni; () => { var y = this; }; return x; } >revoili : Symbol(jugularis.revoili, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 136, 178)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 137, 36)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 137, 68)) >this : Symbol(jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 137, 36)) @@ -1684,10 +1684,10 @@ module Lanthanum { macrobullatus() : macrorhinos.daphaenodon { var x : macrorhinos.daphaenodon; () => { var y = this; }; return x; } >macrobullatus : Symbol(jugularis.macrobullatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 137, 93)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 138, 51)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 138, 92)) >this : Symbol(jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 138, 51)) @@ -1695,10 +1695,10 @@ module Lanthanum { compactus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; } >compactus : Symbol(jugularis.compactus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 138, 117)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 139, 42)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 139, 78)) >this : Symbol(jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 139, 42)) @@ -1707,15 +1707,15 @@ module Lanthanum { >talpinus : Symbol(jugularis.talpinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 139, 103)) >nitidus : Symbol(nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 140, 72)) >nitidus : Symbol(nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 140, 139)) >this : Symbol(jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 140, 72)) @@ -1736,16 +1736,16 @@ module Lanthanum { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >mixtus : Symbol(trivirgatus.mixtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 197, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 142, 86)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >mixtus : Symbol(trivirgatus.mixtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 197, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 142, 165)) >this : Symbol(jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 142, 86)) @@ -1753,18 +1753,18 @@ module Lanthanum { ogilbyi() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } >ogilbyi : Symbol(jugularis.ogilbyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 142, 190)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 143, 77)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 143, 150)) >this : Symbol(jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 143, 77)) @@ -1772,18 +1772,18 @@ module Lanthanum { incomtus() : daubentonii.nesiotes { var x : daubentonii.nesiotes; () => { var y = this; }; return x; } >incomtus : Symbol(jugularis.incomtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 143, 175)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 20)) +>nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 144, 87)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 20)) +>nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 144, 169)) >this : Symbol(jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 144, 87)) @@ -1791,18 +1791,18 @@ module Lanthanum { surdaster() : ruatanica.Praseodymium { var x : ruatanica.Praseodymium; () => { var y = this; }; return x; } >surdaster : Symbol(jugularis.surdaster, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 144, 194)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 145, 86)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 145, 166)) >this : Symbol(jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 145, 86)) @@ -1810,18 +1810,18 @@ module Lanthanum { melanorhinus() : samarensis.pelurus { var x : samarensis.pelurus; () => { var y = this; }; return x; } >melanorhinus : Symbol(jugularis.melanorhinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 145, 191)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 146, 86)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 146, 163)) >this : Symbol(jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 146, 86)) @@ -1829,22 +1829,22 @@ module Lanthanum { picticaudata() : minutus.inez, dogramacii.kaiseri> { var x : minutus.inez, dogramacii.kaiseri>; () => { var y = this; }; return x; } >picticaudata : Symbol(jugularis.picticaudata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 146, 188)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 147, 118)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) @@ -1856,10 +1856,10 @@ module Lanthanum { pomona() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; } >pomona : Symbol(jugularis.pomona, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 147, 252)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 148, 37)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 148, 71)) >this : Symbol(jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 148, 37)) @@ -1867,79 +1867,79 @@ module Lanthanum { ileile() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; } >ileile : Symbol(jugularis.ileile, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 148, 96)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 149, 43)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 149, 83)) >this : Symbol(jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 149, 43)) } } -module rendalli { +namespace rendalli { >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) export class zuluensis extends julianae.steerii { ->zuluensis : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) ->julianae.steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>zuluensis : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) +>julianae.steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) telfairi() : argurus.wetmorei { var x : argurus.wetmorei; () => { var y = this; }; return x; } >telfairi : Symbol(zuluensis.telfairi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 153, 51)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->wetmorei : Symbol(argurus.wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 16)) +>wetmorei : Symbol(argurus.wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 19)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 154, 82)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->wetmorei : Symbol(argurus.wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 16)) +>wetmorei : Symbol(argurus.wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 19)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 154, 159)) ->this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 154, 82)) keyensis() : quasiater.wattsi { var x : quasiater.wattsi; () => { var y = this; }; return x; } >keyensis : Symbol(zuluensis.keyensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 154, 184)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 155, 80)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 155, 155)) ->this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 155, 80)) occasius() : argurus.gilbertii { var x : argurus.gilbertii; () => { var y = this; }; return x; } >occasius : Symbol(zuluensis.occasius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 155, 180)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->gilbertii : Symbol(argurus.gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>gilbertii : Symbol(argurus.gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 156, 81)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->gilbertii : Symbol(argurus.gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>gilbertii : Symbol(argurus.gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 156, 157)) ->this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 156, 81)) damarensis() : julianae.galapagoensis { var x : julianae.galapagoensis; () => { var y = this; }; return x; } @@ -1950,7 +1950,7 @@ module rendalli { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 157, 87)) ->this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 157, 47)) Neptunium() : panglima.abidi { var x : panglima.abidi; () => { var y = this; }; return x; } @@ -1958,149 +1958,149 @@ module rendalli { >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 158, 78)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 158, 150)) ->this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 158, 78)) griseoflavus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } >griseoflavus : Symbol(zuluensis.griseoflavus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 158, 175)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 159, 47)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 159, 85)) ->this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 159, 47)) thar() : argurus.oreas { var x : argurus.oreas; () => { var y = this; }; return x; } >thar : Symbol(zuluensis.thar, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 159, 110)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 160, 32)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 160, 63)) ->this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 160, 32)) alborufus() : panamensis.linulus { var x : panamensis.linulus; () => { var y = this; }; return x; } >alborufus : Symbol(zuluensis.alborufus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 160, 88)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 161, 74)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 161, 142)) ->this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 161, 74)) fusicaudus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; } >fusicaudus : Symbol(zuluensis.fusicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 161, 167)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 162, 43)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 162, 79)) ->this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 162, 43)) gordonorum() : howi.angulatus { var x : howi.angulatus; () => { var y = this; }; return x; } >gordonorum : Symbol(zuluensis.gordonorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 162, 104)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13)) +>angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 16)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 163, 79)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13)) +>angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 16)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 163, 151)) ->this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 163, 79)) ruber() : dammermani.siberu { var x : dammermani.siberu; () => { var y = this; }; return x; } >ruber : Symbol(zuluensis.ruber, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 163, 176)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 164, 77)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 164, 152)) ->this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 164, 77)) desmarestianus() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; } >desmarestianus : Symbol(zuluensis.desmarestianus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 164, 177)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 165, 45)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 165, 79)) ->this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 165, 45)) lutillus() : nigra.dolichurus { var x : nigra.dolichurus; () => { var y = this; }; return x; } >lutillus : Symbol(zuluensis.lutillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 165, 104)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 166, 70)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 166, 135)) ->this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 166, 70)) salocco() : argurus.peninsulae { var x : argurus.peninsulae; () => { var y = this; }; return x; } >salocco : Symbol(zuluensis.salocco, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 166, 160)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 167, 40)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 167, 76)) ->this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>this : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 167, 40)) } export class moojeni { @@ -2126,14 +2126,14 @@ module rendalli { >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 171, 88)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 171, 172)) >this : Symbol(moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 171, 88)) @@ -2151,9 +2151,9 @@ module rendalli { heaneyi() : zuluensis { var x : zuluensis; () => { var y = this; }; return x; } >heaneyi : Symbol(moojeni.heaneyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 172, 101)) ->zuluensis : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 173, 31)) ->zuluensis : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 173, 58)) >this : Symbol(moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 173, 31)) @@ -2161,22 +2161,22 @@ module rendalli { marchei() : panglima.amphibius> { var x : panglima.amphibius>; () => { var y = this; }; return x; } >marchei : Symbol(moojeni.marchei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 173, 83)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 174, 117)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) @@ -2201,9 +2201,9 @@ module rendalli { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >mixtus : Symbol(trivirgatus.mixtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 197, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) @@ -2211,14 +2211,14 @@ module rendalli { >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 176, 173)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >mixtus : Symbol(trivirgatus.mixtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 197, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) @@ -2226,7 +2226,7 @@ module rendalli { >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 176, 335)) >this : Symbol(moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 176, 173)) @@ -2238,14 +2238,14 @@ module rendalli { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 177, 86)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >gerbillus : Symbol(julianae.gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 177, 162)) >this : Symbol(moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 177, 86)) @@ -2253,18 +2253,18 @@ module rendalli { zibethicus() : minutus.inez { var x : minutus.inez; () => { var y = this; }; return x; } >zibethicus : Symbol(moojeni.zibethicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 177, 187)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 178, 78)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 178, 149)) >this : Symbol(moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 178, 78)) @@ -2272,18 +2272,18 @@ module rendalli { biacensis() : howi.coludo { var x : howi.coludo; () => { var y = this; }; return x; } >biacensis : Symbol(moojeni.biacensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 178, 174)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 179, 79)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 179, 152)) >this : Symbol(moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 179, 79)) @@ -2299,18 +2299,18 @@ module rendalli { salvanius() : howi.coludo { var x : howi.coludo; () => { var y = this; }; return x; } >salvanius : Symbol(crenulata.salvanius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 181, 64)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 182, 75)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 182, 144)) >this : Symbol(crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 182, 75)) @@ -2318,10 +2318,10 @@ module rendalli { maritimus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } >maritimus : Symbol(crenulata.maritimus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 182, 169)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 183, 44)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 183, 82)) >this : Symbol(crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 183, 44)) @@ -2329,44 +2329,44 @@ module rendalli { edax() : lutreolus.cor>, rionegrensis.caniventer> { var x : lutreolus.cor>, rionegrensis.caniventer>; () => { var y = this; }; return x; } >edax : Symbol(crenulata.edax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 183, 107)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->cor : Symbol(lutreolus.cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 18)) +>cor : Symbol(lutreolus.cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 21)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 184, 161)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->cor : Symbol(lutreolus.cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 18)) +>cor : Symbol(lutreolus.cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 21)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 184, 321)) >this : Symbol(crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 184, 161)) } } -module trivirgatus { +namespace trivirgatus { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) export class tumidifrons { ->tumidifrons : Symbol(tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 20)) +>tumidifrons : Symbol(tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 23)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 188, 27)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 188, 30)) @@ -2378,7 +2378,7 @@ module trivirgatus { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 189, 76)) ->this : Symbol(tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 20)) +>this : Symbol(tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 189, 40)) vestitus() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; } @@ -2389,18 +2389,18 @@ module trivirgatus { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 190, 81)) ->this : Symbol(tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 20)) +>this : Symbol(tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 190, 43)) aequatorius() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; } >aequatorius : Symbol(tumidifrons.aequatorius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 190, 106)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 191, 49)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 191, 90)) ->this : Symbol(tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 20)) +>this : Symbol(tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 191, 49)) scherman() : oconnelli { var x : oconnelli; () => { var y = this; }; return x; } @@ -2409,18 +2409,18 @@ module trivirgatus { >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 192, 32)) >oconnelli : Symbol(oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 192, 59)) ->this : Symbol(tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 20)) +>this : Symbol(tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 192, 32)) improvisum() : argurus.peninsulae { var x : argurus.peninsulae; () => { var y = this; }; return x; } >improvisum : Symbol(tumidifrons.improvisum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 192, 84)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 193, 43)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 193, 79)) ->this : Symbol(tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 20)) +>this : Symbol(tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 193, 43)) cervinipes() : panglima.abidi { var x : panglima.abidi; () => { var y = this; }; return x; } @@ -2430,63 +2430,63 @@ module trivirgatus { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 194, 75)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 194, 143)) ->this : Symbol(tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 20)) +>this : Symbol(tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 194, 75)) audax() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; } >audax : Symbol(tumidifrons.audax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 194, 168)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 195, 41)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 195, 80)) ->this : Symbol(tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 20)) +>this : Symbol(tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 195, 41)) vallinus() : sagitta.sicarius { var x : sagitta.sicarius; () => { var y = this; }; return x; } >vallinus : Symbol(tumidifrons.vallinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 195, 105)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->sicarius : Symbol(sagitta.sicarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 676, 16)) +>sicarius : Symbol(sagitta.sicarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 676, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 196, 74)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->sicarius : Symbol(sagitta.sicarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 676, 16)) +>sicarius : Symbol(sagitta.sicarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 676, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 196, 143)) ->this : Symbol(tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 20)) +>this : Symbol(tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 196, 74)) } export class mixtus extends argurus.pygmaea> { >mixtus : Symbol(mixtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 197, 3)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 198, 22)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 198, 25)) ->argurus.pygmaea : Symbol(argurus.pygmaea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 596, 16)) +>argurus.pygmaea : Symbol(argurus.pygmaea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 596, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->pygmaea : Symbol(argurus.pygmaea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 596, 16)) +>pygmaea : Symbol(argurus.pygmaea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 596, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) ochrogaster() : dogramacii.aurata { var x : dogramacii.aurata; () => { var y = this; }; return x; } >ochrogaster : Symbol(mixtus.ochrogaster, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 198, 138)) @@ -2502,7 +2502,7 @@ module trivirgatus { bryophilus() : macrorhinos.marmosurus>> { var x : macrorhinos.marmosurus>>; () => { var y = this; }; return x; } >bryophilus : Symbol(mixtus.bryophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 199, 103)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) @@ -2510,14 +2510,14 @@ module trivirgatus { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 200, 173)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) @@ -2525,9 +2525,9 @@ module trivirgatus { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 200, 339)) @@ -2537,10 +2537,10 @@ module trivirgatus { liechtensteini() : rendalli.zuluensis { var x : rendalli.zuluensis; () => { var y = this; }; return x; } >liechtensteini : Symbol(mixtus.liechtensteini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 200, 364)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 201, 47)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 201, 83)) >this : Symbol(mixtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 197, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 201, 47)) @@ -2548,26 +2548,26 @@ module trivirgatus { crawfordi() : howi.coludo> { var x : howi.coludo>; () => { var y = this; }; return x; } >crawfordi : Symbol(mixtus.crawfordi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 201, 108)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >gerbillus : Symbol(julianae.gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 202, 114)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >gerbillus : Symbol(julianae.gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 202, 222)) >this : Symbol(mixtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 197, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 202, 114)) @@ -2588,30 +2588,30 @@ module trivirgatus { >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >lotor : Symbol(lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 204, 135)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >lotor : Symbol(lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 204, 266)) >this : Symbol(mixtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 197, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 204, 135)) @@ -2619,18 +2619,18 @@ module trivirgatus { demidoff() : caurinus.johorensis { var x : caurinus.johorensis; () => { var y = this; }; return x; } >demidoff : Symbol(mixtus.demidoff, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 204, 291)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 205, 83)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 205, 161)) >this : Symbol(mixtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 197, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 205, 83)) @@ -2656,16 +2656,16 @@ module trivirgatus { >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 209, 90)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 209, 176)) >this : Symbol(lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 209, 90)) @@ -2678,40 +2678,40 @@ module trivirgatus { >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 212, 203)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 212, 402)) >this : Symbol(falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 212, 203)) @@ -2719,34 +2719,34 @@ module trivirgatus { gouldi() : nigra.dolichurus>, patas.uralensis> { var x : nigra.dolichurus>, patas.uralensis>; () => { var y = this; }; return x; } >gouldi : Symbol(falconeri.gouldi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 212, 427)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 213, 139)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 213, 275)) >this : Symbol(falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 213, 139)) @@ -2754,26 +2754,26 @@ module trivirgatus { fuscicollis() : samarensis.pelurus> { var x : samarensis.pelurus>; () => { var y = this; }; return x; } >fuscicollis : Symbol(falconeri.fuscicollis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 213, 300)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 214, 126)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 214, 244)) >this : Symbol(falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 214, 126)) @@ -2781,32 +2781,32 @@ module trivirgatus { martiensseni() : sagitta.cinereus>, dogramacii.koepckeae> { var x : sagitta.cinereus>, dogramacii.koepckeae>; () => { var y = this; }; return x; } >martiensseni : Symbol(falconeri.martiensseni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 214, 269)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 215, 166)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 215, 323)) @@ -2827,26 +2827,26 @@ module trivirgatus { shawi() : minutus.inez> { var x : minutus.inez>; () => { var y = this; }; return x; } >shawi : Symbol(falconeri.shawi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 216, 112)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 217, 122)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 217, 242)) >this : Symbol(falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 217, 122)) @@ -2854,10 +2854,10 @@ module trivirgatus { gmelini() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; } >gmelini : Symbol(falconeri.gmelini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 217, 267)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 218, 45)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 218, 86)) >this : Symbol(falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 218, 45)) @@ -2868,16 +2868,16 @@ module trivirgatus { youngsoni() : nigra.thalia { var x : nigra.thalia; () => { var y = this; }; return x; } >youngsoni : Symbol(oconnelli.youngsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 220, 26)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 221, 77)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 221, 148)) @@ -2887,10 +2887,10 @@ module trivirgatus { terrestris() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; } >terrestris : Symbol(oconnelli.terrestris, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 221, 173)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 222, 48)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 222, 89)) >this : Symbol(oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 222, 48)) @@ -2898,26 +2898,26 @@ module trivirgatus { chrysopus() : sagitta.sicarius> { var x : sagitta.sicarius>; () => { var y = this; }; return x; } >chrysopus : Symbol(oconnelli.chrysopus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 222, 114)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->sicarius : Symbol(sagitta.sicarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 676, 16)) +>sicarius : Symbol(sagitta.sicarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 676, 19)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 223, 121)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->sicarius : Symbol(sagitta.sicarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 676, 16)) +>sicarius : Symbol(sagitta.sicarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 676, 19)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 223, 236)) >this : Symbol(oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 223, 121)) @@ -2925,10 +2925,10 @@ module trivirgatus { fuscomurina() : argurus.peninsulae { var x : argurus.peninsulae; () => { var y = this; }; return x; } >fuscomurina : Symbol(oconnelli.fuscomurina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 223, 261)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 224, 44)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 224, 80)) >this : Symbol(oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 224, 44)) @@ -2936,34 +2936,34 @@ module trivirgatus { hellwaldii() : nigra.gracilis, petrophilus.sodyi> { var x : nigra.gracilis, petrophilus.sodyi>; () => { var y = this; }; return x; } >hellwaldii : Symbol(oconnelli.hellwaldii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 224, 105)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 225, 160)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 225, 313)) >this : Symbol(oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 225, 160)) @@ -2971,10 +2971,10 @@ module trivirgatus { aenea() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; } >aenea : Symbol(oconnelli.aenea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 225, 338)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 226, 36)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 226, 70)) >this : Symbol(oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 226, 36)) @@ -2982,10 +2982,10 @@ module trivirgatus { perrini() : quasiater.bobrinskoi { var x : quasiater.bobrinskoi; () => { var y = this; }; return x; } >perrini : Symbol(oconnelli.perrini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 226, 95)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 227, 42)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 227, 80)) >this : Symbol(oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 227, 42)) @@ -2993,10 +2993,10 @@ module trivirgatus { entellus() : dammermani.melanops { var x : dammermani.melanops; () => { var y = this; }; return x; } >entellus : Symbol(oconnelli.entellus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 227, 105)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 228, 42)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 228, 79)) >this : Symbol(oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 228, 42)) @@ -3006,14 +3006,14 @@ module trivirgatus { >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 229, 90)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 229, 176)) @@ -3023,10 +3023,10 @@ module trivirgatus { cephalotes() : lutreolus.schlegeli { var x : lutreolus.schlegeli; () => { var y = this; }; return x; } >cephalotes : Symbol(oconnelli.cephalotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 229, 201)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 230, 44)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 230, 81)) >this : Symbol(oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 230, 44)) @@ -3034,26 +3034,26 @@ module trivirgatus { molossinus() : daubentonii.nigricans> { var x : daubentonii.nigricans>; () => { var y = this; }; return x; } >molossinus : Symbol(oconnelli.molossinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 230, 106)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->nigricans : Symbol(daubentonii.nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 20)) +>nigricans : Symbol(daubentonii.nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 20)) +>nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 231, 136)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->nigricans : Symbol(daubentonii.nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 20)) +>nigricans : Symbol(daubentonii.nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 20)) +>nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 231, 265)) >this : Symbol(oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 231, 136)) @@ -3061,10 +3061,10 @@ module trivirgatus { luisi() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; } >luisi : Symbol(oconnelli.luisi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 231, 290)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 232, 41)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 232, 80)) >this : Symbol(oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 232, 41)) @@ -3072,10 +3072,10 @@ module trivirgatus { ceylonicus() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; } >ceylonicus : Symbol(oconnelli.ceylonicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 232, 105)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 233, 48)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 233, 89)) >this : Symbol(oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 233, 48)) @@ -3092,40 +3092,40 @@ module trivirgatus { >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 234, 40)) } } -module quasiater { +namespace quasiater { >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) export class bobrinskoi { ->bobrinskoi : Symbol(bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) crassicaudatus() : samarensis.cahirinus { var x : samarensis.cahirinus; () => { var y = this; }; return x; } >crassicaudatus : Symbol(bobrinskoi.crassicaudatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 238, 27)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 239, 92)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 239, 173)) ->this : Symbol(bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>this : Symbol(bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 239, 92)) mulatta() : argurus.oreas { var x : argurus.oreas; () => { var y = this; }; return x; } >mulatta : Symbol(bobrinskoi.mulatta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 239, 198)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 240, 35)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 240, 66)) ->this : Symbol(bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>this : Symbol(bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 240, 35)) ansorgei() : rendalli.moojeni, gabriellae.echinatus> { var x : rendalli.moojeni, gabriellae.echinatus>; () => { var y = this; }; return x; } @@ -3133,89 +3133,89 @@ module quasiater { >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 241, 123)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 241, 241)) ->this : Symbol(bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>this : Symbol(bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 241, 123)) Copper() : argurus.netscheri { var x : argurus.netscheri; () => { var y = this; }; return x; } >Copper : Symbol(bobrinskoi.Copper, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 241, 266)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 242, 82)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 242, 161)) ->this : Symbol(bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>this : Symbol(bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 242, 82)) } } -module ruatanica { +namespace ruatanica { >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) export class americanus extends imperfecta.ciliolabrum { ->americanus : Symbol(americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >imperfecta.ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) nasoloi() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; } >nasoloi : Symbol(americanus.nasoloi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 246, 93)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 247, 45)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 247, 86)) ->this : Symbol(americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>this : Symbol(americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 247, 45)) mystacalis() : howi.angulatus { var x : howi.angulatus; () => { var y = this; }; return x; } >mystacalis : Symbol(americanus.mystacalis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 247, 111)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13)) +>angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 16)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 248, 83)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13)) +>angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 16)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 248, 159)) ->this : Symbol(americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>this : Symbol(americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 248, 83)) fardoulisi() : trivirgatus.oconnelli { var x : trivirgatus.oconnelli; () => { var y = this; }; return x; } @@ -3226,7 +3226,7 @@ module ruatanica { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 249, 85)) ->this : Symbol(americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>this : Symbol(americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 249, 46)) tumidus() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; } @@ -3237,38 +3237,38 @@ module ruatanica { >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 250, 74)) ->this : Symbol(americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>this : Symbol(americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 250, 39)) } } -module lavali { +namespace lavali { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) export class wilsoni extends Lanthanum.nitidus { ->wilsoni : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >Lanthanum.nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) setiger() : nigra.thalia { var x : nigra.thalia; () => { var y = this; }; return x; } >setiger : Symbol(wilsoni.setiger, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 254, 96)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) ->wilsoni : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) +>wilsoni : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 255, 60)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) ->wilsoni : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) +>wilsoni : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 255, 116)) ->this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 255, 60)) lorentzii() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; } @@ -3279,67 +3279,67 @@ module lavali { >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 256, 86)) ->this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 256, 46)) antisensis() : lutreolus.foina { var x : lutreolus.foina; () => { var y = this; }; return x; } >antisensis : Symbol(wilsoni.antisensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 256, 111)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 257, 40)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 257, 73)) ->this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 257, 40)) blossevillii() : dammermani.siberu { var x : dammermani.siberu; () => { var y = this; }; return x; } >blossevillii : Symbol(wilsoni.blossevillii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 257, 98)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 258, 85)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 258, 161)) ->this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 258, 85)) bontanus() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; } >bontanus : Symbol(wilsoni.bontanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 258, 186)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 259, 46)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 259, 87)) ->this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 259, 46)) caligata() : argurus.oreas { var x : argurus.oreas; () => { var y = this; }; return x; } >caligata : Symbol(wilsoni.caligata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 259, 112)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 260, 36)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 260, 67)) ->this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 260, 36)) franqueti() : panglima.amphibius, imperfecta.subspinosus> { var x : panglima.amphibius, imperfecta.subspinosus>; () => { var y = this; }; return x; } >franqueti : Symbol(wilsoni.franqueti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 260, 92)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) @@ -3348,9 +3348,9 @@ module lavali { >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 261, 128)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) @@ -3358,7 +3358,7 @@ module lavali { >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 261, 250)) ->this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 261, 128)) roberti() : julianae.acariensis { var x : julianae.acariensis; () => { var y = this; }; return x; } @@ -3369,37 +3369,37 @@ module lavali { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 262, 78)) ->this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 262, 41)) degelidus() : chrysaeolus.sarasinorum { var x : chrysaeolus.sarasinorum; () => { var y = this; }; return x; } >degelidus : Symbol(wilsoni.degelidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 262, 103)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 263, 92)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 263, 178)) ->this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 263, 92)) amoenus() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; } >amoenus : Symbol(wilsoni.amoenus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 263, 203)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 264, 44)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 264, 84)) ->this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 264, 44)) kob() : trivirgatus.lotor { var x : trivirgatus.lotor; () => { var y = this; }; return x; } @@ -3407,35 +3407,35 @@ module lavali { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >beisa : Symbol(beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 265, 57)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >beisa : Symbol(beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 265, 114)) ->this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 265, 57)) csorbai() : caurinus.johorensis { var x : caurinus.johorensis; () => { var y = this; }; return x; } >csorbai : Symbol(wilsoni.csorbai, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 265, 139)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 266, 81)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 266, 158)) ->this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 266, 81)) dorsata() : gabriellae.echinatus { var x : gabriellae.echinatus; () => { var y = this; }; return x; } @@ -3446,7 +3446,7 @@ module lavali { >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 267, 80)) ->this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>this : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 267, 42)) } export class beisa { @@ -3454,21 +3454,21 @@ module lavali { } export class otion extends howi.coludo { >otion : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) ->howi.coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>howi.coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) bonaerensis() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; } >bonaerensis : Symbol(otion.bonaerensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 271, 72)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 272, 46)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 272, 84)) >this : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 272, 46)) @@ -3476,16 +3476,16 @@ module lavali { dussumieri() : nigra.gracilis { var x : nigra.gracilis; () => { var y = this; }; return x; } >dussumieri : Symbol(otion.dussumieri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 272, 109)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 273, 77)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 273, 147)) @@ -3497,16 +3497,16 @@ module lavali { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >albidens : Symbol(julianae.albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 274, 86)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >albidens : Symbol(julianae.albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 274, 163)) >this : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 274, 86)) @@ -3534,10 +3534,10 @@ module lavali { cristatus() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; } >cristatus : Symbol(otion.cristatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 276, 81)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 277, 40)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 277, 74)) >this : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 277, 40)) @@ -3545,14 +3545,14 @@ module lavali { darlingtoni() : sagitta.leptoceros { var x : sagitta.leptoceros; () => { var y = this; }; return x; } >darlingtoni : Symbol(otion.darlingtoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 277, 99)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 16)) ->wilsoni : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 19)) +>wilsoni : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 278, 76)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 16)) ->wilsoni : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 19)) +>wilsoni : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 278, 144)) @@ -3562,32 +3562,32 @@ module lavali { fontanierii() : panamensis.setulosus>, lutreolus.foina> { var x : panamensis.setulosus>, lutreolus.foina>; () => { var y = this; }; return x; } >fontanierii : Symbol(otion.fontanierii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 278, 169)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >fuscus : Symbol(samarensis.fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5)) ->wilsoni : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 279, 161)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >fuscus : Symbol(samarensis.fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5)) ->wilsoni : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 279, 314)) >this : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 279, 161)) @@ -3595,10 +3595,10 @@ module lavali { umbrosus() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; } >umbrosus : Symbol(otion.umbrosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 279, 339)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 280, 36)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 280, 67)) >this : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 280, 36)) @@ -3606,18 +3606,18 @@ module lavali { chiriquinus() : imperfecta.lasiurus { var x : imperfecta.lasiurus; () => { var y = this; }; return x; } >chiriquinus : Symbol(otion.chiriquinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 280, 92)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 281, 83)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 281, 158)) >this : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 281, 83)) @@ -3625,10 +3625,10 @@ module lavali { orarius() : lutreolus.schlegeli { var x : lutreolus.schlegeli; () => { var y = this; }; return x; } >orarius : Symbol(otion.orarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 281, 183)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 282, 41)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 282, 78)) >this : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 282, 41)) @@ -3636,14 +3636,14 @@ module lavali { ilaeus() : caurinus.mahaganus { var x : caurinus.mahaganus; () => { var y = this; }; return x; } >ilaeus : Symbol(otion.ilaeus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 282, 103)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 283, 80)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) @@ -3669,14 +3669,14 @@ module lavali { nanulus() : daubentonii.nigricans { var x : daubentonii.nigricans; () => { var y = this; }; return x; } >nanulus : Symbol(xanthognathus.nanulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 286, 30)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->nigricans : Symbol(daubentonii.nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 20)) +>nigricans : Symbol(daubentonii.nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 23)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 287, 88)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->nigricans : Symbol(daubentonii.nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 20)) +>nigricans : Symbol(daubentonii.nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 23)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) @@ -3688,18 +3688,18 @@ module lavali { albigena() : chrysaeolus.sarasinorum { var x : chrysaeolus.sarasinorum; () => { var y = this; }; return x; } >albigena : Symbol(xanthognathus.albigena, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 287, 197)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 288, 87)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 288, 169)) >this : Symbol(xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 288, 87)) @@ -3707,10 +3707,10 @@ module lavali { onca() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; } >onca : Symbol(xanthognathus.onca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 288, 194)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 289, 37)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 289, 73)) >this : Symbol(xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 289, 37)) @@ -3718,32 +3718,32 @@ module lavali { gunnii() : minutus.himalayana, nigra.thalia> { var x : minutus.himalayana, nigra.thalia>; () => { var y = this; }; return x; } >gunnii : Symbol(xanthognathus.gunnii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 289, 98)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->himalayana : Symbol(minutus.himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 16)) +>himalayana : Symbol(minutus.himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 19)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >lepturus : Symbol(lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 290, 135)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->himalayana : Symbol(minutus.himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 16)) +>himalayana : Symbol(minutus.himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 19)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >lepturus : Symbol(lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 290, 267)) >this : Symbol(xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 290, 135)) @@ -3751,10 +3751,10 @@ module lavali { apeco() : lutreolus.foina { var x : lutreolus.foina; () => { var y = this; }; return x; } >apeco : Symbol(xanthognathus.apeco, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 290, 292)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 291, 35)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 291, 68)) >this : Symbol(xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 291, 35)) @@ -3762,14 +3762,14 @@ module lavali { variegates() : gabriellae.klossii { var x : gabriellae.klossii; () => { var y = this; }; return x; } >variegates : Symbol(xanthognathus.variegates, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 291, 93)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) ->wilsoni : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) +>wilsoni : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 292, 73)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) ->wilsoni : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) +>wilsoni : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 292, 139)) @@ -3801,12 +3801,12 @@ module lavali { ineptus() : panamensis.setulosus { var x : panamensis.setulosus; () => { var y = this; }; return x; } >ineptus : Symbol(xanthognathus.ineptus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 294, 102)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >xanthognathus : Symbol(xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >beisa : Symbol(beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 295, 64)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >xanthognathus : Symbol(xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >beisa : Symbol(beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 295, 124)) @@ -3818,24 +3818,24 @@ module lavali { >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 296, 120)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 296, 235)) >this : Symbol(xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 296, 120)) @@ -3843,16 +3843,16 @@ module lavali { maurisca() : Lanthanum.suillus { var x : Lanthanum.suillus; () => { var y = this; }; return x; } >maurisca : Symbol(xanthognathus.maurisca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 296, 260)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) ->suillus : Symbol(Lanthanum.suillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 107, 18)) +>suillus : Symbol(Lanthanum.suillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 107, 21)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 297, 89)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) ->suillus : Symbol(Lanthanum.suillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 107, 18)) +>suillus : Symbol(Lanthanum.suillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 107, 21)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 297, 173)) @@ -3862,51 +3862,51 @@ module lavali { coyhaiquensis() : caurinus.mahaganus, panglima.abidi>, lutreolus.punicus> { var x : caurinus.mahaganus, panglima.abidi>, lutreolus.punicus>; () => { var y = this; }; return x; } >coyhaiquensis : Symbol(xanthognathus.coyhaiquensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 297, 198)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 298, 192)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 298, 374)) >this : Symbol(xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 298, 192)) } export class thaeleri extends argurus.oreas { >thaeleri : Symbol(thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) ->argurus.oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>argurus.oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) coromandra() : julianae.galapagoensis { var x : julianae.galapagoensis; () => { var y = this; }; return x; } >coromandra : Symbol(thaeleri.coromandra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 300, 47)) @@ -3922,16 +3922,16 @@ module lavali { parvipes() : nigra.dolichurus { var x : nigra.dolichurus; () => { var y = this; }; return x; } >parvipes : Symbol(thaeleri.parvipes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 301, 112)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 302, 78)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 302, 151)) @@ -3943,24 +3943,24 @@ module lavali { >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 303, 133)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 303, 259)) >this : Symbol(thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 303, 133)) @@ -3968,10 +3968,10 @@ module lavali { vates() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; } >vates : Symbol(thaeleri.vates, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 303, 284)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 304, 41)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 304, 80)) >this : Symbol(thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 304, 41)) @@ -3992,30 +3992,30 @@ module lavali { >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 306, 166)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 306, 327)) @@ -4025,10 +4025,10 @@ module lavali { ikonnikovi() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; } >ikonnikovi : Symbol(thaeleri.ikonnikovi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 306, 352)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 307, 41)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 307, 75)) >this : Symbol(thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 307, 41)) @@ -4039,48 +4039,48 @@ module lavali { >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >otion : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 308, 117)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >otion : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 308, 227)) >this : Symbol(thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 308, 117)) } export class lepturus extends Lanthanum.suillus { >lepturus : Symbol(lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) ->Lanthanum.suillus : Symbol(Lanthanum.suillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 107, 18)) +>Lanthanum.suillus : Symbol(Lanthanum.suillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 107, 21)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) ->suillus : Symbol(Lanthanum.suillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 107, 18)) +>suillus : Symbol(Lanthanum.suillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 107, 21)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) ferrumequinum() : argurus.netscheri { var x : argurus.netscheri; () => { var y = this; }; return x; } >ferrumequinum : Symbol(lepturus.ferrumequinum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 310, 96)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 311, 84)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 311, 158)) @@ -4090,38 +4090,38 @@ module lavali { aequalis() : sagitta.cinereus>, petrophilus.minutilla>, Lanthanum.jugularis> { var x : sagitta.cinereus>, petrophilus.minutilla>, Lanthanum.jugularis>; () => { var y = this; }; return x; } >aequalis : Symbol(lepturus.aequalis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 311, 183)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >xanthognathus : Symbol(xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 312, 204)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >xanthognathus : Symbol(xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 312, 403)) @@ -4129,62 +4129,62 @@ module lavali { >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 312, 204)) } } -module dogramacii { +namespace dogramacii { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) export class robustulus extends lavali.wilsoni { ->robustulus : Symbol(robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) ->lavali.wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>robustulus : Symbol(robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) +>lavali.wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) fossor() : minutus.inez { var x : minutus.inez; () => { var y = this; }; return x; } >fossor : Symbol(robustulus.fossor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 316, 50)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 317, 74)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 317, 145)) ->this : Symbol(robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>this : Symbol(robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 317, 74)) humboldti() : sagitta.cinereus { var x : sagitta.cinereus; () => { var y = this; }; return x; } >humboldti : Symbol(robustulus.humboldti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 317, 170)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 318, 77)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 318, 148)) ->this : Symbol(robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>this : Symbol(robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 318, 77)) mexicana() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; } >mexicana : Symbol(robustulus.mexicana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 318, 173)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 319, 46)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 319, 87)) ->this : Symbol(robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>this : Symbol(robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 319, 46)) martini() : julianae.oralis { var x : julianae.oralis; () => { var y = this; }; return x; } @@ -4192,18 +4192,18 @@ module dogramacii { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >oralis : Symbol(julianae.oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 320, 72)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >oralis : Symbol(julianae.oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 320, 140)) ->this : Symbol(robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>this : Symbol(robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 320, 72)) beatus() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; } @@ -4214,7 +4214,7 @@ module dogramacii { >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 321, 77)) ->this : Symbol(robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>this : Symbol(robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 321, 40)) leporina() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; } @@ -4225,56 +4225,56 @@ module dogramacii { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 322, 83)) ->this : Symbol(robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>this : Symbol(robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 322, 44)) pearsonii() : dammermani.melanops { var x : dammermani.melanops; () => { var y = this; }; return x; } >pearsonii : Symbol(robustulus.pearsonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 322, 108)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 323, 43)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 323, 80)) ->this : Symbol(robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>this : Symbol(robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 323, 43)) keaysi() : howi.angulatus { var x : howi.angulatus; () => { var y = this; }; return x; } >keaysi : Symbol(robustulus.keaysi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 323, 105)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13)) +>angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 16)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 324, 69)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13)) +>angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 16)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 324, 135)) ->this : Symbol(robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>this : Symbol(robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 324, 69)) hindei() : imperfecta.lasiurus { var x : imperfecta.lasiurus; () => { var y = this; }; return x; } >hindei : Symbol(robustulus.hindei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 324, 160)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 325, 83)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 325, 163)) ->this : Symbol(robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>this : Symbol(robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 325, 83)) } export class koepckeae { @@ -4283,22 +4283,22 @@ module dogramacii { culturatus() : samarensis.pelurus, julianae.sumatrana> { var x : samarensis.pelurus, julianae.sumatrana>; () => { var y = this; }; return x; } >culturatus : Symbol(koepckeae.culturatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 327, 26)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >kaiseri : Symbol(kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 328, 113)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >kaiseri : Symbol(kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 328, 219)) @@ -4311,10 +4311,10 @@ module dogramacii { bedfordiae() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; } >bedfordiae : Symbol(kaiseri.bedfordiae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 330, 24)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 331, 47)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 331, 87)) >this : Symbol(kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 331, 47)) @@ -4335,14 +4335,14 @@ module dogramacii { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 333, 78)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 333, 152)) @@ -4352,10 +4352,10 @@ module dogramacii { juninensis() : quasiater.bobrinskoi { var x : quasiater.bobrinskoi; () => { var y = this; }; return x; } >juninensis : Symbol(kaiseri.juninensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 333, 177)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 334, 45)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 334, 83)) >this : Symbol(kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 334, 45)) @@ -4363,34 +4363,34 @@ module dogramacii { marginata() : argurus.wetmorei>> { var x : argurus.wetmorei>>; () => { var y = this; }; return x; } >marginata : Symbol(kaiseri.marginata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 334, 108)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->wetmorei : Symbol(argurus.wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 16)) +>wetmorei : Symbol(argurus.wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 19)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 16)) +>leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 19)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 335, 175)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->wetmorei : Symbol(argurus.wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 16)) +>wetmorei : Symbol(argurus.wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 19)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 16)) +>leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 19)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 335, 344)) >this : Symbol(kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 335, 175)) @@ -4398,22 +4398,22 @@ module dogramacii { Meitnerium() : ruatanica.Praseodymium> { var x : ruatanica.Praseodymium>; () => { var y = this; }; return x; } >Meitnerium : Symbol(kaiseri.Meitnerium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 335, 369)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->cor : Symbol(lutreolus.cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 18)) +>cor : Symbol(lutreolus.cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 21)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 336, 127)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->cor : Symbol(lutreolus.cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 18)) +>cor : Symbol(lutreolus.cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 21)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) @@ -4425,10 +4425,10 @@ module dogramacii { pinetorum() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; } >pinetorum : Symbol(kaiseri.pinetorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 336, 272)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 337, 47)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 337, 88)) >this : Symbol(kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 337, 47)) @@ -4436,18 +4436,18 @@ module dogramacii { hoolock() : samarensis.pelurus { var x : samarensis.pelurus; () => { var y = this; }; return x; } >hoolock : Symbol(kaiseri.hoolock, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 337, 113)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 338, 73)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 338, 142)) >this : Symbol(kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 338, 73)) @@ -4499,10 +4499,10 @@ module dogramacii { ater() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } >ater : Symbol(kaiseri.ater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 342, 109)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 343, 39)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 343, 77)) >this : Symbol(kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 343, 39)) @@ -4513,32 +4513,32 @@ module dogramacii { grunniens() : nigra.gracilis, julianae.sumatrana>, ruatanica.americanus> { var x : nigra.gracilis, julianae.sumatrana>, ruatanica.americanus>; () => { var y = this; }; return x; } >grunniens : Symbol(aurata.grunniens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 345, 23)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >kaiseri : Symbol(kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 346, 150)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >kaiseri : Symbol(kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 346, 294)) >this : Symbol(aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 346, 150)) @@ -4546,10 +4546,10 @@ module dogramacii { howensis() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; } >howensis : Symbol(aurata.howensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 346, 319)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 347, 43)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 347, 81)) >this : Symbol(aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 347, 43)) @@ -4557,10 +4557,10 @@ module dogramacii { karlkoopmani() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; } >karlkoopmani : Symbol(aurata.karlkoopmani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 347, 106)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 348, 44)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 348, 79)) >this : Symbol(aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 348, 44)) @@ -4596,18 +4596,18 @@ module dogramacii { landeri() : samarensis.pelurus { var x : samarensis.pelurus; () => { var y = this; }; return x; } >landeri : Symbol(aurata.landeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 350, 78)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 351, 83)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 351, 162)) >this : Symbol(aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 351, 83)) @@ -4621,7 +4621,7 @@ module dogramacii { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >koepckeae : Symbol(koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 352, 102)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) @@ -4631,7 +4631,7 @@ module dogramacii { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >koepckeae : Symbol(koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 352, 200)) >this : Symbol(aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) @@ -4640,30 +4640,30 @@ module dogramacii { erythromos() : caurinus.johorensis, nigra.dolichurus> { var x : caurinus.johorensis, nigra.dolichurus>; () => { var y = this; }; return x; } >erythromos : Symbol(aurata.erythromos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 352, 225)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 353, 160)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) @@ -4673,11 +4673,11 @@ module dogramacii { >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 353, 160)) } } -module lutreolus { +namespace lutreolus { >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) export class schlegeli extends lavali.beisa { ->schlegeli : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >lavali.beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) @@ -4685,126 +4685,126 @@ module lutreolus { mittendorfi() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; } >mittendorfi : Symbol(schlegeli.mittendorfi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 357, 47)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 358, 49)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 358, 90)) ->this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 358, 49)) blicki() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; } >blicki : Symbol(schlegeli.blicki, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 358, 115)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 359, 42)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 359, 81)) ->this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 359, 42)) culionensis() : argurus.dauricus { var x : argurus.dauricus; () => { var y = this; }; return x; } >culionensis : Symbol(schlegeli.culionensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 359, 106)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 360, 89)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 360, 170)) ->this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 360, 89)) scrofa() : petrophilus.sodyi { var x : petrophilus.sodyi; () => { var y = this; }; return x; } >scrofa : Symbol(schlegeli.scrofa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 360, 195)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 361, 77)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 361, 151)) ->this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 361, 77)) fernandoni() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; } >fernandoni : Symbol(schlegeli.fernandoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 361, 176)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 362, 47)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 362, 87)) ->this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 362, 47)) Tin() : sagitta.leptoceros> { var x : sagitta.leptoceros>; () => { var y = this; }; return x; } >Tin : Symbol(schlegeli.Tin, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 362, 112)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 16)) +>leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 19)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 363, 126)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 16)) +>leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 19)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 363, 252)) ->this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 363, 126)) marmorata() : panamensis.setulosus> { var x : panamensis.setulosus>; () => { var y = this; }; return x; } >marmorata : Symbol(schlegeli.marmorata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 363, 277)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 364, 129)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 364, 252)) ->this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 364, 129)) tavaratra() : Lanthanum.nitidus { var x : Lanthanum.nitidus; () => { var y = this; }; return x; } @@ -4812,83 +4812,83 @@ module lutreolus { >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 365, 81)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 365, 156)) ->this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 365, 81)) peregrina() : daubentonii.nesiotes { var x : daubentonii.nesiotes; () => { var y = this; }; return x; } >peregrina : Symbol(schlegeli.peregrina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 365, 181)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 20)) +>nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 23)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 366, 88)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 20)) +>nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 23)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 366, 170)) ->this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 366, 88)) frontalis() : macrorhinos.marmosurus>, samarensis.pallidus> { var x : macrorhinos.marmosurus>, samarensis.pallidus>; () => { var y = this; }; return x; } >frontalis : Symbol(schlegeli.frontalis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 366, 195)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18)) +>hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 367, 163)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18)) +>hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 367, 320)) ->this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 367, 163)) cuniculus() : patas.uralensis { var x : patas.uralensis; () => { var y = this; }; return x; } >cuniculus : Symbol(schlegeli.cuniculus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 367, 345)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 368, 39)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 368, 72)) ->this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 368, 39)) magdalenae() : julianae.gerbillus> { var x : julianae.gerbillus>; () => { var y = this; }; return x; } @@ -4896,26 +4896,26 @@ module lutreolus { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >gerbillus : Symbol(julianae.gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 369, 131)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >gerbillus : Symbol(julianae.gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 369, 255)) ->this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 369, 131)) andamanensis() : julianae.oralis { var x : julianae.oralis; () => { var y = this; }; return x; } @@ -4923,45 +4923,45 @@ module lutreolus { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >oralis : Symbol(julianae.oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 370, 84)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >oralis : Symbol(julianae.oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 370, 159)) ->this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 370, 84)) dispar() : panamensis.linulus { var x : panamensis.linulus; () => { var y = this; }; return x; } >dispar : Symbol(schlegeli.dispar, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 370, 184)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 371, 82)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 371, 161)) ->this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>this : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 371, 82)) } } -module argurus { +namespace argurus { >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) export class dauricus { ->dauricus : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 375, 24)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 375, 27)) @@ -4973,7 +4973,7 @@ module argurus { >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 376, 80)) ->this : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>this : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 376, 43)) duodecimcostatus() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; } @@ -4984,61 +4984,61 @@ module argurus { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 377, 89)) ->this : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>this : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 377, 51)) foxi() : daubentonii.nesiotes { var x : daubentonii.nesiotes; () => { var y = this; }; return x; } >foxi : Symbol(dauricus.foxi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 377, 114)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 20)) +>nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 23)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 378, 70)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 20)) +>nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 23)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 378, 139)) ->this : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>this : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 378, 70)) macleayii() : petrophilus.sodyi>, petrophilus.minutilla> { var x : petrophilus.sodyi>, petrophilus.minutilla>; () => { var y = this; }; return x; } >macleayii : Symbol(dauricus.macleayii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 378, 164)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 379, 173)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 379, 340)) ->this : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>this : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 379, 173)) darienensis() : trivirgatus.oconnelli { var x : trivirgatus.oconnelli; () => { var y = this; }; return x; } @@ -5049,18 +5049,18 @@ module argurus { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 380, 86)) ->this : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>this : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 380, 47)) hardwickii() : macrorhinos.daphaenodon { var x : macrorhinos.daphaenodon; () => { var y = this; }; return x; } >hardwickii : Symbol(dauricus.hardwickii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 380, 111)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 381, 48)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 381, 89)) ->this : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>this : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 381, 48)) albifrons() : rionegrensis.veraecrucis { var x : rionegrensis.veraecrucis; () => { var y = this; }; return x; } @@ -5079,42 +5079,42 @@ module argurus { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 382, 162)) ->this : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>this : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 382, 84)) jacobitus() : caurinus.johorensis>> { var x : caurinus.johorensis>>; () => { var y = this; }; return x; } >jacobitus : Symbol(dauricus.jacobitus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 382, 187)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 383, 169)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 383, 332)) ->this : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>this : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 383, 169)) guentheri() : rendalli.moojeni { var x : rendalli.moojeni; () => { var y = this; }; return x; } @@ -5122,18 +5122,18 @@ module argurus { >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 384, 72)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 384, 138)) ->this : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>this : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 384, 72)) mahomet() : imperfecta.ciliolabrum { var x : imperfecta.ciliolabrum; () => { var y = this; }; return x; } @@ -5141,53 +5141,53 @@ module argurus { >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 385, 79)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 385, 154)) ->this : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>this : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 385, 79)) misionensis() : macrorhinos.marmosurus, gabriellae.echinatus> { var x : macrorhinos.marmosurus, gabriellae.echinatus>; () => { var y = this; }; return x; } >misionensis : Symbol(dauricus.misionensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 385, 179)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 386, 141)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 386, 274)) ->this : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>this : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 386, 141)) } } -module nigra { +namespace nigra { >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) export class dolichurus { ->dolichurus : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 390, 26)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 390, 29)) @@ -5196,21 +5196,21 @@ module nigra { >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) @@ -5218,26 +5218,26 @@ module nigra { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 391, 270)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) @@ -5245,71 +5245,71 @@ module nigra { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 391, 534)) ->this : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>this : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 391, 270)) alfredi() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; } >alfredi : Symbol(dolichurus.alfredi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 391, 559)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 392, 39)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 392, 74)) ->this : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>this : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 392, 39)) morrisi() : ruatanica.hector, quasiater.wattsi>>> { var x : ruatanica.hector, quasiater.wattsi>>>; () => { var y = this; }; return x; } >morrisi : Symbol(dolichurus.morrisi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 392, 99)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18)) +>hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->caucasica : Symbol(caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 14)) +>caucasica : Symbol(caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 17)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 393, 248)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18)) +>hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->caucasica : Symbol(caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 14)) +>caucasica : Symbol(caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 17)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 393, 492)) ->this : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>this : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 393, 248)) lekaguli() : Lanthanum.nitidus { var x : Lanthanum.nitidus; () => { var y = this; }; return x; } @@ -5317,18 +5317,18 @@ module nigra { >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 394, 78)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 394, 151)) ->this : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>this : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 394, 78)) dimissus() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; } @@ -5339,7 +5339,7 @@ module nigra { >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 395, 85)) ->this : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>this : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 395, 45)) phaeotis() : julianae.sumatrana { var x : julianae.sumatrana; () => { var y = this; }; return x; } @@ -5350,7 +5350,7 @@ module nigra { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 396, 77)) ->this : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>this : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 396, 41)) ustus() : julianae.acariensis { var x : julianae.acariensis; () => { var y = this; }; return x; } @@ -5361,35 +5361,35 @@ module nigra { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 397, 76)) ->this : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>this : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 397, 39)) sagei() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; } >sagei : Symbol(dolichurus.sagei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 397, 101)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 398, 33)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 398, 64)) ->this : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>this : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 398, 33)) } } -module panglima { +namespace panglima { >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) export class amphibius extends caurinus.johorensis, Lanthanum.jugularis> { ->amphibius : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 402, 27)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 402, 30)) ->caurinus.johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>caurinus.johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) @@ -5398,45 +5398,45 @@ module panglima { bottegi(): macrorhinos.marmosurus, gabriellae.echinatus>, sagitta.stolzmanni> { var x: macrorhinos.marmosurus, gabriellae.echinatus>, sagitta.stolzmanni>; () => { var y = this; }; return x; } >bottegi : Symbol(amphibius.bottegi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 402, 147)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) ->amphibius : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 403, 160)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) ->amphibius : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 403, 312)) ->this : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>this : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 403, 160)) jerdoni(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; } >jerdoni : Symbol(amphibius.jerdoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 403, 337)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 404, 48)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 404, 88)) ->this : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>this : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 404, 48)) camtschatica(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; } @@ -5447,26 +5447,26 @@ module panglima { >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 405, 85)) ->this : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>this : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 405, 49)) spadix(): petrophilus.sodyi { var x: petrophilus.sodyi; () => { var y = this; }; return x; } >spadix : Symbol(amphibius.spadix, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 405, 110)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 406, 85)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 406, 163)) ->this : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>this : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 406, 85)) luismanueli(): rendalli.moojeni { var x: rendalli.moojeni; () => { var y = this; }; return x; } @@ -5485,51 +5485,51 @@ module panglima { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 407, 164)) ->this : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>this : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 407, 88)) aceramarcae(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } >aceramarcae : Symbol(amphibius.aceramarcae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 407, 189)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 408, 88)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 408, 164)) ->this : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>this : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 408, 88)) } export class fundatus extends lutreolus.schlegeli { >fundatus : Symbol(fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 410, 26)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 410, 29)) ->lutreolus.schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>lutreolus.schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) crassulus(): nigra.gracilis { var x: nigra.gracilis; () => { var y = this; }; return x; } >crassulus : Symbol(fundatus.crassulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 410, 63)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 411, 85)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 411, 160)) >this : Symbol(fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 411, 85)) @@ -5537,48 +5537,48 @@ module panglima { flamarioni(): imperfecta.lasiurus>, sagitta.leptoceros>> { var x: imperfecta.lasiurus>, sagitta.leptoceros>>; () => { var y = this; }; return x; } >flamarioni : Symbol(fundatus.flamarioni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 411, 185)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) ->amphibius : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) +>amphibius : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 16)) +>leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 19)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 412, 245)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) ->amphibius : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) +>amphibius : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 16)) +>leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 19)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 412, 479)) >this : Symbol(fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 412, 245)) @@ -5586,22 +5586,22 @@ module panglima { mirabilis(): macrorhinos.marmosurus, lavali.lepturus> { var x: macrorhinos.marmosurus, lavali.lepturus>; () => { var y = this; }; return x; } >mirabilis : Symbol(fundatus.mirabilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 412, 504)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20)) +>rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 413, 119)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20)) +>rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) @@ -5614,11 +5614,11 @@ module panglima { >abidi : Symbol(abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 415, 23)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 415, 26)) ->argurus.dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>argurus.dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3)) @@ -5636,10 +5636,10 @@ module panglima { macedonicus(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; } >macedonicus : Symbol(abidi.macedonicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 416, 108)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 417, 50)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 417, 88)) >this : Symbol(abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 417, 50)) @@ -5649,14 +5649,14 @@ module panglima { >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 418, 86)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 418, 165)) @@ -5666,10 +5666,10 @@ module panglima { thierryi(): dogramacii.robustulus { var x: dogramacii.robustulus; () => { var y = this; }; return x; } >thierryi : Symbol(abidi.thierryi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 418, 190)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 419, 47)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 419, 85)) >this : Symbol(abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 419, 47)) @@ -5677,84 +5677,84 @@ module panglima { ega(): imperfecta.lasiurus> { var x: imperfecta.lasiurus>; () => { var y = this; }; return x; } >ega : Symbol(abidi.ega, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 419, 110)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 420, 104)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 420, 204)) >this : Symbol(abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 420, 104)) } } -module quasiater { +namespace quasiater { >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) export class carolinensis { ->carolinensis : Symbol(carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) concinna(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; } >concinna : Symbol(carolinensis.concinna, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 424, 31)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 425, 44)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 425, 79)) ->this : Symbol(carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>this : Symbol(carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 425, 44)) aeneus(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; } >aeneus : Symbol(carolinensis.aeneus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 425, 104)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 426, 37)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 426, 67)) ->this : Symbol(carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>this : Symbol(carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 426, 37)) aloysiisabaudiae(): argurus.netscheri, lavali.lepturus> { var x: argurus.netscheri, lavali.lepturus>; () => { var y = this; }; return x; } >aloysiisabaudiae : Symbol(carolinensis.aloysiisabaudiae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 426, 92)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 427, 116)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 427, 215)) ->this : Symbol(carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>this : Symbol(carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 427, 116)) tenellus(): julianae.nudicaudus { var x: julianae.nudicaudus; () => { var y = this; }; return x; } @@ -5765,7 +5765,7 @@ module quasiater { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 428, 81)) ->this : Symbol(carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>this : Symbol(carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 428, 45)) andium(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; } @@ -5776,7 +5776,7 @@ module quasiater { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 429, 65)) ->this : Symbol(carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>this : Symbol(carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 429, 36)) persephone(): panglima.fundatus { var x: panglima.fundatus; () => { var y = this; }; return x; } @@ -5786,16 +5786,16 @@ module quasiater { >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 430, 86)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 430, 161)) ->this : Symbol(carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>this : Symbol(carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 430, 86)) patrizii(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; } @@ -5806,46 +5806,46 @@ module quasiater { >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 431, 81)) ->this : Symbol(carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>this : Symbol(carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 431, 45)) } } -module minutus { +namespace minutus { >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) export class himalayana extends lutreolus.punicus { ->himalayana : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 16)) +>himalayana : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 19)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 435, 28)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 435, 31)) ->lutreolus.punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>lutreolus.punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) simoni(): argurus.netscheri> { var x: argurus.netscheri>; () => { var y = this; }; return x; } >simoni : Symbol(himalayana.simoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 435, 63)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 436, 115)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 436, 223)) ->this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 16)) +>this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 436, 115)) lobata(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; } @@ -5856,7 +5856,7 @@ module minutus { >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 437, 79)) ->this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 16)) +>this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 437, 43)) rusticus(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; } @@ -5867,102 +5867,102 @@ module minutus { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 438, 77)) ->this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 16)) +>this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 438, 43)) latona(): daubentonii.nesiotes { var x: daubentonii.nesiotes; () => { var y = this; }; return x; } >latona : Symbol(himalayana.latona, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 438, 102)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 20)) +>nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 23)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 439, 86)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 20)) +>nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 23)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 439, 165)) ->this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 16)) +>this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 439, 86)) famulus(): patas.uralensis { var x: patas.uralensis; () => { var y = this; }; return x; } >famulus : Symbol(himalayana.famulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 439, 190)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 440, 40)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 440, 72)) ->this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 16)) +>this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 440, 40)) flaviceps(): minutus.inez> { var x: minutus.inez>; () => { var y = this; }; return x; } >flaviceps : Symbol(himalayana.flaviceps, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 440, 97)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 441, 109)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 441, 208)) ->this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 16)) +>this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 441, 109)) paradoxolophus(): nigra.dolichurus> { var x: nigra.dolichurus>; () => { var y = this; }; return x; } >paradoxolophus : Symbol(himalayana.paradoxolophus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 441, 233)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 442, 139)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 442, 263)) ->this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 16)) +>this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 442, 139)) Osmium(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; } >Osmium : Symbol(himalayana.Osmium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 442, 288)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 443, 38)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 443, 69)) ->this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 16)) +>this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 443, 38)) vulgaris(): Lanthanum.nitidus { var x: Lanthanum.nitidus; () => { var y = this; }; return x; } @@ -5981,53 +5981,53 @@ module minutus { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 444, 153)) ->this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 16)) +>this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 444, 81)) betsileoensis(): panglima.amphibius { var x: panglima.amphibius; () => { var y = this; }; return x; } >betsileoensis : Symbol(himalayana.betsileoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 444, 178)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 445, 88)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 445, 162)) ->this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 16)) +>this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 445, 88)) vespuccii(): argurus.gilbertii, provocax.melanoleuca> { var x: argurus.gilbertii, provocax.melanoleuca>; () => { var y = this; }; return x; } >vespuccii : Symbol(himalayana.vespuccii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 445, 187)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->gilbertii : Symbol(argurus.gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>gilbertii : Symbol(argurus.gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 446, 135)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->gilbertii : Symbol(argurus.gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>gilbertii : Symbol(argurus.gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 446, 260)) ->this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 16)) +>this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 446, 135)) olympus(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; } @@ -6038,123 +6038,123 @@ module minutus { >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 447, 80)) ->this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 16)) +>this : Symbol(himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 447, 44)) } } -module caurinus { +namespace caurinus { >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) export class mahaganus extends panglima.fundatus { ->mahaganus : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>mahaganus : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 451, 27)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 451, 30)) >panglima.fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) martiniquensis(): ruatanica.hector>> { var x: ruatanica.hector>>; () => { var y = this; }; return x; } >martiniquensis : Symbol(mahaganus.martiniquensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 451, 111)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18)) +>hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->mahaganus : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>mahaganus : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 452, 168)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18)) +>hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->mahaganus : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>mahaganus : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 452, 321)) ->this : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>this : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 452, 168)) devius(): samarensis.pelurus, trivirgatus.falconeri>> { var x: samarensis.pelurus, trivirgatus.falconeri>>; () => { var y = this; }; return x; } >devius : Symbol(mahaganus.devius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 452, 346)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 453, 153)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 453, 299)) ->this : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>this : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 453, 153)) masalai(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; } >masalai : Symbol(mahaganus.masalai, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 453, 324)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 454, 38)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 454, 68)) ->this : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>this : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 454, 38)) kathleenae(): nigra.dolichurus { var x: nigra.dolichurus; () => { var y = this; }; return x; } >kathleenae : Symbol(mahaganus.kathleenae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 454, 93)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 455, 80)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 455, 149)) ->this : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>this : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 455, 80)) simulus(): gabriellae.echinatus { var x: gabriellae.echinatus; () => { var y = this; }; return x; } @@ -6165,17 +6165,17 @@ module caurinus { >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 456, 82)) ->this : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>this : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 456, 45)) nigrovittatus(): caurinus.mahaganus>> { var x: caurinus.mahaganus>>; () => { var y = this; }; return x; } >nigrovittatus : Symbol(mahaganus.nigrovittatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 456, 107)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->mahaganus : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>mahaganus : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20)) +>rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) @@ -6183,14 +6183,14 @@ module caurinus { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 457, 165)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->mahaganus : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>mahaganus : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20)) +>rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) @@ -6198,146 +6198,146 @@ module caurinus { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 457, 316)) ->this : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>this : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 457, 165)) senegalensis(): gabriellae.klossii, dammermani.melanops> { var x: gabriellae.klossii, dammermani.melanops>; () => { var y = this; }; return x; } >senegalensis : Symbol(mahaganus.senegalensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 457, 341)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 458, 118)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 458, 223)) ->this : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>this : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 458, 118)) acticola(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; } >acticola : Symbol(mahaganus.acticola, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 458, 248)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 459, 42)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 459, 75)) ->this : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>this : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 459, 42)) } } -module macrorhinos { +namespace macrorhinos { >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) export class marmosurus { ->marmosurus : Symbol(marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 463, 28)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 463, 31)) tansaniana(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; } >tansaniana : Symbol(marmosurus.tansaniana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 463, 37)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 464, 45)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 464, 79)) ->this : Symbol(marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>this : Symbol(marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 464, 45)) } } -module howi { +namespace howi { >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) export class angulatus extends sagitta.stolzmanni { ->angulatus : Symbol(angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13)) +>angulatus : Symbol(angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 16)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 468, 27)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 468, 30)) ->sagitta.stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>sagitta.stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) pennatus(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; } >pennatus : Symbol(angulatus.pennatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 468, 63)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 469, 39)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 469, 69)) ->this : Symbol(angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13)) +>this : Symbol(angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 469, 39)) } } -module daubentonii { +namespace daubentonii { >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) export class nesiotes { ->nesiotes : Symbol(nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 20)) +>nesiotes : Symbol(nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 23)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 473, 26)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 473, 29)) } } -module nigra { +namespace nigra { >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) export class thalia { ->thalia : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>thalia : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 477, 24)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 477, 27)) dichotomus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } >dichotomus : Symbol(thalia.dichotomus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 477, 33)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 478, 50)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 478, 89)) ->this : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>this : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 478, 50)) arnuxii(): panamensis.linulus, lavali.beisa> { var x: panamensis.linulus, lavali.beisa>; () => { var y = this; }; return x; } >arnuxii : Symbol(thalia.arnuxii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 478, 114)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 479, 110)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 479, 212)) ->this : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>this : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 479, 110)) verheyeni(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; } @@ -6348,7 +6348,7 @@ module nigra { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 480, 84)) ->this : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>this : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 480, 47)) dauuricus(): gabriellae.amicus { var x: gabriellae.amicus; () => { var y = this; }; return x; } @@ -6359,7 +6359,7 @@ module nigra { >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 481, 78)) ->this : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>this : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 481, 44)) tristriatus(): rionegrensis.veraecrucis> { var x: rionegrensis.veraecrucis>; () => { var y = this; }; return x; } @@ -6367,26 +6367,26 @@ module nigra { >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 482, 124)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 482, 236)) ->this : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>this : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 482, 124)) lasiura(): panglima.abidi>, Lanthanum.nitidus> { var x: panglima.abidi>, Lanthanum.nitidus>; () => { var y = this; }; return x; } @@ -6396,9 +6396,9 @@ module nigra { >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >fuscus : Symbol(samarensis.fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) @@ -6415,9 +6415,9 @@ module nigra { >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >fuscus : Symbol(samarensis.fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) @@ -6429,48 +6429,48 @@ module nigra { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 483, 394)) ->this : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>this : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 483, 201)) gangetica(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; } >gangetica : Symbol(thalia.gangetica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 483, 419)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 484, 43)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 484, 76)) ->this : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>this : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 484, 43)) brucei(): chrysaeolus.sarasinorum { var x: chrysaeolus.sarasinorum; () => { var y = this; }; return x; } >brucei : Symbol(thalia.brucei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 484, 101)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 485, 87)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 485, 167)) ->this : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>this : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 485, 87)) } } -module sagitta { +namespace sagitta { >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) export class walkeri extends minutus.portoricensis { ->walkeri : Symbol(walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) ->minutus.portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>walkeri : Symbol(walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) +>minutus.portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) maracajuensis(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } >maracajuensis : Symbol(walkeri.maracajuensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 489, 56)) @@ -6479,31 +6479,31 @@ module sagitta { >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 490, 94)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 490, 174)) ->this : Symbol(walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>this : Symbol(walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 490, 94)) } } -module minutus { +namespace minutus { >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) export class inez extends samarensis.pelurus { ->inez : Symbol(inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 494, 22)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 494, 25)) ->samarensis.pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>samarensis.pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3)) @@ -6514,80 +6514,80 @@ module minutus { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 495, 81)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 495, 151)) ->this : Symbol(inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>this : Symbol(inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 495, 81)) } } -module macrorhinos { +namespace macrorhinos { >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) export class konganensis extends imperfecta.lasiurus { ->konganensis : Symbol(konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) ->imperfecta.lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>konganensis : Symbol(konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) +>imperfecta.lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) } } -module panamensis { +namespace panamensis { >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) export class linulus extends ruatanica.hector> { ->linulus : Symbol(linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 503, 25)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 503, 28)) ->ruatanica.hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18)) +>ruatanica.hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18)) +>hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) goslingi(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } >goslingi : Symbol(linulus.goslingi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 503, 137)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 504, 85)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 504, 161)) ->this : Symbol(linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>this : Symbol(linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 504, 85)) taki(): patas.uralensis { var x: patas.uralensis; () => { var y = this; }; return x; } >taki : Symbol(linulus.taki, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 504, 186)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 505, 37)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 505, 69)) ->this : Symbol(linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>this : Symbol(linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 505, 37)) fumosus(): rendalli.moojeni, lavali.beisa> { var x: rendalli.moojeni, lavali.beisa>; () => { var y = this; }; return x; } @@ -6595,7 +6595,7 @@ module panamensis { >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) @@ -6606,7 +6606,7 @@ module panamensis { >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) @@ -6614,37 +6614,37 @@ module panamensis { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 506, 216)) ->this : Symbol(linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>this : Symbol(linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 506, 112)) rufinus(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; } >rufinus : Symbol(linulus.rufinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 506, 241)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 507, 48)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 507, 88)) ->this : Symbol(linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>this : Symbol(linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 507, 48)) lami(): nigra.thalia { var x: nigra.thalia; () => { var y = this; }; return x; } >lami : Symbol(linulus.lami, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 507, 113)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 508, 74)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 508, 143)) ->this : Symbol(linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>this : Symbol(linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 508, 74)) regina(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; } @@ -6655,45 +6655,45 @@ module panamensis { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 509, 83)) ->this : Symbol(linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>this : Symbol(linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 509, 45)) nanilla(): dammermani.siberu { var x: dammermani.siberu; () => { var y = this; }; return x; } >nanilla : Symbol(linulus.nanilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 509, 108)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 510, 87)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 510, 166)) ->this : Symbol(linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>this : Symbol(linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 510, 87)) enganus(): petrophilus.sodyi { var x: petrophilus.sodyi; () => { var y = this; }; return x; } >enganus : Symbol(linulus.enganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 510, 191)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 511, 76)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 511, 144)) ->this : Symbol(linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>this : Symbol(linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 511, 76)) gomantongensis(): rionegrensis.veraecrucis> { var x: rionegrensis.veraecrucis>; () => { var y = this; }; return x; } @@ -6701,54 +6701,54 @@ module panamensis { >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 512, 134)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 512, 253)) ->this : Symbol(linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>this : Symbol(linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 512, 134)) } } -module nigra { +namespace nigra { >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) export class gracilis { ->gracilis : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 516, 26)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 516, 29)) weddellii(): nigra.dolichurus { var x: nigra.dolichurus; () => { var y = this; }; return x; } >weddellii : Symbol(gracilis.weddellii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 516, 35)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 517, 80)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 517, 150)) ->this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 517, 80)) echinothrix(): Lanthanum.nitidus, argurus.oreas> { var x: Lanthanum.nitidus, argurus.oreas>; () => { var y = this; }; return x; } @@ -6756,26 +6756,26 @@ module nigra { >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 518, 120)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 518, 228)) ->this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 518, 120)) garridoi(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; } @@ -6786,107 +6786,107 @@ module nigra { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 519, 83)) ->this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 519, 46)) rouxii(): nigra.gracilis, nigra.thalia> { var x: nigra.gracilis, nigra.thalia>; () => { var y = this; }; return x; } >rouxii : Symbol(gracilis.rouxii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 519, 108)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->thalia : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>thalia : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 520, 153)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->thalia : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>thalia : Symbol(thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 520, 299)) ->this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 520, 153)) aurita(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; } >aurita : Symbol(gracilis.aurita, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 520, 324)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 521, 42)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 521, 77)) ->this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 521, 42)) geoffrensis(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; } >geoffrensis : Symbol(gracilis.geoffrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 521, 102)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 522, 52)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 522, 92)) ->this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 522, 52)) theresa(): macrorhinos.marmosurus, argurus.luctuosa>, nigra.dolichurus> { var x: macrorhinos.marmosurus, argurus.luctuosa>, nigra.dolichurus>; () => { var y = this; }; return x; } >theresa : Symbol(gracilis.theresa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 522, 117)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 523, 197)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 523, 386)) ->this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 523, 197)) melanocarpus(): julianae.albidens, julianae.sumatrana> { var x: julianae.albidens, julianae.sumatrana>; () => { var y = this; }; return x; } @@ -6894,9 +6894,9 @@ module nigra { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >albidens : Symbol(julianae.albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) @@ -6905,26 +6905,26 @@ module nigra { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >albidens : Symbol(julianae.albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 524, 235)) ->this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 524, 124)) dubiaquercus(): dogramacii.robustulus { var x: dogramacii.robustulus; () => { var y = this; }; return x; } >dubiaquercus : Symbol(gracilis.dubiaquercus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 524, 260)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 525, 51)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 525, 89)) ->this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 525, 51)) pectoralis(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; } @@ -6935,18 +6935,18 @@ module nigra { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 526, 81)) ->this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 526, 46)) apoensis(): caurinus.megaphyllus { var x: caurinus.megaphyllus; () => { var y = this; }; return x; } >apoensis : Symbol(gracilis.apoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 526, 106)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 527, 46)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 527, 83)) ->this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 527, 46)) grisescens(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; } @@ -6957,67 +6957,67 @@ module nigra { >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 528, 83)) ->this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 528, 47)) ramirohitra(): panglima.amphibius { var x: panglima.amphibius; () => { var y = this; }; return x; } >ramirohitra : Symbol(gracilis.ramirohitra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 528, 108)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 529, 92)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 529, 172)) ->this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>this : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 529, 92)) } } -module samarensis { +namespace samarensis { >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) export class pelurus extends sagitta.stolzmanni { ->pelurus : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 533, 25)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 533, 28)) ->sagitta.stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>sagitta.stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) Palladium(): panamensis.linulus { var x: panamensis.linulus; () => { var y = this; }; return x; } >Palladium : Symbol(pelurus.Palladium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 533, 61)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 534, 95)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 534, 180)) ->this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 534, 95)) castanea(): argurus.netscheri, julianae.oralis> { var x: argurus.netscheri, julianae.oralis>; () => { var y = this; }; return x; } >castanea : Symbol(pelurus.castanea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 534, 205)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) @@ -7025,14 +7025,14 @@ module samarensis { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 535, 152)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) @@ -7040,143 +7040,143 @@ module samarensis { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 535, 295)) ->this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 535, 152)) chamek(): argurus.pygmaea { var x: argurus.pygmaea; () => { var y = this; }; return x; } >chamek : Symbol(pelurus.chamek, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 535, 320)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->pygmaea : Symbol(argurus.pygmaea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 596, 16)) +>pygmaea : Symbol(argurus.pygmaea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 596, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 536, 85)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->pygmaea : Symbol(argurus.pygmaea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 596, 16)) +>pygmaea : Symbol(argurus.pygmaea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 596, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 536, 163)) ->this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 536, 85)) nigriceps(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; } >nigriceps : Symbol(pelurus.nigriceps, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 536, 188)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 537, 44)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 537, 78)) ->this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 537, 44)) lunatus(): pelurus { var x: pelurus; () => { var y = this; }; return x; } >lunatus : Symbol(pelurus.lunatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 537, 103)) ->pelurus : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 538, 70)) ->pelurus : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 538, 132)) ->this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 538, 70)) madurae(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; } >madurae : Symbol(pelurus.madurae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 538, 157)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 539, 48)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 539, 88)) ->this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 539, 48)) chinchilla(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; } >chinchilla : Symbol(pelurus.chinchilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 539, 113)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 540, 51)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 540, 91)) ->this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 540, 51)) eliasi(): petrophilus.rosalia { var x: petrophilus.rosalia; () => { var y = this; }; return x; } >eliasi : Symbol(pelurus.eliasi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 540, 116)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20)) +>rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 541, 75)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20)) +>rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 541, 143)) ->this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 541, 75)) proditor(): panamensis.setulosus { var x: panamensis.setulosus; () => { var y = this; }; return x; } >proditor : Symbol(pelurus.proditor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 541, 168)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 542, 86)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 542, 163)) ->this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 542, 86)) gambianus(): quasiater.wattsi> { var x: quasiater.wattsi>; () => { var y = this; }; return x; } >gambianus : Symbol(pelurus.gambianus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 542, 188)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 543, 134)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 543, 258)) ->this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 543, 134)) petteri(): dogramacii.kaiseri { var x: dogramacii.kaiseri; () => { var y = this; }; return x; } @@ -7187,26 +7187,26 @@ module samarensis { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 544, 78)) ->this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 544, 43)) nusatenggara(): panglima.amphibius { var x: panglima.amphibius; () => { var y = this; }; return x; } >nusatenggara : Symbol(pelurus.nusatenggara, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 544, 103)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 545, 89)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 545, 165)) ->this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 545, 89)) olitor(): rionegrensis.veraecrucis { var x: rionegrensis.veraecrucis; () => { var y = this; }; return x; } @@ -7216,37 +7216,37 @@ module samarensis { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 546, 92)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 546, 177)) ->this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>this : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 546, 92)) } export class fuscus extends macrorhinos.daphaenodon { >fuscus : Symbol(fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 548, 24)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 548, 27)) ->macrorhinos.daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>macrorhinos.daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) planifrons(): nigra.gracilis { var x: nigra.gracilis; () => { var y = this; }; return x; } >planifrons : Symbol(fuscus.planifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 548, 65)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 549, 82)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) @@ -7269,10 +7269,10 @@ module samarensis { prymnolopha(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; } >prymnolopha : Symbol(fuscus.prymnolopha, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 550, 101)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 551, 44)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 551, 76)) >this : Symbol(fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 551, 44)) @@ -7311,14 +7311,14 @@ module samarensis { macrocercus(): panamensis.setulosus { var x: panamensis.setulosus; () => { var y = this; }; return x; } >macrocercus : Symbol(fuscus.macrocercus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 554, 83)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 555, 91)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) @@ -7330,10 +7330,10 @@ module samarensis { nimbae(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; } >nimbae : Symbol(fuscus.nimbae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 555, 195)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 556, 41)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 556, 75)) >this : Symbol(fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 556, 41)) @@ -7341,16 +7341,16 @@ module samarensis { suricatta(): daubentonii.nigricans { var x: daubentonii.nigricans; () => { var y = this; }; return x; } >suricatta : Symbol(fuscus.suricatta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 556, 100)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->nigricans : Symbol(daubentonii.nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 20)) +>nigricans : Symbol(daubentonii.nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 23)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 557, 93)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->nigricans : Symbol(daubentonii.nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 20)) +>nigricans : Symbol(daubentonii.nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 23)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 557, 176)) @@ -7371,10 +7371,10 @@ module samarensis { beecrofti(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; } >beecrofti : Symbol(fuscus.beecrofti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 558, 111)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 559, 45)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 559, 80)) >this : Symbol(fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 559, 45)) @@ -7382,19 +7382,19 @@ module samarensis { imaizumii(): minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis> { var x: minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis>; () => { var y = this; }; return x; } >imaizumii : Symbol(fuscus.imaizumii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 559, 105)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >gerbillus : Symbol(julianae.gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) @@ -7402,22 +7402,22 @@ module samarensis { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 560, 233)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >gerbillus : Symbol(julianae.gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) @@ -7425,7 +7425,7 @@ module samarensis { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 560, 456)) >this : Symbol(fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 560, 233)) @@ -7433,10 +7433,10 @@ module samarensis { colocolo(): quasiater.bobrinskoi { var x: quasiater.bobrinskoi; () => { var y = this; }; return x; } >colocolo : Symbol(fuscus.colocolo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 560, 481)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 561, 46)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 561, 83)) >this : Symbol(fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 561, 46)) @@ -7444,7 +7444,7 @@ module samarensis { wolfi(): petrophilus.rosalia> { var x: petrophilus.rosalia>; () => { var y = this; }; return x; } >wolfi : Symbol(fuscus.wolfi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 561, 108)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20)) +>rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) @@ -7452,10 +7452,10 @@ module samarensis { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 562, 115)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20)) +>rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) @@ -7463,7 +7463,7 @@ module samarensis { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 562, 224)) >this : Symbol(fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 562, 115)) @@ -7485,10 +7485,10 @@ module samarensis { watersi(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; } >watersi : Symbol(pallidus.watersi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 565, 110)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 566, 39)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 566, 70)) >this : Symbol(pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 566, 39)) @@ -7496,42 +7496,42 @@ module samarensis { glacialis(): sagitta.cinereus, quasiater.wattsi>> { var x: sagitta.cinereus, quasiater.wattsi>>; () => { var y = this; }; return x; } >glacialis : Symbol(pallidus.glacialis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 566, 95)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 14)) +>caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 17)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 567, 212)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 14)) +>caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 17)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 567, 414)) >this : Symbol(pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 567, 212)) @@ -7539,18 +7539,18 @@ module samarensis { viaria(): chrysaeolus.sarasinorum { var x: chrysaeolus.sarasinorum; () => { var y = this; }; return x; } >viaria : Symbol(pallidus.viaria, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 567, 439)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 568, 88)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 568, 169)) >this : Symbol(pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 568, 88)) @@ -7563,18 +7563,18 @@ module samarensis { alashanicus(): nigra.caucasica { var x: nigra.caucasica; () => { var y = this; }; return x; } >alashanicus : Symbol(cahirinus.alashanicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 570, 36)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 14)) +>caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 17)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 571, 86)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 14)) +>caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 17)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 571, 160)) >this : Symbol(cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 571, 86)) @@ -7582,26 +7582,26 @@ module samarensis { flaviventer(): trivirgatus.tumidifrons> { var x: trivirgatus.tumidifrons>; () => { var y = this; }; return x; } >flaviventer : Symbol(cahirinus.flaviventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 571, 185)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) ->tumidifrons : Symbol(trivirgatus.tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 20)) +>tumidifrons : Symbol(trivirgatus.tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 23)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 572, 134)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) ->tumidifrons : Symbol(trivirgatus.tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 20)) +>tumidifrons : Symbol(trivirgatus.tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 23)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 572, 256)) >this : Symbol(cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 572, 134)) @@ -7609,10 +7609,10 @@ module samarensis { bottai(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; } >bottai : Symbol(cahirinus.bottai, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 572, 281)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 573, 43)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 573, 79)) >this : Symbol(cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 573, 43)) @@ -7620,10 +7620,10 @@ module samarensis { pinetis(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; } >pinetis : Symbol(cahirinus.pinetis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 573, 104)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 574, 38)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 574, 68)) >this : Symbol(cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 574, 38)) @@ -7633,17 +7633,17 @@ module samarensis { >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) @@ -7651,22 +7651,22 @@ module samarensis { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 575, 233)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) @@ -7674,40 +7674,40 @@ module samarensis { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 575, 456)) >this : Symbol(cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 575, 233)) } } -module sagitta { +namespace sagitta { >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) export class leptoceros extends caurinus.johorensis> { ->leptoceros : Symbol(leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 16)) +>leptoceros : Symbol(leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 19)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 579, 28)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 579, 31)) ->caurinus.johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>caurinus.johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) victus(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; } >victus : Symbol(leptoceros.victus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 579, 145)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 580, 47)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 580, 87)) ->this : Symbol(leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 16)) +>this : Symbol(leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 580, 47)) hoplomyoides(): panglima.fundatus, nigra.gracilis> { var x: panglima.fundatus, nigra.gracilis>; () => { var y = this; }; return x; } @@ -7721,9 +7721,9 @@ module sagitta { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 581, 168)) @@ -7736,13 +7736,13 @@ module sagitta { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 581, 323)) ->this : Symbol(leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 16)) +>this : Symbol(leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 581, 168)) gratiosus(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; } @@ -7753,84 +7753,84 @@ module sagitta { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 582, 74)) ->this : Symbol(leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 16)) +>this : Symbol(leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 582, 42)) rex(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; } >rex : Symbol(leptoceros.rex, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 582, 99)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 583, 35)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 583, 66)) ->this : Symbol(leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 16)) +>this : Symbol(leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 583, 35)) bolami(): trivirgatus.tumidifrons { var x: trivirgatus.tumidifrons; () => { var y = this; }; return x; } >bolami : Symbol(leptoceros.bolami, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 583, 91)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) ->tumidifrons : Symbol(trivirgatus.tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 20)) +>tumidifrons : Symbol(trivirgatus.tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 23)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 584, 90)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) ->tumidifrons : Symbol(trivirgatus.tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 20)) +>tumidifrons : Symbol(trivirgatus.tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 23)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 584, 173)) ->this : Symbol(leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 16)) +>this : Symbol(leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 584, 90)) } } -module daubentonii { +namespace daubentonii { >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) export class nigricans extends sagitta.stolzmanni { ->nigricans : Symbol(nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 20)) +>nigricans : Symbol(nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 23)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 588, 27)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 588, 30)) ->sagitta.stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>sagitta.stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) woosnami(): dogramacii.robustulus { var x: dogramacii.robustulus; () => { var y = this; }; return x; } >woosnami : Symbol(nigricans.woosnami, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 588, 63)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 589, 47)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 589, 85)) ->this : Symbol(nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 20)) +>this : Symbol(nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 589, 47)) } } -module dammermani { +namespace dammermani { >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) export class siberu { ->siberu : Symbol(siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 593, 24)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 593, 27)) } } -module argurus { +namespace argurus { >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) export class pygmaea extends rendalli.moojeni { ->pygmaea : Symbol(pygmaea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 596, 16)) +>pygmaea : Symbol(pygmaea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 596, 19)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 597, 25)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 597, 28)) >rendalli.moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) @@ -7842,42 +7842,42 @@ module argurus { >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 598, 82)) ->this : Symbol(pygmaea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 596, 16)) +>this : Symbol(pygmaea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 596, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 598, 45)) capucinus(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; } >capucinus : Symbol(pygmaea.capucinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 598, 107)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 599, 45)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 599, 80)) ->this : Symbol(pygmaea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 596, 16)) +>this : Symbol(pygmaea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 596, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 599, 45)) cuvieri(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; } >cuvieri : Symbol(pygmaea.cuvieri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 599, 105)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 600, 48)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 600, 88)) ->this : Symbol(pygmaea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 596, 16)) +>this : Symbol(pygmaea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 596, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 600, 48)) } } -module chrysaeolus { +namespace chrysaeolus { >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) export class sarasinorum extends caurinus.psilurus { ->sarasinorum : Symbol(sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 604, 29)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 604, 32)) ->caurinus.psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>caurinus.psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) belzebul(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; } >belzebul : Symbol(sarasinorum.belzebul, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 604, 64)) @@ -7887,56 +7887,56 @@ module chrysaeolus { >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 605, 81)) ->this : Symbol(sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>this : Symbol(sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 605, 45)) hinpoon(): nigra.caucasica { var x: nigra.caucasica; () => { var y = this; }; return x; } >hinpoon : Symbol(sarasinorum.hinpoon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 605, 106)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 14)) +>caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 17)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 606, 83)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 14)) +>caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 17)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 606, 158)) ->this : Symbol(sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>this : Symbol(sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 606, 83)) kandti(): quasiater.wattsi { var x: quasiater.wattsi; () => { var y = this; }; return x; } >kandti : Symbol(sarasinorum.kandti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 606, 183)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 607, 81)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 607, 155)) ->this : Symbol(sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>this : Symbol(sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 607, 81)) cynosuros(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; } >cynosuros : Symbol(sarasinorum.cynosuros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 607, 180)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 608, 46)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 608, 82)) ->this : Symbol(sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>this : Symbol(sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 608, 46)) Germanium(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; } @@ -7947,76 +7947,76 @@ module chrysaeolus { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 609, 68)) ->this : Symbol(sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>this : Symbol(sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 609, 39)) Ununoctium(): nigra.gracilis { var x: nigra.gracilis; () => { var y = this; }; return x; } >Ununoctium : Symbol(sarasinorum.Ununoctium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 609, 93)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 610, 86)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 610, 161)) ->this : Symbol(sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>this : Symbol(sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 610, 86)) princeps(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; } >princeps : Symbol(sarasinorum.princeps, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 610, 186)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 611, 47)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 611, 85)) ->this : Symbol(sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>this : Symbol(sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 611, 47)) } } -module argurus { +namespace argurus { >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) export class wetmorei { ->wetmorei : Symbol(wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 16)) +>wetmorei : Symbol(wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 19)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 615, 26)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 615, 29)) leucoptera(): petrophilus.rosalia { var x: petrophilus.rosalia; () => { var y = this; }; return x; } >leucoptera : Symbol(wetmorei.leucoptera, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 615, 35)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20)) +>rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 23)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 616, 86)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20)) +>rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 23)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 616, 161)) ->this : Symbol(wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 16)) +>this : Symbol(wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 616, 86)) ochraventer(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; } >ochraventer : Symbol(wetmorei.ochraventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 616, 186)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 617, 44)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 617, 76)) ->this : Symbol(wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 16)) +>this : Symbol(wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 617, 44)) tephromelas(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; } @@ -8027,53 +8027,53 @@ module argurus { >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 618, 84)) ->this : Symbol(wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 16)) +>this : Symbol(wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 618, 48)) cracens(): argurus.gilbertii { var x: argurus.gilbertii; () => { var y = this; }; return x; } >cracens : Symbol(wetmorei.cracens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 618, 109)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->gilbertii : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>gilbertii : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 619, 78)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->gilbertii : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>gilbertii : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 619, 148)) ->this : Symbol(wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 16)) +>this : Symbol(wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 619, 78)) jamaicensis(): nigra.thalia> { var x: nigra.thalia>; () => { var y = this; }; return x; } >jamaicensis : Symbol(wetmorei.jamaicensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 619, 173)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 620, 129)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 620, 246)) ->this : Symbol(wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 16)) +>this : Symbol(wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 620, 129)) gymnocaudus(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; } @@ -8084,29 +8084,29 @@ module argurus { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 621, 80)) ->this : Symbol(wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 16)) +>this : Symbol(wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 621, 46)) mayori(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; } >mayori : Symbol(wetmorei.mayori, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 621, 105)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 622, 42)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 622, 77)) ->this : Symbol(wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 16)) +>this : Symbol(wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 622, 42)) } } -module argurus { +namespace argurus { >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) export class oreas extends lavali.wilsoni { ->oreas : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) ->lavali.wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>oreas : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) +>lavali.wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) salamonis(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; } >salamonis : Symbol(oreas.salamonis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 626, 47)) @@ -8116,26 +8116,26 @@ module argurus { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 627, 84)) ->this : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>this : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 627, 47)) paniscus(): ruatanica.Praseodymium { var x: ruatanica.Praseodymium; () => { var y = this; }; return x; } >paniscus : Symbol(oreas.paniscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 627, 109)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 628, 89)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 628, 169)) ->this : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>this : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 628, 89)) fagani(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; } @@ -8146,7 +8146,7 @@ module argurus { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 629, 83)) ->this : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>this : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 629, 45)) papuanus(): panglima.fundatus { var x: panglima.fundatus; () => { var y = this; }; return x; } @@ -8154,48 +8154,48 @@ module argurus { >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 630, 92)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 630, 175)) ->this : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>this : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 630, 92)) timidus(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; } >timidus : Symbol(oreas.timidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 630, 200)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 631, 44)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 631, 80)) ->this : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>this : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 631, 44)) nghetinhensis(): gabriellae.klossii { var x: gabriellae.klossii; () => { var y = this; }; return x; } >nghetinhensis : Symbol(oreas.nghetinhensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 631, 105)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 632, 85)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 632, 156)) ->this : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>this : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 632, 85)) barbei(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } @@ -8205,35 +8205,35 @@ module argurus { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 633, 85)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 633, 163)) ->this : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>this : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 633, 85)) univittatus(): argurus.peninsulae { var x: argurus.peninsulae; () => { var y = this; }; return x; } >univittatus : Symbol(oreas.univittatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 633, 188)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 634, 47)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 634, 82)) ->this : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>this : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 634, 47)) } } -module daubentonii { +namespace daubentonii { >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) export class arboreus { ->arboreus : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 638, 26)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 638, 29)) @@ -8242,26 +8242,26 @@ module daubentonii { >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 639, 124)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 639, 238)) ->this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 639, 124)) moreni(): panglima.abidi { var x: panglima.abidi; () => { var y = this; }; return x; } @@ -8280,37 +8280,37 @@ module daubentonii { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 640, 161)) ->this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 640, 84)) hypoleucos(): nigra.gracilis { var x: nigra.gracilis; () => { var y = this; }; return x; } >hypoleucos : Symbol(arboreus.hypoleucos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 640, 186)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 641, 83)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 641, 155)) ->this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 641, 83)) paedulcus(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; } >paedulcus : Symbol(arboreus.paedulcus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 641, 180)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 642, 48)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 642, 86)) ->this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 642, 48)) pucheranii(): samarensis.fuscus { var x: samarensis.fuscus; () => { var y = this; }; return x; } @@ -8320,16 +8320,16 @@ module daubentonii { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 643, 86)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >fuscus : Symbol(samarensis.fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 643, 161)) ->this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 643, 86)) stella(): julianae.oralis { var x: julianae.oralis; () => { var y = this; }; return x; } @@ -8337,18 +8337,18 @@ module daubentonii { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >oralis : Symbol(julianae.oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 644, 80)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >oralis : Symbol(julianae.oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 644, 153)) ->this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 644, 80)) brasiliensis(): imperfecta.subspinosus { var x: imperfecta.subspinosus; () => { var y = this; }; return x; } @@ -8359,7 +8359,7 @@ module daubentonii { >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 645, 91)) ->this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 645, 52)) brevicaudata(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; } @@ -8370,7 +8370,7 @@ module daubentonii { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 646, 89)) ->this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 646, 51)) vitticollis(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; } @@ -8381,98 +8381,98 @@ module daubentonii { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 647, 86)) ->this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 647, 49)) huangensis(): caurinus.psilurus { var x: caurinus.psilurus; () => { var y = this; }; return x; } >huangensis : Symbol(arboreus.huangensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 647, 111)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 648, 45)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 648, 79)) ->this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 648, 45)) cameroni(): petrophilus.rosalia, imperfecta.ciliolabrum>, caurinus.psilurus> { var x: petrophilus.rosalia, imperfecta.ciliolabrum>, caurinus.psilurus>; () => { var y = this; }; return x; } >cameroni : Symbol(arboreus.cameroni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 648, 104)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20)) +>rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 23)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 649, 210)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20)) +>rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 23)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 649, 411)) ->this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 649, 210)) tianshanica(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; } >tianshanica : Symbol(arboreus.tianshanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 649, 436)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 650, 42)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 650, 72)) ->this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>this : Symbol(arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 650, 42)) } } -module patas { +namespace patas { >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) export class uralensis { ->uralensis : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) cartilagonodus(): Lanthanum.nitidus { var x: Lanthanum.nitidus; () => { var y = this; }; return x; } >cartilagonodus : Symbol(uralensis.cartilagonodus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 654, 28)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 655, 95)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 655, 175)) ->this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 655, 95)) pyrrhinus(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; } @@ -8483,7 +8483,7 @@ module patas { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 656, 68)) ->this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 656, 39)) insulans(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; } @@ -8494,34 +8494,34 @@ module patas { >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 657, 81)) ->this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 657, 45)) nigricauda(): caurinus.johorensis, Lanthanum.jugularis> { var x: caurinus.johorensis, Lanthanum.jugularis>; () => { var y = this; }; return x; } >nigricauda : Symbol(uralensis.nigricauda, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 657, 106)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 658, 130)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 658, 249)) ->this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 658, 130)) muricauda(): panglima.fundatus> { var x: panglima.fundatus>; () => { var y = this; }; return x; } @@ -8529,151 +8529,151 @@ module patas { >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 659, 120)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 659, 230)) ->this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 659, 120)) albicaudus(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; } >albicaudus : Symbol(uralensis.albicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 659, 255)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 660, 46)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 660, 81)) ->this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 660, 46)) fallax(): ruatanica.hector { var x: ruatanica.hector; () => { var y = this; }; return x; } >fallax : Symbol(uralensis.fallax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 660, 106)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18)) +>hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 661, 78)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18)) +>hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 661, 149)) ->this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 661, 78)) attenuata(): macrorhinos.marmosurus> { var x: macrorhinos.marmosurus>; () => { var y = this; }; return x; } >attenuata : Symbol(uralensis.attenuata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 661, 174)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 662, 134)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 662, 258)) ->this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 662, 134)) megalura(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; } >megalura : Symbol(uralensis.megalura, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 662, 283)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 663, 39)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 663, 69)) ->this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 663, 39)) neblina(): samarensis.pelurus { var x: samarensis.pelurus; () => { var y = this; }; return x; } >neblina : Symbol(uralensis.neblina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 663, 94)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 664, 93)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 664, 178)) ->this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 664, 93)) citellus(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } >citellus : Symbol(uralensis.citellus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 664, 203)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 665, 95)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 665, 181)) ->this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 665, 95)) tanezumi(): imperfecta.lasiurus { var x: imperfecta.lasiurus; () => { var y = this; }; return x; } >tanezumi : Symbol(uralensis.tanezumi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 665, 206)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 666, 87)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 666, 165)) ->this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 666, 87)) albiventer(): rendalli.crenulata { var x: rendalli.crenulata; () => { var y = this; }; return x; } @@ -8681,82 +8681,82 @@ module patas { >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 667, 89)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 667, 167)) ->this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>this : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 667, 89)) } } -module provocax { +namespace provocax { >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) export class melanoleuca extends lavali.wilsoni { ->melanoleuca : Symbol(melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) ->lavali.wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>melanoleuca : Symbol(melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) +>lavali.wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) Neodymium(): macrorhinos.marmosurus, lutreolus.foina> { var x: macrorhinos.marmosurus, lutreolus.foina>; () => { var y = this; }; return x; } >Neodymium : Symbol(melanoleuca.Neodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 671, 53)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 672, 130)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 672, 250)) ->this : Symbol(melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>this : Symbol(melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 672, 130)) baeri(): imperfecta.lasiurus { var x: imperfecta.lasiurus; () => { var y = this; }; return x; } >baeri : Symbol(melanoleuca.baeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 672, 275)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 673, 81)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 673, 156)) ->this : Symbol(melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>this : Symbol(melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 673, 81)) } } -module sagitta { +namespace sagitta { >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) export class sicarius { ->sicarius : Symbol(sicarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 676, 16)) +>sicarius : Symbol(sicarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 676, 19)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 677, 26)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 677, 29)) @@ -8765,85 +8765,85 @@ module sagitta { >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 678, 127)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 678, 245)) ->this : Symbol(sicarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 676, 16)) +>this : Symbol(sicarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 676, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 678, 127)) simulator(): macrorhinos.marmosurus, macrorhinos.marmosurus, gabriellae.echinatus>, sagitta.stolzmanni>> { var x: macrorhinos.marmosurus, macrorhinos.marmosurus, gabriellae.echinatus>, sagitta.stolzmanni>>; () => { var y = this; }; return x; } >simulator : Symbol(sicarius.simulator, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 678, 270)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 679, 252)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 679, 494)) ->this : Symbol(sicarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 676, 16)) +>this : Symbol(sicarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 676, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 679, 252)) } } -module howi { +namespace howi { >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) export class marcanoi extends Lanthanum.megalonyx { ->marcanoi : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >Lanthanum.megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) @@ -8856,37 +8856,37 @@ module howi { >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 684, 81)) ->this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 684, 45)) dudui(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; } >dudui : Symbol(marcanoi.dudui, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 684, 106)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 685, 40)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 685, 74)) ->this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 685, 40)) leander(): daubentonii.nesiotes { var x: daubentonii.nesiotes; () => { var y = this; }; return x; } >leander : Symbol(marcanoi.leander, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 685, 99)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 20)) +>nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 686, 89)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 20)) +>nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 686, 170)) ->this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 686, 89)) martinsi(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; } @@ -8897,7 +8897,7 @@ module howi { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 687, 77)) ->this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 687, 43)) beatrix(): imperfecta.ciliolabrum, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum>> { var x: imperfecta.ciliolabrum, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum>>; () => { var y = this; }; return x; } @@ -8905,19 +8905,19 @@ module howi { >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) @@ -8925,26 +8925,26 @@ module howi { >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 688, 286)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) @@ -8952,65 +8952,65 @@ module howi { >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 688, 564)) ->this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 688, 286)) griseoventer(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; } >griseoventer : Symbol(marcanoi.griseoventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 688, 589)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 689, 43)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 689, 73)) ->this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 689, 43)) zerda(): quasiater.wattsi, howi.coludo>> { var x: quasiater.wattsi, howi.coludo>>; () => { var y = this; }; return x; } >zerda : Symbol(marcanoi.zerda, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 689, 98)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >oralis : Symbol(julianae.oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >gerbillus : Symbol(julianae.gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 690, 183)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >oralis : Symbol(julianae.oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >gerbillus : Symbol(julianae.gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 690, 360)) ->this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 690, 183)) yucatanicus(): julianae.nudicaudus { var x: julianae.nudicaudus; () => { var y = this; }; return x; } @@ -9021,59 +9021,59 @@ module howi { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 691, 84)) ->this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 691, 48)) nigrita(): argurus.peninsulae { var x: argurus.peninsulae; () => { var y = this; }; return x; } >nigrita : Symbol(marcanoi.nigrita, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 691, 109)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 692, 43)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 692, 78)) ->this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 692, 43)) jouvenetae(): argurus.dauricus { var x: argurus.dauricus; () => { var y = this; }; return x; } >jouvenetae : Symbol(marcanoi.jouvenetae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 692, 103)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 693, 81)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 693, 151)) ->this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 693, 81)) indefessus(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; } >indefessus : Symbol(marcanoi.indefessus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 693, 176)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 694, 43)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 694, 75)) ->this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 694, 43)) vuquangensis(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; } >vuquangensis : Symbol(marcanoi.vuquangensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 694, 100)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 695, 53)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 695, 93)) ->this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 695, 53)) Zirconium(): lavali.thaeleri { var x: lavali.thaeleri; () => { var y = this; }; return x; } @@ -9084,7 +9084,7 @@ module howi { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 696, 74)) ->this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 696, 42)) hyaena(): julianae.oralis { var x: julianae.oralis; () => { var y = this; }; return x; } @@ -9094,24 +9094,24 @@ module howi { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 697, 68)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >oralis : Symbol(julianae.oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 697, 129)) ->this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>this : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 697, 68)) } } -module argurus { +namespace argurus { >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) export class gilbertii { ->gilbertii : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>gilbertii : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 701, 27)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 701, 30)) @@ -9123,18 +9123,18 @@ module argurus { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 702, 72)) ->this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 702, 40)) poecilops(): julianae.steerii { var x: julianae.steerii; () => { var y = this; }; return x; } >poecilops : Symbol(gilbertii.poecilops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 702, 97)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 703, 43)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 703, 76)) ->this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 703, 43)) sondaicus(): samarensis.fuscus { var x: samarensis.fuscus; () => { var y = this; }; return x; } @@ -9142,217 +9142,217 @@ module argurus { >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >fuscus : Symbol(samarensis.fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 704, 81)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >fuscus : Symbol(samarensis.fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 704, 152)) ->this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 704, 81)) auriventer(): petrophilus.rosalia { var x: petrophilus.rosalia; () => { var y = this; }; return x; } >auriventer : Symbol(gilbertii.auriventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 704, 177)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20)) +>rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 23)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 705, 92)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20)) +>rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 23)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 705, 173)) ->this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 705, 92)) cherriei(): ruatanica.Praseodymium { var x: ruatanica.Praseodymium; () => { var y = this; }; return x; } >cherriei : Symbol(gilbertii.cherriei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 705, 198)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 706, 84)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 706, 159)) ->this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 706, 84)) lindberghi(): minutus.inez { var x: minutus.inez; () => { var y = this; }; return x; } >lindberghi : Symbol(gilbertii.lindberghi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 706, 184)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 707, 85)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 707, 159)) ->this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 707, 85)) pipistrellus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } >pipistrellus : Symbol(gilbertii.pipistrellus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 707, 184)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 708, 52)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 708, 91)) ->this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 708, 52)) paranus(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; } >paranus : Symbol(gilbertii.paranus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 708, 116)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 709, 42)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 709, 76)) ->this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 709, 42)) dubosti(): nigra.thalia { var x: nigra.thalia; () => { var y = this; }; return x; } >dubosti : Symbol(gilbertii.dubosti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 709, 101)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 710, 78)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 710, 148)) ->this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 710, 78)) opossum(): nigra.dolichurus { var x: nigra.dolichurus; () => { var y = this; }; return x; } >opossum : Symbol(gilbertii.opossum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 710, 173)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 711, 79)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 711, 150)) ->this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 711, 79)) oreopolus(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; } >oreopolus : Symbol(gilbertii.oreopolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 711, 175)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 712, 48)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 712, 86)) ->this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 712, 48)) amurensis(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } >amurensis : Symbol(gilbertii.amurensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 712, 111)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 713, 86)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 713, 162)) ->this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16)) +>this : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 713, 86)) } } -module petrophilus { +namespace petrophilus { >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) export class minutilla { ->minutilla : Symbol(minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) } } -module lutreolus { +namespace lutreolus { >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) export class punicus { ->punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) strandi(): gabriellae.klossii { var x: gabriellae.klossii; () => { var y = this; }; return x; } >strandi : Symbol(punicus.strandi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 721, 26)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 722, 85)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 722, 162)) ->this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 722, 85)) lar(): caurinus.mahaganus { var x: caurinus.mahaganus; () => { var y = this; }; return x; } >lar : Symbol(punicus.lar, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 722, 187)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 723, 74)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 723, 144)) ->this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 723, 74)) erica(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; } @@ -9363,18 +9363,18 @@ module lutreolus { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 724, 80)) ->this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 724, 43)) trichura(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; } >trichura : Symbol(punicus.trichura, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 724, 105)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 725, 49)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 725, 89)) ->this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 725, 49)) lemniscatus(): panglima.fundatus { var x: panglima.fundatus; () => { var y = this; }; return x; } @@ -9384,35 +9384,35 @@ module lutreolus { >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 726, 82)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 726, 152)) ->this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 726, 82)) aspalax(): panamensis.linulus { var x: panamensis.linulus; () => { var y = this; }; return x; } >aspalax : Symbol(punicus.aspalax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 726, 177)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 727, 90)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 727, 172)) ->this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 727, 90)) marshalli(): julianae.nudicaudus { var x: julianae.nudicaudus; () => { var y = this; }; return x; } @@ -9423,7 +9423,7 @@ module lutreolus { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 728, 82)) ->this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 728, 46)) Zinc(): julianae.galapagoensis { var x: julianae.galapagoensis; () => { var y = this; }; return x; } @@ -9434,45 +9434,45 @@ module lutreolus { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 729, 83)) ->this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 729, 44)) monochromos(): howi.coludo { var x: howi.coludo; () => { var y = this; }; return x; } >monochromos : Symbol(punicus.monochromos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 729, 108)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 730, 76)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 730, 140)) ->this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 730, 76)) purinus(): ruatanica.hector { var x: ruatanica.hector; () => { var y = this; }; return x; } >purinus : Symbol(punicus.purinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 730, 165)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18)) +>hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 731, 84)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18)) +>hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 731, 160)) ->this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 731, 84)) ischyrus(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; } @@ -9483,18 +9483,18 @@ module lutreolus { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 732, 73)) ->this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 732, 41)) tenuis(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; } >tenuis : Symbol(punicus.tenuis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 732, 98)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 733, 47)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 733, 87)) ->this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 733, 47)) Helium(): julianae.acariensis { var x: julianae.acariensis; () => { var y = this; }; return x; } @@ -9505,15 +9505,15 @@ module lutreolus { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 734, 79)) ->this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>this : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 734, 43)) } } -module macrorhinos { +namespace macrorhinos { >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) export class daphaenodon { ->daphaenodon : Symbol(daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) bredanensis(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; } >bredanensis : Symbol(daphaenodon.bredanensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 738, 30)) @@ -9523,26 +9523,26 @@ module macrorhinos { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 739, 82)) ->this : Symbol(daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>this : Symbol(daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 739, 47)) othus(): howi.coludo { var x: howi.coludo; () => { var y = this; }; return x; } >othus : Symbol(daphaenodon.othus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 739, 107)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 740, 64)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 740, 122)) ->this : Symbol(daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>this : Symbol(daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 740, 64)) hammondi(): julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion> { var x: julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>; () => { var y = this; }; return x; } @@ -9550,15 +9550,15 @@ module macrorhinos { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >gerbillus : Symbol(julianae.gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) @@ -9569,15 +9569,15 @@ module macrorhinos { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >gerbillus : Symbol(julianae.gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) @@ -9585,29 +9585,29 @@ module macrorhinos { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 741, 377)) ->this : Symbol(daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>this : Symbol(daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 741, 193)) aureocollaris(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } >aureocollaris : Symbol(daphaenodon.aureocollaris, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 741, 402)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 742, 53)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 742, 92)) ->this : Symbol(daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>this : Symbol(daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 742, 53)) flavipes(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; } >flavipes : Symbol(daphaenodon.flavipes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 742, 117)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 743, 47)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 743, 85)) ->this : Symbol(daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>this : Symbol(daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 743, 47)) callosus(): trivirgatus.lotor { var x: trivirgatus.lotor; () => { var y = this; }; return x; } @@ -9615,26 +9615,26 @@ module macrorhinos { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 744, 83)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 744, 157)) ->this : Symbol(daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>this : Symbol(daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 744, 83)) } } -module sagitta { +namespace sagitta { >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) export class cinereus { ->cinereus : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>cinereus : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 748, 26)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 748, 29)) @@ -9643,9 +9643,9 @@ module sagitta { >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) @@ -9654,61 +9654,61 @@ module sagitta { >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 749, 240)) ->this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 749, 124)) microps(): daubentonii.nigricans> { var x: daubentonii.nigricans>; () => { var y = this; }; return x; } >microps : Symbol(cinereus.microps, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 749, 265)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->nigricans : Symbol(daubentonii.nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 20)) +>nigricans : Symbol(daubentonii.nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 750, 127)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->nigricans : Symbol(daubentonii.nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 20)) +>nigricans : Symbol(daubentonii.nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 750, 246)) ->this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 750, 127)) guaporensis(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } >guaporensis : Symbol(cinereus.guaporensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 750, 271)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 751, 86)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 751, 160)) ->this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 751, 86)) tonkeana(): panglima.fundatus { var x: panglima.fundatus; () => { var y = this; }; return x; } @@ -9716,127 +9716,127 @@ module sagitta { >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 752, 87)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 752, 165)) ->this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 752, 87)) montensis(): dammermani.siberu { var x: dammermani.siberu; () => { var y = this; }; return x; } >montensis : Symbol(cinereus.montensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 752, 190)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 753, 86)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 753, 162)) ->this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 753, 86)) sphinx(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; } >sphinx : Symbol(cinereus.sphinx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 753, 187)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 754, 45)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 754, 83)) ->this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 754, 45)) glis(): argurus.wetmorei { var x: argurus.wetmorei; () => { var y = this; }; return x; } >glis : Symbol(cinereus.glis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 754, 108)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->wetmorei : Symbol(argurus.wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 16)) +>wetmorei : Symbol(argurus.wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 755, 68)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->wetmorei : Symbol(argurus.wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 16)) +>wetmorei : Symbol(argurus.wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 755, 131)) ->this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 755, 68)) dorsalis(): petrophilus.sodyi { var x: petrophilus.sodyi; () => { var y = this; }; return x; } >dorsalis : Symbol(cinereus.dorsalis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 755, 156)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 756, 81)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 756, 153)) ->this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 756, 81)) fimbriatus(): provocax.melanoleuca { var x: provocax.melanoleuca; () => { var y = this; }; return x; } >fimbriatus : Symbol(cinereus.fimbriatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 756, 178)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 757, 48)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 757, 85)) ->this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 757, 48)) sara(): nigra.gracilis { var x: nigra.gracilis; () => { var y = this; }; return x; } >sara : Symbol(cinereus.sara, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 757, 110)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 758, 78)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 758, 151)) ->this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 758, 78)) epimelas(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; } >epimelas : Symbol(cinereus.epimelas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 758, 176)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 759, 44)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 759, 79)) ->this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 759, 44)) pittieri(): samarensis.fuscus { var x: samarensis.fuscus; () => { var y = this; }; return x; } @@ -9844,44 +9844,44 @@ module sagitta { >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >fuscus : Symbol(samarensis.fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 760, 87)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >fuscus : Symbol(samarensis.fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 760, 165)) ->this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>this : Symbol(cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 760, 87)) } } -module nigra { +namespace nigra { >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) export class caucasica { ->caucasica : Symbol(caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 14)) +>caucasica : Symbol(caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 17)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 764, 27)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 764, 30)) } } -module gabriellae { +namespace gabriellae { >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) export class klossii extends imperfecta.lasiurus { ->klossii : Symbol(klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 768, 25)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 768, 28)) ->imperfecta.lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>imperfecta.lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) } export class amicus { >amicus : Symbol(amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) @@ -9889,10 +9889,10 @@ module gabriellae { pirrensis(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; } >pirrensis : Symbol(amicus.pirrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 770, 25)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 771, 43)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 771, 76)) >this : Symbol(amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 771, 43)) @@ -9902,16 +9902,16 @@ module gabriellae { >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 772, 76)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 772, 144)) >this : Symbol(amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 772, 76)) @@ -9932,16 +9932,16 @@ module gabriellae { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 774, 76)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 774, 144)) >this : Symbol(amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 774, 76)) @@ -9949,10 +9949,10 @@ module gabriellae { hooperi(): caurinus.psilurus { var x: caurinus.psilurus; () => { var y = this; }; return x; } >hooperi : Symbol(amicus.hooperi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 774, 169)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 775, 42)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 775, 76)) >this : Symbol(amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 775, 42)) @@ -9964,14 +9964,14 @@ module gabriellae { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 776, 82)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 776, 155)) >this : Symbol(amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 776, 82)) @@ -9979,26 +9979,26 @@ module gabriellae { ridei(): ruatanica.hector> { var x: ruatanica.hector>; () => { var y = this; }; return x; } >ridei : Symbol(amicus.ridei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 776, 180)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18)) +>hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 777, 117)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18)) +>hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 777, 228)) >this : Symbol(amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 777, 117)) @@ -10006,18 +10006,18 @@ module gabriellae { audeberti(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } >audeberti : Symbol(amicus.audeberti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 777, 253)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 778, 86)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 778, 162)) >this : Symbol(amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 778, 86)) @@ -10025,16 +10025,16 @@ module gabriellae { Lutetium(): macrorhinos.marmosurus { var x: macrorhinos.marmosurus; () => { var y = this; }; return x; } >Lutetium : Symbol(amicus.Lutetium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 778, 187)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 779, 85)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 779, 161)) @@ -10048,7 +10048,7 @@ module gabriellae { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >oralis : Symbol(julianae.oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) @@ -10059,7 +10059,7 @@ module gabriellae { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >oralis : Symbol(julianae.oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) @@ -10074,36 +10074,36 @@ module gabriellae { tenuipes(): howi.coludo> { var x: howi.coludo>; () => { var y = this; }; return x; } >tenuipes : Symbol(echinatus.tenuipes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 782, 28)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 783, 124)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 783, 239)) >this : Symbol(echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 783, 124)) } } -module imperfecta { +namespace imperfecta { >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) export class lasiurus { ->lasiurus : Symbol(lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 787, 26)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 787, 29)) @@ -10115,18 +10115,18 @@ module imperfecta { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 788, 72)) ->this : Symbol(lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>this : Symbol(lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 788, 40)) fulvus(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; } >fulvus : Symbol(lasiurus.fulvus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 788, 97)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 789, 40)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 789, 73)) ->this : Symbol(lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>this : Symbol(lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 789, 40)) paranaensis(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; } @@ -10137,7 +10137,7 @@ module imperfecta { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 790, 86)) ->this : Symbol(lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>this : Symbol(lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 790, 49)) didactylus(): panglima.abidi> { var x: panglima.abidi>; () => { var y = this; }; return x; } @@ -10147,9 +10147,9 @@ module imperfecta { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 791, 130)) @@ -10158,32 +10158,32 @@ module imperfecta { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 791, 249)) ->this : Symbol(lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>this : Symbol(lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 791, 130)) schreibersii(): nigra.gracilis { var x: nigra.gracilis; () => { var y = this; }; return x; } >schreibersii : Symbol(lasiurus.schreibersii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 791, 274)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 792, 84)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 792, 155)) ->this : Symbol(lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>this : Symbol(lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 792, 84)) orii(): dogramacii.kaiseri { var x: dogramacii.kaiseri; () => { var y = this; }; return x; } @@ -10194,7 +10194,7 @@ module imperfecta { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 793, 75)) ->this : Symbol(lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>this : Symbol(lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 793, 40)) } export class subspinosus { @@ -10203,10 +10203,10 @@ module imperfecta { monticularis(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; } >monticularis : Symbol(subspinosus.monticularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 795, 30)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 796, 53)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 796, 93)) >this : Symbol(subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 796, 53)) @@ -10214,18 +10214,18 @@ module imperfecta { Gadolinium(): nigra.caucasica { var x: nigra.caucasica; () => { var y = this; }; return x; } >Gadolinium : Symbol(subspinosus.Gadolinium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 796, 118)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 14)) +>caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 17)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 797, 80)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 14)) +>caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 17)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 797, 149)) >this : Symbol(subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 797, 80)) @@ -10233,26 +10233,26 @@ module imperfecta { oasicus(): caurinus.johorensis> { var x: caurinus.johorensis>; () => { var y = this; }; return x; } >oasicus : Symbol(subspinosus.oasicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 797, 174)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 798, 124)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 798, 240)) >this : Symbol(subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 798, 124)) @@ -10260,10 +10260,10 @@ module imperfecta { paterculus(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; } >paterculus : Symbol(subspinosus.paterculus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 798, 265)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 799, 45)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 799, 79)) >this : Symbol(subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 799, 45)) @@ -10282,10 +10282,10 @@ module imperfecta { invictus(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; } >invictus : Symbol(subspinosus.invictus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 800, 98)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 801, 44)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 801, 79)) >this : Symbol(subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 801, 44)) @@ -10293,10 +10293,10 @@ module imperfecta { stangeri(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; } >stangeri : Symbol(subspinosus.stangeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 801, 104)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 802, 47)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 802, 85)) >this : Symbol(subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 802, 47)) @@ -10304,16 +10304,16 @@ module imperfecta { siskiyou(): minutus.inez { var x: minutus.inez; () => { var y = this; }; return x; } >siskiyou : Symbol(subspinosus.siskiyou, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 802, 110)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 803, 84)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 803, 159)) @@ -10323,10 +10323,10 @@ module imperfecta { welwitschii(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; } >welwitschii : Symbol(subspinosus.welwitschii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 803, 184)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 804, 52)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 804, 92)) >this : Symbol(subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 804, 52)) @@ -10334,10 +10334,10 @@ module imperfecta { Polonium(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; } >Polonium : Symbol(subspinosus.Polonium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 804, 117)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 805, 40)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 805, 71)) >this : Symbol(subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 805, 40)) @@ -10345,10 +10345,10 @@ module imperfecta { harpia(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; } >harpia : Symbol(subspinosus.harpia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 805, 96)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 806, 40)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 806, 73)) >this : Symbol(subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 806, 40)) @@ -10357,33 +10357,33 @@ module imperfecta { >ciliolabrum : Symbol(ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 808, 29)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 808, 32)) ->dogramacii.robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>dogramacii.robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) leschenaultii(): argurus.dauricus> { var x: argurus.dauricus>; () => { var y = this; }; return x; } >leschenaultii : Symbol(ciliolabrum.leschenaultii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 808, 68)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 809, 132)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 809, 250)) >this : Symbol(ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 809, 132)) @@ -10391,18 +10391,18 @@ module imperfecta { ludia(): caurinus.johorensis { var x: caurinus.johorensis; () => { var y = this; }; return x; } >ludia : Symbol(ciliolabrum.ludia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 809, 275)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 810, 86)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 810, 166)) >this : Symbol(ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 810, 86)) @@ -10410,16 +10410,16 @@ module imperfecta { sinicus(): macrorhinos.marmosurus { var x: macrorhinos.marmosurus; () => { var y = this; }; return x; } >sinicus : Symbol(ciliolabrum.sinicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 810, 191)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 811, 91)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 811, 174)) @@ -10427,11 +10427,11 @@ module imperfecta { >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 811, 91)) } } -module quasiater { +namespace quasiater { >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) export class wattsi { ->wattsi : Symbol(wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 815, 24)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 815, 27)) @@ -10443,18 +10443,18 @@ module quasiater { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 816, 82)) ->this : Symbol(wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>this : Symbol(wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 816, 45)) hussoni(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; } >hussoni : Symbol(wattsi.hussoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 816, 107)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 817, 39)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 817, 70)) ->this : Symbol(wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>this : Symbol(wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 817, 39)) bilarni(): samarensis.cahirinus>, dogramacii.koepckeae> { var x: samarensis.cahirinus>, dogramacii.koepckeae>; () => { var y = this; }; return x; } @@ -10464,13 +10464,13 @@ module quasiater { >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 818, 158)) @@ -10479,17 +10479,17 @@ module quasiater { >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 818, 308)) ->this : Symbol(wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>this : Symbol(wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 818, 158)) cabrerae(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; } @@ -10500,23 +10500,23 @@ module quasiater { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 819, 73)) ->this : Symbol(wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>this : Symbol(wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 819, 41)) } } -module butleri { +namespace butleri { >butleri : Symbol(butleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 821, 1)) } -module petrophilus { +namespace petrophilus { >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) export class sodyi extends quasiater.bobrinskoi { ->sodyi : Symbol(sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 825, 23)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 825, 26)) ->quasiater.bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>quasiater.bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) saundersiae(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; } >saundersiae : Symbol(sodyi.saundersiae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 825, 61)) @@ -10526,100 +10526,100 @@ module petrophilus { >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 826, 84)) ->this : Symbol(sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>this : Symbol(sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 826, 48)) imberbis(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } >imberbis : Symbol(sodyi.imberbis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 826, 109)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 827, 48)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 827, 87)) ->this : Symbol(sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>this : Symbol(sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 827, 48)) cansdalei(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; } >cansdalei : Symbol(sodyi.cansdalei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 827, 112)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 828, 46)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 828, 82)) ->this : Symbol(sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>this : Symbol(sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 828, 46)) Lawrencium(): nigra.dolichurus { var x: nigra.dolichurus; () => { var y = this; }; return x; } >Lawrencium : Symbol(sodyi.Lawrencium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 828, 107)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 829, 88)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 829, 165)) ->this : Symbol(sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>this : Symbol(sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 829, 88)) catta(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; } >catta : Symbol(sodyi.catta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 829, 190)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 830, 36)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 830, 66)) ->this : Symbol(sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>this : Symbol(sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 830, 36)) breviceps(): argurus.dauricus { var x: argurus.dauricus; () => { var y = this; }; return x; } >breviceps : Symbol(sodyi.breviceps, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 830, 91)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 831, 83)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 831, 156)) ->this : Symbol(sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>this : Symbol(sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 831, 83)) transitionalis(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; } >transitionalis : Symbol(sodyi.transitionalis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 831, 181)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 832, 50)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 832, 85)) ->this : Symbol(sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>this : Symbol(sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 832, 50)) heptneri(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; } >heptneri : Symbol(sodyi.heptneri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 832, 110)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 833, 42)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 833, 75)) ->this : Symbol(sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>this : Symbol(sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 833, 42)) bairdii(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; } @@ -10630,47 +10630,47 @@ module petrophilus { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 834, 66)) ->this : Symbol(sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>this : Symbol(sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 834, 37)) } } -module caurinus { +namespace caurinus { >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) export class megaphyllus extends imperfecta.lasiurus> { ->megaphyllus : Symbol(megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) ->imperfecta.lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>megaphyllus : Symbol(megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) +>imperfecta.lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) montana(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; } >montana : Symbol(megaphyllus.montana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 838, 122)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 839, 38)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 839, 68)) ->this : Symbol(megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>this : Symbol(megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 839, 38)) amatus(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; } >amatus : Symbol(megaphyllus.amatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 839, 93)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 840, 43)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 840, 79)) ->this : Symbol(megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>this : Symbol(megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 840, 43)) bucculentus(): gabriellae.echinatus { var x: gabriellae.echinatus; () => { var y = this; }; return x; } @@ -10681,7 +10681,7 @@ module caurinus { >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 841, 86)) ->this : Symbol(megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>this : Symbol(megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 841, 49)) lepida(): rendalli.crenulata> { var x: rendalli.crenulata>; () => { var y = this; }; return x; } @@ -10689,26 +10689,26 @@ module caurinus { >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 842, 113)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 842, 219)) ->this : Symbol(megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>this : Symbol(megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 842, 113)) graecus(): dogramacii.kaiseri { var x: dogramacii.kaiseri; () => { var y = this; }; return x; } @@ -10719,18 +10719,18 @@ module caurinus { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 843, 78)) ->this : Symbol(megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>this : Symbol(megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 843, 43)) forsteri(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; } >forsteri : Symbol(megaphyllus.forsteri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 843, 103)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 844, 47)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 844, 85)) ->this : Symbol(megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>this : Symbol(megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 844, 47)) perotensis(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } @@ -10738,66 +10738,66 @@ module caurinus { >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 845, 88)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 845, 165)) ->this : Symbol(megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>this : Symbol(megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 845, 88)) cirrhosus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } >cirrhosus : Symbol(megaphyllus.cirrhosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 845, 190)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 846, 49)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 846, 88)) ->this : Symbol(megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>this : Symbol(megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 846, 49)) } } -module minutus { +namespace minutus { >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) export class portoricensis { ->portoricensis : Symbol(portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) relictus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } >relictus : Symbol(portoricensis.relictus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 850, 32)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 851, 48)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 851, 87)) ->this : Symbol(portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>this : Symbol(portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 851, 48)) aequatorianus(): gabriellae.klossii { var x: gabriellae.klossii; () => { var y = this; }; return x; } >aequatorianus : Symbol(portoricensis.aequatorianus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 851, 112)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 852, 89)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 852, 164)) ->this : Symbol(portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>this : Symbol(portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 852, 89)) rhinogradoides(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } @@ -10805,112 +10805,112 @@ module minutus { >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 853, 95)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 853, 175)) ->this : Symbol(portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>this : Symbol(portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 853, 95)) } } -module lutreolus { +namespace lutreolus { >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) export class foina { ->foina : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) tarfayensis(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; } >tarfayensis : Symbol(foina.tarfayensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 857, 24)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 858, 46)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 858, 80)) ->this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 858, 46)) Promethium(): samarensis.pelurus { var x: samarensis.pelurus; () => { var y = this; }; return x; } >Promethium : Symbol(foina.Promethium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 858, 105)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 859, 83)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) ->pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19)) +>pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 22)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 859, 155)) ->this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 859, 83)) salinae(): gabriellae.klossii { var x: gabriellae.klossii; () => { var y = this; }; return x; } >salinae : Symbol(foina.salinae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 859, 180)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 860, 92)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 860, 176)) ->this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 860, 92)) kerri(): howi.coludo { var x: howi.coludo; () => { var y = this; }; return x; } >kerri : Symbol(foina.kerri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 860, 201)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 861, 81)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 861, 156)) ->this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 861, 81)) scotti(): quasiater.wattsi { var x: quasiater.wattsi; () => { var y = this; }; return x; } >scotti : Symbol(foina.scotti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 861, 181)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 862, 88)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 862, 169)) ->this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 862, 88)) camerunensis(): julianae.gerbillus { var x: julianae.gerbillus; () => { var y = this; }; return x; } @@ -10929,18 +10929,18 @@ module lutreolus { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 863, 169)) ->this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 863, 91)) affinis(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; } >affinis : Symbol(foina.affinis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 863, 194)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 864, 41)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 864, 74)) ->this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 864, 41)) siebersi(): trivirgatus.lotor> { var x: trivirgatus.lotor>; () => { var y = this; }; return x; } @@ -10948,26 +10948,26 @@ module lutreolus { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 865, 105)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 865, 201)) ->this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 865, 105)) maquassiensis(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; } @@ -10978,7 +10978,7 @@ module lutreolus { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 866, 90)) ->this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 866, 52)) layardi(): julianae.albidens { var x: julianae.albidens; () => { var y = this; }; return x; } @@ -10986,18 +10986,18 @@ module lutreolus { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >albidens : Symbol(julianae.albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 867, 79)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >albidens : Symbol(julianae.albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 867, 150)) ->this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 867, 79)) bishopi(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; } @@ -11008,18 +11008,18 @@ module lutreolus { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 868, 76)) ->this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 868, 42)) apodemoides(): caurinus.psilurus { var x: caurinus.psilurus; () => { var y = this; }; return x; } >apodemoides : Symbol(foina.apodemoides, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 868, 101)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 869, 46)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 869, 80)) ->this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 869, 46)) argentiventer(): trivirgatus.mixtus { var x: trivirgatus.mixtus; () => { var y = this; }; return x; } @@ -11029,89 +11029,89 @@ module lutreolus { >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 870, 87)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >mixtus : Symbol(trivirgatus.mixtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 197, 3)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 870, 160)) ->this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>this : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 870, 87)) } } -module lutreolus { +namespace lutreolus { >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) export class cor extends panglima.fundatus, lavali.beisa>, dammermani.melanops> { ->cor : Symbol(cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 18)) +>cor : Symbol(cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 21)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 874, 21)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 874, 24)) >panglima.fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) antinorii(): petrophilus.sodyi { var x: petrophilus.sodyi; () => { var y = this; }; return x; } >antinorii : Symbol(cor.antinorii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 874, 164)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 875, 86)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 875, 162)) ->this : Symbol(cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 18)) +>this : Symbol(cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 875, 86)) voi(): caurinus.johorensis { var x: caurinus.johorensis; () => { var y = this; }; return x; } >voi : Symbol(cor.voi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 875, 187)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 876, 86)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 876, 168)) ->this : Symbol(cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 18)) +>this : Symbol(cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 876, 86)) mussoi(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } >mussoi : Symbol(cor.mussoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 876, 193)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 877, 46)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 877, 85)) ->this : Symbol(cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 18)) +>this : Symbol(cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 877, 46)) truncatus(): trivirgatus.lotor { var x: trivirgatus.lotor; () => { var y = this; }; return x; } @@ -11119,121 +11119,121 @@ module lutreolus { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 878, 81)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 878, 152)) ->this : Symbol(cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 18)) +>this : Symbol(cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 878, 81)) achates(): provocax.melanoleuca { var x: provocax.melanoleuca; () => { var y = this; }; return x; } >achates : Symbol(cor.achates, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 878, 177)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 879, 45)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 879, 82)) ->this : Symbol(cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 18)) +>this : Symbol(cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 879, 45)) praedatrix(): howi.angulatus { var x: howi.angulatus; () => { var y = this; }; return x; } >praedatrix : Symbol(cor.praedatrix, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 879, 107)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13)) +>angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 16)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 880, 80)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13)) +>angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 16)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 880, 149)) ->this : Symbol(cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 18)) +>this : Symbol(cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 880, 80)) mzabi(): quasiater.wattsi, minutus.inez> { var x: quasiater.wattsi, minutus.inez>; () => { var y = this; }; return x; } >mzabi : Symbol(cor.mzabi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 880, 174)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 881, 155)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18)) +>wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 21)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 881, 304)) ->this : Symbol(cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 18)) +>this : Symbol(cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 881, 155)) xanthinus(): nigra.gracilis, howi.marcanoi> { var x: nigra.gracilis, howi.marcanoi>; () => { var y = this; }; return x; } >xanthinus : Symbol(cor.xanthinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 881, 329)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 882, 119)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 882, 228)) ->this : Symbol(cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 18)) +>this : Symbol(cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 882, 119)) tapoatafa(): caurinus.megaphyllus { var x: caurinus.megaphyllus; () => { var y = this; }; return x; } >tapoatafa : Symbol(cor.tapoatafa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 882, 253)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 883, 47)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 883, 84)) ->this : Symbol(cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 18)) +>this : Symbol(cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 883, 47)) castroviejoi(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; } @@ -11244,46 +11244,46 @@ module lutreolus { >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 884, 85)) ->this : Symbol(cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 18)) +>this : Symbol(cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 884, 49)) } } -module howi { +namespace howi { >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) export class coludo { ->coludo : Symbol(coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 888, 24)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 888, 27)) bernhardi(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; } >bernhardi : Symbol(coludo.bernhardi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 888, 33)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 889, 44)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 889, 78)) ->this : Symbol(coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>this : Symbol(coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 889, 44)) isseli(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; } >isseli : Symbol(coludo.isseli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 889, 103)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 890, 40)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 890, 73)) ->this : Symbol(coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>this : Symbol(coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 890, 40)) } } -module argurus { +namespace argurus { >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) export class germaini extends gabriellae.amicus { ->germaini : Symbol(germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >gabriellae.amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) @@ -11291,79 +11291,79 @@ module argurus { sharpei(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; } >sharpei : Symbol(germaini.sharpei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 894, 53)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 895, 39)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 895, 70)) ->this : Symbol(germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>this : Symbol(germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 895, 39)) palmarum(): macrorhinos.marmosurus { var x: macrorhinos.marmosurus; () => { var y = this; }; return x; } >palmarum : Symbol(germaini.palmarum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 895, 95)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 896, 86)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 896, 163)) ->this : Symbol(germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>this : Symbol(germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 896, 86)) } } -module sagitta { +namespace sagitta { >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) export class stolzmanni { ->stolzmanni : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) riparius(): nigra.dolichurus { var x: nigra.dolichurus; () => { var y = this; }; return x; } >riparius : Symbol(stolzmanni.riparius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 900, 29)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 901, 83)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 901, 157)) ->this : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>this : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 901, 83)) dhofarensis(): lutreolus.foina { var x: lutreolus.foina; () => { var y = this; }; return x; } >dhofarensis : Symbol(stolzmanni.dhofarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 901, 182)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 902, 44)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 902, 76)) ->this : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>this : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 902, 44)) tricolor(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; } >tricolor : Symbol(stolzmanni.tricolor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 902, 101)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 903, 42)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16)) +>germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 903, 75)) ->this : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>this : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 903, 42)) gardneri(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; } @@ -11374,7 +11374,7 @@ module sagitta { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 904, 83)) ->this : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>this : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 904, 46)) walleri(): rendalli.moojeni, gabriellae.echinatus> { var x: rendalli.moojeni, gabriellae.echinatus>; () => { var y = this; }; return x; } @@ -11382,9 +11382,9 @@ module sagitta { >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) @@ -11393,15 +11393,15 @@ module sagitta { >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 905, 256)) ->this : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>this : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 905, 132)) talpoides(): gabriellae.echinatus { var x: gabriellae.echinatus; () => { var y = this; }; return x; } @@ -11412,18 +11412,18 @@ module sagitta { >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 906, 84)) ->this : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>this : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 906, 47)) pallipes(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; } >pallipes : Symbol(stolzmanni.pallipes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 906, 109)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 907, 45)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 907, 81)) ->this : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>this : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 907, 45)) lagurus(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; } @@ -11434,7 +11434,7 @@ module sagitta { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 908, 66)) ->this : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>this : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 908, 37)) hipposideros(): julianae.albidens { var x: julianae.albidens; () => { var y = this; }; return x; } @@ -11442,65 +11442,65 @@ module sagitta { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >albidens : Symbol(julianae.albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 909, 87)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >albidens : Symbol(julianae.albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 909, 161)) ->this : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>this : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 909, 87)) griselda(): caurinus.psilurus { var x: caurinus.psilurus; () => { var y = this; }; return x; } >griselda : Symbol(stolzmanni.griselda, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 909, 186)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 910, 43)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 910, 77)) ->this : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>this : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 910, 43)) florium(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; } >florium : Symbol(stolzmanni.florium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 910, 102)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 911, 43)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) ->zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17)) +>zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 911, 78)) ->this : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>this : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 911, 43)) } } -module dammermani { +namespace dammermani { >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) export class melanops extends minutus.inez { ->melanops : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) ->minutus.inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>melanops : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) +>minutus.inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) blarina(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; } >blarina : Symbol(melanops.blarina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 915, 89)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 916, 44)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 916, 80)) ->this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 916, 44)) harwoodi(): rionegrensis.veraecrucis, lavali.wilsoni> { var x: rionegrensis.veraecrucis, lavali.wilsoni>; () => { var y = this; }; return x; } @@ -11508,26 +11508,26 @@ module dammermani { >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 917, 122)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14)) +>dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 17)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 917, 235)) ->this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 917, 122)) ashaninka(): julianae.nudicaudus { var x: julianae.nudicaudus; () => { var y = this; }; return x; } @@ -11538,18 +11538,18 @@ module dammermani { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 918, 82)) ->this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 918, 46)) wiedii(): julianae.steerii { var x: julianae.steerii; () => { var y = this; }; return x; } >wiedii : Symbol(melanops.wiedii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 918, 107)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 919, 40)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 919, 73)) ->this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 919, 40)) godmani(): imperfecta.subspinosus { var x: imperfecta.subspinosus; () => { var y = this; }; return x; } @@ -11560,7 +11560,7 @@ module dammermani { >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 920, 86)) ->this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 920, 47)) condorensis(): imperfecta.ciliolabrum { var x: imperfecta.ciliolabrum; () => { var y = this; }; return x; } @@ -11570,16 +11570,16 @@ module dammermani { >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 921, 91)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 921, 170)) ->this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 921, 91)) xerophila(): panglima.abidi { var x: panglima.abidi; () => { var y = this; }; return x; } @@ -11587,18 +11587,18 @@ module dammermani { >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 922, 81)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 922, 152)) ->this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 922, 81)) laminatus(): panglima.fundatus>> { var x: panglima.fundatus>>; () => { var y = this; }; return x; } @@ -11606,13 +11606,13 @@ module dammermani { >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >fuscus : Symbol(samarensis.fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) @@ -11621,79 +11621,79 @@ module dammermani { >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >fuscus : Symbol(samarensis.fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 923, 318)) ->this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 923, 164)) archeri(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; } >archeri : Symbol(melanops.archeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 923, 343)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 924, 38)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 924, 68)) ->this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 924, 38)) hidalgo(): minutus.inez { var x: minutus.inez; () => { var y = this; }; return x; } >hidalgo : Symbol(melanops.hidalgo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 924, 93)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 925, 81)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 925, 154)) ->this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 925, 81)) unicolor(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; } >unicolor : Symbol(melanops.unicolor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 925, 179)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 926, 45)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 926, 81)) ->this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 926, 45)) philippii(): nigra.gracilis { var x: nigra.gracilis; () => { var y = this; }; return x; } >philippii : Symbol(melanops.philippii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 926, 106)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 927, 78)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14)) +>gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 17)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 927, 146)) ->this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 927, 78)) bocagei(): julianae.albidens { var x: julianae.albidens; () => { var y = this; }; return x; } @@ -11701,63 +11701,63 @@ module dammermani { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >albidens : Symbol(julianae.albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 928, 75)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >albidens : Symbol(julianae.albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 928, 142)) ->this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>this : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 928, 75)) } } -module argurus { +namespace argurus { >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) export class peninsulae extends patas.uralensis { ->peninsulae : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) ->patas.uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>peninsulae : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) +>patas.uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) aitkeni(): trivirgatus.mixtus, panglima.amphibius> { var x: trivirgatus.mixtus, panglima.amphibius>; () => { var y = this; }; return x; } >aitkeni : Symbol(peninsulae.aitkeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 932, 53)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >mixtus : Symbol(trivirgatus.mixtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 197, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 933, 162)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >mixtus : Symbol(trivirgatus.mixtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 197, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 933, 316)) ->this : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>this : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 933, 162)) novaeangliae(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; } @@ -11768,7 +11768,7 @@ module argurus { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 934, 87)) ->this : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>this : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 934, 50)) olallae(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; } @@ -11779,7 +11779,7 @@ module argurus { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 935, 78)) ->this : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>this : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 935, 43)) anselli(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; } @@ -11790,18 +11790,18 @@ module argurus { >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 936, 76)) ->this : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>this : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 936, 42)) timminsi(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; } >timminsi : Symbol(peninsulae.timminsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 936, 101)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 937, 49)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 937, 89)) ->this : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>this : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 937, 49)) sordidus(): rendalli.moojeni { var x: rendalli.moojeni; () => { var y = this; }; return x; } @@ -11809,18 +11809,18 @@ module argurus { >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 938, 89)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 938, 169)) ->this : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>this : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 938, 89)) telfordi(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; } @@ -11831,135 +11831,135 @@ module argurus { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 939, 85)) ->this : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>this : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 939, 47)) cavernarum(): minutus.inez { var x: minutus.inez; () => { var y = this; }; return x; } >cavernarum : Symbol(peninsulae.cavernarum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 939, 110)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 940, 80)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 940, 149)) ->this : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>this : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 940, 80)) } } -module argurus { +namespace argurus { >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) export class netscheri { ->netscheri : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 944, 27)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 944, 30)) gravis(): nigra.caucasica, dogramacii.kaiseri> { var x: nigra.caucasica, dogramacii.kaiseri>; () => { var y = this; }; return x; } >gravis : Symbol(netscheri.gravis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 944, 36)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 14)) +>caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 17)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 945, 117)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 14)) +>caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 17)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 945, 227)) ->this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 945, 117)) ruschii(): imperfecta.lasiurus> { var x: imperfecta.lasiurus>; () => { var y = this; }; return x; } >ruschii : Symbol(netscheri.ruschii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 945, 252)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 946, 127)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 946, 246)) ->this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 946, 127)) tricuspidatus(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; } >tricuspidatus : Symbol(netscheri.tricuspidatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 946, 271)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 947, 45)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) ->wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15)) +>wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 18)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 947, 76)) ->this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 947, 45)) fernandezi(): dammermani.siberu, panglima.abidi> { var x: dammermani.siberu, panglima.abidi>; () => { var y = this; }; return x; } >fernandezi : Symbol(netscheri.fernandezi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 947, 101)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 948, 153)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1)) ->thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14)) +>thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 17)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->peninsulae : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16)) +>peninsulae : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 948, 295)) ->this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 948, 153)) colletti(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; } @@ -11970,75 +11970,75 @@ module argurus { >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1)) >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 949, 81)) ->this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 949, 45)) microbullatus(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; } >microbullatus : Symbol(netscheri.microbullatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 949, 106)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 950, 50)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18)) +>schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 950, 86)) ->this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 950, 50)) eburneae(): chrysaeolus.sarasinorum { var x: chrysaeolus.sarasinorum; () => { var y = this; }; return x; } >eburneae : Symbol(netscheri.eburneae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 950, 111)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 951, 95)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 951, 181)) ->this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 951, 95)) tatei(): argurus.pygmaea> { var x: argurus.pygmaea>; () => { var y = this; }; return x; } >tatei : Symbol(netscheri.tatei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 951, 206)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->pygmaea : Symbol(pygmaea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 596, 16)) +>pygmaea : Symbol(pygmaea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 596, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 952, 121)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->pygmaea : Symbol(pygmaea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 596, 16)) +>pygmaea : Symbol(pygmaea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 596, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 952, 236)) ->this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 952, 121)) millardi(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; } >millardi : Symbol(netscheri.millardi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 952, 261)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 953, 41)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 953, 73)) ->this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 953, 41)) pruinosus(): trivirgatus.falconeri { var x: trivirgatus.falconeri; () => { var y = this; }; return x; } @@ -12049,77 +12049,77 @@ module argurus { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 954, 86)) ->this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 954, 48)) delator(): argurus.netscheri { var x: argurus.netscheri; () => { var y = this; }; return x; } >delator : Symbol(netscheri.delator, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 954, 111)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 955, 79)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 955, 150)) ->this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 955, 79)) nyikae(): trivirgatus.tumidifrons, petrophilus.minutilla>, julianae.acariensis> { var x: trivirgatus.tumidifrons, petrophilus.minutilla>, julianae.acariensis>; () => { var y = this; }; return x; } >nyikae : Symbol(netscheri.nyikae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 955, 175)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) ->tumidifrons : Symbol(trivirgatus.tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 20)) +>tumidifrons : Symbol(trivirgatus.tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 23)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13)) +>angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 16)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 956, 167)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) ->tumidifrons : Symbol(trivirgatus.tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 20)) +>tumidifrons : Symbol(trivirgatus.tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 23)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13)) +>angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 16)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 956, 327)) ->this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 956, 167)) ruemmleri(): panglima.amphibius, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum> { var x: panglima.amphibius, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum>; () => { var y = this; }; return x; } >ruemmleri : Symbol(netscheri.ruemmleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 956, 352)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) @@ -12127,22 +12127,22 @@ module argurus { >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 957, 242)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) @@ -12150,81 +12150,81 @@ module argurus { >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 957, 474)) ->this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>this : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 957, 242)) } } -module ruatanica { +namespace ruatanica { >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) export class Praseodymium extends ruatanica.hector { ->Praseodymium : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>Praseodymium : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 961, 30)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 961, 33)) ->ruatanica.hector : Symbol(hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18)) +>ruatanica.hector : Symbol(hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->hector : Symbol(hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18)) +>hector : Symbol(hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 21)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) clara(): panglima.amphibius, argurus.dauricus> { var x: panglima.amphibius, argurus.dauricus>; () => { var y = this; }; return x; } >clara : Symbol(Praseodymium.clara, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 961, 102)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 962, 168)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->americanus : Symbol(americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18)) +>americanus : Symbol(americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 21)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 962, 330)) ->this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 962, 168)) spectabilis(): petrophilus.sodyi { var x: petrophilus.sodyi; () => { var y = this; }; return x; } >spectabilis : Symbol(Praseodymium.spectabilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 962, 355)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 963, 95)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 963, 178)) ->this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 963, 95)) kamensis(): trivirgatus.lotor, lavali.lepturus> { var x: trivirgatus.lotor, lavali.lepturus>; () => { var y = this; }; return x; } @@ -12232,37 +12232,37 @@ module ruatanica { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 964, 123)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16)) +>portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 19)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 964, 237)) ->this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 964, 123)) ruddi(): lutreolus.foina { var x: lutreolus.foina; () => { var y = this; }; return x; } >ruddi : Symbol(Praseodymium.ruddi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 964, 262)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 965, 38)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 965, 70)) ->this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 965, 38)) bartelsii(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; } @@ -12273,42 +12273,42 @@ module ruatanica { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 966, 80)) ->this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 966, 45)) yerbabuenae(): dammermani.siberu, imperfecta.ciliolabrum> { var x: dammermani.siberu, imperfecta.ciliolabrum>; () => { var y = this; }; return x; } >yerbabuenae : Symbol(Praseodymium.yerbabuenae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 966, 105)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 967, 173)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19)) +>siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 22)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20)) +>minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 967, 334)) ->this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 967, 173)) davidi(): trivirgatus.mixtus { var x: trivirgatus.mixtus; () => { var y = this; }; return x; } @@ -12316,322 +12316,322 @@ module ruatanica { >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >mixtus : Symbol(trivirgatus.mixtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 197, 3)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 968, 84)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >mixtus : Symbol(trivirgatus.mixtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 197, 3)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 968, 161)) ->this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 968, 84)) pilirostris(): argurus.wetmorei>, sagitta.leptoceros>>, macrorhinos.konganensis> { var x: argurus.wetmorei>, sagitta.leptoceros>>, macrorhinos.konganensis>; () => { var y = this; }; return x; } >pilirostris : Symbol(Praseodymium.pilirostris, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 968, 186)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->wetmorei : Symbol(argurus.wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 16)) +>wetmorei : Symbol(argurus.wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 19)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 16)) +>leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 19)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 969, 298)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->wetmorei : Symbol(argurus.wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 16)) +>wetmorei : Symbol(argurus.wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 19)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) ->klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19)) +>klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 22)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 16)) +>leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 19)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20)) +>arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 23)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 969, 584)) ->this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 969, 298)) catherinae(): imperfecta.lasiurus, petrophilus.sodyi> { var x: imperfecta.lasiurus, petrophilus.sodyi>; () => { var y = this; }; return x; } >catherinae : Symbol(Praseodymium.catherinae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 969, 609)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 970, 169)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20)) +>konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 970, 327)) ->this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 970, 169)) frontata(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; } >frontata : Symbol(Praseodymium.frontata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 970, 352)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 971, 39)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 971, 69)) ->this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 971, 39)) Terbium(): caurinus.mahaganus { var x: caurinus.mahaganus; () => { var y = this; }; return x; } >Terbium : Symbol(Praseodymium.Terbium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 971, 94)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 972, 85)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 972, 162)) ->this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 972, 85)) thomensis(): minutus.inez> { var x: minutus.inez>; () => { var y = this; }; return x; } >thomensis : Symbol(Praseodymium.thomensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 972, 187)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >albidens : Symbol(julianae.albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 973, 113)) >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1)) ->inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16)) +>inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >albidens : Symbol(julianae.albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 973, 216)) ->this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 973, 113)) soricinus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } >soricinus : Symbol(Praseodymium.soricinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 973, 241)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 974, 49)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 974, 88)) ->this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>this : Symbol(Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 974, 49)) } } -module caurinus { +namespace caurinus { >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) export class johorensis extends lutreolus.punicus { ->johorensis : Symbol(johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>johorensis : Symbol(johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 978, 28)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 978, 31)) ->lutreolus.punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>lutreolus.punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) maini(): ruatanica.Praseodymium { var x: ruatanica.Praseodymium; () => { var y = this; }; return x; } >maini : Symbol(johorensis.maini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 978, 63)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 979, 83)) >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1)) ->Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18)) +>Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 979, 160)) ->this : Symbol(johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17)) +>this : Symbol(johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 979, 83)) } } -module argurus { +namespace argurus { >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) export class luctuosa { ->luctuosa : Symbol(luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) loriae(): rendalli.moojeni, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus> { var x: rendalli.moojeni, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus>; () => { var y = this; }; return x; } >loriae : Symbol(luctuosa.loriae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 983, 27)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 984, 205)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20)) +>marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 23)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 984, 403)) ->this : Symbol(luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>this : Symbol(luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 984, 205)) } } -module panamensis { +namespace panamensis { >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) export class setulosus { ->setulosus : Symbol(setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 988, 27)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 988, 30)) duthieae(): caurinus.mahaganus, dogramacii.aurata> { var x: caurinus.mahaganus, dogramacii.aurata>; () => { var y = this; }; return x; } >duthieae : Symbol(setulosus.duthieae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 988, 36)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 989, 106)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17)) +>mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 20)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16)) +>oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 19)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 989, 203)) ->this : Symbol(setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>this : Symbol(setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 989, 106)) guereza(): howi.coludo { var x: howi.coludo; () => { var y = this; }; return x; } >guereza : Symbol(setulosus.guereza, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 989, 228)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 990, 80)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 990, 152)) ->this : Symbol(setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>this : Symbol(setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 990, 80)) buselaphus(): daubentonii.nesiotes, dogramacii.koepckeae>, trivirgatus.mixtus> { var x: daubentonii.nesiotes, dogramacii.koepckeae>, trivirgatus.mixtus>; () => { var y = this; }; return x; } >buselaphus : Symbol(setulosus.buselaphus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 990, 177)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 20)) +>nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 23)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) @@ -12639,7 +12639,7 @@ module panamensis { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) @@ -12647,10 +12647,10 @@ module panamensis { >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 991, 199)) >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1)) ->nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 20)) +>nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 23)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) @@ -12658,7 +12658,7 @@ module panamensis { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) @@ -12666,44 +12666,44 @@ module panamensis { >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 991, 387)) ->this : Symbol(setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>this : Symbol(setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 991, 199)) nuttalli(): sagitta.cinereus, chrysaeolus.sarasinorum> { var x: sagitta.cinereus, chrysaeolus.sarasinorum>; () => { var y = this; }; return x; } >nuttalli : Symbol(setulosus.nuttalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 991, 412)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 992, 169)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16)) +>cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16)) +>netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 19)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3)) >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1)) ->sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20)) +>sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 23)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 992, 329)) ->this : Symbol(setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>this : Symbol(setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 992, 169)) pelii(): rendalli.crenulata, julianae.steerii> { var x: rendalli.crenulata, julianae.steerii>; () => { var y = this; }; return x; } @@ -12713,46 +12713,46 @@ module panamensis { >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 993, 124)) >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1)) >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3)) >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0)) ->caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21)) +>caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 24)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) ->steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17)) +>steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 993, 242)) ->this : Symbol(setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>this : Symbol(setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 993, 124)) tunneyi(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; } >tunneyi : Symbol(setulosus.tunneyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 993, 267)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 994, 43)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16)) +>stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 994, 78)) ->this : Symbol(setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>this : Symbol(setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 994, 43)) lamula(): patas.uralensis { var x: patas.uralensis; () => { var y = this; }; return x; } >lamula : Symbol(setulosus.lamula, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 994, 103)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 995, 39)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 995, 71)) ->this : Symbol(setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>this : Symbol(setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 995, 39)) vampyrus(): julianae.oralis { var x: julianae.oralis; () => { var y = this; }; return x; } @@ -12760,86 +12760,86 @@ module panamensis { >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >oralis : Symbol(julianae.oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 996, 80)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >oralis : Symbol(julianae.oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1)) ->melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17)) +>melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 996, 151)) ->this : Symbol(setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>this : Symbol(setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 996, 80)) } } -module petrophilus { +namespace petrophilus { >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) export class rosalia { ->rosalia : Symbol(rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20)) +>rosalia : Symbol(rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 23)) >T0 : Symbol(T0, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1000, 25)) >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1000, 28)) palmeri(): panglima.amphibius>, trivirgatus.mixtus, panglima.amphibius>> { var x: panglima.amphibius>, trivirgatus.mixtus, panglima.amphibius>>; () => { var y = this; }; return x; } >palmeri : Symbol(rosalia.palmeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1000, 34)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >mixtus : Symbol(trivirgatus.mixtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 197, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1001, 282)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13)) +>coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 16)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1)) ->daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20)) +>daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 23)) >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1)) ->uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14)) +>uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 17)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >mixtus : Symbol(trivirgatus.mixtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 197, 3)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16)) +>dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 19)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3)) >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1)) ->melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19)) +>melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 22)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1001, 556)) ->this : Symbol(rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20)) +>this : Symbol(rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1001, 282)) baeops(): Lanthanum.nitidus { var x: Lanthanum.nitidus; () => { var y = this; }; return x; } @@ -12858,120 +12858,120 @@ module petrophilus { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1002, 143)) ->this : Symbol(rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20)) +>this : Symbol(rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1002, 75)) ozensis(): imperfecta.lasiurus, lutreolus.foina> { var x: imperfecta.lasiurus, lutreolus.foina>; () => { var y = this; }; return x; } >ozensis : Symbol(rosalia.ozensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1002, 168)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1003, 116)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) ->lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19)) +>lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 22)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5)) >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1)) >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18)) +>foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1003, 224)) ->this : Symbol(rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20)) +>this : Symbol(rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1003, 116)) creaghi(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; } >creaghi : Symbol(rosalia.creaghi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1003, 249)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1004, 41)) >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1) ... and 4 more) ->luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16)) +>luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 19)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1004, 74)) ->this : Symbol(rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20)) +>this : Symbol(rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1004, 41)) montivaga(): panamensis.setulosus> { var x: panamensis.setulosus>; () => { var y = this; }; return x; } >montivaga : Symbol(rosalia.montivaga, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1004, 99)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1005, 125)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17)) +>megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1005, 240)) ->this : Symbol(rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20)) +>this : Symbol(rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 23)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1005, 125)) } } -module caurinus { +namespace caurinus { >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) export class psilurus extends lutreolus.punicus { ->psilurus : Symbol(psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) ->lutreolus.punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>psilurus : Symbol(psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) +>lutreolus.punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1)) ->punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18)) +>punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 21)) socialis(): panglima.amphibius { var x: panglima.amphibius; () => { var y = this; }; return x; } >socialis : Symbol(psilurus.socialis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1009, 53)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1010, 86)) >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1)) ->amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17)) +>amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 20)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1)) ->psilurus : Symbol(psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>psilurus : Symbol(psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1010, 163)) ->this : Symbol(psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>this : Symbol(psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1010, 86)) lundi(): petrophilus.sodyi { var x: petrophilus.sodyi; () => { var y = this; }; return x; } >lundi : Symbol(psilurus.lundi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1010, 188)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1011, 85)) >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1)) ->sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20)) +>sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 23)) >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1)) >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18)) +>bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1011, 164)) ->this : Symbol(psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>this : Symbol(psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1011, 85)) araeum(): imperfecta.ciliolabrum { var x: imperfecta.ciliolabrum; () => { var y = this; }; return x; } @@ -12979,18 +12979,18 @@ module caurinus { >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1012, 84)) >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1)) >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1012, 161)) ->this : Symbol(psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>this : Symbol(psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1012, 84)) calamianensis(): julianae.gerbillus { var x: julianae.gerbillus; () => { var y = this; }; return x; } @@ -13000,54 +13000,54 @@ module caurinus { >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1013, 90)) >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1)) >gerbillus : Symbol(julianae.gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3)) >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1)) >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3)) >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1)) ->carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18)) +>carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 21)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1013, 166)) ->this : Symbol(psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>this : Symbol(psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1013, 90)) petersoni(): panamensis.setulosus { var x: panamensis.setulosus; () => { var y = this; }; return x; } >petersoni : Symbol(psilurus.petersoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1013, 191)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1014, 87)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19)) +>setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 22)) >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1)) ->walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16)) +>walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 19)) >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1)) ->robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19)) +>robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 22)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1014, 164)) ->this : Symbol(psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>this : Symbol(psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1014, 87)) nitela(): panamensis.linulus { var x: panamensis.linulus; () => { var y = this; }; return x; } >nitela : Symbol(psilurus.nitela, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1014, 189)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1015, 78)) >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1)) ->linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19)) +>linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 22)) >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1)) >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3)) >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1)) ->marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13)) +>marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 16)) >y : Symbol(y, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1015, 149)) ->this : Symbol(psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17)) +>this : Symbol(psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 20)) >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1015, 78)) } } diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types index c28d49097b198..866e043ddbec7 100644 --- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types +++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types @@ -4,7 +4,7 @@ Type Count: 2,500 === resolvingClassDeclarationWhenInBaseTypeResolution.ts === -module rionegrensis { +namespace rionegrensis { >rionegrensis : typeof rionegrensis > : ^^^^^^^^^^^^^^^^^^^ @@ -277,7 +277,7 @@ module rionegrensis { > : ^^^^^^^^^^^^^^^^^^^ } } -module julianae { +namespace julianae { >julianae : typeof julianae > : ^^^^^^^^^^^^^^^ @@ -1794,7 +1794,7 @@ module julianae { > : ^^^^^^^^^^^^^^^^^^ } } -module ruatanica { +namespace ruatanica { >ruatanica : typeof ruatanica > : ^^^^^^^^^^^^^^^^ @@ -1855,7 +1855,7 @@ module ruatanica { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module Lanthanum { +namespace Lanthanum { >Lanthanum : typeof Lanthanum > : ^^^^^^^^^^^^^^^^ @@ -2666,7 +2666,7 @@ module Lanthanum { > : ^^^^^^^^^^^^^^^^^^^^^^ } } -module rendalli { +namespace rendalli { >rendalli : typeof rendalli > : ^^^^^^^^^^^^^^^ @@ -3345,7 +3345,7 @@ module rendalli { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module trivirgatus { +namespace trivirgatus { >trivirgatus : typeof trivirgatus > : ^^^^^^^^^^^^^^^^^^ @@ -4340,7 +4340,7 @@ module trivirgatus { > : ^^^^^^^^^^^^^^^^^^^^ } } -module quasiater { +namespace quasiater { >quasiater : typeof quasiater > : ^^^^^^^^^^^^^^^^ @@ -4453,7 +4453,7 @@ module quasiater { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module ruatanica { +namespace ruatanica { >ruatanica : typeof ruatanica > : ^^^^^^^^^^^^^^^^ @@ -4552,7 +4552,7 @@ module ruatanica { > : ^^^^^^^^^^^^^^^^^ } } -module lavali { +namespace lavali { >lavali : typeof lavali > : ^^^^^^^^^^^^^ @@ -5773,7 +5773,7 @@ module lavali { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module dogramacii { +namespace dogramacii { >dogramacii : typeof dogramacii > : ^^^^^^^^^^^^^^^^^ @@ -6534,7 +6534,7 @@ module dogramacii { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module lutreolus { +namespace lutreolus { >lutreolus : typeof lutreolus > : ^^^^^^^^^^^^^^^^ @@ -6921,7 +6921,7 @@ module lutreolus { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module argurus { +namespace argurus { >argurus : typeof argurus > : ^^^^^^^^^^^^^^ @@ -7224,7 +7224,7 @@ module argurus { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module nigra { +namespace nigra { >nigra : typeof nigra > : ^^^^^^^^^^^^ @@ -7473,7 +7473,7 @@ module nigra { > : ^^^^^^^^^^^^^ } } -module panglima { +namespace panglima { >panglima : typeof panglima > : ^^^^^^^^^^^^^^^ @@ -7900,7 +7900,7 @@ module panglima { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module quasiater { +namespace quasiater { >quasiater : typeof quasiater > : ^^^^^^^^^^^^^^^^ @@ -8059,7 +8059,7 @@ module quasiater { > : ^^^^^^^^^^^^^^^^^^^ } } -module minutus { +namespace minutus { >minutus : typeof minutus > : ^^^^^^^^^^^^^^ @@ -8378,7 +8378,7 @@ module minutus { > : ^^^^^^^^^^^^^^^^^^^ } } -module caurinus { +namespace caurinus { >caurinus : typeof caurinus > : ^^^^^^^^^^^^^^^ @@ -8637,7 +8637,7 @@ module caurinus { > : ^^^^^^^^^^^^^^^^ } } -module macrorhinos { +namespace macrorhinos { >macrorhinos : typeof macrorhinos > : ^^^^^^^^^^^^^^^^^^ @@ -8664,7 +8664,7 @@ module macrorhinos { > : ^^^^^^^^^^^^^^^^^ } } -module howi { +namespace howi { >howi : typeof howi > : ^^^^^^^^^^^ @@ -8697,7 +8697,7 @@ module howi { > : ^^^^^^^^ } } -module daubentonii { +namespace daubentonii { >daubentonii : typeof daubentonii > : ^^^^^^^^^^^^^^^^^^ @@ -8706,7 +8706,7 @@ module daubentonii { > : ^^^^^^^^^^^^^^^^ } } -module nigra { +namespace nigra { >nigra : typeof nigra > : ^^^^^^^^^^^^ @@ -8931,7 +8931,7 @@ module nigra { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module sagitta { +namespace sagitta { >sagitta : typeof sagitta > : ^^^^^^^^^^^^^^ @@ -8972,7 +8972,7 @@ module sagitta { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module minutus { +namespace minutus { >minutus : typeof minutus > : ^^^^^^^^^^^^^^ @@ -9017,7 +9017,7 @@ module minutus { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module macrorhinos { +namespace macrorhinos { >macrorhinos : typeof macrorhinos > : ^^^^^^^^^^^^^^^^^^ @@ -9036,7 +9036,7 @@ module macrorhinos { > : ^^^ } } -module panamensis { +namespace panamensis { >panamensis : typeof panamensis > : ^^^^^^^^^^^^^^^^^ @@ -9285,7 +9285,7 @@ module panamensis { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module nigra { +namespace nigra { >nigra : typeof nigra > : ^^^^^^^^^^^^ @@ -9632,7 +9632,7 @@ module nigra { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module samarensis { +namespace samarensis { >samarensis : typeof samarensis > : ^^^^^^^^^^^^^^^^^ @@ -10585,7 +10585,7 @@ module samarensis { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module sagitta { +namespace sagitta { >sagitta : typeof sagitta > : ^^^^^^^^^^^^^^ @@ -10730,7 +10730,7 @@ module sagitta { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module daubentonii { +namespace daubentonii { >daubentonii : typeof daubentonii > : ^^^^^^^^^^^^^^^^^^ @@ -10763,7 +10763,7 @@ module daubentonii { > : ^^^^^^^^^^^^^^^^^^^^^ } } -module dammermani { +namespace dammermani { >dammermani : typeof dammermani > : ^^^^^^^^^^^^^^^^^ @@ -10772,7 +10772,7 @@ module dammermani { > : ^^^^^^^^^^^^^^ } } -module argurus { +namespace argurus { >argurus : typeof argurus > : ^^^^^^^^^^^^^^ @@ -10845,7 +10845,7 @@ module argurus { > : ^^^^^^^^^^^^^^^^^^^^^^^ } } -module chrysaeolus { +namespace chrysaeolus { >chrysaeolus : typeof chrysaeolus > : ^^^^^^^^^^^^^^^^^^ @@ -11010,7 +11010,7 @@ module chrysaeolus { > : ^^^^^^^^^^^^^^^^^^^^^ } } -module argurus { +namespace argurus { >argurus : typeof argurus > : ^^^^^^^^^^^^^^ @@ -11177,7 +11177,7 @@ module argurus { > : ^^^^^^^^^^^^^^^^^^ } } -module argurus { +namespace argurus { >argurus : typeof argurus > : ^^^^^^^^^^^^^^ @@ -11368,7 +11368,7 @@ module argurus { > : ^^^^^^^^^^ } } -module daubentonii { +namespace daubentonii { >daubentonii : typeof daubentonii > : ^^^^^^^^^^^^^^^^^^ @@ -11673,7 +11673,7 @@ module daubentonii { > : ^^^^^^^^^^^^^ } } -module patas { +namespace patas { >patas : typeof patas > : ^^^^^^^^^^^^ @@ -12012,7 +12012,7 @@ module patas { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module provocax { +namespace provocax { >provocax : typeof provocax > : ^^^^^^^^^^^^^^^ @@ -12087,7 +12087,7 @@ module provocax { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module sagitta { +namespace sagitta { >sagitta : typeof sagitta > : ^^^^^^^^^^^^^^ @@ -12188,7 +12188,7 @@ module sagitta { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module howi { +namespace howi { >howi : typeof howi > : ^^^^^^^^^^^ @@ -12559,7 +12559,7 @@ module howi { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module argurus { +namespace argurus { >argurus : typeof argurus > : ^^^^^^^^^^^^^^ @@ -12840,7 +12840,7 @@ module argurus { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module petrophilus { +namespace petrophilus { >petrophilus : typeof petrophilus > : ^^^^^^^^^^^^^^^^^^ @@ -12849,7 +12849,7 @@ module petrophilus { > : ^^^^^^^^^ } } -module lutreolus { +namespace lutreolus { >lutreolus : typeof lutreolus > : ^^^^^^^^^^^^^^^^ @@ -13140,7 +13140,7 @@ module lutreolus { > : ^^^^^^^^^^^^^^^^^^^ } } -module macrorhinos { +namespace macrorhinos { >macrorhinos : typeof macrorhinos > : ^^^^^^^^^^^^^^^^^^ @@ -13305,7 +13305,7 @@ module macrorhinos { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module sagitta { +namespace sagitta { >sagitta : typeof sagitta > : ^^^^^^^^^^^^^^ @@ -13618,7 +13618,7 @@ module sagitta { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module nigra { +namespace nigra { >nigra : typeof nigra > : ^^^^^^^^^^^^ @@ -13627,7 +13627,7 @@ module nigra { > : ^^^^^^^^^^^^^^^^^ } } -module gabriellae { +namespace gabriellae { >gabriellae : typeof gabriellae > : ^^^^^^^^^^^^^^^^^ @@ -13940,7 +13940,7 @@ module gabriellae { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module imperfecta { +namespace imperfecta { >imperfecta : typeof imperfecta > : ^^^^^^^^^^^^^^^^^ @@ -14411,7 +14411,7 @@ module imperfecta { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module quasiater { +namespace quasiater { >quasiater : typeof quasiater > : ^^^^^^^^^^^^^^^^ @@ -14516,9 +14516,9 @@ module quasiater { > : ^^^^^^^^^^^^^^^ } } -module butleri { +namespace butleri { } -module petrophilus { +namespace petrophilus { >petrophilus : typeof petrophilus > : ^^^^^^^^^^^^^^^^^^ @@ -14711,7 +14711,7 @@ module petrophilus { > : ^^^^^^^^^^^^ } } -module caurinus { +namespace caurinus { >caurinus : typeof caurinus > : ^^^^^^^^^^^^^^^ @@ -14902,7 +14902,7 @@ module caurinus { > : ^^^^^^^^^^^^^^^^^^^^^^ } } -module minutus { +namespace minutus { >minutus : typeof minutus > : ^^^^^^^^^^^^^^ @@ -14981,7 +14981,7 @@ module minutus { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module lutreolus { +namespace lutreolus { >lutreolus : typeof lutreolus > : ^^^^^^^^^^^^^^^^ @@ -15296,7 +15296,7 @@ module lutreolus { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module lutreolus { +namespace lutreolus { >lutreolus : typeof lutreolus > : ^^^^^^^^^^^^^^^^ @@ -15575,7 +15575,7 @@ module lutreolus { > : ^^^^^^^^^^^^^^^^^^^ } } -module howi { +namespace howi { >howi : typeof howi > : ^^^^^^^^^^^ @@ -15620,7 +15620,7 @@ module howi { > : ^^^^^^^^^^^^^^^^ } } -module argurus { +namespace argurus { >argurus : typeof argurus > : ^^^^^^^^^^^^^^ @@ -15679,7 +15679,7 @@ module argurus { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module sagitta { +namespace sagitta { >sagitta : typeof sagitta > : ^^^^^^^^^^^^^^ @@ -15918,7 +15918,7 @@ module sagitta { > : ^^^^^^^^^^^^^^^^^^ } } -module dammermani { +namespace dammermani { >dammermani : typeof dammermani > : ^^^^^^^^^^^^^^^^^ @@ -16251,7 +16251,7 @@ module dammermani { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module argurus { +namespace argurus { >argurus : typeof argurus > : ^^^^^^^^^^^^^^ @@ -16450,7 +16450,7 @@ module argurus { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module argurus { +namespace argurus { >argurus : typeof argurus > : ^^^^^^^^^^^^^^ @@ -16845,7 +16845,7 @@ module argurus { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module ruatanica { +namespace ruatanica { >ruatanica : typeof ruatanica > : ^^^^^^^^^^^^^^^^ @@ -17274,7 +17274,7 @@ module ruatanica { > : ^^^^^^^^^^^^^^^^^^^^^^ } } -module caurinus { +namespace caurinus { >caurinus : typeof caurinus > : ^^^^^^^^^^^^^^^ @@ -17315,7 +17315,7 @@ module caurinus { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module argurus { +namespace argurus { >argurus : typeof argurus > : ^^^^^^^^^^^^^^ @@ -17374,7 +17374,7 @@ module argurus { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module panamensis { +namespace panamensis { >panamensis : typeof panamensis > : ^^^^^^^^^^^^^^^^^ @@ -17631,7 +17631,7 @@ module panamensis { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module petrophilus { +namespace petrophilus { >petrophilus : typeof petrophilus > : ^^^^^^^^^^^^^^^^^^ @@ -17818,7 +17818,7 @@ module petrophilus { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } } -module caurinus { +namespace caurinus { >caurinus : typeof caurinus > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/returnTypeParameterWithModules.js b/tests/baselines/reference/returnTypeParameterWithModules.js index 0ff8c9fdab3d8..65805b0933ace 100644 --- a/tests/baselines/reference/returnTypeParameterWithModules.js +++ b/tests/baselines/reference/returnTypeParameterWithModules.js @@ -1,12 +1,12 @@ //// [tests/cases/compiler/returnTypeParameterWithModules.ts] //// //// [returnTypeParameterWithModules.ts] -module M1 { +namespace M1 { export function reduce(ar, f, e?): Array { return Array.prototype.reduce.apply(ar, e ? [f, e] : [f]); }; }; -module M2 { +namespace M2 { import A = M1 export function compose() { A.reduce(arguments, compose2); diff --git a/tests/baselines/reference/returnTypeParameterWithModules.symbols b/tests/baselines/reference/returnTypeParameterWithModules.symbols index 35ae415b22a8c..08f80e23aa32c 100644 --- a/tests/baselines/reference/returnTypeParameterWithModules.symbols +++ b/tests/baselines/reference/returnTypeParameterWithModules.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/returnTypeParameterWithModules.ts] //// === returnTypeParameterWithModules.ts === -module M1 { +namespace M1 { >M1 : Symbol(M1, Decl(returnTypeParameterWithModules.ts, 0, 0)) export function reduce(ar, f, e?): Array { ->reduce : Symbol(reduce, Decl(returnTypeParameterWithModules.ts, 0, 11)) +>reduce : Symbol(reduce, Decl(returnTypeParameterWithModules.ts, 0, 14)) >A : Symbol(A, Decl(returnTypeParameterWithModules.ts, 1, 27)) >ar : Symbol(ar, Decl(returnTypeParameterWithModules.ts, 1, 30)) >f : Symbol(f, Decl(returnTypeParameterWithModules.ts, 1, 33)) @@ -29,20 +29,20 @@ module M1 { }; }; -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(returnTypeParameterWithModules.ts, 4, 2)) import A = M1 ->A : Symbol(A, Decl(returnTypeParameterWithModules.ts, 5, 11)) +>A : Symbol(A, Decl(returnTypeParameterWithModules.ts, 5, 14)) >M1 : Symbol(A, Decl(returnTypeParameterWithModules.ts, 0, 0)) export function compose() { >compose : Symbol(compose, Decl(returnTypeParameterWithModules.ts, 6, 15)) A.reduce(arguments, compose2); ->A.reduce : Symbol(A.reduce, Decl(returnTypeParameterWithModules.ts, 0, 11)) ->A : Symbol(A, Decl(returnTypeParameterWithModules.ts, 5, 11)) ->reduce : Symbol(A.reduce, Decl(returnTypeParameterWithModules.ts, 0, 11)) +>A.reduce : Symbol(A.reduce, Decl(returnTypeParameterWithModules.ts, 0, 14)) +>A : Symbol(A, Decl(returnTypeParameterWithModules.ts, 5, 14)) +>reduce : Symbol(A.reduce, Decl(returnTypeParameterWithModules.ts, 0, 14)) >arguments : Symbol(arguments) >compose2 : Symbol(compose2, Decl(returnTypeParameterWithModules.ts, 9, 6)) diff --git a/tests/baselines/reference/returnTypeParameterWithModules.types b/tests/baselines/reference/returnTypeParameterWithModules.types index a97badc7dc14b..3583a0de4705d 100644 --- a/tests/baselines/reference/returnTypeParameterWithModules.types +++ b/tests/baselines/reference/returnTypeParameterWithModules.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/returnTypeParameterWithModules.ts] //// === returnTypeParameterWithModules.ts === -module M1 { +namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ @@ -42,7 +42,7 @@ module M1 { }; }; -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/reuseInnerModuleMember.js b/tests/baselines/reference/reuseInnerModuleMember.js index bafa91b6a943d..ab877f6c45133 100644 --- a/tests/baselines/reference/reuseInnerModuleMember.js +++ b/tests/baselines/reference/reuseInnerModuleMember.js @@ -1,16 +1,16 @@ //// [tests/cases/compiler/reuseInnerModuleMember.ts] //// //// [reuseInnerModuleMember_0.ts] -export module M { } +export namespace M { } //// [reuseInnerModuleMember_1.ts] /// -declare module bar { +declare namespace bar { interface alpha { } } import f = require('./reuseInnerModuleMember_0'); -module bar { +namespace bar { var x: alpha; } diff --git a/tests/baselines/reference/reuseInnerModuleMember.symbols b/tests/baselines/reference/reuseInnerModuleMember.symbols index d4f1c843c3f40..190e72ae32ec5 100644 --- a/tests/baselines/reference/reuseInnerModuleMember.symbols +++ b/tests/baselines/reference/reuseInnerModuleMember.symbols @@ -2,25 +2,25 @@ === reuseInnerModuleMember_1.ts === /// -declare module bar { +declare namespace bar { >bar : Symbol(bar, Decl(reuseInnerModuleMember_1.ts, 0, 0), Decl(reuseInnerModuleMember_1.ts, 5, 49)) interface alpha { } ->alpha : Symbol(alpha, Decl(reuseInnerModuleMember_1.ts, 1, 20)) +>alpha : Symbol(alpha, Decl(reuseInnerModuleMember_1.ts, 1, 23)) } import f = require('./reuseInnerModuleMember_0'); >f : Symbol(f, Decl(reuseInnerModuleMember_1.ts, 3, 1)) -module bar { +namespace bar { >bar : Symbol(bar, Decl(reuseInnerModuleMember_1.ts, 0, 0), Decl(reuseInnerModuleMember_1.ts, 5, 49)) var x: alpha; >x : Symbol(x, Decl(reuseInnerModuleMember_1.ts, 7, 7)) ->alpha : Symbol(alpha, Decl(reuseInnerModuleMember_1.ts, 1, 20)) +>alpha : Symbol(alpha, Decl(reuseInnerModuleMember_1.ts, 1, 23)) } === reuseInnerModuleMember_0.ts === -export module M { } +export namespace M { } >M : Symbol(M, Decl(reuseInnerModuleMember_0.ts, 0, 0)) diff --git a/tests/baselines/reference/reuseInnerModuleMember.types b/tests/baselines/reference/reuseInnerModuleMember.types index f1713b771b426..7e6e5df74a5c6 100644 --- a/tests/baselines/reference/reuseInnerModuleMember.types +++ b/tests/baselines/reference/reuseInnerModuleMember.types @@ -2,7 +2,7 @@ === reuseInnerModuleMember_1.ts === /// -declare module bar { +declare namespace bar { interface alpha { } } @@ -10,7 +10,7 @@ import f = require('./reuseInnerModuleMember_0'); >f : typeof f > : ^^^^^^^^ -module bar { +namespace bar { >bar : typeof bar > : ^^^^^^^^^^ @@ -21,5 +21,5 @@ module bar { === reuseInnerModuleMember_0.ts === -export module M { } +export namespace M { } diff --git a/tests/baselines/reference/scopeResolutionIdentifiers.errors.txt b/tests/baselines/reference/scopeResolutionIdentifiers.errors.txt index 1500c50c79c53..eb24d90ea53ed 100644 --- a/tests/baselines/reference/scopeResolutionIdentifiers.errors.txt +++ b/tests/baselines/reference/scopeResolutionIdentifiers.errors.txt @@ -5,13 +5,13 @@ scopeResolutionIdentifiers.ts(24,14): error TS2729: Property 's' is used before // EveryType used in a nested scope of a different EveryType with the same name, type of the identifier is the one defined in the inner scope var s: string; - module M1 { + namespace M1 { export var s: number; var n = s; var n: number; } - module M2 { + namespace M2 { var s: number; var n = s; var n: number; @@ -35,9 +35,9 @@ scopeResolutionIdentifiers.ts(24,14): error TS2729: Property 's' is used before } } - module M3 { + namespace M3 { var s: any; - module M4 { + namespace M4 { var n = s; var n: any; } diff --git a/tests/baselines/reference/scopeResolutionIdentifiers.js b/tests/baselines/reference/scopeResolutionIdentifiers.js index 802070d0155ad..477e84ced134f 100644 --- a/tests/baselines/reference/scopeResolutionIdentifiers.js +++ b/tests/baselines/reference/scopeResolutionIdentifiers.js @@ -4,13 +4,13 @@ // EveryType used in a nested scope of a different EveryType with the same name, type of the identifier is the one defined in the inner scope var s: string; -module M1 { +namespace M1 { export var s: number; var n = s; var n: number; } -module M2 { +namespace M2 { var s: number; var n = s; var n: number; @@ -31,9 +31,9 @@ class C { } } -module M3 { +namespace M3 { var s: any; - module M4 { + namespace M4 { var n = s; var n: any; } diff --git a/tests/baselines/reference/scopeResolutionIdentifiers.symbols b/tests/baselines/reference/scopeResolutionIdentifiers.symbols index 7626646ddae3a..ff984122d5657 100644 --- a/tests/baselines/reference/scopeResolutionIdentifiers.symbols +++ b/tests/baselines/reference/scopeResolutionIdentifiers.symbols @@ -6,7 +6,7 @@ var s: string; >s : Symbol(s, Decl(scopeResolutionIdentifiers.ts, 2, 3)) -module M1 { +namespace M1 { >M1 : Symbol(M1, Decl(scopeResolutionIdentifiers.ts, 2, 14)) export var s: number; @@ -20,7 +20,7 @@ module M1 { >n : Symbol(n, Decl(scopeResolutionIdentifiers.ts, 5, 7), Decl(scopeResolutionIdentifiers.ts, 6, 7)) } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(scopeResolutionIdentifiers.ts, 7, 1)) var s: number; @@ -76,13 +76,13 @@ class C { } } -module M3 { +namespace M3 { >M3 : Symbol(M3, Decl(scopeResolutionIdentifiers.ts, 28, 1)) var s: any; >s : Symbol(s, Decl(scopeResolutionIdentifiers.ts, 31, 7)) - module M4 { + namespace M4 { >M4 : Symbol(M4, Decl(scopeResolutionIdentifiers.ts, 31, 15)) var n = s; diff --git a/tests/baselines/reference/scopeResolutionIdentifiers.types b/tests/baselines/reference/scopeResolutionIdentifiers.types index a5885439626df..6e147efb1ec8c 100644 --- a/tests/baselines/reference/scopeResolutionIdentifiers.types +++ b/tests/baselines/reference/scopeResolutionIdentifiers.types @@ -7,7 +7,7 @@ var s: string; >s : string > : ^^^^^^ -module M1 { +namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ @@ -26,7 +26,7 @@ module M1 { > : ^^^^^^ } -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ @@ -102,7 +102,7 @@ class C { } } -module M3 { +namespace M3 { >M3 : typeof M3 > : ^^^^^^^^^ @@ -110,7 +110,7 @@ module M3 { >s : any > : ^^^ - module M4 { + namespace M4 { >M4 : typeof M4 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/selfRef.errors.txt b/tests/baselines/reference/selfRef.errors.txt index 37bdaf9700b52..e4b5edd820f13 100644 --- a/tests/baselines/reference/selfRef.errors.txt +++ b/tests/baselines/reference/selfRef.errors.txt @@ -3,7 +3,7 @@ selfRef.ts(12,18): error TS2304: Cannot find name 'name'. ==== selfRef.ts (2 errors) ==== - module M + namespace M { export class Test { diff --git a/tests/baselines/reference/selfRef.js b/tests/baselines/reference/selfRef.js index 4ff5e6d6fa118..31a7e338041a8 100644 --- a/tests/baselines/reference/selfRef.js +++ b/tests/baselines/reference/selfRef.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/selfRef.ts] //// //// [selfRef.ts] -module M +namespace M { export class Test { diff --git a/tests/baselines/reference/selfRef.symbols b/tests/baselines/reference/selfRef.symbols index 75a9b2457ed21..088fa3304b8b8 100644 --- a/tests/baselines/reference/selfRef.symbols +++ b/tests/baselines/reference/selfRef.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/selfRef.ts] //// === selfRef.ts === -module M +namespace M >M : Symbol(M, Decl(selfRef.ts, 0, 0)) { export class Test diff --git a/tests/baselines/reference/selfRef.types b/tests/baselines/reference/selfRef.types index adaf914b5348d..c6eddd052ef57 100644 --- a/tests/baselines/reference/selfRef.types +++ b/tests/baselines/reference/selfRef.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/selfRef.ts] //// === selfRef.ts === -module M +namespace M >M : typeof M > : ^^^^^^^^ { diff --git a/tests/baselines/reference/semicolonsInModuleDeclarations.errors.txt b/tests/baselines/reference/semicolonsInModuleDeclarations.errors.txt index e3836bb61ecd1..feaff7fd08427 100644 --- a/tests/baselines/reference/semicolonsInModuleDeclarations.errors.txt +++ b/tests/baselines/reference/semicolonsInModuleDeclarations.errors.txt @@ -2,7 +2,7 @@ semicolonsInModuleDeclarations.ts(2,27): error TS1036: Statements are not allowe ==== semicolonsInModuleDeclarations.ts (1 errors) ==== - declare module ambiModule { + declare namespace ambiModule { export interface i1 { }; ~ !!! error TS1036: Statements are not allowed in ambient contexts. diff --git a/tests/baselines/reference/semicolonsInModuleDeclarations.js b/tests/baselines/reference/semicolonsInModuleDeclarations.js index e3bce64bab554..2bd6083cf9084 100644 --- a/tests/baselines/reference/semicolonsInModuleDeclarations.js +++ b/tests/baselines/reference/semicolonsInModuleDeclarations.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/semicolonsInModuleDeclarations.ts] //// //// [semicolonsInModuleDeclarations.ts] -declare module ambiModule { +declare namespace ambiModule { export interface i1 { }; export interface i2 { } } diff --git a/tests/baselines/reference/semicolonsInModuleDeclarations.symbols b/tests/baselines/reference/semicolonsInModuleDeclarations.symbols index b6457ac401401..1dafb977b23c2 100644 --- a/tests/baselines/reference/semicolonsInModuleDeclarations.symbols +++ b/tests/baselines/reference/semicolonsInModuleDeclarations.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/semicolonsInModuleDeclarations.ts] //// === semicolonsInModuleDeclarations.ts === -declare module ambiModule { +declare namespace ambiModule { >ambiModule : Symbol(ambiModule, Decl(semicolonsInModuleDeclarations.ts, 0, 0)) export interface i1 { }; ->i1 : Symbol(i1, Decl(semicolonsInModuleDeclarations.ts, 0, 27)) +>i1 : Symbol(i1, Decl(semicolonsInModuleDeclarations.ts, 0, 30)) export interface i2 { } >i2 : Symbol(i2, Decl(semicolonsInModuleDeclarations.ts, 1, 27)) @@ -14,7 +14,7 @@ declare module ambiModule { var n1: ambiModule.i1; >n1 : Symbol(n1, Decl(semicolonsInModuleDeclarations.ts, 5, 3)) >ambiModule : Symbol(ambiModule, Decl(semicolonsInModuleDeclarations.ts, 0, 0)) ->i1 : Symbol(ambiModule.i1, Decl(semicolonsInModuleDeclarations.ts, 0, 27)) +>i1 : Symbol(ambiModule.i1, Decl(semicolonsInModuleDeclarations.ts, 0, 30)) var n2: ambiModule.i2; >n2 : Symbol(n2, Decl(semicolonsInModuleDeclarations.ts, 6, 3)) diff --git a/tests/baselines/reference/semicolonsInModuleDeclarations.types b/tests/baselines/reference/semicolonsInModuleDeclarations.types index f7d253789e812..48126ff65ad2d 100644 --- a/tests/baselines/reference/semicolonsInModuleDeclarations.types +++ b/tests/baselines/reference/semicolonsInModuleDeclarations.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/semicolonsInModuleDeclarations.ts] //// === semicolonsInModuleDeclarations.ts === -declare module ambiModule { +declare namespace ambiModule { >ambiModule : typeof ambiModule > : ^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/separate1-2.js b/tests/baselines/reference/separate1-2.js index 09d69017ce8f3..610483bf6c49b 100644 --- a/tests/baselines/reference/separate1-2.js +++ b/tests/baselines/reference/separate1-2.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/separate1-2.ts] //// //// [separate1-2.ts] -module X { +namespace X { export function f() { } } diff --git a/tests/baselines/reference/separate1-2.symbols b/tests/baselines/reference/separate1-2.symbols index b678370a5e753..4d8243f4fe18a 100644 --- a/tests/baselines/reference/separate1-2.symbols +++ b/tests/baselines/reference/separate1-2.symbols @@ -1,9 +1,9 @@ //// [tests/cases/compiler/separate1-2.ts] //// === separate1-2.ts === -module X { +namespace X { >X : Symbol(X, Decl(separate1-2.ts, 0, 0)) export function f() { } ->f : Symbol(f, Decl(separate1-2.ts, 0, 10)) +>f : Symbol(f, Decl(separate1-2.ts, 0, 13)) } diff --git a/tests/baselines/reference/separate1-2.types b/tests/baselines/reference/separate1-2.types index 5829d474b1a5b..b8395971e326d 100644 --- a/tests/baselines/reference/separate1-2.types +++ b/tests/baselines/reference/separate1-2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/separate1-2.ts] //// === separate1-2.ts === -module X { +namespace X { >X : typeof X > : ^^^^^^^^ diff --git a/tests/baselines/reference/shadowedInternalModule.errors.txt b/tests/baselines/reference/shadowedInternalModule.errors.txt index 12d5e7ddb8d1b..01d54380f9f45 100644 --- a/tests/baselines/reference/shadowedInternalModule.errors.txt +++ b/tests/baselines/reference/shadowedInternalModule.errors.txt @@ -7,7 +7,7 @@ shadowedInternalModule.ts(62,3): error TS2440: Import declaration conflicts with ==== shadowedInternalModule.ts (4 errors) ==== // all errors imported modules conflict with local variables - module A { + namespace A { export var Point = { x: 0, y: 0 } export interface Point { x: number; @@ -15,15 +15,15 @@ shadowedInternalModule.ts(62,3): error TS2440: Import declaration conflicts with } } - module B { + namespace B { var A = { x: 0, y: 0 }; import Point = A; ~ !!! error TS2437: Module 'A' is hidden by a local declaration with the same name. } - module X { - export module Y { + namespace X { + export namespace Y { export interface Point{ x: number; y: number @@ -35,7 +35,7 @@ shadowedInternalModule.ts(62,3): error TS2440: Import declaration conflicts with } } - module Z { + namespace Z { import Y = X.Y; ~~~~~~~~~~~~~~~ !!! error TS2440: Import declaration conflicts with local declaration of 'Y'. @@ -45,16 +45,16 @@ shadowedInternalModule.ts(62,3): error TS2440: Import declaration conflicts with // - module a { + namespace a { export type A = number; } - module b { + namespace b { export import A = a.A; - export module A {} + export namespace A {} } - module c { + namespace c { import any = b.A; ~~~ !!! error TS2438: Import name cannot be 'any'. @@ -62,16 +62,16 @@ shadowedInternalModule.ts(62,3): error TS2440: Import declaration conflicts with // - module q { + namespace q { export const Q = {}; } - module r { + namespace r { export import Q = q.Q; export type Q = number; } - module s { + namespace s { import Q = r.Q; ~~~~~~~~~~~~~~~ !!! error TS2440: Import declaration conflicts with local declaration of 'Q'. diff --git a/tests/baselines/reference/shadowedInternalModule.js b/tests/baselines/reference/shadowedInternalModule.js index 663133902cd83..7ebbe5740f01e 100644 --- a/tests/baselines/reference/shadowedInternalModule.js +++ b/tests/baselines/reference/shadowedInternalModule.js @@ -3,7 +3,7 @@ //// [shadowedInternalModule.ts] // all errors imported modules conflict with local variables -module A { +namespace A { export var Point = { x: 0, y: 0 } export interface Point { x: number; @@ -11,13 +11,13 @@ module A { } } -module B { +namespace B { var A = { x: 0, y: 0 }; import Point = A; } -module X { - export module Y { +namespace X { + export namespace Y { export interface Point{ x: number; y: number @@ -29,7 +29,7 @@ module X { } } -module Z { +namespace Z { import Y = X.Y; var Y = 12; @@ -37,31 +37,31 @@ module Z { // -module a { +namespace a { export type A = number; } -module b { +namespace b { export import A = a.A; - export module A {} + export namespace A {} } -module c { +namespace c { import any = b.A; } // -module q { +namespace q { export const Q = {}; } -module r { +namespace r { export import Q = q.Q; export type Q = number; } -module s { +namespace s { import Q = r.Q; const Q = 0; } diff --git a/tests/baselines/reference/shadowedInternalModule.symbols b/tests/baselines/reference/shadowedInternalModule.symbols index 67baac91997f7..20ef737d5f30e 100644 --- a/tests/baselines/reference/shadowedInternalModule.symbols +++ b/tests/baselines/reference/shadowedInternalModule.symbols @@ -3,7 +3,7 @@ === shadowedInternalModule.ts === // all errors imported modules conflict with local variables -module A { +namespace A { >A : Symbol(A, Decl(shadowedInternalModule.ts, 0, 0)) export var Point = { x: 0, y: 0 } @@ -22,7 +22,7 @@ module A { } } -module B { +namespace B { >B : Symbol(B, Decl(shadowedInternalModule.ts, 8, 1)) var A = { x: 0, y: 0 }; @@ -35,14 +35,14 @@ module B { >A : Symbol(Point, Decl(shadowedInternalModule.ts, 0, 0)) } -module X { +namespace X { >X : Symbol(X, Decl(shadowedInternalModule.ts, 13, 1)) - export module Y { ->Y : Symbol(Y, Decl(shadowedInternalModule.ts, 15, 10), Decl(shadowedInternalModule.ts, 21, 5)) + export namespace Y { +>Y : Symbol(Y, Decl(shadowedInternalModule.ts, 15, 13), Decl(shadowedInternalModule.ts, 21, 5)) export interface Point{ ->Point : Symbol(Point, Decl(shadowedInternalModule.ts, 16, 21)) +>Point : Symbol(Point, Decl(shadowedInternalModule.ts, 16, 24)) x: number; >x : Symbol(Point.x, Decl(shadowedInternalModule.ts, 17, 31)) @@ -53,85 +53,85 @@ module X { } export class Y { ->Y : Symbol(Y, Decl(shadowedInternalModule.ts, 15, 10), Decl(shadowedInternalModule.ts, 21, 5)) +>Y : Symbol(Y, Decl(shadowedInternalModule.ts, 15, 13), Decl(shadowedInternalModule.ts, 21, 5)) name: string; >name : Symbol(Y.name, Decl(shadowedInternalModule.ts, 23, 20)) } } -module Z { +namespace Z { >Z : Symbol(Z, Decl(shadowedInternalModule.ts, 26, 1)) import Y = X.Y; ->Y : Symbol(Y, Decl(shadowedInternalModule.ts, 28, 10), Decl(shadowedInternalModule.ts, 31, 7)) +>Y : Symbol(Y, Decl(shadowedInternalModule.ts, 28, 13), Decl(shadowedInternalModule.ts, 31, 7)) >X : Symbol(X, Decl(shadowedInternalModule.ts, 13, 1)) ->Y : Symbol(Y, Decl(shadowedInternalModule.ts, 15, 10), Decl(shadowedInternalModule.ts, 21, 5)) +>Y : Symbol(Y, Decl(shadowedInternalModule.ts, 15, 13), Decl(shadowedInternalModule.ts, 21, 5)) var Y = 12; ->Y : Symbol(Y, Decl(shadowedInternalModule.ts, 28, 10), Decl(shadowedInternalModule.ts, 31, 7)) +>Y : Symbol(Y, Decl(shadowedInternalModule.ts, 28, 13), Decl(shadowedInternalModule.ts, 31, 7)) } // -module a { +namespace a { >a : Symbol(a, Decl(shadowedInternalModule.ts, 32, 1)) export type A = number; ->A : Symbol(A, Decl(shadowedInternalModule.ts, 36, 10)) +>A : Symbol(A, Decl(shadowedInternalModule.ts, 36, 13)) } -module b { +namespace b { >b : Symbol(b, Decl(shadowedInternalModule.ts, 38, 1)) export import A = a.A; ->A : Symbol(A, Decl(shadowedInternalModule.ts, 40, 10), Decl(shadowedInternalModule.ts, 41, 24)) +>A : Symbol(A, Decl(shadowedInternalModule.ts, 40, 13), Decl(shadowedInternalModule.ts, 41, 24)) >a : Symbol(a, Decl(shadowedInternalModule.ts, 32, 1)) ->A : Symbol(A, Decl(shadowedInternalModule.ts, 36, 10)) +>A : Symbol(A, Decl(shadowedInternalModule.ts, 36, 13)) - export module A {} ->A : Symbol(A, Decl(shadowedInternalModule.ts, 40, 10), Decl(shadowedInternalModule.ts, 41, 24)) + export namespace A {} +>A : Symbol(A, Decl(shadowedInternalModule.ts, 40, 13), Decl(shadowedInternalModule.ts, 41, 24)) } -module c { +namespace c { >c : Symbol(c, Decl(shadowedInternalModule.ts, 43, 1)) import any = b.A; ->any : Symbol(any, Decl(shadowedInternalModule.ts, 45, 10)) +>any : Symbol(any, Decl(shadowedInternalModule.ts, 45, 13)) >b : Symbol(b, Decl(shadowedInternalModule.ts, 38, 1)) ->A : Symbol(any, Decl(shadowedInternalModule.ts, 40, 10), Decl(shadowedInternalModule.ts, 41, 24)) +>A : Symbol(any, Decl(shadowedInternalModule.ts, 40, 13), Decl(shadowedInternalModule.ts, 41, 24)) } // -module q { +namespace q { >q : Symbol(q, Decl(shadowedInternalModule.ts, 47, 1)) export const Q = {}; >Q : Symbol(Q, Decl(shadowedInternalModule.ts, 52, 14)) } -module r { +namespace r { >r : Symbol(r, Decl(shadowedInternalModule.ts, 53, 1)) export import Q = q.Q; ->Q : Symbol(Q, Decl(shadowedInternalModule.ts, 55, 10), Decl(shadowedInternalModule.ts, 56, 24)) +>Q : Symbol(Q, Decl(shadowedInternalModule.ts, 55, 13), Decl(shadowedInternalModule.ts, 56, 24)) >q : Symbol(q, Decl(shadowedInternalModule.ts, 47, 1)) >Q : Symbol(Q, Decl(shadowedInternalModule.ts, 52, 14)) export type Q = number; ->Q : Symbol(Q, Decl(shadowedInternalModule.ts, 55, 10), Decl(shadowedInternalModule.ts, 56, 24)) +>Q : Symbol(Q, Decl(shadowedInternalModule.ts, 55, 13), Decl(shadowedInternalModule.ts, 56, 24)) } -module s { +namespace s { >s : Symbol(s, Decl(shadowedInternalModule.ts, 58, 1)) import Q = r.Q; ->Q : Symbol(Q, Decl(shadowedInternalModule.ts, 60, 10), Decl(shadowedInternalModule.ts, 62, 7)) +>Q : Symbol(Q, Decl(shadowedInternalModule.ts, 60, 13), Decl(shadowedInternalModule.ts, 62, 7)) >r : Symbol(r, Decl(shadowedInternalModule.ts, 53, 1)) ->Q : Symbol(Q, Decl(shadowedInternalModule.ts, 55, 10), Decl(shadowedInternalModule.ts, 56, 24)) +>Q : Symbol(Q, Decl(shadowedInternalModule.ts, 55, 13), Decl(shadowedInternalModule.ts, 56, 24)) const Q = 0; ->Q : Symbol(Q, Decl(shadowedInternalModule.ts, 60, 10), Decl(shadowedInternalModule.ts, 62, 7)) +>Q : Symbol(Q, Decl(shadowedInternalModule.ts, 60, 13), Decl(shadowedInternalModule.ts, 62, 7)) } diff --git a/tests/baselines/reference/shadowedInternalModule.types b/tests/baselines/reference/shadowedInternalModule.types index 389c04ae56c02..79ae16b521171 100644 --- a/tests/baselines/reference/shadowedInternalModule.types +++ b/tests/baselines/reference/shadowedInternalModule.types @@ -3,7 +3,7 @@ === shadowedInternalModule.ts === // all errors imported modules conflict with local variables -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -32,7 +32,7 @@ module A { } } -module B { +namespace B { >B : typeof B > : ^^^^^^^^ @@ -57,11 +57,11 @@ module B { > : ^^^^^^^^^^^^ } -module X { +namespace X { >X : typeof X > : ^^^^^^^^ - export module Y { + export namespace Y { export interface Point{ x: number; >x : number @@ -83,7 +83,7 @@ module X { } } -module Z { +namespace Z { >Z : typeof Z > : ^^^^^^^^ @@ -104,13 +104,13 @@ module Z { // -module a { +namespace a { export type A = number; >A : number > : ^^^^^^ } -module b { +namespace b { >b : typeof b > : ^^^^^^^^ @@ -122,10 +122,10 @@ module b { >A : number > : ^^^^^^ - export module A {} + export namespace A {} } -module c { +namespace c { import any = b.A; >any : any > : ^^^ @@ -137,7 +137,7 @@ module c { // -module q { +namespace q { >q : typeof q > : ^^^^^^^^ @@ -148,7 +148,7 @@ module q { > : ^^ } -module r { +namespace r { >r : typeof r > : ^^^^^^^^ @@ -165,7 +165,7 @@ module r { > : ^^^^^^ } -module s { +namespace s { >s : typeof s > : ^^^^^^^^ diff --git a/tests/baselines/reference/sourceMap-Comments.js b/tests/baselines/reference/sourceMap-Comments.js index 9dbdff12045f1..a7c6be9f3f2a8 100644 --- a/tests/baselines/reference/sourceMap-Comments.js +++ b/tests/baselines/reference/sourceMap-Comments.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/sourceMap-Comments.ts] //// //// [sourceMap-Comments.ts] -module sas.tools { +namespace sas.tools { export class Test { public doX(): void { let f: number = 2; diff --git a/tests/baselines/reference/sourceMap-Comments.js.map b/tests/baselines/reference/sourceMap-Comments.js.map index db8e07ceec0bb..cf310bbccffb8 100644 --- a/tests/baselines/reference/sourceMap-Comments.js.map +++ b/tests/baselines/reference/sourceMap-Comments.js.map @@ -1,3 +1,3 @@ //// [sourceMap-Comments.js.map] -{"version":3,"file":"sourceMap-Comments.js","sourceRoot":"","sources":["sourceMap-Comments.ts"],"names":[],"mappings":"AAAA,IAAO,GAAG,CAkBT;AAlBD,WAAO,GAAG;IAAC,IAAA,KAAK,CAkBf;IAlBU,WAAA,KAAK;QACZ;YAAA;YAeA,CAAC;YAdU,kBAAG,GAAV;gBACI,IAAI,CAAC,GAAW,CAAC,CAAC;gBAClB,QAAQ,CAAC,EAAE,CAAC;oBACR,KAAK,CAAC;wBACF,MAAM;oBACV,KAAK,CAAC;wBACF,gBAAgB;wBAChB,gBAAgB;wBAChB,MAAM;oBACV,KAAK,CAAC;wBACF,WAAW;wBACX,MAAM;gBACd,CAAC;YACL,CAAC;YACL,WAAC;QAAD,CAAC,AAfD,IAeC;QAfY,UAAI,OAehB,CAAA;IAEL,CAAC,EAlBU,KAAK,GAAL,SAAK,KAAL,SAAK,QAkBf;AAAD,CAAC,EAlBM,GAAG,KAAH,GAAG,QAkBT"} -//// https://sokra.github.io/source-map-visualization#base64,dmFyIHNhczsNCihmdW5jdGlvbiAoc2FzKSB7DQogICAgdmFyIHRvb2xzOw0KICAgIChmdW5jdGlvbiAodG9vbHMpIHsNCiAgICAgICAgdmFyIFRlc3QgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgICAgICAgICBmdW5jdGlvbiBUZXN0KCkgew0KICAgICAgICAgICAgfQ0KICAgICAgICAgICAgVGVzdC5wcm90b3R5cGUuZG9YID0gZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgICAgIHZhciBmID0gMjsNCiAgICAgICAgICAgICAgICBzd2l0Y2ggKGYpIHsNCiAgICAgICAgICAgICAgICAgICAgY2FzZSAxOg0KICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7DQogICAgICAgICAgICAgICAgICAgIGNhc2UgMjoNCiAgICAgICAgICAgICAgICAgICAgICAgIC8vbGluZSBjb21tZW50IDENCiAgICAgICAgICAgICAgICAgICAgICAgIC8vbGluZSBjb21tZW50IDINCiAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOw0KICAgICAgICAgICAgICAgICAgICBjYXNlIDM6DQogICAgICAgICAgICAgICAgICAgICAgICAvL2EgY29tbWVudA0KICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7DQogICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgfTsNCiAgICAgICAgICAgIHJldHVybiBUZXN0Ow0KICAgICAgICB9KCkpOw0KICAgICAgICB0b29scy5UZXN0ID0gVGVzdDsNCiAgICB9KSh0b29scyA9IHNhcy50b29scyB8fCAoc2FzLnRvb2xzID0ge30pKTsNCn0pKHNhcyB8fCAoc2FzID0ge30pKTsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPXNvdXJjZU1hcC1Db21tZW50cy5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlTWFwLUNvbW1lbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsic291cmNlTWFwLUNvbW1lbnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLElBQU8sR0FBRyxDQWtCVDtBQWxCRCxXQUFPLEdBQUc7SUFBQyxJQUFBLEtBQUssQ0FrQmY7SUFsQlUsV0FBQSxLQUFLO1FBQ1o7WUFBQTtZQWVBLENBQUM7WUFkVSxrQkFBRyxHQUFWO2dCQUNJLElBQUksQ0FBQyxHQUFXLENBQUMsQ0FBQztnQkFDbEIsUUFBUSxDQUFDLEVBQUUsQ0FBQztvQkFDUixLQUFLLENBQUM7d0JBQ0YsTUFBTTtvQkFDVixLQUFLLENBQUM7d0JBQ0YsZ0JBQWdCO3dCQUNoQixnQkFBZ0I7d0JBQ2hCLE1BQU07b0JBQ1YsS0FBSyxDQUFDO3dCQUNGLFdBQVc7d0JBQ1gsTUFBTTtnQkFDZCxDQUFDO1lBQ0wsQ0FBQztZQUNMLFdBQUM7UUFBRCxDQUFDLEFBZkQsSUFlQztRQWZZLFVBQUksT0FlaEIsQ0FBQTtJQUVMLENBQUMsRUFsQlUsS0FBSyxHQUFMLFNBQUssS0FBTCxTQUFLLFFBa0JmO0FBQUQsQ0FBQyxFQWxCTSxHQUFHLEtBQUgsR0FBRyxRQWtCVCJ9,bW9kdWxlIHNhcy50b29scyB7CiAgICBleHBvcnQgY2xhc3MgVGVzdCB7CiAgICAgICAgcHVibGljIGRvWCgpOiB2b2lkIHsKICAgICAgICAgICAgbGV0IGY6IG51bWJlciA9IDI7CiAgICAgICAgICAgIHN3aXRjaCAoZikgewogICAgICAgICAgICAgICAgY2FzZSAxOgogICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgY2FzZSAyOgogICAgICAgICAgICAgICAgICAgIC8vbGluZSBjb21tZW50IDEKICAgICAgICAgICAgICAgICAgICAvL2xpbmUgY29tbWVudCAyCiAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICBjYXNlIDM6CiAgICAgICAgICAgICAgICAgICAgLy9hIGNvbW1lbnQKICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgfQogICAgICAgIH0KICAgIH0KCn0K +{"version":3,"file":"sourceMap-Comments.js","sourceRoot":"","sources":["sourceMap-Comments.ts"],"names":[],"mappings":"AAAA,IAAU,GAAG,CAkBZ;AAlBD,WAAU,GAAG;IAAC,IAAA,KAAK,CAkBlB;IAlBa,WAAA,KAAK;QACf;YAAA;YAeA,CAAC;YAdU,kBAAG,GAAV;gBACI,IAAI,CAAC,GAAW,CAAC,CAAC;gBAClB,QAAQ,CAAC,EAAE,CAAC;oBACR,KAAK,CAAC;wBACF,MAAM;oBACV,KAAK,CAAC;wBACF,gBAAgB;wBAChB,gBAAgB;wBAChB,MAAM;oBACV,KAAK,CAAC;wBACF,WAAW;wBACX,MAAM;gBACd,CAAC;YACL,CAAC;YACL,WAAC;QAAD,CAAC,AAfD,IAeC;QAfY,UAAI,OAehB,CAAA;IAEL,CAAC,EAlBa,KAAK,GAAL,SAAK,KAAL,SAAK,QAkBlB;AAAD,CAAC,EAlBS,GAAG,KAAH,GAAG,QAkBZ"} +//// https://sokra.github.io/source-map-visualization#base64,dmFyIHNhczsNCihmdW5jdGlvbiAoc2FzKSB7DQogICAgdmFyIHRvb2xzOw0KICAgIChmdW5jdGlvbiAodG9vbHMpIHsNCiAgICAgICAgdmFyIFRlc3QgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgICAgICAgICBmdW5jdGlvbiBUZXN0KCkgew0KICAgICAgICAgICAgfQ0KICAgICAgICAgICAgVGVzdC5wcm90b3R5cGUuZG9YID0gZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgICAgIHZhciBmID0gMjsNCiAgICAgICAgICAgICAgICBzd2l0Y2ggKGYpIHsNCiAgICAgICAgICAgICAgICAgICAgY2FzZSAxOg0KICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7DQogICAgICAgICAgICAgICAgICAgIGNhc2UgMjoNCiAgICAgICAgICAgICAgICAgICAgICAgIC8vbGluZSBjb21tZW50IDENCiAgICAgICAgICAgICAgICAgICAgICAgIC8vbGluZSBjb21tZW50IDINCiAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOw0KICAgICAgICAgICAgICAgICAgICBjYXNlIDM6DQogICAgICAgICAgICAgICAgICAgICAgICAvL2EgY29tbWVudA0KICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7DQogICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgfTsNCiAgICAgICAgICAgIHJldHVybiBUZXN0Ow0KICAgICAgICB9KCkpOw0KICAgICAgICB0b29scy5UZXN0ID0gVGVzdDsNCiAgICB9KSh0b29scyA9IHNhcy50b29scyB8fCAoc2FzLnRvb2xzID0ge30pKTsNCn0pKHNhcyB8fCAoc2FzID0ge30pKTsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPXNvdXJjZU1hcC1Db21tZW50cy5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlTWFwLUNvbW1lbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsic291cmNlTWFwLUNvbW1lbnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLElBQVUsR0FBRyxDQWtCWjtBQWxCRCxXQUFVLEdBQUc7SUFBQyxJQUFBLEtBQUssQ0FrQmxCO0lBbEJhLFdBQUEsS0FBSztRQUNmO1lBQUE7WUFlQSxDQUFDO1lBZFUsa0JBQUcsR0FBVjtnQkFDSSxJQUFJLENBQUMsR0FBVyxDQUFDLENBQUM7Z0JBQ2xCLFFBQVEsQ0FBQyxFQUFFLENBQUM7b0JBQ1IsS0FBSyxDQUFDO3dCQUNGLE1BQU07b0JBQ1YsS0FBSyxDQUFDO3dCQUNGLGdCQUFnQjt3QkFDaEIsZ0JBQWdCO3dCQUNoQixNQUFNO29CQUNWLEtBQUssQ0FBQzt3QkFDRixXQUFXO3dCQUNYLE1BQU07Z0JBQ2QsQ0FBQztZQUNMLENBQUM7WUFDTCxXQUFDO1FBQUQsQ0FBQyxBQWZELElBZUM7UUFmWSxVQUFJLE9BZWhCLENBQUE7SUFFTCxDQUFDLEVBbEJhLEtBQUssR0FBTCxTQUFLLEtBQUwsU0FBSyxRQWtCbEI7QUFBRCxDQUFDLEVBbEJTLEdBQUcsS0FBSCxHQUFHLFFBa0JaIn0=,bmFtZXNwYWNlIHNhcy50b29scyB7CiAgICBleHBvcnQgY2xhc3MgVGVzdCB7CiAgICAgICAgcHVibGljIGRvWCgpOiB2b2lkIHsKICAgICAgICAgICAgbGV0IGY6IG51bWJlciA9IDI7CiAgICAgICAgICAgIHN3aXRjaCAoZikgewogICAgICAgICAgICAgICAgY2FzZSAxOgogICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgY2FzZSAyOgogICAgICAgICAgICAgICAgICAgIC8vbGluZSBjb21tZW50IDEKICAgICAgICAgICAgICAgICAgICAvL2xpbmUgY29tbWVudCAyCiAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICBjYXNlIDM6CiAgICAgICAgICAgICAgICAgICAgLy9hIGNvbW1lbnQKICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgfQogICAgICAgIH0KICAgIH0KCn0K diff --git a/tests/baselines/reference/sourceMap-Comments.sourcemap.txt b/tests/baselines/reference/sourceMap-Comments.sourcemap.txt index 5d117ced1c92f..3486b25fff77e 100644 --- a/tests/baselines/reference/sourceMap-Comments.sourcemap.txt +++ b/tests/baselines/reference/sourceMap-Comments.sourcemap.txt @@ -15,7 +15,7 @@ sourceFile:sourceMap-Comments.ts 4 > ^ 5 > ^^^^^^^^^^-> 1 > -2 >module +2 >namespace 3 > sas 4 > .tools { > export class Test { @@ -37,8 +37,8 @@ sourceFile:sourceMap-Comments.ts > > } 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 8) Source(1, 11) + SourceIndex(0) +2 >Emitted(1, 5) Source(1, 11) + SourceIndex(0) +3 >Emitted(1, 8) Source(1, 14) + SourceIndex(0) 4 >Emitted(1, 9) Source(19, 2) + SourceIndex(0) --- >>>(function (sas) { @@ -47,11 +47,11 @@ sourceFile:sourceMap-Comments.ts 3 > ^^^ 4 > ^-> 1-> -2 >module +2 >namespace 3 > sas 1->Emitted(2, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(2, 12) Source(1, 8) + SourceIndex(0) -3 >Emitted(2, 15) Source(1, 11) + SourceIndex(0) +2 >Emitted(2, 12) Source(1, 11) + SourceIndex(0) +3 >Emitted(2, 15) Source(1, 14) + SourceIndex(0) --- >>> var tools; 1->^^^^ @@ -81,9 +81,9 @@ sourceFile:sourceMap-Comments.ts > } > > } -1->Emitted(3, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(3, 9) Source(1, 12) + SourceIndex(0) -3 >Emitted(3, 14) Source(1, 17) + SourceIndex(0) +1->Emitted(3, 5) Source(1, 15) + SourceIndex(0) +2 >Emitted(3, 9) Source(1, 15) + SourceIndex(0) +3 >Emitted(3, 14) Source(1, 20) + SourceIndex(0) 4 >Emitted(3, 15) Source(19, 2) + SourceIndex(0) --- >>> (function (tools) { @@ -94,9 +94,9 @@ sourceFile:sourceMap-Comments.ts 1-> 2 > 3 > tools -1->Emitted(4, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(4, 16) Source(1, 12) + SourceIndex(0) -3 >Emitted(4, 21) Source(1, 17) + SourceIndex(0) +1->Emitted(4, 5) Source(1, 15) + SourceIndex(0) +2 >Emitted(4, 16) Source(1, 15) + SourceIndex(0) +3 >Emitted(4, 21) Source(1, 20) + SourceIndex(0) --- >>> var Test = /** @class */ (function () { 1->^^^^^^^^ @@ -409,12 +409,12 @@ sourceFile:sourceMap-Comments.ts > } 1->Emitted(25, 5) Source(19, 1) + SourceIndex(0) 2 >Emitted(25, 6) Source(19, 2) + SourceIndex(0) -3 >Emitted(25, 8) Source(1, 12) + SourceIndex(0) -4 >Emitted(25, 13) Source(1, 17) + SourceIndex(0) -5 >Emitted(25, 16) Source(1, 12) + SourceIndex(0) -6 >Emitted(25, 25) Source(1, 17) + SourceIndex(0) -7 >Emitted(25, 30) Source(1, 12) + SourceIndex(0) -8 >Emitted(25, 39) Source(1, 17) + SourceIndex(0) +3 >Emitted(25, 8) Source(1, 15) + SourceIndex(0) +4 >Emitted(25, 13) Source(1, 20) + SourceIndex(0) +5 >Emitted(25, 16) Source(1, 15) + SourceIndex(0) +6 >Emitted(25, 25) Source(1, 20) + SourceIndex(0) +7 >Emitted(25, 30) Source(1, 15) + SourceIndex(0) +8 >Emitted(25, 39) Source(1, 20) + SourceIndex(0) 9 >Emitted(25, 47) Source(19, 2) + SourceIndex(0) --- >>>})(sas || (sas = {})); @@ -453,10 +453,10 @@ sourceFile:sourceMap-Comments.ts > } 1 >Emitted(26, 1) Source(19, 1) + SourceIndex(0) 2 >Emitted(26, 2) Source(19, 2) + SourceIndex(0) -3 >Emitted(26, 4) Source(1, 8) + SourceIndex(0) -4 >Emitted(26, 7) Source(1, 11) + SourceIndex(0) -5 >Emitted(26, 12) Source(1, 8) + SourceIndex(0) -6 >Emitted(26, 15) Source(1, 11) + SourceIndex(0) +3 >Emitted(26, 4) Source(1, 11) + SourceIndex(0) +4 >Emitted(26, 7) Source(1, 14) + SourceIndex(0) +5 >Emitted(26, 12) Source(1, 11) + SourceIndex(0) +6 >Emitted(26, 15) Source(1, 14) + SourceIndex(0) 7 >Emitted(26, 23) Source(19, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMap-Comments.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMap-Comments.symbols b/tests/baselines/reference/sourceMap-Comments.symbols index 17cd04469b5c6..fbaad65ff687d 100644 --- a/tests/baselines/reference/sourceMap-Comments.symbols +++ b/tests/baselines/reference/sourceMap-Comments.symbols @@ -1,12 +1,12 @@ //// [tests/cases/compiler/sourceMap-Comments.ts] //// === sourceMap-Comments.ts === -module sas.tools { +namespace sas.tools { >sas : Symbol(sas, Decl(sourceMap-Comments.ts, 0, 0)) ->tools : Symbol(tools, Decl(sourceMap-Comments.ts, 0, 11)) +>tools : Symbol(tools, Decl(sourceMap-Comments.ts, 0, 14)) export class Test { ->Test : Symbol(Test, Decl(sourceMap-Comments.ts, 0, 18)) +>Test : Symbol(Test, Decl(sourceMap-Comments.ts, 0, 21)) public doX(): void { >doX : Symbol(Test.doX, Decl(sourceMap-Comments.ts, 1, 23)) diff --git a/tests/baselines/reference/sourceMap-Comments.types b/tests/baselines/reference/sourceMap-Comments.types index 237c24a863a12..55207e4ec9c36 100644 --- a/tests/baselines/reference/sourceMap-Comments.types +++ b/tests/baselines/reference/sourceMap-Comments.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/sourceMap-Comments.ts] //// === sourceMap-Comments.ts === -module sas.tools { +namespace sas.tools { >sas : typeof sas > : ^^^^^^^^^^ >tools : typeof tools diff --git a/tests/baselines/reference/sourceMap-FileWithComments.js b/tests/baselines/reference/sourceMap-FileWithComments.js index aefcedf7dd372..bf1b6e673ada5 100644 --- a/tests/baselines/reference/sourceMap-FileWithComments.js +++ b/tests/baselines/reference/sourceMap-FileWithComments.js @@ -7,7 +7,7 @@ interface IPoint { } // Module -module Shapes { +namespace Shapes { // Class export class Point implements IPoint { diff --git a/tests/baselines/reference/sourceMap-FileWithComments.js.map b/tests/baselines/reference/sourceMap-FileWithComments.js.map index f24767e460dbb..e0d6b4b5bd6bd 100644 --- a/tests/baselines/reference/sourceMap-FileWithComments.js.map +++ b/tests/baselines/reference/sourceMap-FileWithComments.js.map @@ -1,3 +1,3 @@ //// [sourceMap-FileWithComments.js.map] -{"version":3,"file":"sourceMap-FileWithComments.js","sourceRoot":"","sources":["sourceMap-FileWithComments.ts"],"names":[],"mappings":"AAKA,SAAS;AACT,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM;IAET,QAAQ;IACR;QACI,cAAc;QACd,eAAmB,CAAS,EAAS,CAAS;YAA3B,MAAC,GAAD,CAAC,CAAQ;YAAS,MAAC,GAAD,CAAC,CAAQ;QAAI,CAAC;QAEnD,kBAAkB;QAClB,uBAAO,GAAP,cAAY,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAElE,gBAAgB;QACT,YAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACpC,YAAC;KAAA,AATD,IASC;IATY,YAAK,QASjB,CAAA;IAED,+BAA+B;IAC/B,IAAI,CAAC,GAAG,EAAE,CAAC;IAEX,SAAgB,GAAG;IACnB,CAAC;IADe,UAAG,MAClB,CAAA;IAED;;MAEE;IACF,IAAI,CAAC,GAAG,EAAE,CAAC;AACf,CAAC,EAxBM,MAAM,KAAN,MAAM,QAwBZ;AAED,qBAAqB;AACrB,IAAI,CAAC,GAAW,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACvC,IAAI,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC"} -//// https://sokra.github.io/source-map-visualization#base64,Ly8gTW9kdWxlDQp2YXIgU2hhcGVzOw0KKGZ1bmN0aW9uIChTaGFwZXMpIHsNCiAgICAvLyBDbGFzcw0KICAgIHZhciBQb2ludCA9IC8qKiBAY2xhc3MgKi8gKGZ1bmN0aW9uICgpIHsNCiAgICAgICAgLy8gQ29uc3RydWN0b3INCiAgICAgICAgZnVuY3Rpb24gUG9pbnQoeCwgeSkgew0KICAgICAgICAgICAgdGhpcy54ID0geDsNCiAgICAgICAgICAgIHRoaXMueSA9IHk7DQogICAgICAgIH0NCiAgICAgICAgLy8gSW5zdGFuY2UgbWVtYmVyDQogICAgICAgIFBvaW50LnByb3RvdHlwZS5nZXREaXN0ID0gZnVuY3Rpb24gKCkgeyByZXR1cm4gTWF0aC5zcXJ0KHRoaXMueCAqIHRoaXMueCArIHRoaXMueSAqIHRoaXMueSk7IH07DQogICAgICAgIC8vIFN0YXRpYyBtZW1iZXINCiAgICAgICAgUG9pbnQub3JpZ2luID0gbmV3IFBvaW50KDAsIDApOw0KICAgICAgICByZXR1cm4gUG9pbnQ7DQogICAgfSgpKTsNCiAgICBTaGFwZXMuUG9pbnQgPSBQb2ludDsNCiAgICAvLyBWYXJpYWJsZSBjb21tZW50IGFmdGVyIGNsYXNzDQogICAgdmFyIGEgPSAxMDsNCiAgICBmdW5jdGlvbiBmb28oKSB7DQogICAgfQ0KICAgIFNoYXBlcy5mb28gPSBmb287DQogICAgLyoqICBjb21tZW50IGFmdGVyIGZ1bmN0aW9uDQogICAgKiB0aGlzIGlzIGFub3RoZXIgY29tbWVudA0KICAgICovDQogICAgdmFyIGIgPSAxMDsNCn0pKFNoYXBlcyB8fCAoU2hhcGVzID0ge30pKTsNCi8qKiBMb2NhbCBWYXJpYWJsZSAqLw0KdmFyIHAgPSBuZXcgU2hhcGVzLlBvaW50KDMsIDQpOw0KdmFyIGRpc3QgPSBwLmdldERpc3QoKTsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPXNvdXJjZU1hcC1GaWxlV2l0aENvbW1lbnRzLmpzLm1hcA==,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlTWFwLUZpbGVXaXRoQ29tbWVudHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJzb3VyY2VNYXAtRmlsZVdpdGhDb21tZW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFLQSxTQUFTO0FBQ1QsSUFBTyxNQUFNLENBd0JaO0FBeEJELFdBQU8sTUFBTTtJQUVULFFBQVE7SUFDUjtRQUNJLGNBQWM7UUFDZCxlQUFtQixDQUFTLEVBQVMsQ0FBUztZQUEzQixNQUFDLEdBQUQsQ0FBQyxDQUFRO1lBQVMsTUFBQyxHQUFELENBQUMsQ0FBUTtRQUFJLENBQUM7UUFFbkQsa0JBQWtCO1FBQ2xCLHVCQUFPLEdBQVAsY0FBWSxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxDQUFDLEdBQUcsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUVsRSxnQkFBZ0I7UUFDVCxZQUFNLEdBQUcsSUFBSSxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3BDLFlBQUM7S0FBQSxBQVRELElBU0M7SUFUWSxZQUFLLFFBU2pCLENBQUE7SUFFRCwrQkFBK0I7SUFDL0IsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBRVgsU0FBZ0IsR0FBRztJQUNuQixDQUFDO0lBRGUsVUFBRyxNQUNsQixDQUFBO0lBRUQ7O01BRUU7SUFDRixJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7QUFDZixDQUFDLEVBeEJNLE1BQU0sS0FBTixNQUFNLFFBd0JaO0FBRUQscUJBQXFCO0FBQ3JCLElBQUksQ0FBQyxHQUFXLElBQUksTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDdkMsSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDIn0=,Ly8gSW50ZXJmYWNlCmludGVyZmFjZSBJUG9pbnQgewogICAgZ2V0RGlzdCgpOiBudW1iZXI7Cn0KCi8vIE1vZHVsZQptb2R1bGUgU2hhcGVzIHsKCiAgICAvLyBDbGFzcwogICAgZXhwb3J0IGNsYXNzIFBvaW50IGltcGxlbWVudHMgSVBvaW50IHsKICAgICAgICAvLyBDb25zdHJ1Y3RvcgogICAgICAgIGNvbnN0cnVjdG9yKHB1YmxpYyB4OiBudW1iZXIsIHB1YmxpYyB5OiBudW1iZXIpIHsgfQoKICAgICAgICAvLyBJbnN0YW5jZSBtZW1iZXIKICAgICAgICBnZXREaXN0KCkgeyByZXR1cm4gTWF0aC5zcXJ0KHRoaXMueCAqIHRoaXMueCArIHRoaXMueSAqIHRoaXMueSk7IH0KCiAgICAgICAgLy8gU3RhdGljIG1lbWJlcgogICAgICAgIHN0YXRpYyBvcmlnaW4gPSBuZXcgUG9pbnQoMCwgMCk7CiAgICB9CgogICAgLy8gVmFyaWFibGUgY29tbWVudCBhZnRlciBjbGFzcwogICAgdmFyIGEgPSAxMDsKCiAgICBleHBvcnQgZnVuY3Rpb24gZm9vKCkgewogICAgfQoKICAgIC8qKiAgY29tbWVudCBhZnRlciBmdW5jdGlvbgogICAgKiB0aGlzIGlzIGFub3RoZXIgY29tbWVudCAKICAgICovCiAgICB2YXIgYiA9IDEwOwp9CgovKiogTG9jYWwgVmFyaWFibGUgKi8KdmFyIHA6IElQb2ludCA9IG5ldyBTaGFwZXMuUG9pbnQoMywgNCk7CnZhciBkaXN0ID0gcC5nZXREaXN0KCk7 +{"version":3,"file":"sourceMap-FileWithComments.js","sourceRoot":"","sources":["sourceMap-FileWithComments.ts"],"names":[],"mappings":"AAKA,SAAS;AACT,IAAU,MAAM,CAwBf;AAxBD,WAAU,MAAM;IAEZ,QAAQ;IACR;QACI,cAAc;QACd,eAAmB,CAAS,EAAS,CAAS;YAA3B,MAAC,GAAD,CAAC,CAAQ;YAAS,MAAC,GAAD,CAAC,CAAQ;QAAI,CAAC;QAEnD,kBAAkB;QAClB,uBAAO,GAAP,cAAY,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAElE,gBAAgB;QACT,YAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACpC,YAAC;KAAA,AATD,IASC;IATY,YAAK,QASjB,CAAA;IAED,+BAA+B;IAC/B,IAAI,CAAC,GAAG,EAAE,CAAC;IAEX,SAAgB,GAAG;IACnB,CAAC;IADe,UAAG,MAClB,CAAA;IAED;;MAEE;IACF,IAAI,CAAC,GAAG,EAAE,CAAC;AACf,CAAC,EAxBS,MAAM,KAAN,MAAM,QAwBf;AAED,qBAAqB;AACrB,IAAI,CAAC,GAAW,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACvC,IAAI,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC"} +//// https://sokra.github.io/source-map-visualization#base64,Ly8gTW9kdWxlDQp2YXIgU2hhcGVzOw0KKGZ1bmN0aW9uIChTaGFwZXMpIHsNCiAgICAvLyBDbGFzcw0KICAgIHZhciBQb2ludCA9IC8qKiBAY2xhc3MgKi8gKGZ1bmN0aW9uICgpIHsNCiAgICAgICAgLy8gQ29uc3RydWN0b3INCiAgICAgICAgZnVuY3Rpb24gUG9pbnQoeCwgeSkgew0KICAgICAgICAgICAgdGhpcy54ID0geDsNCiAgICAgICAgICAgIHRoaXMueSA9IHk7DQogICAgICAgIH0NCiAgICAgICAgLy8gSW5zdGFuY2UgbWVtYmVyDQogICAgICAgIFBvaW50LnByb3RvdHlwZS5nZXREaXN0ID0gZnVuY3Rpb24gKCkgeyByZXR1cm4gTWF0aC5zcXJ0KHRoaXMueCAqIHRoaXMueCArIHRoaXMueSAqIHRoaXMueSk7IH07DQogICAgICAgIC8vIFN0YXRpYyBtZW1iZXINCiAgICAgICAgUG9pbnQub3JpZ2luID0gbmV3IFBvaW50KDAsIDApOw0KICAgICAgICByZXR1cm4gUG9pbnQ7DQogICAgfSgpKTsNCiAgICBTaGFwZXMuUG9pbnQgPSBQb2ludDsNCiAgICAvLyBWYXJpYWJsZSBjb21tZW50IGFmdGVyIGNsYXNzDQogICAgdmFyIGEgPSAxMDsNCiAgICBmdW5jdGlvbiBmb28oKSB7DQogICAgfQ0KICAgIFNoYXBlcy5mb28gPSBmb287DQogICAgLyoqICBjb21tZW50IGFmdGVyIGZ1bmN0aW9uDQogICAgKiB0aGlzIGlzIGFub3RoZXIgY29tbWVudA0KICAgICovDQogICAgdmFyIGIgPSAxMDsNCn0pKFNoYXBlcyB8fCAoU2hhcGVzID0ge30pKTsNCi8qKiBMb2NhbCBWYXJpYWJsZSAqLw0KdmFyIHAgPSBuZXcgU2hhcGVzLlBvaW50KDMsIDQpOw0KdmFyIGRpc3QgPSBwLmdldERpc3QoKTsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPXNvdXJjZU1hcC1GaWxlV2l0aENvbW1lbnRzLmpzLm1hcA==,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlTWFwLUZpbGVXaXRoQ29tbWVudHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJzb3VyY2VNYXAtRmlsZVdpdGhDb21tZW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFLQSxTQUFTO0FBQ1QsSUFBVSxNQUFNLENBd0JmO0FBeEJELFdBQVUsTUFBTTtJQUVaLFFBQVE7SUFDUjtRQUNJLGNBQWM7UUFDZCxlQUFtQixDQUFTLEVBQVMsQ0FBUztZQUEzQixNQUFDLEdBQUQsQ0FBQyxDQUFRO1lBQVMsTUFBQyxHQUFELENBQUMsQ0FBUTtRQUFJLENBQUM7UUFFbkQsa0JBQWtCO1FBQ2xCLHVCQUFPLEdBQVAsY0FBWSxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxDQUFDLEdBQUcsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUVsRSxnQkFBZ0I7UUFDVCxZQUFNLEdBQUcsSUFBSSxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3BDLFlBQUM7S0FBQSxBQVRELElBU0M7SUFUWSxZQUFLLFFBU2pCLENBQUE7SUFFRCwrQkFBK0I7SUFDL0IsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBRVgsU0FBZ0IsR0FBRztJQUNuQixDQUFDO0lBRGUsVUFBRyxNQUNsQixDQUFBO0lBRUQ7O01BRUU7SUFDRixJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7QUFDZixDQUFDLEVBeEJTLE1BQU0sS0FBTixNQUFNLFFBd0JmO0FBRUQscUJBQXFCO0FBQ3JCLElBQUksQ0FBQyxHQUFXLElBQUksTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDdkMsSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDIn0=,Ly8gSW50ZXJmYWNlCmludGVyZmFjZSBJUG9pbnQgewogICAgZ2V0RGlzdCgpOiBudW1iZXI7Cn0KCi8vIE1vZHVsZQpuYW1lc3BhY2UgU2hhcGVzIHsKCiAgICAvLyBDbGFzcwogICAgZXhwb3J0IGNsYXNzIFBvaW50IGltcGxlbWVudHMgSVBvaW50IHsKICAgICAgICAvLyBDb25zdHJ1Y3RvcgogICAgICAgIGNvbnN0cnVjdG9yKHB1YmxpYyB4OiBudW1iZXIsIHB1YmxpYyB5OiBudW1iZXIpIHsgfQoKICAgICAgICAvLyBJbnN0YW5jZSBtZW1iZXIKICAgICAgICBnZXREaXN0KCkgeyByZXR1cm4gTWF0aC5zcXJ0KHRoaXMueCAqIHRoaXMueCArIHRoaXMueSAqIHRoaXMueSk7IH0KCiAgICAgICAgLy8gU3RhdGljIG1lbWJlcgogICAgICAgIHN0YXRpYyBvcmlnaW4gPSBuZXcgUG9pbnQoMCwgMCk7CiAgICB9CgogICAgLy8gVmFyaWFibGUgY29tbWVudCBhZnRlciBjbGFzcwogICAgdmFyIGEgPSAxMDsKCiAgICBleHBvcnQgZnVuY3Rpb24gZm9vKCkgewogICAgfQoKICAgIC8qKiAgY29tbWVudCBhZnRlciBmdW5jdGlvbgogICAgKiB0aGlzIGlzIGFub3RoZXIgY29tbWVudCAKICAgICovCiAgICB2YXIgYiA9IDEwOwp9CgovKiogTG9jYWwgVmFyaWFibGUgKi8KdmFyIHA6IElQb2ludCA9IG5ldyBTaGFwZXMuUG9pbnQoMywgNCk7CnZhciBkaXN0ID0gcC5nZXREaXN0KCk7 diff --git a/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt b/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt index 9867f0aae9758..08e5a14e7275e 100644 --- a/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt +++ b/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt @@ -30,7 +30,7 @@ sourceFile:sourceMap-FileWithComments.ts 5 > ^^^^^^^^^^-> 1-> > -2 >module +2 >namespace 3 > Shapes 4 > { > @@ -58,8 +58,8 @@ sourceFile:sourceMap-FileWithComments.ts > var b = 10; > } 1->Emitted(2, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(7, 8) + SourceIndex(0) -3 >Emitted(2, 11) Source(7, 14) + SourceIndex(0) +2 >Emitted(2, 5) Source(7, 11) + SourceIndex(0) +3 >Emitted(2, 11) Source(7, 17) + SourceIndex(0) 4 >Emitted(2, 12) Source(31, 2) + SourceIndex(0) --- >>>(function (Shapes) { @@ -67,11 +67,11 @@ sourceFile:sourceMap-FileWithComments.ts 2 >^^^^^^^^^^^ 3 > ^^^^^^ 1-> -2 >module +2 >namespace 3 > Shapes 1->Emitted(3, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(3, 12) Source(7, 8) + SourceIndex(0) -3 >Emitted(3, 18) Source(7, 14) + SourceIndex(0) +2 >Emitted(3, 12) Source(7, 11) + SourceIndex(0) +3 >Emitted(3, 18) Source(7, 17) + SourceIndex(0) --- >>> // Class 1 >^^^^ @@ -514,10 +514,10 @@ sourceFile:sourceMap-FileWithComments.ts > } 1->Emitted(27, 1) Source(31, 1) + SourceIndex(0) 2 >Emitted(27, 2) Source(31, 2) + SourceIndex(0) -3 >Emitted(27, 4) Source(7, 8) + SourceIndex(0) -4 >Emitted(27, 10) Source(7, 14) + SourceIndex(0) -5 >Emitted(27, 15) Source(7, 8) + SourceIndex(0) -6 >Emitted(27, 21) Source(7, 14) + SourceIndex(0) +3 >Emitted(27, 4) Source(7, 11) + SourceIndex(0) +4 >Emitted(27, 10) Source(7, 17) + SourceIndex(0) +5 >Emitted(27, 15) Source(7, 11) + SourceIndex(0) +6 >Emitted(27, 21) Source(7, 17) + SourceIndex(0) 7 >Emitted(27, 29) Source(31, 2) + SourceIndex(0) --- >>>/** Local Variable */ diff --git a/tests/baselines/reference/sourceMap-FileWithComments.symbols b/tests/baselines/reference/sourceMap-FileWithComments.symbols index 9f091fcb7f6a5..0344b3829a624 100644 --- a/tests/baselines/reference/sourceMap-FileWithComments.symbols +++ b/tests/baselines/reference/sourceMap-FileWithComments.symbols @@ -10,12 +10,12 @@ interface IPoint { } // Module -module Shapes { +namespace Shapes { >Shapes : Symbol(Shapes, Decl(sourceMap-FileWithComments.ts, 3, 1)) // Class export class Point implements IPoint { ->Point : Symbol(Point, Decl(sourceMap-FileWithComments.ts, 6, 15)) +>Point : Symbol(Point, Decl(sourceMap-FileWithComments.ts, 6, 18)) >IPoint : Symbol(IPoint, Decl(sourceMap-FileWithComments.ts, 0, 0)) // Constructor @@ -30,22 +30,22 @@ module Shapes { >Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >sqrt : Symbol(Math.sqrt, Decl(lib.es5.d.ts, --, --)) >this.x : Symbol(Point.x, Decl(sourceMap-FileWithComments.ts, 11, 20)) ->this : Symbol(Point, Decl(sourceMap-FileWithComments.ts, 6, 15)) +>this : Symbol(Point, Decl(sourceMap-FileWithComments.ts, 6, 18)) >x : Symbol(Point.x, Decl(sourceMap-FileWithComments.ts, 11, 20)) >this.x : Symbol(Point.x, Decl(sourceMap-FileWithComments.ts, 11, 20)) ->this : Symbol(Point, Decl(sourceMap-FileWithComments.ts, 6, 15)) +>this : Symbol(Point, Decl(sourceMap-FileWithComments.ts, 6, 18)) >x : Symbol(Point.x, Decl(sourceMap-FileWithComments.ts, 11, 20)) >this.y : Symbol(Point.y, Decl(sourceMap-FileWithComments.ts, 11, 37)) ->this : Symbol(Point, Decl(sourceMap-FileWithComments.ts, 6, 15)) +>this : Symbol(Point, Decl(sourceMap-FileWithComments.ts, 6, 18)) >y : Symbol(Point.y, Decl(sourceMap-FileWithComments.ts, 11, 37)) >this.y : Symbol(Point.y, Decl(sourceMap-FileWithComments.ts, 11, 37)) ->this : Symbol(Point, Decl(sourceMap-FileWithComments.ts, 6, 15)) +>this : Symbol(Point, Decl(sourceMap-FileWithComments.ts, 6, 18)) >y : Symbol(Point.y, Decl(sourceMap-FileWithComments.ts, 11, 37)) // Static member static origin = new Point(0, 0); >origin : Symbol(Point.origin, Decl(sourceMap-FileWithComments.ts, 14, 74)) ->Point : Symbol(Point, Decl(sourceMap-FileWithComments.ts, 6, 15)) +>Point : Symbol(Point, Decl(sourceMap-FileWithComments.ts, 6, 18)) } // Variable comment after class @@ -67,9 +67,9 @@ module Shapes { var p: IPoint = new Shapes.Point(3, 4); >p : Symbol(p, Decl(sourceMap-FileWithComments.ts, 33, 3)) >IPoint : Symbol(IPoint, Decl(sourceMap-FileWithComments.ts, 0, 0)) ->Shapes.Point : Symbol(Shapes.Point, Decl(sourceMap-FileWithComments.ts, 6, 15)) +>Shapes.Point : Symbol(Shapes.Point, Decl(sourceMap-FileWithComments.ts, 6, 18)) >Shapes : Symbol(Shapes, Decl(sourceMap-FileWithComments.ts, 3, 1)) ->Point : Symbol(Shapes.Point, Decl(sourceMap-FileWithComments.ts, 6, 15)) +>Point : Symbol(Shapes.Point, Decl(sourceMap-FileWithComments.ts, 6, 18)) var dist = p.getDist(); >dist : Symbol(dist, Decl(sourceMap-FileWithComments.ts, 34, 3)) diff --git a/tests/baselines/reference/sourceMap-FileWithComments.types b/tests/baselines/reference/sourceMap-FileWithComments.types index 3ee2579e00eee..602dc704ddf2a 100644 --- a/tests/baselines/reference/sourceMap-FileWithComments.types +++ b/tests/baselines/reference/sourceMap-FileWithComments.types @@ -9,7 +9,7 @@ interface IPoint { } // Module -module Shapes { +namespace Shapes { >Shapes : typeof Shapes > : ^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js index a6490c521d7c8..9c156c6e7e99f 100644 --- a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js +++ b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js @@ -8,7 +8,7 @@ interface Window { } declare var window: Window; -module Foo { +namespace Foo { var x = "test1"; var y = "test 2\ isn't this a lot of fun"; diff --git a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js.map b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js.map index 87ab07d2201b8..01c7bb3513c2a 100644 --- a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js.map +++ b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js.map @@ -1,3 +1,3 @@ //// [sourceMap-StringLiteralWithNewLine.js.map] -{"version":3,"file":"sourceMap-StringLiteralWithNewLine.js","sourceRoot":"","sources":["sourceMap-StringLiteralWithNewLine.ts"],"names":[],"mappings":"AAOA,IAAO,GAAG,CAKT;AALD,WAAO,GAAG;IACN,IAAI,CAAC,GAAG,OAAO,CAAC;IAChB,IAAI,CAAC,GAAG;wBACY,CAAC;IACrB,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC;AAC5B,CAAC,EALM,GAAG,KAAH,GAAG,QAKT"} -//// https://sokra.github.io/source-map-visualization#base64,dmFyIEZvbzsNCihmdW5jdGlvbiAoRm9vKSB7DQogICAgdmFyIHggPSAidGVzdDEiOw0KICAgIHZhciB5ID0gInRlc3QgMlwKaXNuJ3QgdGhpcyBhIGxvdCBvZiBmdW4iOw0KICAgIHZhciB6ID0gd2luZG93LmRvY3VtZW50Ow0KfSkoRm9vIHx8IChGb28gPSB7fSkpOw0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9c291cmNlTWFwLVN0cmluZ0xpdGVyYWxXaXRoTmV3TGluZS5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlTWFwLVN0cmluZ0xpdGVyYWxXaXRoTmV3TGluZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInNvdXJjZU1hcC1TdHJpbmdMaXRlcmFsV2l0aE5ld0xpbmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBT0EsSUFBTyxHQUFHLENBS1Q7QUFMRCxXQUFPLEdBQUc7SUFDTixJQUFJLENBQUMsR0FBRyxPQUFPLENBQUM7SUFDaEIsSUFBSSxDQUFDLEdBQUc7d0JBQ1ksQ0FBQztJQUNyQixJQUFJLENBQUMsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDO0FBQzVCLENBQUMsRUFMTSxHQUFHLEtBQUgsR0FBRyxRQUtUIn0=,aW50ZXJmYWNlIERvY3VtZW50IHsKfQppbnRlcmZhY2UgV2luZG93IHsKICAgIGRvY3VtZW50OiBEb2N1bWVudDsKfQpkZWNsYXJlIHZhciB3aW5kb3c6IFdpbmRvdzsKCm1vZHVsZSBGb28gewogICAgdmFyIHggPSAidGVzdDEiOwogICAgdmFyIHkgPSAidGVzdCAyXAppc24ndCB0aGlzIGEgbG90IG9mIGZ1biI7CiAgICB2YXIgeiA9IHdpbmRvdy5kb2N1bWVudDsKfQ== +{"version":3,"file":"sourceMap-StringLiteralWithNewLine.js","sourceRoot":"","sources":["sourceMap-StringLiteralWithNewLine.ts"],"names":[],"mappings":"AAOA,IAAU,GAAG,CAKZ;AALD,WAAU,GAAG;IACT,IAAI,CAAC,GAAG,OAAO,CAAC;IAChB,IAAI,CAAC,GAAG;wBACY,CAAC;IACrB,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC;AAC5B,CAAC,EALS,GAAG,KAAH,GAAG,QAKZ"} +//// https://sokra.github.io/source-map-visualization#base64,dmFyIEZvbzsNCihmdW5jdGlvbiAoRm9vKSB7DQogICAgdmFyIHggPSAidGVzdDEiOw0KICAgIHZhciB5ID0gInRlc3QgMlwKaXNuJ3QgdGhpcyBhIGxvdCBvZiBmdW4iOw0KICAgIHZhciB6ID0gd2luZG93LmRvY3VtZW50Ow0KfSkoRm9vIHx8IChGb28gPSB7fSkpOw0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9c291cmNlTWFwLVN0cmluZ0xpdGVyYWxXaXRoTmV3TGluZS5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlTWFwLVN0cmluZ0xpdGVyYWxXaXRoTmV3TGluZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInNvdXJjZU1hcC1TdHJpbmdMaXRlcmFsV2l0aE5ld0xpbmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBT0EsSUFBVSxHQUFHLENBS1o7QUFMRCxXQUFVLEdBQUc7SUFDVCxJQUFJLENBQUMsR0FBRyxPQUFPLENBQUM7SUFDaEIsSUFBSSxDQUFDLEdBQUc7d0JBQ1ksQ0FBQztJQUNyQixJQUFJLENBQUMsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDO0FBQzVCLENBQUMsRUFMUyxHQUFHLEtBQUgsR0FBRyxRQUtaIn0=,aW50ZXJmYWNlIERvY3VtZW50IHsKfQppbnRlcmZhY2UgV2luZG93IHsKICAgIGRvY3VtZW50OiBEb2N1bWVudDsKfQpkZWNsYXJlIHZhciB3aW5kb3c6IFdpbmRvdzsKCm5hbWVzcGFjZSBGb28gewogICAgdmFyIHggPSAidGVzdDEiOwogICAgdmFyIHkgPSAidGVzdCAyXAppc24ndCB0aGlzIGEgbG90IG9mIGZ1biI7CiAgICB2YXIgeiA9IHdpbmRvdy5kb2N1bWVudDsKfQ== diff --git a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.sourcemap.txt b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.sourcemap.txt index f093c1ee492c8..1e69dfbef8816 100644 --- a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.sourcemap.txt +++ b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.sourcemap.txt @@ -22,7 +22,7 @@ sourceFile:sourceMap-StringLiteralWithNewLine.ts >declare var window: Window; > > -2 >module +2 >namespace 3 > Foo 4 > { > var x = "test1"; @@ -31,8 +31,8 @@ sourceFile:sourceMap-StringLiteralWithNewLine.ts > var z = window.document; > } 1 >Emitted(1, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(8, 8) + SourceIndex(0) -3 >Emitted(1, 8) Source(8, 11) + SourceIndex(0) +2 >Emitted(1, 5) Source(8, 11) + SourceIndex(0) +3 >Emitted(1, 8) Source(8, 14) + SourceIndex(0) 4 >Emitted(1, 9) Source(13, 2) + SourceIndex(0) --- >>>(function (Foo) { @@ -41,11 +41,11 @@ sourceFile:sourceMap-StringLiteralWithNewLine.ts 3 > ^^^ 4 > ^^^^^^^-> 1-> -2 >module +2 >namespace 3 > Foo 1->Emitted(2, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(2, 12) Source(8, 8) + SourceIndex(0) -3 >Emitted(2, 15) Source(8, 11) + SourceIndex(0) +2 >Emitted(2, 12) Source(8, 11) + SourceIndex(0) +3 >Emitted(2, 15) Source(8, 14) + SourceIndex(0) --- >>> var x = "test1"; 1->^^^^ @@ -145,10 +145,10 @@ sourceFile:sourceMap-StringLiteralWithNewLine.ts > } 1 >Emitted(7, 1) Source(13, 1) + SourceIndex(0) 2 >Emitted(7, 2) Source(13, 2) + SourceIndex(0) -3 >Emitted(7, 4) Source(8, 8) + SourceIndex(0) -4 >Emitted(7, 7) Source(8, 11) + SourceIndex(0) -5 >Emitted(7, 12) Source(8, 8) + SourceIndex(0) -6 >Emitted(7, 15) Source(8, 11) + SourceIndex(0) +3 >Emitted(7, 4) Source(8, 11) + SourceIndex(0) +4 >Emitted(7, 7) Source(8, 14) + SourceIndex(0) +5 >Emitted(7, 12) Source(8, 11) + SourceIndex(0) +6 >Emitted(7, 15) Source(8, 14) + SourceIndex(0) 7 >Emitted(7, 23) Source(13, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMap-StringLiteralWithNewLine.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.symbols b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.symbols index eed0cb97ec02f..c4bbe7ce81ca5 100644 --- a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.symbols +++ b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.symbols @@ -15,7 +15,7 @@ declare var window: Window; >window : Symbol(window, Decl(sourceMap-StringLiteralWithNewLine.ts, 5, 11)) >Window : Symbol(Window, Decl(sourceMap-StringLiteralWithNewLine.ts, 1, 1)) -module Foo { +namespace Foo { >Foo : Symbol(Foo, Decl(sourceMap-StringLiteralWithNewLine.ts, 5, 27)) var x = "test1"; diff --git a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.types b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.types index 1f9dc9439812a..3e2d21e4aced1 100644 --- a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.types +++ b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.types @@ -12,7 +12,7 @@ declare var window: Window; >window : Window > : ^^^^^^ -module Foo { +namespace Foo { >Foo : typeof Foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js index c8075d81efee2..1a20fbab15db1 100644 --- a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js +++ b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts] //// //// [sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts] -module Q { +namespace Q { function P() { // Test this var a = 1; diff --git a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map index 53696da9a682f..4762e1d2a4f88 100644 --- a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map +++ b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map @@ -1,3 +1,3 @@ //// [sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map] -{"version":3,"file":"sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js","sourceRoot":"","sources":["sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts"],"names":[],"mappings":"AAAA,IAAO,CAAC,CAKP;AALD,WAAO,CAAC;IACJ,SAAS,CAAC;QACN,YAAY;QACZ,IAAI,CAAC,GAAG,CAAC,CAAC;IACd,CAAC;AACL,CAAC,EALM,CAAC,KAAD,CAAC,QAKP"} -//// https://sokra.github.io/source-map-visualization#base64,dmFyIFE7DQooZnVuY3Rpb24gKFEpIHsNCiAgICBmdW5jdGlvbiBQKCkgew0KICAgICAgICAvLyBUZXN0IHRoaXMNCiAgICAgICAgdmFyIGEgPSAxOw0KICAgIH0NCn0pKFEgfHwgKFEgPSB7fSkpOw0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9c291cmNlTWFwRm9yRnVuY3Rpb25JbkludGVybmFsTW9kdWxlV2l0aENvbW1lbnRQcmVjZWRpbmdTdGF0ZW1lbnQwMS5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlTWFwRm9yRnVuY3Rpb25JbkludGVybmFsTW9kdWxlV2l0aENvbW1lbnRQcmVjZWRpbmdTdGF0ZW1lbnQwMS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInNvdXJjZU1hcEZvckZ1bmN0aW9uSW5JbnRlcm5hbE1vZHVsZVdpdGhDb21tZW50UHJlY2VkaW5nU3RhdGVtZW50MDEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsSUFBTyxDQUFDLENBS1A7QUFMRCxXQUFPLENBQUM7SUFDSixTQUFTLENBQUM7UUFDTixZQUFZO1FBQ1osSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ2QsQ0FBQztBQUNMLENBQUMsRUFMTSxDQUFDLEtBQUQsQ0FBQyxRQUtQIn0=,bW9kdWxlIFEgewogICAgZnVuY3Rpb24gUCgpIHsKICAgICAgICAvLyBUZXN0IHRoaXMKICAgICAgICB2YXIgYSA9IDE7CiAgICB9Cn0= +{"version":3,"file":"sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js","sourceRoot":"","sources":["sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts"],"names":[],"mappings":"AAAA,IAAU,CAAC,CAKV;AALD,WAAU,CAAC;IACP,SAAS,CAAC;QACN,YAAY;QACZ,IAAI,CAAC,GAAG,CAAC,CAAC;IACd,CAAC;AACL,CAAC,EALS,CAAC,KAAD,CAAC,QAKV"} +//// https://sokra.github.io/source-map-visualization#base64,dmFyIFE7DQooZnVuY3Rpb24gKFEpIHsNCiAgICBmdW5jdGlvbiBQKCkgew0KICAgICAgICAvLyBUZXN0IHRoaXMNCiAgICAgICAgdmFyIGEgPSAxOw0KICAgIH0NCn0pKFEgfHwgKFEgPSB7fSkpOw0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9c291cmNlTWFwRm9yRnVuY3Rpb25JbkludGVybmFsTW9kdWxlV2l0aENvbW1lbnRQcmVjZWRpbmdTdGF0ZW1lbnQwMS5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlTWFwRm9yRnVuY3Rpb25JbkludGVybmFsTW9kdWxlV2l0aENvbW1lbnRQcmVjZWRpbmdTdGF0ZW1lbnQwMS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInNvdXJjZU1hcEZvckZ1bmN0aW9uSW5JbnRlcm5hbE1vZHVsZVdpdGhDb21tZW50UHJlY2VkaW5nU3RhdGVtZW50MDEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsSUFBVSxDQUFDLENBS1Y7QUFMRCxXQUFVLENBQUM7SUFDUCxTQUFTLENBQUM7UUFDTixZQUFZO1FBQ1osSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ2QsQ0FBQztBQUNMLENBQUMsRUFMUyxDQUFDLEtBQUQsQ0FBQyxRQUtWIn0=,bmFtZXNwYWNlIFEgewogICAgZnVuY3Rpb24gUCgpIHsKICAgICAgICAvLyBUZXN0IHRoaXMKICAgICAgICB2YXIgYSA9IDE7CiAgICB9Cn0= diff --git a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.sourcemap.txt b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.sourcemap.txt index d8692c74c4b8c..93ba44f98cb6d 100644 --- a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.sourcemap.txt +++ b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.sourcemap.txt @@ -15,7 +15,7 @@ sourceFile:sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.t 4 > ^ 5 > ^^^^^^^^^^-> 1 > -2 >module +2 >namespace 3 > Q 4 > { > function P() { @@ -24,8 +24,8 @@ sourceFile:sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.t > } > } 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 6) Source(1, 9) + SourceIndex(0) +2 >Emitted(1, 5) Source(1, 11) + SourceIndex(0) +3 >Emitted(1, 6) Source(1, 12) + SourceIndex(0) 4 >Emitted(1, 7) Source(6, 2) + SourceIndex(0) --- >>>(function (Q) { @@ -34,11 +34,11 @@ sourceFile:sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.t 3 > ^ 4 > ^^^^^^^-> 1-> -2 >module +2 >namespace 3 > Q 1->Emitted(2, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(2, 12) Source(1, 8) + SourceIndex(0) -3 >Emitted(2, 13) Source(1, 9) + SourceIndex(0) +2 >Emitted(2, 12) Source(1, 11) + SourceIndex(0) +3 >Emitted(2, 13) Source(1, 12) + SourceIndex(0) --- >>> function P() { 1->^^^^ @@ -117,10 +117,10 @@ sourceFile:sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.t > } 1->Emitted(7, 1) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 2) Source(6, 2) + SourceIndex(0) -3 >Emitted(7, 4) Source(1, 8) + SourceIndex(0) -4 >Emitted(7, 5) Source(1, 9) + SourceIndex(0) -5 >Emitted(7, 10) Source(1, 8) + SourceIndex(0) -6 >Emitted(7, 11) Source(1, 9) + SourceIndex(0) +3 >Emitted(7, 4) Source(1, 11) + SourceIndex(0) +4 >Emitted(7, 5) Source(1, 12) + SourceIndex(0) +5 >Emitted(7, 10) Source(1, 11) + SourceIndex(0) +6 >Emitted(7, 11) Source(1, 12) + SourceIndex(0) 7 >Emitted(7, 19) Source(6, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.symbols b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.symbols index 77ca3997a2c46..6442e4f619adf 100644 --- a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.symbols +++ b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts] //// === sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts === -module Q { +namespace Q { >Q : Symbol(Q, Decl(sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts, 0, 0)) function P() { ->P : Symbol(P, Decl(sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts, 0, 10)) +>P : Symbol(P, Decl(sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts, 0, 13)) // Test this var a = 1; diff --git a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.types b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.types index 74d557341ce1f..7757d7a9ef4c7 100644 --- a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.types +++ b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts] //// === sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts === -module Q { +namespace Q { >Q : typeof Q > : ^^^^^^^^ diff --git a/tests/baselines/reference/sourceMapSample.errors.txt b/tests/baselines/reference/sourceMapSample.errors.txt index c82d38a07e4d6..801b3f856c70c 100644 --- a/tests/baselines/reference/sourceMapSample.errors.txt +++ b/tests/baselines/reference/sourceMapSample.errors.txt @@ -2,7 +2,7 @@ sourceMapSample.ts(14,45): error TS2694: Namespace 'Foo.Bar' has no exported mem ==== sourceMapSample.ts (1 errors) ==== - module Foo.Bar { + namespace Foo.Bar { "use strict"; class Greeter { diff --git a/tests/baselines/reference/sourceMapSample.js b/tests/baselines/reference/sourceMapSample.js index a9562e83de499..f32ad96fc8a56 100644 --- a/tests/baselines/reference/sourceMapSample.js +++ b/tests/baselines/reference/sourceMapSample.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/sourceMapSample.ts] //// //// [sourceMapSample.ts] -module Foo.Bar { +namespace Foo.Bar { "use strict"; class Greeter { diff --git a/tests/baselines/reference/sourceMapSample.js.map b/tests/baselines/reference/sourceMapSample.js.map index 1c99394e3549c..ed3f30eebbf55 100644 --- a/tests/baselines/reference/sourceMapSample.js.map +++ b/tests/baselines/reference/sourceMapSample.js.map @@ -1,3 +1,3 @@ //// [sourceMapSample.js.map] -{"version":3,"file":"sourceMapSample.js","sourceRoot":"","sources":["sourceMapSample.ts"],"names":[],"mappings":"AAAA,IAAO,GAAG,CAkCT;AAlCD,WAAO,GAAG;IAAC,IAAA,GAAG,CAkCb;IAlCU,WAAA,GAAG;QACV,YAAY,CAAC;QAEb;YACI,iBAAmB,QAAgB;gBAAhB,aAAQ,GAAR,QAAQ,CAAQ;YACnC,CAAC;YAED,uBAAK,GAAL;gBACI,OAAO,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YAC5C,CAAC;YACL,cAAC;QAAD,CAAC,AAPD,IAOC;QAGD,SAAS,GAAG,CAAC,QAAgB;YACzB,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;QAC3C,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;QAE1B,SAAS,IAAI,CAAC,QAAgB;YAAE,uBAA0B;iBAA1B,UAA0B,EAA1B,qBAA0B,EAA1B,IAA0B;gBAA1B,sCAA0B;;YACtD,IAAI,QAAQ,GAAc,EAAE,CAAC;YAC7B,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;YACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC5C,QAAQ,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,CAAC;YAED,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC;IACL,CAAC,EAlCU,GAAG,GAAH,OAAG,KAAH,OAAG,QAkCb;AAAD,CAAC,EAlCM,GAAG,KAAH,GAAG,QAkCT"} -//// https://sokra.github.io/source-map-visualization#base64,dmFyIEZvbzsNCihmdW5jdGlvbiAoRm9vKSB7DQogICAgdmFyIEJhcjsNCiAgICAoZnVuY3Rpb24gKEJhcikgew0KICAgICAgICAidXNlIHN0cmljdCI7DQogICAgICAgIHZhciBHcmVldGVyID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgZnVuY3Rpb24gR3JlZXRlcihncmVldGluZykgew0KICAgICAgICAgICAgICAgIHRoaXMuZ3JlZXRpbmcgPSBncmVldGluZzsNCiAgICAgICAgICAgIH0NCiAgICAgICAgICAgIEdyZWV0ZXIucHJvdG90eXBlLmdyZWV0ID0gZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgICAgIHJldHVybiAiPGgxPiIgKyB0aGlzLmdyZWV0aW5nICsgIjwvaDE+IjsNCiAgICAgICAgICAgIH07DQogICAgICAgICAgICByZXR1cm4gR3JlZXRlcjsNCiAgICAgICAgfSgpKTsNCiAgICAgICAgZnVuY3Rpb24gZm9vKGdyZWV0aW5nKSB7DQogICAgICAgICAgICByZXR1cm4gbmV3IEdyZWV0ZXIoZ3JlZXRpbmcpOw0KICAgICAgICB9DQogICAgICAgIHZhciBncmVldGVyID0gbmV3IEdyZWV0ZXIoIkhlbGxvLCB3b3JsZCEiKTsNCiAgICAgICAgdmFyIHN0ciA9IGdyZWV0ZXIuZ3JlZXQoKTsNCiAgICAgICAgZnVuY3Rpb24gZm9vMihncmVldGluZykgew0KICAgICAgICAgICAgdmFyIHJlc3RHcmVldGluZ3MgPSBbXTsNCiAgICAgICAgICAgIGZvciAodmFyIF9pID0gMTsgX2kgPCBhcmd1bWVudHMubGVuZ3RoOyBfaSsrKSB7DQogICAgICAgICAgICAgICAgcmVzdEdyZWV0aW5nc1tfaSAtIDFdID0gYXJndW1lbnRzW19pXTsNCiAgICAgICAgICAgIH0NCiAgICAgICAgICAgIHZhciBncmVldGVycyA9IFtdOw0KICAgICAgICAgICAgZ3JlZXRlcnNbMF0gPSBuZXcgR3JlZXRlcihncmVldGluZyk7DQogICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHJlc3RHcmVldGluZ3MubGVuZ3RoOyBpKyspIHsNCiAgICAgICAgICAgICAgICBncmVldGVycy5wdXNoKG5ldyBHcmVldGVyKHJlc3RHcmVldGluZ3NbaV0pKTsNCiAgICAgICAgICAgIH0NCiAgICAgICAgICAgIHJldHVybiBncmVldGVyczsNCiAgICAgICAgfQ0KICAgICAgICB2YXIgYiA9IGZvbzIoIkhlbGxvIiwgIldvcmxkIiwgIiEiKTsNCiAgICAgICAgZm9yICh2YXIgaiA9IDA7IGogPCBiLmxlbmd0aDsgaisrKSB7DQogICAgICAgICAgICBiW2pdLmdyZWV0KCk7DQogICAgICAgIH0NCiAgICB9KShCYXIgPSBGb28uQmFyIHx8IChGb28uQmFyID0ge30pKTsNCn0pKEZvbyB8fCAoRm9vID0ge30pKTsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPXNvdXJjZU1hcFNhbXBsZS5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlTWFwU2FtcGxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsic291cmNlTWFwU2FtcGxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLElBQU8sR0FBRyxDQWtDVDtBQWxDRCxXQUFPLEdBQUc7SUFBQyxJQUFBLEdBQUcsQ0FrQ2I7SUFsQ1UsV0FBQSxHQUFHO1FBQ1YsWUFBWSxDQUFDO1FBRWI7WUFDSSxpQkFBbUIsUUFBZ0I7Z0JBQWhCLGFBQVEsR0FBUixRQUFRLENBQVE7WUFDbkMsQ0FBQztZQUVELHVCQUFLLEdBQUw7Z0JBQ0ksT0FBTyxNQUFNLEdBQUcsSUFBSSxDQUFDLFFBQVEsR0FBRyxPQUFPLENBQUM7WUFDNUMsQ0FBQztZQUNMLGNBQUM7UUFBRCxDQUFDLEFBUEQsSUFPQztRQUdELFNBQVMsR0FBRyxDQUFDLFFBQWdCO1lBQ3pCLE9BQU8sSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDakMsQ0FBQztRQUVELElBQUksT0FBTyxHQUFHLElBQUksT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQzNDLElBQUksR0FBRyxHQUFHLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUUxQixTQUFTLElBQUksQ0FBQyxRQUFnQjtZQUFFLHVCQUEwQjtpQkFBMUIsVUFBMEIsRUFBMUIscUJBQTBCLEVBQTFCLElBQTBCO2dCQUExQixzQ0FBMEI7O1lBQ3RELElBQUksUUFBUSxHQUFjLEVBQUUsQ0FBQztZQUM3QixRQUFRLENBQUMsQ0FBQyxDQUFDLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDcEMsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLGFBQWEsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztnQkFDNUMsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLE9BQU8sQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ2pELENBQUM7WUFFRCxPQUFPLFFBQVEsQ0FBQztRQUNwQixDQUFDO1FBRUQsSUFBSSxDQUFDLEdBQUcsSUFBSSxDQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsR0FBRyxDQUFDLENBQUM7UUFDcEMsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztZQUNoQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDakIsQ0FBQztJQUNMLENBQUMsRUFsQ1UsR0FBRyxHQUFILE9BQUcsS0FBSCxPQUFHLFFBa0NiO0FBQUQsQ0FBQyxFQWxDTSxHQUFHLEtBQUgsR0FBRyxRQWtDVCJ9,bW9kdWxlIEZvby5CYXIgewogICAgInVzZSBzdHJpY3QiOwoKICAgIGNsYXNzIEdyZWV0ZXIgewogICAgICAgIGNvbnN0cnVjdG9yKHB1YmxpYyBncmVldGluZzogc3RyaW5nKSB7CiAgICAgICAgfQoKICAgICAgICBncmVldCgpIHsKICAgICAgICAgICAgcmV0dXJuICI8aDE+IiArIHRoaXMuZ3JlZXRpbmcgKyAiPC9oMT4iOwogICAgICAgIH0KICAgIH0KCgogICAgZnVuY3Rpb24gZm9vKGdyZWV0aW5nOiBzdHJpbmcpOiBGb28uQmFyLkdyZWV0ZXIgewogICAgICAgIHJldHVybiBuZXcgR3JlZXRlcihncmVldGluZyk7CiAgICB9CgogICAgdmFyIGdyZWV0ZXIgPSBuZXcgR3JlZXRlcigiSGVsbG8sIHdvcmxkISIpOwogICAgdmFyIHN0ciA9IGdyZWV0ZXIuZ3JlZXQoKTsKCiAgICBmdW5jdGlvbiBmb28yKGdyZWV0aW5nOiBzdHJpbmcsIC4uLnJlc3RHcmVldGluZ3M6IHN0cmluZ1tdKSB7CiAgICAgICAgdmFyIGdyZWV0ZXJzOiBHcmVldGVyW10gPSBbXTsKICAgICAgICBncmVldGVyc1swXSA9IG5ldyBHcmVldGVyKGdyZWV0aW5nKTsKICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHJlc3RHcmVldGluZ3MubGVuZ3RoOyBpKyspIHsKICAgICAgICAgICAgZ3JlZXRlcnMucHVzaChuZXcgR3JlZXRlcihyZXN0R3JlZXRpbmdzW2ldKSk7CiAgICAgICAgfQoKICAgICAgICByZXR1cm4gZ3JlZXRlcnM7CiAgICB9CgogICAgdmFyIGIgPSBmb28yKCJIZWxsbyIsICJXb3JsZCIsICIhIik7CiAgICBmb3IgKHZhciBqID0gMDsgaiA8IGIubGVuZ3RoOyBqKyspIHsKICAgICAgICBiW2pdLmdyZWV0KCk7CiAgICB9Cn0= +{"version":3,"file":"sourceMapSample.js","sourceRoot":"","sources":["sourceMapSample.ts"],"names":[],"mappings":"AAAA,IAAU,GAAG,CAkCZ;AAlCD,WAAU,GAAG;IAAC,IAAA,GAAG,CAkChB;IAlCa,WAAA,GAAG;QACb,YAAY,CAAC;QAEb;YACI,iBAAmB,QAAgB;gBAAhB,aAAQ,GAAR,QAAQ,CAAQ;YACnC,CAAC;YAED,uBAAK,GAAL;gBACI,OAAO,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YAC5C,CAAC;YACL,cAAC;QAAD,CAAC,AAPD,IAOC;QAGD,SAAS,GAAG,CAAC,QAAgB;YACzB,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;QAC3C,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;QAE1B,SAAS,IAAI,CAAC,QAAgB;YAAE,uBAA0B;iBAA1B,UAA0B,EAA1B,qBAA0B,EAA1B,IAA0B;gBAA1B,sCAA0B;;YACtD,IAAI,QAAQ,GAAc,EAAE,CAAC;YAC7B,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;YACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC5C,QAAQ,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,CAAC;YAED,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC;IACL,CAAC,EAlCa,GAAG,GAAH,OAAG,KAAH,OAAG,QAkChB;AAAD,CAAC,EAlCS,GAAG,KAAH,GAAG,QAkCZ"} +//// https://sokra.github.io/source-map-visualization#base64,dmFyIEZvbzsNCihmdW5jdGlvbiAoRm9vKSB7DQogICAgdmFyIEJhcjsNCiAgICAoZnVuY3Rpb24gKEJhcikgew0KICAgICAgICAidXNlIHN0cmljdCI7DQogICAgICAgIHZhciBHcmVldGVyID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgZnVuY3Rpb24gR3JlZXRlcihncmVldGluZykgew0KICAgICAgICAgICAgICAgIHRoaXMuZ3JlZXRpbmcgPSBncmVldGluZzsNCiAgICAgICAgICAgIH0NCiAgICAgICAgICAgIEdyZWV0ZXIucHJvdG90eXBlLmdyZWV0ID0gZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgICAgIHJldHVybiAiPGgxPiIgKyB0aGlzLmdyZWV0aW5nICsgIjwvaDE+IjsNCiAgICAgICAgICAgIH07DQogICAgICAgICAgICByZXR1cm4gR3JlZXRlcjsNCiAgICAgICAgfSgpKTsNCiAgICAgICAgZnVuY3Rpb24gZm9vKGdyZWV0aW5nKSB7DQogICAgICAgICAgICByZXR1cm4gbmV3IEdyZWV0ZXIoZ3JlZXRpbmcpOw0KICAgICAgICB9DQogICAgICAgIHZhciBncmVldGVyID0gbmV3IEdyZWV0ZXIoIkhlbGxvLCB3b3JsZCEiKTsNCiAgICAgICAgdmFyIHN0ciA9IGdyZWV0ZXIuZ3JlZXQoKTsNCiAgICAgICAgZnVuY3Rpb24gZm9vMihncmVldGluZykgew0KICAgICAgICAgICAgdmFyIHJlc3RHcmVldGluZ3MgPSBbXTsNCiAgICAgICAgICAgIGZvciAodmFyIF9pID0gMTsgX2kgPCBhcmd1bWVudHMubGVuZ3RoOyBfaSsrKSB7DQogICAgICAgICAgICAgICAgcmVzdEdyZWV0aW5nc1tfaSAtIDFdID0gYXJndW1lbnRzW19pXTsNCiAgICAgICAgICAgIH0NCiAgICAgICAgICAgIHZhciBncmVldGVycyA9IFtdOw0KICAgICAgICAgICAgZ3JlZXRlcnNbMF0gPSBuZXcgR3JlZXRlcihncmVldGluZyk7DQogICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHJlc3RHcmVldGluZ3MubGVuZ3RoOyBpKyspIHsNCiAgICAgICAgICAgICAgICBncmVldGVycy5wdXNoKG5ldyBHcmVldGVyKHJlc3RHcmVldGluZ3NbaV0pKTsNCiAgICAgICAgICAgIH0NCiAgICAgICAgICAgIHJldHVybiBncmVldGVyczsNCiAgICAgICAgfQ0KICAgICAgICB2YXIgYiA9IGZvbzIoIkhlbGxvIiwgIldvcmxkIiwgIiEiKTsNCiAgICAgICAgZm9yICh2YXIgaiA9IDA7IGogPCBiLmxlbmd0aDsgaisrKSB7DQogICAgICAgICAgICBiW2pdLmdyZWV0KCk7DQogICAgICAgIH0NCiAgICB9KShCYXIgPSBGb28uQmFyIHx8IChGb28uQmFyID0ge30pKTsNCn0pKEZvbyB8fCAoRm9vID0ge30pKTsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPXNvdXJjZU1hcFNhbXBsZS5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlTWFwU2FtcGxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsic291cmNlTWFwU2FtcGxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLElBQVUsR0FBRyxDQWtDWjtBQWxDRCxXQUFVLEdBQUc7SUFBQyxJQUFBLEdBQUcsQ0FrQ2hCO0lBbENhLFdBQUEsR0FBRztRQUNiLFlBQVksQ0FBQztRQUViO1lBQ0ksaUJBQW1CLFFBQWdCO2dCQUFoQixhQUFRLEdBQVIsUUFBUSxDQUFRO1lBQ25DLENBQUM7WUFFRCx1QkFBSyxHQUFMO2dCQUNJLE9BQU8sTUFBTSxHQUFHLElBQUksQ0FBQyxRQUFRLEdBQUcsT0FBTyxDQUFDO1lBQzVDLENBQUM7WUFDTCxjQUFDO1FBQUQsQ0FBQyxBQVBELElBT0M7UUFHRCxTQUFTLEdBQUcsQ0FBQyxRQUFnQjtZQUN6QixPQUFPLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ2pDLENBQUM7UUFFRCxJQUFJLE9BQU8sR0FBRyxJQUFJLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQztRQUMzQyxJQUFJLEdBQUcsR0FBRyxPQUFPLENBQUMsS0FBSyxFQUFFLENBQUM7UUFFMUIsU0FBUyxJQUFJLENBQUMsUUFBZ0I7WUFBRSx1QkFBMEI7aUJBQTFCLFVBQTBCLEVBQTFCLHFCQUEwQixFQUExQixJQUEwQjtnQkFBMUIsc0NBQTBCOztZQUN0RCxJQUFJLFFBQVEsR0FBYyxFQUFFLENBQUM7WUFDN0IsUUFBUSxDQUFDLENBQUMsQ0FBQyxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ3BDLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxhQUFhLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUM7Z0JBQzVDLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxPQUFPLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUNqRCxDQUFDO1lBRUQsT0FBTyxRQUFRLENBQUM7UUFDcEIsQ0FBQztRQUVELElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxPQUFPLEVBQUUsT0FBTyxFQUFFLEdBQUcsQ0FBQyxDQUFDO1FBQ3BDLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUM7WUFDaEMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ2pCLENBQUM7SUFDTCxDQUFDLEVBbENhLEdBQUcsR0FBSCxPQUFHLEtBQUgsT0FBRyxRQWtDaEI7QUFBRCxDQUFDLEVBbENTLEdBQUcsS0FBSCxHQUFHLFFBa0NaIn0=,bmFtZXNwYWNlIEZvby5CYXIgewogICAgInVzZSBzdHJpY3QiOwoKICAgIGNsYXNzIEdyZWV0ZXIgewogICAgICAgIGNvbnN0cnVjdG9yKHB1YmxpYyBncmVldGluZzogc3RyaW5nKSB7CiAgICAgICAgfQoKICAgICAgICBncmVldCgpIHsKICAgICAgICAgICAgcmV0dXJuICI8aDE+IiArIHRoaXMuZ3JlZXRpbmcgKyAiPC9oMT4iOwogICAgICAgIH0KICAgIH0KCgogICAgZnVuY3Rpb24gZm9vKGdyZWV0aW5nOiBzdHJpbmcpOiBGb28uQmFyLkdyZWV0ZXIgewogICAgICAgIHJldHVybiBuZXcgR3JlZXRlcihncmVldGluZyk7CiAgICB9CgogICAgdmFyIGdyZWV0ZXIgPSBuZXcgR3JlZXRlcigiSGVsbG8sIHdvcmxkISIpOwogICAgdmFyIHN0ciA9IGdyZWV0ZXIuZ3JlZXQoKTsKCiAgICBmdW5jdGlvbiBmb28yKGdyZWV0aW5nOiBzdHJpbmcsIC4uLnJlc3RHcmVldGluZ3M6IHN0cmluZ1tdKSB7CiAgICAgICAgdmFyIGdyZWV0ZXJzOiBHcmVldGVyW10gPSBbXTsKICAgICAgICBncmVldGVyc1swXSA9IG5ldyBHcmVldGVyKGdyZWV0aW5nKTsKICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHJlc3RHcmVldGluZ3MubGVuZ3RoOyBpKyspIHsKICAgICAgICAgICAgZ3JlZXRlcnMucHVzaChuZXcgR3JlZXRlcihyZXN0R3JlZXRpbmdzW2ldKSk7CiAgICAgICAgfQoKICAgICAgICByZXR1cm4gZ3JlZXRlcnM7CiAgICB9CgogICAgdmFyIGIgPSBmb28yKCJIZWxsbyIsICJXb3JsZCIsICIhIik7CiAgICBmb3IgKHZhciBqID0gMDsgaiA8IGIubGVuZ3RoOyBqKyspIHsKICAgICAgICBiW2pdLmdyZWV0KCk7CiAgICB9Cn0= diff --git a/tests/baselines/reference/sourceMapSample.sourcemap.txt b/tests/baselines/reference/sourceMapSample.sourcemap.txt index e9ff61c15f031..9f413cff54e02 100644 --- a/tests/baselines/reference/sourceMapSample.sourcemap.txt +++ b/tests/baselines/reference/sourceMapSample.sourcemap.txt @@ -15,7 +15,7 @@ sourceFile:sourceMapSample.ts 4 > ^ 5 > ^^^^^^^^^^-> 1 > -2 >module +2 >namespace 3 > Foo 4 > .Bar { > "use strict"; @@ -53,8 +53,8 @@ sourceFile:sourceMapSample.ts > } > } 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 8) Source(1, 11) + SourceIndex(0) +2 >Emitted(1, 5) Source(1, 11) + SourceIndex(0) +3 >Emitted(1, 8) Source(1, 14) + SourceIndex(0) 4 >Emitted(1, 9) Source(35, 2) + SourceIndex(0) --- >>>(function (Foo) { @@ -62,11 +62,11 @@ sourceFile:sourceMapSample.ts 2 >^^^^^^^^^^^ 3 > ^^^ 1-> -2 >module +2 >namespace 3 > Foo 1->Emitted(2, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(2, 12) Source(1, 8) + SourceIndex(0) -3 >Emitted(2, 15) Source(1, 11) + SourceIndex(0) +2 >Emitted(2, 12) Source(1, 11) + SourceIndex(0) +3 >Emitted(2, 15) Source(1, 14) + SourceIndex(0) --- >>> var Bar; 1 >^^^^ @@ -112,9 +112,9 @@ sourceFile:sourceMapSample.ts > b[j].greet(); > } > } -1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(3, 9) Source(1, 12) + SourceIndex(0) -3 >Emitted(3, 12) Source(1, 15) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 15) + SourceIndex(0) +2 >Emitted(3, 9) Source(1, 15) + SourceIndex(0) +3 >Emitted(3, 12) Source(1, 18) + SourceIndex(0) 4 >Emitted(3, 13) Source(35, 2) + SourceIndex(0) --- >>> (function (Bar) { @@ -125,9 +125,9 @@ sourceFile:sourceMapSample.ts 1-> 2 > 3 > Bar -1->Emitted(4, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(4, 16) Source(1, 12) + SourceIndex(0) -3 >Emitted(4, 19) Source(1, 15) + SourceIndex(0) +1->Emitted(4, 5) Source(1, 15) + SourceIndex(0) +2 >Emitted(4, 16) Source(1, 15) + SourceIndex(0) +3 >Emitted(4, 19) Source(1, 18) + SourceIndex(0) --- >>> "use strict"; 1->^^^^^^^^ @@ -853,12 +853,12 @@ sourceFile:sourceMapSample.ts > } 1->Emitted(36, 5) Source(35, 1) + SourceIndex(0) 2 >Emitted(36, 6) Source(35, 2) + SourceIndex(0) -3 >Emitted(36, 8) Source(1, 12) + SourceIndex(0) -4 >Emitted(36, 11) Source(1, 15) + SourceIndex(0) -5 >Emitted(36, 14) Source(1, 12) + SourceIndex(0) -6 >Emitted(36, 21) Source(1, 15) + SourceIndex(0) -7 >Emitted(36, 26) Source(1, 12) + SourceIndex(0) -8 >Emitted(36, 33) Source(1, 15) + SourceIndex(0) +3 >Emitted(36, 8) Source(1, 15) + SourceIndex(0) +4 >Emitted(36, 11) Source(1, 18) + SourceIndex(0) +5 >Emitted(36, 14) Source(1, 15) + SourceIndex(0) +6 >Emitted(36, 21) Source(1, 18) + SourceIndex(0) +7 >Emitted(36, 26) Source(1, 15) + SourceIndex(0) +8 >Emitted(36, 33) Source(1, 18) + SourceIndex(0) 9 >Emitted(36, 41) Source(35, 2) + SourceIndex(0) --- >>>})(Foo || (Foo = {})); @@ -913,10 +913,10 @@ sourceFile:sourceMapSample.ts > } 1 >Emitted(37, 1) Source(35, 1) + SourceIndex(0) 2 >Emitted(37, 2) Source(35, 2) + SourceIndex(0) -3 >Emitted(37, 4) Source(1, 8) + SourceIndex(0) -4 >Emitted(37, 7) Source(1, 11) + SourceIndex(0) -5 >Emitted(37, 12) Source(1, 8) + SourceIndex(0) -6 >Emitted(37, 15) Source(1, 11) + SourceIndex(0) +3 >Emitted(37, 4) Source(1, 11) + SourceIndex(0) +4 >Emitted(37, 7) Source(1, 14) + SourceIndex(0) +5 >Emitted(37, 12) Source(1, 11) + SourceIndex(0) +6 >Emitted(37, 15) Source(1, 14) + SourceIndex(0) 7 >Emitted(37, 23) Source(35, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMapSample.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapSample.symbols b/tests/baselines/reference/sourceMapSample.symbols index 6517e51449b76..a40fc1f61f714 100644 --- a/tests/baselines/reference/sourceMapSample.symbols +++ b/tests/baselines/reference/sourceMapSample.symbols @@ -1,9 +1,9 @@ //// [tests/cases/compiler/sourceMapSample.ts] //// === sourceMapSample.ts === -module Foo.Bar { +namespace Foo.Bar { >Foo : Symbol(Foo, Decl(sourceMapSample.ts, 0, 0)) ->Bar : Symbol(Bar, Decl(sourceMapSample.ts, 0, 11)) +>Bar : Symbol(Bar, Decl(sourceMapSample.ts, 0, 14)) "use strict"; @@ -29,7 +29,7 @@ module Foo.Bar { >foo : Symbol(foo, Decl(sourceMapSample.ts, 10, 5)) >greeting : Symbol(greeting, Decl(sourceMapSample.ts, 13, 17)) >Foo : Symbol(Foo, Decl(sourceMapSample.ts, 0, 0)) ->Bar : Symbol(Bar, Decl(sourceMapSample.ts, 0, 11)) +>Bar : Symbol(Bar, Decl(sourceMapSample.ts, 0, 14)) >Greeter : Symbol(Foo.Bar.Greeter) return new Greeter(greeting); diff --git a/tests/baselines/reference/sourceMapSample.types b/tests/baselines/reference/sourceMapSample.types index 18833168898e4..6636fd0b6a3b1 100644 --- a/tests/baselines/reference/sourceMapSample.types +++ b/tests/baselines/reference/sourceMapSample.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/sourceMapSample.ts] //// === sourceMapSample.ts === -module Foo.Bar { +namespace Foo.Bar { >Foo : typeof Foo > : ^^^^^^^^^^ >Bar : typeof Bar diff --git a/tests/baselines/reference/sourceMapValidationClasses.js b/tests/baselines/reference/sourceMapValidationClasses.js index 221dac3680800..e0e733787b5aa 100644 --- a/tests/baselines/reference/sourceMapValidationClasses.js +++ b/tests/baselines/reference/sourceMapValidationClasses.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/sourceMapValidationClasses.ts] //// //// [sourceMapValidationClasses.ts] -module Foo.Bar { +namespace Foo.Bar { "use strict"; class Greeter { diff --git a/tests/baselines/reference/sourceMapValidationClasses.js.map b/tests/baselines/reference/sourceMapValidationClasses.js.map index 1a91e9d67725e..3417dec27e035 100644 --- a/tests/baselines/reference/sourceMapValidationClasses.js.map +++ b/tests/baselines/reference/sourceMapValidationClasses.js.map @@ -1,3 +1,3 @@ //// [sourceMapValidationClasses.js.map] -{"version":3,"file":"sourceMapValidationClasses.js","sourceRoot":"","sources":["sourceMapValidationClasses.ts"],"names":[],"mappings":"AAAA,IAAO,GAAG,CAmCT;AAnCD,WAAO,GAAG;IAAC,IAAA,GAAG,CAmCb;IAnCU,WAAA,GAAG;QACV,YAAY,CAAC;QAEb;YACI,iBAAmB,QAAgB;gBAAhB,aAAQ,GAAR,QAAQ,CAAQ;YACnC,CAAC;YAED,uBAAK,GAAL;gBACI,OAAO,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YAC5C,CAAC;YACL,cAAC;QAAD,CAAC,AAPD,IAOC;QAGD,SAAS,GAAG,CAAC,QAAgB;YACzB,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;QAC3C,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;QAE1B,SAAS,IAAI,CAAC,QAAgB;YAAE,kBAAiB,mBAAmB,MAAU;iBAA9C,UAA8C,EAA9C,qBAA8C,EAA9C,IAA8C;gBAA9C,sCAA8C;;YAC1E,IAAI,QAAQ,GAAc,EAAE,CAAC,CAAC,0BAA0B;YACxD,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;YACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC5C,QAAQ,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,CAAC;YAED,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QACpC,qCAAqC;QACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC;IACL,CAAC,EAnCU,GAAG,GAAH,OAAG,KAAH,OAAG,QAmCb;AAAD,CAAC,EAnCM,GAAG,KAAH,GAAG,QAmCT"} -//// https://sokra.github.io/source-map-visualization#base64,dmFyIEZvbzsNCihmdW5jdGlvbiAoRm9vKSB7DQogICAgdmFyIEJhcjsNCiAgICAoZnVuY3Rpb24gKEJhcikgew0KICAgICAgICAidXNlIHN0cmljdCI7DQogICAgICAgIHZhciBHcmVldGVyID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgZnVuY3Rpb24gR3JlZXRlcihncmVldGluZykgew0KICAgICAgICAgICAgICAgIHRoaXMuZ3JlZXRpbmcgPSBncmVldGluZzsNCiAgICAgICAgICAgIH0NCiAgICAgICAgICAgIEdyZWV0ZXIucHJvdG90eXBlLmdyZWV0ID0gZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgICAgIHJldHVybiAiPGgxPiIgKyB0aGlzLmdyZWV0aW5nICsgIjwvaDE+IjsNCiAgICAgICAgICAgIH07DQogICAgICAgICAgICByZXR1cm4gR3JlZXRlcjsNCiAgICAgICAgfSgpKTsNCiAgICAgICAgZnVuY3Rpb24gZm9vKGdyZWV0aW5nKSB7DQogICAgICAgICAgICByZXR1cm4gbmV3IEdyZWV0ZXIoZ3JlZXRpbmcpOw0KICAgICAgICB9DQogICAgICAgIHZhciBncmVldGVyID0gbmV3IEdyZWV0ZXIoIkhlbGxvLCB3b3JsZCEiKTsNCiAgICAgICAgdmFyIHN0ciA9IGdyZWV0ZXIuZ3JlZXQoKTsNCiAgICAgICAgZnVuY3Rpb24gZm9vMihncmVldGluZykgew0KICAgICAgICAgICAgdmFyIHJlc3RHcmVldGluZ3MgLyogbW9yZSBncmVldGluZyAqLyA9IFtdOw0KICAgICAgICAgICAgZm9yICh2YXIgX2kgPSAxOyBfaSA8IGFyZ3VtZW50cy5sZW5ndGg7IF9pKyspIHsNCiAgICAgICAgICAgICAgICByZXN0R3JlZXRpbmdzW19pIC0gMV0gPSBhcmd1bWVudHNbX2ldOw0KICAgICAgICAgICAgfQ0KICAgICAgICAgICAgdmFyIGdyZWV0ZXJzID0gW107IC8qIGlubGluZSBibG9jayBjb21tZW50ICovDQogICAgICAgICAgICBncmVldGVyc1swXSA9IG5ldyBHcmVldGVyKGdyZWV0aW5nKTsNCiAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcmVzdEdyZWV0aW5ncy5sZW5ndGg7IGkrKykgew0KICAgICAgICAgICAgICAgIGdyZWV0ZXJzLnB1c2gobmV3IEdyZWV0ZXIocmVzdEdyZWV0aW5nc1tpXSkpOw0KICAgICAgICAgICAgfQ0KICAgICAgICAgICAgcmV0dXJuIGdyZWV0ZXJzOw0KICAgICAgICB9DQogICAgICAgIHZhciBiID0gZm9vMigiSGVsbG8iLCAiV29ybGQiLCAiISIpOw0KICAgICAgICAvLyBUaGlzIGlzIHNpbXBsZSBzaWdubGUgbGluZSBjb21tZW50DQogICAgICAgIGZvciAodmFyIGogPSAwOyBqIDwgYi5sZW5ndGg7IGorKykgew0KICAgICAgICAgICAgYltqXS5ncmVldCgpOw0KICAgICAgICB9DQogICAgfSkoQmFyID0gRm9vLkJhciB8fCAoRm9vLkJhciA9IHt9KSk7DQp9KShGb28gfHwgKEZvbyA9IHt9KSk7DQovLyMgc291cmNlTWFwcGluZ1VSTD1zb3VyY2VNYXBWYWxpZGF0aW9uQ2xhc3Nlcy5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlTWFwVmFsaWRhdGlvbkNsYXNzZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJzb3VyY2VNYXBWYWxpZGF0aW9uQ2xhc3Nlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxJQUFPLEdBQUcsQ0FtQ1Q7QUFuQ0QsV0FBTyxHQUFHO0lBQUMsSUFBQSxHQUFHLENBbUNiO0lBbkNVLFdBQUEsR0FBRztRQUNWLFlBQVksQ0FBQztRQUViO1lBQ0ksaUJBQW1CLFFBQWdCO2dCQUFoQixhQUFRLEdBQVIsUUFBUSxDQUFRO1lBQ25DLENBQUM7WUFFRCx1QkFBSyxHQUFMO2dCQUNJLE9BQU8sTUFBTSxHQUFHLElBQUksQ0FBQyxRQUFRLEdBQUcsT0FBTyxDQUFDO1lBQzVDLENBQUM7WUFDTCxjQUFDO1FBQUQsQ0FBQyxBQVBELElBT0M7UUFHRCxTQUFTLEdBQUcsQ0FBQyxRQUFnQjtZQUN6QixPQUFPLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ2pDLENBQUM7UUFFRCxJQUFJLE9BQU8sR0FBRyxJQUFJLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQztRQUMzQyxJQUFJLEdBQUcsR0FBRyxPQUFPLENBQUMsS0FBSyxFQUFFLENBQUM7UUFFMUIsU0FBUyxJQUFJLENBQUMsUUFBZ0I7WUFBRSxrQkFBaUIsbUJBQW1CLE1BQVU7aUJBQTlDLFVBQThDLEVBQTlDLHFCQUE4QyxFQUE5QyxJQUE4QztnQkFBOUMsc0NBQThDOztZQUMxRSxJQUFJLFFBQVEsR0FBYyxFQUFFLENBQUMsQ0FBQywwQkFBMEI7WUFDeEQsUUFBUSxDQUFDLENBQUMsQ0FBQyxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ3BDLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxhQUFhLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUM7Z0JBQzVDLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxPQUFPLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUNqRCxDQUFDO1lBRUQsT0FBTyxRQUFRLENBQUM7UUFDcEIsQ0FBQztRQUVELElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxPQUFPLEVBQUUsT0FBTyxFQUFFLEdBQUcsQ0FBQyxDQUFDO1FBQ3BDLHFDQUFxQztRQUNyQyxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQ2hDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNqQixDQUFDO0lBQ0wsQ0FBQyxFQW5DVSxHQUFHLEdBQUgsT0FBRyxLQUFILE9BQUcsUUFtQ2I7QUFBRCxDQUFDLEVBbkNNLEdBQUcsS0FBSCxHQUFHLFFBbUNUIn0=,bW9kdWxlIEZvby5CYXIgewogICAgInVzZSBzdHJpY3QiOwoKICAgIGNsYXNzIEdyZWV0ZXIgewogICAgICAgIGNvbnN0cnVjdG9yKHB1YmxpYyBncmVldGluZzogc3RyaW5nKSB7CiAgICAgICAgfQoKICAgICAgICBncmVldCgpIHsKICAgICAgICAgICAgcmV0dXJuICI8aDE+IiArIHRoaXMuZ3JlZXRpbmcgKyAiPC9oMT4iOwogICAgICAgIH0KICAgIH0KCgogICAgZnVuY3Rpb24gZm9vKGdyZWV0aW5nOiBzdHJpbmcpOiBHcmVldGVyIHsKICAgICAgICByZXR1cm4gbmV3IEdyZWV0ZXIoZ3JlZXRpbmcpOwogICAgfQoKICAgIHZhciBncmVldGVyID0gbmV3IEdyZWV0ZXIoIkhlbGxvLCB3b3JsZCEiKTsKICAgIHZhciBzdHIgPSBncmVldGVyLmdyZWV0KCk7CgogICAgZnVuY3Rpb24gZm9vMihncmVldGluZzogc3RyaW5nLCAuLi5yZXN0R3JlZXRpbmdzIC8qIG1vcmUgZ3JlZXRpbmcgKi86IHN0cmluZ1tdKSB7CiAgICAgICAgdmFyIGdyZWV0ZXJzOiBHcmVldGVyW10gPSBbXTsgLyogaW5saW5lIGJsb2NrIGNvbW1lbnQgKi8KICAgICAgICBncmVldGVyc1swXSA9IG5ldyBHcmVldGVyKGdyZWV0aW5nKTsKICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHJlc3RHcmVldGluZ3MubGVuZ3RoOyBpKyspIHsKICAgICAgICAgICAgZ3JlZXRlcnMucHVzaChuZXcgR3JlZXRlcihyZXN0R3JlZXRpbmdzW2ldKSk7CiAgICAgICAgfQoKICAgICAgICByZXR1cm4gZ3JlZXRlcnM7CiAgICB9CgogICAgdmFyIGIgPSBmb28yKCJIZWxsbyIsICJXb3JsZCIsICIhIik7CiAgICAvLyBUaGlzIGlzIHNpbXBsZSBzaWdubGUgbGluZSBjb21tZW50CiAgICBmb3IgKHZhciBqID0gMDsgaiA8IGIubGVuZ3RoOyBqKyspIHsKICAgICAgICBiW2pdLmdyZWV0KCk7CiAgICB9Cn0= +{"version":3,"file":"sourceMapValidationClasses.js","sourceRoot":"","sources":["sourceMapValidationClasses.ts"],"names":[],"mappings":"AAAA,IAAU,GAAG,CAmCZ;AAnCD,WAAU,GAAG;IAAC,IAAA,GAAG,CAmChB;IAnCa,WAAA,GAAG;QACb,YAAY,CAAC;QAEb;YACI,iBAAmB,QAAgB;gBAAhB,aAAQ,GAAR,QAAQ,CAAQ;YACnC,CAAC;YAED,uBAAK,GAAL;gBACI,OAAO,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YAC5C,CAAC;YACL,cAAC;QAAD,CAAC,AAPD,IAOC;QAGD,SAAS,GAAG,CAAC,QAAgB;YACzB,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;QAC3C,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;QAE1B,SAAS,IAAI,CAAC,QAAgB;YAAE,kBAAiB,mBAAmB,MAAU;iBAA9C,UAA8C,EAA9C,qBAA8C,EAA9C,IAA8C;gBAA9C,sCAA8C;;YAC1E,IAAI,QAAQ,GAAc,EAAE,CAAC,CAAC,0BAA0B;YACxD,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;YACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC5C,QAAQ,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,CAAC;YAED,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QACpC,qCAAqC;QACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC;IACL,CAAC,EAnCa,GAAG,GAAH,OAAG,KAAH,OAAG,QAmChB;AAAD,CAAC,EAnCS,GAAG,KAAH,GAAG,QAmCZ"} +//// https://sokra.github.io/source-map-visualization#base64,dmFyIEZvbzsNCihmdW5jdGlvbiAoRm9vKSB7DQogICAgdmFyIEJhcjsNCiAgICAoZnVuY3Rpb24gKEJhcikgew0KICAgICAgICAidXNlIHN0cmljdCI7DQogICAgICAgIHZhciBHcmVldGVyID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgZnVuY3Rpb24gR3JlZXRlcihncmVldGluZykgew0KICAgICAgICAgICAgICAgIHRoaXMuZ3JlZXRpbmcgPSBncmVldGluZzsNCiAgICAgICAgICAgIH0NCiAgICAgICAgICAgIEdyZWV0ZXIucHJvdG90eXBlLmdyZWV0ID0gZnVuY3Rpb24gKCkgew0KICAgICAgICAgICAgICAgIHJldHVybiAiPGgxPiIgKyB0aGlzLmdyZWV0aW5nICsgIjwvaDE+IjsNCiAgICAgICAgICAgIH07DQogICAgICAgICAgICByZXR1cm4gR3JlZXRlcjsNCiAgICAgICAgfSgpKTsNCiAgICAgICAgZnVuY3Rpb24gZm9vKGdyZWV0aW5nKSB7DQogICAgICAgICAgICByZXR1cm4gbmV3IEdyZWV0ZXIoZ3JlZXRpbmcpOw0KICAgICAgICB9DQogICAgICAgIHZhciBncmVldGVyID0gbmV3IEdyZWV0ZXIoIkhlbGxvLCB3b3JsZCEiKTsNCiAgICAgICAgdmFyIHN0ciA9IGdyZWV0ZXIuZ3JlZXQoKTsNCiAgICAgICAgZnVuY3Rpb24gZm9vMihncmVldGluZykgew0KICAgICAgICAgICAgdmFyIHJlc3RHcmVldGluZ3MgLyogbW9yZSBncmVldGluZyAqLyA9IFtdOw0KICAgICAgICAgICAgZm9yICh2YXIgX2kgPSAxOyBfaSA8IGFyZ3VtZW50cy5sZW5ndGg7IF9pKyspIHsNCiAgICAgICAgICAgICAgICByZXN0R3JlZXRpbmdzW19pIC0gMV0gPSBhcmd1bWVudHNbX2ldOw0KICAgICAgICAgICAgfQ0KICAgICAgICAgICAgdmFyIGdyZWV0ZXJzID0gW107IC8qIGlubGluZSBibG9jayBjb21tZW50ICovDQogICAgICAgICAgICBncmVldGVyc1swXSA9IG5ldyBHcmVldGVyKGdyZWV0aW5nKTsNCiAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcmVzdEdyZWV0aW5ncy5sZW5ndGg7IGkrKykgew0KICAgICAgICAgICAgICAgIGdyZWV0ZXJzLnB1c2gobmV3IEdyZWV0ZXIocmVzdEdyZWV0aW5nc1tpXSkpOw0KICAgICAgICAgICAgfQ0KICAgICAgICAgICAgcmV0dXJuIGdyZWV0ZXJzOw0KICAgICAgICB9DQogICAgICAgIHZhciBiID0gZm9vMigiSGVsbG8iLCAiV29ybGQiLCAiISIpOw0KICAgICAgICAvLyBUaGlzIGlzIHNpbXBsZSBzaWdubGUgbGluZSBjb21tZW50DQogICAgICAgIGZvciAodmFyIGogPSAwOyBqIDwgYi5sZW5ndGg7IGorKykgew0KICAgICAgICAgICAgYltqXS5ncmVldCgpOw0KICAgICAgICB9DQogICAgfSkoQmFyID0gRm9vLkJhciB8fCAoRm9vLkJhciA9IHt9KSk7DQp9KShGb28gfHwgKEZvbyA9IHt9KSk7DQovLyMgc291cmNlTWFwcGluZ1VSTD1zb3VyY2VNYXBWYWxpZGF0aW9uQ2xhc3Nlcy5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlTWFwVmFsaWRhdGlvbkNsYXNzZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJzb3VyY2VNYXBWYWxpZGF0aW9uQ2xhc3Nlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxJQUFVLEdBQUcsQ0FtQ1o7QUFuQ0QsV0FBVSxHQUFHO0lBQUMsSUFBQSxHQUFHLENBbUNoQjtJQW5DYSxXQUFBLEdBQUc7UUFDYixZQUFZLENBQUM7UUFFYjtZQUNJLGlCQUFtQixRQUFnQjtnQkFBaEIsYUFBUSxHQUFSLFFBQVEsQ0FBUTtZQUNuQyxDQUFDO1lBRUQsdUJBQUssR0FBTDtnQkFDSSxPQUFPLE1BQU0sR0FBRyxJQUFJLENBQUMsUUFBUSxHQUFHLE9BQU8sQ0FBQztZQUM1QyxDQUFDO1lBQ0wsY0FBQztRQUFELENBQUMsQUFQRCxJQU9DO1FBR0QsU0FBUyxHQUFHLENBQUMsUUFBZ0I7WUFDekIsT0FBTyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNqQyxDQUFDO1FBRUQsSUFBSSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDM0MsSUFBSSxHQUFHLEdBQUcsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBRTFCLFNBQVMsSUFBSSxDQUFDLFFBQWdCO1lBQUUsa0JBQWlCLG1CQUFtQixNQUFVO2lCQUE5QyxVQUE4QyxFQUE5QyxxQkFBOEMsRUFBOUMsSUFBOEM7Z0JBQTlDLHNDQUE4Qzs7WUFDMUUsSUFBSSxRQUFRLEdBQWMsRUFBRSxDQUFDLENBQUMsMEJBQTBCO1lBQ3hELFFBQVEsQ0FBQyxDQUFDLENBQUMsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQztZQUNwQyxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsYUFBYSxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO2dCQUM1QyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDakQsQ0FBQztZQUVELE9BQU8sUUFBUSxDQUFDO1FBQ3BCLENBQUM7UUFFRCxJQUFJLENBQUMsR0FBRyxJQUFJLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxHQUFHLENBQUMsQ0FBQztRQUNwQyxxQ0FBcUM7UUFDckMsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztZQUNoQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDakIsQ0FBQztJQUNMLENBQUMsRUFuQ2EsR0FBRyxHQUFILE9BQUcsS0FBSCxPQUFHLFFBbUNoQjtBQUFELENBQUMsRUFuQ1MsR0FBRyxLQUFILEdBQUcsUUFtQ1oifQ==,bmFtZXNwYWNlIEZvby5CYXIgewogICAgInVzZSBzdHJpY3QiOwoKICAgIGNsYXNzIEdyZWV0ZXIgewogICAgICAgIGNvbnN0cnVjdG9yKHB1YmxpYyBncmVldGluZzogc3RyaW5nKSB7CiAgICAgICAgfQoKICAgICAgICBncmVldCgpIHsKICAgICAgICAgICAgcmV0dXJuICI8aDE+IiArIHRoaXMuZ3JlZXRpbmcgKyAiPC9oMT4iOwogICAgICAgIH0KICAgIH0KCgogICAgZnVuY3Rpb24gZm9vKGdyZWV0aW5nOiBzdHJpbmcpOiBHcmVldGVyIHsKICAgICAgICByZXR1cm4gbmV3IEdyZWV0ZXIoZ3JlZXRpbmcpOwogICAgfQoKICAgIHZhciBncmVldGVyID0gbmV3IEdyZWV0ZXIoIkhlbGxvLCB3b3JsZCEiKTsKICAgIHZhciBzdHIgPSBncmVldGVyLmdyZWV0KCk7CgogICAgZnVuY3Rpb24gZm9vMihncmVldGluZzogc3RyaW5nLCAuLi5yZXN0R3JlZXRpbmdzIC8qIG1vcmUgZ3JlZXRpbmcgKi86IHN0cmluZ1tdKSB7CiAgICAgICAgdmFyIGdyZWV0ZXJzOiBHcmVldGVyW10gPSBbXTsgLyogaW5saW5lIGJsb2NrIGNvbW1lbnQgKi8KICAgICAgICBncmVldGVyc1swXSA9IG5ldyBHcmVldGVyKGdyZWV0aW5nKTsKICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHJlc3RHcmVldGluZ3MubGVuZ3RoOyBpKyspIHsKICAgICAgICAgICAgZ3JlZXRlcnMucHVzaChuZXcgR3JlZXRlcihyZXN0R3JlZXRpbmdzW2ldKSk7CiAgICAgICAgfQoKICAgICAgICByZXR1cm4gZ3JlZXRlcnM7CiAgICB9CgogICAgdmFyIGIgPSBmb28yKCJIZWxsbyIsICJXb3JsZCIsICIhIik7CiAgICAvLyBUaGlzIGlzIHNpbXBsZSBzaWdubGUgbGluZSBjb21tZW50CiAgICBmb3IgKHZhciBqID0gMDsgaiA8IGIubGVuZ3RoOyBqKyspIHsKICAgICAgICBiW2pdLmdyZWV0KCk7CiAgICB9Cn0= diff --git a/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt index 352b3ff078f29..9e9773825336a 100644 --- a/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt @@ -15,7 +15,7 @@ sourceFile:sourceMapValidationClasses.ts 4 > ^ 5 > ^^^^^^^^^^-> 1 > -2 >module +2 >namespace 3 > Foo 4 > .Bar { > "use strict"; @@ -54,8 +54,8 @@ sourceFile:sourceMapValidationClasses.ts > } > } 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 8) Source(1, 11) + SourceIndex(0) +2 >Emitted(1, 5) Source(1, 11) + SourceIndex(0) +3 >Emitted(1, 8) Source(1, 14) + SourceIndex(0) 4 >Emitted(1, 9) Source(36, 2) + SourceIndex(0) --- >>>(function (Foo) { @@ -63,11 +63,11 @@ sourceFile:sourceMapValidationClasses.ts 2 >^^^^^^^^^^^ 3 > ^^^ 1-> -2 >module +2 >namespace 3 > Foo 1->Emitted(2, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(2, 12) Source(1, 8) + SourceIndex(0) -3 >Emitted(2, 15) Source(1, 11) + SourceIndex(0) +2 >Emitted(2, 12) Source(1, 11) + SourceIndex(0) +3 >Emitted(2, 15) Source(1, 14) + SourceIndex(0) --- >>> var Bar; 1 >^^^^ @@ -114,9 +114,9 @@ sourceFile:sourceMapValidationClasses.ts > b[j].greet(); > } > } -1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(3, 9) Source(1, 12) + SourceIndex(0) -3 >Emitted(3, 12) Source(1, 15) + SourceIndex(0) +1 >Emitted(3, 5) Source(1, 15) + SourceIndex(0) +2 >Emitted(3, 9) Source(1, 15) + SourceIndex(0) +3 >Emitted(3, 12) Source(1, 18) + SourceIndex(0) 4 >Emitted(3, 13) Source(36, 2) + SourceIndex(0) --- >>> (function (Bar) { @@ -127,9 +127,9 @@ sourceFile:sourceMapValidationClasses.ts 1-> 2 > 3 > Bar -1->Emitted(4, 5) Source(1, 12) + SourceIndex(0) -2 >Emitted(4, 16) Source(1, 12) + SourceIndex(0) -3 >Emitted(4, 19) Source(1, 15) + SourceIndex(0) +1->Emitted(4, 5) Source(1, 15) + SourceIndex(0) +2 >Emitted(4, 16) Source(1, 15) + SourceIndex(0) +3 >Emitted(4, 19) Source(1, 18) + SourceIndex(0) --- >>> "use strict"; 1->^^^^^^^^ @@ -876,12 +876,12 @@ sourceFile:sourceMapValidationClasses.ts > } 1->Emitted(37, 5) Source(36, 1) + SourceIndex(0) 2 >Emitted(37, 6) Source(36, 2) + SourceIndex(0) -3 >Emitted(37, 8) Source(1, 12) + SourceIndex(0) -4 >Emitted(37, 11) Source(1, 15) + SourceIndex(0) -5 >Emitted(37, 14) Source(1, 12) + SourceIndex(0) -6 >Emitted(37, 21) Source(1, 15) + SourceIndex(0) -7 >Emitted(37, 26) Source(1, 12) + SourceIndex(0) -8 >Emitted(37, 33) Source(1, 15) + SourceIndex(0) +3 >Emitted(37, 8) Source(1, 15) + SourceIndex(0) +4 >Emitted(37, 11) Source(1, 18) + SourceIndex(0) +5 >Emitted(37, 14) Source(1, 15) + SourceIndex(0) +6 >Emitted(37, 21) Source(1, 18) + SourceIndex(0) +7 >Emitted(37, 26) Source(1, 15) + SourceIndex(0) +8 >Emitted(37, 33) Source(1, 18) + SourceIndex(0) 9 >Emitted(37, 41) Source(36, 2) + SourceIndex(0) --- >>>})(Foo || (Foo = {})); @@ -937,10 +937,10 @@ sourceFile:sourceMapValidationClasses.ts > } 1 >Emitted(38, 1) Source(36, 1) + SourceIndex(0) 2 >Emitted(38, 2) Source(36, 2) + SourceIndex(0) -3 >Emitted(38, 4) Source(1, 8) + SourceIndex(0) -4 >Emitted(38, 7) Source(1, 11) + SourceIndex(0) -5 >Emitted(38, 12) Source(1, 8) + SourceIndex(0) -6 >Emitted(38, 15) Source(1, 11) + SourceIndex(0) +3 >Emitted(38, 4) Source(1, 11) + SourceIndex(0) +4 >Emitted(38, 7) Source(1, 14) + SourceIndex(0) +5 >Emitted(38, 12) Source(1, 11) + SourceIndex(0) +6 >Emitted(38, 15) Source(1, 14) + SourceIndex(0) 7 >Emitted(38, 23) Source(36, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMapValidationClasses.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClasses.symbols b/tests/baselines/reference/sourceMapValidationClasses.symbols index 5b4c8e3587252..9b414fea1f236 100644 --- a/tests/baselines/reference/sourceMapValidationClasses.symbols +++ b/tests/baselines/reference/sourceMapValidationClasses.symbols @@ -1,9 +1,9 @@ //// [tests/cases/compiler/sourceMapValidationClasses.ts] //// === sourceMapValidationClasses.ts === -module Foo.Bar { +namespace Foo.Bar { >Foo : Symbol(Foo, Decl(sourceMapValidationClasses.ts, 0, 0)) ->Bar : Symbol(Bar, Decl(sourceMapValidationClasses.ts, 0, 11)) +>Bar : Symbol(Bar, Decl(sourceMapValidationClasses.ts, 0, 14)) "use strict"; diff --git a/tests/baselines/reference/sourceMapValidationClasses.types b/tests/baselines/reference/sourceMapValidationClasses.types index 15c3c6d1dac57..5302f5b345d1e 100644 --- a/tests/baselines/reference/sourceMapValidationClasses.types +++ b/tests/baselines/reference/sourceMapValidationClasses.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/sourceMapValidationClasses.ts] //// === sourceMapValidationClasses.ts === -module Foo.Bar { +namespace Foo.Bar { >Foo : typeof Foo > : ^^^^^^^^^^ >Bar : typeof Bar diff --git a/tests/baselines/reference/sourceMapValidationImport.js b/tests/baselines/reference/sourceMapValidationImport.js index 56ac057550103..5310428b4207a 100644 --- a/tests/baselines/reference/sourceMapValidationImport.js +++ b/tests/baselines/reference/sourceMapValidationImport.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/sourceMapValidationImport.ts] //// //// [sourceMapValidationImport.ts] -export module m { +export namespace m { export class c { } } diff --git a/tests/baselines/reference/sourceMapValidationImport.js.map b/tests/baselines/reference/sourceMapValidationImport.js.map index 907b5671fb622..f364b8a764874 100644 --- a/tests/baselines/reference/sourceMapValidationImport.js.map +++ b/tests/baselines/reference/sourceMapValidationImport.js.map @@ -1,3 +1,3 @@ //// [sourceMapValidationImport.js.map] -{"version":3,"file":"sourceMapValidationImport.js","sourceRoot":"","sources":["sourceMapValidationImport.ts"],"names":[],"mappings":";;;AAAA,IAAc,CAAC,CAGd;AAHD,WAAc,CAAC;IACX;QAAA;QACA,CAAC;QAAD,QAAC;IAAD,CAAC,AADD,IACC;IADY,GAAC,IACb,CAAA;AACL,CAAC,EAHa,CAAC,iBAAD,CAAC,QAGd;AACD,IAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACD,QAAA,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACtB,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,IAAI,CAAC,GAAG,IAAI,SAAC,EAAE,CAAC"} -//// https://sokra.github.io/source-map-visualization#base64,InVzZSBzdHJpY3QiOw0KT2JqZWN0LmRlZmluZVByb3BlcnR5KGV4cG9ydHMsICJfX2VzTW9kdWxlIiwgeyB2YWx1ZTogdHJ1ZSB9KTsNCmV4cG9ydHMuYiA9IGV4cG9ydHMubSA9IHZvaWQgMDsNCnZhciBtOw0KKGZ1bmN0aW9uIChtKSB7DQogICAgdmFyIGMgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgICAgIGZ1bmN0aW9uIGMoKSB7DQogICAgICAgIH0NCiAgICAgICAgcmV0dXJuIGM7DQogICAgfSgpKTsNCiAgICBtLmMgPSBjOw0KfSkobSB8fCAoZXhwb3J0cy5tID0gbSA9IHt9KSk7DQp2YXIgYSA9IG0uYzsNCmV4cG9ydHMuYiA9IG0uYzsNCnZhciB4ID0gbmV3IGEoKTsNCnZhciB5ID0gbmV3IGV4cG9ydHMuYigpOw0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9c291cmNlTWFwVmFsaWRhdGlvbkltcG9ydC5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlTWFwVmFsaWRhdGlvbkltcG9ydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInNvdXJjZU1hcFZhbGlkYXRpb25JbXBvcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsSUFBYyxDQUFDLENBR2Q7QUFIRCxXQUFjLENBQUM7SUFDWDtRQUFBO1FBQ0EsQ0FBQztRQUFELFFBQUM7SUFBRCxDQUFDLEFBREQsSUFDQztJQURZLEdBQUMsSUFDYixDQUFBO0FBQ0wsQ0FBQyxFQUhhLENBQUMsaUJBQUQsQ0FBQyxRQUdkO0FBQ0QsSUFBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNELFFBQUEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDdEIsSUFBSSxDQUFDLEdBQUcsSUFBSSxDQUFDLEVBQUUsQ0FBQztBQUNoQixJQUFJLENBQUMsR0FBRyxJQUFJLFNBQUMsRUFBRSxDQUFDIn0=,ZXhwb3J0IG1vZHVsZSBtIHsKICAgIGV4cG9ydCBjbGFzcyBjIHsKICAgIH0KfQppbXBvcnQgYSA9IG0uYzsKZXhwb3J0IGltcG9ydCBiID0gbS5jOwp2YXIgeCA9IG5ldyBhKCk7CnZhciB5ID0gbmV3IGIoKTs= +{"version":3,"file":"sourceMapValidationImport.js","sourceRoot":"","sources":["sourceMapValidationImport.ts"],"names":[],"mappings":";;;AAAA,IAAiB,CAAC,CAGjB;AAHD,WAAiB,CAAC;IACd;QAAA;QACA,CAAC;QAAD,QAAC;IAAD,CAAC,AADD,IACC;IADY,GAAC,IACb,CAAA;AACL,CAAC,EAHgB,CAAC,iBAAD,CAAC,QAGjB;AACD,IAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACD,QAAA,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACtB,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,IAAI,CAAC,GAAG,IAAI,SAAC,EAAE,CAAC"} +//// https://sokra.github.io/source-map-visualization#base64,InVzZSBzdHJpY3QiOw0KT2JqZWN0LmRlZmluZVByb3BlcnR5KGV4cG9ydHMsICJfX2VzTW9kdWxlIiwgeyB2YWx1ZTogdHJ1ZSB9KTsNCmV4cG9ydHMuYiA9IGV4cG9ydHMubSA9IHZvaWQgMDsNCnZhciBtOw0KKGZ1bmN0aW9uIChtKSB7DQogICAgdmFyIGMgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgICAgIGZ1bmN0aW9uIGMoKSB7DQogICAgICAgIH0NCiAgICAgICAgcmV0dXJuIGM7DQogICAgfSgpKTsNCiAgICBtLmMgPSBjOw0KfSkobSB8fCAoZXhwb3J0cy5tID0gbSA9IHt9KSk7DQp2YXIgYSA9IG0uYzsNCmV4cG9ydHMuYiA9IG0uYzsNCnZhciB4ID0gbmV3IGEoKTsNCnZhciB5ID0gbmV3IGV4cG9ydHMuYigpOw0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9c291cmNlTWFwVmFsaWRhdGlvbkltcG9ydC5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlTWFwVmFsaWRhdGlvbkltcG9ydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInNvdXJjZU1hcFZhbGlkYXRpb25JbXBvcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsSUFBaUIsQ0FBQyxDQUdqQjtBQUhELFdBQWlCLENBQUM7SUFDZDtRQUFBO1FBQ0EsQ0FBQztRQUFELFFBQUM7SUFBRCxDQUFDLEFBREQsSUFDQztJQURZLEdBQUMsSUFDYixDQUFBO0FBQ0wsQ0FBQyxFQUhnQixDQUFDLGlCQUFELENBQUMsUUFHakI7QUFDRCxJQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ0QsUUFBQSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUN0QixJQUFJLENBQUMsR0FBRyxJQUFJLENBQUMsRUFBRSxDQUFDO0FBQ2hCLElBQUksQ0FBQyxHQUFHLElBQUksU0FBQyxFQUFFLENBQUMifQ==,ZXhwb3J0IG5hbWVzcGFjZSBtIHsKICAgIGV4cG9ydCBjbGFzcyBjIHsKICAgIH0KfQppbXBvcnQgYSA9IG0uYzsKZXhwb3J0IGltcG9ydCBiID0gbS5jOwp2YXIgeCA9IG5ldyBhKCk7CnZhciB5ID0gbmV3IGIoKTs= diff --git a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt index 74b3c8de26d01..0c855e55e4a78 100644 --- a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt @@ -18,15 +18,15 @@ sourceFile:sourceMapValidationImport.ts 4 > ^ 5 > ^^^^^^^^^^-> 1 > -2 >export module +2 >export namespace 3 > m 4 > { > export class c { > } > } 1 >Emitted(4, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(1, 15) + SourceIndex(0) -3 >Emitted(4, 6) Source(1, 16) + SourceIndex(0) +2 >Emitted(4, 5) Source(1, 18) + SourceIndex(0) +3 >Emitted(4, 6) Source(1, 19) + SourceIndex(0) 4 >Emitted(4, 7) Source(4, 2) + SourceIndex(0) --- >>>(function (m) { @@ -35,11 +35,11 @@ sourceFile:sourceMapValidationImport.ts 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> -2 >export module +2 >export namespace 3 > m 1->Emitted(5, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(5, 12) Source(1, 15) + SourceIndex(0) -3 >Emitted(5, 13) Source(1, 16) + SourceIndex(0) +2 >Emitted(5, 12) Source(1, 18) + SourceIndex(0) +3 >Emitted(5, 13) Source(1, 19) + SourceIndex(0) --- >>> var c = /** @class */ (function () { 1->^^^^ @@ -125,10 +125,10 @@ sourceFile:sourceMapValidationImport.ts > } 1->Emitted(12, 1) Source(4, 1) + SourceIndex(0) 2 >Emitted(12, 2) Source(4, 2) + SourceIndex(0) -3 >Emitted(12, 4) Source(1, 15) + SourceIndex(0) -4 >Emitted(12, 5) Source(1, 16) + SourceIndex(0) -5 >Emitted(12, 22) Source(1, 15) + SourceIndex(0) -6 >Emitted(12, 23) Source(1, 16) + SourceIndex(0) +3 >Emitted(12, 4) Source(1, 18) + SourceIndex(0) +4 >Emitted(12, 5) Source(1, 19) + SourceIndex(0) +5 >Emitted(12, 22) Source(1, 18) + SourceIndex(0) +6 >Emitted(12, 23) Source(1, 19) + SourceIndex(0) 7 >Emitted(12, 31) Source(4, 2) + SourceIndex(0) --- >>>var a = m.c; diff --git a/tests/baselines/reference/sourceMapValidationImport.symbols b/tests/baselines/reference/sourceMapValidationImport.symbols index 675fa4ec94d79..59614646105e7 100644 --- a/tests/baselines/reference/sourceMapValidationImport.symbols +++ b/tests/baselines/reference/sourceMapValidationImport.symbols @@ -1,22 +1,22 @@ //// [tests/cases/compiler/sourceMapValidationImport.ts] //// === sourceMapValidationImport.ts === -export module m { +export namespace m { >m : Symbol(m, Decl(sourceMapValidationImport.ts, 0, 0)) export class c { ->c : Symbol(c, Decl(sourceMapValidationImport.ts, 0, 17)) +>c : Symbol(c, Decl(sourceMapValidationImport.ts, 0, 20)) } } import a = m.c; >a : Symbol(a, Decl(sourceMapValidationImport.ts, 3, 1)) >m : Symbol(m, Decl(sourceMapValidationImport.ts, 0, 0)) ->c : Symbol(a, Decl(sourceMapValidationImport.ts, 0, 17)) +>c : Symbol(a, Decl(sourceMapValidationImport.ts, 0, 20)) export import b = m.c; >b : Symbol(b, Decl(sourceMapValidationImport.ts, 4, 15)) >m : Symbol(m, Decl(sourceMapValidationImport.ts, 0, 0)) ->c : Symbol(a, Decl(sourceMapValidationImport.ts, 0, 17)) +>c : Symbol(a, Decl(sourceMapValidationImport.ts, 0, 20)) var x = new a(); >x : Symbol(x, Decl(sourceMapValidationImport.ts, 6, 3)) diff --git a/tests/baselines/reference/sourceMapValidationImport.types b/tests/baselines/reference/sourceMapValidationImport.types index 88b8aae646ac4..fcd7cb9600e09 100644 --- a/tests/baselines/reference/sourceMapValidationImport.types +++ b/tests/baselines/reference/sourceMapValidationImport.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/sourceMapValidationImport.ts] //// === sourceMapValidationImport.ts === -export module m { +export namespace m { >m : typeof m > : ^^^^^^^^ diff --git a/tests/baselines/reference/sourceMapValidationModule.js b/tests/baselines/reference/sourceMapValidationModule.js index d07ce17816c84..9a23ac5aa5741 100644 --- a/tests/baselines/reference/sourceMapValidationModule.js +++ b/tests/baselines/reference/sourceMapValidationModule.js @@ -1,12 +1,12 @@ //// [tests/cases/compiler/sourceMapValidationModule.ts] //// //// [sourceMapValidationModule.ts] -module m2 { +namespace m2 { var a = 10; a++; } -module m3 { - module m4 { +namespace m3 { + namespace m4 { export var x = 30; } diff --git a/tests/baselines/reference/sourceMapValidationModule.js.map b/tests/baselines/reference/sourceMapValidationModule.js.map index dacf1a27c18c0..6e494f2617f5c 100644 --- a/tests/baselines/reference/sourceMapValidationModule.js.map +++ b/tests/baselines/reference/sourceMapValidationModule.js.map @@ -1,3 +1,3 @@ //// [sourceMapValidationModule.js.map] -{"version":3,"file":"sourceMapValidationModule.js","sourceRoot":"","sources":["sourceMapValidationModule.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,CAGR;AAHD,WAAO,EAAE;IACL,IAAI,CAAC,GAAG,EAAE,CAAC;IACX,CAAC,EAAE,CAAC;AACR,CAAC,EAHM,EAAE,KAAF,EAAE,QAGR;AACD,IAAO,EAAE,CAQR;AARD,WAAO,EAAE;IACL,IAAO,EAAE,CAER;IAFD,WAAO,EAAE;QACM,IAAC,GAAG,EAAE,CAAC;IACtB,CAAC,EAFM,EAAE,KAAF,EAAE,QAER;IAED,SAAgB,GAAG;QACf,OAAO,EAAE,CAAC,CAAC,CAAC;IAChB,CAAC;IAFe,MAAG,MAElB,CAAA;AACL,CAAC,EARM,EAAE,KAAF,EAAE,QAQR"} -//// https://sokra.github.io/source-map-visualization#base64,dmFyIG0yOw0KKGZ1bmN0aW9uIChtMikgew0KICAgIHZhciBhID0gMTA7DQogICAgYSsrOw0KfSkobTIgfHwgKG0yID0ge30pKTsNCnZhciBtMzsNCihmdW5jdGlvbiAobTMpIHsNCiAgICB2YXIgbTQ7DQogICAgKGZ1bmN0aW9uIChtNCkgew0KICAgICAgICBtNC54ID0gMzA7DQogICAgfSkobTQgfHwgKG00ID0ge30pKTsNCiAgICBmdW5jdGlvbiBmb28oKSB7DQogICAgICAgIHJldHVybiBtNC54Ow0KICAgIH0NCiAgICBtMy5mb28gPSBmb287DQp9KShtMyB8fCAobTMgPSB7fSkpOw0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9c291cmNlTWFwVmFsaWRhdGlvbk1vZHVsZS5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlTWFwVmFsaWRhdGlvbk1vZHVsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInNvdXJjZU1hcFZhbGlkYXRpb25Nb2R1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsSUFBTyxFQUFFLENBR1I7QUFIRCxXQUFPLEVBQUU7SUFDTCxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7SUFDWCxDQUFDLEVBQUUsQ0FBQztBQUNSLENBQUMsRUFITSxFQUFFLEtBQUYsRUFBRSxRQUdSO0FBQ0QsSUFBTyxFQUFFLENBUVI7QUFSRCxXQUFPLEVBQUU7SUFDTCxJQUFPLEVBQUUsQ0FFUjtJQUZELFdBQU8sRUFBRTtRQUNNLElBQUMsR0FBRyxFQUFFLENBQUM7SUFDdEIsQ0FBQyxFQUZNLEVBQUUsS0FBRixFQUFFLFFBRVI7SUFFRCxTQUFnQixHQUFHO1FBQ2YsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ2hCLENBQUM7SUFGZSxNQUFHLE1BRWxCLENBQUE7QUFDTCxDQUFDLEVBUk0sRUFBRSxLQUFGLEVBQUUsUUFRUiJ9,bW9kdWxlIG0yIHsKICAgIHZhciBhID0gMTA7CiAgICBhKys7Cn0KbW9kdWxlIG0zIHsKICAgIG1vZHVsZSBtNCB7CiAgICAgICAgZXhwb3J0IHZhciB4ID0gMzA7CiAgICB9CgogICAgZXhwb3J0IGZ1bmN0aW9uIGZvbygpIHsKICAgICAgICByZXR1cm4gbTQueDsKICAgIH0KfQ== +{"version":3,"file":"sourceMapValidationModule.js","sourceRoot":"","sources":["sourceMapValidationModule.ts"],"names":[],"mappings":"AAAA,IAAU,EAAE,CAGX;AAHD,WAAU,EAAE;IACR,IAAI,CAAC,GAAG,EAAE,CAAC;IACX,CAAC,EAAE,CAAC;AACR,CAAC,EAHS,EAAE,KAAF,EAAE,QAGX;AACD,IAAU,EAAE,CAQX;AARD,WAAU,EAAE;IACR,IAAU,EAAE,CAEX;IAFD,WAAU,EAAE;QACG,IAAC,GAAG,EAAE,CAAC;IACtB,CAAC,EAFS,EAAE,KAAF,EAAE,QAEX;IAED,SAAgB,GAAG;QACf,OAAO,EAAE,CAAC,CAAC,CAAC;IAChB,CAAC;IAFe,MAAG,MAElB,CAAA;AACL,CAAC,EARS,EAAE,KAAF,EAAE,QAQX"} +//// https://sokra.github.io/source-map-visualization#base64,dmFyIG0yOw0KKGZ1bmN0aW9uIChtMikgew0KICAgIHZhciBhID0gMTA7DQogICAgYSsrOw0KfSkobTIgfHwgKG0yID0ge30pKTsNCnZhciBtMzsNCihmdW5jdGlvbiAobTMpIHsNCiAgICB2YXIgbTQ7DQogICAgKGZ1bmN0aW9uIChtNCkgew0KICAgICAgICBtNC54ID0gMzA7DQogICAgfSkobTQgfHwgKG00ID0ge30pKTsNCiAgICBmdW5jdGlvbiBmb28oKSB7DQogICAgICAgIHJldHVybiBtNC54Ow0KICAgIH0NCiAgICBtMy5mb28gPSBmb287DQp9KShtMyB8fCAobTMgPSB7fSkpOw0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9c291cmNlTWFwVmFsaWRhdGlvbk1vZHVsZS5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlTWFwVmFsaWRhdGlvbk1vZHVsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInNvdXJjZU1hcFZhbGlkYXRpb25Nb2R1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsSUFBVSxFQUFFLENBR1g7QUFIRCxXQUFVLEVBQUU7SUFDUixJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7SUFDWCxDQUFDLEVBQUUsQ0FBQztBQUNSLENBQUMsRUFIUyxFQUFFLEtBQUYsRUFBRSxRQUdYO0FBQ0QsSUFBVSxFQUFFLENBUVg7QUFSRCxXQUFVLEVBQUU7SUFDUixJQUFVLEVBQUUsQ0FFWDtJQUZELFdBQVUsRUFBRTtRQUNHLElBQUMsR0FBRyxFQUFFLENBQUM7SUFDdEIsQ0FBQyxFQUZTLEVBQUUsS0FBRixFQUFFLFFBRVg7SUFFRCxTQUFnQixHQUFHO1FBQ2YsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ2hCLENBQUM7SUFGZSxNQUFHLE1BRWxCLENBQUE7QUFDTCxDQUFDLEVBUlMsRUFBRSxLQUFGLEVBQUUsUUFRWCJ9,bmFtZXNwYWNlIG0yIHsKICAgIHZhciBhID0gMTA7CiAgICBhKys7Cn0KbmFtZXNwYWNlIG0zIHsKICAgIG5hbWVzcGFjZSBtNCB7CiAgICAgICAgZXhwb3J0IHZhciB4ID0gMzA7CiAgICB9CgogICAgZXhwb3J0IGZ1bmN0aW9uIGZvbygpIHsKICAgICAgICByZXR1cm4gbTQueDsKICAgIH0KfQ== diff --git a/tests/baselines/reference/sourceMapValidationModule.sourcemap.txt b/tests/baselines/reference/sourceMapValidationModule.sourcemap.txt index f2024f621387d..5476cbf910bec 100644 --- a/tests/baselines/reference/sourceMapValidationModule.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationModule.sourcemap.txt @@ -15,15 +15,15 @@ sourceFile:sourceMapValidationModule.ts 4 > ^ 5 > ^^^^^^^^^^-> 1 > -2 >module +2 >namespace 3 > m2 4 > { > var a = 10; > a++; > } 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) +2 >Emitted(1, 5) Source(1, 11) + SourceIndex(0) +3 >Emitted(1, 7) Source(1, 13) + SourceIndex(0) 4 >Emitted(1, 8) Source(4, 2) + SourceIndex(0) --- >>>(function (m2) { @@ -32,11 +32,11 @@ sourceFile:sourceMapValidationModule.ts 3 > ^^ 4 > ^^^-> 1-> -2 >module +2 >namespace 3 > m2 1->Emitted(2, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(2, 12) Source(1, 8) + SourceIndex(0) -3 >Emitted(2, 14) Source(1, 10) + SourceIndex(0) +2 >Emitted(2, 12) Source(1, 11) + SourceIndex(0) +3 >Emitted(2, 14) Source(1, 13) + SourceIndex(0) --- >>> var a = 10; 1->^^^^ @@ -96,10 +96,10 @@ sourceFile:sourceMapValidationModule.ts > } 1->Emitted(5, 1) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 2) Source(4, 2) + SourceIndex(0) -3 >Emitted(5, 4) Source(1, 8) + SourceIndex(0) -4 >Emitted(5, 6) Source(1, 10) + SourceIndex(0) -5 >Emitted(5, 11) Source(1, 8) + SourceIndex(0) -6 >Emitted(5, 13) Source(1, 10) + SourceIndex(0) +3 >Emitted(5, 4) Source(1, 11) + SourceIndex(0) +4 >Emitted(5, 6) Source(1, 13) + SourceIndex(0) +5 >Emitted(5, 11) Source(1, 11) + SourceIndex(0) +6 >Emitted(5, 13) Source(1, 13) + SourceIndex(0) 7 >Emitted(5, 21) Source(4, 2) + SourceIndex(0) --- >>>var m3; @@ -110,10 +110,10 @@ sourceFile:sourceMapValidationModule.ts 5 > ^^^^^^^^^^-> 1 > > -2 >module +2 >namespace 3 > m3 4 > { - > module m4 { + > namespace m4 { > export var x = 30; > } > @@ -122,8 +122,8 @@ sourceFile:sourceMapValidationModule.ts > } > } 1 >Emitted(6, 1) Source(5, 1) + SourceIndex(0) -2 >Emitted(6, 5) Source(5, 8) + SourceIndex(0) -3 >Emitted(6, 7) Source(5, 10) + SourceIndex(0) +2 >Emitted(6, 5) Source(5, 11) + SourceIndex(0) +3 >Emitted(6, 7) Source(5, 13) + SourceIndex(0) 4 >Emitted(6, 8) Source(13, 2) + SourceIndex(0) --- >>>(function (m3) { @@ -131,11 +131,11 @@ sourceFile:sourceMapValidationModule.ts 2 >^^^^^^^^^^^ 3 > ^^ 1-> -2 >module +2 >namespace 3 > m3 1->Emitted(7, 1) Source(5, 1) + SourceIndex(0) -2 >Emitted(7, 12) Source(5, 8) + SourceIndex(0) -3 >Emitted(7, 14) Source(5, 10) + SourceIndex(0) +2 >Emitted(7, 12) Source(5, 11) + SourceIndex(0) +3 >Emitted(7, 14) Source(5, 13) + SourceIndex(0) --- >>> var m4; 1 >^^^^ @@ -145,14 +145,14 @@ sourceFile:sourceMapValidationModule.ts 5 > ^^^^^^^^^^-> 1 > { > -2 > module +2 > namespace 3 > m4 4 > { > export var x = 30; > } 1 >Emitted(8, 5) Source(6, 5) + SourceIndex(0) -2 >Emitted(8, 9) Source(6, 12) + SourceIndex(0) -3 >Emitted(8, 11) Source(6, 14) + SourceIndex(0) +2 >Emitted(8, 9) Source(6, 15) + SourceIndex(0) +3 >Emitted(8, 11) Source(6, 17) + SourceIndex(0) 4 >Emitted(8, 12) Source(8, 6) + SourceIndex(0) --- >>> (function (m4) { @@ -161,11 +161,11 @@ sourceFile:sourceMapValidationModule.ts 3 > ^^ 4 > ^^-> 1-> -2 > module +2 > namespace 3 > m4 1->Emitted(9, 5) Source(6, 5) + SourceIndex(0) -2 >Emitted(9, 16) Source(6, 12) + SourceIndex(0) -3 >Emitted(9, 18) Source(6, 14) + SourceIndex(0) +2 >Emitted(9, 16) Source(6, 15) + SourceIndex(0) +3 >Emitted(9, 18) Source(6, 17) + SourceIndex(0) --- >>> m4.x = 30; 1->^^^^^^^^ @@ -206,10 +206,10 @@ sourceFile:sourceMapValidationModule.ts > } 1->Emitted(11, 5) Source(8, 5) + SourceIndex(0) 2 >Emitted(11, 6) Source(8, 6) + SourceIndex(0) -3 >Emitted(11, 8) Source(6, 12) + SourceIndex(0) -4 >Emitted(11, 10) Source(6, 14) + SourceIndex(0) -5 >Emitted(11, 15) Source(6, 12) + SourceIndex(0) -6 >Emitted(11, 17) Source(6, 14) + SourceIndex(0) +3 >Emitted(11, 8) Source(6, 15) + SourceIndex(0) +4 >Emitted(11, 10) Source(6, 17) + SourceIndex(0) +5 >Emitted(11, 15) Source(6, 15) + SourceIndex(0) +6 >Emitted(11, 17) Source(6, 17) + SourceIndex(0) 7 >Emitted(11, 25) Source(8, 6) + SourceIndex(0) --- >>> function foo() { @@ -291,7 +291,7 @@ sourceFile:sourceMapValidationModule.ts 5 > 6 > m3 7 > { - > module m4 { + > namespace m4 { > export var x = 30; > } > @@ -301,10 +301,10 @@ sourceFile:sourceMapValidationModule.ts > } 1->Emitted(16, 1) Source(13, 1) + SourceIndex(0) 2 >Emitted(16, 2) Source(13, 2) + SourceIndex(0) -3 >Emitted(16, 4) Source(5, 8) + SourceIndex(0) -4 >Emitted(16, 6) Source(5, 10) + SourceIndex(0) -5 >Emitted(16, 11) Source(5, 8) + SourceIndex(0) -6 >Emitted(16, 13) Source(5, 10) + SourceIndex(0) +3 >Emitted(16, 4) Source(5, 11) + SourceIndex(0) +4 >Emitted(16, 6) Source(5, 13) + SourceIndex(0) +5 >Emitted(16, 11) Source(5, 11) + SourceIndex(0) +6 >Emitted(16, 13) Source(5, 13) + SourceIndex(0) 7 >Emitted(16, 21) Source(13, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMapValidationModule.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationModule.symbols b/tests/baselines/reference/sourceMapValidationModule.symbols index f2b85e3d97f74..1c276afaca7bb 100644 --- a/tests/baselines/reference/sourceMapValidationModule.symbols +++ b/tests/baselines/reference/sourceMapValidationModule.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/sourceMapValidationModule.ts] //// === sourceMapValidationModule.ts === -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(sourceMapValidationModule.ts, 0, 0)) var a = 10; @@ -10,11 +10,11 @@ module m2 { a++; >a : Symbol(a, Decl(sourceMapValidationModule.ts, 1, 7)) } -module m3 { +namespace m3 { >m3 : Symbol(m3, Decl(sourceMapValidationModule.ts, 3, 1)) - module m4 { ->m4 : Symbol(m4, Decl(sourceMapValidationModule.ts, 4, 11)) + namespace m4 { +>m4 : Symbol(m4, Decl(sourceMapValidationModule.ts, 4, 14)) export var x = 30; >x : Symbol(x, Decl(sourceMapValidationModule.ts, 6, 18)) @@ -25,7 +25,7 @@ module m3 { return m4.x; >m4.x : Symbol(m4.x, Decl(sourceMapValidationModule.ts, 6, 18)) ->m4 : Symbol(m4, Decl(sourceMapValidationModule.ts, 4, 11)) +>m4 : Symbol(m4, Decl(sourceMapValidationModule.ts, 4, 14)) >x : Symbol(m4.x, Decl(sourceMapValidationModule.ts, 6, 18)) } } diff --git a/tests/baselines/reference/sourceMapValidationModule.types b/tests/baselines/reference/sourceMapValidationModule.types index e14971fcae5d5..6441c26b6b524 100644 --- a/tests/baselines/reference/sourceMapValidationModule.types +++ b/tests/baselines/reference/sourceMapValidationModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/sourceMapValidationModule.ts] //// === sourceMapValidationModule.ts === -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -17,11 +17,11 @@ module m2 { >a : number > : ^^^^^^ } -module m3 { +namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ - module m4 { + namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js index eef3e883409d5..8e4410fd93a5c 100644 --- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js +++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts] //// //// [a.ts] -module M { +namespace M { export var X = 1; } interface Navigator { @@ -12,7 +12,7 @@ interface Navigator { } //// [b.ts] -module m1 { +namespace m1 { export class c1 { } } diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map index 3f26d66bb10c0..be29eaf1b1f53 100644 --- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map +++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map @@ -1,3 +1,3 @@ //// [fooResult.js.map] -{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["a.ts","b.ts"],"names":[],"mappings":"AAAA,IAAO,CAAC,CAEP;AAFD,WAAO,CAAC;IACO,GAAC,GAAG,CAAC,CAAC;AACrB,CAAC,EAFM,CAAC,KAAD,CAAC,QAEP;ACFD,IAAO,EAAE,CAGR;AAHD,WAAO,EAAE;IACL;QAAA;QACA,CAAC;QAAD,SAAC;IAAD,CAAC,AADD,IACC;IADY,KAAE,KACd,CAAA;AACL,CAAC,EAHM,EAAE,KAAF,EAAE,QAGR"} -//// https://sokra.github.io/source-map-visualization#base64,dmFyIE07DQooZnVuY3Rpb24gKE0pIHsNCiAgICBNLlggPSAxOw0KfSkoTSB8fCAoTSA9IHt9KSk7DQp2YXIgbTE7DQooZnVuY3Rpb24gKG0xKSB7DQogICAgdmFyIGMxID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgICAgICBmdW5jdGlvbiBjMSgpIHsNCiAgICAgICAgfQ0KICAgICAgICByZXR1cm4gYzE7DQogICAgfSgpKTsNCiAgICBtMS5jMSA9IGMxOw0KfSkobTEgfHwgKG0xID0ge30pKTsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPWZvb1Jlc3VsdC5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9vUmVzdWx0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYS50cyIsImIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsSUFBTyxDQUFDLENBRVA7QUFGRCxXQUFPLENBQUM7SUFDTyxHQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ3JCLENBQUMsRUFGTSxDQUFDLEtBQUQsQ0FBQyxRQUVQO0FDRkQsSUFBTyxFQUFFLENBR1I7QUFIRCxXQUFPLEVBQUU7SUFDTDtRQUFBO1FBQ0EsQ0FBQztRQUFELFNBQUM7SUFBRCxDQUFDLEFBREQsSUFDQztJQURZLEtBQUUsS0FDZCxDQUFBO0FBQ0wsQ0FBQyxFQUhNLEVBQUUsS0FBRixFQUFFLFFBR1IifQ==,bW9kdWxlIE0gewogICAgZXhwb3J0IHZhciBYID0gMTsKfQppbnRlcmZhY2UgTmF2aWdhdG9yIHsKICAgIGdldEdhbWVwYWRzKGZ1bmM/OiBhbnkpOiBhbnk7CiAgICB3ZWJraXRHZXRHYW1lcGFkcyhmdW5jPzogYW55KTogYW55CiAgICBtc0dldEdhbWVwYWRzKGZ1bmM/OiBhbnkpOiBhbnk7CiAgICB3ZWJraXRHYW1lcGFkcyhmdW5jPzogYW55KTogYW55Owp9Cg==,bW9kdWxlIG0xIHsKICAgIGV4cG9ydCBjbGFzcyBjMSB7CiAgICB9Cn0K +{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["a.ts","b.ts"],"names":[],"mappings":"AAAA,IAAU,CAAC,CAEV;AAFD,WAAU,CAAC;IACI,GAAC,GAAG,CAAC,CAAC;AACrB,CAAC,EAFS,CAAC,KAAD,CAAC,QAEV;ACFD,IAAU,EAAE,CAGX;AAHD,WAAU,EAAE;IACR;QAAA;QACA,CAAC;QAAD,SAAC;IAAD,CAAC,AADD,IACC;IADY,KAAE,KACd,CAAA;AACL,CAAC,EAHS,EAAE,KAAF,EAAE,QAGX"} +//// https://sokra.github.io/source-map-visualization#base64,dmFyIE07DQooZnVuY3Rpb24gKE0pIHsNCiAgICBNLlggPSAxOw0KfSkoTSB8fCAoTSA9IHt9KSk7DQp2YXIgbTE7DQooZnVuY3Rpb24gKG0xKSB7DQogICAgdmFyIGMxID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgICAgICBmdW5jdGlvbiBjMSgpIHsNCiAgICAgICAgfQ0KICAgICAgICByZXR1cm4gYzE7DQogICAgfSgpKTsNCiAgICBtMS5jMSA9IGMxOw0KfSkobTEgfHwgKG0xID0ge30pKTsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPWZvb1Jlc3VsdC5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9vUmVzdWx0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYS50cyIsImIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsSUFBVSxDQUFDLENBRVY7QUFGRCxXQUFVLENBQUM7SUFDSSxHQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ3JCLENBQUMsRUFGUyxDQUFDLEtBQUQsQ0FBQyxRQUVWO0FDRkQsSUFBVSxFQUFFLENBR1g7QUFIRCxXQUFVLEVBQUU7SUFDUjtRQUFBO1FBQ0EsQ0FBQztRQUFELFNBQUM7SUFBRCxDQUFDLEFBREQsSUFDQztJQURZLEtBQUUsS0FDZCxDQUFBO0FBQ0wsQ0FBQyxFQUhTLEVBQUUsS0FBRixFQUFFLFFBR1gifQ==,bmFtZXNwYWNlIE0gewogICAgZXhwb3J0IHZhciBYID0gMTsKfQppbnRlcmZhY2UgTmF2aWdhdG9yIHsKICAgIGdldEdhbWVwYWRzKGZ1bmM/OiBhbnkpOiBhbnk7CiAgICB3ZWJraXRHZXRHYW1lcGFkcyhmdW5jPzogYW55KTogYW55CiAgICBtc0dldEdhbWVwYWRzKGZ1bmM/OiBhbnkpOiBhbnk7CiAgICB3ZWJraXRHYW1lcGFkcyhmdW5jPzogYW55KTogYW55Owp9Cg==,bmFtZXNwYWNlIG0xIHsKICAgIGV4cG9ydCBjbGFzcyBjMSB7CiAgICB9Cn0K diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt index f905f09e375bd..90873117587d3 100644 --- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt +++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt @@ -15,14 +15,14 @@ sourceFile:a.ts 4 > ^ 5 > ^^^^^^^^^^-> 1 > -2 >module +2 >namespace 3 > M 4 > { > export var X = 1; > } 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 6) Source(1, 9) + SourceIndex(0) +2 >Emitted(1, 5) Source(1, 11) + SourceIndex(0) +3 >Emitted(1, 6) Source(1, 12) + SourceIndex(0) 4 >Emitted(1, 7) Source(3, 2) + SourceIndex(0) --- >>>(function (M) { @@ -31,11 +31,11 @@ sourceFile:a.ts 3 > ^ 4 > ^-> 1-> -2 >module +2 >namespace 3 > M 1->Emitted(2, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(2, 12) Source(1, 8) + SourceIndex(0) -3 >Emitted(2, 13) Source(1, 9) + SourceIndex(0) +2 >Emitted(2, 12) Source(1, 11) + SourceIndex(0) +3 >Emitted(2, 13) Source(1, 12) + SourceIndex(0) --- >>> M.X = 1; 1->^^^^ @@ -76,10 +76,10 @@ sourceFile:a.ts > } 1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) 2 >Emitted(4, 2) Source(3, 2) + SourceIndex(0) -3 >Emitted(4, 4) Source(1, 8) + SourceIndex(0) -4 >Emitted(4, 5) Source(1, 9) + SourceIndex(0) -5 >Emitted(4, 10) Source(1, 8) + SourceIndex(0) -6 >Emitted(4, 11) Source(1, 9) + SourceIndex(0) +3 >Emitted(4, 4) Source(1, 11) + SourceIndex(0) +4 >Emitted(4, 5) Source(1, 12) + SourceIndex(0) +5 >Emitted(4, 10) Source(1, 11) + SourceIndex(0) +6 >Emitted(4, 11) Source(1, 12) + SourceIndex(0) 7 >Emitted(4, 19) Source(3, 2) + SourceIndex(0) --- ------------------------------------------------------------------- @@ -93,15 +93,15 @@ sourceFile:b.ts 4 > ^ 5 > ^^^^^^^^^^-> 1 > -2 >module +2 >namespace 3 > m1 4 > { > export class c1 { > } > } 1 >Emitted(5, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(5, 5) Source(1, 8) + SourceIndex(1) -3 >Emitted(5, 7) Source(1, 10) + SourceIndex(1) +2 >Emitted(5, 5) Source(1, 11) + SourceIndex(1) +3 >Emitted(5, 7) Source(1, 13) + SourceIndex(1) 4 >Emitted(5, 8) Source(4, 2) + SourceIndex(1) --- >>>(function (m1) { @@ -110,11 +110,11 @@ sourceFile:b.ts 3 > ^^ 4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> -2 >module +2 >namespace 3 > m1 1->Emitted(6, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(6, 12) Source(1, 8) + SourceIndex(1) -3 >Emitted(6, 14) Source(1, 10) + SourceIndex(1) +2 >Emitted(6, 12) Source(1, 11) + SourceIndex(1) +3 >Emitted(6, 14) Source(1, 13) + SourceIndex(1) --- >>> var c1 = /** @class */ (function () { 1->^^^^ @@ -201,10 +201,10 @@ sourceFile:b.ts > } 1->Emitted(13, 1) Source(4, 1) + SourceIndex(1) 2 >Emitted(13, 2) Source(4, 2) + SourceIndex(1) -3 >Emitted(13, 4) Source(1, 8) + SourceIndex(1) -4 >Emitted(13, 6) Source(1, 10) + SourceIndex(1) -5 >Emitted(13, 11) Source(1, 8) + SourceIndex(1) -6 >Emitted(13, 13) Source(1, 10) + SourceIndex(1) +3 >Emitted(13, 4) Source(1, 11) + SourceIndex(1) +4 >Emitted(13, 6) Source(1, 13) + SourceIndex(1) +5 >Emitted(13, 11) Source(1, 11) + SourceIndex(1) +6 >Emitted(13, 13) Source(1, 13) + SourceIndex(1) 7 >Emitted(13, 21) Source(4, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=fooResult.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.symbols b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.symbols index b98896057b0a6..14ed9c57d4bb7 100644 --- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.symbols +++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts] //// === a.ts === -module M { +namespace M { >M : Symbol(M, Decl(a.ts, 0, 0)) export var X = 1; @@ -28,11 +28,11 @@ interface Navigator { } === b.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(b.ts, 0, 0)) export class c1 { ->c1 : Symbol(c1, Decl(b.ts, 0, 11)) +>c1 : Symbol(c1, Decl(b.ts, 0, 14)) } } diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types index 2911f8b23b94d..82bcd5200afca 100644 --- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types +++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts] //// === a.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -34,7 +34,7 @@ interface Navigator { } === b.ts === -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/sourcemapValidationDuplicateNames.js b/tests/baselines/reference/sourcemapValidationDuplicateNames.js index 00e5576bf04ce..8257554878650 100644 --- a/tests/baselines/reference/sourcemapValidationDuplicateNames.js +++ b/tests/baselines/reference/sourcemapValidationDuplicateNames.js @@ -1,12 +1,12 @@ //// [tests/cases/compiler/sourcemapValidationDuplicateNames.ts] //// //// [sourcemapValidationDuplicateNames.ts] -module m1 { +namespace m1 { var x = 10; export class c { } } -module m1 { +namespace m1 { var b = new m1.c(); } diff --git a/tests/baselines/reference/sourcemapValidationDuplicateNames.js.map b/tests/baselines/reference/sourcemapValidationDuplicateNames.js.map index 9a6d1d9f1e8e1..4d175f8936e39 100644 --- a/tests/baselines/reference/sourcemapValidationDuplicateNames.js.map +++ b/tests/baselines/reference/sourcemapValidationDuplicateNames.js.map @@ -1,3 +1,3 @@ //// [sourcemapValidationDuplicateNames.js.map] -{"version":3,"file":"sourcemapValidationDuplicateNames.js","sourceRoot":"","sources":["sourcemapValidationDuplicateNames.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,CAIR;AAJD,WAAO,EAAE;IACL,IAAI,CAAC,GAAG,EAAE,CAAC;IACX;QAAA;QACA,CAAC;QAAD,QAAC;IAAD,CAAC,AADD,IACC;IADY,IAAC,IACb,CAAA;AACL,CAAC,EAJM,EAAE,KAAF,EAAE,QAIR;AACD,WAAO,EAAE;IACL,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;AACvB,CAAC,EAFM,EAAE,KAAF,EAAE,QAER"} -//// https://sokra.github.io/source-map-visualization#base64,dmFyIG0xOw0KKGZ1bmN0aW9uIChtMSkgew0KICAgIHZhciB4ID0gMTA7DQogICAgdmFyIGMgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgICAgIGZ1bmN0aW9uIGMoKSB7DQogICAgICAgIH0NCiAgICAgICAgcmV0dXJuIGM7DQogICAgfSgpKTsNCiAgICBtMS5jID0gYzsNCn0pKG0xIHx8IChtMSA9IHt9KSk7DQooZnVuY3Rpb24gKG0xKSB7DQogICAgdmFyIGIgPSBuZXcgbTEuYygpOw0KfSkobTEgfHwgKG0xID0ge30pKTsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPXNvdXJjZW1hcFZhbGlkYXRpb25EdXBsaWNhdGVOYW1lcy5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlbWFwVmFsaWRhdGlvbkR1cGxpY2F0ZU5hbWVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsic291cmNlbWFwVmFsaWRhdGlvbkR1cGxpY2F0ZU5hbWVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLElBQU8sRUFBRSxDQUlSO0FBSkQsV0FBTyxFQUFFO0lBQ0wsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQ1g7UUFBQTtRQUNBLENBQUM7UUFBRCxRQUFDO0lBQUQsQ0FBQyxBQURELElBQ0M7SUFEWSxJQUFDLElBQ2IsQ0FBQTtBQUNMLENBQUMsRUFKTSxFQUFFLEtBQUYsRUFBRSxRQUlSO0FBQ0QsV0FBTyxFQUFFO0lBQ0wsSUFBSSxDQUFDLEdBQUcsSUFBSSxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUM7QUFDdkIsQ0FBQyxFQUZNLEVBQUUsS0FBRixFQUFFLFFBRVIifQ==,bW9kdWxlIG0xIHsKICAgIHZhciB4ID0gMTA7CiAgICBleHBvcnQgY2xhc3MgYyB7CiAgICB9Cn0KbW9kdWxlIG0xIHsKICAgIHZhciBiID0gbmV3IG0xLmMoKTsKfQ== +{"version":3,"file":"sourcemapValidationDuplicateNames.js","sourceRoot":"","sources":["sourcemapValidationDuplicateNames.ts"],"names":[],"mappings":"AAAA,IAAU,EAAE,CAIX;AAJD,WAAU,EAAE;IACR,IAAI,CAAC,GAAG,EAAE,CAAC;IACX;QAAA;QACA,CAAC;QAAD,QAAC;IAAD,CAAC,AADD,IACC;IADY,IAAC,IACb,CAAA;AACL,CAAC,EAJS,EAAE,KAAF,EAAE,QAIX;AACD,WAAU,EAAE;IACR,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;AACvB,CAAC,EAFS,EAAE,KAAF,EAAE,QAEX"} +//// https://sokra.github.io/source-map-visualization#base64,dmFyIG0xOw0KKGZ1bmN0aW9uIChtMSkgew0KICAgIHZhciB4ID0gMTA7DQogICAgdmFyIGMgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgICAgIGZ1bmN0aW9uIGMoKSB7DQogICAgICAgIH0NCiAgICAgICAgcmV0dXJuIGM7DQogICAgfSgpKTsNCiAgICBtMS5jID0gYzsNCn0pKG0xIHx8IChtMSA9IHt9KSk7DQooZnVuY3Rpb24gKG0xKSB7DQogICAgdmFyIGIgPSBuZXcgbTEuYygpOw0KfSkobTEgfHwgKG0xID0ge30pKTsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPXNvdXJjZW1hcFZhbGlkYXRpb25EdXBsaWNhdGVOYW1lcy5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlbWFwVmFsaWRhdGlvbkR1cGxpY2F0ZU5hbWVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsic291cmNlbWFwVmFsaWRhdGlvbkR1cGxpY2F0ZU5hbWVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLElBQVUsRUFBRSxDQUlYO0FBSkQsV0FBVSxFQUFFO0lBQ1IsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQ1g7UUFBQTtRQUNBLENBQUM7UUFBRCxRQUFDO0lBQUQsQ0FBQyxBQURELElBQ0M7SUFEWSxJQUFDLElBQ2IsQ0FBQTtBQUNMLENBQUMsRUFKUyxFQUFFLEtBQUYsRUFBRSxRQUlYO0FBQ0QsV0FBVSxFQUFFO0lBQ1IsSUFBSSxDQUFDLEdBQUcsSUFBSSxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUM7QUFDdkIsQ0FBQyxFQUZTLEVBQUUsS0FBRixFQUFFLFFBRVgifQ==,bmFtZXNwYWNlIG0xIHsKICAgIHZhciB4ID0gMTA7CiAgICBleHBvcnQgY2xhc3MgYyB7CiAgICB9Cn0KbmFtZXNwYWNlIG0xIHsKICAgIHZhciBiID0gbmV3IG0xLmMoKTsKfQ== diff --git a/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt b/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt index a028dd342ef29..0c73e4b29a49a 100644 --- a/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt +++ b/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt @@ -15,7 +15,7 @@ sourceFile:sourcemapValidationDuplicateNames.ts 4 > ^ 5 > ^^^^^^^^^^-> 1 > -2 >module +2 >namespace 3 > m1 4 > { > var x = 10; @@ -23,8 +23,8 @@ sourceFile:sourcemapValidationDuplicateNames.ts > } > } 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) +2 >Emitted(1, 5) Source(1, 11) + SourceIndex(0) +3 >Emitted(1, 7) Source(1, 13) + SourceIndex(0) 4 >Emitted(1, 8) Source(5, 2) + SourceIndex(0) --- >>>(function (m1) { @@ -33,11 +33,11 @@ sourceFile:sourcemapValidationDuplicateNames.ts 3 > ^^ 4 > ^^^-> 1-> -2 >module +2 >namespace 3 > m1 1->Emitted(2, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(2, 12) Source(1, 8) + SourceIndex(0) -3 >Emitted(2, 14) Source(1, 10) + SourceIndex(0) +2 >Emitted(2, 12) Source(1, 11) + SourceIndex(0) +3 >Emitted(2, 14) Source(1, 13) + SourceIndex(0) --- >>> var x = 10; 1->^^^^ @@ -146,10 +146,10 @@ sourceFile:sourcemapValidationDuplicateNames.ts > } 1->Emitted(10, 1) Source(5, 1) + SourceIndex(0) 2 >Emitted(10, 2) Source(5, 2) + SourceIndex(0) -3 >Emitted(10, 4) Source(1, 8) + SourceIndex(0) -4 >Emitted(10, 6) Source(1, 10) + SourceIndex(0) -5 >Emitted(10, 11) Source(1, 8) + SourceIndex(0) -6 >Emitted(10, 13) Source(1, 10) + SourceIndex(0) +3 >Emitted(10, 4) Source(1, 11) + SourceIndex(0) +4 >Emitted(10, 6) Source(1, 13) + SourceIndex(0) +5 >Emitted(10, 11) Source(1, 11) + SourceIndex(0) +6 >Emitted(10, 13) Source(1, 13) + SourceIndex(0) 7 >Emitted(10, 21) Source(5, 2) + SourceIndex(0) --- >>>(function (m1) { @@ -159,11 +159,11 @@ sourceFile:sourcemapValidationDuplicateNames.ts 4 > ^^^^^^^^^^^-> 1 > > -2 >module +2 >namespace 3 > m1 1 >Emitted(11, 1) Source(6, 1) + SourceIndex(0) -2 >Emitted(11, 12) Source(6, 8) + SourceIndex(0) -3 >Emitted(11, 14) Source(6, 10) + SourceIndex(0) +2 >Emitted(11, 12) Source(6, 11) + SourceIndex(0) +3 >Emitted(11, 14) Source(6, 13) + SourceIndex(0) --- >>> var b = new m1.c(); 1->^^^^ @@ -219,10 +219,10 @@ sourceFile:sourcemapValidationDuplicateNames.ts > } 1 >Emitted(13, 1) Source(8, 1) + SourceIndex(0) 2 >Emitted(13, 2) Source(8, 2) + SourceIndex(0) -3 >Emitted(13, 4) Source(6, 8) + SourceIndex(0) -4 >Emitted(13, 6) Source(6, 10) + SourceIndex(0) -5 >Emitted(13, 11) Source(6, 8) + SourceIndex(0) -6 >Emitted(13, 13) Source(6, 10) + SourceIndex(0) +3 >Emitted(13, 4) Source(6, 11) + SourceIndex(0) +4 >Emitted(13, 6) Source(6, 13) + SourceIndex(0) +5 >Emitted(13, 11) Source(6, 11) + SourceIndex(0) +6 >Emitted(13, 13) Source(6, 13) + SourceIndex(0) 7 >Emitted(13, 21) Source(8, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourcemapValidationDuplicateNames.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourcemapValidationDuplicateNames.symbols b/tests/baselines/reference/sourcemapValidationDuplicateNames.symbols index 728ffc13cb935..1d895f41954c8 100644 --- a/tests/baselines/reference/sourcemapValidationDuplicateNames.symbols +++ b/tests/baselines/reference/sourcemapValidationDuplicateNames.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/sourcemapValidationDuplicateNames.ts] //// === sourcemapValidationDuplicateNames.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(sourcemapValidationDuplicateNames.ts, 0, 0), Decl(sourcemapValidationDuplicateNames.ts, 4, 1)) var x = 10; @@ -11,7 +11,7 @@ module m1 { >c : Symbol(c, Decl(sourcemapValidationDuplicateNames.ts, 1, 15)) } } -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(sourcemapValidationDuplicateNames.ts, 0, 0), Decl(sourcemapValidationDuplicateNames.ts, 4, 1)) var b = new m1.c(); diff --git a/tests/baselines/reference/sourcemapValidationDuplicateNames.types b/tests/baselines/reference/sourcemapValidationDuplicateNames.types index 85f2b3db2cc3e..8b47b622f8c69 100644 --- a/tests/baselines/reference/sourcemapValidationDuplicateNames.types +++ b/tests/baselines/reference/sourcemapValidationDuplicateNames.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/sourcemapValidationDuplicateNames.ts] //// === sourcemapValidationDuplicateNames.ts === -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -16,7 +16,7 @@ module m1 { > : ^ } } -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/specializationOfExportedClass.js b/tests/baselines/reference/specializationOfExportedClass.js index f6633f7ee5df4..354b05e36ac40 100644 --- a/tests/baselines/reference/specializationOfExportedClass.js +++ b/tests/baselines/reference/specializationOfExportedClass.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/specializationOfExportedClass.ts] //// //// [specializationOfExportedClass.ts] -module M { +namespace M { export class C { } diff --git a/tests/baselines/reference/specializationOfExportedClass.symbols b/tests/baselines/reference/specializationOfExportedClass.symbols index f977c3708f216..cf95442b94a05 100644 --- a/tests/baselines/reference/specializationOfExportedClass.symbols +++ b/tests/baselines/reference/specializationOfExportedClass.symbols @@ -1,18 +1,18 @@ //// [tests/cases/compiler/specializationOfExportedClass.ts] //// === specializationOfExportedClass.ts === -module M { +namespace M { >M : Symbol(M, Decl(specializationOfExportedClass.ts, 0, 0)) export class C { } ->C : Symbol(C, Decl(specializationOfExportedClass.ts, 0, 10)) +>C : Symbol(C, Decl(specializationOfExportedClass.ts, 0, 13)) >T : Symbol(T, Decl(specializationOfExportedClass.ts, 2, 15)) } var x = new M.C(); >x : Symbol(x, Decl(specializationOfExportedClass.ts, 6, 3)) ->M.C : Symbol(M.C, Decl(specializationOfExportedClass.ts, 0, 10)) +>M.C : Symbol(M.C, Decl(specializationOfExportedClass.ts, 0, 13)) >M : Symbol(M, Decl(specializationOfExportedClass.ts, 0, 0)) ->C : Symbol(M.C, Decl(specializationOfExportedClass.ts, 0, 10)) +>C : Symbol(M.C, Decl(specializationOfExportedClass.ts, 0, 13)) diff --git a/tests/baselines/reference/specializationOfExportedClass.types b/tests/baselines/reference/specializationOfExportedClass.types index 0a1a0589424aa..ff2d323fa3355 100644 --- a/tests/baselines/reference/specializationOfExportedClass.types +++ b/tests/baselines/reference/specializationOfExportedClass.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/specializationOfExportedClass.ts] //// === specializationOfExportedClass.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/spellingSuggestionModule.errors.txt b/tests/baselines/reference/spellingSuggestionModule.errors.txt index 47fb42baec688..3822700c9eada 100644 --- a/tests/baselines/reference/spellingSuggestionModule.errors.txt +++ b/tests/baselines/reference/spellingSuggestionModule.errors.txt @@ -14,9 +14,9 @@ spellingSuggestionModule.ts(8,1): error TS2552: Cannot find name 'faroo'. Did yo ~~~~~~ !!! error TS2304: Cannot find name 'barfoo'. - declare module farboo { export const x: number; } + declare namespace farboo { export const x: number; } faroo; ~~~~~ !!! error TS2552: Cannot find name 'faroo'. Did you mean 'farboo'? -!!! related TS2728 spellingSuggestionModule.ts:7:16: 'farboo' is declared here. +!!! related TS2728 spellingSuggestionModule.ts:7:19: 'farboo' is declared here. \ No newline at end of file diff --git a/tests/baselines/reference/spellingSuggestionModule.js b/tests/baselines/reference/spellingSuggestionModule.js index d79b876628dd1..947b31a0175cd 100644 --- a/tests/baselines/reference/spellingSuggestionModule.js +++ b/tests/baselines/reference/spellingSuggestionModule.js @@ -7,7 +7,7 @@ foobar; declare module 'barfoo' { export const x: number; } barfoo; -declare module farboo { export const x: number; } +declare namespace farboo { export const x: number; } faroo; diff --git a/tests/baselines/reference/spellingSuggestionModule.symbols b/tests/baselines/reference/spellingSuggestionModule.symbols index 78c54aa11a67c..71a84af8bd147 100644 --- a/tests/baselines/reference/spellingSuggestionModule.symbols +++ b/tests/baselines/reference/spellingSuggestionModule.symbols @@ -13,9 +13,9 @@ declare module 'barfoo' { export const x: number; } barfoo; -declare module farboo { export const x: number; } +declare namespace farboo { export const x: number; } >farboo : Symbol(farboo, Decl(spellingSuggestionModule.ts, 4, 7)) ->x : Symbol(x, Decl(spellingSuggestionModule.ts, 6, 36)) +>x : Symbol(x, Decl(spellingSuggestionModule.ts, 6, 39)) faroo; diff --git a/tests/baselines/reference/spellingSuggestionModule.types b/tests/baselines/reference/spellingSuggestionModule.types index eeeb1be81fe12..191065d93aa1b 100644 --- a/tests/baselines/reference/spellingSuggestionModule.types +++ b/tests/baselines/reference/spellingSuggestionModule.types @@ -21,7 +21,7 @@ barfoo; >barfoo : any > : ^^^ -declare module farboo { export const x: number; } +declare namespace farboo { export const x: number; } >farboo : typeof farboo > : ^^^^^^^^^^^^^ >x : number diff --git a/tests/baselines/reference/staticMemberExportAccess.errors.txt b/tests/baselines/reference/staticMemberExportAccess.errors.txt index b9dfba1801cb5..645af2a68a319 100644 --- a/tests/baselines/reference/staticMemberExportAccess.errors.txt +++ b/tests/baselines/reference/staticMemberExportAccess.errors.txt @@ -11,7 +11,7 @@ staticMemberExportAccess.ts(18,18): error TS2339: Property 'x' does not exist on return -1; } } - module Sammy { + namespace Sammy { export var x = 1; } interface JQueryStatic { diff --git a/tests/baselines/reference/staticMemberExportAccess.js b/tests/baselines/reference/staticMemberExportAccess.js index 0de03a0aae01c..a7211bedacbc3 100644 --- a/tests/baselines/reference/staticMemberExportAccess.js +++ b/tests/baselines/reference/staticMemberExportAccess.js @@ -7,7 +7,7 @@ class Sammy { return -1; } } -module Sammy { +namespace Sammy { export var x = 1; } interface JQueryStatic { diff --git a/tests/baselines/reference/staticMemberExportAccess.symbols b/tests/baselines/reference/staticMemberExportAccess.symbols index d8d128ba7a0cd..877c2d7400543 100644 --- a/tests/baselines/reference/staticMemberExportAccess.symbols +++ b/tests/baselines/reference/staticMemberExportAccess.symbols @@ -13,7 +13,7 @@ class Sammy { return -1; } } -module Sammy { +namespace Sammy { >Sammy : Symbol(Sammy, Decl(staticMemberExportAccess.ts, 0, 0), Decl(staticMemberExportAccess.ts, 5, 1)) export var x = 1; diff --git a/tests/baselines/reference/staticMemberExportAccess.types b/tests/baselines/reference/staticMemberExportAccess.types index a6625662ca0ed..91add29a4129a 100644 --- a/tests/baselines/reference/staticMemberExportAccess.types +++ b/tests/baselines/reference/staticMemberExportAccess.types @@ -22,7 +22,7 @@ class Sammy { > : ^ } } -module Sammy { +namespace Sammy { >Sammy : typeof Sammy > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/staticMethodReferencingTypeArgument1.errors.txt b/tests/baselines/reference/staticMethodReferencingTypeArgument1.errors.txt index 6e0f4a1d15a3e..e52a3611745fb 100644 --- a/tests/baselines/reference/staticMethodReferencingTypeArgument1.errors.txt +++ b/tests/baselines/reference/staticMethodReferencingTypeArgument1.errors.txt @@ -4,7 +4,7 @@ staticMethodReferencingTypeArgument1.ts(10,43): error TS2302: Static members can ==== staticMethodReferencingTypeArgument1.ts (3 errors) ==== - module Editor { + namespace Editor { export class List { next: List; prev: List; diff --git a/tests/baselines/reference/staticMethodReferencingTypeArgument1.js b/tests/baselines/reference/staticMethodReferencingTypeArgument1.js index d3992c54b766a..696b92e48823b 100644 --- a/tests/baselines/reference/staticMethodReferencingTypeArgument1.js +++ b/tests/baselines/reference/staticMethodReferencingTypeArgument1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/staticMethodReferencingTypeArgument1.ts] //// //// [staticMethodReferencingTypeArgument1.ts] -module Editor { +namespace Editor { export class List { next: List; prev: List; diff --git a/tests/baselines/reference/staticMethodReferencingTypeArgument1.symbols b/tests/baselines/reference/staticMethodReferencingTypeArgument1.symbols index efedab7a0bfc0..b82b8b2958d1a 100644 --- a/tests/baselines/reference/staticMethodReferencingTypeArgument1.symbols +++ b/tests/baselines/reference/staticMethodReferencingTypeArgument1.symbols @@ -1,21 +1,21 @@ //// [tests/cases/compiler/staticMethodReferencingTypeArgument1.ts] //// === staticMethodReferencingTypeArgument1.ts === -module Editor { +namespace Editor { >Editor : Symbol(Editor, Decl(staticMethodReferencingTypeArgument1.ts, 0, 0)) export class List { ->List : Symbol(List, Decl(staticMethodReferencingTypeArgument1.ts, 0, 15)) +>List : Symbol(List, Decl(staticMethodReferencingTypeArgument1.ts, 0, 18)) >T : Symbol(T, Decl(staticMethodReferencingTypeArgument1.ts, 1, 22)) next: List; >next : Symbol(List.next, Decl(staticMethodReferencingTypeArgument1.ts, 1, 26)) ->List : Symbol(List, Decl(staticMethodReferencingTypeArgument1.ts, 0, 15)) +>List : Symbol(List, Decl(staticMethodReferencingTypeArgument1.ts, 0, 18)) >T : Symbol(T, Decl(staticMethodReferencingTypeArgument1.ts, 1, 22)) prev: List; >prev : Symbol(List.prev, Decl(staticMethodReferencingTypeArgument1.ts, 2, 22)) ->List : Symbol(List, Decl(staticMethodReferencingTypeArgument1.ts, 0, 15)) +>List : Symbol(List, Decl(staticMethodReferencingTypeArgument1.ts, 0, 18)) >T : Symbol(T, Decl(staticMethodReferencingTypeArgument1.ts, 1, 22)) constructor(public isHead: boolean, public data: T) { @@ -26,14 +26,14 @@ module Editor { static MakeHead(): List { >MakeHead : Symbol(List.MakeHead, Decl(staticMethodReferencingTypeArgument1.ts, 6, 9)) ->List : Symbol(List, Decl(staticMethodReferencingTypeArgument1.ts, 0, 15)) +>List : Symbol(List, Decl(staticMethodReferencingTypeArgument1.ts, 0, 18)) >T : Symbol(T) var entry: List = new List(true, null); // can't access T here >entry : Symbol(entry, Decl(staticMethodReferencingTypeArgument1.ts, 9, 15)) ->List : Symbol(List, Decl(staticMethodReferencingTypeArgument1.ts, 0, 15)) +>List : Symbol(List, Decl(staticMethodReferencingTypeArgument1.ts, 0, 18)) >T : Symbol(T) ->List : Symbol(List, Decl(staticMethodReferencingTypeArgument1.ts, 0, 15)) +>List : Symbol(List, Decl(staticMethodReferencingTypeArgument1.ts, 0, 18)) >T : Symbol(T) entry.prev = entry; diff --git a/tests/baselines/reference/staticMethodReferencingTypeArgument1.types b/tests/baselines/reference/staticMethodReferencingTypeArgument1.types index 89071f80f5181..fe2385303ec86 100644 --- a/tests/baselines/reference/staticMethodReferencingTypeArgument1.types +++ b/tests/baselines/reference/staticMethodReferencingTypeArgument1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/staticMethodReferencingTypeArgument1.ts] //// === staticMethodReferencingTypeArgument1.ts === -module Editor { +namespace Editor { >Editor : typeof Editor > : ^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=false).errors.txt b/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=false).errors.txt index 2416c0a2ae63a..b2590432eae80 100644 --- a/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=false).errors.txt +++ b/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=false).errors.txt @@ -388,7 +388,7 @@ staticPropertyNameConflicts.ts(346,12): error TS2699: Static property 'arguments // === Static properties on default exported classes === // name - module TestOnDefaultExportedClass_1 { + namespace TestOnDefaultExportedClass_1 { class StaticName { static name: number; // error without useDefineForClassFields ~~~~ @@ -404,7 +404,7 @@ staticPropertyNameConflicts.ts(346,12): error TS2699: Static property 'arguments [FunctionPropertyNames.name]: string; // ok } - module TestOnDefaultExportedClass_2 { + namespace TestOnDefaultExportedClass_2 { class StaticNameFn { static name() {} // error without useDefineForClassFields ~~~~ @@ -421,7 +421,7 @@ staticPropertyNameConflicts.ts(346,12): error TS2699: Static property 'arguments } // length - module TestOnDefaultExportedClass_3 { + namespace TestOnDefaultExportedClass_3 { export default class StaticLength { ~~~~~~~ !!! error TS1319: A default export can only be used in an ECMAScript-style module. @@ -439,7 +439,7 @@ staticPropertyNameConflicts.ts(346,12): error TS2699: Static property 'arguments [FunctionPropertyNames.length]: string; // ok } - module TestOnDefaultExportedClass_4 { + namespace TestOnDefaultExportedClass_4 { export default class StaticLengthFn { ~~~~~~~ !!! error TS1319: A default export can only be used in an ECMAScript-style module. @@ -458,7 +458,7 @@ staticPropertyNameConflicts.ts(346,12): error TS2699: Static property 'arguments } // prototype - module TestOnDefaultExportedClass_5 { + namespace TestOnDefaultExportedClass_5 { export default class StaticPrototype { ~~~~~~~ !!! error TS1319: A default export can only be used in an ECMAScript-style module. @@ -476,7 +476,7 @@ staticPropertyNameConflicts.ts(346,12): error TS2699: Static property 'arguments [FunctionPropertyNames.prototype]: string; // ok } - module TestOnDefaultExportedClass_6 { + namespace TestOnDefaultExportedClass_6 { export default class StaticPrototypeFn { ~~~~~~~ !!! error TS1319: A default export can only be used in an ECMAScript-style module. @@ -499,7 +499,7 @@ staticPropertyNameConflicts.ts(346,12): error TS2699: Static property 'arguments } // caller - module TestOnDefaultExportedClass_7 { + namespace TestOnDefaultExportedClass_7 { export default class StaticCaller { ~~~~~~~ !!! error TS1319: A default export can only be used in an ECMAScript-style module. @@ -517,7 +517,7 @@ staticPropertyNameConflicts.ts(346,12): error TS2699: Static property 'arguments [FunctionPropertyNames.caller]: string; // ok } - module TestOnDefaultExportedClass_8 { + namespace TestOnDefaultExportedClass_8 { export default class StaticCallerFn { ~~~~~~~ !!! error TS1319: A default export can only be used in an ECMAScript-style module. @@ -536,7 +536,7 @@ staticPropertyNameConflicts.ts(346,12): error TS2699: Static property 'arguments } // arguments - module TestOnDefaultExportedClass_9 { + namespace TestOnDefaultExportedClass_9 { export default class StaticArguments { ~~~~~~~ !!! error TS1319: A default export can only be used in an ECMAScript-style module. @@ -554,7 +554,7 @@ staticPropertyNameConflicts.ts(346,12): error TS2699: Static property 'arguments [FunctionPropertyNames.arguments]: string; // ok } - module TestOnDefaultExportedClass_10 { + namespace TestOnDefaultExportedClass_10 { export default class StaticArgumentsFn { ~~~~~~~ !!! error TS1319: A default export can only be used in an ECMAScript-style module. diff --git a/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=false).js b/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=false).js index 22896845f9fd4..eb09b2dc0b524 100644 --- a/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=false).js +++ b/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=false).js @@ -226,7 +226,7 @@ var StaticArgumentsFn_Anonymous2 = class { // === Static properties on default exported classes === // name -module TestOnDefaultExportedClass_1 { +namespace TestOnDefaultExportedClass_1 { class StaticName { static name: number; // error without useDefineForClassFields name: string; // ok @@ -238,7 +238,7 @@ export class ExportedStaticName { [FunctionPropertyNames.name]: string; // ok } -module TestOnDefaultExportedClass_2 { +namespace TestOnDefaultExportedClass_2 { class StaticNameFn { static name() {} // error without useDefineForClassFields name() {} // ok @@ -251,7 +251,7 @@ export class ExportedStaticNameFn { } // length -module TestOnDefaultExportedClass_3 { +namespace TestOnDefaultExportedClass_3 { export default class StaticLength { static length: number; // error without useDefineForClassFields length: string; // ok @@ -263,7 +263,7 @@ export class ExportedStaticLength { [FunctionPropertyNames.length]: string; // ok } -module TestOnDefaultExportedClass_4 { +namespace TestOnDefaultExportedClass_4 { export default class StaticLengthFn { static length() {} // error without useDefineForClassFields length() {} // ok @@ -276,7 +276,7 @@ export class ExportedStaticLengthFn { } // prototype -module TestOnDefaultExportedClass_5 { +namespace TestOnDefaultExportedClass_5 { export default class StaticPrototype { static prototype: number; // always an error prototype: string; // ok @@ -288,7 +288,7 @@ export class ExportedStaticPrototype { [FunctionPropertyNames.prototype]: string; // ok } -module TestOnDefaultExportedClass_6 { +namespace TestOnDefaultExportedClass_6 { export default class StaticPrototypeFn { static prototype() {} // always an error prototype() {} // ok @@ -301,7 +301,7 @@ export class ExportedStaticPrototypeFn { } // caller -module TestOnDefaultExportedClass_7 { +namespace TestOnDefaultExportedClass_7 { export default class StaticCaller { static caller: number; // error without useDefineForClassFields caller: string; // ok @@ -313,7 +313,7 @@ export class ExportedStaticCaller { [FunctionPropertyNames.caller]: string; // ok } -module TestOnDefaultExportedClass_8 { +namespace TestOnDefaultExportedClass_8 { export default class StaticCallerFn { static caller() {} // error without useDefineForClassFields caller() {} // ok @@ -326,7 +326,7 @@ export class ExportedStaticCallerFn { } // arguments -module TestOnDefaultExportedClass_9 { +namespace TestOnDefaultExportedClass_9 { export default class StaticArguments { static arguments: number; // error without useDefineForClassFields arguments: string; // ok @@ -338,7 +338,7 @@ export class ExportedStaticArguments { [FunctionPropertyNames.arguments]: string; // ok } -module TestOnDefaultExportedClass_10 { +namespace TestOnDefaultExportedClass_10 { export default class StaticArgumentsFn { static arguments() {} // error without useDefineForClassFields arguments() {} // ok diff --git a/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=false).symbols b/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=false).symbols index 3452acae0dce3..f9cf9064c688b 100644 --- a/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=false).symbols +++ b/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=false).symbols @@ -559,11 +559,11 @@ var StaticArgumentsFn_Anonymous2 = class { // === Static properties on default exported classes === // name -module TestOnDefaultExportedClass_1 { +namespace TestOnDefaultExportedClass_1 { >TestOnDefaultExportedClass_1 : Symbol(TestOnDefaultExportedClass_1, Decl(staticPropertyNameConflicts.ts, 219, 1)) class StaticName { ->StaticName : Symbol(StaticName, Decl(staticPropertyNameConflicts.ts, 225, 37)) +>StaticName : Symbol(StaticName, Decl(staticPropertyNameConflicts.ts, 225, 40)) static name: number; // error without useDefineForClassFields >name : Symbol(StaticName.name, Decl(staticPropertyNameConflicts.ts, 226, 22)) @@ -589,11 +589,11 @@ export class ExportedStaticName { >name : Symbol(name, Decl(staticPropertyNameConflicts.ts, 0, 31)) } -module TestOnDefaultExportedClass_2 { +namespace TestOnDefaultExportedClass_2 { >TestOnDefaultExportedClass_2 : Symbol(TestOnDefaultExportedClass_2, Decl(staticPropertyNameConflicts.ts, 235, 1)) class StaticNameFn { ->StaticNameFn : Symbol(StaticNameFn, Decl(staticPropertyNameConflicts.ts, 237, 37)) +>StaticNameFn : Symbol(StaticNameFn, Decl(staticPropertyNameConflicts.ts, 237, 40)) static name() {} // error without useDefineForClassFields >name : Symbol(StaticNameFn.name, Decl(staticPropertyNameConflicts.ts, 238, 24)) @@ -620,11 +620,11 @@ export class ExportedStaticNameFn { } // length -module TestOnDefaultExportedClass_3 { +namespace TestOnDefaultExportedClass_3 { >TestOnDefaultExportedClass_3 : Symbol(TestOnDefaultExportedClass_3, Decl(staticPropertyNameConflicts.ts, 247, 1)) export default class StaticLength { ->StaticLength : Symbol(StaticLength, Decl(staticPropertyNameConflicts.ts, 250, 37)) +>StaticLength : Symbol(StaticLength, Decl(staticPropertyNameConflicts.ts, 250, 40)) static length: number; // error without useDefineForClassFields >length : Symbol(StaticLength.length, Decl(staticPropertyNameConflicts.ts, 251, 39)) @@ -650,11 +650,11 @@ export class ExportedStaticLength { >length : Symbol(length, Decl(staticPropertyNameConflicts.ts, 1, 17)) } -module TestOnDefaultExportedClass_4 { +namespace TestOnDefaultExportedClass_4 { >TestOnDefaultExportedClass_4 : Symbol(TestOnDefaultExportedClass_4, Decl(staticPropertyNameConflicts.ts, 260, 1)) export default class StaticLengthFn { ->StaticLengthFn : Symbol(StaticLengthFn, Decl(staticPropertyNameConflicts.ts, 262, 37)) +>StaticLengthFn : Symbol(StaticLengthFn, Decl(staticPropertyNameConflicts.ts, 262, 40)) static length() {} // error without useDefineForClassFields >length : Symbol(StaticLengthFn.length, Decl(staticPropertyNameConflicts.ts, 263, 41)) @@ -681,11 +681,11 @@ export class ExportedStaticLengthFn { } // prototype -module TestOnDefaultExportedClass_5 { +namespace TestOnDefaultExportedClass_5 { >TestOnDefaultExportedClass_5 : Symbol(TestOnDefaultExportedClass_5, Decl(staticPropertyNameConflicts.ts, 272, 1)) export default class StaticPrototype { ->StaticPrototype : Symbol(StaticPrototype, Decl(staticPropertyNameConflicts.ts, 275, 37)) +>StaticPrototype : Symbol(StaticPrototype, Decl(staticPropertyNameConflicts.ts, 275, 40)) static prototype: number; // always an error >prototype : Symbol(StaticPrototype.prototype, Decl(staticPropertyNameConflicts.ts, 276, 42)) @@ -711,11 +711,11 @@ export class ExportedStaticPrototype { >prototype : Symbol(prototype, Decl(staticPropertyNameConflicts.ts, 2, 21)) } -module TestOnDefaultExportedClass_6 { +namespace TestOnDefaultExportedClass_6 { >TestOnDefaultExportedClass_6 : Symbol(TestOnDefaultExportedClass_6, Decl(staticPropertyNameConflicts.ts, 285, 1)) export default class StaticPrototypeFn { ->StaticPrototypeFn : Symbol(StaticPrototypeFn, Decl(staticPropertyNameConflicts.ts, 287, 37)) +>StaticPrototypeFn : Symbol(StaticPrototypeFn, Decl(staticPropertyNameConflicts.ts, 287, 40)) static prototype() {} // always an error >prototype : Symbol(StaticPrototypeFn.prototype, Decl(staticPropertyNameConflicts.ts, 288, 44)) @@ -742,11 +742,11 @@ export class ExportedStaticPrototypeFn { } // caller -module TestOnDefaultExportedClass_7 { +namespace TestOnDefaultExportedClass_7 { >TestOnDefaultExportedClass_7 : Symbol(TestOnDefaultExportedClass_7, Decl(staticPropertyNameConflicts.ts, 297, 1)) export default class StaticCaller { ->StaticCaller : Symbol(StaticCaller, Decl(staticPropertyNameConflicts.ts, 300, 37)) +>StaticCaller : Symbol(StaticCaller, Decl(staticPropertyNameConflicts.ts, 300, 40)) static caller: number; // error without useDefineForClassFields >caller : Symbol(StaticCaller.caller, Decl(staticPropertyNameConflicts.ts, 301, 39)) @@ -772,11 +772,11 @@ export class ExportedStaticCaller { >caller : Symbol(caller, Decl(staticPropertyNameConflicts.ts, 3, 27)) } -module TestOnDefaultExportedClass_8 { +namespace TestOnDefaultExportedClass_8 { >TestOnDefaultExportedClass_8 : Symbol(TestOnDefaultExportedClass_8, Decl(staticPropertyNameConflicts.ts, 310, 1)) export default class StaticCallerFn { ->StaticCallerFn : Symbol(StaticCallerFn, Decl(staticPropertyNameConflicts.ts, 312, 37)) +>StaticCallerFn : Symbol(StaticCallerFn, Decl(staticPropertyNameConflicts.ts, 312, 40)) static caller() {} // error without useDefineForClassFields >caller : Symbol(StaticCallerFn.caller, Decl(staticPropertyNameConflicts.ts, 313, 41)) @@ -803,11 +803,11 @@ export class ExportedStaticCallerFn { } // arguments -module TestOnDefaultExportedClass_9 { +namespace TestOnDefaultExportedClass_9 { >TestOnDefaultExportedClass_9 : Symbol(TestOnDefaultExportedClass_9, Decl(staticPropertyNameConflicts.ts, 322, 1)) export default class StaticArguments { ->StaticArguments : Symbol(StaticArguments, Decl(staticPropertyNameConflicts.ts, 325, 37)) +>StaticArguments : Symbol(StaticArguments, Decl(staticPropertyNameConflicts.ts, 325, 40)) static arguments: number; // error without useDefineForClassFields >arguments : Symbol(StaticArguments.arguments, Decl(staticPropertyNameConflicts.ts, 326, 42)) @@ -833,11 +833,11 @@ export class ExportedStaticArguments { >arguments : Symbol(arguments, Decl(staticPropertyNameConflicts.ts, 4, 21)) } -module TestOnDefaultExportedClass_10 { +namespace TestOnDefaultExportedClass_10 { >TestOnDefaultExportedClass_10 : Symbol(TestOnDefaultExportedClass_10, Decl(staticPropertyNameConflicts.ts, 335, 1)) export default class StaticArgumentsFn { ->StaticArgumentsFn : Symbol(StaticArgumentsFn, Decl(staticPropertyNameConflicts.ts, 337, 38)) +>StaticArgumentsFn : Symbol(StaticArgumentsFn, Decl(staticPropertyNameConflicts.ts, 337, 41)) static arguments() {} // error without useDefineForClassFields >arguments : Symbol(StaticArgumentsFn.arguments, Decl(staticPropertyNameConflicts.ts, 338, 44)) diff --git a/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=false).types b/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=false).types index 72bd521739d69..ea7ff4d80440a 100644 --- a/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=false).types +++ b/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=false).types @@ -858,7 +858,7 @@ var StaticArgumentsFn_Anonymous2 = class { // === Static properties on default exported classes === // name -module TestOnDefaultExportedClass_1 { +namespace TestOnDefaultExportedClass_1 { >TestOnDefaultExportedClass_1 : typeof TestOnDefaultExportedClass_1 > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -901,7 +901,7 @@ export class ExportedStaticName { > : ^^^^^^ } -module TestOnDefaultExportedClass_2 { +namespace TestOnDefaultExportedClass_2 { >TestOnDefaultExportedClass_2 : typeof TestOnDefaultExportedClass_2 > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -945,7 +945,7 @@ export class ExportedStaticNameFn { } // length -module TestOnDefaultExportedClass_3 { +namespace TestOnDefaultExportedClass_3 { >TestOnDefaultExportedClass_3 : typeof TestOnDefaultExportedClass_3 > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -988,7 +988,7 @@ export class ExportedStaticLength { > : ^^^^^^^^ } -module TestOnDefaultExportedClass_4 { +namespace TestOnDefaultExportedClass_4 { >TestOnDefaultExportedClass_4 : typeof TestOnDefaultExportedClass_4 > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1032,7 +1032,7 @@ export class ExportedStaticLengthFn { } // prototype -module TestOnDefaultExportedClass_5 { +namespace TestOnDefaultExportedClass_5 { >TestOnDefaultExportedClass_5 : typeof TestOnDefaultExportedClass_5 > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1075,7 +1075,7 @@ export class ExportedStaticPrototype { > : ^^^^^^^^^^^ } -module TestOnDefaultExportedClass_6 { +namespace TestOnDefaultExportedClass_6 { >TestOnDefaultExportedClass_6 : typeof TestOnDefaultExportedClass_6 > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1119,7 +1119,7 @@ export class ExportedStaticPrototypeFn { } // caller -module TestOnDefaultExportedClass_7 { +namespace TestOnDefaultExportedClass_7 { >TestOnDefaultExportedClass_7 : typeof TestOnDefaultExportedClass_7 > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1162,7 +1162,7 @@ export class ExportedStaticCaller { > : ^^^^^^^^ } -module TestOnDefaultExportedClass_8 { +namespace TestOnDefaultExportedClass_8 { >TestOnDefaultExportedClass_8 : typeof TestOnDefaultExportedClass_8 > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1206,7 +1206,7 @@ export class ExportedStaticCallerFn { } // arguments -module TestOnDefaultExportedClass_9 { +namespace TestOnDefaultExportedClass_9 { >TestOnDefaultExportedClass_9 : typeof TestOnDefaultExportedClass_9 > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1249,7 +1249,7 @@ export class ExportedStaticArguments { > : ^^^^^^^^^^^ } -module TestOnDefaultExportedClass_10 { +namespace TestOnDefaultExportedClass_10 { >TestOnDefaultExportedClass_10 : typeof TestOnDefaultExportedClass_10 > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=true).errors.txt b/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=true).errors.txt index 4d30b87e5dd4e..4d4d2b4442b44 100644 --- a/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=true).errors.txt +++ b/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=true).errors.txt @@ -276,7 +276,7 @@ staticPropertyNameConflicts.ts(339,12): error TS1319: A default export can only // === Static properties on default exported classes === // name - module TestOnDefaultExportedClass_1 { + namespace TestOnDefaultExportedClass_1 { class StaticName { static name: number; // error without useDefineForClassFields name: string; // ok @@ -288,7 +288,7 @@ staticPropertyNameConflicts.ts(339,12): error TS1319: A default export can only [FunctionPropertyNames.name]: string; // ok } - module TestOnDefaultExportedClass_2 { + namespace TestOnDefaultExportedClass_2 { class StaticNameFn { static name() {} // error without useDefineForClassFields name() {} // ok @@ -301,7 +301,7 @@ staticPropertyNameConflicts.ts(339,12): error TS1319: A default export can only } // length - module TestOnDefaultExportedClass_3 { + namespace TestOnDefaultExportedClass_3 { export default class StaticLength { ~~~~~~~ !!! error TS1319: A default export can only be used in an ECMAScript-style module. @@ -315,7 +315,7 @@ staticPropertyNameConflicts.ts(339,12): error TS1319: A default export can only [FunctionPropertyNames.length]: string; // ok } - module TestOnDefaultExportedClass_4 { + namespace TestOnDefaultExportedClass_4 { export default class StaticLengthFn { ~~~~~~~ !!! error TS1319: A default export can only be used in an ECMAScript-style module. @@ -330,7 +330,7 @@ staticPropertyNameConflicts.ts(339,12): error TS1319: A default export can only } // prototype - module TestOnDefaultExportedClass_5 { + namespace TestOnDefaultExportedClass_5 { export default class StaticPrototype { ~~~~~~~ !!! error TS1319: A default export can only be used in an ECMAScript-style module. @@ -348,7 +348,7 @@ staticPropertyNameConflicts.ts(339,12): error TS1319: A default export can only [FunctionPropertyNames.prototype]: string; // ok } - module TestOnDefaultExportedClass_6 { + namespace TestOnDefaultExportedClass_6 { export default class StaticPrototypeFn { ~~~~~~~ !!! error TS1319: A default export can only be used in an ECMAScript-style module. @@ -371,7 +371,7 @@ staticPropertyNameConflicts.ts(339,12): error TS1319: A default export can only } // caller - module TestOnDefaultExportedClass_7 { + namespace TestOnDefaultExportedClass_7 { export default class StaticCaller { ~~~~~~~ !!! error TS1319: A default export can only be used in an ECMAScript-style module. @@ -385,7 +385,7 @@ staticPropertyNameConflicts.ts(339,12): error TS1319: A default export can only [FunctionPropertyNames.caller]: string; // ok } - module TestOnDefaultExportedClass_8 { + namespace TestOnDefaultExportedClass_8 { export default class StaticCallerFn { ~~~~~~~ !!! error TS1319: A default export can only be used in an ECMAScript-style module. @@ -400,7 +400,7 @@ staticPropertyNameConflicts.ts(339,12): error TS1319: A default export can only } // arguments - module TestOnDefaultExportedClass_9 { + namespace TestOnDefaultExportedClass_9 { export default class StaticArguments { ~~~~~~~ !!! error TS1319: A default export can only be used in an ECMAScript-style module. @@ -414,7 +414,7 @@ staticPropertyNameConflicts.ts(339,12): error TS1319: A default export can only [FunctionPropertyNames.arguments]: string; // ok } - module TestOnDefaultExportedClass_10 { + namespace TestOnDefaultExportedClass_10 { export default class StaticArgumentsFn { ~~~~~~~ !!! error TS1319: A default export can only be used in an ECMAScript-style module. diff --git a/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=true).js b/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=true).js index 317c085d6d9c6..41da098ab9c6c 100644 --- a/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=true).js +++ b/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=true).js @@ -226,7 +226,7 @@ var StaticArgumentsFn_Anonymous2 = class { // === Static properties on default exported classes === // name -module TestOnDefaultExportedClass_1 { +namespace TestOnDefaultExportedClass_1 { class StaticName { static name: number; // error without useDefineForClassFields name: string; // ok @@ -238,7 +238,7 @@ export class ExportedStaticName { [FunctionPropertyNames.name]: string; // ok } -module TestOnDefaultExportedClass_2 { +namespace TestOnDefaultExportedClass_2 { class StaticNameFn { static name() {} // error without useDefineForClassFields name() {} // ok @@ -251,7 +251,7 @@ export class ExportedStaticNameFn { } // length -module TestOnDefaultExportedClass_3 { +namespace TestOnDefaultExportedClass_3 { export default class StaticLength { static length: number; // error without useDefineForClassFields length: string; // ok @@ -263,7 +263,7 @@ export class ExportedStaticLength { [FunctionPropertyNames.length]: string; // ok } -module TestOnDefaultExportedClass_4 { +namespace TestOnDefaultExportedClass_4 { export default class StaticLengthFn { static length() {} // error without useDefineForClassFields length() {} // ok @@ -276,7 +276,7 @@ export class ExportedStaticLengthFn { } // prototype -module TestOnDefaultExportedClass_5 { +namespace TestOnDefaultExportedClass_5 { export default class StaticPrototype { static prototype: number; // always an error prototype: string; // ok @@ -288,7 +288,7 @@ export class ExportedStaticPrototype { [FunctionPropertyNames.prototype]: string; // ok } -module TestOnDefaultExportedClass_6 { +namespace TestOnDefaultExportedClass_6 { export default class StaticPrototypeFn { static prototype() {} // always an error prototype() {} // ok @@ -301,7 +301,7 @@ export class ExportedStaticPrototypeFn { } // caller -module TestOnDefaultExportedClass_7 { +namespace TestOnDefaultExportedClass_7 { export default class StaticCaller { static caller: number; // error without useDefineForClassFields caller: string; // ok @@ -313,7 +313,7 @@ export class ExportedStaticCaller { [FunctionPropertyNames.caller]: string; // ok } -module TestOnDefaultExportedClass_8 { +namespace TestOnDefaultExportedClass_8 { export default class StaticCallerFn { static caller() {} // error without useDefineForClassFields caller() {} // ok @@ -326,7 +326,7 @@ export class ExportedStaticCallerFn { } // arguments -module TestOnDefaultExportedClass_9 { +namespace TestOnDefaultExportedClass_9 { export default class StaticArguments { static arguments: number; // error without useDefineForClassFields arguments: string; // ok @@ -338,7 +338,7 @@ export class ExportedStaticArguments { [FunctionPropertyNames.arguments]: string; // ok } -module TestOnDefaultExportedClass_10 { +namespace TestOnDefaultExportedClass_10 { export default class StaticArgumentsFn { static arguments() {} // error without useDefineForClassFields arguments() {} // ok diff --git a/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=true).symbols b/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=true).symbols index 3452acae0dce3..f9cf9064c688b 100644 --- a/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=true).symbols +++ b/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=true).symbols @@ -559,11 +559,11 @@ var StaticArgumentsFn_Anonymous2 = class { // === Static properties on default exported classes === // name -module TestOnDefaultExportedClass_1 { +namespace TestOnDefaultExportedClass_1 { >TestOnDefaultExportedClass_1 : Symbol(TestOnDefaultExportedClass_1, Decl(staticPropertyNameConflicts.ts, 219, 1)) class StaticName { ->StaticName : Symbol(StaticName, Decl(staticPropertyNameConflicts.ts, 225, 37)) +>StaticName : Symbol(StaticName, Decl(staticPropertyNameConflicts.ts, 225, 40)) static name: number; // error without useDefineForClassFields >name : Symbol(StaticName.name, Decl(staticPropertyNameConflicts.ts, 226, 22)) @@ -589,11 +589,11 @@ export class ExportedStaticName { >name : Symbol(name, Decl(staticPropertyNameConflicts.ts, 0, 31)) } -module TestOnDefaultExportedClass_2 { +namespace TestOnDefaultExportedClass_2 { >TestOnDefaultExportedClass_2 : Symbol(TestOnDefaultExportedClass_2, Decl(staticPropertyNameConflicts.ts, 235, 1)) class StaticNameFn { ->StaticNameFn : Symbol(StaticNameFn, Decl(staticPropertyNameConflicts.ts, 237, 37)) +>StaticNameFn : Symbol(StaticNameFn, Decl(staticPropertyNameConflicts.ts, 237, 40)) static name() {} // error without useDefineForClassFields >name : Symbol(StaticNameFn.name, Decl(staticPropertyNameConflicts.ts, 238, 24)) @@ -620,11 +620,11 @@ export class ExportedStaticNameFn { } // length -module TestOnDefaultExportedClass_3 { +namespace TestOnDefaultExportedClass_3 { >TestOnDefaultExportedClass_3 : Symbol(TestOnDefaultExportedClass_3, Decl(staticPropertyNameConflicts.ts, 247, 1)) export default class StaticLength { ->StaticLength : Symbol(StaticLength, Decl(staticPropertyNameConflicts.ts, 250, 37)) +>StaticLength : Symbol(StaticLength, Decl(staticPropertyNameConflicts.ts, 250, 40)) static length: number; // error without useDefineForClassFields >length : Symbol(StaticLength.length, Decl(staticPropertyNameConflicts.ts, 251, 39)) @@ -650,11 +650,11 @@ export class ExportedStaticLength { >length : Symbol(length, Decl(staticPropertyNameConflicts.ts, 1, 17)) } -module TestOnDefaultExportedClass_4 { +namespace TestOnDefaultExportedClass_4 { >TestOnDefaultExportedClass_4 : Symbol(TestOnDefaultExportedClass_4, Decl(staticPropertyNameConflicts.ts, 260, 1)) export default class StaticLengthFn { ->StaticLengthFn : Symbol(StaticLengthFn, Decl(staticPropertyNameConflicts.ts, 262, 37)) +>StaticLengthFn : Symbol(StaticLengthFn, Decl(staticPropertyNameConflicts.ts, 262, 40)) static length() {} // error without useDefineForClassFields >length : Symbol(StaticLengthFn.length, Decl(staticPropertyNameConflicts.ts, 263, 41)) @@ -681,11 +681,11 @@ export class ExportedStaticLengthFn { } // prototype -module TestOnDefaultExportedClass_5 { +namespace TestOnDefaultExportedClass_5 { >TestOnDefaultExportedClass_5 : Symbol(TestOnDefaultExportedClass_5, Decl(staticPropertyNameConflicts.ts, 272, 1)) export default class StaticPrototype { ->StaticPrototype : Symbol(StaticPrototype, Decl(staticPropertyNameConflicts.ts, 275, 37)) +>StaticPrototype : Symbol(StaticPrototype, Decl(staticPropertyNameConflicts.ts, 275, 40)) static prototype: number; // always an error >prototype : Symbol(StaticPrototype.prototype, Decl(staticPropertyNameConflicts.ts, 276, 42)) @@ -711,11 +711,11 @@ export class ExportedStaticPrototype { >prototype : Symbol(prototype, Decl(staticPropertyNameConflicts.ts, 2, 21)) } -module TestOnDefaultExportedClass_6 { +namespace TestOnDefaultExportedClass_6 { >TestOnDefaultExportedClass_6 : Symbol(TestOnDefaultExportedClass_6, Decl(staticPropertyNameConflicts.ts, 285, 1)) export default class StaticPrototypeFn { ->StaticPrototypeFn : Symbol(StaticPrototypeFn, Decl(staticPropertyNameConflicts.ts, 287, 37)) +>StaticPrototypeFn : Symbol(StaticPrototypeFn, Decl(staticPropertyNameConflicts.ts, 287, 40)) static prototype() {} // always an error >prototype : Symbol(StaticPrototypeFn.prototype, Decl(staticPropertyNameConflicts.ts, 288, 44)) @@ -742,11 +742,11 @@ export class ExportedStaticPrototypeFn { } // caller -module TestOnDefaultExportedClass_7 { +namespace TestOnDefaultExportedClass_7 { >TestOnDefaultExportedClass_7 : Symbol(TestOnDefaultExportedClass_7, Decl(staticPropertyNameConflicts.ts, 297, 1)) export default class StaticCaller { ->StaticCaller : Symbol(StaticCaller, Decl(staticPropertyNameConflicts.ts, 300, 37)) +>StaticCaller : Symbol(StaticCaller, Decl(staticPropertyNameConflicts.ts, 300, 40)) static caller: number; // error without useDefineForClassFields >caller : Symbol(StaticCaller.caller, Decl(staticPropertyNameConflicts.ts, 301, 39)) @@ -772,11 +772,11 @@ export class ExportedStaticCaller { >caller : Symbol(caller, Decl(staticPropertyNameConflicts.ts, 3, 27)) } -module TestOnDefaultExportedClass_8 { +namespace TestOnDefaultExportedClass_8 { >TestOnDefaultExportedClass_8 : Symbol(TestOnDefaultExportedClass_8, Decl(staticPropertyNameConflicts.ts, 310, 1)) export default class StaticCallerFn { ->StaticCallerFn : Symbol(StaticCallerFn, Decl(staticPropertyNameConflicts.ts, 312, 37)) +>StaticCallerFn : Symbol(StaticCallerFn, Decl(staticPropertyNameConflicts.ts, 312, 40)) static caller() {} // error without useDefineForClassFields >caller : Symbol(StaticCallerFn.caller, Decl(staticPropertyNameConflicts.ts, 313, 41)) @@ -803,11 +803,11 @@ export class ExportedStaticCallerFn { } // arguments -module TestOnDefaultExportedClass_9 { +namespace TestOnDefaultExportedClass_9 { >TestOnDefaultExportedClass_9 : Symbol(TestOnDefaultExportedClass_9, Decl(staticPropertyNameConflicts.ts, 322, 1)) export default class StaticArguments { ->StaticArguments : Symbol(StaticArguments, Decl(staticPropertyNameConflicts.ts, 325, 37)) +>StaticArguments : Symbol(StaticArguments, Decl(staticPropertyNameConflicts.ts, 325, 40)) static arguments: number; // error without useDefineForClassFields >arguments : Symbol(StaticArguments.arguments, Decl(staticPropertyNameConflicts.ts, 326, 42)) @@ -833,11 +833,11 @@ export class ExportedStaticArguments { >arguments : Symbol(arguments, Decl(staticPropertyNameConflicts.ts, 4, 21)) } -module TestOnDefaultExportedClass_10 { +namespace TestOnDefaultExportedClass_10 { >TestOnDefaultExportedClass_10 : Symbol(TestOnDefaultExportedClass_10, Decl(staticPropertyNameConflicts.ts, 335, 1)) export default class StaticArgumentsFn { ->StaticArgumentsFn : Symbol(StaticArgumentsFn, Decl(staticPropertyNameConflicts.ts, 337, 38)) +>StaticArgumentsFn : Symbol(StaticArgumentsFn, Decl(staticPropertyNameConflicts.ts, 337, 41)) static arguments() {} // error without useDefineForClassFields >arguments : Symbol(StaticArgumentsFn.arguments, Decl(staticPropertyNameConflicts.ts, 338, 44)) diff --git a/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=true).types b/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=true).types index 72bd521739d69..ea7ff4d80440a 100644 --- a/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=true).types +++ b/tests/baselines/reference/staticPropertyNameConflicts(usedefineforclassfields=true).types @@ -858,7 +858,7 @@ var StaticArgumentsFn_Anonymous2 = class { // === Static properties on default exported classes === // name -module TestOnDefaultExportedClass_1 { +namespace TestOnDefaultExportedClass_1 { >TestOnDefaultExportedClass_1 : typeof TestOnDefaultExportedClass_1 > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -901,7 +901,7 @@ export class ExportedStaticName { > : ^^^^^^ } -module TestOnDefaultExportedClass_2 { +namespace TestOnDefaultExportedClass_2 { >TestOnDefaultExportedClass_2 : typeof TestOnDefaultExportedClass_2 > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -945,7 +945,7 @@ export class ExportedStaticNameFn { } // length -module TestOnDefaultExportedClass_3 { +namespace TestOnDefaultExportedClass_3 { >TestOnDefaultExportedClass_3 : typeof TestOnDefaultExportedClass_3 > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -988,7 +988,7 @@ export class ExportedStaticLength { > : ^^^^^^^^ } -module TestOnDefaultExportedClass_4 { +namespace TestOnDefaultExportedClass_4 { >TestOnDefaultExportedClass_4 : typeof TestOnDefaultExportedClass_4 > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1032,7 +1032,7 @@ export class ExportedStaticLengthFn { } // prototype -module TestOnDefaultExportedClass_5 { +namespace TestOnDefaultExportedClass_5 { >TestOnDefaultExportedClass_5 : typeof TestOnDefaultExportedClass_5 > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1075,7 +1075,7 @@ export class ExportedStaticPrototype { > : ^^^^^^^^^^^ } -module TestOnDefaultExportedClass_6 { +namespace TestOnDefaultExportedClass_6 { >TestOnDefaultExportedClass_6 : typeof TestOnDefaultExportedClass_6 > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1119,7 +1119,7 @@ export class ExportedStaticPrototypeFn { } // caller -module TestOnDefaultExportedClass_7 { +namespace TestOnDefaultExportedClass_7 { >TestOnDefaultExportedClass_7 : typeof TestOnDefaultExportedClass_7 > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1162,7 +1162,7 @@ export class ExportedStaticCaller { > : ^^^^^^^^ } -module TestOnDefaultExportedClass_8 { +namespace TestOnDefaultExportedClass_8 { >TestOnDefaultExportedClass_8 : typeof TestOnDefaultExportedClass_8 > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1206,7 +1206,7 @@ export class ExportedStaticCallerFn { } // arguments -module TestOnDefaultExportedClass_9 { +namespace TestOnDefaultExportedClass_9 { >TestOnDefaultExportedClass_9 : typeof TestOnDefaultExportedClass_9 > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1249,7 +1249,7 @@ export class ExportedStaticArguments { > : ^^^^^^^^^^^ } -module TestOnDefaultExportedClass_10 { +namespace TestOnDefaultExportedClass_10 { >TestOnDefaultExportedClass_10 : typeof TestOnDefaultExportedClass_10 > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/staticPropertyNotInClassType.errors.txt b/tests/baselines/reference/staticPropertyNotInClassType.errors.txt index 9c0ab00358759..aed1e657c3715 100644 --- a/tests/baselines/reference/staticPropertyNotInClassType.errors.txt +++ b/tests/baselines/reference/staticPropertyNotInClassType.errors.txt @@ -8,7 +8,7 @@ staticPropertyNotInClassType.ts(38,16): error TS2576: Property 'x' does not exis ==== staticPropertyNotInClassType.ts (7 errors) ==== - module NonGeneric { + namespace NonGeneric { class C { fn() { return this; } static get x() { return 1; } @@ -17,7 +17,7 @@ staticPropertyNotInClassType.ts(38,16): error TS2576: Property 'x' does not exis static foo: string; // not reflected in class type } - module C { + namespace C { export var bar = ''; // not reflected in class type } @@ -34,7 +34,7 @@ staticPropertyNotInClassType.ts(38,16): error TS2576: Property 'x' does not exis !!! error TS2576: Property 'x' does not exist on type 'C'. Did you mean to access the static member 'C.x' instead? } - module Generic { + namespace Generic { class C { fn() { return this; } static get x() { return 1; } @@ -45,7 +45,7 @@ staticPropertyNotInClassType.ts(38,16): error TS2576: Property 'x' does not exis !!! error TS2302: Static members cannot reference class type parameters. } - module C { + namespace C { export var bar = ''; // not reflected in class type } diff --git a/tests/baselines/reference/staticPropertyNotInClassType.js b/tests/baselines/reference/staticPropertyNotInClassType.js index 3319ad2f8750a..685b84bf5cf80 100644 --- a/tests/baselines/reference/staticPropertyNotInClassType.js +++ b/tests/baselines/reference/staticPropertyNotInClassType.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/classes/members/classTypes/staticPropertyNotInClassType.ts] //// //// [staticPropertyNotInClassType.ts] -module NonGeneric { +namespace NonGeneric { class C { fn() { return this; } static get x() { return 1; } @@ -10,7 +10,7 @@ module NonGeneric { static foo: string; // not reflected in class type } - module C { + namespace C { export var bar = ''; // not reflected in class type } @@ -21,7 +21,7 @@ module NonGeneric { var r6 = c.x; // error } -module Generic { +namespace Generic { class C { fn() { return this; } static get x() { return 1; } @@ -30,7 +30,7 @@ module Generic { static foo: T; // not reflected in class type } - module C { + namespace C { export var bar = ''; // not reflected in class type } diff --git a/tests/baselines/reference/staticPropertyNotInClassType.symbols b/tests/baselines/reference/staticPropertyNotInClassType.symbols index fa5d12ed24bff..6c9b907a8fa0f 100644 --- a/tests/baselines/reference/staticPropertyNotInClassType.symbols +++ b/tests/baselines/reference/staticPropertyNotInClassType.symbols @@ -1,15 +1,15 @@ //// [tests/cases/conformance/classes/members/classTypes/staticPropertyNotInClassType.ts] //// === staticPropertyNotInClassType.ts === -module NonGeneric { +namespace NonGeneric { >NonGeneric : Symbol(NonGeneric, Decl(staticPropertyNotInClassType.ts, 0, 0)) class C { ->C : Symbol(C, Decl(staticPropertyNotInClassType.ts, 0, 19), Decl(staticPropertyNotInClassType.ts, 7, 5)) +>C : Symbol(C, Decl(staticPropertyNotInClassType.ts, 0, 22), Decl(staticPropertyNotInClassType.ts, 7, 5)) fn() { return this; } >fn : Symbol(C.fn, Decl(staticPropertyNotInClassType.ts, 1, 13)) ->this : Symbol(C, Decl(staticPropertyNotInClassType.ts, 0, 19), Decl(staticPropertyNotInClassType.ts, 7, 5)) +>this : Symbol(C, Decl(staticPropertyNotInClassType.ts, 0, 22), Decl(staticPropertyNotInClassType.ts, 7, 5)) static get x() { return 1; } >x : Symbol(C.x, Decl(staticPropertyNotInClassType.ts, 2, 29), Decl(staticPropertyNotInClassType.ts, 3, 36)) @@ -26,8 +26,8 @@ module NonGeneric { >foo : Symbol(C.foo, Decl(staticPropertyNotInClassType.ts, 5, 60)) } - module C { ->C : Symbol(C, Decl(staticPropertyNotInClassType.ts, 0, 19), Decl(staticPropertyNotInClassType.ts, 7, 5)) + namespace C { +>C : Symbol(C, Decl(staticPropertyNotInClassType.ts, 0, 22), Decl(staticPropertyNotInClassType.ts, 7, 5)) export var bar = ''; // not reflected in class type >bar : Symbol(bar, Decl(staticPropertyNotInClassType.ts, 10, 18)) @@ -35,7 +35,7 @@ module NonGeneric { var c = new C(1, 2); >c : Symbol(c, Decl(staticPropertyNotInClassType.ts, 13, 7)) ->C : Symbol(C, Decl(staticPropertyNotInClassType.ts, 0, 19), Decl(staticPropertyNotInClassType.ts, 7, 5)) +>C : Symbol(C, Decl(staticPropertyNotInClassType.ts, 0, 22), Decl(staticPropertyNotInClassType.ts, 7, 5)) var r = c.fn(); >r : Symbol(r, Decl(staticPropertyNotInClassType.ts, 14, 7)) @@ -56,17 +56,17 @@ module NonGeneric { >c : Symbol(c, Decl(staticPropertyNotInClassType.ts, 13, 7)) } -module Generic { +namespace Generic { >Generic : Symbol(Generic, Decl(staticPropertyNotInClassType.ts, 18, 1)) class C { ->C : Symbol(C, Decl(staticPropertyNotInClassType.ts, 20, 16), Decl(staticPropertyNotInClassType.ts, 27, 5)) +>C : Symbol(C, Decl(staticPropertyNotInClassType.ts, 20, 19), Decl(staticPropertyNotInClassType.ts, 27, 5)) >T : Symbol(T, Decl(staticPropertyNotInClassType.ts, 21, 12)) >U : Symbol(U, Decl(staticPropertyNotInClassType.ts, 21, 14)) fn() { return this; } >fn : Symbol(C.fn, Decl(staticPropertyNotInClassType.ts, 21, 19)) ->this : Symbol(C, Decl(staticPropertyNotInClassType.ts, 20, 16), Decl(staticPropertyNotInClassType.ts, 27, 5)) +>this : Symbol(C, Decl(staticPropertyNotInClassType.ts, 20, 19), Decl(staticPropertyNotInClassType.ts, 27, 5)) static get x() { return 1; } >x : Symbol(C.x, Decl(staticPropertyNotInClassType.ts, 22, 29), Decl(staticPropertyNotInClassType.ts, 23, 36)) @@ -86,8 +86,8 @@ module Generic { >T : Symbol(T) } - module C { ->C : Symbol(C, Decl(staticPropertyNotInClassType.ts, 20, 16), Decl(staticPropertyNotInClassType.ts, 27, 5)) + namespace C { +>C : Symbol(C, Decl(staticPropertyNotInClassType.ts, 20, 19), Decl(staticPropertyNotInClassType.ts, 27, 5)) export var bar = ''; // not reflected in class type >bar : Symbol(bar, Decl(staticPropertyNotInClassType.ts, 30, 18)) @@ -95,7 +95,7 @@ module Generic { var c = new C(1, ''); >c : Symbol(c, Decl(staticPropertyNotInClassType.ts, 33, 7)) ->C : Symbol(C, Decl(staticPropertyNotInClassType.ts, 20, 16), Decl(staticPropertyNotInClassType.ts, 27, 5)) +>C : Symbol(C, Decl(staticPropertyNotInClassType.ts, 20, 19), Decl(staticPropertyNotInClassType.ts, 27, 5)) var r = c.fn(); >r : Symbol(r, Decl(staticPropertyNotInClassType.ts, 34, 7)) diff --git a/tests/baselines/reference/staticPropertyNotInClassType.types b/tests/baselines/reference/staticPropertyNotInClassType.types index 09a48bbc5b152..3599c27f248bf 100644 --- a/tests/baselines/reference/staticPropertyNotInClassType.types +++ b/tests/baselines/reference/staticPropertyNotInClassType.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/classes/members/classTypes/staticPropertyNotInClassType.ts] //// === staticPropertyNotInClassType.ts === -module NonGeneric { +namespace NonGeneric { >NonGeneric : typeof NonGeneric > : ^^^^^^^^^^^^^^^^^ @@ -38,7 +38,7 @@ module NonGeneric { > : ^^^^^^ } - module C { + namespace C { >C : typeof C > : ^^^^^^^^ @@ -104,7 +104,7 @@ module NonGeneric { > : ^^^ } -module Generic { +namespace Generic { >Generic : typeof Generic > : ^^^^^^^^^^^^^^ @@ -141,7 +141,7 @@ module Generic { > : ^ } - module C { + namespace C { >C : typeof C > : ^^^^^^^^ diff --git a/tests/baselines/reference/statics.errors.txt b/tests/baselines/reference/statics.errors.txt index e4b8e903494f9..e76242c34fadd 100644 --- a/tests/baselines/reference/statics.errors.txt +++ b/tests/baselines/reference/statics.errors.txt @@ -3,7 +3,7 @@ statics.ts(23,33): error TS2339: Property 'g' does not exist on type 'C'. ==== statics.ts (2 errors) ==== - module M { + namespace M { export class C { x: number; constructor(public c1: number, public c2: number, c3: number) { diff --git a/tests/baselines/reference/statics.js b/tests/baselines/reference/statics.js index c8eae4d41e6bb..cf13cc8dc9075 100644 --- a/tests/baselines/reference/statics.js +++ b/tests/baselines/reference/statics.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/statics.ts] //// //// [statics.ts] -module M { +namespace M { export class C { x: number; constructor(public c1: number, public c2: number, c3: number) { diff --git a/tests/baselines/reference/statics.symbols b/tests/baselines/reference/statics.symbols index 6234ae1c18a90..a9acf79786101 100644 --- a/tests/baselines/reference/statics.symbols +++ b/tests/baselines/reference/statics.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/statics.ts] //// === statics.ts === -module M { +namespace M { >M : Symbol(M, Decl(statics.ts, 0, 0)) export class C { ->C : Symbol(C, Decl(statics.ts, 0, 10)) +>C : Symbol(C, Decl(statics.ts, 0, 13)) x: number; >x : Symbol(C.x, Decl(statics.ts, 1, 20)) @@ -17,40 +17,40 @@ module M { this.x = C.y+this.c1+this.c2+c3; >this.x : Symbol(C.x, Decl(statics.ts, 1, 20)) ->this : Symbol(C, Decl(statics.ts, 0, 10)) +>this : Symbol(C, Decl(statics.ts, 0, 13)) >x : Symbol(C.x, Decl(statics.ts, 1, 20)) >C.y : Symbol(C.y, Decl(statics.ts, 9, 21)) ->C : Symbol(C, Decl(statics.ts, 0, 10)) +>C : Symbol(C, Decl(statics.ts, 0, 13)) >y : Symbol(C.y, Decl(statics.ts, 9, 21)) >this.c1 : Symbol(C.c1, Decl(statics.ts, 3, 20)) ->this : Symbol(C, Decl(statics.ts, 0, 10)) +>this : Symbol(C, Decl(statics.ts, 0, 13)) >c1 : Symbol(C.c1, Decl(statics.ts, 3, 20)) >this.c2 : Symbol(C.c2, Decl(statics.ts, 3, 38)) ->this : Symbol(C, Decl(statics.ts, 0, 10)) +>this : Symbol(C, Decl(statics.ts, 0, 13)) >c2 : Symbol(C.c2, Decl(statics.ts, 3, 38)) >c3 : Symbol(c3, Decl(statics.ts, 3, 57)) this.g = (v:number) => C.f(this.x+C.y+v+this.c1+this.c2+C.pub); ->this : Symbol(C, Decl(statics.ts, 0, 10)) +>this : Symbol(C, Decl(statics.ts, 0, 13)) >v : Symbol(v, Decl(statics.ts, 5, 22)) >C.f : Symbol(C.f, Decl(statics.ts, 10, 24)) ->C : Symbol(C, Decl(statics.ts, 0, 10)) +>C : Symbol(C, Decl(statics.ts, 0, 13)) >f : Symbol(C.f, Decl(statics.ts, 10, 24)) >this.x : Symbol(C.x, Decl(statics.ts, 1, 20)) ->this : Symbol(C, Decl(statics.ts, 0, 10)) +>this : Symbol(C, Decl(statics.ts, 0, 13)) >x : Symbol(C.x, Decl(statics.ts, 1, 20)) >C.y : Symbol(C.y, Decl(statics.ts, 9, 21)) ->C : Symbol(C, Decl(statics.ts, 0, 10)) +>C : Symbol(C, Decl(statics.ts, 0, 13)) >y : Symbol(C.y, Decl(statics.ts, 9, 21)) >v : Symbol(v, Decl(statics.ts, 5, 22)) >this.c1 : Symbol(C.c1, Decl(statics.ts, 3, 20)) ->this : Symbol(C, Decl(statics.ts, 0, 10)) +>this : Symbol(C, Decl(statics.ts, 0, 13)) >c1 : Symbol(C.c1, Decl(statics.ts, 3, 20)) >this.c2 : Symbol(C.c2, Decl(statics.ts, 3, 38)) ->this : Symbol(C, Decl(statics.ts, 0, 10)) +>this : Symbol(C, Decl(statics.ts, 0, 13)) >c2 : Symbol(C.c2, Decl(statics.ts, 3, 38)) >C.pub : Symbol(C.pub, Decl(statics.ts, 8, 22)) ->C : Symbol(C, Decl(statics.ts, 0, 10)) +>C : Symbol(C, Decl(statics.ts, 0, 13)) >pub : Symbol(C.pub, Decl(statics.ts, 8, 22)) } @@ -63,7 +63,7 @@ module M { static y=C.priv; >y : Symbol(C.y, Decl(statics.ts, 9, 21)) >C.priv : Symbol(C.priv, Decl(statics.ts, 6, 9)) ->C : Symbol(C, Decl(statics.ts, 0, 10)) +>C : Symbol(C, Decl(statics.ts, 0, 13)) >priv : Symbol(C.priv, Decl(statics.ts, 6, 9)) static f(n:number) { @@ -73,13 +73,13 @@ module M { return "wow: "+(n+C.y+C.pub+C.priv); >n : Symbol(n, Decl(statics.ts, 11, 17)) >C.y : Symbol(C.y, Decl(statics.ts, 9, 21)) ->C : Symbol(C, Decl(statics.ts, 0, 10)) +>C : Symbol(C, Decl(statics.ts, 0, 13)) >y : Symbol(C.y, Decl(statics.ts, 9, 21)) >C.pub : Symbol(C.pub, Decl(statics.ts, 8, 22)) ->C : Symbol(C, Decl(statics.ts, 0, 10)) +>C : Symbol(C, Decl(statics.ts, 0, 13)) >pub : Symbol(C.pub, Decl(statics.ts, 8, 22)) >C.priv : Symbol(C.priv, Decl(statics.ts, 6, 9)) ->C : Symbol(C, Decl(statics.ts, 0, 10)) +>C : Symbol(C, Decl(statics.ts, 0, 13)) >priv : Symbol(C.priv, Decl(statics.ts, 6, 9)) } @@ -87,7 +87,7 @@ module M { var c=C.y; >c : Symbol(c, Decl(statics.ts, 16, 7)) >C.y : Symbol(C.y, Decl(statics.ts, 9, 21)) ->C : Symbol(C, Decl(statics.ts, 0, 10)) +>C : Symbol(C, Decl(statics.ts, 0, 13)) >y : Symbol(C.y, Decl(statics.ts, 9, 21)) export function f() { @@ -103,20 +103,20 @@ module M { result+=(new C(0,1,2).x); >result : Symbol(result, Decl(statics.ts, 18, 11)) >new C(0,1,2).x : Symbol(C.x, Decl(statics.ts, 1, 20)) ->C : Symbol(C, Decl(statics.ts, 0, 10)) +>C : Symbol(C, Decl(statics.ts, 0, 13)) >x : Symbol(C.x, Decl(statics.ts, 1, 20)) result+=(C.f(10)); >result : Symbol(result, Decl(statics.ts, 18, 11)) >C.f : Symbol(C.f, Decl(statics.ts, 10, 24)) ->C : Symbol(C, Decl(statics.ts, 0, 10)) +>C : Symbol(C, Decl(statics.ts, 0, 13)) >f : Symbol(C.f, Decl(statics.ts, 10, 24)) result+=(new C(5,10,20).g(C.y)); >result : Symbol(result, Decl(statics.ts, 18, 11)) ->C : Symbol(C, Decl(statics.ts, 0, 10)) +>C : Symbol(C, Decl(statics.ts, 0, 13)) >C.y : Symbol(C.y, Decl(statics.ts, 9, 21)) ->C : Symbol(C, Decl(statics.ts, 0, 10)) +>C : Symbol(C, Decl(statics.ts, 0, 13)) >y : Symbol(C.y, Decl(statics.ts, 9, 21)) return result; diff --git a/tests/baselines/reference/statics.types b/tests/baselines/reference/statics.types index 12ef6cb4eb4bd..e6cda45e00a62 100644 --- a/tests/baselines/reference/statics.types +++ b/tests/baselines/reference/statics.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/statics.ts] //// === statics.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/staticsNotInScopeInClodule.errors.txt b/tests/baselines/reference/staticsNotInScopeInClodule.errors.txt index b01e274fbc667..99ff495d512b0 100644 --- a/tests/baselines/reference/staticsNotInScopeInClodule.errors.txt +++ b/tests/baselines/reference/staticsNotInScopeInClodule.errors.txt @@ -6,7 +6,7 @@ staticsNotInScopeInClodule.ts(6,13): error TS2304: Cannot find name 'x'. static x = 10; } - module Clod { + namespace Clod { var p = x; // x isn't in scope here ~ !!! error TS2304: Cannot find name 'x'. diff --git a/tests/baselines/reference/staticsNotInScopeInClodule.js b/tests/baselines/reference/staticsNotInScopeInClodule.js index b54931a61092f..db9cb402f4f5a 100644 --- a/tests/baselines/reference/staticsNotInScopeInClodule.js +++ b/tests/baselines/reference/staticsNotInScopeInClodule.js @@ -5,7 +5,7 @@ class Clod { static x = 10; } -module Clod { +namespace Clod { var p = x; // x isn't in scope here } diff --git a/tests/baselines/reference/staticsNotInScopeInClodule.symbols b/tests/baselines/reference/staticsNotInScopeInClodule.symbols index c925a66ae3316..47cc2b1dab982 100644 --- a/tests/baselines/reference/staticsNotInScopeInClodule.symbols +++ b/tests/baselines/reference/staticsNotInScopeInClodule.symbols @@ -8,7 +8,7 @@ class Clod { >x : Symbol(Clod.x, Decl(staticsNotInScopeInClodule.ts, 0, 12)) } -module Clod { +namespace Clod { >Clod : Symbol(Clod, Decl(staticsNotInScopeInClodule.ts, 0, 0), Decl(staticsNotInScopeInClodule.ts, 2, 1)) var p = x; // x isn't in scope here diff --git a/tests/baselines/reference/staticsNotInScopeInClodule.types b/tests/baselines/reference/staticsNotInScopeInClodule.types index d8cc1085036d8..9143129fcbb1a 100644 --- a/tests/baselines/reference/staticsNotInScopeInClodule.types +++ b/tests/baselines/reference/staticsNotInScopeInClodule.types @@ -12,7 +12,7 @@ class Clod { > : ^^ } -module Clod { +namespace Clod { >Clod : typeof Clod > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/strictModeReservedWordInModuleDeclaration.errors.txt b/tests/baselines/reference/strictModeReservedWordInModuleDeclaration.errors.txt index d895a7bb80247..66e5c420fcb60 100644 --- a/tests/baselines/reference/strictModeReservedWordInModuleDeclaration.errors.txt +++ b/tests/baselines/reference/strictModeReservedWordInModuleDeclaration.errors.txt @@ -1,24 +1,24 @@ -strictModeReservedWordInModuleDeclaration.ts(2,8): error TS1212: Identifier expected. 'public' is a reserved word in strict mode. -strictModeReservedWordInModuleDeclaration.ts(3,8): error TS1212: Identifier expected. 'private' is a reserved word in strict mode. -strictModeReservedWordInModuleDeclaration.ts(4,8): error TS1212: Identifier expected. 'public' is a reserved word in strict mode. -strictModeReservedWordInModuleDeclaration.ts(6,8): error TS1212: Identifier expected. 'private' is a reserved word in strict mode. -strictModeReservedWordInModuleDeclaration.ts(6,16): error TS1212: Identifier expected. 'public' is a reserved word in strict mode. +strictModeReservedWordInModuleDeclaration.ts(2,11): error TS1212: Identifier expected. 'public' is a reserved word in strict mode. +strictModeReservedWordInModuleDeclaration.ts(3,11): error TS1212: Identifier expected. 'private' is a reserved word in strict mode. +strictModeReservedWordInModuleDeclaration.ts(4,11): error TS1212: Identifier expected. 'public' is a reserved word in strict mode. +strictModeReservedWordInModuleDeclaration.ts(6,11): error TS1212: Identifier expected. 'private' is a reserved word in strict mode. +strictModeReservedWordInModuleDeclaration.ts(6,19): error TS1212: Identifier expected. 'public' is a reserved word in strict mode. ==== strictModeReservedWordInModuleDeclaration.ts (5 errors) ==== "use strict" - module public { } - ~~~~~~ + namespace public { } + ~~~~~~ !!! error TS1212: Identifier expected. 'public' is a reserved word in strict mode. - module private { } - ~~~~~~~ + namespace private { } + ~~~~~~~ !!! error TS1212: Identifier expected. 'private' is a reserved word in strict mode. - module public.whatever { - ~~~~~~ + namespace public.whatever { + ~~~~~~ !!! error TS1212: Identifier expected. 'public' is a reserved word in strict mode. } - module private.public.foo { } - ~~~~~~~ + namespace private.public.foo { } + ~~~~~~~ !!! error TS1212: Identifier expected. 'private' is a reserved word in strict mode. - ~~~~~~ + ~~~~~~ !!! error TS1212: Identifier expected. 'public' is a reserved word in strict mode. \ No newline at end of file diff --git a/tests/baselines/reference/strictModeReservedWordInModuleDeclaration.js b/tests/baselines/reference/strictModeReservedWordInModuleDeclaration.js index f3d872cfa3d9c..3cc289405bb7b 100644 --- a/tests/baselines/reference/strictModeReservedWordInModuleDeclaration.js +++ b/tests/baselines/reference/strictModeReservedWordInModuleDeclaration.js @@ -2,11 +2,11 @@ //// [strictModeReservedWordInModuleDeclaration.ts] "use strict" -module public { } -module private { } -module public.whatever { +namespace public { } +namespace private { } +namespace public.whatever { } -module private.public.foo { } +namespace private.public.foo { } //// [strictModeReservedWordInModuleDeclaration.js] "use strict"; diff --git a/tests/baselines/reference/strictModeReservedWordInModuleDeclaration.symbols b/tests/baselines/reference/strictModeReservedWordInModuleDeclaration.symbols index 6bd76eaec32c4..429d2a82d8494 100644 --- a/tests/baselines/reference/strictModeReservedWordInModuleDeclaration.symbols +++ b/tests/baselines/reference/strictModeReservedWordInModuleDeclaration.symbols @@ -2,18 +2,18 @@ === strictModeReservedWordInModuleDeclaration.ts === "use strict" -module public { } ->public : Symbol(public, Decl(strictModeReservedWordInModuleDeclaration.ts, 0, 12), Decl(strictModeReservedWordInModuleDeclaration.ts, 2, 18)) +namespace public { } +>public : Symbol(public, Decl(strictModeReservedWordInModuleDeclaration.ts, 0, 12), Decl(strictModeReservedWordInModuleDeclaration.ts, 2, 21)) -module private { } ->private : Symbol(private, Decl(strictModeReservedWordInModuleDeclaration.ts, 1, 17), Decl(strictModeReservedWordInModuleDeclaration.ts, 4, 1)) +namespace private { } +>private : Symbol(private, Decl(strictModeReservedWordInModuleDeclaration.ts, 1, 20), Decl(strictModeReservedWordInModuleDeclaration.ts, 4, 1)) -module public.whatever { ->public : Symbol(public, Decl(strictModeReservedWordInModuleDeclaration.ts, 0, 12), Decl(strictModeReservedWordInModuleDeclaration.ts, 2, 18)) ->whatever : Symbol(whatever, Decl(strictModeReservedWordInModuleDeclaration.ts, 3, 14)) +namespace public.whatever { +>public : Symbol(public, Decl(strictModeReservedWordInModuleDeclaration.ts, 0, 12), Decl(strictModeReservedWordInModuleDeclaration.ts, 2, 21)) +>whatever : Symbol(whatever, Decl(strictModeReservedWordInModuleDeclaration.ts, 3, 17)) } -module private.public.foo { } ->private : Symbol(private, Decl(strictModeReservedWordInModuleDeclaration.ts, 1, 17), Decl(strictModeReservedWordInModuleDeclaration.ts, 4, 1)) ->public : Symbol(public, Decl(strictModeReservedWordInModuleDeclaration.ts, 5, 15)) ->foo : Symbol(foo, Decl(strictModeReservedWordInModuleDeclaration.ts, 5, 22)) +namespace private.public.foo { } +>private : Symbol(private, Decl(strictModeReservedWordInModuleDeclaration.ts, 1, 20), Decl(strictModeReservedWordInModuleDeclaration.ts, 4, 1)) +>public : Symbol(public, Decl(strictModeReservedWordInModuleDeclaration.ts, 5, 18)) +>foo : Symbol(foo, Decl(strictModeReservedWordInModuleDeclaration.ts, 5, 25)) diff --git a/tests/baselines/reference/strictModeReservedWordInModuleDeclaration.types b/tests/baselines/reference/strictModeReservedWordInModuleDeclaration.types index d5c477887f810..a5e07af3473b3 100644 --- a/tests/baselines/reference/strictModeReservedWordInModuleDeclaration.types +++ b/tests/baselines/reference/strictModeReservedWordInModuleDeclaration.types @@ -5,8 +5,8 @@ >"use strict" : "use strict" > : ^^^^^^^^^^^^ -module public { } -module private { } -module public.whatever { +namespace public { } +namespace private { } +namespace public.whatever { } -module private.public.foo { } +namespace private.public.foo { } diff --git a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.js b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.js index bdbf5554d0a7d..0dbde8a5fd799 100644 --- a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.js +++ b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/stringLiteralObjectLiteralDeclaration1.ts] //// //// [stringLiteralObjectLiteralDeclaration1.ts] -module m1 { +namespace m1 { export var n = { 'foo bar': 4 }; } diff --git a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.symbols b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.symbols index 44673d89d37da..d2f4987838ed2 100644 --- a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.symbols +++ b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/stringLiteralObjectLiteralDeclaration1.ts] //// === stringLiteralObjectLiteralDeclaration1.ts === -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(stringLiteralObjectLiteralDeclaration1.ts, 0, 0)) export var n = { 'foo bar': 4 }; diff --git a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.types b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.types index 33ebcd42180b3..38cd5910299c2 100644 --- a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.types +++ b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/stringLiteralObjectLiteralDeclaration1.ts] //// === stringLiteralObjectLiteralDeclaration1.ts === -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/structural1.js b/tests/baselines/reference/structural1.js index 1bd4796c66378..72a99734af781 100644 --- a/tests/baselines/reference/structural1.js +++ b/tests/baselines/reference/structural1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/structural1.ts] //// //// [structural1.ts] -module M { +namespace M { export interface I { salt:number; pepper:number; diff --git a/tests/baselines/reference/structural1.symbols b/tests/baselines/reference/structural1.symbols index 93f140847945c..5972f8e7ee8cf 100644 --- a/tests/baselines/reference/structural1.symbols +++ b/tests/baselines/reference/structural1.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/structural1.ts] //// === structural1.ts === -module M { +namespace M { >M : Symbol(M, Decl(structural1.ts, 0, 0)) export interface I { ->I : Symbol(I, Decl(structural1.ts, 0, 10)) +>I : Symbol(I, Decl(structural1.ts, 0, 13)) salt:number; >salt : Symbol(I.salt, Decl(structural1.ts, 1, 24)) @@ -17,7 +17,7 @@ module M { export function f(i:I) { >f : Symbol(f, Decl(structural1.ts, 4, 5)) >i : Symbol(i, Decl(structural1.ts, 6, 22)) ->I : Symbol(I, Decl(structural1.ts, 0, 10)) +>I : Symbol(I, Decl(structural1.ts, 0, 13)) } f({salt:2,pepper:0}); diff --git a/tests/baselines/reference/structural1.types b/tests/baselines/reference/structural1.types index 20e0945add2c8..45f8f9cb137be 100644 --- a/tests/baselines/reference/structural1.types +++ b/tests/baselines/reference/structural1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/structural1.ts] //// === structural1.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/structuralTypeInDeclareFileForModule.js b/tests/baselines/reference/structuralTypeInDeclareFileForModule.js index 006d45544381e..39f10351d8374 100644 --- a/tests/baselines/reference/structuralTypeInDeclareFileForModule.js +++ b/tests/baselines/reference/structuralTypeInDeclareFileForModule.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/structuralTypeInDeclareFileForModule.ts] //// //// [structuralTypeInDeclareFileForModule.ts] -module M { export var x; } +namespace M { export var x; } var m = M; //// [structuralTypeInDeclareFileForModule.js] diff --git a/tests/baselines/reference/structuralTypeInDeclareFileForModule.symbols b/tests/baselines/reference/structuralTypeInDeclareFileForModule.symbols index 559404925be6d..c13f3e93cd283 100644 --- a/tests/baselines/reference/structuralTypeInDeclareFileForModule.symbols +++ b/tests/baselines/reference/structuralTypeInDeclareFileForModule.symbols @@ -1,9 +1,9 @@ //// [tests/cases/compiler/structuralTypeInDeclareFileForModule.ts] //// === structuralTypeInDeclareFileForModule.ts === -module M { export var x; } +namespace M { export var x; } >M : Symbol(M, Decl(structuralTypeInDeclareFileForModule.ts, 0, 0)) ->x : Symbol(x, Decl(structuralTypeInDeclareFileForModule.ts, 0, 21)) +>x : Symbol(x, Decl(structuralTypeInDeclareFileForModule.ts, 0, 24)) var m = M; >m : Symbol(m, Decl(structuralTypeInDeclareFileForModule.ts, 1, 3)) diff --git a/tests/baselines/reference/structuralTypeInDeclareFileForModule.types b/tests/baselines/reference/structuralTypeInDeclareFileForModule.types index 6f47c616ccc0d..2ec13b74fc900 100644 --- a/tests/baselines/reference/structuralTypeInDeclareFileForModule.types +++ b/tests/baselines/reference/structuralTypeInDeclareFileForModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/structuralTypeInDeclareFileForModule.ts] //// === structuralTypeInDeclareFileForModule.ts === -module M { export var x; } +namespace M { export var x; } >M : typeof M > : ^^^^^^^^ >x : any diff --git a/tests/baselines/reference/subtypesOfAny.js b/tests/baselines/reference/subtypesOfAny.js index 79296ee21a88a..e6bb481d9f975 100644 --- a/tests/baselines/reference/subtypesOfAny.js +++ b/tests/baselines/reference/subtypesOfAny.js @@ -89,7 +89,7 @@ interface I14 { function f() { } -module f { +namespace f { export var bar = 1; } interface I15 { @@ -99,7 +99,7 @@ interface I15 { class c { baz: string } -module c { +namespace c { export var bar = 1; } interface I16 { diff --git a/tests/baselines/reference/subtypesOfAny.symbols b/tests/baselines/reference/subtypesOfAny.symbols index af5d2f690f97b..28d1506e85ba3 100644 --- a/tests/baselines/reference/subtypesOfAny.symbols +++ b/tests/baselines/reference/subtypesOfAny.symbols @@ -184,7 +184,7 @@ interface I14 { function f() { } >f : Symbol(f, Decl(subtypesOfAny.ts, 84, 1), Decl(subtypesOfAny.ts, 87, 16)) -module f { +namespace f { >f : Symbol(f, Decl(subtypesOfAny.ts, 84, 1), Decl(subtypesOfAny.ts, 87, 16)) export var bar = 1; @@ -206,7 +206,7 @@ class c { baz: string } >c : Symbol(c, Decl(subtypesOfAny.ts, 94, 1), Decl(subtypesOfAny.ts, 97, 23)) >baz : Symbol(c.baz, Decl(subtypesOfAny.ts, 97, 9)) -module c { +namespace c { >c : Symbol(c, Decl(subtypesOfAny.ts, 94, 1), Decl(subtypesOfAny.ts, 97, 23)) export var bar = 1; diff --git a/tests/baselines/reference/subtypesOfAny.types b/tests/baselines/reference/subtypesOfAny.types index f52f5e649abca..293e9fb57e444 100644 --- a/tests/baselines/reference/subtypesOfAny.types +++ b/tests/baselines/reference/subtypesOfAny.types @@ -181,7 +181,7 @@ function f() { } >f : typeof f > : ^^^^^^^^ -module f { +namespace f { >f : typeof f > : ^^^^^^^^ @@ -210,7 +210,7 @@ class c { baz: string } >baz : string > : ^^^^^^ -module c { +namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/subtypesOfTypeParameter.errors.txt b/tests/baselines/reference/subtypesOfTypeParameter.errors.txt index 0e448bce51069..ef058dad35788 100644 --- a/tests/baselines/reference/subtypesOfTypeParameter.errors.txt +++ b/tests/baselines/reference/subtypesOfTypeParameter.errors.txt @@ -29,11 +29,11 @@ subtypesOfTypeParameter.ts(8,5): error TS2416: Property 'foo' in type 'D1' class C2 { foo: T; } enum E { A } function f() { } - module f { + namespace f { export var bar = 1; } class c { baz: string } - module c { + namespace c { export var bar = 1; } diff --git a/tests/baselines/reference/subtypesOfTypeParameter.js b/tests/baselines/reference/subtypesOfTypeParameter.js index 1360dcc69d3bd..ce6e18de11b3e 100644 --- a/tests/baselines/reference/subtypesOfTypeParameter.js +++ b/tests/baselines/reference/subtypesOfTypeParameter.js @@ -21,11 +21,11 @@ class C1 { foo: number; } class C2 { foo: T; } enum E { A } function f() { } -module f { +namespace f { export var bar = 1; } class c { baz: string } -module c { +namespace c { export var bar = 1; } diff --git a/tests/baselines/reference/subtypesOfTypeParameter.symbols b/tests/baselines/reference/subtypesOfTypeParameter.symbols index d5e1dd517a03d..87cd680a8a176 100644 --- a/tests/baselines/reference/subtypesOfTypeParameter.symbols +++ b/tests/baselines/reference/subtypesOfTypeParameter.symbols @@ -65,7 +65,7 @@ enum E { A } function f() { } >f : Symbol(f, Decl(subtypesOfTypeParameter.ts, 18, 12), Decl(subtypesOfTypeParameter.ts, 19, 16)) -module f { +namespace f { >f : Symbol(f, Decl(subtypesOfTypeParameter.ts, 18, 12), Decl(subtypesOfTypeParameter.ts, 19, 16)) export var bar = 1; @@ -75,7 +75,7 @@ class c { baz: string } >c : Symbol(c, Decl(subtypesOfTypeParameter.ts, 22, 1), Decl(subtypesOfTypeParameter.ts, 23, 23)) >baz : Symbol(c.baz, Decl(subtypesOfTypeParameter.ts, 23, 9)) -module c { +namespace c { >c : Symbol(c, Decl(subtypesOfTypeParameter.ts, 22, 1), Decl(subtypesOfTypeParameter.ts, 23, 23)) export var bar = 1; diff --git a/tests/baselines/reference/subtypesOfTypeParameter.types b/tests/baselines/reference/subtypesOfTypeParameter.types index aa9afca661a5e..096c2f5629b58 100644 --- a/tests/baselines/reference/subtypesOfTypeParameter.types +++ b/tests/baselines/reference/subtypesOfTypeParameter.types @@ -82,7 +82,7 @@ function f() { } >f : typeof f > : ^^^^^^^^ -module f { +namespace f { >f : typeof f > : ^^^^^^^^ @@ -98,7 +98,7 @@ class c { baz: string } >baz : string > : ^^^^^^ -module c { +namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.js b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.js index ac997d247939a..fc451a9da2660 100644 --- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.js +++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.js @@ -42,11 +42,11 @@ class C1 { foo: number; } class C2 { foo: T; } enum E { A } function f() { } -module f { +namespace f { export var bar = 1; } class c { baz: string } -module c { +namespace c { export var bar = 1; } diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.symbols b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.symbols index 29c6ea9ef2974..ec04d2096a343 100644 --- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.symbols +++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.symbols @@ -139,7 +139,7 @@ enum E { A } function f() { } >f : Symbol(f, Decl(subtypesOfTypeParameterWithConstraints2.ts, 39, 12), Decl(subtypesOfTypeParameterWithConstraints2.ts, 40, 16)) -module f { +namespace f { >f : Symbol(f, Decl(subtypesOfTypeParameterWithConstraints2.ts, 39, 12), Decl(subtypesOfTypeParameterWithConstraints2.ts, 40, 16)) export var bar = 1; @@ -149,7 +149,7 @@ class c { baz: string } >c : Symbol(c, Decl(subtypesOfTypeParameterWithConstraints2.ts, 43, 1), Decl(subtypesOfTypeParameterWithConstraints2.ts, 44, 23)) >baz : Symbol(c.baz, Decl(subtypesOfTypeParameterWithConstraints2.ts, 44, 9)) -module c { +namespace c { >c : Symbol(c, Decl(subtypesOfTypeParameterWithConstraints2.ts, 43, 1), Decl(subtypesOfTypeParameterWithConstraints2.ts, 44, 23)) export var bar = 1; diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types index c181f9980b718..c2bbdc3655db2 100644 --- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types +++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types @@ -241,7 +241,7 @@ function f() { } >f : typeof f > : ^^^^^^^^ -module f { +namespace f { >f : typeof f > : ^^^^^^^^ @@ -257,7 +257,7 @@ class c { baz: string } >baz : string > : ^^^^^^ -module c { +namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.errors.txt b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.errors.txt index c889d468425d4..748b146933cff 100644 --- a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.errors.txt +++ b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.errors.txt @@ -116,7 +116,7 @@ subtypesOfTypeParameterWithRecursiveConstraints.ts(150,9): error TS2416: Propert var r12 = true ? new Foo() : v; } - module M1 { + namespace M1 { class Base { foo: T; } @@ -204,7 +204,7 @@ subtypesOfTypeParameterWithRecursiveConstraints.ts(150,9): error TS2416: Propert } - module M2 { + namespace M2 { class Base2 { foo: Foo; } diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js index 7f7c36b5a387b..c8b3fddda8bff 100644 --- a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js +++ b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js @@ -56,7 +56,7 @@ function f, U extends Foo, V extends Foo>(t: T, u: U, v: var r12 = true ? new Foo() : v; } -module M1 { +namespace M1 { class Base { foo: T; } @@ -108,7 +108,7 @@ module M1 { } -module M2 { +namespace M2 { class Base2 { foo: Foo; } diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.symbols b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.symbols index ed80b3954b5d0..a50926c3a564e 100644 --- a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.symbols +++ b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.symbols @@ -180,11 +180,11 @@ function f, U extends Foo, V extends Foo>(t: T, u: U, v: >v : Symbol(v, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 3, 76)) } -module M1 { +namespace M1 { >M1 : Symbol(M1, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 53, 1)) class Base { ->Base : Symbol(Base, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 55, 11)) +>Base : Symbol(Base, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 55, 14)) >T : Symbol(T, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 56, 15)) foo: T; @@ -203,7 +203,7 @@ module M1 { >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 60, 48)) >Foo : Symbol(Foo, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 0, 0)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 60, 48)) ->Base : Symbol(Base, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 55, 11)) +>Base : Symbol(Base, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 55, 14)) >T : Symbol(T, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 60, 13)) [x: string]: T; @@ -226,7 +226,7 @@ module M1 { >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 65, 48)) >Foo : Symbol(Foo, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 0, 0)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 65, 48)) ->Base : Symbol(Base, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 55, 11)) +>Base : Symbol(Base, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 55, 14)) >T : Symbol(T, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 65, 13)) [x: string]: T; @@ -249,7 +249,7 @@ module M1 { >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 70, 48)) >Foo : Symbol(Foo, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 0, 0)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 70, 48)) ->Base : Symbol(Base, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 55, 11)) +>Base : Symbol(Base, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 55, 14)) >T : Symbol(T, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 70, 13)) [x: string]: T; @@ -272,7 +272,7 @@ module M1 { >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 75, 48)) >Foo : Symbol(Foo, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 0, 0)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 75, 48)) ->Base : Symbol(Base, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 55, 11)) +>Base : Symbol(Base, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 55, 14)) >U : Symbol(U, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 75, 30)) [x: string]: U; @@ -295,7 +295,7 @@ module M1 { >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 80, 48)) >Foo : Symbol(Foo, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 0, 0)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 80, 48)) ->Base : Symbol(Base, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 55, 11)) +>Base : Symbol(Base, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 55, 14)) >U : Symbol(U, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 80, 30)) [x: string]: U; @@ -318,7 +318,7 @@ module M1 { >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 85, 48)) >Foo : Symbol(Foo, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 0, 0)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 85, 48)) ->Base : Symbol(Base, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 55, 11)) +>Base : Symbol(Base, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 55, 14)) >U : Symbol(U, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 85, 30)) [x: string]: U; @@ -341,7 +341,7 @@ module M1 { >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 90, 48)) >Foo : Symbol(Foo, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 0, 0)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 90, 48)) ->Base : Symbol(Base, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 55, 11)) +>Base : Symbol(Base, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 55, 14)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 90, 48)) [x: string]: V; @@ -364,7 +364,7 @@ module M1 { >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 95, 48)) >Foo : Symbol(Foo, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 0, 0)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 95, 48)) ->Base : Symbol(Base, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 55, 11)) +>Base : Symbol(Base, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 55, 14)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 95, 48)) [x: string]: V; @@ -387,7 +387,7 @@ module M1 { >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 100, 48)) >Foo : Symbol(Foo, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 0, 0)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 100, 48)) ->Base : Symbol(Base, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 55, 11)) +>Base : Symbol(Base, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 55, 14)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 100, 48)) [x: string]: V; @@ -401,11 +401,11 @@ module M1 { } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 104, 1)) class Base2 { ->Base2 : Symbol(Base2, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 107, 11)) +>Base2 : Symbol(Base2, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 107, 14)) >T : Symbol(T, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 108, 16)) foo: Foo; @@ -425,7 +425,7 @@ module M2 { >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 112, 48)) >Foo : Symbol(Foo, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 0, 0)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 112, 48)) ->Base2 : Symbol(Base2, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 107, 11)) +>Base2 : Symbol(Base2, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 107, 14)) >T : Symbol(T, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 112, 13)) [x: string]: T; @@ -448,7 +448,7 @@ module M2 { >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 117, 48)) >Foo : Symbol(Foo, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 0, 0)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 117, 48)) ->Base2 : Symbol(Base2, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 107, 11)) +>Base2 : Symbol(Base2, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 107, 14)) >T : Symbol(T, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 117, 13)) [x: string]: T; @@ -471,7 +471,7 @@ module M2 { >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 122, 48)) >Foo : Symbol(Foo, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 0, 0)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 122, 48)) ->Base2 : Symbol(Base2, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 107, 11)) +>Base2 : Symbol(Base2, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 107, 14)) >T : Symbol(T, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 122, 13)) [x: string]: T; @@ -494,7 +494,7 @@ module M2 { >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 127, 48)) >Foo : Symbol(Foo, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 0, 0)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 127, 48)) ->Base2 : Symbol(Base2, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 107, 11)) +>Base2 : Symbol(Base2, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 107, 14)) >U : Symbol(U, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 127, 30)) [x: string]: U; @@ -517,7 +517,7 @@ module M2 { >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 132, 48)) >Foo : Symbol(Foo, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 0, 0)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 132, 48)) ->Base2 : Symbol(Base2, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 107, 11)) +>Base2 : Symbol(Base2, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 107, 14)) >U : Symbol(U, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 132, 30)) [x: string]: U; @@ -540,7 +540,7 @@ module M2 { >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 137, 48)) >Foo : Symbol(Foo, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 0, 0)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 137, 48)) ->Base2 : Symbol(Base2, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 107, 11)) +>Base2 : Symbol(Base2, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 107, 14)) >U : Symbol(U, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 137, 30)) [x: string]: U; @@ -563,7 +563,7 @@ module M2 { >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 142, 48)) >Foo : Symbol(Foo, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 0, 0)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 142, 48)) ->Base2 : Symbol(Base2, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 107, 11)) +>Base2 : Symbol(Base2, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 107, 14)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 142, 48)) [x: string]: V; @@ -586,7 +586,7 @@ module M2 { >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 147, 48)) >Foo : Symbol(Foo, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 0, 0)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 147, 48)) ->Base2 : Symbol(Base2, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 107, 11)) +>Base2 : Symbol(Base2, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 107, 14)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 147, 48)) [x: string]: V; @@ -609,7 +609,7 @@ module M2 { >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 152, 48)) >Foo : Symbol(Foo, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 0, 0)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 152, 48)) ->Base2 : Symbol(Base2, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 107, 11)) +>Base2 : Symbol(Base2, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 107, 14)) >V : Symbol(V, Decl(subtypesOfTypeParameterWithRecursiveConstraints.ts, 152, 48)) [x: string]: V; diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.types b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.types index 1539b4d2cd064..b74782e7393a2 100644 --- a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.types +++ b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.types @@ -358,7 +358,7 @@ function f, U extends Foo, V extends Foo>(t: T, u: U, v: > : ^ } -module M1 { +namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ @@ -508,7 +508,7 @@ module M1 { } -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/subtypesOfUnion.errors.txt b/tests/baselines/reference/subtypesOfUnion.errors.txt index 49f667cc429b6..a977858af6288 100644 --- a/tests/baselines/reference/subtypesOfUnion.errors.txt +++ b/tests/baselines/reference/subtypesOfUnion.errors.txt @@ -35,9 +35,9 @@ subtypesOfUnion.ts(51,5): error TS2411: Property 'foo18' of type '{}' is not ass class A { foo: number; } class A2 { foo: T; } function f() { } - module f { export var bar = 1; } + namespace f { export var bar = 1; } class c { baz: string } - module c { export var bar = 1; } + namespace c { export var bar = 1; } // A type T is a subtype of a union type U if T is a subtype of any type in U. interface I1 { diff --git a/tests/baselines/reference/subtypesOfUnion.js b/tests/baselines/reference/subtypesOfUnion.js index 255a299baf5ef..98f2cab6a3c43 100644 --- a/tests/baselines/reference/subtypesOfUnion.js +++ b/tests/baselines/reference/subtypesOfUnion.js @@ -6,9 +6,9 @@ interface I8 { [x: string]: number[]; } class A { foo: number; } class A2 { foo: T; } function f() { } -module f { export var bar = 1; } +namespace f { export var bar = 1; } class c { baz: string } -module c { export var bar = 1; } +namespace c { export var bar = 1; } // A type T is a subtype of a union type U if T is a subtype of any type in U. interface I1 { diff --git a/tests/baselines/reference/subtypesOfUnion.symbols b/tests/baselines/reference/subtypesOfUnion.symbols index d4d6dcae34df7..2796f1320070a 100644 --- a/tests/baselines/reference/subtypesOfUnion.symbols +++ b/tests/baselines/reference/subtypesOfUnion.symbols @@ -23,21 +23,21 @@ class A2 { foo: T; } function f() { } >f : Symbol(f, Decl(subtypesOfUnion.ts, 3, 23), Decl(subtypesOfUnion.ts, 4, 16)) -module f { export var bar = 1; } +namespace f { export var bar = 1; } >f : Symbol(f, Decl(subtypesOfUnion.ts, 3, 23), Decl(subtypesOfUnion.ts, 4, 16)) ->bar : Symbol(bar, Decl(subtypesOfUnion.ts, 5, 21)) +>bar : Symbol(bar, Decl(subtypesOfUnion.ts, 5, 24)) class c { baz: string } ->c : Symbol(c, Decl(subtypesOfUnion.ts, 5, 32), Decl(subtypesOfUnion.ts, 6, 23)) +>c : Symbol(c, Decl(subtypesOfUnion.ts, 5, 35), Decl(subtypesOfUnion.ts, 6, 23)) >baz : Symbol(c.baz, Decl(subtypesOfUnion.ts, 6, 9)) -module c { export var bar = 1; } ->c : Symbol(c, Decl(subtypesOfUnion.ts, 5, 32), Decl(subtypesOfUnion.ts, 6, 23)) ->bar : Symbol(bar, Decl(subtypesOfUnion.ts, 7, 21)) +namespace c { export var bar = 1; } +>c : Symbol(c, Decl(subtypesOfUnion.ts, 5, 35), Decl(subtypesOfUnion.ts, 6, 23)) +>bar : Symbol(bar, Decl(subtypesOfUnion.ts, 7, 24)) // A type T is a subtype of a union type U if T is a subtype of any type in U. interface I1 { ->I1 : Symbol(I1, Decl(subtypesOfUnion.ts, 7, 32)) +>I1 : Symbol(I1, Decl(subtypesOfUnion.ts, 7, 35)) >T : Symbol(T, Decl(subtypesOfUnion.ts, 10, 13)) [x: string]: string | number; @@ -100,7 +100,7 @@ interface I1 { foo15: typeof c; // error >foo15 : Symbol(I1.foo15, Decl(subtypesOfUnion.ts, 25, 20)) ->c : Symbol(c, Decl(subtypesOfUnion.ts, 5, 32), Decl(subtypesOfUnion.ts, 6, 23)) +>c : Symbol(c, Decl(subtypesOfUnion.ts, 5, 35), Decl(subtypesOfUnion.ts, 6, 23)) foo16: T; // error >foo16 : Symbol(I1.foo16, Decl(subtypesOfUnion.ts, 26, 20)) @@ -178,7 +178,7 @@ interface I2 { foo15: typeof c; // error >foo15 : Symbol(I2.foo15, Decl(subtypesOfUnion.ts, 46, 20)) ->c : Symbol(c, Decl(subtypesOfUnion.ts, 5, 32), Decl(subtypesOfUnion.ts, 6, 23)) +>c : Symbol(c, Decl(subtypesOfUnion.ts, 5, 35), Decl(subtypesOfUnion.ts, 6, 23)) foo16: T; // error >foo16 : Symbol(I2.foo16, Decl(subtypesOfUnion.ts, 47, 20)) diff --git a/tests/baselines/reference/subtypesOfUnion.types b/tests/baselines/reference/subtypesOfUnion.types index 59e2a8378f5f6..163a91a0b1ce8 100644 --- a/tests/baselines/reference/subtypesOfUnion.types +++ b/tests/baselines/reference/subtypesOfUnion.types @@ -29,7 +29,7 @@ function f() { } >f : typeof f > : ^^^^^^^^ -module f { export var bar = 1; } +namespace f { export var bar = 1; } >f : typeof f > : ^^^^^^^^ >bar : number @@ -43,7 +43,7 @@ class c { baz: string } >baz : string > : ^^^^^^ -module c { export var bar = 1; } +namespace c { export var bar = 1; } >c : typeof c > : ^^^^^^^^ >bar : number diff --git a/tests/baselines/reference/subtypingWithCallSignatures.js b/tests/baselines/reference/subtypingWithCallSignatures.js index 3ec50c590400e..79cf297a6ad95 100644 --- a/tests/baselines/reference/subtypingWithCallSignatures.js +++ b/tests/baselines/reference/subtypingWithCallSignatures.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures.ts] //// //// [subtypingWithCallSignatures.ts] -module CallSignature { +namespace CallSignature { declare function foo1(cb: (x: number) => void): typeof cb; declare function foo1(cb: any): any; var r = foo1((x: number) => 1); // ok because base returns void diff --git a/tests/baselines/reference/subtypingWithCallSignatures.symbols b/tests/baselines/reference/subtypingWithCallSignatures.symbols index 54fb09e0c02d1..2f22a384c8327 100644 --- a/tests/baselines/reference/subtypingWithCallSignatures.symbols +++ b/tests/baselines/reference/subtypingWithCallSignatures.symbols @@ -1,27 +1,27 @@ //// [tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures.ts] //// === subtypingWithCallSignatures.ts === -module CallSignature { +namespace CallSignature { >CallSignature : Symbol(CallSignature, Decl(subtypingWithCallSignatures.ts, 0, 0)) declare function foo1(cb: (x: number) => void): typeof cb; ->foo1 : Symbol(foo1, Decl(subtypingWithCallSignatures.ts, 0, 22), Decl(subtypingWithCallSignatures.ts, 1, 62)) +>foo1 : Symbol(foo1, Decl(subtypingWithCallSignatures.ts, 0, 25), Decl(subtypingWithCallSignatures.ts, 1, 62)) >cb : Symbol(cb, Decl(subtypingWithCallSignatures.ts, 1, 26)) >x : Symbol(x, Decl(subtypingWithCallSignatures.ts, 1, 31)) >cb : Symbol(cb, Decl(subtypingWithCallSignatures.ts, 1, 26)) declare function foo1(cb: any): any; ->foo1 : Symbol(foo1, Decl(subtypingWithCallSignatures.ts, 0, 22), Decl(subtypingWithCallSignatures.ts, 1, 62)) +>foo1 : Symbol(foo1, Decl(subtypingWithCallSignatures.ts, 0, 25), Decl(subtypingWithCallSignatures.ts, 1, 62)) >cb : Symbol(cb, Decl(subtypingWithCallSignatures.ts, 2, 26)) var r = foo1((x: number) => 1); // ok because base returns void >r : Symbol(r, Decl(subtypingWithCallSignatures.ts, 3, 7)) ->foo1 : Symbol(foo1, Decl(subtypingWithCallSignatures.ts, 0, 22), Decl(subtypingWithCallSignatures.ts, 1, 62)) +>foo1 : Symbol(foo1, Decl(subtypingWithCallSignatures.ts, 0, 25), Decl(subtypingWithCallSignatures.ts, 1, 62)) >x : Symbol(x, Decl(subtypingWithCallSignatures.ts, 3, 18)) var r2 = foo1((x: T) => ''); // ok because base returns void >r2 : Symbol(r2, Decl(subtypingWithCallSignatures.ts, 4, 7)) ->foo1 : Symbol(foo1, Decl(subtypingWithCallSignatures.ts, 0, 22), Decl(subtypingWithCallSignatures.ts, 1, 62)) +>foo1 : Symbol(foo1, Decl(subtypingWithCallSignatures.ts, 0, 25), Decl(subtypingWithCallSignatures.ts, 1, 62)) >T : Symbol(T, Decl(subtypingWithCallSignatures.ts, 4, 19)) >x : Symbol(x, Decl(subtypingWithCallSignatures.ts, 4, 22)) >T : Symbol(T, Decl(subtypingWithCallSignatures.ts, 4, 19)) diff --git a/tests/baselines/reference/subtypingWithCallSignatures.types b/tests/baselines/reference/subtypingWithCallSignatures.types index 938d1445c988b..4762a2c584e1e 100644 --- a/tests/baselines/reference/subtypingWithCallSignatures.types +++ b/tests/baselines/reference/subtypingWithCallSignatures.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures.ts] //// === subtypingWithCallSignatures.ts === -module CallSignature { +namespace CallSignature { >CallSignature : typeof CallSignature > : ^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/subtypingWithCallSignatures3.js b/tests/baselines/reference/subtypingWithCallSignatures3.js index f0ceb80945b4b..738eca28eb616 100644 --- a/tests/baselines/reference/subtypingWithCallSignatures3.js +++ b/tests/baselines/reference/subtypingWithCallSignatures3.js @@ -4,7 +4,7 @@ // checking subtype relations for function types as it relates to contextual signature instantiation // error cases, so function calls will all result in 'any' -module Errors { +namespace Errors { class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Derived { baz: string; } @@ -108,7 +108,7 @@ module Errors { var r9 = foo17(r9arg); // (x: { (a: T): T; (a: T): T; }): any[]; (x: { (a: T): T; (a: T): T; }): any[]; } -module WithGenericSignaturesInBaseType { +namespace WithGenericSignaturesInBaseType { declare function foo2(a2: (x: T) => T[]): typeof a2; declare function foo2(a2: any): any; var r2arg2 = (x: T) => ['']; diff --git a/tests/baselines/reference/subtypingWithCallSignatures3.symbols b/tests/baselines/reference/subtypingWithCallSignatures3.symbols index 6dac3064e077b..60ba90afdf7be 100644 --- a/tests/baselines/reference/subtypingWithCallSignatures3.symbols +++ b/tests/baselines/reference/subtypingWithCallSignatures3.symbols @@ -4,16 +4,16 @@ // checking subtype relations for function types as it relates to contextual signature instantiation // error cases, so function calls will all result in 'any' -module Errors { +namespace Errors { >Errors : Symbol(Errors, Decl(subtypingWithCallSignatures3.ts, 0, 0)) class Base { foo: string; } ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >foo : Symbol(Base.foo, Decl(subtypingWithCallSignatures3.ts, 4, 16)) class Derived extends Base { bar: string; } >Derived : Symbol(Derived, Decl(subtypingWithCallSignatures3.ts, 4, 31)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >bar : Symbol(Derived.bar, Decl(subtypingWithCallSignatures3.ts, 5, 32)) class Derived2 extends Derived { baz: string; } @@ -23,7 +23,7 @@ module Errors { class OtherDerived extends Base { bing: string; } >OtherDerived : Symbol(OtherDerived, Decl(subtypingWithCallSignatures3.ts, 6, 51)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >bing : Symbol(OtherDerived.bing, Decl(subtypingWithCallSignatures3.ts, 7, 37)) declare function foo2(a2: (x: number) => string[]): typeof a2; @@ -41,10 +41,10 @@ module Errors { >a2 : Symbol(a2, Decl(subtypingWithCallSignatures3.ts, 12, 26)) >x : Symbol(x, Decl(subtypingWithCallSignatures3.ts, 12, 31)) >arg : Symbol(arg, Decl(subtypingWithCallSignatures3.ts, 12, 35)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(subtypingWithCallSignatures3.ts, 4, 31)) >r : Symbol(r, Decl(subtypingWithCallSignatures3.ts, 12, 62)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >Derived2 : Symbol(Derived2, Decl(subtypingWithCallSignatures3.ts, 5, 47)) >a2 : Symbol(a2, Decl(subtypingWithCallSignatures3.ts, 12, 26)) @@ -57,14 +57,14 @@ module Errors { >a2 : Symbol(a2, Decl(subtypingWithCallSignatures3.ts, 15, 26)) >x : Symbol(x, Decl(subtypingWithCallSignatures3.ts, 15, 31)) >arg : Symbol(arg, Decl(subtypingWithCallSignatures3.ts, 15, 35)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(subtypingWithCallSignatures3.ts, 4, 31)) >y : Symbol(y, Decl(subtypingWithCallSignatures3.ts, 15, 57)) >arg2 : Symbol(arg2, Decl(subtypingWithCallSignatures3.ts, 15, 62)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(subtypingWithCallSignatures3.ts, 4, 31)) >r : Symbol(r, Decl(subtypingWithCallSignatures3.ts, 15, 90)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(subtypingWithCallSignatures3.ts, 4, 31)) >a2 : Symbol(a2, Decl(subtypingWithCallSignatures3.ts, 15, 26)) @@ -76,8 +76,8 @@ module Errors { >foo10 : Symbol(foo10, Decl(subtypingWithCallSignatures3.ts, 16, 40), Decl(subtypingWithCallSignatures3.ts, 18, 66)) >a2 : Symbol(a2, Decl(subtypingWithCallSignatures3.ts, 18, 27)) >x : Symbol(x, Decl(subtypingWithCallSignatures3.ts, 18, 32)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >a2 : Symbol(a2, Decl(subtypingWithCallSignatures3.ts, 18, 27)) declare function foo10(a2: any): any; @@ -92,7 +92,7 @@ module Errors { >y : Symbol(y, Decl(subtypingWithCallSignatures3.ts, 21, 51)) >foo : Symbol(foo, Decl(subtypingWithCallSignatures3.ts, 21, 56)) >bar : Symbol(bar, Decl(subtypingWithCallSignatures3.ts, 21, 69)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >a2 : Symbol(a2, Decl(subtypingWithCallSignatures3.ts, 21, 27)) declare function foo11(a2: any): any; @@ -104,7 +104,7 @@ module Errors { >a2 : Symbol(a2, Decl(subtypingWithCallSignatures3.ts, 24, 27)) >x : Symbol(x, Decl(subtypingWithCallSignatures3.ts, 24, 32)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >y : Symbol(y, Decl(subtypingWithCallSignatures3.ts, 24, 47)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Derived2 : Symbol(Derived2, Decl(subtypingWithCallSignatures3.ts, 5, 47)) @@ -176,7 +176,7 @@ module Errors { (a: T): T; >T : Symbol(T, Decl(subtypingWithCallSignatures3.ts, 46, 13)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >a : Symbol(a, Decl(subtypingWithCallSignatures3.ts, 46, 29)) >T : Symbol(T, Decl(subtypingWithCallSignatures3.ts, 46, 13)) >T : Symbol(T, Decl(subtypingWithCallSignatures3.ts, 46, 13)) @@ -194,7 +194,7 @@ module Errors { (a: T): T; >T : Symbol(T, Decl(subtypingWithCallSignatures3.ts, 50, 13)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >a : Symbol(a, Decl(subtypingWithCallSignatures3.ts, 50, 29)) >T : Symbol(T, Decl(subtypingWithCallSignatures3.ts, 50, 13)) >T : Symbol(T, Decl(subtypingWithCallSignatures3.ts, 50, 13)) @@ -237,7 +237,7 @@ module Errors { var r2arg = (x: (arg: T) => U) => (r: T) => null; >r2arg : Symbol(r2arg, Decl(subtypingWithCallSignatures3.ts, 59, 7)) >T : Symbol(T, Decl(subtypingWithCallSignatures3.ts, 59, 17)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >U : Symbol(U, Decl(subtypingWithCallSignatures3.ts, 59, 32)) >Derived : Symbol(Derived, Decl(subtypingWithCallSignatures3.ts, 4, 31)) >V : Symbol(V, Decl(subtypingWithCallSignatures3.ts, 59, 51)) @@ -254,10 +254,10 @@ module Errors { >r2arg2 : Symbol(r2arg2, Decl(subtypingWithCallSignatures3.ts, 60, 7)) >x : Symbol(x, Decl(subtypingWithCallSignatures3.ts, 60, 18)) >arg : Symbol(arg, Decl(subtypingWithCallSignatures3.ts, 60, 22)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(subtypingWithCallSignatures3.ts, 4, 31)) >r : Symbol(r, Decl(subtypingWithCallSignatures3.ts, 60, 49)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >Derived2 : Symbol(Derived2, Decl(subtypingWithCallSignatures3.ts, 5, 47)) var r2 = foo7(r2arg); // any @@ -278,7 +278,7 @@ module Errors { var r3arg = (x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => null; >r3arg : Symbol(r3arg, Decl(subtypingWithCallSignatures3.ts, 65, 7)) >T : Symbol(T, Decl(subtypingWithCallSignatures3.ts, 65, 17)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >U : Symbol(U, Decl(subtypingWithCallSignatures3.ts, 65, 32)) >Derived : Symbol(Derived, Decl(subtypingWithCallSignatures3.ts, 4, 31)) >x : Symbol(x, Decl(subtypingWithCallSignatures3.ts, 65, 52)) @@ -297,14 +297,14 @@ module Errors { >r3arg2 : Symbol(r3arg2, Decl(subtypingWithCallSignatures3.ts, 66, 7)) >x : Symbol(x, Decl(subtypingWithCallSignatures3.ts, 66, 18)) >arg : Symbol(arg, Decl(subtypingWithCallSignatures3.ts, 66, 22)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(subtypingWithCallSignatures3.ts, 4, 31)) >y : Symbol(y, Decl(subtypingWithCallSignatures3.ts, 66, 44)) >arg2 : Symbol(arg2, Decl(subtypingWithCallSignatures3.ts, 66, 49)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(subtypingWithCallSignatures3.ts, 4, 31)) >r : Symbol(r, Decl(subtypingWithCallSignatures3.ts, 66, 77)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(subtypingWithCallSignatures3.ts, 4, 31)) var r3 = foo8(r3arg); // any @@ -333,8 +333,8 @@ module Errors { var r4arg2 = (...x: Base[]) => null; >r4arg2 : Symbol(r4arg2, Decl(subtypingWithCallSignatures3.ts, 72, 7)) >x : Symbol(x, Decl(subtypingWithCallSignatures3.ts, 72, 18)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) var r4 = foo10(r4arg); // any >r4 : Symbol(r4, Decl(subtypingWithCallSignatures3.ts, 73, 7)) @@ -368,7 +368,7 @@ module Errors { >y : Symbol(y, Decl(subtypingWithCallSignatures3.ts, 78, 37)) >foo : Symbol(foo, Decl(subtypingWithCallSignatures3.ts, 78, 42)) >bar : Symbol(bar, Decl(subtypingWithCallSignatures3.ts, 78, 55)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) var r5 = foo11(r5arg); // any >r5 : Symbol(r5, Decl(subtypingWithCallSignatures3.ts, 79, 7)) @@ -389,7 +389,7 @@ module Errors { >r6arg : Symbol(r6arg, Decl(subtypingWithCallSignatures3.ts, 83, 7)) >x : Symbol(x, Decl(subtypingWithCallSignatures3.ts, 83, 17)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >y : Symbol(y, Decl(subtypingWithCallSignatures3.ts, 83, 32)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Derived2 : Symbol(Derived2, Decl(subtypingWithCallSignatures3.ts, 5, 47)) @@ -403,10 +403,10 @@ module Errors { >Derived2 : Symbol(Derived2, Decl(subtypingWithCallSignatures3.ts, 5, 47)) >x : Symbol(x, Decl(subtypingWithCallSignatures3.ts, 84, 45)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >y : Symbol(y, Decl(subtypingWithCallSignatures3.ts, 84, 60)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >T : Symbol(T, Decl(subtypingWithCallSignatures3.ts, 84, 18)) var r6 = foo12(r6arg); // (x: Array, y: Array) => Array @@ -458,7 +458,7 @@ module Errors { var r7arg3 = (x: { a: T; b: T }) => 1; >r7arg3 : Symbol(r7arg3, Decl(subtypingWithCallSignatures3.ts, 95, 7)) >T : Symbol(T, Decl(subtypingWithCallSignatures3.ts, 95, 18)) ->Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 18)) >x : Symbol(x, Decl(subtypingWithCallSignatures3.ts, 95, 34)) >a : Symbol(a, Decl(subtypingWithCallSignatures3.ts, 95, 38)) >T : Symbol(T, Decl(subtypingWithCallSignatures3.ts, 95, 18)) @@ -508,11 +508,11 @@ module Errors { >r9arg : Symbol(r9arg, Decl(subtypingWithCallSignatures3.ts, 103, 7)) } -module WithGenericSignaturesInBaseType { +namespace WithGenericSignaturesInBaseType { >WithGenericSignaturesInBaseType : Symbol(WithGenericSignaturesInBaseType, Decl(subtypingWithCallSignatures3.ts, 105, 1)) declare function foo2(a2: (x: T) => T[]): typeof a2; ->foo2 : Symbol(foo2, Decl(subtypingWithCallSignatures3.ts, 107, 40), Decl(subtypingWithCallSignatures3.ts, 108, 59)) +>foo2 : Symbol(foo2, Decl(subtypingWithCallSignatures3.ts, 107, 43), Decl(subtypingWithCallSignatures3.ts, 108, 59)) >a2 : Symbol(a2, Decl(subtypingWithCallSignatures3.ts, 108, 26)) >T : Symbol(T, Decl(subtypingWithCallSignatures3.ts, 108, 31)) >x : Symbol(x, Decl(subtypingWithCallSignatures3.ts, 108, 34)) @@ -521,7 +521,7 @@ module WithGenericSignaturesInBaseType { >a2 : Symbol(a2, Decl(subtypingWithCallSignatures3.ts, 108, 26)) declare function foo2(a2: any): any; ->foo2 : Symbol(foo2, Decl(subtypingWithCallSignatures3.ts, 107, 40), Decl(subtypingWithCallSignatures3.ts, 108, 59)) +>foo2 : Symbol(foo2, Decl(subtypingWithCallSignatures3.ts, 107, 43), Decl(subtypingWithCallSignatures3.ts, 108, 59)) >a2 : Symbol(a2, Decl(subtypingWithCallSignatures3.ts, 109, 26)) var r2arg2 = (x: T) => ['']; @@ -532,7 +532,7 @@ module WithGenericSignaturesInBaseType { var r2 = foo2(r2arg2); // (x:T) => T[] since we can infer from generic signatures now >r2 : Symbol(r2, Decl(subtypingWithCallSignatures3.ts, 111, 7)) ->foo2 : Symbol(foo2, Decl(subtypingWithCallSignatures3.ts, 107, 40), Decl(subtypingWithCallSignatures3.ts, 108, 59)) +>foo2 : Symbol(foo2, Decl(subtypingWithCallSignatures3.ts, 107, 43), Decl(subtypingWithCallSignatures3.ts, 108, 59)) >r2arg2 : Symbol(r2arg2, Decl(subtypingWithCallSignatures3.ts, 110, 7)) declare function foo3(a2: (x: T) => string[]): typeof a2; diff --git a/tests/baselines/reference/subtypingWithCallSignatures3.types b/tests/baselines/reference/subtypingWithCallSignatures3.types index 5618553cd89b6..43f41fe9a738b 100644 --- a/tests/baselines/reference/subtypingWithCallSignatures3.types +++ b/tests/baselines/reference/subtypingWithCallSignatures3.types @@ -4,7 +4,7 @@ // checking subtype relations for function types as it relates to contextual signature instantiation // error cases, so function calls will all result in 'any' -module Errors { +namespace Errors { >Errors : typeof Errors > : ^^^^^^^^^^^^^ @@ -743,7 +743,7 @@ module Errors { > : ^ ^^ ^^ ^^^^^ } -module WithGenericSignaturesInBaseType { +namespace WithGenericSignaturesInBaseType { >WithGenericSignaturesInBaseType : typeof WithGenericSignaturesInBaseType > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.errors.txt b/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.errors.txt index b94eb09873208..ec11975d20266 100644 --- a/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.errors.txt +++ b/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.errors.txt @@ -10,7 +10,7 @@ subtypingWithCallSignaturesWithSpecializedSignatures.ts(76,15): error TS2430: In ==== subtypingWithCallSignaturesWithSpecializedSignatures.ts (2 errors) ==== // same as subtypingWithCallSignatures but with additional specialized signatures that should not affect the results - module CallSignature { + namespace CallSignature { interface Base { // T // M's (x: 'a'): void; @@ -45,7 +45,7 @@ subtypingWithCallSignaturesWithSpecializedSignatures.ts(76,15): error TS2430: In } } - module MemberWithCallSignature { + namespace MemberWithCallSignature { interface Base { // T // M's a: { diff --git a/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.js b/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.js index 2e22e64d009fc..8f8365b033a12 100644 --- a/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.js +++ b/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.js @@ -3,7 +3,7 @@ //// [subtypingWithCallSignaturesWithSpecializedSignatures.ts] // same as subtypingWithCallSignatures but with additional specialized signatures that should not affect the results -module CallSignature { +namespace CallSignature { interface Base { // T // M's (x: 'a'): void; @@ -38,7 +38,7 @@ module CallSignature { } } -module MemberWithCallSignature { +namespace MemberWithCallSignature { interface Base { // T // M's a: { diff --git a/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.symbols b/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.symbols index 93500c4633995..c831d9b743095 100644 --- a/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.symbols +++ b/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.symbols @@ -3,11 +3,11 @@ === subtypingWithCallSignaturesWithSpecializedSignatures.ts === // same as subtypingWithCallSignatures but with additional specialized signatures that should not affect the results -module CallSignature { +namespace CallSignature { >CallSignature : Symbol(CallSignature, Decl(subtypingWithCallSignaturesWithSpecializedSignatures.ts, 0, 0)) interface Base { // T ->Base : Symbol(Base, Decl(subtypingWithCallSignaturesWithSpecializedSignatures.ts, 2, 22)) +>Base : Symbol(Base, Decl(subtypingWithCallSignaturesWithSpecializedSignatures.ts, 2, 25)) // M's (x: 'a'): void; @@ -21,7 +21,7 @@ module CallSignature { // S's interface I extends Base { >I : Symbol(I, Decl(subtypingWithCallSignaturesWithSpecializedSignatures.ts, 7, 5)) ->Base : Symbol(Base, Decl(subtypingWithCallSignaturesWithSpecializedSignatures.ts, 2, 22)) +>Base : Symbol(Base, Decl(subtypingWithCallSignaturesWithSpecializedSignatures.ts, 2, 25)) // N's (x: 'a'): number; // ok because base returns void @@ -74,11 +74,11 @@ module CallSignature { } } -module MemberWithCallSignature { +namespace MemberWithCallSignature { >MemberWithCallSignature : Symbol(MemberWithCallSignature, Decl(subtypingWithCallSignaturesWithSpecializedSignatures.ts, 35, 1)) interface Base { // T ->Base : Symbol(Base, Decl(subtypingWithCallSignaturesWithSpecializedSignatures.ts, 37, 32)) +>Base : Symbol(Base, Decl(subtypingWithCallSignaturesWithSpecializedSignatures.ts, 37, 35)) // M's a: { @@ -111,7 +111,7 @@ module MemberWithCallSignature { // S's interface I extends Base { >I : Symbol(I, Decl(subtypingWithCallSignaturesWithSpecializedSignatures.ts, 49, 5)) ->Base : Symbol(Base, Decl(subtypingWithCallSignaturesWithSpecializedSignatures.ts, 37, 32)) +>Base : Symbol(Base, Decl(subtypingWithCallSignaturesWithSpecializedSignatures.ts, 37, 35)) // N's a: (x: string) => number; // ok because base returns void diff --git a/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.types b/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.types index 998b51c20d623..7704e128755bc 100644 --- a/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.types +++ b/tests/baselines/reference/subtypingWithCallSignaturesWithSpecializedSignatures.types @@ -3,7 +3,7 @@ === subtypingWithCallSignaturesWithSpecializedSignatures.ts === // same as subtypingWithCallSignatures but with additional specialized signatures that should not affect the results -module CallSignature { +namespace CallSignature { interface Base { // T // M's (x: 'a'): void; @@ -67,7 +67,7 @@ module CallSignature { } } -module MemberWithCallSignature { +namespace MemberWithCallSignature { interface Base { // T // M's a: { diff --git a/tests/baselines/reference/subtypingWithConstructSignatures.js b/tests/baselines/reference/subtypingWithConstructSignatures.js index 32b9219b21613..7842980db9dd3 100644 --- a/tests/baselines/reference/subtypingWithConstructSignatures.js +++ b/tests/baselines/reference/subtypingWithConstructSignatures.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures.ts] //// //// [subtypingWithConstructSignatures.ts] -module ConstructSignature { +namespace ConstructSignature { declare function foo1(cb: new (x: number) => void): typeof cb; declare function foo1(cb: any): any; var rarg1: new (x: number) => number; diff --git a/tests/baselines/reference/subtypingWithConstructSignatures.symbols b/tests/baselines/reference/subtypingWithConstructSignatures.symbols index e0f2083dc115d..db16274fee253 100644 --- a/tests/baselines/reference/subtypingWithConstructSignatures.symbols +++ b/tests/baselines/reference/subtypingWithConstructSignatures.symbols @@ -1,17 +1,17 @@ //// [tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures.ts] //// === subtypingWithConstructSignatures.ts === -module ConstructSignature { +namespace ConstructSignature { >ConstructSignature : Symbol(ConstructSignature, Decl(subtypingWithConstructSignatures.ts, 0, 0)) declare function foo1(cb: new (x: number) => void): typeof cb; ->foo1 : Symbol(foo1, Decl(subtypingWithConstructSignatures.ts, 0, 27), Decl(subtypingWithConstructSignatures.ts, 1, 66)) +>foo1 : Symbol(foo1, Decl(subtypingWithConstructSignatures.ts, 0, 30), Decl(subtypingWithConstructSignatures.ts, 1, 66)) >cb : Symbol(cb, Decl(subtypingWithConstructSignatures.ts, 1, 26)) >x : Symbol(x, Decl(subtypingWithConstructSignatures.ts, 1, 35)) >cb : Symbol(cb, Decl(subtypingWithConstructSignatures.ts, 1, 26)) declare function foo1(cb: any): any; ->foo1 : Symbol(foo1, Decl(subtypingWithConstructSignatures.ts, 0, 27), Decl(subtypingWithConstructSignatures.ts, 1, 66)) +>foo1 : Symbol(foo1, Decl(subtypingWithConstructSignatures.ts, 0, 30), Decl(subtypingWithConstructSignatures.ts, 1, 66)) >cb : Symbol(cb, Decl(subtypingWithConstructSignatures.ts, 2, 26)) var rarg1: new (x: number) => number; @@ -20,7 +20,7 @@ module ConstructSignature { var r = foo1(rarg1); // ok because base returns void >r : Symbol(r, Decl(subtypingWithConstructSignatures.ts, 4, 7)) ->foo1 : Symbol(foo1, Decl(subtypingWithConstructSignatures.ts, 0, 27), Decl(subtypingWithConstructSignatures.ts, 1, 66)) +>foo1 : Symbol(foo1, Decl(subtypingWithConstructSignatures.ts, 0, 30), Decl(subtypingWithConstructSignatures.ts, 1, 66)) >rarg1 : Symbol(rarg1, Decl(subtypingWithConstructSignatures.ts, 3, 7)) var rarg2: new (x: T) => string; @@ -31,7 +31,7 @@ module ConstructSignature { var r2 = foo1(rarg2); // ok because base returns void >r2 : Symbol(r2, Decl(subtypingWithConstructSignatures.ts, 6, 7)) ->foo1 : Symbol(foo1, Decl(subtypingWithConstructSignatures.ts, 0, 27), Decl(subtypingWithConstructSignatures.ts, 1, 66)) +>foo1 : Symbol(foo1, Decl(subtypingWithConstructSignatures.ts, 0, 30), Decl(subtypingWithConstructSignatures.ts, 1, 66)) >rarg2 : Symbol(rarg2, Decl(subtypingWithConstructSignatures.ts, 5, 7)) declare function foo2(cb: new (x: number, y: number) => void): typeof cb; diff --git a/tests/baselines/reference/subtypingWithConstructSignatures.types b/tests/baselines/reference/subtypingWithConstructSignatures.types index a73396e328bf2..62f0c0c97fc0e 100644 --- a/tests/baselines/reference/subtypingWithConstructSignatures.types +++ b/tests/baselines/reference/subtypingWithConstructSignatures.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures.ts] //// === subtypingWithConstructSignatures.ts === -module ConstructSignature { +namespace ConstructSignature { >ConstructSignature : typeof ConstructSignature > : ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/subtypingWithConstructSignatures3.js b/tests/baselines/reference/subtypingWithConstructSignatures3.js index 4d35b0740a917..87a0826ab0c57 100644 --- a/tests/baselines/reference/subtypingWithConstructSignatures3.js +++ b/tests/baselines/reference/subtypingWithConstructSignatures3.js @@ -4,7 +4,7 @@ // checking subtype relations for function types as it relates to contextual signature instantiation // error cases, so function calls will all result in 'any' -module Errors { +namespace Errors { class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Derived { baz: string; } @@ -110,7 +110,7 @@ module Errors { var r9 = foo17(r9arg); // // (x: { (a: T): T; (a: T): T; }): any[]; (x: { (a: T): T; (a: T): T; }): any[]; } -module WithGenericSignaturesInBaseType { +namespace WithGenericSignaturesInBaseType { declare function foo2(a2: new (x: T) => T[]): typeof a2; declare function foo2(a2: any): any; var r2arg2: new (x: T) => string[]; diff --git a/tests/baselines/reference/subtypingWithConstructSignatures3.symbols b/tests/baselines/reference/subtypingWithConstructSignatures3.symbols index ecf83f8c324e5..21ebb9e17a461 100644 --- a/tests/baselines/reference/subtypingWithConstructSignatures3.symbols +++ b/tests/baselines/reference/subtypingWithConstructSignatures3.symbols @@ -4,16 +4,16 @@ // checking subtype relations for function types as it relates to contextual signature instantiation // error cases, so function calls will all result in 'any' -module Errors { +namespace Errors { >Errors : Symbol(Errors, Decl(subtypingWithConstructSignatures3.ts, 0, 0)) class Base { foo: string; } ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >foo : Symbol(Base.foo, Decl(subtypingWithConstructSignatures3.ts, 4, 16)) class Derived extends Base { bar: string; } >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures3.ts, 4, 31)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >bar : Symbol(Derived.bar, Decl(subtypingWithConstructSignatures3.ts, 5, 32)) class Derived2 extends Derived { baz: string; } @@ -23,7 +23,7 @@ module Errors { class OtherDerived extends Base { bing: string; } >OtherDerived : Symbol(OtherDerived, Decl(subtypingWithConstructSignatures3.ts, 6, 51)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >bing : Symbol(OtherDerived.bing, Decl(subtypingWithConstructSignatures3.ts, 7, 37)) declare function foo2(a2: new (x: number) => string[]): typeof a2; @@ -41,10 +41,10 @@ module Errors { >a2 : Symbol(a2, Decl(subtypingWithConstructSignatures3.ts, 12, 26)) >x : Symbol(x, Decl(subtypingWithConstructSignatures3.ts, 12, 35)) >arg : Symbol(arg, Decl(subtypingWithConstructSignatures3.ts, 12, 43)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures3.ts, 4, 31)) >r : Symbol(r, Decl(subtypingWithConstructSignatures3.ts, 12, 74)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >Derived2 : Symbol(Derived2, Decl(subtypingWithConstructSignatures3.ts, 5, 47)) >a2 : Symbol(a2, Decl(subtypingWithConstructSignatures3.ts, 12, 26)) @@ -57,14 +57,14 @@ module Errors { >a2 : Symbol(a2, Decl(subtypingWithConstructSignatures3.ts, 15, 26)) >x : Symbol(x, Decl(subtypingWithConstructSignatures3.ts, 15, 35)) >arg : Symbol(arg, Decl(subtypingWithConstructSignatures3.ts, 15, 43)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures3.ts, 4, 31)) >y : Symbol(y, Decl(subtypingWithConstructSignatures3.ts, 15, 65)) >arg2 : Symbol(arg2, Decl(subtypingWithConstructSignatures3.ts, 15, 74)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures3.ts, 4, 31)) >r : Symbol(r, Decl(subtypingWithConstructSignatures3.ts, 15, 106)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures3.ts, 4, 31)) >a2 : Symbol(a2, Decl(subtypingWithConstructSignatures3.ts, 15, 26)) @@ -76,8 +76,8 @@ module Errors { >foo10 : Symbol(foo10, Decl(subtypingWithConstructSignatures3.ts, 16, 40), Decl(subtypingWithConstructSignatures3.ts, 18, 70)) >a2 : Symbol(a2, Decl(subtypingWithConstructSignatures3.ts, 18, 27)) >x : Symbol(x, Decl(subtypingWithConstructSignatures3.ts, 18, 36)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >a2 : Symbol(a2, Decl(subtypingWithConstructSignatures3.ts, 18, 27)) declare function foo10(a2: any): any; @@ -92,7 +92,7 @@ module Errors { >y : Symbol(y, Decl(subtypingWithConstructSignatures3.ts, 21, 55)) >foo : Symbol(foo, Decl(subtypingWithConstructSignatures3.ts, 21, 60)) >bar : Symbol(bar, Decl(subtypingWithConstructSignatures3.ts, 21, 73)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >a2 : Symbol(a2, Decl(subtypingWithConstructSignatures3.ts, 21, 27)) declare function foo11(a2: any): any; @@ -104,7 +104,7 @@ module Errors { >a2 : Symbol(a2, Decl(subtypingWithConstructSignatures3.ts, 24, 27)) >x : Symbol(x, Decl(subtypingWithConstructSignatures3.ts, 24, 36)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >y : Symbol(y, Decl(subtypingWithConstructSignatures3.ts, 24, 51)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Derived2 : Symbol(Derived2, Decl(subtypingWithConstructSignatures3.ts, 5, 47)) @@ -176,7 +176,7 @@ module Errors { new (a: T): T; >T : Symbol(T, Decl(subtypingWithConstructSignatures3.ts, 46, 17)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >a : Symbol(a, Decl(subtypingWithConstructSignatures3.ts, 46, 33)) >T : Symbol(T, Decl(subtypingWithConstructSignatures3.ts, 46, 17)) >T : Symbol(T, Decl(subtypingWithConstructSignatures3.ts, 46, 17)) @@ -194,7 +194,7 @@ module Errors { new (a: T): T; >T : Symbol(T, Decl(subtypingWithConstructSignatures3.ts, 50, 17)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >a : Symbol(a, Decl(subtypingWithConstructSignatures3.ts, 50, 33)) >T : Symbol(T, Decl(subtypingWithConstructSignatures3.ts, 50, 17)) >T : Symbol(T, Decl(subtypingWithConstructSignatures3.ts, 50, 17)) @@ -237,7 +237,7 @@ module Errors { var r2arg1: new (x: new (arg: T) => U) => new (r: T) => V; >r2arg1 : Symbol(r2arg1, Decl(subtypingWithConstructSignatures3.ts, 61, 7)) >T : Symbol(T, Decl(subtypingWithConstructSignatures3.ts, 61, 21)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >U : Symbol(U, Decl(subtypingWithConstructSignatures3.ts, 61, 36)) >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures3.ts, 4, 31)) >V : Symbol(V, Decl(subtypingWithConstructSignatures3.ts, 61, 55)) @@ -254,10 +254,10 @@ module Errors { >r2arg2 : Symbol(r2arg2, Decl(subtypingWithConstructSignatures3.ts, 62, 7)) >x : Symbol(x, Decl(subtypingWithConstructSignatures3.ts, 62, 21)) >arg : Symbol(arg, Decl(subtypingWithConstructSignatures3.ts, 62, 29)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures3.ts, 4, 31)) >r : Symbol(r, Decl(subtypingWithConstructSignatures3.ts, 62, 60)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >Derived2 : Symbol(Derived2, Decl(subtypingWithConstructSignatures3.ts, 5, 47)) var r2 = foo7(r2arg1); // any @@ -278,7 +278,7 @@ module Errors { var r3arg1: new (x: new (arg: T) => U, y: (arg2: { foo: number; }) => U) => new (r: T) => U; >r3arg1 : Symbol(r3arg1, Decl(subtypingWithConstructSignatures3.ts, 67, 7)) >T : Symbol(T, Decl(subtypingWithConstructSignatures3.ts, 67, 21)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >U : Symbol(U, Decl(subtypingWithConstructSignatures3.ts, 67, 36)) >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures3.ts, 4, 31)) >x : Symbol(x, Decl(subtypingWithConstructSignatures3.ts, 67, 56)) @@ -297,14 +297,14 @@ module Errors { >r3arg2 : Symbol(r3arg2, Decl(subtypingWithConstructSignatures3.ts, 68, 7)) >x : Symbol(x, Decl(subtypingWithConstructSignatures3.ts, 68, 21)) >arg : Symbol(arg, Decl(subtypingWithConstructSignatures3.ts, 68, 25)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures3.ts, 4, 31)) >y : Symbol(y, Decl(subtypingWithConstructSignatures3.ts, 68, 47)) >arg2 : Symbol(arg2, Decl(subtypingWithConstructSignatures3.ts, 68, 56)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures3.ts, 4, 31)) >r : Symbol(r, Decl(subtypingWithConstructSignatures3.ts, 68, 88)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures3.ts, 4, 31)) var r3 = foo8(r3arg1); // any @@ -333,8 +333,8 @@ module Errors { var r4arg2: new (...x: Base[]) => Base; >r4arg2 : Symbol(r4arg2, Decl(subtypingWithConstructSignatures3.ts, 74, 7)) >x : Symbol(x, Decl(subtypingWithConstructSignatures3.ts, 74, 21)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) var r4 = foo10(r4arg1); // any >r4 : Symbol(r4, Decl(subtypingWithConstructSignatures3.ts, 75, 7)) @@ -368,7 +368,7 @@ module Errors { >y : Symbol(y, Decl(subtypingWithConstructSignatures3.ts, 80, 40)) >foo : Symbol(foo, Decl(subtypingWithConstructSignatures3.ts, 80, 45)) >bar : Symbol(bar, Decl(subtypingWithConstructSignatures3.ts, 80, 58)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) var r5 = foo11(r5arg1); // any >r5 : Symbol(r5, Decl(subtypingWithConstructSignatures3.ts, 81, 7)) @@ -389,7 +389,7 @@ module Errors { >r6arg1 : Symbol(r6arg1, Decl(subtypingWithConstructSignatures3.ts, 85, 7)) >x : Symbol(x, Decl(subtypingWithConstructSignatures3.ts, 85, 21)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >y : Symbol(y, Decl(subtypingWithConstructSignatures3.ts, 85, 36)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Derived2 : Symbol(Derived2, Decl(subtypingWithConstructSignatures3.ts, 5, 47)) @@ -403,10 +403,10 @@ module Errors { >Derived2 : Symbol(Derived2, Decl(subtypingWithConstructSignatures3.ts, 5, 47)) >x : Symbol(x, Decl(subtypingWithConstructSignatures3.ts, 86, 48)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >y : Symbol(y, Decl(subtypingWithConstructSignatures3.ts, 86, 63)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >T : Symbol(T, Decl(subtypingWithConstructSignatures3.ts, 86, 21)) var r6 = foo12(r6arg1); // new (x: Array, y: Array) => Array @@ -458,7 +458,7 @@ module Errors { var r7arg3: new (x: { a: T; b: T }) => number; >r7arg3 : Symbol(r7arg3, Decl(subtypingWithConstructSignatures3.ts, 97, 7)) >T : Symbol(T, Decl(subtypingWithConstructSignatures3.ts, 97, 21)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 18)) >x : Symbol(x, Decl(subtypingWithConstructSignatures3.ts, 97, 37)) >a : Symbol(a, Decl(subtypingWithConstructSignatures3.ts, 97, 41)) >T : Symbol(T, Decl(subtypingWithConstructSignatures3.ts, 97, 21)) @@ -508,11 +508,11 @@ module Errors { >r9arg : Symbol(r9arg, Decl(subtypingWithConstructSignatures3.ts, 105, 7)) } -module WithGenericSignaturesInBaseType { +namespace WithGenericSignaturesInBaseType { >WithGenericSignaturesInBaseType : Symbol(WithGenericSignaturesInBaseType, Decl(subtypingWithConstructSignatures3.ts, 107, 1)) declare function foo2(a2: new (x: T) => T[]): typeof a2; ->foo2 : Symbol(foo2, Decl(subtypingWithConstructSignatures3.ts, 109, 40), Decl(subtypingWithConstructSignatures3.ts, 110, 63)) +>foo2 : Symbol(foo2, Decl(subtypingWithConstructSignatures3.ts, 109, 43), Decl(subtypingWithConstructSignatures3.ts, 110, 63)) >a2 : Symbol(a2, Decl(subtypingWithConstructSignatures3.ts, 110, 26)) >T : Symbol(T, Decl(subtypingWithConstructSignatures3.ts, 110, 35)) >x : Symbol(x, Decl(subtypingWithConstructSignatures3.ts, 110, 38)) @@ -521,7 +521,7 @@ module WithGenericSignaturesInBaseType { >a2 : Symbol(a2, Decl(subtypingWithConstructSignatures3.ts, 110, 26)) declare function foo2(a2: any): any; ->foo2 : Symbol(foo2, Decl(subtypingWithConstructSignatures3.ts, 109, 40), Decl(subtypingWithConstructSignatures3.ts, 110, 63)) +>foo2 : Symbol(foo2, Decl(subtypingWithConstructSignatures3.ts, 109, 43), Decl(subtypingWithConstructSignatures3.ts, 110, 63)) >a2 : Symbol(a2, Decl(subtypingWithConstructSignatures3.ts, 111, 26)) var r2arg2: new (x: T) => string[]; @@ -532,7 +532,7 @@ module WithGenericSignaturesInBaseType { var r2 = foo2(r2arg2); // (x:T) => T[] since we can infer from generic signatures now >r2 : Symbol(r2, Decl(subtypingWithConstructSignatures3.ts, 113, 7)) ->foo2 : Symbol(foo2, Decl(subtypingWithConstructSignatures3.ts, 109, 40), Decl(subtypingWithConstructSignatures3.ts, 110, 63)) +>foo2 : Symbol(foo2, Decl(subtypingWithConstructSignatures3.ts, 109, 43), Decl(subtypingWithConstructSignatures3.ts, 110, 63)) >r2arg2 : Symbol(r2arg2, Decl(subtypingWithConstructSignatures3.ts, 112, 7)) declare function foo3(a2: new (x: T) => string[]): typeof a2; diff --git a/tests/baselines/reference/subtypingWithConstructSignatures3.types b/tests/baselines/reference/subtypingWithConstructSignatures3.types index d6cd126a6f618..6c29a79cc2376 100644 --- a/tests/baselines/reference/subtypingWithConstructSignatures3.types +++ b/tests/baselines/reference/subtypingWithConstructSignatures3.types @@ -4,7 +4,7 @@ // checking subtype relations for function types as it relates to contextual signature instantiation // error cases, so function calls will all result in 'any' -module Errors { +namespace Errors { >Errors : typeof Errors > : ^^^^^^^^^^^^^ @@ -663,7 +663,7 @@ module Errors { > : ^^^^^ ^^ ^^ ^^^^^ } -module WithGenericSignaturesInBaseType { +namespace WithGenericSignaturesInBaseType { >WithGenericSignaturesInBaseType : typeof WithGenericSignaturesInBaseType > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.errors.txt b/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.errors.txt index 5ecff96f90d6c..faaeb64492241 100644 --- a/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.errors.txt +++ b/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.errors.txt @@ -10,7 +10,7 @@ subtypingWithConstructSignaturesWithSpecializedSignatures.ts(76,15): error TS243 ==== subtypingWithConstructSignaturesWithSpecializedSignatures.ts (2 errors) ==== // same as subtypingWithCallSignatures but with additional specialized signatures that should not affect the results - module CallSignature { + namespace CallSignature { interface Base { // T // M's new (x: 'a'): void; @@ -45,7 +45,7 @@ subtypingWithConstructSignaturesWithSpecializedSignatures.ts(76,15): error TS243 } } - module MemberWithCallSignature { + namespace MemberWithCallSignature { interface Base { // T // M's a: { diff --git a/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.js b/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.js index bd98b6e946c6b..a6a8a1b4309a7 100644 --- a/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.js +++ b/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.js @@ -3,7 +3,7 @@ //// [subtypingWithConstructSignaturesWithSpecializedSignatures.ts] // same as subtypingWithCallSignatures but with additional specialized signatures that should not affect the results -module CallSignature { +namespace CallSignature { interface Base { // T // M's new (x: 'a'): void; @@ -38,7 +38,7 @@ module CallSignature { } } -module MemberWithCallSignature { +namespace MemberWithCallSignature { interface Base { // T // M's a: { diff --git a/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.symbols b/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.symbols index 1e686a9e88d83..a14a512a8dad3 100644 --- a/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.symbols +++ b/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.symbols @@ -3,11 +3,11 @@ === subtypingWithConstructSignaturesWithSpecializedSignatures.ts === // same as subtypingWithCallSignatures but with additional specialized signatures that should not affect the results -module CallSignature { +namespace CallSignature { >CallSignature : Symbol(CallSignature, Decl(subtypingWithConstructSignaturesWithSpecializedSignatures.ts, 0, 0)) interface Base { // T ->Base : Symbol(Base, Decl(subtypingWithConstructSignaturesWithSpecializedSignatures.ts, 2, 22)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignaturesWithSpecializedSignatures.ts, 2, 25)) // M's new (x: 'a'): void; @@ -21,7 +21,7 @@ module CallSignature { // S's interface I extends Base { >I : Symbol(I, Decl(subtypingWithConstructSignaturesWithSpecializedSignatures.ts, 7, 5)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignaturesWithSpecializedSignatures.ts, 2, 22)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignaturesWithSpecializedSignatures.ts, 2, 25)) // N's new (x: 'a'): number; // ok because base returns void @@ -74,11 +74,11 @@ module CallSignature { } } -module MemberWithCallSignature { +namespace MemberWithCallSignature { >MemberWithCallSignature : Symbol(MemberWithCallSignature, Decl(subtypingWithConstructSignaturesWithSpecializedSignatures.ts, 35, 1)) interface Base { // T ->Base : Symbol(Base, Decl(subtypingWithConstructSignaturesWithSpecializedSignatures.ts, 37, 32)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignaturesWithSpecializedSignatures.ts, 37, 35)) // M's a: { @@ -111,7 +111,7 @@ module MemberWithCallSignature { // S's interface I extends Base { >I : Symbol(I, Decl(subtypingWithConstructSignaturesWithSpecializedSignatures.ts, 49, 5)) ->Base : Symbol(Base, Decl(subtypingWithConstructSignaturesWithSpecializedSignatures.ts, 37, 32)) +>Base : Symbol(Base, Decl(subtypingWithConstructSignaturesWithSpecializedSignatures.ts, 37, 35)) // N's a: new (x: string) => number; // ok because base returns void diff --git a/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.types b/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.types index 3a9928b1f7bd1..04ebb0c1cff91 100644 --- a/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.types +++ b/tests/baselines/reference/subtypingWithConstructSignaturesWithSpecializedSignatures.types @@ -3,7 +3,7 @@ === subtypingWithConstructSignaturesWithSpecializedSignatures.ts === // same as subtypingWithCallSignatures but with additional specialized signatures that should not affect the results -module CallSignature { +namespace CallSignature { interface Base { // T // M's new (x: 'a'): void; @@ -67,7 +67,7 @@ module CallSignature { } } -module MemberWithCallSignature { +namespace MemberWithCallSignature { interface Base { // T // M's a: { diff --git a/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.errors.txt b/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.errors.txt index a69d2499601a8..14654412105ee 100644 --- a/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.errors.txt +++ b/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.errors.txt @@ -111,7 +111,7 @@ subtypingWithGenericCallSignaturesWithOptionalParameters.ts(226,15): error TS243 ==== subtypingWithGenericCallSignaturesWithOptionalParameters.ts (22 errors) ==== // call signatures in derived types must have the same or fewer optional parameters as the base type - module ClassTypeParam { + namespace ClassTypeParam { interface Base { a: () => T; a2: (x?: T) => T; @@ -207,7 +207,7 @@ subtypingWithGenericCallSignaturesWithOptionalParameters.ts(226,15): error TS243 } } - module GenericSignaturesInvalid { + namespace GenericSignaturesInvalid { // all of these are errors interface Base2 { @@ -421,7 +421,7 @@ subtypingWithGenericCallSignaturesWithOptionalParameters.ts(226,15): error TS243 } } - module GenericSignaturesValid { + namespace GenericSignaturesValid { interface Base2 { a: () => T; diff --git a/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.js b/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.js index ef4a765628041..09591d4a37f88 100644 --- a/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.js +++ b/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.js @@ -3,7 +3,7 @@ //// [subtypingWithGenericCallSignaturesWithOptionalParameters.ts] // call signatures in derived types must have the same or fewer optional parameters as the base type -module ClassTypeParam { +namespace ClassTypeParam { interface Base { a: () => T; a2: (x?: T) => T; @@ -89,7 +89,7 @@ module ClassTypeParam { } } -module GenericSignaturesInvalid { +namespace GenericSignaturesInvalid { // all of these are errors interface Base2 { @@ -177,7 +177,7 @@ module GenericSignaturesInvalid { } } -module GenericSignaturesValid { +namespace GenericSignaturesValid { interface Base2 { a: () => T; diff --git a/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.symbols b/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.symbols index e679998c6544c..392574508d50e 100644 --- a/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.symbols +++ b/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.symbols @@ -3,11 +3,11 @@ === subtypingWithGenericCallSignaturesWithOptionalParameters.ts === // call signatures in derived types must have the same or fewer optional parameters as the base type -module ClassTypeParam { +namespace ClassTypeParam { >ClassTypeParam : Symbol(ClassTypeParam, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 0, 0)) interface Base { ->Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 3, 19)) a: () => T; @@ -46,7 +46,7 @@ module ClassTypeParam { interface I1 extends Base { >I1 : Symbol(I1, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 9, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 11, 17)) ->Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 11, 17)) a: () => T; // ok, same T of required params @@ -57,7 +57,7 @@ module ClassTypeParam { interface I2 extends Base { >I2 : Symbol(I2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 13, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 15, 17)) ->Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 15, 17)) a: (x?: T) => T; // ok, same T of required params @@ -70,7 +70,7 @@ module ClassTypeParam { interface I3 extends Base { >I3 : Symbol(I3, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 17, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 19, 17)) ->Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 19, 17)) a: (x: T) => T; // error, too many required params @@ -84,7 +84,7 @@ module ClassTypeParam { interface I4 extends Base { >I4 : Symbol(I4, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 21, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 24, 17)) ->Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 24, 17)) a2: () => T; // ok, same T of required params @@ -95,7 +95,7 @@ module ClassTypeParam { interface I5 extends Base { >I5 : Symbol(I5, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 26, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 28, 17)) ->Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 28, 17)) a2: (x?: T) => T; // ok, same T of required params @@ -108,7 +108,7 @@ module ClassTypeParam { interface I6 extends Base { >I6 : Symbol(I6, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 30, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 32, 17)) ->Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 32, 17)) a2: (x: T) => T; // ok, same number of params @@ -122,7 +122,7 @@ module ClassTypeParam { interface I7 extends Base { >I7 : Symbol(I7, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 34, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 37, 17)) ->Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 37, 17)) a3: () => T; // ok, fewer required params @@ -133,7 +133,7 @@ module ClassTypeParam { interface I8 extends Base { >I8 : Symbol(I8, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 39, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 41, 17)) ->Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 41, 17)) a3: (x?: T) => T; // ok, fewer required params @@ -146,7 +146,7 @@ module ClassTypeParam { interface I9 extends Base { >I9 : Symbol(I9, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 43, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 45, 17)) ->Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 45, 17)) a3: (x: T) => T; // ok, same T of required params @@ -159,7 +159,7 @@ module ClassTypeParam { interface I10 extends Base { >I10 : Symbol(I10, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 47, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 49, 18)) ->Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 49, 18)) a3: (x: T, y: T) => T; // error, too many required params @@ -175,7 +175,7 @@ module ClassTypeParam { interface I11 extends Base { >I11 : Symbol(I11, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 51, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 54, 18)) ->Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 54, 18)) a4: () => T; // ok, fewer required params @@ -186,7 +186,7 @@ module ClassTypeParam { interface I12 extends Base { >I12 : Symbol(I12, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 56, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 58, 18)) ->Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 58, 18)) a4: (x?: T, y?: T) => T; // ok, fewer required params @@ -201,7 +201,7 @@ module ClassTypeParam { interface I13 extends Base { >I13 : Symbol(I13, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 60, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 62, 18)) ->Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 62, 18)) a4: (x: T) => T; // ok, same T of required params @@ -214,7 +214,7 @@ module ClassTypeParam { interface I14 extends Base { >I14 : Symbol(I14, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 64, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 66, 18)) ->Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 66, 18)) a4: (x: T, y: T) => T; // ok, same number of params @@ -230,7 +230,7 @@ module ClassTypeParam { interface I15 extends Base { >I15 : Symbol(I15, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 68, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 71, 18)) ->Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 71, 18)) a5: () => T; // ok, fewer required params @@ -241,7 +241,7 @@ module ClassTypeParam { interface I16 extends Base { >I16 : Symbol(I16, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 73, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 75, 18)) ->Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 75, 18)) a5: (x?: T, y?: T) => T; // ok, fewer required params @@ -256,7 +256,7 @@ module ClassTypeParam { interface I17 extends Base { >I17 : Symbol(I17, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 77, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 79, 18)) ->Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 79, 18)) a5: (x: T) => T; // ok, all present params match @@ -269,7 +269,7 @@ module ClassTypeParam { interface I18 extends Base { >I18 : Symbol(I18, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 81, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 83, 18)) ->Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 83, 18)) a5: (x: T, y: T) => T; // ok, same number of params @@ -282,12 +282,12 @@ module ClassTypeParam { } } -module GenericSignaturesInvalid { +namespace GenericSignaturesInvalid { >GenericSignaturesInvalid : Symbol(GenericSignaturesInvalid, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 86, 1)) // all of these are errors interface Base2 { ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 36)) a: () => T; >a : Symbol(Base2.a, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 91, 21)) @@ -330,7 +330,7 @@ module GenericSignaturesInvalid { interface I1 extends Base2 { >I1 : Symbol(I1, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 97, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 99, 17)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 36)) a: () => T; >a : Symbol(I1.a, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 99, 35)) @@ -340,7 +340,7 @@ module GenericSignaturesInvalid { interface I2 extends Base2 { >I2 : Symbol(I2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 101, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 103, 17)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 36)) a: (x?: T) => T; >a : Symbol(I2.a, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 103, 35)) @@ -352,7 +352,7 @@ module GenericSignaturesInvalid { interface I3 extends Base2 { >I3 : Symbol(I3, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 105, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 107, 17)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 36)) a: (x: T) => T; >a : Symbol(I3.a, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 107, 35)) @@ -365,7 +365,7 @@ module GenericSignaturesInvalid { interface I4 extends Base2 { >I4 : Symbol(I4, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 109, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 112, 17)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 36)) a2: () => T; >a2 : Symbol(I4.a2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 112, 35)) @@ -375,7 +375,7 @@ module GenericSignaturesInvalid { interface I5 extends Base2 { >I5 : Symbol(I5, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 114, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 116, 17)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 36)) a2: (x?: T) => T >a2 : Symbol(I5.a2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 116, 35)) @@ -387,7 +387,7 @@ module GenericSignaturesInvalid { interface I6 extends Base2 { >I6 : Symbol(I6, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 118, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 120, 17)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 36)) a2: (x: T) => T; >a2 : Symbol(I6.a2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 120, 35)) @@ -400,7 +400,7 @@ module GenericSignaturesInvalid { interface I7 extends Base2 { >I7 : Symbol(I7, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 122, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 125, 17)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 36)) a3: () => T; >a3 : Symbol(I7.a3, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 125, 35)) @@ -410,7 +410,7 @@ module GenericSignaturesInvalid { interface I8 extends Base2 { >I8 : Symbol(I8, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 127, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 129, 17)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 36)) a3: (x?: T) => T; >a3 : Symbol(I8.a3, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 129, 35)) @@ -422,7 +422,7 @@ module GenericSignaturesInvalid { interface I9 extends Base2 { >I9 : Symbol(I9, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 131, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 133, 17)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 36)) a3: (x: T) => T; >a3 : Symbol(I9.a3, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 133, 35)) @@ -434,7 +434,7 @@ module GenericSignaturesInvalid { interface I10 extends Base2 { >I10 : Symbol(I10, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 135, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 137, 18)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 36)) a3: (x: T, y: T) => T; >a3 : Symbol(I10.a3, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 137, 36)) @@ -449,7 +449,7 @@ module GenericSignaturesInvalid { interface I11 extends Base2 { >I11 : Symbol(I11, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 139, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 142, 18)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 36)) a4: () => T; >a4 : Symbol(I11.a4, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 142, 36)) @@ -459,7 +459,7 @@ module GenericSignaturesInvalid { interface I12 extends Base2 { >I12 : Symbol(I12, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 144, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 146, 18)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 36)) a4: (x?: T, y?: T) => T; >a4 : Symbol(I12.a4, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 146, 36)) @@ -473,7 +473,7 @@ module GenericSignaturesInvalid { interface I13 extends Base2 { >I13 : Symbol(I13, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 148, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 150, 18)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 36)) a4: (x: T) => T; >a4 : Symbol(I13.a4, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 150, 36)) @@ -485,7 +485,7 @@ module GenericSignaturesInvalid { interface I14 extends Base2 { >I14 : Symbol(I14, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 152, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 154, 18)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 36)) a4: (x: T, y: T) => T; >a4 : Symbol(I14.a4, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 154, 36)) @@ -500,7 +500,7 @@ module GenericSignaturesInvalid { interface I15 extends Base2 { >I15 : Symbol(I15, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 156, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 159, 18)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 36)) a5: () => T; >a5 : Symbol(I15.a5, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 159, 36)) @@ -510,7 +510,7 @@ module GenericSignaturesInvalid { interface I16 extends Base2 { >I16 : Symbol(I16, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 161, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 163, 18)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 36)) a5: (x?: T, y?: T) => T; >a5 : Symbol(I16.a5, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 163, 36)) @@ -524,7 +524,7 @@ module GenericSignaturesInvalid { interface I17 extends Base2 { >I17 : Symbol(I17, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 165, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 167, 18)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 36)) a5: (x: T) => T; >a5 : Symbol(I17.a5, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 167, 36)) @@ -536,7 +536,7 @@ module GenericSignaturesInvalid { interface I18 extends Base2 { >I18 : Symbol(I18, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 169, 5)) >T : Symbol(T, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 171, 18)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 88, 36)) a5: (x: T, y: T) => T; >a5 : Symbol(I18.a5, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 171, 36)) @@ -548,11 +548,11 @@ module GenericSignaturesInvalid { } } -module GenericSignaturesValid { +namespace GenericSignaturesValid { >GenericSignaturesValid : Symbol(GenericSignaturesValid, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 174, 1)) interface Base2 { ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) a: () => T; >a : Symbol(Base2.a, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 178, 21)) @@ -595,7 +595,7 @@ module GenericSignaturesValid { // BUG 833350 interface I1 extends Base2 { >I1 : Symbol(I1, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 184, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) a: () => T; // ok, same number of required params >a : Symbol(I1.a, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 187, 32)) @@ -605,7 +605,7 @@ module GenericSignaturesValid { interface I2 extends Base2 { >I2 : Symbol(I2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 189, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) a: (x?: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T >a : Symbol(I2.a, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 191, 32)) @@ -617,7 +617,7 @@ module GenericSignaturesValid { interface I3 extends Base2 { >I3 : Symbol(I3, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 193, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) a: (x: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T >a : Symbol(I3.a, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 195, 32)) @@ -630,7 +630,7 @@ module GenericSignaturesValid { interface I4 extends Base2 { >I4 : Symbol(I4, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 197, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) a2: () => T; // error, not identical and contextual signature instatiation can't make inference from T to T >a2 : Symbol(I4.a2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 200, 32)) @@ -640,7 +640,7 @@ module GenericSignaturesValid { interface I5 extends Base2 { >I5 : Symbol(I5, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 202, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) a2: (x?: T) => T; // ok, identical >a2 : Symbol(I5.a2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 204, 32)) @@ -652,7 +652,7 @@ module GenericSignaturesValid { interface I6 extends Base2 { >I6 : Symbol(I6, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 206, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) a2: (x: T) => T; // ok, same number of params >a2 : Symbol(I6.a2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 208, 32)) @@ -665,7 +665,7 @@ module GenericSignaturesValid { interface I7 extends Base2 { >I7 : Symbol(I7, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 210, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) a3: () => T; // error, no inferences for T so {} not assignable to {} in return type >a3 : Symbol(I7.a3, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 213, 32)) @@ -675,7 +675,7 @@ module GenericSignaturesValid { interface I8 extends Base2 { >I8 : Symbol(I8, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 215, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) a3: (x?: T) => T; // ok, fewer required params >a3 : Symbol(I8.a3, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 217, 32)) @@ -687,7 +687,7 @@ module GenericSignaturesValid { interface I9 extends Base2 { >I9 : Symbol(I9, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 219, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) a3: (x: T) => T; // ok, identical, same number of required params >a3 : Symbol(I9.a3, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 221, 32)) @@ -699,7 +699,7 @@ module GenericSignaturesValid { interface I10 extends Base2 { >I10 : Symbol(I10, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 223, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) a3: (x: T, y: T) => T; // error, too many required params >a3 : Symbol(I10.a3, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 225, 33)) @@ -714,7 +714,7 @@ module GenericSignaturesValid { interface I11 extends Base2 { >I11 : Symbol(I11, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 227, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) a4: () => T; // error, not identical and contextual signature instatiation can't make inference from T to T >a4 : Symbol(I11.a4, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 230, 33)) @@ -724,7 +724,7 @@ module GenericSignaturesValid { interface I12 extends Base2 { >I12 : Symbol(I12, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 232, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) a4: (x?: T, y?: T) => T; // ok, fewer required params >a4 : Symbol(I12.a4, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 234, 33)) @@ -738,7 +738,7 @@ module GenericSignaturesValid { interface I13 extends Base2 { >I13 : Symbol(I13, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 236, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) a4: (x: T) => T; // ok, same T of required params >a4 : Symbol(I13.a4, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 238, 33)) @@ -750,7 +750,7 @@ module GenericSignaturesValid { interface I14 extends Base2 { >I14 : Symbol(I14, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 240, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) a4: (x: T, y: T) => T; // error, too many required params >a4 : Symbol(I14.a4, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 242, 33)) @@ -765,7 +765,7 @@ module GenericSignaturesValid { interface I15 extends Base2 { >I15 : Symbol(I15, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 244, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) a5: () => T; // error, not identical and contextual signature instatiation can't make inference from T to T >a5 : Symbol(I15.a5, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 247, 33)) @@ -775,7 +775,7 @@ module GenericSignaturesValid { interface I16 extends Base2 { >I16 : Symbol(I16, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 249, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) a5: (x?: T, y?: T) => T; // ok, fewer required params >a5 : Symbol(I16.a5, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 251, 33)) @@ -789,7 +789,7 @@ module GenericSignaturesValid { interface I17 extends Base2 { >I17 : Symbol(I17, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 253, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) a5: (x: T) => T; // ok, all present params match >a5 : Symbol(I17.a5, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 255, 33)) @@ -801,7 +801,7 @@ module GenericSignaturesValid { interface I18 extends Base2 { >I18 : Symbol(I18, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 257, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 176, 34)) a5: (x: T, y: T) => T; // ok, same number of params >a5 : Symbol(I18.a5, Decl(subtypingWithGenericCallSignaturesWithOptionalParameters.ts, 259, 33)) diff --git a/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.types b/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.types index b8c259a1bc176..b15b715767c89 100644 --- a/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.types +++ b/tests/baselines/reference/subtypingWithGenericCallSignaturesWithOptionalParameters.types @@ -3,7 +3,7 @@ === subtypingWithGenericCallSignaturesWithOptionalParameters.ts === // call signatures in derived types must have the same or fewer optional parameters as the base type -module ClassTypeParam { +namespace ClassTypeParam { interface Base { a: () => T; >a : () => T @@ -187,7 +187,7 @@ module ClassTypeParam { } } -module GenericSignaturesInvalid { +namespace GenericSignaturesInvalid { // all of these are errors interface Base2 { @@ -373,7 +373,7 @@ module GenericSignaturesInvalid { } } -module GenericSignaturesValid { +namespace GenericSignaturesValid { interface Base2 { a: () => T; diff --git a/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.errors.txt b/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.errors.txt index 962bd6f02a2d9..345f6b5a1bfba 100644 --- a/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.errors.txt +++ b/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.errors.txt @@ -111,7 +111,7 @@ subtypingWithGenericConstructSignaturesWithOptionalParameters.ts(226,15): error ==== subtypingWithGenericConstructSignaturesWithOptionalParameters.ts (22 errors) ==== // call signatures in derived types must have the same or fewer optional parameters as the base type - module ClassTypeParam { + namespace ClassTypeParam { interface Base { a: new () => T; a2: new (x?: T) => T; @@ -207,7 +207,7 @@ subtypingWithGenericConstructSignaturesWithOptionalParameters.ts(226,15): error } } - module GenericSignaturesInvalid { + namespace GenericSignaturesInvalid { // all of these are errors interface Base2 { @@ -421,7 +421,7 @@ subtypingWithGenericConstructSignaturesWithOptionalParameters.ts(226,15): error } } - module GenericSignaturesValid { + namespace GenericSignaturesValid { interface Base2 { a: new () => T; diff --git a/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.js b/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.js index 4e0af30dc3a76..cd3a05d4730b2 100644 --- a/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.js +++ b/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.js @@ -3,7 +3,7 @@ //// [subtypingWithGenericConstructSignaturesWithOptionalParameters.ts] // call signatures in derived types must have the same or fewer optional parameters as the base type -module ClassTypeParam { +namespace ClassTypeParam { interface Base { a: new () => T; a2: new (x?: T) => T; @@ -89,7 +89,7 @@ module ClassTypeParam { } } -module GenericSignaturesInvalid { +namespace GenericSignaturesInvalid { // all of these are errors interface Base2 { @@ -177,7 +177,7 @@ module GenericSignaturesInvalid { } } -module GenericSignaturesValid { +namespace GenericSignaturesValid { interface Base2 { a: new () => T; diff --git a/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.symbols b/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.symbols index db32e28660711..42b3f5d9d4fb9 100644 --- a/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.symbols +++ b/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.symbols @@ -3,11 +3,11 @@ === subtypingWithGenericConstructSignaturesWithOptionalParameters.ts === // call signatures in derived types must have the same or fewer optional parameters as the base type -module ClassTypeParam { +namespace ClassTypeParam { >ClassTypeParam : Symbol(ClassTypeParam, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 0, 0)) interface Base { ->Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 3, 19)) a: new () => T; @@ -46,7 +46,7 @@ module ClassTypeParam { interface I1 extends Base { >I1 : Symbol(I1, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 9, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 11, 17)) ->Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 11, 17)) a: new () => T; // ok, same T of required params @@ -57,7 +57,7 @@ module ClassTypeParam { interface I2 extends Base { >I2 : Symbol(I2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 13, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 15, 17)) ->Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 15, 17)) a: new (x?: T) => T; // ok, same T of required params @@ -70,7 +70,7 @@ module ClassTypeParam { interface I3 extends Base { >I3 : Symbol(I3, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 17, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 19, 17)) ->Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 19, 17)) a: new (x: T) => T; // error, too many required params @@ -84,7 +84,7 @@ module ClassTypeParam { interface I4 extends Base { >I4 : Symbol(I4, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 21, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 24, 17)) ->Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 24, 17)) a2: new () => T; // ok, same T of required params @@ -95,7 +95,7 @@ module ClassTypeParam { interface I5 extends Base { >I5 : Symbol(I5, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 26, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 28, 17)) ->Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 28, 17)) a2: new (x?: T) => T; // ok, same T of required params @@ -108,7 +108,7 @@ module ClassTypeParam { interface I6 extends Base { >I6 : Symbol(I6, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 30, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 32, 17)) ->Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 32, 17)) a2: new (x: T) => T; // ok, same number of params @@ -122,7 +122,7 @@ module ClassTypeParam { interface I7 extends Base { >I7 : Symbol(I7, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 34, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 37, 17)) ->Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 37, 17)) a3: new () => T; // ok, fewer required params @@ -133,7 +133,7 @@ module ClassTypeParam { interface I8 extends Base { >I8 : Symbol(I8, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 39, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 41, 17)) ->Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 41, 17)) a3: new (x?: T) => T; // ok, fewer required params @@ -146,7 +146,7 @@ module ClassTypeParam { interface I9 extends Base { >I9 : Symbol(I9, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 43, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 45, 17)) ->Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 45, 17)) a3: new (x: T) => T; // ok, same T of required params @@ -159,7 +159,7 @@ module ClassTypeParam { interface I10 extends Base { >I10 : Symbol(I10, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 47, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 49, 18)) ->Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 49, 18)) a3: new (x: T, y: T) => T; // error, too many required params @@ -175,7 +175,7 @@ module ClassTypeParam { interface I11 extends Base { >I11 : Symbol(I11, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 51, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 54, 18)) ->Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 54, 18)) a4: new () => T; // ok, fewer required params @@ -186,7 +186,7 @@ module ClassTypeParam { interface I12 extends Base { >I12 : Symbol(I12, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 56, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 58, 18)) ->Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 58, 18)) a4: new (x?: T, y?: T) => T; // ok, fewer required params @@ -201,7 +201,7 @@ module ClassTypeParam { interface I13 extends Base { >I13 : Symbol(I13, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 60, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 62, 18)) ->Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 62, 18)) a4: new (x: T) => T; // ok, same T of required params @@ -214,7 +214,7 @@ module ClassTypeParam { interface I14 extends Base { >I14 : Symbol(I14, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 64, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 66, 18)) ->Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 66, 18)) a4: new (x: T, y: T) => T; // ok, same number of params @@ -230,7 +230,7 @@ module ClassTypeParam { interface I15 extends Base { >I15 : Symbol(I15, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 68, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 71, 18)) ->Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 71, 18)) a5: new () => T; // ok, fewer required params @@ -241,7 +241,7 @@ module ClassTypeParam { interface I16 extends Base { >I16 : Symbol(I16, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 73, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 75, 18)) ->Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 75, 18)) a5: new (x?: T, y?: T) => T; // ok, fewer required params @@ -256,7 +256,7 @@ module ClassTypeParam { interface I17 extends Base { >I17 : Symbol(I17, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 77, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 79, 18)) ->Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 79, 18)) a5: new (x: T) => T; // ok, all present params match @@ -269,7 +269,7 @@ module ClassTypeParam { interface I18 extends Base { >I18 : Symbol(I18, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 81, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 83, 18)) ->Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 23)) +>Base : Symbol(Base, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 2, 26)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 83, 18)) a5: new (x: T, y: T) => T; // ok, same number of params @@ -282,12 +282,12 @@ module ClassTypeParam { } } -module GenericSignaturesInvalid { +namespace GenericSignaturesInvalid { >GenericSignaturesInvalid : Symbol(GenericSignaturesInvalid, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 86, 1)) // all of these are errors interface Base2 { ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 36)) a: new () => T; >a : Symbol(Base2.a, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 91, 21)) @@ -330,7 +330,7 @@ module GenericSignaturesInvalid { interface I1 extends Base2 { >I1 : Symbol(I1, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 97, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 99, 17)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 36)) a: new () => T; >a : Symbol(I1.a, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 99, 35)) @@ -340,7 +340,7 @@ module GenericSignaturesInvalid { interface I2 extends Base2 { >I2 : Symbol(I2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 101, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 103, 17)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 36)) a: new (x?: T) => T; >a : Symbol(I2.a, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 103, 35)) @@ -352,7 +352,7 @@ module GenericSignaturesInvalid { interface I3 extends Base2 { >I3 : Symbol(I3, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 105, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 107, 17)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 36)) a: new (x: T) => T; >a : Symbol(I3.a, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 107, 35)) @@ -365,7 +365,7 @@ module GenericSignaturesInvalid { interface I4 extends Base2 { >I4 : Symbol(I4, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 109, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 112, 17)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 36)) a2: new () => T; >a2 : Symbol(I4.a2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 112, 35)) @@ -375,7 +375,7 @@ module GenericSignaturesInvalid { interface I5 extends Base2 { >I5 : Symbol(I5, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 114, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 116, 17)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 36)) a2: new (x?: T) => T >a2 : Symbol(I5.a2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 116, 35)) @@ -387,7 +387,7 @@ module GenericSignaturesInvalid { interface I6 extends Base2 { >I6 : Symbol(I6, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 118, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 120, 17)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 36)) a2: new (x: T) => T; >a2 : Symbol(I6.a2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 120, 35)) @@ -400,7 +400,7 @@ module GenericSignaturesInvalid { interface I7 extends Base2 { >I7 : Symbol(I7, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 122, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 125, 17)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 36)) a3: new () => T; >a3 : Symbol(I7.a3, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 125, 35)) @@ -410,7 +410,7 @@ module GenericSignaturesInvalid { interface I8 extends Base2 { >I8 : Symbol(I8, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 127, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 129, 17)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 36)) a3: new (x?: T) => T; >a3 : Symbol(I8.a3, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 129, 35)) @@ -422,7 +422,7 @@ module GenericSignaturesInvalid { interface I9 extends Base2 { >I9 : Symbol(I9, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 131, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 133, 17)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 36)) a3: new (x: T) => T; >a3 : Symbol(I9.a3, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 133, 35)) @@ -434,7 +434,7 @@ module GenericSignaturesInvalid { interface I10 extends Base2 { >I10 : Symbol(I10, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 135, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 137, 18)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 36)) a3: new (x: T, y: T) => T; >a3 : Symbol(I10.a3, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 137, 36)) @@ -449,7 +449,7 @@ module GenericSignaturesInvalid { interface I11 extends Base2 { >I11 : Symbol(I11, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 139, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 142, 18)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 36)) a4: new () => T; >a4 : Symbol(I11.a4, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 142, 36)) @@ -459,7 +459,7 @@ module GenericSignaturesInvalid { interface I12 extends Base2 { >I12 : Symbol(I12, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 144, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 146, 18)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 36)) a4: new (x?: T, y?: T) => T; >a4 : Symbol(I12.a4, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 146, 36)) @@ -473,7 +473,7 @@ module GenericSignaturesInvalid { interface I13 extends Base2 { >I13 : Symbol(I13, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 148, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 150, 18)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 36)) a4: new (x: T) => T; >a4 : Symbol(I13.a4, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 150, 36)) @@ -485,7 +485,7 @@ module GenericSignaturesInvalid { interface I14 extends Base2 { >I14 : Symbol(I14, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 152, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 154, 18)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 36)) a4: new (x: T, y: T) => T; >a4 : Symbol(I14.a4, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 154, 36)) @@ -500,7 +500,7 @@ module GenericSignaturesInvalid { interface I15 extends Base2 { >I15 : Symbol(I15, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 156, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 159, 18)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 36)) a5: new () => T; >a5 : Symbol(I15.a5, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 159, 36)) @@ -510,7 +510,7 @@ module GenericSignaturesInvalid { interface I16 extends Base2 { >I16 : Symbol(I16, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 161, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 163, 18)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 36)) a5: new (x?: T, y?: T) => T; >a5 : Symbol(I16.a5, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 163, 36)) @@ -524,7 +524,7 @@ module GenericSignaturesInvalid { interface I17 extends Base2 { >I17 : Symbol(I17, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 165, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 167, 18)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 36)) a5: new (x: T) => T; >a5 : Symbol(I17.a5, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 167, 36)) @@ -536,7 +536,7 @@ module GenericSignaturesInvalid { interface I18 extends Base2 { >I18 : Symbol(I18, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 169, 5)) >T : Symbol(T, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 171, 18)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 33)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 88, 36)) a5: new (x: T, y: T) => T; >a5 : Symbol(I18.a5, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 171, 36)) @@ -548,11 +548,11 @@ module GenericSignaturesInvalid { } } -module GenericSignaturesValid { +namespace GenericSignaturesValid { >GenericSignaturesValid : Symbol(GenericSignaturesValid, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 174, 1)) interface Base2 { ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) a: new () => T; >a : Symbol(Base2.a, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 178, 21)) @@ -595,7 +595,7 @@ module GenericSignaturesValid { // BUG 833350 interface I1 extends Base2 { >I1 : Symbol(I1, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 184, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) a: new () => T; // ok, same number of required params >a : Symbol(I1.a, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 187, 32)) @@ -605,7 +605,7 @@ module GenericSignaturesValid { interface I2 extends Base2 { >I2 : Symbol(I2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 189, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) a: new (x?: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T >a : Symbol(I2.a, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 191, 32)) @@ -617,7 +617,7 @@ module GenericSignaturesValid { interface I3 extends Base2 { >I3 : Symbol(I3, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 193, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) a: new (x: T) => T; // error, not identical and contextual signature instatiation can't make inference from T to T >a : Symbol(I3.a, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 195, 32)) @@ -630,7 +630,7 @@ module GenericSignaturesValid { interface I4 extends Base2 { >I4 : Symbol(I4, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 197, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) a2: new () => T; // error, not identical and contextual signature instatiation can't make inference from T to T >a2 : Symbol(I4.a2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 200, 32)) @@ -640,7 +640,7 @@ module GenericSignaturesValid { interface I5 extends Base2 { >I5 : Symbol(I5, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 202, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) a2: new (x?: T) => T; // ok, identical >a2 : Symbol(I5.a2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 204, 32)) @@ -652,7 +652,7 @@ module GenericSignaturesValid { interface I6 extends Base2 { >I6 : Symbol(I6, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 206, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) a2: new (x: T) => T; // ok, same number of params >a2 : Symbol(I6.a2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 208, 32)) @@ -665,7 +665,7 @@ module GenericSignaturesValid { interface I7 extends Base2 { >I7 : Symbol(I7, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 210, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) a3: new () => T; // ok, fewer required params >a3 : Symbol(I7.a3, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 213, 32)) @@ -675,7 +675,7 @@ module GenericSignaturesValid { interface I8 extends Base2 { >I8 : Symbol(I8, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 215, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) a3: new (x?: T) => T; // error, no inferences for T so {} not assignable to {} in return type >a3 : Symbol(I8.a3, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 217, 32)) @@ -687,7 +687,7 @@ module GenericSignaturesValid { interface I9 extends Base2 { >I9 : Symbol(I9, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 219, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) a3: new (x: T) => T; // ok, identical, same number of required params >a3 : Symbol(I9.a3, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 221, 32)) @@ -699,7 +699,7 @@ module GenericSignaturesValid { interface I10 extends Base2 { >I10 : Symbol(I10, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 223, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) a3: new (x: T, y: T) => T; // error, too many required params >a3 : Symbol(I10.a3, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 225, 33)) @@ -714,7 +714,7 @@ module GenericSignaturesValid { interface I11 extends Base2 { >I11 : Symbol(I11, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 227, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) a4: new () => T; // error, not identical and contextual signature instatiation can't make inference from T to T >a4 : Symbol(I11.a4, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 230, 33)) @@ -724,7 +724,7 @@ module GenericSignaturesValid { interface I12 extends Base2 { >I12 : Symbol(I12, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 232, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) a4: new (x?: T, y?: T) => T; // ok, fewer required params >a4 : Symbol(I12.a4, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 234, 33)) @@ -738,7 +738,7 @@ module GenericSignaturesValid { interface I13 extends Base2 { >I13 : Symbol(I13, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 236, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) a4: new (x: T) => T; // ok, same T of required params >a4 : Symbol(I13.a4, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 238, 33)) @@ -750,7 +750,7 @@ module GenericSignaturesValid { interface I14 extends Base2 { >I14 : Symbol(I14, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 240, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) a4: new (x: T, y: T) => T; // ok, same number of params >a4 : Symbol(I14.a4, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 242, 33)) @@ -765,7 +765,7 @@ module GenericSignaturesValid { interface I15 extends Base2 { >I15 : Symbol(I15, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 244, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) a5: new () => T; // error, not identical and contextual signature instatiation can't make inference from T to T >a5 : Symbol(I15.a5, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 247, 33)) @@ -775,7 +775,7 @@ module GenericSignaturesValid { interface I16 extends Base2 { >I16 : Symbol(I16, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 249, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) a5: new (x?: T, y?: T) => T; // ok, fewer required params >a5 : Symbol(I16.a5, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 251, 33)) @@ -789,7 +789,7 @@ module GenericSignaturesValid { interface I17 extends Base2 { >I17 : Symbol(I17, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 253, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) a5: new (x: T) => T; // ok, all present params match >a5 : Symbol(I17.a5, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 255, 33)) @@ -801,7 +801,7 @@ module GenericSignaturesValid { interface I18 extends Base2 { >I18 : Symbol(I18, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 257, 5)) ->Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 31)) +>Base2 : Symbol(Base2, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 176, 34)) a5: new (x: T, y: T) => T; // ok, same number of params >a5 : Symbol(I18.a5, Decl(subtypingWithGenericConstructSignaturesWithOptionalParameters.ts, 259, 33)) diff --git a/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.types b/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.types index 815642281b64a..2cda8d4ac64a1 100644 --- a/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.types +++ b/tests/baselines/reference/subtypingWithGenericConstructSignaturesWithOptionalParameters.types @@ -3,7 +3,7 @@ === subtypingWithGenericConstructSignaturesWithOptionalParameters.ts === // call signatures in derived types must have the same or fewer optional parameters as the base type -module ClassTypeParam { +namespace ClassTypeParam { interface Base { a: new () => T; >a : new () => T @@ -187,7 +187,7 @@ module ClassTypeParam { } } -module GenericSignaturesInvalid { +namespace GenericSignaturesInvalid { // all of these are errors interface Base2 { @@ -373,7 +373,7 @@ module GenericSignaturesInvalid { } } -module GenericSignaturesValid { +namespace GenericSignaturesValid { interface Base2 { a: new () => T; diff --git a/tests/baselines/reference/subtypingWithNumericIndexer.errors.txt b/tests/baselines/reference/subtypingWithNumericIndexer.errors.txt index ebe38a9ecc663..f5dea7c94525c 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer.errors.txt +++ b/tests/baselines/reference/subtypingWithNumericIndexer.errors.txt @@ -27,7 +27,7 @@ subtypingWithNumericIndexer.ts(36,11): error TS2415: Class 'B4' incorrectly e [x: number]: Derived2; // ok } - module Generics { + namespace Generics { class A { [x: number]: T; } diff --git a/tests/baselines/reference/subtypingWithNumericIndexer.js b/tests/baselines/reference/subtypingWithNumericIndexer.js index b45bda5b8afe8..4952fbea79f4d 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer.js +++ b/tests/baselines/reference/subtypingWithNumericIndexer.js @@ -19,7 +19,7 @@ class B2 extends A { [x: number]: Derived2; // ok } -module Generics { +namespace Generics { class A { [x: number]: T; } diff --git a/tests/baselines/reference/subtypingWithNumericIndexer.symbols b/tests/baselines/reference/subtypingWithNumericIndexer.symbols index 451c4886350aa..2383f9f3d3271 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer.symbols +++ b/tests/baselines/reference/subtypingWithNumericIndexer.symbols @@ -43,11 +43,11 @@ class B2 extends A { >Derived2 : Symbol(Derived2, Decl(subtypingWithNumericIndexer.ts, 3, 47)) } -module Generics { +namespace Generics { >Generics : Symbol(Generics, Decl(subtypingWithNumericIndexer.ts, 16, 1)) class A { ->A : Symbol(A, Decl(subtypingWithNumericIndexer.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithNumericIndexer.ts, 19, 12)) >Base : Symbol(Base, Decl(subtypingWithNumericIndexer.ts, 0, 0)) @@ -58,7 +58,7 @@ module Generics { class B extends A { >B : Symbol(B, Decl(subtypingWithNumericIndexer.ts, 21, 5)) ->A : Symbol(A, Decl(subtypingWithNumericIndexer.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer.ts, 18, 20)) >Base : Symbol(Base, Decl(subtypingWithNumericIndexer.ts, 0, 0)) [x: number]: Derived; // ok @@ -68,7 +68,7 @@ module Generics { class B2 extends A { >B2 : Symbol(B2, Decl(subtypingWithNumericIndexer.ts, 25, 5)) ->A : Symbol(A, Decl(subtypingWithNumericIndexer.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer.ts, 18, 20)) >Base : Symbol(Base, Decl(subtypingWithNumericIndexer.ts, 0, 0)) [x: number]: Derived2; // ok @@ -80,7 +80,7 @@ module Generics { >B3 : Symbol(B3, Decl(subtypingWithNumericIndexer.ts, 29, 5)) >T : Symbol(T, Decl(subtypingWithNumericIndexer.ts, 31, 13)) >Base : Symbol(Base, Decl(subtypingWithNumericIndexer.ts, 0, 0)) ->A : Symbol(A, Decl(subtypingWithNumericIndexer.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithNumericIndexer.ts, 31, 13)) [x: number]: Derived; // error, BUG? @@ -92,7 +92,7 @@ module Generics { >B4 : Symbol(B4, Decl(subtypingWithNumericIndexer.ts, 33, 5)) >T : Symbol(T, Decl(subtypingWithNumericIndexer.ts, 35, 13)) >Base : Symbol(Base, Decl(subtypingWithNumericIndexer.ts, 0, 0)) ->A : Symbol(A, Decl(subtypingWithNumericIndexer.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithNumericIndexer.ts, 35, 13)) [x: number]: Derived2; // error, BUG? diff --git a/tests/baselines/reference/subtypingWithNumericIndexer.types b/tests/baselines/reference/subtypingWithNumericIndexer.types index 8f32ec70cd282..2202e3c5edecc 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer.types +++ b/tests/baselines/reference/subtypingWithNumericIndexer.types @@ -46,7 +46,7 @@ class B2 extends A { > : ^^^^^^ } -module Generics { +namespace Generics { >Generics : typeof Generics > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/subtypingWithNumericIndexer2.errors.txt b/tests/baselines/reference/subtypingWithNumericIndexer2.errors.txt index 4ffb55f7afd11..11eca9a79d8c7 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer2.errors.txt +++ b/tests/baselines/reference/subtypingWithNumericIndexer2.errors.txt @@ -41,7 +41,7 @@ subtypingWithNumericIndexer2.ts(40,15): error TS2430: Interface 'B5' incorrec [x: number]: Derived2; // ok } - module Generics { + namespace Generics { interface A { [x: number]: T; } diff --git a/tests/baselines/reference/subtypingWithNumericIndexer2.js b/tests/baselines/reference/subtypingWithNumericIndexer2.js index f78e1f3f6eb40..09c6e6910a725 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer2.js +++ b/tests/baselines/reference/subtypingWithNumericIndexer2.js @@ -19,7 +19,7 @@ interface B2 extends A { [x: number]: Derived2; // ok } -module Generics { +namespace Generics { interface A { [x: number]: T; } diff --git a/tests/baselines/reference/subtypingWithNumericIndexer2.symbols b/tests/baselines/reference/subtypingWithNumericIndexer2.symbols index a7e9d53c24821..4761c9cf7e61b 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer2.symbols +++ b/tests/baselines/reference/subtypingWithNumericIndexer2.symbols @@ -43,11 +43,11 @@ interface B2 extends A { >Derived2 : Symbol(Derived2, Decl(subtypingWithNumericIndexer2.ts, 3, 47)) } -module Generics { +namespace Generics { >Generics : Symbol(Generics, Decl(subtypingWithNumericIndexer2.ts, 16, 1)) interface A { ->A : Symbol(A, Decl(subtypingWithNumericIndexer2.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer2.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithNumericIndexer2.ts, 19, 16)) >Derived : Symbol(Derived, Decl(subtypingWithNumericIndexer2.ts, 2, 31)) @@ -58,7 +58,7 @@ module Generics { interface B extends A { >B : Symbol(B, Decl(subtypingWithNumericIndexer2.ts, 21, 5)) ->A : Symbol(A, Decl(subtypingWithNumericIndexer2.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer2.ts, 18, 20)) >Base : Symbol(Base, Decl(subtypingWithNumericIndexer2.ts, 0, 0)) [x: number]: Derived; // error @@ -68,7 +68,7 @@ module Generics { interface B2 extends A { >B2 : Symbol(B2, Decl(subtypingWithNumericIndexer2.ts, 25, 5)) ->A : Symbol(A, Decl(subtypingWithNumericIndexer2.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer2.ts, 18, 20)) >Derived : Symbol(Derived, Decl(subtypingWithNumericIndexer2.ts, 2, 31)) [x: number]: Derived2; // ok @@ -80,7 +80,7 @@ module Generics { >B3 : Symbol(B3, Decl(subtypingWithNumericIndexer2.ts, 29, 5)) >T : Symbol(T, Decl(subtypingWithNumericIndexer2.ts, 31, 17)) >Derived : Symbol(Derived, Decl(subtypingWithNumericIndexer2.ts, 2, 31)) ->A : Symbol(A, Decl(subtypingWithNumericIndexer2.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer2.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithNumericIndexer2.ts, 31, 17)) [x: number]: Base; // error @@ -92,7 +92,7 @@ module Generics { >B4 : Symbol(B4, Decl(subtypingWithNumericIndexer2.ts, 33, 5)) >T : Symbol(T, Decl(subtypingWithNumericIndexer2.ts, 35, 17)) >Derived : Symbol(Derived, Decl(subtypingWithNumericIndexer2.ts, 2, 31)) ->A : Symbol(A, Decl(subtypingWithNumericIndexer2.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer2.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithNumericIndexer2.ts, 35, 17)) [x: number]: Derived; // error @@ -104,7 +104,7 @@ module Generics { >B5 : Symbol(B5, Decl(subtypingWithNumericIndexer2.ts, 37, 5)) >T : Symbol(T, Decl(subtypingWithNumericIndexer2.ts, 39, 17)) >Derived2 : Symbol(Derived2, Decl(subtypingWithNumericIndexer2.ts, 3, 47)) ->A : Symbol(A, Decl(subtypingWithNumericIndexer2.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer2.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithNumericIndexer2.ts, 39, 17)) [x: number]: Derived2; // error diff --git a/tests/baselines/reference/subtypingWithNumericIndexer2.types b/tests/baselines/reference/subtypingWithNumericIndexer2.types index 474078114eee5..41b75a100b6bf 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer2.types +++ b/tests/baselines/reference/subtypingWithNumericIndexer2.types @@ -33,7 +33,7 @@ interface B2 extends A { > : ^^^^^^ } -module Generics { +namespace Generics { interface A { [x: number]: T; >x : number diff --git a/tests/baselines/reference/subtypingWithNumericIndexer3.errors.txt b/tests/baselines/reference/subtypingWithNumericIndexer3.errors.txt index f08112dbb97cd..69a555110ab42 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer3.errors.txt +++ b/tests/baselines/reference/subtypingWithNumericIndexer3.errors.txt @@ -41,7 +41,7 @@ subtypingWithNumericIndexer3.ts(40,11): error TS2415: Class 'B5' incorrectly [x: number]: Derived2; // ok } - module Generics { + namespace Generics { class A { [x: number]: T; } diff --git a/tests/baselines/reference/subtypingWithNumericIndexer3.js b/tests/baselines/reference/subtypingWithNumericIndexer3.js index 6291ed1589c40..565612bd63c26 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer3.js +++ b/tests/baselines/reference/subtypingWithNumericIndexer3.js @@ -19,7 +19,7 @@ class B2 extends A { [x: number]: Derived2; // ok } -module Generics { +namespace Generics { class A { [x: number]: T; } diff --git a/tests/baselines/reference/subtypingWithNumericIndexer3.symbols b/tests/baselines/reference/subtypingWithNumericIndexer3.symbols index 847d937c8ca0a..692a806cf8935 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer3.symbols +++ b/tests/baselines/reference/subtypingWithNumericIndexer3.symbols @@ -43,11 +43,11 @@ class B2 extends A { >Derived2 : Symbol(Derived2, Decl(subtypingWithNumericIndexer3.ts, 3, 47)) } -module Generics { +namespace Generics { >Generics : Symbol(Generics, Decl(subtypingWithNumericIndexer3.ts, 16, 1)) class A { ->A : Symbol(A, Decl(subtypingWithNumericIndexer3.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer3.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithNumericIndexer3.ts, 19, 12)) >Derived : Symbol(Derived, Decl(subtypingWithNumericIndexer3.ts, 2, 31)) @@ -58,7 +58,7 @@ module Generics { class B extends A { >B : Symbol(B, Decl(subtypingWithNumericIndexer3.ts, 21, 5)) ->A : Symbol(A, Decl(subtypingWithNumericIndexer3.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer3.ts, 18, 20)) >Base : Symbol(Base, Decl(subtypingWithNumericIndexer3.ts, 0, 0)) [x: number]: Derived; // error @@ -68,7 +68,7 @@ module Generics { class B2 extends A { >B2 : Symbol(B2, Decl(subtypingWithNumericIndexer3.ts, 25, 5)) ->A : Symbol(A, Decl(subtypingWithNumericIndexer3.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer3.ts, 18, 20)) >Derived : Symbol(Derived, Decl(subtypingWithNumericIndexer3.ts, 2, 31)) [x: number]: Derived2; // ok @@ -80,7 +80,7 @@ module Generics { >B3 : Symbol(B3, Decl(subtypingWithNumericIndexer3.ts, 29, 5)) >T : Symbol(T, Decl(subtypingWithNumericIndexer3.ts, 31, 13)) >Derived : Symbol(Derived, Decl(subtypingWithNumericIndexer3.ts, 2, 31)) ->A : Symbol(A, Decl(subtypingWithNumericIndexer3.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer3.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithNumericIndexer3.ts, 31, 13)) [x: number]: Base; // error @@ -92,7 +92,7 @@ module Generics { >B4 : Symbol(B4, Decl(subtypingWithNumericIndexer3.ts, 33, 5)) >T : Symbol(T, Decl(subtypingWithNumericIndexer3.ts, 35, 13)) >Derived : Symbol(Derived, Decl(subtypingWithNumericIndexer3.ts, 2, 31)) ->A : Symbol(A, Decl(subtypingWithNumericIndexer3.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer3.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithNumericIndexer3.ts, 35, 13)) [x: number]: Derived; // error @@ -104,7 +104,7 @@ module Generics { >B5 : Symbol(B5, Decl(subtypingWithNumericIndexer3.ts, 37, 5)) >T : Symbol(T, Decl(subtypingWithNumericIndexer3.ts, 39, 13)) >Derived2 : Symbol(Derived2, Decl(subtypingWithNumericIndexer3.ts, 3, 47)) ->A : Symbol(A, Decl(subtypingWithNumericIndexer3.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer3.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithNumericIndexer3.ts, 39, 13)) [x: number]: Derived2; // error diff --git a/tests/baselines/reference/subtypingWithNumericIndexer3.types b/tests/baselines/reference/subtypingWithNumericIndexer3.types index 119bc3ad487ee..dc1baff6e08c0 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer3.types +++ b/tests/baselines/reference/subtypingWithNumericIndexer3.types @@ -46,7 +46,7 @@ class B2 extends A { > : ^^^^^^ } -module Generics { +namespace Generics { >Generics : typeof Generics > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/subtypingWithNumericIndexer4.errors.txt b/tests/baselines/reference/subtypingWithNumericIndexer4.errors.txt index 7a19e44207f5f..fb5fdbe772ff3 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer4.errors.txt +++ b/tests/baselines/reference/subtypingWithNumericIndexer4.errors.txt @@ -31,7 +31,7 @@ subtypingWithNumericIndexer4.ts(24,11): error TS2415: Class 'B3' incorrectly [x: number]: string; // error } - module Generics { + namespace Generics { class A { [x: number]: T; } diff --git a/tests/baselines/reference/subtypingWithNumericIndexer4.js b/tests/baselines/reference/subtypingWithNumericIndexer4.js index 5c4deee9979be..9ad17c69b6fb8 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer4.js +++ b/tests/baselines/reference/subtypingWithNumericIndexer4.js @@ -15,7 +15,7 @@ class B extends A { [x: number]: string; // error } -module Generics { +namespace Generics { class A { [x: number]: T; } diff --git a/tests/baselines/reference/subtypingWithNumericIndexer4.symbols b/tests/baselines/reference/subtypingWithNumericIndexer4.symbols index ed1ab87fa14f9..0739627645399 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer4.symbols +++ b/tests/baselines/reference/subtypingWithNumericIndexer4.symbols @@ -33,11 +33,11 @@ class B extends A { >x : Symbol(x, Decl(subtypingWithNumericIndexer4.ts, 11, 5)) } -module Generics { +namespace Generics { >Generics : Symbol(Generics, Decl(subtypingWithNumericIndexer4.ts, 12, 1)) class A { ->A : Symbol(A, Decl(subtypingWithNumericIndexer4.ts, 14, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer4.ts, 14, 20)) >T : Symbol(T, Decl(subtypingWithNumericIndexer4.ts, 15, 12)) >Derived : Symbol(Derived, Decl(subtypingWithNumericIndexer4.ts, 2, 31)) @@ -48,7 +48,7 @@ module Generics { class B extends A { >B : Symbol(B, Decl(subtypingWithNumericIndexer4.ts, 17, 5)) ->A : Symbol(A, Decl(subtypingWithNumericIndexer4.ts, 14, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer4.ts, 14, 20)) >Base : Symbol(Base, Decl(subtypingWithNumericIndexer4.ts, 0, 0)) [x: number]: string; // error @@ -59,7 +59,7 @@ module Generics { >B3 : Symbol(B3, Decl(subtypingWithNumericIndexer4.ts, 21, 5)) >T : Symbol(T, Decl(subtypingWithNumericIndexer4.ts, 23, 13)) >Derived : Symbol(Derived, Decl(subtypingWithNumericIndexer4.ts, 2, 31)) ->A : Symbol(A, Decl(subtypingWithNumericIndexer4.ts, 14, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer4.ts, 14, 20)) >T : Symbol(T, Decl(subtypingWithNumericIndexer4.ts, 23, 13)) [x: number]: string; // error diff --git a/tests/baselines/reference/subtypingWithNumericIndexer4.types b/tests/baselines/reference/subtypingWithNumericIndexer4.types index 754f66c5a3fd6..534a1f73ba326 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer4.types +++ b/tests/baselines/reference/subtypingWithNumericIndexer4.types @@ -35,7 +35,7 @@ class B extends A { > : ^^^^^^ } -module Generics { +namespace Generics { >Generics : typeof Generics > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/subtypingWithNumericIndexer5.errors.txt b/tests/baselines/reference/subtypingWithNumericIndexer5.errors.txt index b8e96c0d40243..f8f7bc93c0e37 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer5.errors.txt +++ b/tests/baselines/reference/subtypingWithNumericIndexer5.errors.txt @@ -41,7 +41,7 @@ subtypingWithNumericIndexer5.ts(40,11): error TS2420: Class 'B5' incorrectly [x: string]: Derived2; // ok } - module Generics { + namespace Generics { interface A { [x: number]: T; } diff --git a/tests/baselines/reference/subtypingWithNumericIndexer5.js b/tests/baselines/reference/subtypingWithNumericIndexer5.js index 2a9aa51171ac8..17fb380760e99 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer5.js +++ b/tests/baselines/reference/subtypingWithNumericIndexer5.js @@ -19,7 +19,7 @@ class B2 implements A { [x: string]: Derived2; // ok } -module Generics { +namespace Generics { interface A { [x: number]: T; } diff --git a/tests/baselines/reference/subtypingWithNumericIndexer5.symbols b/tests/baselines/reference/subtypingWithNumericIndexer5.symbols index da1d58a759215..fd0dd0563d8cb 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer5.symbols +++ b/tests/baselines/reference/subtypingWithNumericIndexer5.symbols @@ -43,11 +43,11 @@ class B2 implements A { >Derived2 : Symbol(Derived2, Decl(subtypingWithNumericIndexer5.ts, 3, 47)) } -module Generics { +namespace Generics { >Generics : Symbol(Generics, Decl(subtypingWithNumericIndexer5.ts, 16, 1)) interface A { ->A : Symbol(A, Decl(subtypingWithNumericIndexer5.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer5.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithNumericIndexer5.ts, 19, 16)) >Base : Symbol(Base, Decl(subtypingWithNumericIndexer5.ts, 0, 0)) @@ -58,7 +58,7 @@ module Generics { class B implements A { >B : Symbol(B, Decl(subtypingWithNumericIndexer5.ts, 21, 5)) ->A : Symbol(A, Decl(subtypingWithNumericIndexer5.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer5.ts, 18, 20)) >Base : Symbol(Base, Decl(subtypingWithNumericIndexer5.ts, 0, 0)) [x: string]: Derived; // ok @@ -68,7 +68,7 @@ module Generics { class B2 implements A { >B2 : Symbol(B2, Decl(subtypingWithNumericIndexer5.ts, 25, 5)) ->A : Symbol(A, Decl(subtypingWithNumericIndexer5.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer5.ts, 18, 20)) >Derived : Symbol(Derived, Decl(subtypingWithNumericIndexer5.ts, 2, 31)) [x: string]: Derived2; // ok @@ -80,7 +80,7 @@ module Generics { >B3 : Symbol(B3, Decl(subtypingWithNumericIndexer5.ts, 29, 5)) >T : Symbol(T, Decl(subtypingWithNumericIndexer5.ts, 31, 13)) >Derived : Symbol(Derived, Decl(subtypingWithNumericIndexer5.ts, 2, 31)) ->A : Symbol(A, Decl(subtypingWithNumericIndexer5.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer5.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithNumericIndexer5.ts, 31, 13)) [x: string]: Base; // error @@ -92,7 +92,7 @@ module Generics { >B4 : Symbol(B4, Decl(subtypingWithNumericIndexer5.ts, 33, 5)) >T : Symbol(T, Decl(subtypingWithNumericIndexer5.ts, 35, 13)) >Derived : Symbol(Derived, Decl(subtypingWithNumericIndexer5.ts, 2, 31)) ->A : Symbol(A, Decl(subtypingWithNumericIndexer5.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer5.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithNumericIndexer5.ts, 35, 13)) [x: string]: Derived; // error @@ -104,7 +104,7 @@ module Generics { >B5 : Symbol(B5, Decl(subtypingWithNumericIndexer5.ts, 37, 5)) >T : Symbol(T, Decl(subtypingWithNumericIndexer5.ts, 39, 13)) >Derived2 : Symbol(Derived2, Decl(subtypingWithNumericIndexer5.ts, 3, 47)) ->A : Symbol(A, Decl(subtypingWithNumericIndexer5.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithNumericIndexer5.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithNumericIndexer5.ts, 39, 13)) [x: string]: Derived2; // error diff --git a/tests/baselines/reference/subtypingWithNumericIndexer5.types b/tests/baselines/reference/subtypingWithNumericIndexer5.types index bdba00da406d5..f0e6350f7fe21 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer5.types +++ b/tests/baselines/reference/subtypingWithNumericIndexer5.types @@ -39,7 +39,7 @@ class B2 implements A { > : ^^^^^^ } -module Generics { +namespace Generics { >Generics : typeof Generics > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/subtypingWithObjectMembers.errors.txt b/tests/baselines/reference/subtypingWithObjectMembers.errors.txt index 3a4205341f95c..bea94f2089d69 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers.errors.txt +++ b/tests/baselines/reference/subtypingWithObjectMembers.errors.txt @@ -58,7 +58,7 @@ subtypingWithObjectMembers.ts(65,9): error TS2416: Property ''2.0'' in type 'B3' !!! error TS2416: Type 'string' is not assignable to type 'Base'. } - module TwoLevels { + namespace TwoLevels { class A { foo: Base; bar: Base; diff --git a/tests/baselines/reference/subtypingWithObjectMembers.js b/tests/baselines/reference/subtypingWithObjectMembers.js index 94824b2be6810..2ac463bab2237 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers.js +++ b/tests/baselines/reference/subtypingWithObjectMembers.js @@ -37,7 +37,7 @@ class B3 extends A3 { '2.0': string; // error } -module TwoLevels { +namespace TwoLevels { class A { foo: Base; bar: Base; diff --git a/tests/baselines/reference/subtypingWithObjectMembers.symbols b/tests/baselines/reference/subtypingWithObjectMembers.symbols index 96dc0e3641f5b..ebd7ef75dc61e 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers.symbols +++ b/tests/baselines/reference/subtypingWithObjectMembers.symbols @@ -89,11 +89,11 @@ class B3 extends A3 { >'2.0' : Symbol(B3['2.0'], Decl(subtypingWithObjectMembers.ts, 32, 17)) } -module TwoLevels { +namespace TwoLevels { >TwoLevels : Symbol(TwoLevels, Decl(subtypingWithObjectMembers.ts, 34, 1)) class A { ->A : Symbol(A, Decl(subtypingWithObjectMembers.ts, 36, 18)) +>A : Symbol(A, Decl(subtypingWithObjectMembers.ts, 36, 21)) foo: Base; >foo : Symbol(A.foo, Decl(subtypingWithObjectMembers.ts, 37, 13)) @@ -106,7 +106,7 @@ module TwoLevels { class B extends A { >B : Symbol(B, Decl(subtypingWithObjectMembers.ts, 40, 5)) ->A : Symbol(A, Decl(subtypingWithObjectMembers.ts, 36, 18)) +>A : Symbol(A, Decl(subtypingWithObjectMembers.ts, 36, 21)) foo: Derived2; // ok >foo : Symbol(B.foo, Decl(subtypingWithObjectMembers.ts, 42, 23)) diff --git a/tests/baselines/reference/subtypingWithObjectMembers.types b/tests/baselines/reference/subtypingWithObjectMembers.types index 28b0eabd81942..426f75f518821 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers.types +++ b/tests/baselines/reference/subtypingWithObjectMembers.types @@ -109,7 +109,7 @@ class B3 extends A3 { > : ^^^^^^ } -module TwoLevels { +namespace TwoLevels { >TwoLevels : typeof TwoLevels > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/subtypingWithObjectMembers2.errors.txt b/tests/baselines/reference/subtypingWithObjectMembers2.errors.txt index 391292aadbd24..bd006839a60d3 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers2.errors.txt +++ b/tests/baselines/reference/subtypingWithObjectMembers2.errors.txt @@ -29,7 +29,7 @@ subtypingWithObjectMembers2.ts(70,15): error TS2430: Interface 'B3' incorrectly // N and M have the same name, same accessibility, same optionality, and N is a subtype of M // foo properties are valid, bar properties cause errors in the derived class declarations - module NotOptional { + namespace NotOptional { interface A { foo: Base; bar: Base; @@ -74,7 +74,7 @@ subtypingWithObjectMembers2.ts(70,15): error TS2430: Interface 'B3' incorrectly } // same cases as above but with optional - module Optional { + namespace Optional { interface A { foo?: Base; bar?: Base; diff --git a/tests/baselines/reference/subtypingWithObjectMembers2.js b/tests/baselines/reference/subtypingWithObjectMembers2.js index 624af13d8ca20..627ca74dded10 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers2.js +++ b/tests/baselines/reference/subtypingWithObjectMembers2.js @@ -11,7 +11,7 @@ interface Derived extends Base { // N and M have the same name, same accessibility, same optionality, and N is a subtype of M // foo properties are valid, bar properties cause errors in the derived class declarations -module NotOptional { +namespace NotOptional { interface A { foo: Base; bar: Base; @@ -44,7 +44,7 @@ module NotOptional { } // same cases as above but with optional -module Optional { +namespace Optional { interface A { foo?: Base; bar?: Base; diff --git a/tests/baselines/reference/subtypingWithObjectMembers2.symbols b/tests/baselines/reference/subtypingWithObjectMembers2.symbols index e2c919be889ef..397a5b961c729 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers2.symbols +++ b/tests/baselines/reference/subtypingWithObjectMembers2.symbols @@ -18,11 +18,11 @@ interface Derived extends Base { // N and M have the same name, same accessibility, same optionality, and N is a subtype of M // foo properties are valid, bar properties cause errors in the derived class declarations -module NotOptional { +namespace NotOptional { >NotOptional : Symbol(NotOptional, Decl(subtypingWithObjectMembers2.ts, 6, 1)) interface A { ->A : Symbol(A, Decl(subtypingWithObjectMembers2.ts, 10, 20)) +>A : Symbol(A, Decl(subtypingWithObjectMembers2.ts, 10, 23)) foo: Base; >foo : Symbol(A.foo, Decl(subtypingWithObjectMembers2.ts, 11, 17)) @@ -35,7 +35,7 @@ module NotOptional { interface B extends A { >B : Symbol(B, Decl(subtypingWithObjectMembers2.ts, 14, 5)) ->A : Symbol(A, Decl(subtypingWithObjectMembers2.ts, 10, 20)) +>A : Symbol(A, Decl(subtypingWithObjectMembers2.ts, 10, 23)) foo: Derived; // ok >foo : Symbol(B.foo, Decl(subtypingWithObjectMembers2.ts, 16, 27)) @@ -95,11 +95,11 @@ module NotOptional { } // same cases as above but with optional -module Optional { +namespace Optional { >Optional : Symbol(Optional, Decl(subtypingWithObjectMembers2.ts, 40, 1)) interface A { ->A : Symbol(A, Decl(subtypingWithObjectMembers2.ts, 43, 17)) +>A : Symbol(A, Decl(subtypingWithObjectMembers2.ts, 43, 20)) foo?: Base; >foo : Symbol(A.foo, Decl(subtypingWithObjectMembers2.ts, 44, 17)) @@ -112,7 +112,7 @@ module Optional { interface B extends A { >B : Symbol(B, Decl(subtypingWithObjectMembers2.ts, 47, 5)) ->A : Symbol(A, Decl(subtypingWithObjectMembers2.ts, 43, 17)) +>A : Symbol(A, Decl(subtypingWithObjectMembers2.ts, 43, 20)) foo?: Derived; // ok >foo : Symbol(B.foo, Decl(subtypingWithObjectMembers2.ts, 49, 27)) diff --git a/tests/baselines/reference/subtypingWithObjectMembers2.types b/tests/baselines/reference/subtypingWithObjectMembers2.types index 646cab7bbd003..832d8e2dff3d5 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers2.types +++ b/tests/baselines/reference/subtypingWithObjectMembers2.types @@ -15,7 +15,7 @@ interface Derived extends Base { // N and M have the same name, same accessibility, same optionality, and N is a subtype of M // foo properties are valid, bar properties cause errors in the derived class declarations -module NotOptional { +namespace NotOptional { interface A { foo: Base; >foo : Base @@ -78,7 +78,7 @@ module NotOptional { } // same cases as above but with optional -module Optional { +namespace Optional { interface A { foo?: Base; >foo : Base diff --git a/tests/baselines/reference/subtypingWithObjectMembers3.errors.txt b/tests/baselines/reference/subtypingWithObjectMembers3.errors.txt index c69465b1ee1cf..1cdaea69f5b96 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers3.errors.txt +++ b/tests/baselines/reference/subtypingWithObjectMembers3.errors.txt @@ -29,7 +29,7 @@ subtypingWithObjectMembers3.ts(69,15): error TS2430: Interface 'B3' incorrectly // N and M have the same name, same accessibility, same optionality, and N is a subtype of M // foo properties are valid, bar properties cause errors in the derived class declarations - module NotOptional { + namespace NotOptional { interface A { foo: Base; bar: Derived; @@ -76,7 +76,7 @@ subtypingWithObjectMembers3.ts(69,15): error TS2430: Interface 'B3' incorrectly } } - module Optional { + namespace Optional { interface A { foo?: Base; bar?: Derived; diff --git a/tests/baselines/reference/subtypingWithObjectMembers3.js b/tests/baselines/reference/subtypingWithObjectMembers3.js index 228637a624179..33b91ae2c8c94 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers3.js +++ b/tests/baselines/reference/subtypingWithObjectMembers3.js @@ -11,7 +11,7 @@ interface Derived extends Base { // N and M have the same name, same accessibility, same optionality, and N is a subtype of M // foo properties are valid, bar properties cause errors in the derived class declarations -module NotOptional { +namespace NotOptional { interface A { foo: Base; bar: Derived; @@ -43,7 +43,7 @@ module NotOptional { } } -module Optional { +namespace Optional { interface A { foo?: Base; bar?: Derived; diff --git a/tests/baselines/reference/subtypingWithObjectMembers3.symbols b/tests/baselines/reference/subtypingWithObjectMembers3.symbols index 111dbb361f7fa..a1adcebb33bca 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers3.symbols +++ b/tests/baselines/reference/subtypingWithObjectMembers3.symbols @@ -18,11 +18,11 @@ interface Derived extends Base { // N and M have the same name, same accessibility, same optionality, and N is a subtype of M // foo properties are valid, bar properties cause errors in the derived class declarations -module NotOptional { +namespace NotOptional { >NotOptional : Symbol(NotOptional, Decl(subtypingWithObjectMembers3.ts, 6, 1)) interface A { ->A : Symbol(A, Decl(subtypingWithObjectMembers3.ts, 10, 20)) +>A : Symbol(A, Decl(subtypingWithObjectMembers3.ts, 10, 23)) foo: Base; >foo : Symbol(A.foo, Decl(subtypingWithObjectMembers3.ts, 11, 17)) @@ -35,7 +35,7 @@ module NotOptional { interface B extends A { >B : Symbol(B, Decl(subtypingWithObjectMembers3.ts, 14, 5)) ->A : Symbol(A, Decl(subtypingWithObjectMembers3.ts, 10, 20)) +>A : Symbol(A, Decl(subtypingWithObjectMembers3.ts, 10, 23)) foo: Derived; // ok >foo : Symbol(B.foo, Decl(subtypingWithObjectMembers3.ts, 16, 27)) @@ -97,11 +97,11 @@ module NotOptional { } } -module Optional { +namespace Optional { >Optional : Symbol(Optional, Decl(subtypingWithObjectMembers3.ts, 40, 1)) interface A { ->A : Symbol(A, Decl(subtypingWithObjectMembers3.ts, 42, 17)) +>A : Symbol(A, Decl(subtypingWithObjectMembers3.ts, 42, 20)) foo?: Base; >foo : Symbol(A.foo, Decl(subtypingWithObjectMembers3.ts, 43, 17)) @@ -114,7 +114,7 @@ module Optional { interface B extends A { >B : Symbol(B, Decl(subtypingWithObjectMembers3.ts, 46, 5)) ->A : Symbol(A, Decl(subtypingWithObjectMembers3.ts, 42, 17)) +>A : Symbol(A, Decl(subtypingWithObjectMembers3.ts, 42, 20)) foo?: Derived; // ok >foo : Symbol(B.foo, Decl(subtypingWithObjectMembers3.ts, 48, 27)) diff --git a/tests/baselines/reference/subtypingWithObjectMembers3.types b/tests/baselines/reference/subtypingWithObjectMembers3.types index df94161919b97..0f99390b135be 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers3.types +++ b/tests/baselines/reference/subtypingWithObjectMembers3.types @@ -15,7 +15,7 @@ interface Derived extends Base { // N and M have the same name, same accessibility, same optionality, and N is a subtype of M // foo properties are valid, bar properties cause errors in the derived class declarations -module NotOptional { +namespace NotOptional { interface A { foo: Base; >foo : Base @@ -77,7 +77,7 @@ module NotOptional { } } -module Optional { +namespace Optional { interface A { foo?: Base; >foo : Base diff --git a/tests/baselines/reference/subtypingWithObjectMembers5.errors.txt b/tests/baselines/reference/subtypingWithObjectMembers5.errors.txt index d5251e2ce7a70..4aaf2f5ffda9e 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers5.errors.txt +++ b/tests/baselines/reference/subtypingWithObjectMembers5.errors.txt @@ -20,7 +20,7 @@ subtypingWithObjectMembers5.ts(59,11): error TS2559: Type 'B3' has no properties // N and M have the same name, same accessibility, same optionality, and N is a subtype of M // foo properties are valid, bar properties cause errors in the derived class declarations - module NotOptional { + namespace NotOptional { interface A { foo: Base; } @@ -59,7 +59,7 @@ subtypingWithObjectMembers5.ts(59,11): error TS2559: Type 'B3' has no properties } // same cases as above but with optional - module Optional { + namespace Optional { interface A { foo?: Base; } diff --git a/tests/baselines/reference/subtypingWithObjectMembers5.js b/tests/baselines/reference/subtypingWithObjectMembers5.js index 8d0a5b1642b15..d4bf61334683a 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers5.js +++ b/tests/baselines/reference/subtypingWithObjectMembers5.js @@ -11,7 +11,7 @@ interface Derived extends Base { // N and M have the same name, same accessibility, same optionality, and N is a subtype of M // foo properties are valid, bar properties cause errors in the derived class declarations -module NotOptional { +namespace NotOptional { interface A { foo: Base; } @@ -38,7 +38,7 @@ module NotOptional { } // same cases as above but with optional -module Optional { +namespace Optional { interface A { foo?: Base; } diff --git a/tests/baselines/reference/subtypingWithObjectMembers5.symbols b/tests/baselines/reference/subtypingWithObjectMembers5.symbols index b92b99119f7f7..37dae00b23fcc 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers5.symbols +++ b/tests/baselines/reference/subtypingWithObjectMembers5.symbols @@ -18,11 +18,11 @@ interface Derived extends Base { // N and M have the same name, same accessibility, same optionality, and N is a subtype of M // foo properties are valid, bar properties cause errors in the derived class declarations -module NotOptional { +namespace NotOptional { >NotOptional : Symbol(NotOptional, Decl(subtypingWithObjectMembers5.ts, 6, 1)) interface A { ->A : Symbol(A, Decl(subtypingWithObjectMembers5.ts, 10, 20)) +>A : Symbol(A, Decl(subtypingWithObjectMembers5.ts, 10, 23)) foo: Base; >foo : Symbol(A.foo, Decl(subtypingWithObjectMembers5.ts, 11, 17)) @@ -31,7 +31,7 @@ module NotOptional { class B implements A { >B : Symbol(B, Decl(subtypingWithObjectMembers5.ts, 13, 5)) ->A : Symbol(A, Decl(subtypingWithObjectMembers5.ts, 10, 20)) +>A : Symbol(A, Decl(subtypingWithObjectMembers5.ts, 10, 23)) fooo: Derived; // error >fooo : Symbol(B.fooo, Decl(subtypingWithObjectMembers5.ts, 15, 26)) @@ -74,11 +74,11 @@ module NotOptional { } // same cases as above but with optional -module Optional { +namespace Optional { >Optional : Symbol(Optional, Decl(subtypingWithObjectMembers5.ts, 34, 1)) interface A { ->A : Symbol(A, Decl(subtypingWithObjectMembers5.ts, 37, 17)) +>A : Symbol(A, Decl(subtypingWithObjectMembers5.ts, 37, 20)) foo?: Base; >foo : Symbol(A.foo, Decl(subtypingWithObjectMembers5.ts, 38, 17)) @@ -87,7 +87,7 @@ module Optional { class B implements A { >B : Symbol(B, Decl(subtypingWithObjectMembers5.ts, 40, 5)) ->A : Symbol(A, Decl(subtypingWithObjectMembers5.ts, 37, 17)) +>A : Symbol(A, Decl(subtypingWithObjectMembers5.ts, 37, 20)) fooo: Derived; // weak type error >fooo : Symbol(B.fooo, Decl(subtypingWithObjectMembers5.ts, 42, 26)) diff --git a/tests/baselines/reference/subtypingWithObjectMembers5.types b/tests/baselines/reference/subtypingWithObjectMembers5.types index 6595b88a93861..99f47c2fd0011 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers5.types +++ b/tests/baselines/reference/subtypingWithObjectMembers5.types @@ -15,7 +15,7 @@ interface Derived extends Base { // N and M have the same name, same accessibility, same optionality, and N is a subtype of M // foo properties are valid, bar properties cause errors in the derived class declarations -module NotOptional { +namespace NotOptional { >NotOptional : typeof NotOptional > : ^^^^^^^^^^^^^^^^^^ @@ -66,7 +66,7 @@ module NotOptional { } // same cases as above but with optional -module Optional { +namespace Optional { >Optional : typeof Optional > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.errors.txt b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.errors.txt index bb4fec3208f26..a462b24ba234c 100644 --- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.errors.txt +++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.errors.txt @@ -23,7 +23,7 @@ subtypingWithObjectMembersAccessibility2.ts(58,11): error TS2415: Class 'B3' inc bar: string; } - module ExplicitPublic { + namespace ExplicitPublic { class A { private foo: Base; } @@ -58,7 +58,7 @@ subtypingWithObjectMembersAccessibility2.ts(58,11): error TS2415: Class 'B3' inc } } - module ImplicitPublic { + namespace ImplicitPublic { class A { private foo: Base; } diff --git a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js index b2597b223a227..0d31e2f1a3b2b 100644 --- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js +++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js @@ -11,7 +11,7 @@ class Derived extends Base { bar: string; } -module ExplicitPublic { +namespace ExplicitPublic { class A { private foo: Base; } @@ -37,7 +37,7 @@ module ExplicitPublic { } } -module ImplicitPublic { +namespace ImplicitPublic { class A { private foo: Base; } diff --git a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.symbols b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.symbols index a4e2535a9dc24..6f4c83d69d032 100644 --- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.symbols +++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.symbols @@ -18,11 +18,11 @@ class Derived extends Base { >bar : Symbol(Derived.bar, Decl(subtypingWithObjectMembersAccessibility2.ts, 6, 28)) } -module ExplicitPublic { +namespace ExplicitPublic { >ExplicitPublic : Symbol(ExplicitPublic, Decl(subtypingWithObjectMembersAccessibility2.ts, 8, 1)) class A { ->A : Symbol(A, Decl(subtypingWithObjectMembersAccessibility2.ts, 10, 23)) +>A : Symbol(A, Decl(subtypingWithObjectMembersAccessibility2.ts, 10, 26)) private foo: Base; >foo : Symbol(A.foo, Decl(subtypingWithObjectMembersAccessibility2.ts, 11, 13)) @@ -31,7 +31,7 @@ module ExplicitPublic { class B extends A { >B : Symbol(B, Decl(subtypingWithObjectMembersAccessibility2.ts, 13, 5)) ->A : Symbol(A, Decl(subtypingWithObjectMembersAccessibility2.ts, 10, 23)) +>A : Symbol(A, Decl(subtypingWithObjectMembersAccessibility2.ts, 10, 26)) public foo: Derived; // error >foo : Symbol(B.foo, Decl(subtypingWithObjectMembersAccessibility2.ts, 15, 23)) @@ -73,11 +73,11 @@ module ExplicitPublic { } } -module ImplicitPublic { +namespace ImplicitPublic { >ImplicitPublic : Symbol(ImplicitPublic, Decl(subtypingWithObjectMembersAccessibility2.ts, 34, 1)) class A { ->A : Symbol(A, Decl(subtypingWithObjectMembersAccessibility2.ts, 36, 23)) +>A : Symbol(A, Decl(subtypingWithObjectMembersAccessibility2.ts, 36, 26)) private foo: Base; >foo : Symbol(A.foo, Decl(subtypingWithObjectMembersAccessibility2.ts, 37, 13)) @@ -86,7 +86,7 @@ module ImplicitPublic { class B extends A { >B : Symbol(B, Decl(subtypingWithObjectMembersAccessibility2.ts, 39, 5)) ->A : Symbol(A, Decl(subtypingWithObjectMembersAccessibility2.ts, 36, 23)) +>A : Symbol(A, Decl(subtypingWithObjectMembersAccessibility2.ts, 36, 26)) foo: Derived; // error >foo : Symbol(B.foo, Decl(subtypingWithObjectMembersAccessibility2.ts, 41, 23)) diff --git a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.types b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.types index 0f09514768fa6..6687e25de6016 100644 --- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.types +++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.types @@ -23,7 +23,7 @@ class Derived extends Base { > : ^^^^^^ } -module ExplicitPublic { +namespace ExplicitPublic { >ExplicitPublic : typeof ExplicitPublic > : ^^^^^^^^^^^^^^^^^^^^^ @@ -88,7 +88,7 @@ module ExplicitPublic { } } -module ImplicitPublic { +namespace ImplicitPublic { >ImplicitPublic : typeof ImplicitPublic > : ^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality.js b/tests/baselines/reference/subtypingWithObjectMembersOptionality.js index 4601d3e4551e2..8b4656fa5b896 100644 --- a/tests/baselines/reference/subtypingWithObjectMembersOptionality.js +++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality.js @@ -44,7 +44,7 @@ var a: { Foo?: Base; }; var b = { Foo: null }; var r = true ? a : b; -module TwoLevels { +namespace TwoLevels { interface T { Foo?: Base; } diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality.symbols b/tests/baselines/reference/subtypingWithObjectMembersOptionality.symbols index 4932f68d56c34..9e87e92eafebb 100644 --- a/tests/baselines/reference/subtypingWithObjectMembersOptionality.symbols +++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality.symbols @@ -92,11 +92,11 @@ var r = true ? a : b; >a : Symbol(a, Decl(subtypingWithObjectMembersOptionality.ts, 39, 3)) >b : Symbol(b, Decl(subtypingWithObjectMembersOptionality.ts, 40, 3)) -module TwoLevels { +namespace TwoLevels { >TwoLevels : Symbol(TwoLevels, Decl(subtypingWithObjectMembersOptionality.ts, 41, 21)) interface T { ->T : Symbol(T, Decl(subtypingWithObjectMembersOptionality.ts, 43, 18)) +>T : Symbol(T, Decl(subtypingWithObjectMembersOptionality.ts, 43, 21)) Foo?: Base; >Foo : Symbol(T.Foo, Decl(subtypingWithObjectMembersOptionality.ts, 44, 17)) @@ -105,7 +105,7 @@ module TwoLevels { interface S extends T { >S : Symbol(S, Decl(subtypingWithObjectMembersOptionality.ts, 46, 5)) ->T : Symbol(T, Decl(subtypingWithObjectMembersOptionality.ts, 43, 18)) +>T : Symbol(T, Decl(subtypingWithObjectMembersOptionality.ts, 43, 21)) Foo: Derived2 >Foo : Symbol(S.Foo, Decl(subtypingWithObjectMembersOptionality.ts, 48, 27)) diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality.types b/tests/baselines/reference/subtypingWithObjectMembersOptionality.types index fe1a49a8f69b0..767bba4178176 100644 --- a/tests/baselines/reference/subtypingWithObjectMembersOptionality.types +++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality.types @@ -88,7 +88,7 @@ var r = true ? a : b; >b : { Foo: Derived; } > : ^^^^^^^ ^^^ -module TwoLevels { +namespace TwoLevels { >TwoLevels : typeof TwoLevels > : ^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/subtypingWithStringIndexer.errors.txt b/tests/baselines/reference/subtypingWithStringIndexer.errors.txt index a2cedb556bcee..a6e33359561e7 100644 --- a/tests/baselines/reference/subtypingWithStringIndexer.errors.txt +++ b/tests/baselines/reference/subtypingWithStringIndexer.errors.txt @@ -27,7 +27,7 @@ subtypingWithStringIndexer.ts(36,11): error TS2415: Class 'B4' incorrectly ex [x: string]: Derived2; // ok } - module Generics { + namespace Generics { class A { [x: string]: T; } diff --git a/tests/baselines/reference/subtypingWithStringIndexer.js b/tests/baselines/reference/subtypingWithStringIndexer.js index 6dabcc7fc1c1c..d42d65793f0eb 100644 --- a/tests/baselines/reference/subtypingWithStringIndexer.js +++ b/tests/baselines/reference/subtypingWithStringIndexer.js @@ -19,7 +19,7 @@ class B2 extends A { [x: string]: Derived2; // ok } -module Generics { +namespace Generics { class A { [x: string]: T; } diff --git a/tests/baselines/reference/subtypingWithStringIndexer.symbols b/tests/baselines/reference/subtypingWithStringIndexer.symbols index 423f611ead120..9a4ce491bb87c 100644 --- a/tests/baselines/reference/subtypingWithStringIndexer.symbols +++ b/tests/baselines/reference/subtypingWithStringIndexer.symbols @@ -43,11 +43,11 @@ class B2 extends A { >Derived2 : Symbol(Derived2, Decl(subtypingWithStringIndexer.ts, 3, 47)) } -module Generics { +namespace Generics { >Generics : Symbol(Generics, Decl(subtypingWithStringIndexer.ts, 16, 1)) class A { ->A : Symbol(A, Decl(subtypingWithStringIndexer.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithStringIndexer.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithStringIndexer.ts, 19, 12)) >Base : Symbol(Base, Decl(subtypingWithStringIndexer.ts, 0, 0)) @@ -58,7 +58,7 @@ module Generics { class B extends A { >B : Symbol(B, Decl(subtypingWithStringIndexer.ts, 21, 5)) ->A : Symbol(A, Decl(subtypingWithStringIndexer.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithStringIndexer.ts, 18, 20)) >Base : Symbol(Base, Decl(subtypingWithStringIndexer.ts, 0, 0)) [x: string]: Derived; // ok @@ -68,7 +68,7 @@ module Generics { class B2 extends A { >B2 : Symbol(B2, Decl(subtypingWithStringIndexer.ts, 25, 5)) ->A : Symbol(A, Decl(subtypingWithStringIndexer.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithStringIndexer.ts, 18, 20)) >Base : Symbol(Base, Decl(subtypingWithStringIndexer.ts, 0, 0)) [x: string]: Derived2; // ok @@ -80,7 +80,7 @@ module Generics { >B3 : Symbol(B3, Decl(subtypingWithStringIndexer.ts, 29, 5)) >T : Symbol(T, Decl(subtypingWithStringIndexer.ts, 31, 13)) >Base : Symbol(Base, Decl(subtypingWithStringIndexer.ts, 0, 0)) ->A : Symbol(A, Decl(subtypingWithStringIndexer.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithStringIndexer.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithStringIndexer.ts, 31, 13)) [x: string]: Derived; // error @@ -92,7 +92,7 @@ module Generics { >B4 : Symbol(B4, Decl(subtypingWithStringIndexer.ts, 33, 5)) >T : Symbol(T, Decl(subtypingWithStringIndexer.ts, 35, 13)) >Base : Symbol(Base, Decl(subtypingWithStringIndexer.ts, 0, 0)) ->A : Symbol(A, Decl(subtypingWithStringIndexer.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithStringIndexer.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithStringIndexer.ts, 35, 13)) [x: string]: Derived2; // error diff --git a/tests/baselines/reference/subtypingWithStringIndexer.types b/tests/baselines/reference/subtypingWithStringIndexer.types index 810d82e85f03a..cae8d6da4b132 100644 --- a/tests/baselines/reference/subtypingWithStringIndexer.types +++ b/tests/baselines/reference/subtypingWithStringIndexer.types @@ -46,7 +46,7 @@ class B2 extends A { > : ^^^^^^ } -module Generics { +namespace Generics { >Generics : typeof Generics > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/subtypingWithStringIndexer2.errors.txt b/tests/baselines/reference/subtypingWithStringIndexer2.errors.txt index 8a43b708b1946..ee8c004e3a521 100644 --- a/tests/baselines/reference/subtypingWithStringIndexer2.errors.txt +++ b/tests/baselines/reference/subtypingWithStringIndexer2.errors.txt @@ -41,7 +41,7 @@ subtypingWithStringIndexer2.ts(40,15): error TS2430: Interface 'B5' incorrect [x: string]: Derived2; // ok } - module Generics { + namespace Generics { interface A { [x: string]: T; } diff --git a/tests/baselines/reference/subtypingWithStringIndexer2.js b/tests/baselines/reference/subtypingWithStringIndexer2.js index da043797dc619..53abadf87af47 100644 --- a/tests/baselines/reference/subtypingWithStringIndexer2.js +++ b/tests/baselines/reference/subtypingWithStringIndexer2.js @@ -19,7 +19,7 @@ interface B2 extends A { [x: string]: Derived2; // ok } -module Generics { +namespace Generics { interface A { [x: string]: T; } diff --git a/tests/baselines/reference/subtypingWithStringIndexer2.symbols b/tests/baselines/reference/subtypingWithStringIndexer2.symbols index 65feb04ff5762..b87d9dfb95e15 100644 --- a/tests/baselines/reference/subtypingWithStringIndexer2.symbols +++ b/tests/baselines/reference/subtypingWithStringIndexer2.symbols @@ -43,11 +43,11 @@ interface B2 extends A { >Derived2 : Symbol(Derived2, Decl(subtypingWithStringIndexer2.ts, 3, 47)) } -module Generics { +namespace Generics { >Generics : Symbol(Generics, Decl(subtypingWithStringIndexer2.ts, 16, 1)) interface A { ->A : Symbol(A, Decl(subtypingWithStringIndexer2.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithStringIndexer2.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithStringIndexer2.ts, 19, 16)) >Derived : Symbol(Derived, Decl(subtypingWithStringIndexer2.ts, 2, 31)) @@ -58,7 +58,7 @@ module Generics { interface B extends A { >B : Symbol(B, Decl(subtypingWithStringIndexer2.ts, 21, 5)) ->A : Symbol(A, Decl(subtypingWithStringIndexer2.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithStringIndexer2.ts, 18, 20)) >Base : Symbol(Base, Decl(subtypingWithStringIndexer2.ts, 0, 0)) [x: string]: Derived; // error @@ -68,7 +68,7 @@ module Generics { interface B2 extends A { >B2 : Symbol(B2, Decl(subtypingWithStringIndexer2.ts, 25, 5)) ->A : Symbol(A, Decl(subtypingWithStringIndexer2.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithStringIndexer2.ts, 18, 20)) >Derived : Symbol(Derived, Decl(subtypingWithStringIndexer2.ts, 2, 31)) [x: string]: Derived2; // ok @@ -80,7 +80,7 @@ module Generics { >B3 : Symbol(B3, Decl(subtypingWithStringIndexer2.ts, 29, 5)) >T : Symbol(T, Decl(subtypingWithStringIndexer2.ts, 31, 17)) >Derived : Symbol(Derived, Decl(subtypingWithStringIndexer2.ts, 2, 31)) ->A : Symbol(A, Decl(subtypingWithStringIndexer2.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithStringIndexer2.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithStringIndexer2.ts, 31, 17)) [x: string]: Base; // error @@ -92,7 +92,7 @@ module Generics { >B4 : Symbol(B4, Decl(subtypingWithStringIndexer2.ts, 33, 5)) >T : Symbol(T, Decl(subtypingWithStringIndexer2.ts, 35, 17)) >Derived : Symbol(Derived, Decl(subtypingWithStringIndexer2.ts, 2, 31)) ->A : Symbol(A, Decl(subtypingWithStringIndexer2.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithStringIndexer2.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithStringIndexer2.ts, 35, 17)) [x: string]: Derived; // error @@ -104,7 +104,7 @@ module Generics { >B5 : Symbol(B5, Decl(subtypingWithStringIndexer2.ts, 37, 5)) >T : Symbol(T, Decl(subtypingWithStringIndexer2.ts, 39, 17)) >Derived2 : Symbol(Derived2, Decl(subtypingWithStringIndexer2.ts, 3, 47)) ->A : Symbol(A, Decl(subtypingWithStringIndexer2.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithStringIndexer2.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithStringIndexer2.ts, 39, 17)) [x: string]: Derived2; // error diff --git a/tests/baselines/reference/subtypingWithStringIndexer2.types b/tests/baselines/reference/subtypingWithStringIndexer2.types index f892eb9e6d2ec..e3f99915b61f6 100644 --- a/tests/baselines/reference/subtypingWithStringIndexer2.types +++ b/tests/baselines/reference/subtypingWithStringIndexer2.types @@ -33,7 +33,7 @@ interface B2 extends A { > : ^^^^^^ } -module Generics { +namespace Generics { interface A { [x: string]: T; >x : string diff --git a/tests/baselines/reference/subtypingWithStringIndexer3.errors.txt b/tests/baselines/reference/subtypingWithStringIndexer3.errors.txt index 2097ececc0589..0f7e4fc705eed 100644 --- a/tests/baselines/reference/subtypingWithStringIndexer3.errors.txt +++ b/tests/baselines/reference/subtypingWithStringIndexer3.errors.txt @@ -41,7 +41,7 @@ subtypingWithStringIndexer3.ts(40,11): error TS2415: Class 'B5' incorrectly e [x: string]: Derived2; // ok } - module Generics { + namespace Generics { class A { [x: string]: T; } diff --git a/tests/baselines/reference/subtypingWithStringIndexer3.js b/tests/baselines/reference/subtypingWithStringIndexer3.js index 3b263a61f73a4..63593ec84fe59 100644 --- a/tests/baselines/reference/subtypingWithStringIndexer3.js +++ b/tests/baselines/reference/subtypingWithStringIndexer3.js @@ -19,7 +19,7 @@ class B2 extends A { [x: string]: Derived2; // ok } -module Generics { +namespace Generics { class A { [x: string]: T; } diff --git a/tests/baselines/reference/subtypingWithStringIndexer3.symbols b/tests/baselines/reference/subtypingWithStringIndexer3.symbols index 981a3046fb41c..b4b8d6782b13f 100644 --- a/tests/baselines/reference/subtypingWithStringIndexer3.symbols +++ b/tests/baselines/reference/subtypingWithStringIndexer3.symbols @@ -43,11 +43,11 @@ class B2 extends A { >Derived2 : Symbol(Derived2, Decl(subtypingWithStringIndexer3.ts, 3, 47)) } -module Generics { +namespace Generics { >Generics : Symbol(Generics, Decl(subtypingWithStringIndexer3.ts, 16, 1)) class A { ->A : Symbol(A, Decl(subtypingWithStringIndexer3.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithStringIndexer3.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithStringIndexer3.ts, 19, 12)) >Derived : Symbol(Derived, Decl(subtypingWithStringIndexer3.ts, 2, 31)) @@ -58,7 +58,7 @@ module Generics { class B extends A { >B : Symbol(B, Decl(subtypingWithStringIndexer3.ts, 21, 5)) ->A : Symbol(A, Decl(subtypingWithStringIndexer3.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithStringIndexer3.ts, 18, 20)) >Base : Symbol(Base, Decl(subtypingWithStringIndexer3.ts, 0, 0)) [x: string]: Derived; // error @@ -68,7 +68,7 @@ module Generics { class B2 extends A { >B2 : Symbol(B2, Decl(subtypingWithStringIndexer3.ts, 25, 5)) ->A : Symbol(A, Decl(subtypingWithStringIndexer3.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithStringIndexer3.ts, 18, 20)) >Derived : Symbol(Derived, Decl(subtypingWithStringIndexer3.ts, 2, 31)) [x: string]: Derived2; // ok @@ -80,7 +80,7 @@ module Generics { >B3 : Symbol(B3, Decl(subtypingWithStringIndexer3.ts, 29, 5)) >T : Symbol(T, Decl(subtypingWithStringIndexer3.ts, 31, 13)) >Derived : Symbol(Derived, Decl(subtypingWithStringIndexer3.ts, 2, 31)) ->A : Symbol(A, Decl(subtypingWithStringIndexer3.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithStringIndexer3.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithStringIndexer3.ts, 31, 13)) [x: string]: Base; // error @@ -92,7 +92,7 @@ module Generics { >B4 : Symbol(B4, Decl(subtypingWithStringIndexer3.ts, 33, 5)) >T : Symbol(T, Decl(subtypingWithStringIndexer3.ts, 35, 13)) >Derived : Symbol(Derived, Decl(subtypingWithStringIndexer3.ts, 2, 31)) ->A : Symbol(A, Decl(subtypingWithStringIndexer3.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithStringIndexer3.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithStringIndexer3.ts, 35, 13)) [x: string]: Derived; // error @@ -104,7 +104,7 @@ module Generics { >B5 : Symbol(B5, Decl(subtypingWithStringIndexer3.ts, 37, 5)) >T : Symbol(T, Decl(subtypingWithStringIndexer3.ts, 39, 13)) >Derived2 : Symbol(Derived2, Decl(subtypingWithStringIndexer3.ts, 3, 47)) ->A : Symbol(A, Decl(subtypingWithStringIndexer3.ts, 18, 17)) +>A : Symbol(A, Decl(subtypingWithStringIndexer3.ts, 18, 20)) >T : Symbol(T, Decl(subtypingWithStringIndexer3.ts, 39, 13)) [x: string]: Derived2; // error diff --git a/tests/baselines/reference/subtypingWithStringIndexer3.types b/tests/baselines/reference/subtypingWithStringIndexer3.types index 2ba6d1e26d34b..984ddbd1db6cb 100644 --- a/tests/baselines/reference/subtypingWithStringIndexer3.types +++ b/tests/baselines/reference/subtypingWithStringIndexer3.types @@ -46,7 +46,7 @@ class B2 extends A { > : ^^^^^^ } -module Generics { +namespace Generics { >Generics : typeof Generics > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/subtypingWithStringIndexer4.errors.txt b/tests/baselines/reference/subtypingWithStringIndexer4.errors.txt index c339de71ce60a..626d377646893 100644 --- a/tests/baselines/reference/subtypingWithStringIndexer4.errors.txt +++ b/tests/baselines/reference/subtypingWithStringIndexer4.errors.txt @@ -31,7 +31,7 @@ subtypingWithStringIndexer4.ts(24,11): error TS2415: Class 'B3' incorrectly e [x: string]: string; // error } - module Generics { + namespace Generics { class A { [x: string]: T; } diff --git a/tests/baselines/reference/subtypingWithStringIndexer4.js b/tests/baselines/reference/subtypingWithStringIndexer4.js index d3d7f866b409c..dd44c6e810872 100644 --- a/tests/baselines/reference/subtypingWithStringIndexer4.js +++ b/tests/baselines/reference/subtypingWithStringIndexer4.js @@ -15,7 +15,7 @@ class B extends A { [x: string]: string; // error } -module Generics { +namespace Generics { class A { [x: string]: T; } diff --git a/tests/baselines/reference/subtypingWithStringIndexer4.symbols b/tests/baselines/reference/subtypingWithStringIndexer4.symbols index 0073af6c8ac2d..048180d1c3490 100644 --- a/tests/baselines/reference/subtypingWithStringIndexer4.symbols +++ b/tests/baselines/reference/subtypingWithStringIndexer4.symbols @@ -33,11 +33,11 @@ class B extends A { >x : Symbol(x, Decl(subtypingWithStringIndexer4.ts, 11, 5)) } -module Generics { +namespace Generics { >Generics : Symbol(Generics, Decl(subtypingWithStringIndexer4.ts, 12, 1)) class A { ->A : Symbol(A, Decl(subtypingWithStringIndexer4.ts, 14, 17)) +>A : Symbol(A, Decl(subtypingWithStringIndexer4.ts, 14, 20)) >T : Symbol(T, Decl(subtypingWithStringIndexer4.ts, 15, 12)) >Derived : Symbol(Derived, Decl(subtypingWithStringIndexer4.ts, 2, 31)) @@ -48,7 +48,7 @@ module Generics { class B extends A { >B : Symbol(B, Decl(subtypingWithStringIndexer4.ts, 17, 5)) ->A : Symbol(A, Decl(subtypingWithStringIndexer4.ts, 14, 17)) +>A : Symbol(A, Decl(subtypingWithStringIndexer4.ts, 14, 20)) >Base : Symbol(Base, Decl(subtypingWithStringIndexer4.ts, 0, 0)) [x: string]: string; // error @@ -59,7 +59,7 @@ module Generics { >B3 : Symbol(B3, Decl(subtypingWithStringIndexer4.ts, 21, 5)) >T : Symbol(T, Decl(subtypingWithStringIndexer4.ts, 23, 13)) >Derived : Symbol(Derived, Decl(subtypingWithStringIndexer4.ts, 2, 31)) ->A : Symbol(A, Decl(subtypingWithStringIndexer4.ts, 14, 17)) +>A : Symbol(A, Decl(subtypingWithStringIndexer4.ts, 14, 20)) >T : Symbol(T, Decl(subtypingWithStringIndexer4.ts, 23, 13)) [x: string]: string; // error diff --git a/tests/baselines/reference/subtypingWithStringIndexer4.types b/tests/baselines/reference/subtypingWithStringIndexer4.types index 46e30f152c0dd..9ab25d1a12871 100644 --- a/tests/baselines/reference/subtypingWithStringIndexer4.types +++ b/tests/baselines/reference/subtypingWithStringIndexer4.types @@ -35,7 +35,7 @@ class B extends A { > : ^^^^^^ } -module Generics { +namespace Generics { >Generics : typeof Generics > : ^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/super1.errors.txt b/tests/baselines/reference/super1.errors.txt index 02dea57041526..2ba9eecff8f15 100644 --- a/tests/baselines/reference/super1.errors.txt +++ b/tests/baselines/reference/super1.errors.txt @@ -57,7 +57,7 @@ super1.ts(62,20): error TS2335: 'super' can only be referenced in a derived clas } // Case 4 - module Base4 { + namespace Base4 { class Sub4 { public x(){ return "hello"; diff --git a/tests/baselines/reference/super1.js b/tests/baselines/reference/super1.js index 2c956d6eaec52..daeff89485180 100644 --- a/tests/baselines/reference/super1.js +++ b/tests/baselines/reference/super1.js @@ -47,7 +47,7 @@ class SubE3 extends Base3 { } // Case 4 -module Base4 { +namespace Base4 { class Sub4 { public x(){ return "hello"; diff --git a/tests/baselines/reference/super1.symbols b/tests/baselines/reference/super1.symbols index 16b55404f5db5..91d0da565ca5f 100644 --- a/tests/baselines/reference/super1.symbols +++ b/tests/baselines/reference/super1.symbols @@ -82,11 +82,11 @@ class SubE3 extends Base3 { } // Case 4 -module Base4 { +namespace Base4 { >Base4 : Symbol(Base4, Decl(super1.ts, 43, 1)) class Sub4 { ->Sub4 : Symbol(Sub4, Decl(super1.ts, 46, 14)) +>Sub4 : Symbol(Sub4, Decl(super1.ts, 46, 17)) public x(){ >x : Symbol(Sub4.x, Decl(super1.ts, 47, 16)) @@ -97,14 +97,14 @@ module Base4 { export class SubSub4 extends Sub4{ >SubSub4 : Symbol(SubSub4, Decl(super1.ts, 51, 5)) ->Sub4 : Symbol(Sub4, Decl(super1.ts, 46, 14)) +>Sub4 : Symbol(Sub4, Decl(super1.ts, 46, 17)) public x(){ >x : Symbol(SubSub4.x, Decl(super1.ts, 53, 38)) return super.x(); >super.x : Symbol(Sub4.x, Decl(super1.ts, 47, 16)) ->super : Symbol(Sub4, Decl(super1.ts, 46, 14)) +>super : Symbol(Sub4, Decl(super1.ts, 46, 17)) >x : Symbol(Sub4.x, Decl(super1.ts, 47, 16)) } } diff --git a/tests/baselines/reference/super1.types b/tests/baselines/reference/super1.types index cbf4216e5f1d0..cf8fbf0b0cfeb 100644 --- a/tests/baselines/reference/super1.types +++ b/tests/baselines/reference/super1.types @@ -135,7 +135,7 @@ class SubE3 extends Base3 { } // Case 4 -module Base4 { +namespace Base4 { >Base4 : typeof Base4 > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/superAccessInFatArrow1.js b/tests/baselines/reference/superAccessInFatArrow1.js index 59c1f3d6d54b7..168340e4d5b20 100644 --- a/tests/baselines/reference/superAccessInFatArrow1.js +++ b/tests/baselines/reference/superAccessInFatArrow1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/superAccessInFatArrow1.ts] //// //// [superAccessInFatArrow1.ts] -module test { +namespace test { export class A { foo() { } diff --git a/tests/baselines/reference/superAccessInFatArrow1.symbols b/tests/baselines/reference/superAccessInFatArrow1.symbols index 1b5b8dfa89093..3535e0aa5d3a6 100644 --- a/tests/baselines/reference/superAccessInFatArrow1.symbols +++ b/tests/baselines/reference/superAccessInFatArrow1.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/superAccessInFatArrow1.ts] //// === superAccessInFatArrow1.ts === -module test { +namespace test { >test : Symbol(test, Decl(superAccessInFatArrow1.ts, 0, 0)) export class A { ->A : Symbol(A, Decl(superAccessInFatArrow1.ts, 0, 13)) +>A : Symbol(A, Decl(superAccessInFatArrow1.ts, 0, 16)) foo() { >foo : Symbol(A.foo, Decl(superAccessInFatArrow1.ts, 1, 20)) @@ -13,7 +13,7 @@ module test { } export class B extends A { >B : Symbol(B, Decl(superAccessInFatArrow1.ts, 4, 5)) ->A : Symbol(A, Decl(superAccessInFatArrow1.ts, 0, 13)) +>A : Symbol(A, Decl(superAccessInFatArrow1.ts, 0, 16)) bar(callback: () => void ) { >bar : Symbol(B.bar, Decl(superAccessInFatArrow1.ts, 5, 30)) @@ -29,7 +29,7 @@ module test { super.foo(); >super.foo : Symbol(A.foo, Decl(superAccessInFatArrow1.ts, 1, 20)) ->super : Symbol(A, Decl(superAccessInFatArrow1.ts, 0, 13)) +>super : Symbol(A, Decl(superAccessInFatArrow1.ts, 0, 16)) >foo : Symbol(A.foo, Decl(superAccessInFatArrow1.ts, 1, 20)) }); diff --git a/tests/baselines/reference/superAccessInFatArrow1.types b/tests/baselines/reference/superAccessInFatArrow1.types index 1d27b3d458c30..023b712225d7b 100644 --- a/tests/baselines/reference/superAccessInFatArrow1.types +++ b/tests/baselines/reference/superAccessInFatArrow1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/superAccessInFatArrow1.ts] //// === superAccessInFatArrow1.ts === -module test { +namespace test { >test : typeof test > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.errors.txt b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.errors.txt index d6c019a7ee097..23db062a06ad5 100644 --- a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.errors.txt +++ b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.errors.txt @@ -5,7 +5,7 @@ super_inside-object-literal-getters-and-setters.ts(21,24): error TS2659: 'super' ==== super_inside-object-literal-getters-and-setters.ts (4 errors) ==== - module ObjectLiteral { + namespace ObjectLiteral { var ThisInObjectLiteral = { _foo: '1', get foo(): string { diff --git a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.js b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.js index e6f82be7916b1..97d8818bd214b 100644 --- a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.js +++ b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts] //// //// [super_inside-object-literal-getters-and-setters.ts] -module ObjectLiteral { +namespace ObjectLiteral { var ThisInObjectLiteral = { _foo: '1', get foo(): string { diff --git a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.symbols b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.symbols index 1b00c69a858ee..68885b83f081a 100644 --- a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.symbols +++ b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts] //// === super_inside-object-literal-getters-and-setters.ts === -module ObjectLiteral { +namespace ObjectLiteral { >ObjectLiteral : Symbol(ObjectLiteral, Decl(super_inside-object-literal-getters-and-setters.ts, 0, 0)) var ThisInObjectLiteral = { diff --git a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.types b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.types index acff347d34d19..d502e8948dae8 100644 --- a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.types +++ b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts] //// === super_inside-object-literal-getters-and-setters.ts === -module ObjectLiteral { +namespace ObjectLiteral { >ObjectLiteral : typeof ObjectLiteral > : ^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/switchStatements.errors.txt b/tests/baselines/reference/switchStatements.errors.txt index 5ffcf502b7baf..6bb5c81d77698 100644 --- a/tests/baselines/reference/switchStatements.errors.txt +++ b/tests/baselines/reference/switchStatements.errors.txt @@ -2,7 +2,7 @@ switchStatements.ts(35,20): error TS2353: Object literal may only specify known ==== switchStatements.ts (1 errors) ==== - module M { + namespace M { export function fn(x: number) { return ''; } diff --git a/tests/baselines/reference/switchStatements.js b/tests/baselines/reference/switchStatements.js index 1d05064747e04..ed6199269875c 100644 --- a/tests/baselines/reference/switchStatements.js +++ b/tests/baselines/reference/switchStatements.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/statements/switchStatements/switchStatements.ts] //// //// [switchStatements.ts] -module M { +namespace M { export function fn(x: number) { return ''; } diff --git a/tests/baselines/reference/switchStatements.symbols b/tests/baselines/reference/switchStatements.symbols index 88db4fabd74dd..cda381f4ed641 100644 --- a/tests/baselines/reference/switchStatements.symbols +++ b/tests/baselines/reference/switchStatements.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/statements/switchStatements/switchStatements.ts] //// === switchStatements.ts === -module M { +namespace M { >M : Symbol(M, Decl(switchStatements.ts, 0, 0)) export function fn(x: number) { ->fn : Symbol(fn, Decl(switchStatements.ts, 0, 10)) +>fn : Symbol(fn, Decl(switchStatements.ts, 0, 13)) >x : Symbol(x, Decl(switchStatements.ts, 1, 23)) return ''; @@ -45,9 +45,9 @@ switch (x) { >M : Symbol(M, Decl(switchStatements.ts, 0, 0)) case M.fn(1): ->M.fn : Symbol(M.fn, Decl(switchStatements.ts, 0, 10)) +>M.fn : Symbol(M.fn, Decl(switchStatements.ts, 0, 13)) >M : Symbol(M, Decl(switchStatements.ts, 0, 0)) ->fn : Symbol(M.fn, Decl(switchStatements.ts, 0, 10)) +>fn : Symbol(M.fn, Decl(switchStatements.ts, 0, 13)) case (x: number) => '': >T : Symbol(T, Decl(switchStatements.ts, 23, 10)) diff --git a/tests/baselines/reference/switchStatements.types b/tests/baselines/reference/switchStatements.types index b1ccea30718a0..e58c7cdc67cd8 100644 --- a/tests/baselines/reference/switchStatements.types +++ b/tests/baselines/reference/switchStatements.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/statements/switchStatements/switchStatements.ts] //// === switchStatements.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/symbolDeclarationEmit12.errors.txt b/tests/baselines/reference/symbolDeclarationEmit12.errors.txt index d9c0e5a618b23..e410108444916 100644 --- a/tests/baselines/reference/symbolDeclarationEmit12.errors.txt +++ b/tests/baselines/reference/symbolDeclarationEmit12.errors.txt @@ -3,7 +3,7 @@ symbolDeclarationEmit12.ts(10,13): error TS2300: Duplicate identifier '[Symbol.t ==== symbolDeclarationEmit12.ts (2 errors) ==== - module M { + namespace M { interface I { } export class C { [Symbol.iterator]: I; diff --git a/tests/baselines/reference/symbolDeclarationEmit12.js b/tests/baselines/reference/symbolDeclarationEmit12.js index f662f526f774e..d97e1309b5e39 100644 --- a/tests/baselines/reference/symbolDeclarationEmit12.js +++ b/tests/baselines/reference/symbolDeclarationEmit12.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts] //// //// [symbolDeclarationEmit12.ts] -module M { +namespace M { interface I { } export class C { [Symbol.iterator]: I; diff --git a/tests/baselines/reference/symbolDeclarationEmit12.symbols b/tests/baselines/reference/symbolDeclarationEmit12.symbols index 77ce81066de9a..5172fb2a4de91 100644 --- a/tests/baselines/reference/symbolDeclarationEmit12.symbols +++ b/tests/baselines/reference/symbolDeclarationEmit12.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts] //// === symbolDeclarationEmit12.ts === -module M { +namespace M { >M : Symbol(M, Decl(symbolDeclarationEmit12.ts, 0, 0)) interface I { } ->I : Symbol(I, Decl(symbolDeclarationEmit12.ts, 0, 10)) +>I : Symbol(I, Decl(symbolDeclarationEmit12.ts, 0, 13)) export class C { >C : Symbol(C, Decl(symbolDeclarationEmit12.ts, 1, 19)) @@ -15,7 +15,7 @@ module M { >Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.iterable.d.ts, --, --)) >Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) >iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.iterable.d.ts, --, --)) ->I : Symbol(I, Decl(symbolDeclarationEmit12.ts, 0, 10)) +>I : Symbol(I, Decl(symbolDeclarationEmit12.ts, 0, 13)) [Symbol.toPrimitive](x: I) { } >[Symbol.toPrimitive] : Symbol(C[Symbol.toPrimitive], Decl(symbolDeclarationEmit12.ts, 3, 29), Decl(symbolDeclarationEmit12.ts, 7, 9), Decl(symbolDeclarationEmit12.ts, 8, 56)) @@ -23,14 +23,14 @@ module M { >Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) >toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) >x : Symbol(x, Decl(symbolDeclarationEmit12.ts, 4, 29)) ->I : Symbol(I, Decl(symbolDeclarationEmit12.ts, 0, 10)) +>I : Symbol(I, Decl(symbolDeclarationEmit12.ts, 0, 13)) [Symbol.isConcatSpreadable](): I { >[Symbol.isConcatSpreadable] : Symbol(C[Symbol.isConcatSpreadable], Decl(symbolDeclarationEmit12.ts, 4, 38)) >Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) >Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) >isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) ->I : Symbol(I, Decl(symbolDeclarationEmit12.ts, 0, 10)) +>I : Symbol(I, Decl(symbolDeclarationEmit12.ts, 0, 13)) return undefined >undefined : Symbol(undefined) @@ -48,6 +48,6 @@ module M { >Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) >toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --)) >x : Symbol(x, Decl(symbolDeclarationEmit12.ts, 9, 33)) ->I : Symbol(I, Decl(symbolDeclarationEmit12.ts, 0, 10)) +>I : Symbol(I, Decl(symbolDeclarationEmit12.ts, 0, 13)) } } diff --git a/tests/baselines/reference/symbolDeclarationEmit12.types b/tests/baselines/reference/symbolDeclarationEmit12.types index f3391d9c22002..bd3ab173e5cdf 100644 --- a/tests/baselines/reference/symbolDeclarationEmit12.types +++ b/tests/baselines/reference/symbolDeclarationEmit12.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts] //// === symbolDeclarationEmit12.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/symbolProperty48.js b/tests/baselines/reference/symbolProperty48.js index 1f83c6f3bf7dc..c2bc78d7a798a 100644 --- a/tests/baselines/reference/symbolProperty48.js +++ b/tests/baselines/reference/symbolProperty48.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/Symbols/symbolProperty48.ts] //// //// [symbolProperty48.ts] -module M { +namespace M { var Symbol; class C { diff --git a/tests/baselines/reference/symbolProperty48.symbols b/tests/baselines/reference/symbolProperty48.symbols index 100b97a913f5e..d12702d7a146a 100644 --- a/tests/baselines/reference/symbolProperty48.symbols +++ b/tests/baselines/reference/symbolProperty48.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/Symbols/symbolProperty48.ts] //// === symbolProperty48.ts === -module M { +namespace M { >M : Symbol(M, Decl(symbolProperty48.ts, 0, 0)) var Symbol; diff --git a/tests/baselines/reference/symbolProperty48.types b/tests/baselines/reference/symbolProperty48.types index f13741a2c4b95..3676d4ad0a75a 100644 --- a/tests/baselines/reference/symbolProperty48.types +++ b/tests/baselines/reference/symbolProperty48.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/Symbols/symbolProperty48.ts] //// === symbolProperty48.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/symbolProperty49.js b/tests/baselines/reference/symbolProperty49.js index a559b2342b2d6..1ac0b1c5f2d66 100644 --- a/tests/baselines/reference/symbolProperty49.js +++ b/tests/baselines/reference/symbolProperty49.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/Symbols/symbolProperty49.ts] //// //// [symbolProperty49.ts] -module M { +namespace M { export var Symbol; class C { diff --git a/tests/baselines/reference/symbolProperty49.symbols b/tests/baselines/reference/symbolProperty49.symbols index b70412f9bec39..5c3a61de8d893 100644 --- a/tests/baselines/reference/symbolProperty49.symbols +++ b/tests/baselines/reference/symbolProperty49.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/Symbols/symbolProperty49.ts] //// === symbolProperty49.ts === -module M { +namespace M { >M : Symbol(M, Decl(symbolProperty49.ts, 0, 0)) export var Symbol; diff --git a/tests/baselines/reference/symbolProperty49.types b/tests/baselines/reference/symbolProperty49.types index 24f6b96bfaacc..d59e6e318f2c2 100644 --- a/tests/baselines/reference/symbolProperty49.types +++ b/tests/baselines/reference/symbolProperty49.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/Symbols/symbolProperty49.ts] //// === symbolProperty49.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/symbolProperty50.js b/tests/baselines/reference/symbolProperty50.js index 10cbbdb0ffeb0..e3db0bbaf812d 100644 --- a/tests/baselines/reference/symbolProperty50.js +++ b/tests/baselines/reference/symbolProperty50.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/Symbols/symbolProperty50.ts] //// //// [symbolProperty50.ts] -module M { +namespace M { interface Symbol { } class C { diff --git a/tests/baselines/reference/symbolProperty50.symbols b/tests/baselines/reference/symbolProperty50.symbols index 1786985638c01..aa5eef0a05fbe 100644 --- a/tests/baselines/reference/symbolProperty50.symbols +++ b/tests/baselines/reference/symbolProperty50.symbols @@ -1,11 +1,11 @@ //// [tests/cases/conformance/es6/Symbols/symbolProperty50.ts] //// === symbolProperty50.ts === -module M { +namespace M { >M : Symbol(M, Decl(symbolProperty50.ts, 0, 0)) interface Symbol { } ->Symbol : Symbol(Symbol, Decl(symbolProperty50.ts, 0, 10)) +>Symbol : Symbol(Symbol, Decl(symbolProperty50.ts, 0, 13)) class C { >C : Symbol(C, Decl(symbolProperty50.ts, 1, 24)) diff --git a/tests/baselines/reference/symbolProperty50.types b/tests/baselines/reference/symbolProperty50.types index 0994923d271d0..e6bce29cab210 100644 --- a/tests/baselines/reference/symbolProperty50.types +++ b/tests/baselines/reference/symbolProperty50.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/es6/Symbols/symbolProperty50.ts] //// === symbolProperty50.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/symbolProperty51.js b/tests/baselines/reference/symbolProperty51.js index 864746824631c..23f57a64b2e52 100644 --- a/tests/baselines/reference/symbolProperty51.js +++ b/tests/baselines/reference/symbolProperty51.js @@ -1,8 +1,8 @@ //// [tests/cases/conformance/es6/Symbols/symbolProperty51.ts] //// //// [symbolProperty51.ts] -module M { - module Symbol { } +namespace M { + namespace Symbol { } class C { [Symbol.iterator]() { } diff --git a/tests/baselines/reference/symbolProperty51.symbols b/tests/baselines/reference/symbolProperty51.symbols index d4ae8c3e16ca3..ffc7f9582266c 100644 --- a/tests/baselines/reference/symbolProperty51.symbols +++ b/tests/baselines/reference/symbolProperty51.symbols @@ -1,14 +1,14 @@ //// [tests/cases/conformance/es6/Symbols/symbolProperty51.ts] //// === symbolProperty51.ts === -module M { +namespace M { >M : Symbol(M, Decl(symbolProperty51.ts, 0, 0)) - module Symbol { } ->Symbol : Symbol(Symbol, Decl(symbolProperty51.ts, 0, 10)) + namespace Symbol { } +>Symbol : Symbol(Symbol, Decl(symbolProperty51.ts, 0, 13)) class C { ->C : Symbol(C, Decl(symbolProperty51.ts, 1, 21)) +>C : Symbol(C, Decl(symbolProperty51.ts, 1, 24)) [Symbol.iterator]() { } >[Symbol.iterator] : Symbol(C[Symbol.iterator], Decl(symbolProperty51.ts, 3, 13)) diff --git a/tests/baselines/reference/symbolProperty51.types b/tests/baselines/reference/symbolProperty51.types index 68a56fdad8578..81cb7685d77a2 100644 --- a/tests/baselines/reference/symbolProperty51.types +++ b/tests/baselines/reference/symbolProperty51.types @@ -1,11 +1,11 @@ //// [tests/cases/conformance/es6/Symbols/symbolProperty51.ts] //// === symbolProperty51.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ - module Symbol { } + namespace Symbol { } class C { >C : C diff --git a/tests/baselines/reference/symbolProperty55.js b/tests/baselines/reference/symbolProperty55.js index 0e13953bf05b7..592183e89dd65 100644 --- a/tests/baselines/reference/symbolProperty55.js +++ b/tests/baselines/reference/symbolProperty55.js @@ -5,7 +5,7 @@ var obj = { [Symbol.iterator]: 0 }; -module M { +namespace M { var Symbol: SymbolConstructor; // The following should be of type 'any'. This is because even though obj has a property keyed by Symbol.iterator, // the key passed in here is the *wrong* Symbol.iterator. It is not the iterator property of the global Symbol. diff --git a/tests/baselines/reference/symbolProperty55.symbols b/tests/baselines/reference/symbolProperty55.symbols index 566570a2060bb..4420f7f89a0a6 100644 --- a/tests/baselines/reference/symbolProperty55.symbols +++ b/tests/baselines/reference/symbolProperty55.symbols @@ -12,7 +12,7 @@ var obj = { }; -module M { +namespace M { >M : Symbol(M, Decl(symbolProperty55.ts, 2, 2)) var Symbol: SymbolConstructor; diff --git a/tests/baselines/reference/symbolProperty55.types b/tests/baselines/reference/symbolProperty55.types index bb16cd28ba8b5..649cd93eb8c6e 100644 --- a/tests/baselines/reference/symbolProperty55.types +++ b/tests/baselines/reference/symbolProperty55.types @@ -21,7 +21,7 @@ var obj = { }; -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/symbolProperty56.js b/tests/baselines/reference/symbolProperty56.js index 13c67c07efd7d..be5677ddba71d 100644 --- a/tests/baselines/reference/symbolProperty56.js +++ b/tests/baselines/reference/symbolProperty56.js @@ -5,7 +5,7 @@ var obj = { [Symbol.iterator]: 0 }; -module M { +namespace M { var Symbol: {}; // The following should be of type 'any'. This is because even though obj has a property keyed by Symbol.iterator, // the key passed in here is the *wrong* Symbol.iterator. It is not the iterator property of the global Symbol. diff --git a/tests/baselines/reference/symbolProperty56.symbols b/tests/baselines/reference/symbolProperty56.symbols index 6a8fca35eeb41..684d78c375fbd 100644 --- a/tests/baselines/reference/symbolProperty56.symbols +++ b/tests/baselines/reference/symbolProperty56.symbols @@ -12,7 +12,7 @@ var obj = { }; -module M { +namespace M { >M : Symbol(M, Decl(symbolProperty56.ts, 2, 2)) var Symbol: {}; diff --git a/tests/baselines/reference/symbolProperty56.types b/tests/baselines/reference/symbolProperty56.types index 45b764021ad4f..35723176e7897 100644 --- a/tests/baselines/reference/symbolProperty56.types +++ b/tests/baselines/reference/symbolProperty56.types @@ -21,7 +21,7 @@ var obj = { }; -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/systemDefaultImportCallable.js b/tests/baselines/reference/systemDefaultImportCallable.js index c96fcb6b2e478..1c160690be5af 100644 --- a/tests/baselines/reference/systemDefaultImportCallable.js +++ b/tests/baselines/reference/systemDefaultImportCallable.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/systemDefaultImportCallable.ts] //// //// [core-js.d.ts] -declare module core { +declare namespace core { var String: { repeat(text: string, count: number): string; }; diff --git a/tests/baselines/reference/systemDefaultImportCallable.symbols b/tests/baselines/reference/systemDefaultImportCallable.symbols index 507d188784790..7e7be271277d8 100644 --- a/tests/baselines/reference/systemDefaultImportCallable.symbols +++ b/tests/baselines/reference/systemDefaultImportCallable.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/systemDefaultImportCallable.ts] //// === core-js.d.ts === -declare module core { +declare namespace core { >core : Symbol(core, Decl(core-js.d.ts, 0, 0)) var String: { diff --git a/tests/baselines/reference/systemDefaultImportCallable.types b/tests/baselines/reference/systemDefaultImportCallable.types index 6763081fed58c..497412d2af6df 100644 --- a/tests/baselines/reference/systemDefaultImportCallable.types +++ b/tests/baselines/reference/systemDefaultImportCallable.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/systemDefaultImportCallable.ts] //// === core-js.d.ts === -declare module core { +declare namespace core { >core : typeof core > : ^^^^^^^^^^^ diff --git a/tests/baselines/reference/systemModule7.js b/tests/baselines/reference/systemModule7.js index 726bafd757819..79f0905821e98 100644 --- a/tests/baselines/reference/systemModule7.js +++ b/tests/baselines/reference/systemModule7.js @@ -2,12 +2,12 @@ //// [systemModule7.ts] // filename: instantiatedModule.ts -export module M { +export namespace M { var x = 1; } // filename: nonInstantiatedModule.ts -export module M { +export namespace M { interface I {} } diff --git a/tests/baselines/reference/systemModule7.symbols b/tests/baselines/reference/systemModule7.symbols index bca8d5f2c3807..180ed28281bfa 100644 --- a/tests/baselines/reference/systemModule7.symbols +++ b/tests/baselines/reference/systemModule7.symbols @@ -2,7 +2,7 @@ === systemModule7.ts === // filename: instantiatedModule.ts -export module M { +export namespace M { >M : Symbol(M, Decl(systemModule7.ts, 0, 0), Decl(systemModule7.ts, 3, 1)) var x = 1; @@ -10,9 +10,9 @@ export module M { } // filename: nonInstantiatedModule.ts -export module M { +export namespace M { >M : Symbol(M, Decl(systemModule7.ts, 0, 0), Decl(systemModule7.ts, 3, 1)) interface I {} ->I : Symbol(I, Decl(systemModule7.ts, 6, 17)) +>I : Symbol(I, Decl(systemModule7.ts, 6, 20)) } diff --git a/tests/baselines/reference/systemModule7.types b/tests/baselines/reference/systemModule7.types index 3d7d32cc790f4..986e1b854c7c4 100644 --- a/tests/baselines/reference/systemModule7.types +++ b/tests/baselines/reference/systemModule7.types @@ -2,7 +2,7 @@ === systemModule7.ts === // filename: instantiatedModule.ts -export module M { +export namespace M { >M : typeof M > : ^^^^^^^^ @@ -14,6 +14,6 @@ export module M { } // filename: nonInstantiatedModule.ts -export module M { +export namespace M { interface I {} } diff --git a/tests/baselines/reference/systemModuleAmbientDeclarations.js b/tests/baselines/reference/systemModuleAmbientDeclarations.js index b53ae9cc2d40a..1beec104f47b1 100644 --- a/tests/baselines/reference/systemModuleAmbientDeclarations.js +++ b/tests/baselines/reference/systemModuleAmbientDeclarations.js @@ -24,7 +24,7 @@ export declare var v: number; export declare enum E {X = 1} //// [file6.ts] -export declare module M { var v: number; } +export declare namespace M { var v: number; } //// [file1.js] diff --git a/tests/baselines/reference/systemModuleAmbientDeclarations.symbols b/tests/baselines/reference/systemModuleAmbientDeclarations.symbols index b8b6f24a5ad72..c58e7e0e2e0ca 100644 --- a/tests/baselines/reference/systemModuleAmbientDeclarations.symbols +++ b/tests/baselines/reference/systemModuleAmbientDeclarations.symbols @@ -48,7 +48,7 @@ export declare enum E {X = 1} >X : Symbol(E.X, Decl(file5.ts, 0, 23)) === file6.ts === -export declare module M { var v: number; } +export declare namespace M { var v: number; } >M : Symbol(M, Decl(file6.ts, 0, 0)) ->v : Symbol(v, Decl(file6.ts, 0, 29)) +>v : Symbol(v, Decl(file6.ts, 0, 32)) diff --git a/tests/baselines/reference/systemModuleAmbientDeclarations.types b/tests/baselines/reference/systemModuleAmbientDeclarations.types index 80b231422f69b..3f09cdb802a61 100644 --- a/tests/baselines/reference/systemModuleAmbientDeclarations.types +++ b/tests/baselines/reference/systemModuleAmbientDeclarations.types @@ -70,7 +70,7 @@ export declare enum E {X = 1} > : ^ === file6.ts === -export declare module M { var v: number; } +export declare namespace M { var v: number; } >M : typeof M > : ^^^^^^^^ >v : number diff --git a/tests/baselines/reference/systemModuleConstEnums.js b/tests/baselines/reference/systemModuleConstEnums.js index a6fdf23e3d89c..5955cb6a6d048 100644 --- a/tests/baselines/reference/systemModuleConstEnums.js +++ b/tests/baselines/reference/systemModuleConstEnums.js @@ -9,7 +9,7 @@ export function foo() { use(M.NonTopLevelConstEnum.X); } -module M { +namespace M { export const enum NonTopLevelConstEnum { X } } diff --git a/tests/baselines/reference/systemModuleConstEnums.symbols b/tests/baselines/reference/systemModuleConstEnums.symbols index a5fd21a538ddc..7a3209d84ef21 100644 --- a/tests/baselines/reference/systemModuleConstEnums.symbols +++ b/tests/baselines/reference/systemModuleConstEnums.symbols @@ -21,16 +21,16 @@ export function foo() { use(M.NonTopLevelConstEnum.X); >use : Symbol(use, Decl(systemModuleConstEnums.ts, 0, 0)) >M.NonTopLevelConstEnum.X : Symbol(M.NonTopLevelConstEnum.X, Decl(systemModuleConstEnums.ts, 9, 44)) ->M.NonTopLevelConstEnum : Symbol(M.NonTopLevelConstEnum, Decl(systemModuleConstEnums.ts, 8, 10)) +>M.NonTopLevelConstEnum : Symbol(M.NonTopLevelConstEnum, Decl(systemModuleConstEnums.ts, 8, 13)) >M : Symbol(M, Decl(systemModuleConstEnums.ts, 6, 1)) ->NonTopLevelConstEnum : Symbol(M.NonTopLevelConstEnum, Decl(systemModuleConstEnums.ts, 8, 10)) +>NonTopLevelConstEnum : Symbol(M.NonTopLevelConstEnum, Decl(systemModuleConstEnums.ts, 8, 13)) >X : Symbol(M.NonTopLevelConstEnum.X, Decl(systemModuleConstEnums.ts, 9, 44)) } -module M { +namespace M { >M : Symbol(M, Decl(systemModuleConstEnums.ts, 6, 1)) export const enum NonTopLevelConstEnum { X } ->NonTopLevelConstEnum : Symbol(NonTopLevelConstEnum, Decl(systemModuleConstEnums.ts, 8, 10)) +>NonTopLevelConstEnum : Symbol(NonTopLevelConstEnum, Decl(systemModuleConstEnums.ts, 8, 13)) >X : Symbol(NonTopLevelConstEnum.X, Decl(systemModuleConstEnums.ts, 9, 44)) } diff --git a/tests/baselines/reference/systemModuleConstEnums.types b/tests/baselines/reference/systemModuleConstEnums.types index 56d1f19b1e2de..c4bfff3998660 100644 --- a/tests/baselines/reference/systemModuleConstEnums.types +++ b/tests/baselines/reference/systemModuleConstEnums.types @@ -43,7 +43,7 @@ export function foo() { > : ^^^^^^^^^^^^^^^^^^^^^^ } -module M { +namespace M { export const enum NonTopLevelConstEnum { X } >NonTopLevelConstEnum : NonTopLevelConstEnum > : ^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.js b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.js index 72f6a30bb4a3b..604c1d72fb195 100644 --- a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.js +++ b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.js @@ -9,7 +9,7 @@ export function foo() { use(M.NonTopLevelConstEnum.X); } -module M { +namespace M { export const enum NonTopLevelConstEnum { X } } diff --git a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.symbols b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.symbols index ebdc6bc18a931..40d456dadda30 100644 --- a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.symbols +++ b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.symbols @@ -21,16 +21,16 @@ export function foo() { use(M.NonTopLevelConstEnum.X); >use : Symbol(use, Decl(systemModuleConstEnumsSeparateCompilation.ts, 0, 0)) >M.NonTopLevelConstEnum.X : Symbol(M.NonTopLevelConstEnum.X, Decl(systemModuleConstEnumsSeparateCompilation.ts, 9, 44)) ->M.NonTopLevelConstEnum : Symbol(M.NonTopLevelConstEnum, Decl(systemModuleConstEnumsSeparateCompilation.ts, 8, 10)) +>M.NonTopLevelConstEnum : Symbol(M.NonTopLevelConstEnum, Decl(systemModuleConstEnumsSeparateCompilation.ts, 8, 13)) >M : Symbol(M, Decl(systemModuleConstEnumsSeparateCompilation.ts, 6, 1)) ->NonTopLevelConstEnum : Symbol(M.NonTopLevelConstEnum, Decl(systemModuleConstEnumsSeparateCompilation.ts, 8, 10)) +>NonTopLevelConstEnum : Symbol(M.NonTopLevelConstEnum, Decl(systemModuleConstEnumsSeparateCompilation.ts, 8, 13)) >X : Symbol(M.NonTopLevelConstEnum.X, Decl(systemModuleConstEnumsSeparateCompilation.ts, 9, 44)) } -module M { +namespace M { >M : Symbol(M, Decl(systemModuleConstEnumsSeparateCompilation.ts, 6, 1)) export const enum NonTopLevelConstEnum { X } ->NonTopLevelConstEnum : Symbol(NonTopLevelConstEnum, Decl(systemModuleConstEnumsSeparateCompilation.ts, 8, 10)) +>NonTopLevelConstEnum : Symbol(NonTopLevelConstEnum, Decl(systemModuleConstEnumsSeparateCompilation.ts, 8, 13)) >X : Symbol(NonTopLevelConstEnum.X, Decl(systemModuleConstEnumsSeparateCompilation.ts, 9, 44)) } diff --git a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.types b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.types index 89c2edb8e0e8b..15c786d6a85f4 100644 --- a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.types +++ b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.types @@ -43,7 +43,7 @@ export function foo() { > : ^^^^^^^^^^^^^^^^^^^^^^ } -module M { +namespace M { export const enum NonTopLevelConstEnum { X } >NonTopLevelConstEnum : NonTopLevelConstEnum > : ^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/systemModuleDeclarationMerging.js b/tests/baselines/reference/systemModuleDeclarationMerging.js index 38227ce36e5f0..5f0249980d3bf 100644 --- a/tests/baselines/reference/systemModuleDeclarationMerging.js +++ b/tests/baselines/reference/systemModuleDeclarationMerging.js @@ -2,13 +2,13 @@ //// [systemModuleDeclarationMerging.ts] export function F() {} -export module F { var x; } +export namespace F { var x; } export class C {} -export module C { var x; } +export namespace C { var x; } export enum E {} -export module E { var x; } +export namespace E { var x; } //// [systemModuleDeclarationMerging.js] System.register([], function (exports_1, context_1) { diff --git a/tests/baselines/reference/systemModuleDeclarationMerging.symbols b/tests/baselines/reference/systemModuleDeclarationMerging.symbols index e954db98ac041..b8164b99a871b 100644 --- a/tests/baselines/reference/systemModuleDeclarationMerging.symbols +++ b/tests/baselines/reference/systemModuleDeclarationMerging.symbols @@ -4,21 +4,21 @@ export function F() {} >F : Symbol(F, Decl(systemModuleDeclarationMerging.ts, 0, 0), Decl(systemModuleDeclarationMerging.ts, 0, 22)) -export module F { var x; } +export namespace F { var x; } >F : Symbol(F, Decl(systemModuleDeclarationMerging.ts, 0, 0), Decl(systemModuleDeclarationMerging.ts, 0, 22)) ->x : Symbol(x, Decl(systemModuleDeclarationMerging.ts, 1, 21)) +>x : Symbol(x, Decl(systemModuleDeclarationMerging.ts, 1, 24)) export class C {} ->C : Symbol(C, Decl(systemModuleDeclarationMerging.ts, 1, 26), Decl(systemModuleDeclarationMerging.ts, 3, 17)) +>C : Symbol(C, Decl(systemModuleDeclarationMerging.ts, 1, 29), Decl(systemModuleDeclarationMerging.ts, 3, 17)) -export module C { var x; } ->C : Symbol(C, Decl(systemModuleDeclarationMerging.ts, 1, 26), Decl(systemModuleDeclarationMerging.ts, 3, 17)) ->x : Symbol(x, Decl(systemModuleDeclarationMerging.ts, 4, 21)) +export namespace C { var x; } +>C : Symbol(C, Decl(systemModuleDeclarationMerging.ts, 1, 29), Decl(systemModuleDeclarationMerging.ts, 3, 17)) +>x : Symbol(x, Decl(systemModuleDeclarationMerging.ts, 4, 24)) export enum E {} ->E : Symbol(E, Decl(systemModuleDeclarationMerging.ts, 4, 26), Decl(systemModuleDeclarationMerging.ts, 6, 16)) +>E : Symbol(E, Decl(systemModuleDeclarationMerging.ts, 4, 29), Decl(systemModuleDeclarationMerging.ts, 6, 16)) -export module E { var x; } ->E : Symbol(E, Decl(systemModuleDeclarationMerging.ts, 4, 26), Decl(systemModuleDeclarationMerging.ts, 6, 16)) ->x : Symbol(x, Decl(systemModuleDeclarationMerging.ts, 7, 21)) +export namespace E { var x; } +>E : Symbol(E, Decl(systemModuleDeclarationMerging.ts, 4, 29), Decl(systemModuleDeclarationMerging.ts, 6, 16)) +>x : Symbol(x, Decl(systemModuleDeclarationMerging.ts, 7, 24)) diff --git a/tests/baselines/reference/systemModuleDeclarationMerging.types b/tests/baselines/reference/systemModuleDeclarationMerging.types index 607f30b28f75a..85be2211c103d 100644 --- a/tests/baselines/reference/systemModuleDeclarationMerging.types +++ b/tests/baselines/reference/systemModuleDeclarationMerging.types @@ -5,7 +5,7 @@ export function F() {} >F : typeof F > : ^^^^^^^^ -export module F { var x; } +export namespace F { var x; } >F : typeof F > : ^^^^^^^^ >x : any @@ -14,7 +14,7 @@ export class C {} >C : C > : ^ -export module C { var x; } +export namespace C { var x; } >C : typeof C > : ^^^^^^^^ >x : any @@ -23,7 +23,7 @@ export enum E {} >E : E > : ^ -export module E { var x; } +export namespace E { var x; } >E : typeof E > : ^^^^^^^^ >x : any diff --git a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js index f7557a646af1d..22240867ed580 100644 --- a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js +++ b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js @@ -2,13 +2,13 @@ //// [systemModuleNonTopLevelModuleMembers.ts] export class TopLevelClass {} -export module TopLevelModule {var v;} +export namespace TopLevelModule {var v;} export function TopLevelFunction(): void {} export enum TopLevelEnum {E} -export module TopLevelModule2 { +export namespace TopLevelModule2 { export class NonTopLevelClass {} - export module NonTopLevelModule {var v;} + export namespace NonTopLevelModule {var v;} export function NonTopLevelFunction(): void {} export enum NonTopLevelEnum {E} } diff --git a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.symbols b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.symbols index 146d37761ce61..382834b6cdbe4 100644 --- a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.symbols +++ b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.symbols @@ -4,29 +4,29 @@ export class TopLevelClass {} >TopLevelClass : Symbol(TopLevelClass, Decl(systemModuleNonTopLevelModuleMembers.ts, 0, 0)) -export module TopLevelModule {var v;} +export namespace TopLevelModule {var v;} >TopLevelModule : Symbol(TopLevelModule, Decl(systemModuleNonTopLevelModuleMembers.ts, 0, 29)) ->v : Symbol(v, Decl(systemModuleNonTopLevelModuleMembers.ts, 1, 33)) +>v : Symbol(v, Decl(systemModuleNonTopLevelModuleMembers.ts, 1, 36)) export function TopLevelFunction(): void {} ->TopLevelFunction : Symbol(TopLevelFunction, Decl(systemModuleNonTopLevelModuleMembers.ts, 1, 37)) +>TopLevelFunction : Symbol(TopLevelFunction, Decl(systemModuleNonTopLevelModuleMembers.ts, 1, 40)) export enum TopLevelEnum {E} >TopLevelEnum : Symbol(TopLevelEnum, Decl(systemModuleNonTopLevelModuleMembers.ts, 2, 43)) >E : Symbol(TopLevelEnum.E, Decl(systemModuleNonTopLevelModuleMembers.ts, 3, 26)) -export module TopLevelModule2 { +export namespace TopLevelModule2 { >TopLevelModule2 : Symbol(TopLevelModule2, Decl(systemModuleNonTopLevelModuleMembers.ts, 3, 28)) export class NonTopLevelClass {} ->NonTopLevelClass : Symbol(NonTopLevelClass, Decl(systemModuleNonTopLevelModuleMembers.ts, 5, 31)) +>NonTopLevelClass : Symbol(NonTopLevelClass, Decl(systemModuleNonTopLevelModuleMembers.ts, 5, 34)) - export module NonTopLevelModule {var v;} + export namespace NonTopLevelModule {var v;} >NonTopLevelModule : Symbol(NonTopLevelModule, Decl(systemModuleNonTopLevelModuleMembers.ts, 6, 36)) ->v : Symbol(v, Decl(systemModuleNonTopLevelModuleMembers.ts, 7, 40)) +>v : Symbol(v, Decl(systemModuleNonTopLevelModuleMembers.ts, 7, 43)) export function NonTopLevelFunction(): void {} ->NonTopLevelFunction : Symbol(NonTopLevelFunction, Decl(systemModuleNonTopLevelModuleMembers.ts, 7, 44)) +>NonTopLevelFunction : Symbol(NonTopLevelFunction, Decl(systemModuleNonTopLevelModuleMembers.ts, 7, 47)) export enum NonTopLevelEnum {E} >NonTopLevelEnum : Symbol(NonTopLevelEnum, Decl(systemModuleNonTopLevelModuleMembers.ts, 8, 50)) diff --git a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.types b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.types index 4e87b84df2ec9..55d2770f41ac6 100644 --- a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.types +++ b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.types @@ -5,7 +5,7 @@ export class TopLevelClass {} >TopLevelClass : TopLevelClass > : ^^^^^^^^^^^^^ -export module TopLevelModule {var v;} +export namespace TopLevelModule {var v;} >TopLevelModule : typeof TopLevelModule > : ^^^^^^^^^^^^^^^^^^^^^ >v : any @@ -20,7 +20,7 @@ export enum TopLevelEnum {E} >E : TopLevelEnum.E > : ^^^^^^^^^^^^^^ -export module TopLevelModule2 { +export namespace TopLevelModule2 { >TopLevelModule2 : typeof TopLevelModule2 > : ^^^^^^^^^^^^^^^^^^^^^^ @@ -28,7 +28,7 @@ export module TopLevelModule2 { >NonTopLevelClass : NonTopLevelClass > : ^^^^^^^^^^^^^^^^ - export module NonTopLevelModule {var v;} + export namespace NonTopLevelModule {var v;} >NonTopLevelModule : typeof NonTopLevelModule > : ^^^^^^^^^^^^^^^^^^^^^^^^ >v : any diff --git a/tests/baselines/reference/testContainerList.js b/tests/baselines/reference/testContainerList.js index a4d1ddc12d9a4..0ebe84fff1d84 100644 --- a/tests/baselines/reference/testContainerList.js +++ b/tests/baselines/reference/testContainerList.js @@ -2,7 +2,7 @@ //// [testContainerList.ts] // Regression test for #325 -module A { +namespace A { class C { constructor(public d: {}) { } } diff --git a/tests/baselines/reference/testContainerList.symbols b/tests/baselines/reference/testContainerList.symbols index 9b96c6c67e94d..2fe632d4d09c1 100644 --- a/tests/baselines/reference/testContainerList.symbols +++ b/tests/baselines/reference/testContainerList.symbols @@ -2,11 +2,11 @@ === testContainerList.ts === // Regression test for #325 -module A { +namespace A { >A : Symbol(A, Decl(testContainerList.ts, 0, 0)) class C { ->C : Symbol(C, Decl(testContainerList.ts, 1, 10)) +>C : Symbol(C, Decl(testContainerList.ts, 1, 13)) constructor(public d: {}) { } >d : Symbol(C.d, Decl(testContainerList.ts, 3, 20)) diff --git a/tests/baselines/reference/testContainerList.types b/tests/baselines/reference/testContainerList.types index 4805fb61a61a4..b8557bcb583ef 100644 --- a/tests/baselines/reference/testContainerList.types +++ b/tests/baselines/reference/testContainerList.types @@ -2,7 +2,7 @@ === testContainerList.ts === // Regression test for #325 -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/thisAssignmentInNamespaceDeclaration1.errors.txt b/tests/baselines/reference/thisAssignmentInNamespaceDeclaration1.errors.txt index 3824bc8325a48..db36ca96f879a 100644 --- a/tests/baselines/reference/thisAssignmentInNamespaceDeclaration1.errors.txt +++ b/tests/baselines/reference/thisAssignmentInNamespaceDeclaration1.errors.txt @@ -1,13 +1,13 @@ -a.js(1,8): error TS8006: 'module' declarations can only be used in TypeScript files. +a.js(1,11): error TS8006: 'namespace' declarations can only be used in TypeScript files. a.js(2,5): error TS2331: 'this' cannot be referenced in a module or namespace body. b.js(1,11): error TS8006: 'namespace' declarations can only be used in TypeScript files. b.js(2,5): error TS2331: 'this' cannot be referenced in a module or namespace body. ==== a.js (2 errors) ==== - module foo { - ~~~ -!!! error TS8006: 'module' declarations can only be used in TypeScript files. + namespace foo { + ~~~ +!!! error TS8006: 'namespace' declarations can only be used in TypeScript files. this.bar = 4; ~~~~ !!! error TS2331: 'this' cannot be referenced in a module or namespace body. diff --git a/tests/baselines/reference/thisAssignmentInNamespaceDeclaration1.js b/tests/baselines/reference/thisAssignmentInNamespaceDeclaration1.js index 4735d38fdefb8..586bc62a3b526 100644 --- a/tests/baselines/reference/thisAssignmentInNamespaceDeclaration1.js +++ b/tests/baselines/reference/thisAssignmentInNamespaceDeclaration1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/thisAssignmentInNamespaceDeclaration1.ts] //// //// [a.js] -module foo { +namespace foo { this.bar = 4; } diff --git a/tests/baselines/reference/thisAssignmentInNamespaceDeclaration1.symbols b/tests/baselines/reference/thisAssignmentInNamespaceDeclaration1.symbols index 05433eed6a1f3..faaa6d487dc20 100644 --- a/tests/baselines/reference/thisAssignmentInNamespaceDeclaration1.symbols +++ b/tests/baselines/reference/thisAssignmentInNamespaceDeclaration1.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/thisAssignmentInNamespaceDeclaration1.ts] //// === a.js === -module foo { +namespace foo { >foo : Symbol(foo, Decl(a.js, 0, 0)) this.bar = 4; diff --git a/tests/baselines/reference/thisAssignmentInNamespaceDeclaration1.types b/tests/baselines/reference/thisAssignmentInNamespaceDeclaration1.types index 8909056f9ce15..a5c2f4dcacc9f 100644 --- a/tests/baselines/reference/thisAssignmentInNamespaceDeclaration1.types +++ b/tests/baselines/reference/thisAssignmentInNamespaceDeclaration1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/thisAssignmentInNamespaceDeclaration1.ts] //// === a.js === -module foo { +namespace foo { >foo : typeof foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/thisBinding.errors.txt b/tests/baselines/reference/thisBinding.errors.txt index 44b2c84be079b..3dc62bfb62ae2 100644 --- a/tests/baselines/reference/thisBinding.errors.txt +++ b/tests/baselines/reference/thisBinding.errors.txt @@ -2,7 +2,7 @@ thisBinding.ts(9,8): error TS2339: Property 'e' does not exist on type 'I'. ==== thisBinding.ts (1 errors) ==== - module M { + namespace M { export interface I { z; } diff --git a/tests/baselines/reference/thisBinding.js b/tests/baselines/reference/thisBinding.js index 98027e37d11e0..58170a28045a0 100644 --- a/tests/baselines/reference/thisBinding.js +++ b/tests/baselines/reference/thisBinding.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/thisBinding.ts] //// //// [thisBinding.ts] -module M { +namespace M { export interface I { z; } diff --git a/tests/baselines/reference/thisBinding.symbols b/tests/baselines/reference/thisBinding.symbols index c1579a3db77d9..d2759d43084b6 100644 --- a/tests/baselines/reference/thisBinding.symbols +++ b/tests/baselines/reference/thisBinding.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/thisBinding.ts] //// === thisBinding.ts === -module M { +namespace M { >M : Symbol(M, Decl(thisBinding.ts, 0, 0)) export interface I { ->I : Symbol(I, Decl(thisBinding.ts, 0, 10)) +>I : Symbol(I, Decl(thisBinding.ts, 0, 13)) z; >z : Symbol(I.z, Decl(thisBinding.ts, 1, 24)) @@ -20,7 +20,7 @@ module M { f(x:I) { >f : Symbol(C.f, Decl(thisBinding.ts, 6, 12)) >x : Symbol(x, Decl(thisBinding.ts, 7, 3)) ->I : Symbol(I, Decl(thisBinding.ts, 0, 10)) +>I : Symbol(I, Decl(thisBinding.ts, 0, 13)) x.e; // e not found >x : Symbol(x, Decl(thisBinding.ts, 7, 3)) @@ -39,7 +39,7 @@ module M { >this : Symbol(C, Decl(thisBinding.ts, 3, 5)) >f : Symbol(C.f, Decl(thisBinding.ts, 6, 12)) >f : Symbol(f, Decl(thisBinding.ts, 12, 8)) ->I : Symbol(I, Decl(thisBinding.ts, 0, 10)) +>I : Symbol(I, Decl(thisBinding.ts, 0, 13)) } } } diff --git a/tests/baselines/reference/thisBinding.types b/tests/baselines/reference/thisBinding.types index ddfebe9ba9d6b..a4bfaeb6228f1 100644 --- a/tests/baselines/reference/thisBinding.types +++ b/tests/baselines/reference/thisBinding.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/thisBinding.ts] //// === thisBinding.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/thisInInvalidContexts.errors.txt b/tests/baselines/reference/thisInInvalidContexts.errors.txt index 8847058104db5..4cea9c17080fc 100644 --- a/tests/baselines/reference/thisInInvalidContexts.errors.txt +++ b/tests/baselines/reference/thisInInvalidContexts.errors.txt @@ -32,7 +32,7 @@ thisInInvalidContexts.ts(40,9): error TS2332: 'this' cannot be referenced in cur } } - module M { + namespace M { //'this' in module variable var x = this; // Error ~~~~ diff --git a/tests/baselines/reference/thisInInvalidContexts.js b/tests/baselines/reference/thisInInvalidContexts.js index 0a00c94b7f3d3..c1ea3dbb57139 100644 --- a/tests/baselines/reference/thisInInvalidContexts.js +++ b/tests/baselines/reference/thisInInvalidContexts.js @@ -21,7 +21,7 @@ class ClassWithInitializer extends BaseErrClass { } } -module M { +namespace M { //'this' in module variable var x = this; // Error } diff --git a/tests/baselines/reference/thisInInvalidContexts.symbols b/tests/baselines/reference/thisInInvalidContexts.symbols index 7b19a9b79106c..591a841d33f96 100644 --- a/tests/baselines/reference/thisInInvalidContexts.symbols +++ b/tests/baselines/reference/thisInInvalidContexts.symbols @@ -38,7 +38,7 @@ class ClassWithInitializer extends BaseErrClass { } } -module M { +namespace M { >M : Symbol(M, Decl(thisInInvalidContexts.ts, 18, 1)) //'this' in module variable diff --git a/tests/baselines/reference/thisInInvalidContexts.types b/tests/baselines/reference/thisInInvalidContexts.types index f651e32dff49d..2369fbd0f2eed 100644 --- a/tests/baselines/reference/thisInInvalidContexts.types +++ b/tests/baselines/reference/thisInInvalidContexts.types @@ -56,7 +56,7 @@ class ClassWithInitializer extends BaseErrClass { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt index c123b758ac6f4..685702b78babd 100644 --- a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt +++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt @@ -32,7 +32,7 @@ thisInInvalidContextsExternalModule.ts(40,9): error TS2332: 'this' cannot be ref } } - module M { + namespace M { //'this' in module variable var x = this; // Error ~~~~ diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.js b/tests/baselines/reference/thisInInvalidContextsExternalModule.js index e57ab3102fba8..6f56f59337935 100644 --- a/tests/baselines/reference/thisInInvalidContextsExternalModule.js +++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.js @@ -21,7 +21,7 @@ class ClassWithInitializer extends BaseErrClass { } } -module M { +namespace M { //'this' in module variable var x = this; // Error } diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.symbols b/tests/baselines/reference/thisInInvalidContextsExternalModule.symbols index 01044d9a46c0a..475a7f4b888a9 100644 --- a/tests/baselines/reference/thisInInvalidContextsExternalModule.symbols +++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.symbols @@ -38,7 +38,7 @@ class ClassWithInitializer extends BaseErrClass { } } -module M { +namespace M { >M : Symbol(M, Decl(thisInInvalidContextsExternalModule.ts, 18, 1)) //'this' in module variable diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.types b/tests/baselines/reference/thisInInvalidContextsExternalModule.types index ede0e7c8d30a0..10b97072ce5b5 100644 --- a/tests/baselines/reference/thisInInvalidContextsExternalModule.types +++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.types @@ -56,7 +56,7 @@ class ClassWithInitializer extends BaseErrClass { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/thisInModule.errors.txt b/tests/baselines/reference/thisInModule.errors.txt index 3ca1ea57f21e1..36c7679d75cce 100644 --- a/tests/baselines/reference/thisInModule.errors.txt +++ b/tests/baselines/reference/thisInModule.errors.txt @@ -2,7 +2,7 @@ thisInModule.ts(3,5): error TS2331: 'this' cannot be referenced in a module or n ==== thisInModule.ts (1 errors) ==== - module myMod { + namespace myMod { var x; this.x = 5; ~~~~ diff --git a/tests/baselines/reference/thisInModule.js b/tests/baselines/reference/thisInModule.js index 63227bfc0085e..ea48419720020 100644 --- a/tests/baselines/reference/thisInModule.js +++ b/tests/baselines/reference/thisInModule.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/thisInModule.ts] //// //// [thisInModule.ts] -module myMod { +namespace myMod { var x; this.x = 5; } diff --git a/tests/baselines/reference/thisInModule.symbols b/tests/baselines/reference/thisInModule.symbols index e4ad3483dbb51..b520cc749696f 100644 --- a/tests/baselines/reference/thisInModule.symbols +++ b/tests/baselines/reference/thisInModule.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/thisInModule.ts] //// === thisInModule.ts === -module myMod { +namespace myMod { >myMod : Symbol(myMod, Decl(thisInModule.ts, 0, 0)) var x; diff --git a/tests/baselines/reference/thisInModule.types b/tests/baselines/reference/thisInModule.types index 9443b7c42d779..eeea35d192187 100644 --- a/tests/baselines/reference/thisInModule.types +++ b/tests/baselines/reference/thisInModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/thisInModule.ts] //// === thisInModule.ts === -module myMod { +namespace myMod { >myMod : typeof myMod > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/thisInModuleFunction1.js b/tests/baselines/reference/thisInModuleFunction1.js index c782fd0bdf4f3..9780e21d9afd4 100644 --- a/tests/baselines/reference/thisInModuleFunction1.js +++ b/tests/baselines/reference/thisInModuleFunction1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/thisInModuleFunction1.ts] //// //// [thisInModuleFunction1.ts] -module bar { +namespace bar { export function bar() { return this; } diff --git a/tests/baselines/reference/thisInModuleFunction1.symbols b/tests/baselines/reference/thisInModuleFunction1.symbols index 4bb88d4402a0f..a057b633ebd5b 100644 --- a/tests/baselines/reference/thisInModuleFunction1.symbols +++ b/tests/baselines/reference/thisInModuleFunction1.symbols @@ -1,18 +1,18 @@ //// [tests/cases/compiler/thisInModuleFunction1.ts] //// === thisInModuleFunction1.ts === -module bar { +namespace bar { >bar : Symbol(bar, Decl(thisInModuleFunction1.ts, 0, 0)) export function bar() { ->bar : Symbol(bar, Decl(thisInModuleFunction1.ts, 0, 12)) +>bar : Symbol(bar, Decl(thisInModuleFunction1.ts, 0, 15)) return this; } } var z = bar.bar(); >z : Symbol(z, Decl(thisInModuleFunction1.ts, 5, 3)) ->bar.bar : Symbol(bar.bar, Decl(thisInModuleFunction1.ts, 0, 12)) +>bar.bar : Symbol(bar.bar, Decl(thisInModuleFunction1.ts, 0, 15)) >bar : Symbol(bar, Decl(thisInModuleFunction1.ts, 0, 0)) ->bar : Symbol(bar.bar, Decl(thisInModuleFunction1.ts, 0, 12)) +>bar : Symbol(bar.bar, Decl(thisInModuleFunction1.ts, 0, 15)) diff --git a/tests/baselines/reference/thisInModuleFunction1.types b/tests/baselines/reference/thisInModuleFunction1.types index a51ac6530657e..dcef22af60504 100644 --- a/tests/baselines/reference/thisInModuleFunction1.types +++ b/tests/baselines/reference/thisInModuleFunction1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/thisInModuleFunction1.ts] //// === thisInModuleFunction1.ts === -module bar { +namespace bar { >bar : typeof globalThis.bar > : ^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/thisKeyword.errors.txt b/tests/baselines/reference/thisKeyword.errors.txt index 1cde44eb6b49b..74085ac7b3aad 100644 --- a/tests/baselines/reference/thisKeyword.errors.txt +++ b/tests/baselines/reference/thisKeyword.errors.txt @@ -2,7 +2,7 @@ thisKeyword.ts(2,5): error TS2331: 'this' cannot be referenced in a module or na ==== thisKeyword.ts (1 errors) ==== - module foo { + namespace foo { this.bar = 4; ~~~~ !!! error TS2331: 'this' cannot be referenced in a module or namespace body. diff --git a/tests/baselines/reference/thisKeyword.js b/tests/baselines/reference/thisKeyword.js index ac51ab0f0220c..6b0ee39aaa31b 100644 --- a/tests/baselines/reference/thisKeyword.js +++ b/tests/baselines/reference/thisKeyword.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/thisKeyword.ts] //// //// [thisKeyword.ts] -module foo { +namespace foo { this.bar = 4; } diff --git a/tests/baselines/reference/thisKeyword.symbols b/tests/baselines/reference/thisKeyword.symbols index 64d2022161214..c7326e3295b83 100644 --- a/tests/baselines/reference/thisKeyword.symbols +++ b/tests/baselines/reference/thisKeyword.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/thisKeyword.ts] //// === thisKeyword.ts === -module foo { +namespace foo { >foo : Symbol(foo, Decl(thisKeyword.ts, 0, 0)) this.bar = 4; diff --git a/tests/baselines/reference/thisKeyword.types b/tests/baselines/reference/thisKeyword.types index ffea298f6780e..2c646abc5dd0b 100644 --- a/tests/baselines/reference/thisKeyword.types +++ b/tests/baselines/reference/thisKeyword.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/thisKeyword.ts] //// === thisKeyword.ts === -module foo { +namespace foo { >foo : typeof foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/this_inside-enum-should-not-be-allowed.errors.txt b/tests/baselines/reference/this_inside-enum-should-not-be-allowed.errors.txt index c7b2986b99b6d..0975e4a3e2200 100644 --- a/tests/baselines/reference/this_inside-enum-should-not-be-allowed.errors.txt +++ b/tests/baselines/reference/this_inside-enum-should-not-be-allowed.errors.txt @@ -9,7 +9,7 @@ this_inside-enum-should-not-be-allowed.ts(7,30): error TS2332: 'this' cannot be !!! error TS2332: 'this' cannot be referenced in current location. } - module ModuleEnum { + namespace ModuleEnum { enum EnumInModule { WasADifferentError = this // this was handled as if this was in a module ~~~~ diff --git a/tests/baselines/reference/this_inside-enum-should-not-be-allowed.js b/tests/baselines/reference/this_inside-enum-should-not-be-allowed.js index 6efb5442efec8..624e03a5b029a 100644 --- a/tests/baselines/reference/this_inside-enum-should-not-be-allowed.js +++ b/tests/baselines/reference/this_inside-enum-should-not-be-allowed.js @@ -5,7 +5,7 @@ enum TopLevelEnum { ThisWasAllowedButShouldNotBe = this // Should not be allowed } -module ModuleEnum { +namespace ModuleEnum { enum EnumInModule { WasADifferentError = this // this was handled as if this was in a module } diff --git a/tests/baselines/reference/this_inside-enum-should-not-be-allowed.symbols b/tests/baselines/reference/this_inside-enum-should-not-be-allowed.symbols index 1a3dc07dcfb2d..21f48eec24b27 100644 --- a/tests/baselines/reference/this_inside-enum-should-not-be-allowed.symbols +++ b/tests/baselines/reference/this_inside-enum-should-not-be-allowed.symbols @@ -8,11 +8,11 @@ enum TopLevelEnum { >ThisWasAllowedButShouldNotBe : Symbol(TopLevelEnum.ThisWasAllowedButShouldNotBe, Decl(this_inside-enum-should-not-be-allowed.ts, 0, 19)) } -module ModuleEnum { +namespace ModuleEnum { >ModuleEnum : Symbol(ModuleEnum, Decl(this_inside-enum-should-not-be-allowed.ts, 2, 1)) enum EnumInModule { ->EnumInModule : Symbol(EnumInModule, Decl(this_inside-enum-should-not-be-allowed.ts, 4, 19)) +>EnumInModule : Symbol(EnumInModule, Decl(this_inside-enum-should-not-be-allowed.ts, 4, 22)) WasADifferentError = this // this was handled as if this was in a module >WasADifferentError : Symbol(EnumInModule.WasADifferentError, Decl(this_inside-enum-should-not-be-allowed.ts, 5, 23)) diff --git a/tests/baselines/reference/this_inside-enum-should-not-be-allowed.types b/tests/baselines/reference/this_inside-enum-should-not-be-allowed.types index f4a39d352dcd7..1a709e50cf4b3 100644 --- a/tests/baselines/reference/this_inside-enum-should-not-be-allowed.types +++ b/tests/baselines/reference/this_inside-enum-should-not-be-allowed.types @@ -12,7 +12,7 @@ enum TopLevelEnum { > : ^^^ } -module ModuleEnum { +namespace ModuleEnum { >ModuleEnum : typeof ModuleEnum > : ^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/this_inside-object-literal-getters-and-setters.js b/tests/baselines/reference/this_inside-object-literal-getters-and-setters.js index 9cea18ae0014c..3912c5dc67a42 100644 --- a/tests/baselines/reference/this_inside-object-literal-getters-and-setters.js +++ b/tests/baselines/reference/this_inside-object-literal-getters-and-setters.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/this_inside-object-literal-getters-and-setters.ts] //// //// [this_inside-object-literal-getters-and-setters.ts] -module ObjectLiteral { +namespace ObjectLiteral { var ThisInObjectLiteral = { _foo: '1', get foo(): string { diff --git a/tests/baselines/reference/this_inside-object-literal-getters-and-setters.symbols b/tests/baselines/reference/this_inside-object-literal-getters-and-setters.symbols index 5499f994e6433..44070b5c2301d 100644 --- a/tests/baselines/reference/this_inside-object-literal-getters-and-setters.symbols +++ b/tests/baselines/reference/this_inside-object-literal-getters-and-setters.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/this_inside-object-literal-getters-and-setters.ts] //// === this_inside-object-literal-getters-and-setters.ts === -module ObjectLiteral { +namespace ObjectLiteral { >ObjectLiteral : Symbol(ObjectLiteral, Decl(this_inside-object-literal-getters-and-setters.ts, 0, 0)) var ThisInObjectLiteral = { diff --git a/tests/baselines/reference/this_inside-object-literal-getters-and-setters.types b/tests/baselines/reference/this_inside-object-literal-getters-and-setters.types index fb1143f861b47..096f1d7cbad14 100644 --- a/tests/baselines/reference/this_inside-object-literal-getters-and-setters.types +++ b/tests/baselines/reference/this_inside-object-literal-getters-and-setters.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/this_inside-object-literal-getters-and-setters.ts] //// === this_inside-object-literal-getters-and-setters.ts === -module ObjectLiteral { +namespace ObjectLiteral { >ObjectLiteral : typeof ObjectLiteral > : ^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/throwStatements.js b/tests/baselines/reference/throwStatements.js index 89ffa118c5706..9b9c6c0cbf34b 100644 --- a/tests/baselines/reference/throwStatements.js +++ b/tests/baselines/reference/throwStatements.js @@ -19,7 +19,7 @@ class D{ function F(x: string): number { return 42; } -module M { +namespace M { export class A { name: string; } diff --git a/tests/baselines/reference/throwStatements.symbols b/tests/baselines/reference/throwStatements.symbols index ad29b361b1861..2b8362a2b3e1e 100644 --- a/tests/baselines/reference/throwStatements.symbols +++ b/tests/baselines/reference/throwStatements.symbols @@ -42,11 +42,11 @@ function F(x: string): number { return 42; } >F : Symbol(F, Decl(throwStatements.ts, 14, 1)) >x : Symbol(x, Decl(throwStatements.ts, 16, 11)) -module M { +namespace M { >M : Symbol(M, Decl(throwStatements.ts, 16, 44)) export class A { ->A : Symbol(A, Decl(throwStatements.ts, 18, 10)) +>A : Symbol(A, Decl(throwStatements.ts, 18, 13)) name: string; >name : Symbol(A.name, Decl(throwStatements.ts, 19, 20)) @@ -159,9 +159,9 @@ throw typeof M; var aClassInModule = new M.A(); >aClassInModule : Symbol(aClassInModule, Decl(throwStatements.ts, 59, 3)) ->M.A : Symbol(M.A, Decl(throwStatements.ts, 18, 10)) +>M.A : Symbol(M.A, Decl(throwStatements.ts, 18, 13)) >M : Symbol(M, Decl(throwStatements.ts, 16, 44)) ->A : Symbol(M.A, Decl(throwStatements.ts, 18, 10)) +>A : Symbol(M.A, Decl(throwStatements.ts, 18, 13)) throw aClassInModule; >aClassInModule : Symbol(aClassInModule, Decl(throwStatements.ts, 59, 3)) diff --git a/tests/baselines/reference/throwStatements.types b/tests/baselines/reference/throwStatements.types index 697b9d5d871ed..d55edb6cdbf4f 100644 --- a/tests/baselines/reference/throwStatements.types +++ b/tests/baselines/reference/throwStatements.types @@ -43,7 +43,7 @@ function F(x: string): number { return 42; } >42 : 42 > : ^^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/topLevel.js b/tests/baselines/reference/topLevel.js index 5c8110bd8c549..559d564e07954 100644 --- a/tests/baselines/reference/topLevel.js +++ b/tests/baselines/reference/topLevel.js @@ -21,7 +21,7 @@ class Point implements IPoint { var result=""; result+=(new Point(3,4).move(2,2)); -module M { +namespace M { export var origin=new Point(0,0); } diff --git a/tests/baselines/reference/topLevel.symbols b/tests/baselines/reference/topLevel.symbols index ce8359ae796e9..f6e88fe4427d9 100644 --- a/tests/baselines/reference/topLevel.symbols +++ b/tests/baselines/reference/topLevel.symbols @@ -61,7 +61,7 @@ result+=(new Point(3,4).move(2,2)); >Point : Symbol(Point, Decl(topLevel.ts, 3, 1)) >move : Symbol(Point.move, Decl(topLevel.ts, 6, 36)) -module M { +namespace M { >M : Symbol(M, Decl(topLevel.ts, 18, 35)) export var origin=new Point(0,0); diff --git a/tests/baselines/reference/topLevel.types b/tests/baselines/reference/topLevel.types index 779e5f6174e2c..cedcb5fe0b484 100644 --- a/tests/baselines/reference/topLevel.types +++ b/tests/baselines/reference/topLevel.types @@ -117,7 +117,7 @@ result+=(new Point(3,4).move(2,2)); >2 : 2 > : ^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/topLevelLambda.errors.txt b/tests/baselines/reference/topLevelLambda.errors.txt index 963983fe8c457..13afaa0651d9e 100644 --- a/tests/baselines/reference/topLevelLambda.errors.txt +++ b/tests/baselines/reference/topLevelLambda.errors.txt @@ -2,7 +2,7 @@ topLevelLambda.ts(2,17): error TS2331: 'this' cannot be referenced in a module o ==== topLevelLambda.ts (1 errors) ==== - module M { + namespace M { var f = () => {this.window;} ~~~~ !!! error TS2331: 'this' cannot be referenced in a module or namespace body. diff --git a/tests/baselines/reference/topLevelLambda.js b/tests/baselines/reference/topLevelLambda.js index 83a6fafbfdfa1..03194f586759d 100644 --- a/tests/baselines/reference/topLevelLambda.js +++ b/tests/baselines/reference/topLevelLambda.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/topLevelLambda.ts] //// //// [topLevelLambda.ts] -module M { +namespace M { var f = () => {this.window;} } diff --git a/tests/baselines/reference/topLevelLambda.symbols b/tests/baselines/reference/topLevelLambda.symbols index 0127a8eb9046b..b9250dca0ab9e 100644 --- a/tests/baselines/reference/topLevelLambda.symbols +++ b/tests/baselines/reference/topLevelLambda.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/topLevelLambda.ts] //// === topLevelLambda.ts === -module M { +namespace M { >M : Symbol(M, Decl(topLevelLambda.ts, 0, 0)) var f = () => {this.window;} diff --git a/tests/baselines/reference/topLevelLambda.types b/tests/baselines/reference/topLevelLambda.types index b5fa70a5df6f6..3dc186725c4fb 100644 --- a/tests/baselines/reference/topLevelLambda.types +++ b/tests/baselines/reference/topLevelLambda.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/topLevelLambda.ts] //// === topLevelLambda.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/tsserver/projectReferenceCompileOnSave/compile-on-save-emits-same-output-as-project-build-with-external-project.js b/tests/baselines/reference/tsserver/projectReferenceCompileOnSave/compile-on-save-emits-same-output-as-project-build-with-external-project.js index 3130ae106a02e..ac6449b464ef0 100644 --- a/tests/baselines/reference/tsserver/projectReferenceCompileOnSave/compile-on-save-emits-same-output-as-project-build-with-external-project.js +++ b/tests/baselines/reference/tsserver/projectReferenceCompileOnSave/compile-on-save-emits-same-output-as-project-build-with-external-project.js @@ -93,7 +93,7 @@ declare namespace Hmi { //// [/user/username/projects/myproject/buttonClass/Source.tsbuildinfo] -{"fileNames":["../../../../../home/src/tslibs/TS/Lib/lib.d.ts","./Source.ts"],"fileInfos":["3858781397-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ndeclare const console: { log(msg: any): void; };","-1678937917-module Hmi {\n export class Button {\n public static myStaticFunction() {\n }\n }\n}"],"root":[2],"options":{"composite":true,"module":0,"outFile":"./Source.js"},"outSignature":"6176297704-declare namespace Hmi {\n class Button {\n static myStaticFunction(): void;\n }\n}\n","latestChangedDtsFile":"./Source.d.ts","version":"FakeTSVersion"} +{"fileNames":["../../../../../home/src/tslibs/TS/Lib/lib.d.ts","./Source.ts"],"fileInfos":["3858781397-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ndeclare const console: { log(msg: any): void; };","-1678937917-module Hmi {\n export class Button {\n public static myStaticFunction() {\n }\n }\n}"],"root":[2],"options":{"composite":true,"module":0,"outFile":"./Source.js"},"semanticDiagnosticsPerFile":[[2,[{"start":0,"length":6,"messageText":"The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead.","category":1,"code":1547}]]],"outSignature":"6176297704-declare namespace Hmi {\n class Button {\n static myStaticFunction(): void;\n }\n}\n","latestChangedDtsFile":"./Source.d.ts","version":"FakeTSVersion"} //// [/user/username/projects/myproject/buttonClass/Source.tsbuildinfo.readable.baseline.txt] { @@ -116,10 +116,24 @@ declare namespace Hmi { "module": 0, "outFile": "./Source.js" }, + "semanticDiagnosticsPerFile": [ + [ + "./Source.ts", + [ + { + "start": 0, + "length": 6, + "messageText": "The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead.", + "category": 1, + "code": 1547 + } + ] + ] + ], "outSignature": "6176297704-declare namespace Hmi {\n class Button {\n static myStaticFunction(): void;\n }\n}\n", "latestChangedDtsFile": "./Source.d.ts", "version": "FakeTSVersion", - "size": 918 + "size": 1120 } //// [/user/username/projects/myproject/SiblingClass/Source.js] @@ -145,7 +159,7 @@ declare namespace Hmi { //// [/user/username/projects/myproject/SiblingClass/Source.tsbuildinfo] -{"fileNames":["../../../../../home/src/tslibs/TS/Lib/lib.d.ts","../buttonClass/Source.d.ts","./Source.ts"],"fileInfos":["3858781397-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ndeclare const console: { log(msg: any): void; };","6176297704-declare namespace Hmi {\n class Button {\n static myStaticFunction(): void;\n }\n}\n","-3370344921-module Hmi {\n export class Sibling {\n public mySiblingFunction() {\n }\n }\n}"],"root":[3],"options":{"composite":true,"module":0,"outFile":"./Source.js"},"outSignature":"-2810380820-declare namespace Hmi {\n class Sibling {\n mySiblingFunction(): void;\n }\n}\n","latestChangedDtsFile":"./Source.d.ts","version":"FakeTSVersion"} +{"fileNames":["../../../../../home/src/tslibs/TS/Lib/lib.d.ts","../buttonClass/Source.d.ts","./Source.ts"],"fileInfos":["3858781397-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ndeclare const console: { log(msg: any): void; };","6176297704-declare namespace Hmi {\n class Button {\n static myStaticFunction(): void;\n }\n}\n","-3370344921-module Hmi {\n export class Sibling {\n public mySiblingFunction() {\n }\n }\n}"],"root":[3],"options":{"composite":true,"module":0,"outFile":"./Source.js"},"semanticDiagnosticsPerFile":[[3,[{"start":0,"length":6,"messageText":"The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead.","category":1,"code":1547}]]],"outSignature":"-2810380820-declare namespace Hmi {\n class Sibling {\n mySiblingFunction(): void;\n }\n}\n","latestChangedDtsFile":"./Source.d.ts","version":"FakeTSVersion"} //// [/user/username/projects/myproject/SiblingClass/Source.tsbuildinfo.readable.baseline.txt] { @@ -170,10 +184,24 @@ declare namespace Hmi { "module": 0, "outFile": "./Source.js" }, + "semanticDiagnosticsPerFile": [ + [ + "./Source.ts", + [ + { + "start": 0, + "length": 6, + "messageText": "The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead.", + "category": 1, + "code": 1547 + } + ] + ] + ], "outSignature": "-2810380820-declare namespace Hmi {\n class Sibling {\n mySiblingFunction(): void;\n }\n}\n", "latestChangedDtsFile": "./Source.d.ts", "version": "FakeTSVersion", - "size": 1049 + "size": 1251 } diff --git a/tests/baselines/reference/tsxAttributeInvalidNames.errors.txt b/tests/baselines/reference/tsxAttributeInvalidNames.errors.txt index 339091ece5b38..021840ccd5ca7 100644 --- a/tests/baselines/reference/tsxAttributeInvalidNames.errors.txt +++ b/tests/baselines/reference/tsxAttributeInvalidNames.errors.txt @@ -1,3 +1,4 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(10,8): error TS1003: Identifier expected. file.tsx(10,10): error TS1005: ';' expected. file.tsx(10,10): error TS1351: An identifier or keyword cannot immediately follow a numeric literal. @@ -13,8 +14,10 @@ file.tsx(11,13): error TS1005: ';' expected. file.tsx(11,19): error TS1161: Unterminated regular expression literal. -==== file.tsx (13 errors) ==== +==== file.tsx (14 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { test1: { "data-foo"?: string }; diff --git a/tests/baselines/reference/tsxAttributeResolution1.errors.txt b/tests/baselines/reference/tsxAttributeResolution1.errors.txt index 97c5b5a5d5e98..706ee6fda1515 100644 --- a/tests/baselines/reference/tsxAttributeResolution1.errors.txt +++ b/tests/baselines/reference/tsxAttributeResolution1.errors.txt @@ -1,3 +1,4 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(23,8): error TS2322: Type 'string' is not assignable to type 'number'. file.tsx(24,8): error TS2322: Type '{ y: number; }' is not assignable to type 'Attribs1'. Property 'y' does not exist on type 'Attribs1'. @@ -10,8 +11,10 @@ file.tsx(29,2): error TS2741: Property 'reqd' is missing in type '{}' but requir file.tsx(30,8): error TS2322: Type 'number' is not assignable to type 'string'. -==== file.tsx (7 errors) ==== +==== file.tsx (8 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { test1: Attribs1; diff --git a/tests/baselines/reference/tsxAttributeResolution10.errors.txt b/tests/baselines/reference/tsxAttributeResolution10.errors.txt index 5a2d2cd061bed..149104b5bb4f1 100644 --- a/tests/baselines/reference/tsxAttributeResolution10.errors.txt +++ b/tests/baselines/reference/tsxAttributeResolution10.errors.txt @@ -1,8 +1,11 @@ file.tsx(11,14): error TS2322: Type 'string' is not assignable to type 'boolean'. +react.d.ts(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. -==== react.d.ts (0 errors) ==== +==== react.d.ts (1 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { } diff --git a/tests/baselines/reference/tsxAttributeResolution11.errors.txt b/tests/baselines/reference/tsxAttributeResolution11.errors.txt index bad7b2842ebf0..3260bcb47e826 100644 --- a/tests/baselines/reference/tsxAttributeResolution11.errors.txt +++ b/tests/baselines/reference/tsxAttributeResolution11.errors.txt @@ -1,9 +1,12 @@ file.tsx(11,22): error TS2322: Type '{ bar: string; }' is not assignable to type 'IntrinsicAttributes & { ref?: string; }'. Property 'bar' does not exist on type 'IntrinsicAttributes & { ref?: string; }'. +react.d.ts(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. -==== react.d.ts (0 errors) ==== +==== react.d.ts (1 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { } diff --git a/tests/baselines/reference/tsxAttributeResolution12.errors.txt b/tests/baselines/reference/tsxAttributeResolution12.errors.txt index d777757422f32..b085bc9f58f98 100644 --- a/tests/baselines/reference/tsxAttributeResolution12.errors.txt +++ b/tests/baselines/reference/tsxAttributeResolution12.errors.txt @@ -1,11 +1,15 @@ +file.tsx(17,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(25,11): error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { reqd: any; }'. Property 'reqd' is missing in type '{}' but required in type '{ reqd: any; }'. file.tsx(28,11): error TS2322: Type '{}' is not assignable to type 'IntrinsicAttributes & { reqd: any; }'. Property 'reqd' is missing in type '{}' but required in type '{ reqd: any; }'. +react.d.ts(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. -==== react.d.ts (0 errors) ==== +==== react.d.ts (1 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { } @@ -17,7 +21,7 @@ file.tsx(28,11): error TS2322: Type '{}' is not assignable to type 'IntrinsicAtt } } -==== file.tsx (2 errors) ==== +==== file.tsx (3 errors) ==== declare class Component { constructor(props?: P, context?: any); setState(f: (prevState: S, props: P) => S, callback?: () => any): void; @@ -35,6 +39,8 @@ file.tsx(28,11): error TS2322: Type '{}' is not assignable to type 'IntrinsicAtt } declare module TestMod { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface TestClass extends ComponentClass<{reqd: any}> { } var Test: TestClass; diff --git a/tests/baselines/reference/tsxAttributeResolution14.errors.txt b/tests/baselines/reference/tsxAttributeResolution14.errors.txt index b20cb15130805..4a9049eb5682c 100644 --- a/tests/baselines/reference/tsxAttributeResolution14.errors.txt +++ b/tests/baselines/reference/tsxAttributeResolution14.errors.txt @@ -1,9 +1,12 @@ file.tsx(13,28): error TS2322: Type 'number' is not assignable to type 'string'. file.tsx(15,28): error TS2322: Type 'boolean' is not assignable to type 'string | number'. +react.d.ts(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. -==== react.d.ts (0 errors) ==== +==== react.d.ts (1 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { div: any; diff --git a/tests/baselines/reference/tsxAttributeResolution2.errors.txt b/tests/baselines/reference/tsxAttributeResolution2.errors.txt index a883324c5ade6..3a728551da2b0 100644 --- a/tests/baselines/reference/tsxAttributeResolution2.errors.txt +++ b/tests/baselines/reference/tsxAttributeResolution2.errors.txt @@ -1,8 +1,11 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(17,21): error TS2339: Property 'leng' does not exist on type 'string'. -==== file.tsx (1 errors) ==== +==== file.tsx (2 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { test1: Attribs1; diff --git a/tests/baselines/reference/tsxAttributeResolution3.errors.txt b/tests/baselines/reference/tsxAttributeResolution3.errors.txt index fe4a24f30f7bb..7229b6ca56508 100644 --- a/tests/baselines/reference/tsxAttributeResolution3.errors.txt +++ b/tests/baselines/reference/tsxAttributeResolution3.errors.txt @@ -1,3 +1,4 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(19,2): error TS2322: Type '{ x: number; }' is not assignable to type 'Attribs1'. Types of property 'x' are incompatible. Type 'number' is not assignable to type 'string'. @@ -5,8 +6,10 @@ file.tsx(23,2): error TS2741: Property 'x' is missing in type '{ y: number; }' b file.tsx(31,8): error TS2322: Type 'number' is not assignable to type 'string'. -==== file.tsx (3 errors) ==== +==== file.tsx (4 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { test1: Attribs1; diff --git a/tests/baselines/reference/tsxAttributeResolution4.errors.txt b/tests/baselines/reference/tsxAttributeResolution4.errors.txt index 2f74bf4ab3dc7..c1f72e16abf4b 100644 --- a/tests/baselines/reference/tsxAttributeResolution4.errors.txt +++ b/tests/baselines/reference/tsxAttributeResolution4.errors.txt @@ -1,8 +1,11 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(15,26): error TS2339: Property 'len' does not exist on type 'string'. -==== file.tsx (1 errors) ==== +==== file.tsx (2 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { test1: Attribs1; diff --git a/tests/baselines/reference/tsxAttributeResolution5.errors.txt b/tests/baselines/reference/tsxAttributeResolution5.errors.txt index a26f11d72f866..52aa04290343e 100644 --- a/tests/baselines/reference/tsxAttributeResolution5.errors.txt +++ b/tests/baselines/reference/tsxAttributeResolution5.errors.txt @@ -1,3 +1,4 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(21,10): error TS2322: Type 'T' is not assignable to type 'Attribs1'. Type '{ x: number; }' is not assignable to type 'Attribs1'. Types of property 'x' are incompatible. @@ -7,8 +8,10 @@ file.tsx(25,10): error TS2322: Type 'T' is not assignable to type 'Attribs1'. file.tsx(29,2): error TS2741: Property 'x' is missing in type '{}' but required in type 'Attribs1'. -==== file.tsx (3 errors) ==== +==== file.tsx (4 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { test1: Attribs1; diff --git a/tests/baselines/reference/tsxAttributeResolution6.errors.txt b/tests/baselines/reference/tsxAttributeResolution6.errors.txt index 343c4a2709836..840373c81c729 100644 --- a/tests/baselines/reference/tsxAttributeResolution6.errors.txt +++ b/tests/baselines/reference/tsxAttributeResolution6.errors.txt @@ -1,10 +1,13 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(10,8): error TS2322: Type 'boolean' is not assignable to type 'string'. file.tsx(11,8): error TS2322: Type 'string' is not assignable to type 'boolean'. file.tsx(12,2): error TS2741: Property 'n' is missing in type '{}' but required in type '{ n: boolean; }'. -==== file.tsx (3 errors) ==== +==== file.tsx (4 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { test1: { n?: boolean; s?: string}; diff --git a/tests/baselines/reference/tsxAttributeResolution7.errors.txt b/tests/baselines/reference/tsxAttributeResolution7.errors.txt index 66020bf89164c..c5b55e9d6a72e 100644 --- a/tests/baselines/reference/tsxAttributeResolution7.errors.txt +++ b/tests/baselines/reference/tsxAttributeResolution7.errors.txt @@ -1,10 +1,13 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(9,2): error TS2322: Type '{ "data-foo": number; }' is not assignable to type '{ "data-foo"?: string; }'. Types of property '"data-foo"' are incompatible. Type 'number' is not assignable to type 'string'. -==== file.tsx (1 errors) ==== +==== file.tsx (2 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { test1: { "data-foo"?: string }; diff --git a/tests/baselines/reference/tsxAttributeResolution8.errors.txt b/tests/baselines/reference/tsxAttributeResolution8.errors.txt new file mode 100644 index 0000000000000..7653dc4072181 --- /dev/null +++ b/tests/baselines/reference/tsxAttributeResolution8.errors.txt @@ -0,0 +1,16 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== file.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + interface IntrinsicElements { + test1: {x: string}; + } + } + + var x: any; + // Should be OK + \ No newline at end of file diff --git a/tests/baselines/reference/tsxAttributeResolution8.types b/tests/baselines/reference/tsxAttributeResolution8.types index 2c1d895fde545..cfd445dc27f67 100644 --- a/tests/baselines/reference/tsxAttributeResolution8.types +++ b/tests/baselines/reference/tsxAttributeResolution8.types @@ -14,6 +14,7 @@ declare module JSX { var x: any; >x : any +> : ^^^ // Should be OK @@ -22,4 +23,5 @@ var x: any; >test1 : any > : ^^^ >x : any +> : ^^^ diff --git a/tests/baselines/reference/tsxAttributeResolution9.errors.txt b/tests/baselines/reference/tsxAttributeResolution9.errors.txt index 2339359950e14..2c27f082d394e 100644 --- a/tests/baselines/reference/tsxAttributeResolution9.errors.txt +++ b/tests/baselines/reference/tsxAttributeResolution9.errors.txt @@ -1,8 +1,11 @@ file.tsx(9,14): error TS2322: Type 'number' is not assignable to type 'string'. +react.d.ts(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. -==== react.d.ts (0 errors) ==== +==== react.d.ts (1 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { } diff --git a/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.errors.txt b/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.errors.txt new file mode 100644 index 0000000000000..ee390ee08c811 --- /dev/null +++ b/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.errors.txt @@ -0,0 +1,25 @@ +tsxCorrectlyParseLessThanComparison1.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== tsxCorrectlyParseLessThanComparison1.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { + div: string; + } + } + declare namespace React { + class Component { + constructor(props?: P, context?: any); + props: P; + } + } + + export class ShortDetails extends React.Component<{ id: number }, {}> { + public render(): JSX.Element { + if (this.props.id < 1) { + return (
); + } + } + } \ No newline at end of file diff --git a/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.types b/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.types index c2f4e13069a3a..2a460d9df0fce 100644 --- a/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.types +++ b/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.types @@ -20,6 +20,7 @@ declare namespace React { >props : P > : ^ >context : any +> : ^^^ props: P; >props : P @@ -62,8 +63,10 @@ export class ShortDetails extends React.Component<{ id: number }, {}> { > : ^ return (
); ->(
) : error ->
: error +>(
) : any +> : ^^^ +>
: any +> : ^^^ >div : any > : ^^^ >div : any diff --git a/tests/baselines/reference/tsxDynamicTagName2.errors.txt b/tests/baselines/reference/tsxDynamicTagName2.errors.txt index 2d65c21ad0e91..92fdf81cc0c3e 100644 --- a/tests/baselines/reference/tsxDynamicTagName2.errors.txt +++ b/tests/baselines/reference/tsxDynamicTagName2.errors.txt @@ -1,9 +1,12 @@ +tsxDynamicTagName2.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. tsxDynamicTagName2.tsx(9,1): error TS2339: Property 'customTag' does not exist on type 'JSX.IntrinsicElements'. tsxDynamicTagName2.tsx(9,25): error TS2339: Property 'customTag' does not exist on type 'JSX.IntrinsicElements'. -==== tsxDynamicTagName2.tsx (2 errors) ==== +==== tsxDynamicTagName2.tsx (3 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { div: any diff --git a/tests/baselines/reference/tsxDynamicTagName3.errors.txt b/tests/baselines/reference/tsxDynamicTagName3.errors.txt index 0e35fd3af4543..41fbf51bdc9d3 100644 --- a/tests/baselines/reference/tsxDynamicTagName3.errors.txt +++ b/tests/baselines/reference/tsxDynamicTagName3.errors.txt @@ -1,9 +1,12 @@ +tsxDynamicTagName3.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. tsxDynamicTagName3.tsx(9,1): error TS2339: Property 'h1' does not exist on type 'JSX.IntrinsicElements'. tsxDynamicTagName3.tsx(9,2): error TS2604: JSX element type 'CustomTag' does not have any construct or call signatures. -==== tsxDynamicTagName3.tsx (2 errors) ==== +==== tsxDynamicTagName3.tsx (3 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { div: any diff --git a/tests/baselines/reference/tsxDynamicTagName4.errors.txt b/tests/baselines/reference/tsxDynamicTagName4.errors.txt new file mode 100644 index 0000000000000..94afad308b1b0 --- /dev/null +++ b/tests/baselines/reference/tsxDynamicTagName4.errors.txt @@ -0,0 +1,16 @@ +tsxDynamicTagName4.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== tsxDynamicTagName4.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + interface IntrinsicElements { + div: any + h1: any + } + } + + var CustomTag: "h1" = "h1"; + Hello World \ No newline at end of file diff --git a/tests/baselines/reference/tsxDynamicTagName4.types b/tests/baselines/reference/tsxDynamicTagName4.types index d9252c1baae9f..cf907c1c8b6e7 100644 --- a/tests/baselines/reference/tsxDynamicTagName4.types +++ b/tests/baselines/reference/tsxDynamicTagName4.types @@ -6,9 +6,11 @@ declare module JSX { interface IntrinsicElements { div: any >div : any +> : ^^^ h1: any >h1 : any +> : ^^^ } } diff --git a/tests/baselines/reference/tsxDynamicTagName6.errors.txt b/tests/baselines/reference/tsxDynamicTagName6.errors.txt new file mode 100644 index 0000000000000..76b1298565e01 --- /dev/null +++ b/tests/baselines/reference/tsxDynamicTagName6.errors.txt @@ -0,0 +1,15 @@ +tsxDynamicTagName6.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== tsxDynamicTagName6.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + interface IntrinsicElements { + div: any + } + } + + const t = {tag:'h1'} + const foo = // No error \ No newline at end of file diff --git a/tests/baselines/reference/tsxDynamicTagName6.types b/tests/baselines/reference/tsxDynamicTagName6.types index 74559ac6dcffb..81e8dc22e2c9c 100644 --- a/tests/baselines/reference/tsxDynamicTagName6.types +++ b/tests/baselines/reference/tsxDynamicTagName6.types @@ -6,6 +6,7 @@ declare module JSX { interface IntrinsicElements { div: any >div : any +> : ^^^ } } diff --git a/tests/baselines/reference/tsxElementResolution.errors.txt b/tests/baselines/reference/tsxElementResolution.errors.txt new file mode 100644 index 0000000000000..e17235e21bc3c --- /dev/null +++ b/tests/baselines/reference/tsxElementResolution.errors.txt @@ -0,0 +1,30 @@ +tsxElementResolution.tsx(12,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== tsxElementResolution.tsx (1 errors) ==== + declare namespace JSX { + interface IntrinsicElements { + foundFirst: { x: string }; + 'string_named'; + 'var'; + } + } + + class foundFirst { } + class Other {} + + module Dotted { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export class Name { } + } + + // Should find the intrinsic element, not the class element + var a = ; + var b = ; + // TODO: This should not be a parse error (should + // parse a property name here, not identifier) + // var c = ; + var d = ; + var e = ; + \ No newline at end of file diff --git a/tests/baselines/reference/tsxElementResolution.types b/tests/baselines/reference/tsxElementResolution.types index 798cd8774cc46..6ad1eb6ea8b6e 100644 --- a/tests/baselines/reference/tsxElementResolution.types +++ b/tests/baselines/reference/tsxElementResolution.types @@ -11,9 +11,11 @@ declare namespace JSX { 'string_named'; >'string_named' : any +> : ^^^ 'var'; >'var' : any +> : ^^^ } } @@ -36,16 +38,20 @@ module Dotted { // Should find the intrinsic element, not the class element var a = ; ->a : error -> : error +>a : any +> : ^^^ +> : any +> : ^^^ >foundFirst : typeof foundFirst > : ^^^^^^^^^^^^^^^^^ >x : string > : ^^^^^^ var b = ; ->b : error -> : error +>b : any +> : ^^^ +> : any +> : ^^^ >string_named : any > : ^^^ @@ -53,14 +59,18 @@ var b = ; // parse a property name here, not identifier) // var c = ; var d = ; ->d : error -> : error +>d : any +> : ^^^ +> : any +> : ^^^ >Other : typeof Other > : ^^^^^^^^^^^^ var e = ; ->e : error -> : error +>e : any +> : ^^^ +> : any +> : ^^^ >Dotted.Name : typeof Dotted.Name > : ^^^^^^^^^^^^^^^^^^ >Dotted : typeof Dotted diff --git a/tests/baselines/reference/tsxElementResolution1.errors.txt b/tests/baselines/reference/tsxElementResolution1.errors.txt index 14b4701adb5d8..b3c6481bdbaeb 100644 --- a/tests/baselines/reference/tsxElementResolution1.errors.txt +++ b/tests/baselines/reference/tsxElementResolution1.errors.txt @@ -1,8 +1,11 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(12,1): error TS2339: Property 'span' does not exist on type 'JSX.IntrinsicElements'. -==== file.tsx (1 errors) ==== +==== file.tsx (2 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { div: any diff --git a/tests/baselines/reference/tsxElementResolution10.errors.txt b/tests/baselines/reference/tsxElementResolution10.errors.txt index cc2fb31328d47..fdb5bf0413e30 100644 --- a/tests/baselines/reference/tsxElementResolution10.errors.txt +++ b/tests/baselines/reference/tsxElementResolution10.errors.txt @@ -1,3 +1,4 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(13,2): error TS2322: Type '{ x: number; }' is not assignable to type 'string'. file.tsx(13,2): error TS2786: 'Obj1' cannot be used as a JSX component. Its instance type '{ x: number; }' is not a valid JSX element. @@ -5,8 +6,10 @@ file.tsx(13,2): error TS2786: 'Obj1' cannot be used as a JSX component. file.tsx(19,2): error TS2322: Type '{ x: number; render: number; }' is not assignable to type 'string'. -==== file.tsx (3 errors) ==== +==== file.tsx (4 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface ElementClass { render: any; diff --git a/tests/baselines/reference/tsxElementResolution11.errors.txt b/tests/baselines/reference/tsxElementResolution11.errors.txt index 6296e5b226654..a9dc8a10aa87c 100644 --- a/tests/baselines/reference/tsxElementResolution11.errors.txt +++ b/tests/baselines/reference/tsxElementResolution11.errors.txt @@ -1,9 +1,12 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(17,7): error TS2322: Type '{ x: number; }' is not assignable to type '{ q?: number; }'. Property 'x' does not exist on type '{ q?: number; }'. -==== file.tsx (1 errors) ==== +==== file.tsx (2 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface ElementAttributesProperty { } interface IntrinsicElements { } diff --git a/tests/baselines/reference/tsxElementResolution12.errors.txt b/tests/baselines/reference/tsxElementResolution12.errors.txt index 4ae68f689219d..2b77d6f91f2d8 100644 --- a/tests/baselines/reference/tsxElementResolution12.errors.txt +++ b/tests/baselines/reference/tsxElementResolution12.errors.txt @@ -1,11 +1,14 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(23,1): error TS2607: JSX element class does not support attributes because it does not have a 'pr' property. file.tsx(25,1): error TS2607: JSX element class does not support attributes because it does not have a 'pr' property. file.tsx(26,1): error TS2607: JSX element class does not support attributes because it does not have a 'pr' property. file.tsx(33,7): error TS2322: Type 'string' is not assignable to type 'number'. -==== file.tsx (4 errors) ==== +==== file.tsx (5 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface ElementAttributesProperty { pr: any; } interface IntrinsicElements { } diff --git a/tests/baselines/reference/tsxElementResolution13.errors.txt b/tests/baselines/reference/tsxElementResolution13.errors.txt new file mode 100644 index 0000000000000..be4af88180542 --- /dev/null +++ b/tests/baselines/reference/tsxElementResolution13.errors.txt @@ -0,0 +1,17 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== file.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + interface ElementAttributesProperty { pr1: any; pr2: any; } + } + + interface Obj1 { + new(n: string): any; + } + var obj1: Obj1; + ; // Error + \ No newline at end of file diff --git a/tests/baselines/reference/tsxElementResolution13.types b/tests/baselines/reference/tsxElementResolution13.types index 3f0b05cbc0524..e153ff2d87e8d 100644 --- a/tests/baselines/reference/tsxElementResolution13.types +++ b/tests/baselines/reference/tsxElementResolution13.types @@ -5,7 +5,9 @@ declare module JSX { interface Element { } interface ElementAttributesProperty { pr1: any; pr2: any; } >pr1 : any +> : ^^^ >pr2 : any +> : ^^^ } interface Obj1 { diff --git a/tests/baselines/reference/tsxElementResolution14.errors.txt b/tests/baselines/reference/tsxElementResolution14.errors.txt new file mode 100644 index 0000000000000..9b048211eccbd --- /dev/null +++ b/tests/baselines/reference/tsxElementResolution14.errors.txt @@ -0,0 +1,16 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== file.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + } + + interface Obj1 { + new(n: string): {}; + } + var obj1: Obj1; + ; // OK + \ No newline at end of file diff --git a/tests/baselines/reference/tsxElementResolution15.errors.txt b/tests/baselines/reference/tsxElementResolution15.errors.txt index c445681d5ecec..fee184d69e788 100644 --- a/tests/baselines/reference/tsxElementResolution15.errors.txt +++ b/tests/baselines/reference/tsxElementResolution15.errors.txt @@ -1,9 +1,12 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(3,12): error TS2608: The global type 'JSX.ElementAttributesProperty' may not have more than one property. file.tsx(11,2): error TS2322: Type '{ x: number; }' is not assignable to type 'string'. -==== file.tsx (2 errors) ==== +==== file.tsx (3 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface ElementAttributesProperty { pr1: any; pr2: any; } ~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/baselines/reference/tsxElementResolution16.errors.txt b/tests/baselines/reference/tsxElementResolution16.errors.txt index 8faeb1d54b5cb..da84cdbaf01b5 100644 --- a/tests/baselines/reference/tsxElementResolution16.errors.txt +++ b/tests/baselines/reference/tsxElementResolution16.errors.txt @@ -1,8 +1,11 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(8,1): error TS7026: JSX element implicitly has type 'any' because no interface 'JSX.IntrinsicElements' exists. -==== file.tsx (1 errors) ==== +==== file.tsx (2 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. } interface Obj1 { diff --git a/tests/baselines/reference/tsxElementResolution17.errors.txt b/tests/baselines/reference/tsxElementResolution17.errors.txt new file mode 100644 index 0000000000000..f79662576478f --- /dev/null +++ b/tests/baselines/reference/tsxElementResolution17.errors.txt @@ -0,0 +1,30 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== consumer.tsx (0 errors) ==== + /// + // Should keep s1 and elide s2 + import s1 = require('elements1'); + import s2 = require('elements2'); + ; + +==== file.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + interface IntrinsicElements { } + } + + declare module 'elements1' { + class MyElement { + + } + } + + declare module 'elements2' { + class MyElement { + + } + } + \ No newline at end of file diff --git a/tests/baselines/reference/tsxElementResolution18.errors.txt b/tests/baselines/reference/tsxElementResolution18.errors.txt index ac5441e50dae5..6efbd3dcd88f0 100644 --- a/tests/baselines/reference/tsxElementResolution18.errors.txt +++ b/tests/baselines/reference/tsxElementResolution18.errors.txt @@ -1,8 +1,11 @@ +file1.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file1.tsx(6,1): error TS7026: JSX element implicitly has type 'any' because no interface 'JSX.IntrinsicElements' exists. -==== file1.tsx (1 errors) ==== +==== file1.tsx (2 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } } diff --git a/tests/baselines/reference/tsxElementResolution19.errors.txt b/tests/baselines/reference/tsxElementResolution19.errors.txt new file mode 100644 index 0000000000000..c665cb1f73f38 --- /dev/null +++ b/tests/baselines/reference/tsxElementResolution19.errors.txt @@ -0,0 +1,23 @@ +file1.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== react.d.ts (0 errors) ==== + declare module "react" { + + } + +==== file1.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + } + export class MyClass { } + +==== file2.tsx (0 errors) ==== + // Should not elide React import + import * as React from 'react'; + import {MyClass} from './file1'; + + ; + \ No newline at end of file diff --git a/tests/baselines/reference/tsxElementResolution19.types b/tests/baselines/reference/tsxElementResolution19.types index 84abd9ed7fe86..aa1492af6e47d 100644 --- a/tests/baselines/reference/tsxElementResolution19.types +++ b/tests/baselines/reference/tsxElementResolution19.types @@ -26,7 +26,8 @@ import {MyClass} from './file1'; > : ^^^^^^^^^^^^^^ ; -> : error +> : any +> : ^^^ >MyClass : typeof MyClass > : ^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/tsxElementResolution2.errors.txt b/tests/baselines/reference/tsxElementResolution2.errors.txt new file mode 100644 index 0000000000000..6f84da27b2665 --- /dev/null +++ b/tests/baselines/reference/tsxElementResolution2.errors.txt @@ -0,0 +1,18 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== file.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + interface IntrinsicElements { + [x: string]: any; + } + } + + // OK +
; + + // OK + ; \ No newline at end of file diff --git a/tests/baselines/reference/tsxElementResolution3.errors.txt b/tests/baselines/reference/tsxElementResolution3.errors.txt index 9e136eb96e1f5..0fe07c725df89 100644 --- a/tests/baselines/reference/tsxElementResolution3.errors.txt +++ b/tests/baselines/reference/tsxElementResolution3.errors.txt @@ -1,9 +1,12 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(12,7): error TS2322: Type '{ w: string; }' is not assignable to type '{ n: string; }'. Property 'w' does not exist on type '{ n: string; }'. -==== file.tsx (1 errors) ==== +==== file.tsx (2 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { [x: string]: { n: string; }; diff --git a/tests/baselines/reference/tsxElementResolution4.errors.txt b/tests/baselines/reference/tsxElementResolution4.errors.txt index a47a97b2e6852..cda45e5b73d11 100644 --- a/tests/baselines/reference/tsxElementResolution4.errors.txt +++ b/tests/baselines/reference/tsxElementResolution4.errors.txt @@ -1,9 +1,12 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(16,7): error TS2322: Type '{ q: string; }' is not assignable to type '{ m: string; }'. Property 'q' does not exist on type '{ m: string; }'. -==== file.tsx (1 errors) ==== +==== file.tsx (2 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { div: { n: string; }; diff --git a/tests/baselines/reference/tsxElementResolution5.errors.txt b/tests/baselines/reference/tsxElementResolution5.errors.txt new file mode 100644 index 0000000000000..071bde5a5639f --- /dev/null +++ b/tests/baselines/reference/tsxElementResolution5.errors.txt @@ -0,0 +1,13 @@ +file1.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== file1.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + } + + // OK, but implicit any +
; + \ No newline at end of file diff --git a/tests/baselines/reference/tsxElementResolution6.errors.txt b/tests/baselines/reference/tsxElementResolution6.errors.txt index 640f49336e22b..a7f49c747c096 100644 --- a/tests/baselines/reference/tsxElementResolution6.errors.txt +++ b/tests/baselines/reference/tsxElementResolution6.errors.txt @@ -1,8 +1,11 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(8,1): error TS2339: Property 'div' does not exist on type 'JSX.IntrinsicElements'. -==== file.tsx (1 errors) ==== +==== file.tsx (2 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { } } diff --git a/tests/baselines/reference/tsxElementResolution7.errors.txt b/tests/baselines/reference/tsxElementResolution7.errors.txt index fbed105e3f69c..f5ab44383ec0e 100644 --- a/tests/baselines/reference/tsxElementResolution7.errors.txt +++ b/tests/baselines/reference/tsxElementResolution7.errors.txt @@ -1,14 +1,21 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +file.tsx(6,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(12,5): error TS2339: Property 'other' does not exist on type 'typeof my'. +file.tsx(14,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(19,11): error TS2339: Property 'non' does not exist on type 'typeof my'. -==== file.tsx (2 errors) ==== +==== file.tsx (5 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { } } module my { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. export var div: any; } // OK @@ -19,6 +26,8 @@ file.tsx(19,11): error TS2339: Property 'non' does not exist on type 'typeof my' !!! error TS2339: Property 'other' does not exist on type 'typeof my'. module q { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. import mine = my; // OK ; diff --git a/tests/baselines/reference/tsxElementResolution8.errors.txt b/tests/baselines/reference/tsxElementResolution8.errors.txt index 2ac2fb2d0ad6e..c86ea5aa75ced 100644 --- a/tests/baselines/reference/tsxElementResolution8.errors.txt +++ b/tests/baselines/reference/tsxElementResolution8.errors.txt @@ -1,9 +1,12 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(8,2): error TS2604: JSX element type 'Div' does not have any construct or call signatures. file.tsx(34,2): error TS2604: JSX element type 'Obj3' does not have any construct or call signatures. -==== file.tsx (2 errors) ==== +==== file.tsx (3 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { } } diff --git a/tests/baselines/reference/tsxElementResolution9.errors.txt b/tests/baselines/reference/tsxElementResolution9.errors.txt index d7d34730a348b..fab09f79d949c 100644 --- a/tests/baselines/reference/tsxElementResolution9.errors.txt +++ b/tests/baselines/reference/tsxElementResolution9.errors.txt @@ -1,3 +1,4 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(11,2): error TS2769: No overload matches this call. Overload 1 of 2, '(n: string): { x: number; }', gave the following error. Type '{}' is not assignable to type 'string'. @@ -21,8 +22,10 @@ file.tsx(25,2): error TS2786: 'Obj3' cannot be used as a JSX component. Property 'something' is missing in type '{ x: number; } & { x: number; y: string; }' but required in type 'Element'. -==== file.tsx (5 errors) ==== +==== file.tsx (6 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { something; } interface IntrinsicElements { } } diff --git a/tests/baselines/reference/tsxEmit1.errors.txt b/tests/baselines/reference/tsxEmit1.errors.txt new file mode 100644 index 0000000000000..d4f8c7ec663bc --- /dev/null +++ b/tests/baselines/reference/tsxEmit1.errors.txt @@ -0,0 +1,46 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== file.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + interface IntrinsicElements { + [s: string]: any; + } + } + + var p; + var selfClosed1 =
; + var selfClosed2 =
; + var selfClosed3 =
; + var selfClosed4 =
; + var selfClosed5 =
; + var selfClosed6 =
; + var selfClosed7 =
; + + var openClosed1 =
; + var openClosed2 =
foo
; + var openClosed3 =
{p}
; + var openClosed4 =
{p < p}
; + var openClosed5 =
{p > p}
; + + class SomeClass { + f() { + var rewrites1 =
{() => this}
; + var rewrites2 =
{[p, ...p, p]}
; + var rewrites3 =
{{p}}
; + + var rewrites4 =
this}>
; + var rewrites5 =
; + var rewrites6 =
; + } + } + + var whitespace1 =
; + var whitespace2 =
{p}
; + var whitespace3 =
+ {p} +
; + \ No newline at end of file diff --git a/tests/baselines/reference/tsxEmit1.types b/tests/baselines/reference/tsxEmit1.types index 3d54a51b0ce31..3eb4f3b55ee2e 100644 --- a/tests/baselines/reference/tsxEmit1.types +++ b/tests/baselines/reference/tsxEmit1.types @@ -12,6 +12,7 @@ declare module JSX { var p; >p : any +> : ^^^ var selfClosed1 =
; >selfClosed1 : JSX.Element @@ -89,7 +90,9 @@ var selfClosed7 =
; >div : any > : ^^^ >x : any +> : ^^^ >p : any +> : ^^^ >y : string > : ^^^^^^ @@ -125,6 +128,7 @@ var openClosed3 =
{p}
; >n : string > : ^^^^^^ >p : any +> : ^^^ >div : any > : ^^^ @@ -140,7 +144,9 @@ var openClosed4 =
{p < p}
; >p < p : boolean > : ^^^^^^^ >p : any +> : ^^^ >p : any +> : ^^^ >div : any > : ^^^ @@ -156,7 +162,9 @@ var openClosed5 =
{p > p}
; >p > p : boolean > : ^^^^^^^ >p : any +> : ^^^ >p : any +> : ^^^ >div : any > : ^^^ @@ -192,9 +200,13 @@ class SomeClass { >[p, ...p, p] : any[] > : ^^^^^ >p : any +> : ^^^ >...p : any +> : ^^^ >p : any +> : ^^^ >p : any +> : ^^^ >div : any > : ^^^ @@ -208,6 +220,7 @@ class SomeClass { >{p} : { p: any; } > : ^^^^^^^^^^^ >p : any +> : ^^^ >div : any > : ^^^ @@ -239,9 +252,13 @@ class SomeClass { >[p, ...p, p] : any[] > : ^^^^^ >p : any +> : ^^^ >...p : any +> : ^^^ >p : any +> : ^^^ >p : any +> : ^^^ >div : any > : ^^^ @@ -257,6 +274,7 @@ class SomeClass { >{p} : { p: any; } > : ^^^^^^^^^^^ >p : any +> : ^^^ >div : any > : ^^^ } @@ -280,6 +298,7 @@ var whitespace2 =
{p}
; >div : any > : ^^^ >p : any +> : ^^^ >div : any > : ^^^ @@ -293,6 +312,7 @@ var whitespace3 =
{p} >p : any +> : ^^^
; >div : any diff --git a/tests/baselines/reference/tsxEmit2.errors.txt b/tests/baselines/reference/tsxEmit2.errors.txt new file mode 100644 index 0000000000000..fcd1a5676019f --- /dev/null +++ b/tests/baselines/reference/tsxEmit2.errors.txt @@ -0,0 +1,20 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== file.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + interface IntrinsicElements { + [s: string]: any; + } + } + + var p1: any, p2: any, p3: any; + var spreads1 =
{p2}
; + var spreads2 =
{p2}
; + var spreads3 =
{p2}
; + var spreads4 =
{p2}
; + var spreads5 =
{p2}
; + \ No newline at end of file diff --git a/tests/baselines/reference/tsxEmit2.types b/tests/baselines/reference/tsxEmit2.types index 68c88e26d1a74..c3b468198a895 100644 --- a/tests/baselines/reference/tsxEmit2.types +++ b/tests/baselines/reference/tsxEmit2.types @@ -12,8 +12,11 @@ declare module JSX { var p1: any, p2: any, p3: any; >p1 : any +> : ^^^ >p2 : any +> : ^^^ >p3 : any +> : ^^^ var spreads1 =
{p2}
; >spreads1 : JSX.Element @@ -23,7 +26,9 @@ var spreads1 =
{p2}
; >div : any > : ^^^ >p1 : any +> : ^^^ >p2 : any +> : ^^^ >div : any > : ^^^ @@ -35,7 +40,9 @@ var spreads2 =
{p2}
; >div : any > : ^^^ >p1 : any +> : ^^^ >p2 : any +> : ^^^ >div : any > : ^^^ @@ -47,9 +54,13 @@ var spreads3 =
{p2}
; >div : any > : ^^^ >x : any +> : ^^^ >p3 : any +> : ^^^ >p1 : any +> : ^^^ >p2 : any +> : ^^^ >div : any > : ^^^ @@ -61,9 +72,13 @@ var spreads4 =
{p2}
; >div : any > : ^^^ >p1 : any +> : ^^^ >x : any +> : ^^^ >p3 : any +> : ^^^ >p2 : any +> : ^^^ >div : any > : ^^^ @@ -75,11 +90,17 @@ var spreads5 =
{p2}
; >div : any > : ^^^ >x : any +> : ^^^ >p2 : any +> : ^^^ >p1 : any +> : ^^^ >y : any +> : ^^^ >p3 : any +> : ^^^ >p2 : any +> : ^^^ >div : any > : ^^^ diff --git a/tests/baselines/reference/tsxEmit3.errors.txt b/tests/baselines/reference/tsxEmit3.errors.txt index 6cd649f866a58..fb86c5fa504ab 100644 --- a/tests/baselines/reference/tsxEmit3.errors.txt +++ b/tests/baselines/reference/tsxEmit3.errors.txt @@ -1,18 +1,31 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +file.tsx(6,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +file.tsx(8,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +file.tsx(16,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(18,2): error TS2695: Left side of comma operator is unused and has no side effects. +file.tsx(20,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(22,3): error TS2695: Left side of comma operator is unused and has no side effects. file.tsx(25,3): error TS2695: Left side of comma operator is unused and has no side effects. +file.tsx(30,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +file.tsx(35,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(38,2): error TS2695: Left side of comma operator is unused and has no side effects. -==== file.tsx (4 errors) ==== +==== file.tsx (11 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { } } module M { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. export class Foo { constructor() { } } export module S { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. export class Bar { } // Emit Foo @@ -21,12 +34,16 @@ file.tsx(38,2): error TS2695: Left side of comma operator is unused and has no s } module M { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. // Emit M.Foo Foo, ; ~~~ !!! error TS2695: Left side of comma operator is unused and has no side effects. export module S { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. // Emit M.Foo Foo, ; ~~~ @@ -41,11 +58,15 @@ file.tsx(38,2): error TS2695: Left side of comma operator is unused and has no s } module M { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. // Emit M.S.Bar S.Bar, ; } module M { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. var M = 100; // Emit M_1.Foo Foo, ; diff --git a/tests/baselines/reference/tsxFragmentErrors.errors.txt b/tests/baselines/reference/tsxFragmentErrors.errors.txt index 1f64c9fba44f4..fd4352f73dc8e 100644 --- a/tests/baselines/reference/tsxFragmentErrors.errors.txt +++ b/tests/baselines/reference/tsxFragmentErrors.errors.txt @@ -1,11 +1,14 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(9,7): error TS2304: Cannot find name 'div'. file.tsx(9,7): error TS17015: Expected corresponding closing tag for JSX fragment. file.tsx(9,11): error TS17014: JSX fragment has no corresponding closing tag. file.tsx(11,17): error TS1005: '; // no whitespace + < >; // lots of whitespace + < /*starting wrap*/ >; // comments in the tags + <>hi; // text inside + <>hi
bye
; // children + <>1<>2.12.23; // nested fragments + <>#; // # would cause scanning error if not in jsxtext \ No newline at end of file diff --git a/tests/baselines/reference/tsxFragmentPreserveEmit.types b/tests/baselines/reference/tsxFragmentPreserveEmit.types index 6623a6581c5fe..c408a78e30af5 100644 --- a/tests/baselines/reference/tsxFragmentPreserveEmit.types +++ b/tests/baselines/reference/tsxFragmentPreserveEmit.types @@ -11,6 +11,7 @@ declare module JSX { } declare var React: any; >React : any +> : ^^^ <>; // no whitespace ><> : JSX.Element diff --git a/tests/baselines/reference/tsxFragmentReactEmit.errors.txt b/tests/baselines/reference/tsxFragmentReactEmit.errors.txt new file mode 100644 index 0000000000000..1c7b24444400a --- /dev/null +++ b/tests/baselines/reference/tsxFragmentReactEmit.errors.txt @@ -0,0 +1,21 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== file.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + interface IntrinsicElements { + [s: string]: any; + } + } + declare var React: any; + + <>; // no whitespace + < >; // lots of whitespace + < /*starting wrap*/ >; // comments in the tags + <>hi; // text inside + <>hi
bye
; // children + <>1<>2.12.23; // nested fragments + <>#; // # would cause scanning error if not in jsxtext \ No newline at end of file diff --git a/tests/baselines/reference/tsxFragmentReactEmit.types b/tests/baselines/reference/tsxFragmentReactEmit.types index 925d67e86f1f5..79d114572f0fe 100644 --- a/tests/baselines/reference/tsxFragmentReactEmit.types +++ b/tests/baselines/reference/tsxFragmentReactEmit.types @@ -11,6 +11,7 @@ declare module JSX { } declare var React: any; >React : any +> : ^^^ <>; // no whitespace ><> : JSX.Element diff --git a/tests/baselines/reference/tsxGenericArrowFunctionParsing.errors.txt b/tests/baselines/reference/tsxGenericArrowFunctionParsing.errors.txt index 1886cbe92af77..074435de76c66 100644 --- a/tests/baselines/reference/tsxGenericArrowFunctionParsing.errors.txt +++ b/tests/baselines/reference/tsxGenericArrowFunctionParsing.errors.txt @@ -1,10 +1,13 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(8,17): error TS1382: Unexpected token. Did you mean `{'>'}` or `>`? file.tsx(20,32): error TS1382: Unexpected token. Did you mean `{'>'}` or `>`? file.tsx(24,25): error TS1382: Unexpected token. Did you mean `{'>'}` or `>`? -==== file.tsx (3 errors) ==== +==== file.tsx (4 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { isElement; } } diff --git a/tests/baselines/reference/tsxOpeningClosingNames.errors.txt b/tests/baselines/reference/tsxOpeningClosingNames.errors.txt new file mode 100644 index 0000000000000..886b090cae8db --- /dev/null +++ b/tests/baselines/reference/tsxOpeningClosingNames.errors.txt @@ -0,0 +1,25 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +file.tsx(5,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +file.tsx(5,18): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +file.tsx(5,20): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== file.tsx (4 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + } + + declare module A.B.C { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + var D: any; + } + + foo + \ No newline at end of file diff --git a/tests/baselines/reference/tsxOpeningClosingNames.types b/tests/baselines/reference/tsxOpeningClosingNames.types index 73ef8a42136f7..82688cc6cc47a 100644 --- a/tests/baselines/reference/tsxOpeningClosingNames.types +++ b/tests/baselines/reference/tsxOpeningClosingNames.types @@ -15,12 +15,14 @@ declare module A.B.C { var D: any; >D : any +> : ^^^ } foo >foo : JSX.Element > : ^^^^^^^^^^^ >A.B.C.D : any +> : ^^^ >A.B.C : typeof A.B.C > : ^^^^^^^^^^^^ >A.B : typeof A.B @@ -34,6 +36,7 @@ declare module A.B.C { >D : any > : ^^^ >A . B . C.D : any +> : ^^^ >A . B . C : typeof A.B.C > : ^^^^^^^^^^^^ >A . B : typeof A.B diff --git a/tests/baselines/reference/tsxParseTests1.errors.txt b/tests/baselines/reference/tsxParseTests1.errors.txt new file mode 100644 index 0000000000000..124c15854ce43 --- /dev/null +++ b/tests/baselines/reference/tsxParseTests1.errors.txt @@ -0,0 +1,13 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== file.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + interface IntrinsicElements { div; span; } + } + + var x =
; + \ No newline at end of file diff --git a/tests/baselines/reference/tsxParseTests1.types b/tests/baselines/reference/tsxParseTests1.types index 68c0cb92d1c2a..2378f85713c6e 100644 --- a/tests/baselines/reference/tsxParseTests1.types +++ b/tests/baselines/reference/tsxParseTests1.types @@ -5,7 +5,9 @@ declare module JSX { interface Element { } interface IntrinsicElements { div; span; } >div : any +> : ^^^ >span : any +> : ^^^ } var x =
; diff --git a/tests/baselines/reference/tsxParseTests2.errors.txt b/tests/baselines/reference/tsxParseTests2.errors.txt new file mode 100644 index 0000000000000..7097d9d6de872 --- /dev/null +++ b/tests/baselines/reference/tsxParseTests2.errors.txt @@ -0,0 +1,13 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== file.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + interface IntrinsicElements { div; span; } + } + + var x =
; + \ No newline at end of file diff --git a/tests/baselines/reference/tsxParseTests2.types b/tests/baselines/reference/tsxParseTests2.types index b76f472260804..f8cf845fc8876 100644 --- a/tests/baselines/reference/tsxParseTests2.types +++ b/tests/baselines/reference/tsxParseTests2.types @@ -5,7 +5,9 @@ declare module JSX { interface Element { } interface IntrinsicElements { div; span; } >div : any +> : ^^^ >span : any +> : ^^^ } var x =
; diff --git a/tests/baselines/reference/tsxPreserveEmit1.errors.txt b/tests/baselines/reference/tsxPreserveEmit1.errors.txt new file mode 100644 index 0000000000000..be46ad9ecc038 --- /dev/null +++ b/tests/baselines/reference/tsxPreserveEmit1.errors.txt @@ -0,0 +1,42 @@ +react.d.ts(6,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +test.tsx(9,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +test.tsx(12,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== test.tsx (2 errors) ==== + // Should emit 'react-router' in the AMD dependency list + import React = require('react'); + import ReactRouter = require('react-router'); + + import Route = ReactRouter.Route; + + var routes1 = ; + + module M { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + export var X: any; + } + module M { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + // Should emit 'M.X' in both opening and closing tags + var y = ; + } + +==== react.d.ts (1 errors) ==== + declare module 'react' { + var x: any; + export = x; + } + + declare module ReactRouter { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + var Route: any; + interface Thing { } + } + declare module 'react-router' { + export = ReactRouter; + } + \ No newline at end of file diff --git a/tests/baselines/reference/tsxPreserveEmit1.types b/tests/baselines/reference/tsxPreserveEmit1.types index 3b1d03d9fb37e..ed5230cf866b3 100644 --- a/tests/baselines/reference/tsxPreserveEmit1.types +++ b/tests/baselines/reference/tsxPreserveEmit1.types @@ -19,9 +19,12 @@ import Route = ReactRouter.Route; > : ^^^ var routes1 = ; ->routes1 : error -> : error +>routes1 : any +> : ^^^ +> : any +> : ^^^ >Route : any +> : ^^^ module M { >M : typeof M @@ -29,6 +32,7 @@ module M { export var X: any; >X : any +> : ^^^ } module M { >M : typeof M @@ -36,10 +40,14 @@ module M { // Should emit 'M.X' in both opening and closing tags var y = ; ->y : error -> : error +>y : any +> : ^^^ +> : any +> : ^^^ >X : any +> : ^^^ >X : any +> : ^^^ } === react.d.ts === @@ -49,6 +57,7 @@ declare module 'react' { var x: any; >x : any +> : ^^^ export = x; >x : any @@ -61,6 +70,7 @@ declare module ReactRouter { var Route: any; >Route : any +> : ^^^ interface Thing { } } diff --git a/tests/baselines/reference/tsxPreserveEmit3.errors.txt b/tests/baselines/reference/tsxPreserveEmit3.errors.txt new file mode 100644 index 0000000000000..2b729491b972a --- /dev/null +++ b/tests/baselines/reference/tsxPreserveEmit3.errors.txt @@ -0,0 +1,20 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== file.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + interface IntrinsicElements { + [s: string]: any; + } + } + +==== test.d.ts (0 errors) ==== + export var React; + +==== react-consumer.tsx (0 errors) ==== + // This import should be elided + import {React} from "./test"; + \ No newline at end of file diff --git a/tests/baselines/reference/tsxPreserveEmit3.types b/tests/baselines/reference/tsxPreserveEmit3.types index 2419af27a3ec4..f708932c21602 100644 --- a/tests/baselines/reference/tsxPreserveEmit3.types +++ b/tests/baselines/reference/tsxPreserveEmit3.types @@ -13,6 +13,7 @@ declare module JSX { === test.d.ts === export var React; >React : any +> : ^^^ === react-consumer.tsx === // This import should be elided diff --git a/tests/baselines/reference/tsxReactEmit1.errors.txt b/tests/baselines/reference/tsxReactEmit1.errors.txt new file mode 100644 index 0000000000000..1bd4eaeb6b2ab --- /dev/null +++ b/tests/baselines/reference/tsxReactEmit1.errors.txt @@ -0,0 +1,47 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== file.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + interface IntrinsicElements { + [s: string]: any; + } + } + declare var React: any; + + var p; + var selfClosed1 =
; + var selfClosed2 =
; + var selfClosed3 =
; + var selfClosed4 =
; + var selfClosed5 =
; + var selfClosed6 =
; + var selfClosed7 =
; + + var openClosed1 =
; + var openClosed2 =
foo
; + var openClosed3 =
{p}
; + var openClosed4 =
{p < p}
; + var openClosed5 =
{p > p}
; + + class SomeClass { + f() { + var rewrites1 =
{() => this}
; + var rewrites2 =
{[p, ...p, p]}
; + var rewrites3 =
{{p}}
; + + var rewrites4 =
this}>
; + var rewrites5 =
; + var rewrites6 =
; + } + } + + var whitespace1 =
; + var whitespace2 =
{p}
; + var whitespace3 =
+ {p} +
; + \ No newline at end of file diff --git a/tests/baselines/reference/tsxReactEmit1.types b/tests/baselines/reference/tsxReactEmit1.types index dce76f2538cdd..2f567886e1f75 100644 --- a/tests/baselines/reference/tsxReactEmit1.types +++ b/tests/baselines/reference/tsxReactEmit1.types @@ -11,9 +11,11 @@ declare module JSX { } declare var React: any; >React : any +> : ^^^ var p; >p : any +> : ^^^ var selfClosed1 =
; >selfClosed1 : JSX.Element @@ -91,7 +93,9 @@ var selfClosed7 =
; >div : any > : ^^^ >x : any +> : ^^^ >p : any +> : ^^^ >y : string > : ^^^^^^ >b : true @@ -129,6 +133,7 @@ var openClosed3 =
{p}
; >n : string > : ^^^^^^ >p : any +> : ^^^ >div : any > : ^^^ @@ -144,7 +149,9 @@ var openClosed4 =
{p < p}
; >p < p : boolean > : ^^^^^^^ >p : any +> : ^^^ >p : any +> : ^^^ >div : any > : ^^^ @@ -162,7 +169,9 @@ var openClosed5 =
{p > p}
; >p > p : boolean > : ^^^^^^^ >p : any +> : ^^^ >p : any +> : ^^^ >div : any > : ^^^ @@ -198,9 +207,13 @@ class SomeClass { >[p, ...p, p] : any[] > : ^^^^^ >p : any +> : ^^^ >...p : any +> : ^^^ >p : any +> : ^^^ >p : any +> : ^^^ >div : any > : ^^^ @@ -214,6 +227,7 @@ class SomeClass { >{p} : { p: any; } > : ^^^^^^^^^^^ >p : any +> : ^^^ >div : any > : ^^^ @@ -245,9 +259,13 @@ class SomeClass { >[p, ...p, p] : any[] > : ^^^^^ >p : any +> : ^^^ >...p : any +> : ^^^ >p : any +> : ^^^ >p : any +> : ^^^ >div : any > : ^^^ @@ -263,6 +281,7 @@ class SomeClass { >{p} : { p: any; } > : ^^^^^^^^^^^ >p : any +> : ^^^ >div : any > : ^^^ } @@ -286,6 +305,7 @@ var whitespace2 =
{p}
; >div : any > : ^^^ >p : any +> : ^^^ >div : any > : ^^^ @@ -299,6 +319,7 @@ var whitespace3 =
{p} >p : any +> : ^^^
; >div : any diff --git a/tests/baselines/reference/tsxReactEmit2.errors.txt b/tests/baselines/reference/tsxReactEmit2.errors.txt new file mode 100644 index 0000000000000..4c3aac7ec681e --- /dev/null +++ b/tests/baselines/reference/tsxReactEmit2.errors.txt @@ -0,0 +1,21 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== file.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + interface IntrinsicElements { + [s: string]: any; + } + } + declare var React: any; + + var p1: any, p2: any, p3: any; + var spreads1 =
{p2}
; + var spreads2 =
{p2}
; + var spreads3 =
{p2}
; + var spreads4 =
{p2}
; + var spreads5 =
{p2}
; + \ No newline at end of file diff --git a/tests/baselines/reference/tsxReactEmit2.types b/tests/baselines/reference/tsxReactEmit2.types index 7dff2c8ef6019..c8842b94c9722 100644 --- a/tests/baselines/reference/tsxReactEmit2.types +++ b/tests/baselines/reference/tsxReactEmit2.types @@ -11,11 +11,15 @@ declare module JSX { } declare var React: any; >React : any +> : ^^^ var p1: any, p2: any, p3: any; >p1 : any +> : ^^^ >p2 : any +> : ^^^ >p3 : any +> : ^^^ var spreads1 =
{p2}
; >spreads1 : JSX.Element @@ -25,7 +29,9 @@ var spreads1 =
{p2}
; >div : any > : ^^^ >p1 : any +> : ^^^ >p2 : any +> : ^^^ >div : any > : ^^^ @@ -37,7 +43,9 @@ var spreads2 =
{p2}
; >div : any > : ^^^ >p1 : any +> : ^^^ >p2 : any +> : ^^^ >div : any > : ^^^ @@ -49,9 +57,13 @@ var spreads3 =
{p2}
; >div : any > : ^^^ >x : any +> : ^^^ >p3 : any +> : ^^^ >p1 : any +> : ^^^ >p2 : any +> : ^^^ >div : any > : ^^^ @@ -63,9 +75,13 @@ var spreads4 =
{p2}
; >div : any > : ^^^ >p1 : any +> : ^^^ >x : any +> : ^^^ >p3 : any +> : ^^^ >p2 : any +> : ^^^ >div : any > : ^^^ @@ -77,11 +93,17 @@ var spreads5 =
{p2}
; >div : any > : ^^^ >x : any +> : ^^^ >p2 : any +> : ^^^ >p1 : any +> : ^^^ >y : any +> : ^^^ >p3 : any +> : ^^^ >p2 : any +> : ^^^ >div : any > : ^^^ diff --git a/tests/baselines/reference/tsxReactEmit3.errors.txt b/tests/baselines/reference/tsxReactEmit3.errors.txt new file mode 100644 index 0000000000000..491863932f627 --- /dev/null +++ b/tests/baselines/reference/tsxReactEmit3.errors.txt @@ -0,0 +1,12 @@ +test.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== test.tsx (1 errors) ==== + declare module JSX { interface Element { } } + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + declare var React: any; + + declare var Foo, Bar, baz; + + q s ; \ No newline at end of file diff --git a/tests/baselines/reference/tsxReactEmit3.types b/tests/baselines/reference/tsxReactEmit3.types index ef3786fbf2f23..dbdf153f45ae6 100644 --- a/tests/baselines/reference/tsxReactEmit3.types +++ b/tests/baselines/reference/tsxReactEmit3.types @@ -4,28 +4,39 @@ declare module JSX { interface Element { } } declare var React: any; >React : any +> : ^^^ declare var Foo, Bar, baz; >Foo : any +> : ^^^ >Bar : any +> : ^^^ >baz : any +> : ^^^ q s ; > q s : JSX.Element > : ^^^^^^^^^^^ >Foo : any +> : ^^^ > q : JSX.Element > : ^^^^^^^^^^^ >Bar : any +> : ^^^ >Bar : any +> : ^^^ > : JSX.Element > : ^^^^^^^^^^^ >Bar : any +> : ^^^ > : JSX.Element > : ^^^^^^^^^^^ >Bar : any +> : ^^^ > : JSX.Element > : ^^^^^^^^^^^ >Bar : any +> : ^^^ >Foo : any +> : ^^^ diff --git a/tests/baselines/reference/tsxReactEmit4.errors.txt b/tests/baselines/reference/tsxReactEmit4.errors.txt index cd634c4a2393a..ab2e08eb2654c 100644 --- a/tests/baselines/reference/tsxReactEmit4.errors.txt +++ b/tests/baselines/reference/tsxReactEmit4.errors.txt @@ -1,8 +1,11 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(12,5): error TS2304: Cannot find name 'blah'. -==== file.tsx (1 errors) ==== +==== file.tsx (2 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { [s: string]: any; diff --git a/tests/baselines/reference/tsxReactEmit5.errors.txt b/tests/baselines/reference/tsxReactEmit5.errors.txt new file mode 100644 index 0000000000000..6f6885148fb64 --- /dev/null +++ b/tests/baselines/reference/tsxReactEmit5.errors.txt @@ -0,0 +1,23 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== file.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + interface IntrinsicElements { + [s: string]: any; + } + } + +==== test.d.ts (0 errors) ==== + export var React; + +==== react-consumer.tsx (0 errors) ==== + import {React} from "./test"; + // Should emit test_1.React.createElement + // and React.__spread + var foo: any; + var spread1 =
; + \ No newline at end of file diff --git a/tests/baselines/reference/tsxReactEmit5.types b/tests/baselines/reference/tsxReactEmit5.types index 9d0e211292e66..8b93de05856bf 100644 --- a/tests/baselines/reference/tsxReactEmit5.types +++ b/tests/baselines/reference/tsxReactEmit5.types @@ -13,6 +13,7 @@ declare module JSX { === test.d.ts === export var React; >React : any +> : ^^^ === react-consumer.tsx === import {React} from "./test"; @@ -23,6 +24,7 @@ import {React} from "./test"; // and React.__spread var foo: any; >foo : any +> : ^^^ var spread1 =
; >spread1 : JSX.Element @@ -34,6 +36,7 @@ var spread1 =
; >x : string > : ^^^^^^ >foo : any +> : ^^^ >y : string > : ^^^^^^ diff --git a/tests/baselines/reference/tsxReactEmit6.errors.txt b/tests/baselines/reference/tsxReactEmit6.errors.txt new file mode 100644 index 0000000000000..c0a907c63de43 --- /dev/null +++ b/tests/baselines/reference/tsxReactEmit6.errors.txt @@ -0,0 +1,29 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== file.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + interface IntrinsicElements { + [s: string]: any; + } + } + +==== react-consumer.tsx (0 errors) ==== + namespace M { + export var React: any; + } + + namespace M { + // Should emit M.React.createElement + // and M.React.__spread + var foo: any; + var spread1 =
; + + // Quotes + var x =
This "quote" thing
; + } + + \ No newline at end of file diff --git a/tests/baselines/reference/tsxReactEmit6.types b/tests/baselines/reference/tsxReactEmit6.types index 71943031d6149..7850e45e966c7 100644 --- a/tests/baselines/reference/tsxReactEmit6.types +++ b/tests/baselines/reference/tsxReactEmit6.types @@ -17,6 +17,7 @@ namespace M { export var React: any; >React : any +> : ^^^ } namespace M { @@ -27,6 +28,7 @@ namespace M { // and M.React.__spread var foo: any; >foo : any +> : ^^^ var spread1 =
; >spread1 : JSX.Element @@ -38,6 +40,7 @@ namespace M { >x : string > : ^^^^^^ >foo : any +> : ^^^ >y : string > : ^^^^^^ diff --git a/tests/baselines/reference/tsxReactEmit7.errors.txt b/tests/baselines/reference/tsxReactEmit7.errors.txt index c640c0107ff89..848646ddeebcd 100644 --- a/tests/baselines/reference/tsxReactEmit7.errors.txt +++ b/tests/baselines/reference/tsxReactEmit7.errors.txt @@ -1,3 +1,4 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. file.tsx(8,10): error TS2874: This JSX tag requires 'React' to be in scope, but it could not be found. file.tsx(9,10): error TS2874: This JSX tag requires 'React' to be in scope, but it could not be found. file.tsx(10,10): error TS2874: This JSX tag requires 'React' to be in scope, but it could not be found. @@ -9,8 +10,10 @@ file.tsx(17,10): error TS2874: This JSX tag requires 'React' to be in scope, but file.tsx(18,10): error TS2874: This JSX tag requires 'React' to be in scope, but it could not be found. -==== file.tsx (9 errors) ==== +==== file.tsx (10 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { [s: string]: any; diff --git a/tests/baselines/reference/tsxReactEmitEntities.errors.txt b/tests/baselines/reference/tsxReactEmitEntities.errors.txt new file mode 100644 index 0000000000000..8a2b70e9dc5c4 --- /dev/null +++ b/tests/baselines/reference/tsxReactEmitEntities.errors.txt @@ -0,0 +1,28 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== file.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + interface IntrinsicElements { + [s: string]: any; + } + } + declare var React: any; + +
Dot goes here: · ¬AnEntity;
; +
Be careful of "-ed strings!
; +
{{braces}}
; + // Escapes do nothing +
\n
; + + // Also works in string literal attributes +
; + // Does not happen for a string literal that happens to be inside an attribute (and escapes then work) +
; + // Preserves single quotes +
; + // https://github.com/microsoft/TypeScript/issues/35732 +
🐈🐕🐇🐑
; \ No newline at end of file diff --git a/tests/baselines/reference/tsxReactEmitEntities.types b/tests/baselines/reference/tsxReactEmitEntities.types index 096a0e0976ba0..c62888da0840b 100644 --- a/tests/baselines/reference/tsxReactEmitEntities.types +++ b/tests/baselines/reference/tsxReactEmitEntities.types @@ -11,6 +11,7 @@ declare module JSX { } declare var React: any; >React : any +> : ^^^
Dot goes here: · ¬AnEntity;
; >
Dot goes here: · ¬AnEntity;
: JSX.Element diff --git a/tests/baselines/reference/tsxReactEmitWhitespace.errors.txt b/tests/baselines/reference/tsxReactEmitWhitespace.errors.txt new file mode 100644 index 0000000000000..81135e51785d4 --- /dev/null +++ b/tests/baselines/reference/tsxReactEmitWhitespace.errors.txt @@ -0,0 +1,70 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== file.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + interface IntrinsicElements { + [s: string]: any; + } + } + declare var React: any; + + // THIS FILE HAS TEST-SIGNIFICANT LEADING/TRAILING + // WHITESPACE, DO NOT RUN 'FORMAT DOCUMENT' ON IT + + var p = 0; + // Emit " " +
; + // Emit " ", p, " " +
{p}
; + // Emit only p +
+ {p} +
; + + // Emit only p +
+ {p} +
; + + // Emit " 3" +
3 +
; + + // Emit " 3 " +
3
; + + // Emit "3" +
+ 3 +
; + + // Emit no args +
+
; + + // Emit "foo bar" +
+ + foo + + bar + +
; + + // Emit "hello\\ world" +
+ + hello\ + + world +
; + + // Emit " a b c d " +
a + b c + d
; + \ No newline at end of file diff --git a/tests/baselines/reference/tsxReactEmitWhitespace.types b/tests/baselines/reference/tsxReactEmitWhitespace.types index a14632989603f..7bb8fea6ed14d 100644 --- a/tests/baselines/reference/tsxReactEmitWhitespace.types +++ b/tests/baselines/reference/tsxReactEmitWhitespace.types @@ -11,6 +11,7 @@ declare module JSX { } declare var React: any; >React : any +> : ^^^ // THIS FILE HAS TEST-SIGNIFICANT LEADING/TRAILING // WHITESPACE, DO NOT RUN 'FORMAT DOCUMENT' ON IT diff --git a/tests/baselines/reference/tsxReactEmitWhitespace2.errors.txt b/tests/baselines/reference/tsxReactEmitWhitespace2.errors.txt new file mode 100644 index 0000000000000..0a4e5bd6784cc --- /dev/null +++ b/tests/baselines/reference/tsxReactEmitWhitespace2.errors.txt @@ -0,0 +1,22 @@ +file.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== file.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + interface IntrinsicElements { + [s: string]: any; + } + } + declare var React: any; + + // Emit ' word' in the last string +
word code word
; + // Same here +
code word
; + // And here +
word
; + + \ No newline at end of file diff --git a/tests/baselines/reference/tsxReactEmitWhitespace2.types b/tests/baselines/reference/tsxReactEmitWhitespace2.types index 9462fc05066ad..100cedd7dcdec 100644 --- a/tests/baselines/reference/tsxReactEmitWhitespace2.types +++ b/tests/baselines/reference/tsxReactEmitWhitespace2.types @@ -11,6 +11,7 @@ declare module JSX { } declare var React: any; >React : any +> : ^^^ // Emit ' word' in the last string
word code word
; diff --git a/tests/baselines/reference/tsxSpreadChildren.errors.txt b/tests/baselines/reference/tsxSpreadChildren.errors.txt new file mode 100644 index 0000000000000..25d6c57f89107 --- /dev/null +++ b/tests/baselines/reference/tsxSpreadChildren.errors.txt @@ -0,0 +1,32 @@ +tsxSpreadChildren.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== tsxSpreadChildren.tsx (1 errors) ==== + declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + interface Element { } + interface IntrinsicElements { + [s: string]: any; + } + } + declare var React: any; + + interface TodoProp { + id: number; + todo: string; + } + interface TodoListProps { + todos: TodoProp[]; + } + function Todo(prop: { key: number, todo: string }) { + return
{prop.key.toString() + prop.todo}
; + } + function TodoList({ todos }: TodoListProps) { + return
+ {...todos.map(todo => )} +
; + } + let x: TodoListProps; + + \ No newline at end of file diff --git a/tests/baselines/reference/tsxSpreadChildren.types b/tests/baselines/reference/tsxSpreadChildren.types index c60b95ace1470..423d13a5ba9cc 100644 --- a/tests/baselines/reference/tsxSpreadChildren.types +++ b/tests/baselines/reference/tsxSpreadChildren.types @@ -11,6 +11,7 @@ declare module JSX { } declare var React: any; >React : any +> : ^^^ interface TodoProp { id: number; diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es2015).errors.txt b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es2015).errors.txt index 2451cbd0d775c..e5616d7599279 100644 --- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es2015).errors.txt +++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es2015).errors.txt @@ -1,8 +1,11 @@ +tsxSpreadChildrenInvalidType.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. tsxSpreadChildrenInvalidType.tsx(21,9): error TS2609: JSX spread child must be an array type. -==== tsxSpreadChildrenInvalidType.tsx (1 errors) ==== +==== tsxSpreadChildrenInvalidType.tsx (2 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { [s: string]: any; diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).errors.txt b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).errors.txt index 2451cbd0d775c..e5616d7599279 100644 --- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).errors.txt +++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).errors.txt @@ -1,8 +1,11 @@ +tsxSpreadChildrenInvalidType.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. tsxSpreadChildrenInvalidType.tsx(21,9): error TS2609: JSX spread child must be an array type. -==== tsxSpreadChildrenInvalidType.tsx (1 errors) ==== +==== tsxSpreadChildrenInvalidType.tsx (2 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { [s: string]: any; diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).errors.txt b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).errors.txt index 508f839052887..187ce6df0c5ea 100644 --- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).errors.txt +++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).errors.txt @@ -1,9 +1,12 @@ +tsxSpreadChildrenInvalidType.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. tsxSpreadChildrenInvalidType.tsx(17,12): error TS2792: Cannot find module 'react/jsx-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? tsxSpreadChildrenInvalidType.tsx(21,9): error TS2609: JSX spread child must be an array type. -==== tsxSpreadChildrenInvalidType.tsx (2 errors) ==== +==== tsxSpreadChildrenInvalidType.tsx (3 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { [s: string]: any; diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).errors.txt b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).errors.txt index 5d9568a1b87f0..ed86f9a77ec20 100644 --- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).errors.txt +++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).errors.txt @@ -1,9 +1,12 @@ +tsxSpreadChildrenInvalidType.tsx(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. tsxSpreadChildrenInvalidType.tsx(17,12): error TS2875: This JSX tag requires the module path 'react/jsx-runtime' to exist, but none could be found. Make sure you have types for the appropriate package installed. tsxSpreadChildrenInvalidType.tsx(21,9): error TS2609: JSX spread child must be an array type. -==== tsxSpreadChildrenInvalidType.tsx (2 errors) ==== +==== tsxSpreadChildrenInvalidType.tsx (3 errors) ==== declare module JSX { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. interface Element { } interface IntrinsicElements { [s: string]: any; diff --git a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.errors.txt b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.errors.txt index c6ff07cf337ce..79565519a6bf0 100644 --- a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.errors.txt +++ b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.errors.txt @@ -37,7 +37,7 @@ twoGenericInterfacesDifferingByTypeParameterName.ts(56,22): error TS2428: All de y: V; } - module M { + namespace M { interface A { ~ !!! error TS2428: All declarations of 'A' must have identical type parameters. @@ -63,19 +63,19 @@ twoGenericInterfacesDifferingByTypeParameterName.ts(56,22): error TS2428: All de } } - module M2 { + namespace M2 { interface B { x: U; } } - module M2 { + namespace M2 { interface B { // ok, different declaration space than other M2 y: V; } } - module M3 { + namespace M3 { export interface B { ~ !!! error TS2428: All declarations of 'B' must have identical type parameters. @@ -83,7 +83,7 @@ twoGenericInterfacesDifferingByTypeParameterName.ts(56,22): error TS2428: All de } } - module M3 { + namespace M3 { export interface B { // error ~ !!! error TS2428: All declarations of 'B' must have identical type parameters. diff --git a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.js b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.js index 3afcaa525ae63..d326808605404 100644 --- a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.js +++ b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.js @@ -19,7 +19,7 @@ interface B { // error y: V; } -module M { +namespace M { interface A { x: T; } @@ -37,25 +37,25 @@ module M { } } -module M2 { +namespace M2 { interface B { x: U; } } -module M2 { +namespace M2 { interface B { // ok, different declaration space than other M2 y: V; } } -module M3 { +namespace M3 { export interface B { x: U; } } -module M3 { +namespace M3 { export interface B { // error y: V; } diff --git a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.symbols b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.symbols index 856e6df77af3a..bf6745dad380d 100644 --- a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.symbols +++ b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.symbols @@ -41,11 +41,11 @@ interface B { // error >V : Symbol(V, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 14, 14)) } -module M { +namespace M { >M : Symbol(M, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 16, 1)) interface A { ->A : Symbol(A, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 18, 10), Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 21, 5)) +>A : Symbol(A, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 18, 13), Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 21, 5)) >T : Symbol(T, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 19, 16)) x: T; @@ -54,7 +54,7 @@ module M { } interface A { // error ->A : Symbol(A, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 18, 10), Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 21, 5)) +>A : Symbol(A, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 18, 13), Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 21, 5)) >U : Symbol(U, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 23, 16)) y: U; @@ -83,11 +83,11 @@ module M { } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 34, 1), Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 40, 1)) interface B { ->B : Symbol(B, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 36, 11)) +>B : Symbol(B, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 36, 14)) >T : Symbol(T, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 37, 16)) >U : Symbol(U, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 37, 18)) @@ -97,11 +97,11 @@ module M2 { } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 34, 1), Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 40, 1)) interface B { // ok, different declaration space than other M2 ->B : Symbol(B, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 42, 11)) +>B : Symbol(B, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 42, 14)) >T : Symbol(T, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 43, 16)) >V : Symbol(V, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 43, 18)) @@ -111,11 +111,11 @@ module M2 { } } -module M3 { +namespace M3 { >M3 : Symbol(M3, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 46, 1), Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 52, 1)) export interface B { ->B : Symbol(B, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 48, 11), Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 54, 11)) +>B : Symbol(B, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 48, 14), Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 54, 14)) >T : Symbol(T, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 49, 23), Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 55, 23)) >U : Symbol(U, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 49, 25)) @@ -125,11 +125,11 @@ module M3 { } } -module M3 { +namespace M3 { >M3 : Symbol(M3, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 46, 1), Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 52, 1)) export interface B { // error ->B : Symbol(B, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 48, 11), Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 54, 11)) +>B : Symbol(B, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 48, 14), Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 54, 14)) >T : Symbol(T, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 49, 23), Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 55, 23)) >V : Symbol(V, Decl(twoGenericInterfacesDifferingByTypeParameterName.ts, 55, 25)) diff --git a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.types b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.types index 4df081d0c7c57..fd15320812b03 100644 --- a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.types +++ b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.types @@ -27,7 +27,7 @@ interface B { // error > : ^ } -module M { +namespace M { interface A { x: T; >x : T @@ -53,7 +53,7 @@ module M { } } -module M2 { +namespace M2 { interface B { x: U; >x : U @@ -61,7 +61,7 @@ module M2 { } } -module M2 { +namespace M2 { interface B { // ok, different declaration space than other M2 y: V; >y : V @@ -69,7 +69,7 @@ module M2 { } } -module M3 { +namespace M3 { export interface B { x: U; >x : U @@ -77,7 +77,7 @@ module M3 { } } -module M3 { +namespace M3 { export interface B { // error y: V; >y : V diff --git a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.errors.txt b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.errors.txt index c5ad989c5540f..3ddb6258b86c8 100644 --- a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.errors.txt +++ b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.errors.txt @@ -24,7 +24,7 @@ twoGenericInterfacesDifferingByTypeParameterName2.ts(40,22): error TS2428: All d !!! error TS2304: Cannot find name 'V'. } - module M { + namespace M { interface B { ~ !!! error TS2428: All declarations of 'B' must have identical type parameters. @@ -38,19 +38,19 @@ twoGenericInterfacesDifferingByTypeParameterName2.ts(40,22): error TS2428: All d } } - module M2 { + namespace M2 { interface B { x: U; } } - module M2 { + namespace M2 { interface B { // ok, different declaration space than other M2 y: T; } } - module M3 { + namespace M3 { export interface B { ~ !!! error TS2428: All declarations of 'B' must have identical type parameters. @@ -58,7 +58,7 @@ twoGenericInterfacesDifferingByTypeParameterName2.ts(40,22): error TS2428: All d } } - module M3 { + namespace M3 { export interface B { // error ~ !!! error TS2428: All declarations of 'B' must have identical type parameters. diff --git a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.js b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.js index 99d975acc363a..9ff35a37b98e3 100644 --- a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.js +++ b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.js @@ -11,7 +11,7 @@ interface B { // error y: V; } -module M { +namespace M { interface B { x: U; } @@ -21,25 +21,25 @@ module M { } } -module M2 { +namespace M2 { interface B { x: U; } } -module M2 { +namespace M2 { interface B { // ok, different declaration space than other M2 y: T; } } -module M3 { +namespace M3 { export interface B { x: U; } } -module M3 { +namespace M3 { export interface B { // error y: T; } diff --git a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.symbols b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.symbols index 827baf7caa012..e69480fd17da6 100644 --- a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.symbols +++ b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.symbols @@ -23,11 +23,11 @@ interface B { // error >V : Symbol(V) } -module M { +namespace M { >M : Symbol(M, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 8, 1)) interface B { ->B : Symbol(B, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 10, 10), Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 13, 5)) +>B : Symbol(B, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 10, 13), Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 13, 5)) >T : Symbol(T, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 11, 16), Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 15, 18)) >U : Symbol(U, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 11, 18), Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 15, 16)) @@ -37,7 +37,7 @@ module M { } interface B { // error ->B : Symbol(B, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 10, 10), Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 13, 5)) +>B : Symbol(B, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 10, 13), Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 13, 5)) >U : Symbol(U, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 11, 18), Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 15, 16)) >T : Symbol(T, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 11, 16), Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 15, 18)) @@ -47,11 +47,11 @@ module M { } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 18, 1), Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 24, 1)) interface B { ->B : Symbol(B, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 20, 11)) +>B : Symbol(B, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 20, 14)) >T : Symbol(T, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 21, 16)) >U : Symbol(U, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 21, 18)) @@ -61,11 +61,11 @@ module M2 { } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 18, 1), Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 24, 1)) interface B { // ok, different declaration space than other M2 ->B : Symbol(B, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 26, 11)) +>B : Symbol(B, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 26, 14)) >U : Symbol(U, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 27, 16)) >T : Symbol(T, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 27, 18)) @@ -75,11 +75,11 @@ module M2 { } } -module M3 { +namespace M3 { >M3 : Symbol(M3, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 30, 1), Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 36, 1)) export interface B { ->B : Symbol(B, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 32, 11), Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 38, 11)) +>B : Symbol(B, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 32, 14), Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 38, 14)) >T : Symbol(T, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 33, 23), Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 39, 25)) >U : Symbol(U, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 33, 25), Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 39, 23)) @@ -89,11 +89,11 @@ module M3 { } } -module M3 { +namespace M3 { >M3 : Symbol(M3, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 30, 1), Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 36, 1)) export interface B { // error ->B : Symbol(B, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 32, 11), Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 38, 11)) +>B : Symbol(B, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 32, 14), Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 38, 14)) >U : Symbol(U, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 33, 25), Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 39, 23)) >T : Symbol(T, Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 33, 23), Decl(twoGenericInterfacesDifferingByTypeParameterName2.ts, 39, 25)) diff --git a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.types b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.types index 0bdce58eb6118..dd7b83725f60d 100644 --- a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.types +++ b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.types @@ -15,7 +15,7 @@ interface B { // error > : ^ } -module M { +namespace M { interface B { x: U; >x : U @@ -29,7 +29,7 @@ module M { } } -module M2 { +namespace M2 { interface B { x: U; >x : U @@ -37,7 +37,7 @@ module M2 { } } -module M2 { +namespace M2 { interface B { // ok, different declaration space than other M2 y: T; >y : T @@ -45,7 +45,7 @@ module M2 { } } -module M3 { +namespace M3 { export interface B { x: U; >x : U @@ -53,7 +53,7 @@ module M3 { } } -module M3 { +namespace M3 { export interface B { // error y: T; >y : T diff --git a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.errors.txt b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.errors.txt index a64ab9200f0e5..62fd7cf7e0008 100644 --- a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.errors.txt +++ b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.errors.txt @@ -19,7 +19,7 @@ twoGenericInterfacesWithDifferentConstraints.ts(38,22): error TS2428: All declar y: T; } - module M { + namespace M { interface B> { ~ !!! error TS2428: All declarations of 'B' must have identical type parameters. @@ -33,19 +33,19 @@ twoGenericInterfacesWithDifferentConstraints.ts(38,22): error TS2428: All declar } } - module M2 { + namespace M2 { interface A { x: T; } } - module M2 { + namespace M2 { interface A { // ok, different declaration space from other M2.A y: T; } } - module M3 { + namespace M3 { export interface A { ~ !!! error TS2428: All declarations of 'A' must have identical type parameters. @@ -53,7 +53,7 @@ twoGenericInterfacesWithDifferentConstraints.ts(38,22): error TS2428: All declar } } - module M3 { + namespace M3 { export interface A { // error ~ !!! error TS2428: All declarations of 'A' must have identical type parameters. diff --git a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.js b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.js index be8573a21ded3..99aa3af4e00a7 100644 --- a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.js +++ b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.js @@ -9,7 +9,7 @@ interface A { // error y: T; } -module M { +namespace M { interface B> { x: T; } @@ -19,25 +19,25 @@ module M { } } -module M2 { +namespace M2 { interface A { x: T; } } -module M2 { +namespace M2 { interface A { // ok, different declaration space from other M2.A y: T; } } -module M3 { +namespace M3 { export interface A { x: T; } } -module M3 { +namespace M3 { export interface A { // error y: T; } diff --git a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.symbols b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.symbols index 541f727708288..64e3ba21f4336 100644 --- a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.symbols +++ b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.symbols @@ -21,11 +21,11 @@ interface A { // error >T : Symbol(T, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 0, 12), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 4, 12)) } -module M { +namespace M { >M : Symbol(M, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 6, 1)) interface B> { ->B : Symbol(B, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 8, 10), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 11, 5)) +>B : Symbol(B, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 8, 13), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 11, 5)) >T : Symbol(T, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 9, 16), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 13, 16)) >A : Symbol(A, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 0, 0), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 2, 1)) >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --)) @@ -36,7 +36,7 @@ module M { } interface B> { // error ->B : Symbol(B, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 8, 10), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 11, 5)) +>B : Symbol(B, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 8, 13), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 11, 5)) >T : Symbol(T, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 9, 16), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 13, 16)) >A : Symbol(A, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 0, 0), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 2, 1)) @@ -46,11 +46,11 @@ module M { } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 16, 1), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 22, 1)) interface A { ->A : Symbol(A, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 18, 11)) +>A : Symbol(A, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 18, 14)) >T : Symbol(T, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 19, 16)) >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --)) @@ -60,11 +60,11 @@ module M2 { } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 16, 1), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 22, 1)) interface A { // ok, different declaration space from other M2.A ->A : Symbol(A, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 24, 11)) +>A : Symbol(A, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 24, 14)) >T : Symbol(T, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 25, 16)) >Number : Symbol(Number, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) @@ -74,11 +74,11 @@ module M2 { } } -module M3 { +namespace M3 { >M3 : Symbol(M3, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 28, 1), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 34, 1)) export interface A { ->A : Symbol(A, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 30, 11), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 36, 11)) +>A : Symbol(A, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 30, 14), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 36, 14)) >T : Symbol(T, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 31, 23), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 37, 23)) >Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --)) @@ -88,11 +88,11 @@ module M3 { } } -module M3 { +namespace M3 { >M3 : Symbol(M3, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 28, 1), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 34, 1)) export interface A { // error ->A : Symbol(A, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 30, 11), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 36, 11)) +>A : Symbol(A, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 30, 14), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 36, 14)) >T : Symbol(T, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 31, 23), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 37, 23)) >Number : Symbol(Number, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) diff --git a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.types b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.types index d952720038a9b..20b79fb4c9e87 100644 --- a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.types +++ b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.types @@ -13,7 +13,7 @@ interface A { // error > : ^ } -module M { +namespace M { interface B> { x: T; >x : T @@ -27,7 +27,7 @@ module M { } } -module M2 { +namespace M2 { interface A { x: T; >x : T @@ -35,7 +35,7 @@ module M2 { } } -module M2 { +namespace M2 { interface A { // ok, different declaration space from other M2.A y: T; >y : T @@ -43,7 +43,7 @@ module M2 { } } -module M3 { +namespace M3 { export interface A { x: T; >x : T @@ -51,7 +51,7 @@ module M3 { } } -module M3 { +namespace M3 { export interface A { // error y: T; >y : T diff --git a/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.errors.txt b/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.errors.txt index 55daa94d0079d..d1a79bddea300 100644 --- a/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.errors.txt +++ b/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.errors.txt @@ -19,7 +19,7 @@ twoGenericInterfacesWithTheSameNameButDifferentArity.ts(38,22): error TS2428: Al y: T; } - module M { + namespace M { interface A { ~ !!! error TS2428: All declarations of 'A' must have identical type parameters. @@ -33,19 +33,19 @@ twoGenericInterfacesWithTheSameNameButDifferentArity.ts(38,22): error TS2428: Al } } - module M2 { + namespace M2 { interface A { x: T; } } - module M2 { + namespace M2 { interface A { // ok, different declaration space than other M2 y: T; } } - module M3 { + namespace M3 { export interface A { ~ !!! error TS2428: All declarations of 'A' must have identical type parameters. @@ -53,7 +53,7 @@ twoGenericInterfacesWithTheSameNameButDifferentArity.ts(38,22): error TS2428: Al } } - module M3 { + namespace M3 { export interface A { // error ~ !!! error TS2428: All declarations of 'A' must have identical type parameters. diff --git a/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.js b/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.js index 8011e190fdc13..e3851e4a4e845 100644 --- a/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.js +++ b/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.js @@ -9,7 +9,7 @@ interface A { // error y: T; } -module M { +namespace M { interface A { x: T; } @@ -19,25 +19,25 @@ module M { } } -module M2 { +namespace M2 { interface A { x: T; } } -module M2 { +namespace M2 { interface A { // ok, different declaration space than other M2 y: T; } } -module M3 { +namespace M3 { export interface A { x: T; } } -module M3 { +namespace M3 { export interface A { // error y: T; } diff --git a/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.symbols b/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.symbols index a457d89ff4cd4..dac0804a3a24e 100644 --- a/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.symbols +++ b/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.symbols @@ -20,11 +20,11 @@ interface A { // error >T : Symbol(T, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 0, 12), Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 4, 12)) } -module M { +namespace M { >M : Symbol(M, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 6, 1)) interface A { ->A : Symbol(A, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 8, 10), Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 11, 5)) +>A : Symbol(A, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 8, 13), Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 11, 5)) >T : Symbol(T, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 9, 16), Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 13, 16)) x: T; @@ -33,7 +33,7 @@ module M { } interface A { // error ->A : Symbol(A, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 8, 10), Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 11, 5)) +>A : Symbol(A, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 8, 13), Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 11, 5)) >T : Symbol(T, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 9, 16), Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 13, 16)) >U : Symbol(U, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 13, 18)) @@ -43,11 +43,11 @@ module M { } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 16, 1), Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 22, 1)) interface A { ->A : Symbol(A, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 18, 11)) +>A : Symbol(A, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 18, 14)) >T : Symbol(T, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 19, 16)) x: T; @@ -56,11 +56,11 @@ module M2 { } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 16, 1), Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 22, 1)) interface A { // ok, different declaration space than other M2 ->A : Symbol(A, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 24, 11)) +>A : Symbol(A, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 24, 14)) >T : Symbol(T, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 25, 16)) >U : Symbol(U, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 25, 18)) @@ -70,11 +70,11 @@ module M2 { } } -module M3 { +namespace M3 { >M3 : Symbol(M3, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 28, 1), Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 34, 1)) export interface A { ->A : Symbol(A, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 30, 11), Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 36, 11)) +>A : Symbol(A, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 30, 14), Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 36, 14)) >T : Symbol(T, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 31, 23), Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 37, 23)) x: T; @@ -83,11 +83,11 @@ module M3 { } } -module M3 { +namespace M3 { >M3 : Symbol(M3, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 28, 1), Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 34, 1)) export interface A { // error ->A : Symbol(A, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 30, 11), Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 36, 11)) +>A : Symbol(A, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 30, 14), Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 36, 14)) >T : Symbol(T, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 31, 23), Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 37, 23)) >U : Symbol(U, Decl(twoGenericInterfacesWithTheSameNameButDifferentArity.ts, 37, 25)) diff --git a/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.types b/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.types index 15efc965909e0..d0c655e03660b 100644 --- a/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.types +++ b/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.types @@ -13,7 +13,7 @@ interface A { // error > : ^ } -module M { +namespace M { interface A { x: T; >x : T @@ -27,7 +27,7 @@ module M { } } -module M2 { +namespace M2 { interface A { x: T; >x : T @@ -35,7 +35,7 @@ module M2 { } } -module M2 { +namespace M2 { interface A { // ok, different declaration space than other M2 y: T; >y : T @@ -43,7 +43,7 @@ module M2 { } } -module M3 { +namespace M3 { export interface A { x: T; >x : T @@ -51,7 +51,7 @@ module M3 { } } -module M3 { +namespace M3 { export interface A { // error y: T; >y : T diff --git a/tests/baselines/reference/twoInterfacesDifferentRootModule.errors.txt b/tests/baselines/reference/twoInterfacesDifferentRootModule.errors.txt index 7f5fdb77d2e97..b39a1ab1b8ced 100644 --- a/tests/baselines/reference/twoInterfacesDifferentRootModule.errors.txt +++ b/tests/baselines/reference/twoInterfacesDifferentRootModule.errors.txt @@ -5,7 +5,7 @@ twoInterfacesDifferentRootModule.ts(27,16): error TS2339: Property 'foo' does no ==== twoInterfacesDifferentRootModule.ts (2 errors) ==== // two interfaces with different root modules should not merge - module M { + namespace M { export interface A { foo: string; } @@ -15,7 +15,7 @@ twoInterfacesDifferentRootModule.ts(27,16): error TS2339: Property 'foo' does no } } - module M2 { + namespace M2 { export interface A { bar: number; } diff --git a/tests/baselines/reference/twoInterfacesDifferentRootModule.js b/tests/baselines/reference/twoInterfacesDifferentRootModule.js index dc1a51361ebd7..abc9a27d934db 100644 --- a/tests/baselines/reference/twoInterfacesDifferentRootModule.js +++ b/tests/baselines/reference/twoInterfacesDifferentRootModule.js @@ -3,7 +3,7 @@ //// [twoInterfacesDifferentRootModule.ts] // two interfaces with different root modules should not merge -module M { +namespace M { export interface A { foo: string; } @@ -13,7 +13,7 @@ module M { } } -module M2 { +namespace M2 { export interface A { bar: number; } diff --git a/tests/baselines/reference/twoInterfacesDifferentRootModule.symbols b/tests/baselines/reference/twoInterfacesDifferentRootModule.symbols index 77960d8a8062a..7dbd1f5bf03c2 100644 --- a/tests/baselines/reference/twoInterfacesDifferentRootModule.symbols +++ b/tests/baselines/reference/twoInterfacesDifferentRootModule.symbols @@ -3,11 +3,11 @@ === twoInterfacesDifferentRootModule.ts === // two interfaces with different root modules should not merge -module M { +namespace M { >M : Symbol(M, Decl(twoInterfacesDifferentRootModule.ts, 0, 0)) export interface A { ->A : Symbol(A, Decl(twoInterfacesDifferentRootModule.ts, 2, 10)) +>A : Symbol(A, Decl(twoInterfacesDifferentRootModule.ts, 2, 13)) foo: string; >foo : Symbol(A.foo, Decl(twoInterfacesDifferentRootModule.ts, 3, 24)) @@ -23,11 +23,11 @@ module M { } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(twoInterfacesDifferentRootModule.ts, 10, 1)) export interface A { ->A : Symbol(A, Decl(twoInterfacesDifferentRootModule.ts, 12, 11)) +>A : Symbol(A, Decl(twoInterfacesDifferentRootModule.ts, 12, 14)) bar: number; >bar : Symbol(A.bar, Decl(twoInterfacesDifferentRootModule.ts, 13, 24)) @@ -35,7 +35,7 @@ module M2 { var a: A; >a : Symbol(a, Decl(twoInterfacesDifferentRootModule.ts, 17, 7)) ->A : Symbol(A, Decl(twoInterfacesDifferentRootModule.ts, 12, 11)) +>A : Symbol(A, Decl(twoInterfacesDifferentRootModule.ts, 12, 14)) var r1 = a.foo; // error >r1 : Symbol(r1, Decl(twoInterfacesDifferentRootModule.ts, 18, 7)) diff --git a/tests/baselines/reference/twoInterfacesDifferentRootModule.types b/tests/baselines/reference/twoInterfacesDifferentRootModule.types index 7fb6b2d477b94..7caf54bc64966 100644 --- a/tests/baselines/reference/twoInterfacesDifferentRootModule.types +++ b/tests/baselines/reference/twoInterfacesDifferentRootModule.types @@ -3,7 +3,7 @@ === twoInterfacesDifferentRootModule.ts === // two interfaces with different root modules should not merge -module M { +namespace M { export interface A { foo: string; >foo : string @@ -17,7 +17,7 @@ module M { } } -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/twoInterfacesDifferentRootModule2.errors.txt b/tests/baselines/reference/twoInterfacesDifferentRootModule2.errors.txt index 89bc2c51f3af6..55ba198e0ce47 100644 --- a/tests/baselines/reference/twoInterfacesDifferentRootModule2.errors.txt +++ b/tests/baselines/reference/twoInterfacesDifferentRootModule2.errors.txt @@ -7,7 +7,7 @@ twoInterfacesDifferentRootModule2.ts(36,16): error TS2339: Property 'bar' does n ==== twoInterfacesDifferentRootModule2.ts (4 errors) ==== // two interfaces with different root modules should not merge - module M { + namespace M { export interface A { foo: string; } @@ -16,7 +16,7 @@ twoInterfacesDifferentRootModule2.ts(36,16): error TS2339: Property 'bar' does n foo: T; } - module M2 { + namespace M2 { export interface A { bar: number; } diff --git a/tests/baselines/reference/twoInterfacesDifferentRootModule2.js b/tests/baselines/reference/twoInterfacesDifferentRootModule2.js index 2e301952041e9..042699b1c3523 100644 --- a/tests/baselines/reference/twoInterfacesDifferentRootModule2.js +++ b/tests/baselines/reference/twoInterfacesDifferentRootModule2.js @@ -3,7 +3,7 @@ //// [twoInterfacesDifferentRootModule2.ts] // two interfaces with different root modules should not merge -module M { +namespace M { export interface A { foo: string; } @@ -12,7 +12,7 @@ module M { foo: T; } - module M2 { + namespace M2 { export interface A { bar: number; } diff --git a/tests/baselines/reference/twoInterfacesDifferentRootModule2.symbols b/tests/baselines/reference/twoInterfacesDifferentRootModule2.symbols index 6fbba3a04daef..9e1b322985727 100644 --- a/tests/baselines/reference/twoInterfacesDifferentRootModule2.symbols +++ b/tests/baselines/reference/twoInterfacesDifferentRootModule2.symbols @@ -3,11 +3,11 @@ === twoInterfacesDifferentRootModule2.ts === // two interfaces with different root modules should not merge -module M { +namespace M { >M : Symbol(M, Decl(twoInterfacesDifferentRootModule2.ts, 0, 0)) export interface A { ->A : Symbol(A, Decl(twoInterfacesDifferentRootModule2.ts, 2, 10)) +>A : Symbol(A, Decl(twoInterfacesDifferentRootModule2.ts, 2, 13)) foo: string; >foo : Symbol(A.foo, Decl(twoInterfacesDifferentRootModule2.ts, 3, 24)) @@ -22,11 +22,11 @@ module M { >T : Symbol(T, Decl(twoInterfacesDifferentRootModule2.ts, 7, 23)) } - module M2 { + namespace M2 { >M2 : Symbol(M2, Decl(twoInterfacesDifferentRootModule2.ts, 9, 5)) export interface A { ->A : Symbol(A, Decl(twoInterfacesDifferentRootModule2.ts, 11, 15)) +>A : Symbol(A, Decl(twoInterfacesDifferentRootModule2.ts, 11, 18)) bar: number; >bar : Symbol(A.bar, Decl(twoInterfacesDifferentRootModule2.ts, 12, 28)) @@ -34,7 +34,7 @@ module M { var a: A; >a : Symbol(a, Decl(twoInterfacesDifferentRootModule2.ts, 16, 11)) ->A : Symbol(A, Decl(twoInterfacesDifferentRootModule2.ts, 11, 15)) +>A : Symbol(A, Decl(twoInterfacesDifferentRootModule2.ts, 11, 18)) var r1 = a.foo; // error >r1 : Symbol(r1, Decl(twoInterfacesDifferentRootModule2.ts, 17, 11)) @@ -72,7 +72,7 @@ module M { var a: A; >a : Symbol(a, Decl(twoInterfacesDifferentRootModule2.ts, 29, 7)) ->A : Symbol(A, Decl(twoInterfacesDifferentRootModule2.ts, 2, 10)) +>A : Symbol(A, Decl(twoInterfacesDifferentRootModule2.ts, 2, 13)) var r1 = a.foo; >r1 : Symbol(r1, Decl(twoInterfacesDifferentRootModule2.ts, 30, 7)) diff --git a/tests/baselines/reference/twoInterfacesDifferentRootModule2.types b/tests/baselines/reference/twoInterfacesDifferentRootModule2.types index e1313a7ea5b20..6f800ceaa271c 100644 --- a/tests/baselines/reference/twoInterfacesDifferentRootModule2.types +++ b/tests/baselines/reference/twoInterfacesDifferentRootModule2.types @@ -3,7 +3,7 @@ === twoInterfacesDifferentRootModule2.ts === // two interfaces with different root modules should not merge -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -19,7 +19,7 @@ module M { > : ^ } - module M2 { + namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.js b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.js index 272df332402b1..a39c077a13181 100644 --- a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.js +++ b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.js @@ -15,7 +15,7 @@ var r = a(); var r2 = a(1); var r3 = a(1, 2); -module G { +namespace G { interface A { (): string; (x: T): T; diff --git a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.symbols b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.symbols index ac34be231d426..c92a441137bcc 100644 --- a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.symbols +++ b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.symbols @@ -33,11 +33,11 @@ var r3 = a(1, 2); >r3 : Symbol(r3, Decl(twoMergedInterfacesWithDifferingOverloads2.ts, 12, 3)) >a : Symbol(a, Decl(twoMergedInterfacesWithDifferingOverloads2.ts, 9, 3)) -module G { +namespace G { >G : Symbol(G, Decl(twoMergedInterfacesWithDifferingOverloads2.ts, 12, 17)) interface A { ->A : Symbol(A, Decl(twoMergedInterfacesWithDifferingOverloads2.ts, 14, 10), Decl(twoMergedInterfacesWithDifferingOverloads2.ts, 18, 5)) +>A : Symbol(A, Decl(twoMergedInterfacesWithDifferingOverloads2.ts, 14, 13), Decl(twoMergedInterfacesWithDifferingOverloads2.ts, 18, 5)) >T : Symbol(T, Decl(twoMergedInterfacesWithDifferingOverloads2.ts, 15, 16), Decl(twoMergedInterfacesWithDifferingOverloads2.ts, 20, 16)) (): string; @@ -48,7 +48,7 @@ module G { } interface A { ->A : Symbol(A, Decl(twoMergedInterfacesWithDifferingOverloads2.ts, 14, 10), Decl(twoMergedInterfacesWithDifferingOverloads2.ts, 18, 5)) +>A : Symbol(A, Decl(twoMergedInterfacesWithDifferingOverloads2.ts, 14, 13), Decl(twoMergedInterfacesWithDifferingOverloads2.ts, 18, 5)) >T : Symbol(T, Decl(twoMergedInterfacesWithDifferingOverloads2.ts, 15, 16), Decl(twoMergedInterfacesWithDifferingOverloads2.ts, 20, 16)) (x: T, y: number): T; @@ -68,7 +68,7 @@ module G { var a: A; >a : Symbol(a, Decl(twoMergedInterfacesWithDifferingOverloads2.ts, 25, 7)) ->A : Symbol(A, Decl(twoMergedInterfacesWithDifferingOverloads2.ts, 14, 10), Decl(twoMergedInterfacesWithDifferingOverloads2.ts, 18, 5)) +>A : Symbol(A, Decl(twoMergedInterfacesWithDifferingOverloads2.ts, 14, 13), Decl(twoMergedInterfacesWithDifferingOverloads2.ts, 18, 5)) var r = a(); >r : Symbol(r, Decl(twoMergedInterfacesWithDifferingOverloads2.ts, 26, 7)) diff --git a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types index 4d3f8db5ebcc2..48bc90a9ceffd 100644 --- a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types +++ b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types @@ -50,7 +50,7 @@ var r3 = a(1, 2); >2 : 2 > : ^ -module G { +namespace G { >G : typeof G > : ^^^^^^^^ diff --git a/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.js b/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.js index 798dd8b4e8005..ff658c1ba7174 100644 --- a/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.js +++ b/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/typeAliasDoesntMakeModuleInstantiated.ts] //// //// [typeAliasDoesntMakeModuleInstantiated.ts] -declare module m { +declare namespace m { // type alias declaration here shouldnt make the module declaration instantiated type Selector = string| string[] |Function; diff --git a/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.symbols b/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.symbols index 037373732b792..99478c61dd728 100644 --- a/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.symbols +++ b/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.symbols @@ -1,12 +1,12 @@ //// [tests/cases/compiler/typeAliasDoesntMakeModuleInstantiated.ts] //// === typeAliasDoesntMakeModuleInstantiated.ts === -declare module m { +declare namespace m { >m : Symbol(m, Decl(typeAliasDoesntMakeModuleInstantiated.ts, 0, 0), Decl(typeAliasDoesntMakeModuleInstantiated.ts, 9, 11)) // type alias declaration here shouldnt make the module declaration instantiated type Selector = string| string[] |Function; ->Selector : Symbol(Selector, Decl(typeAliasDoesntMakeModuleInstantiated.ts, 0, 18)) +>Selector : Symbol(Selector, Decl(typeAliasDoesntMakeModuleInstantiated.ts, 0, 21)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) export interface IStatic { diff --git a/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.types b/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.types index 58ff347de9069..4bd9a796df44d 100644 --- a/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.types +++ b/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/typeAliasDoesntMakeModuleInstantiated.ts] //// === typeAliasDoesntMakeModuleInstantiated.ts === -declare module m { +declare namespace m { // type alias declaration here shouldnt make the module declaration instantiated type Selector = string| string[] |Function; >Selector : Selector diff --git a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.errors.txt b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.errors.txt new file mode 100644 index 0000000000000..4221e15868e8c --- /dev/null +++ b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.errors.txt @@ -0,0 +1,88 @@ +typeGuardsInFunctionAndModuleBlock.ts(68,5): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +typeGuardsInFunctionAndModuleBlock.ts(68,15): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== typeGuardsInFunctionAndModuleBlock.ts (2 errors) ==== + // typeguards are scoped in function/module block + + function foo(x: number | string | boolean) { + return typeof x === "string" + ? x + : function f() { + var b = x; // number | boolean + return typeof x === "boolean" + ? x.toString() // boolean + : x.toString(); // number + } (); + } + function foo2(x: number | string | boolean) { + return typeof x === "string" + ? x + : function f(a: number | boolean) { + var b = x; // new scope - number | boolean + return typeof x === "boolean" + ? x.toString() // boolean + : x.toString(); // number + } (x); // x here is narrowed to number | boolean + } + function foo3(x: number | string | boolean) { + return typeof x === "string" + ? x + : (() => { + var b = x; // new scope - number | boolean + return typeof x === "boolean" + ? x.toString() // boolean + : x.toString(); // number + })(); + } + function foo4(x: number | string | boolean) { + return typeof x === "string" + ? x + : ((a: number | boolean) => { + var b = x; // new scope - number | boolean + return typeof x === "boolean" + ? x.toString() // boolean + : x.toString(); // number + })(x); // x here is narrowed to number | boolean + } + // Type guards do not affect nested function declarations + function foo5(x: number | string | boolean) { + if (typeof x === "string") { + var y = x; // string; + function foo() { + var z = x; // string + } + } + } + namespace m { + var x: number | string | boolean; + namespace m2 { + var b = x; // new scope - number | boolean | string + var y: string; + if (typeof x === "string") { + y = x // string; + } else { + y = typeof x === "boolean" + ? x.toString() // boolean + : x.toString(); // number + } + } + } + namespace m1 { + var x: number | string | boolean; + module m2.m3 { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + var b = x; // new scope - number | boolean | string + var y: string; + if (typeof x === "string") { + y = x // string; + } else { + y = typeof x === "boolean" + ? x.toString() // boolean + : x.toString(); // number + } + } + } \ No newline at end of file diff --git a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js index 58c9657570dad..4fcc91f904c16 100644 --- a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js +++ b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js @@ -52,9 +52,9 @@ function foo5(x: number | string | boolean) { } } } -module m { +namespace m { var x: number | string | boolean; - module m2 { + namespace m2 { var b = x; // new scope - number | boolean | string var y: string; if (typeof x === "string") { @@ -66,7 +66,7 @@ module m { } } } -module m1 { +namespace m1 { var x: number | string | boolean; module m2.m3 { var b = x; // new scope - number | boolean | string diff --git a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.symbols b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.symbols index adc57275e0e53..429595994b2d1 100644 --- a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.symbols +++ b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.symbols @@ -153,13 +153,13 @@ function foo5(x: number | string | boolean) { } } } -module m { +namespace m { >m : Symbol(m, Decl(typeGuardsInFunctionAndModuleBlock.ts, 50, 1)) var x: number | string | boolean; >x : Symbol(x, Decl(typeGuardsInFunctionAndModuleBlock.ts, 52, 7)) - module m2 { + namespace m2 { >m2 : Symbol(m2, Decl(typeGuardsInFunctionAndModuleBlock.ts, 52, 37)) var b = x; // new scope - number | boolean | string @@ -193,7 +193,7 @@ module m { } } } -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(typeGuardsInFunctionAndModuleBlock.ts, 64, 1)) var x: number | string | boolean; diff --git a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types index 3b05fdcbc0927..f102afee598de 100644 --- a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types +++ b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types @@ -326,7 +326,7 @@ function foo5(x: number | string | boolean) { } } } -module m { +namespace m { >m : typeof m > : ^^^^^^^^ @@ -334,7 +334,7 @@ module m { >x : string | number | boolean > : ^^^^^^^^^^^^^^^^^^^^^^^^^ - module m2 { + namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -405,7 +405,7 @@ module m { } } } -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/typeGuardsInModule.errors.txt b/tests/baselines/reference/typeGuardsInModule.errors.txt new file mode 100644 index 0000000000000..cbc027516008c --- /dev/null +++ b/tests/baselines/reference/typeGuardsInModule.errors.txt @@ -0,0 +1,96 @@ +typeGuardsInModule.ts(65,1): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. +typeGuardsInModule.ts(65,11): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + + +==== typeGuardsInModule.ts (2 errors) ==== + // Note that type guards affect types of variables and parameters only and + // have no effect on members of objects such as properties. + + // variables in global + var num: number; + var strOrNum: string | number; + var var1: string | number; + // Inside module + namespace m1 { + // global vars in function declaration + num = typeof var1 === "string" && var1.length; // string + + // variables in module declaration + var var2: string | number; + if (typeof var2 === "string") { + num = var2.length; // string + } + else { + num = var2; // number + } + + // exported variable in the module + export var var3: string | number; + if (typeof var3 === "string") { + strOrNum = var3; // string | number + } + else { + strOrNum = var3; // string | number + } + } + // local module + namespace m2 { + var var2: string | number; + export var var3: string | number; + namespace m3 { + // global vars in function declaration + num = typeof var1 === "string" && var1.length; // string + + // local variables from outer module declaration + num = typeof var2 === "string" && var2.length; // string + + // exported variable from outer the module + strOrNum = typeof var3 === "string" && var3; // string | number + + // variables in module declaration + var var4: string | number; + if (typeof var4 === "string") { + num = var4.length; // string + } + else { + num = var4; // number + } + + // exported variable in the module + export var var5: string | number; + if (typeof var5 === "string") { + strOrNum = var5; // string | number + } + else { + strOrNum = var5; // string | number + } + } + } + // Dotted module + module m3.m4 { + ~~~~~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + ~~ +!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. + // global vars in function declaration + num = typeof var1 === "string" && var1.length; // string + + // variables in module declaration + var var2: string | number; + if (typeof var2 === "string") { + num = var2.length; // string + } + else { + num = var2; // number + } + + // exported variable in the module + export var var3: string | number; + if (typeof var3 === "string") { + strOrNum = var3; // string | number + } + else { + strOrNum = var3; // string | number + } + } + \ No newline at end of file diff --git a/tests/baselines/reference/typeGuardsInModule.js b/tests/baselines/reference/typeGuardsInModule.js index a15f200eba5a0..a6cfd0147b0ca 100644 --- a/tests/baselines/reference/typeGuardsInModule.js +++ b/tests/baselines/reference/typeGuardsInModule.js @@ -9,7 +9,7 @@ var num: number; var strOrNum: string | number; var var1: string | number; // Inside module -module m1 { +namespace m1 { // global vars in function declaration num = typeof var1 === "string" && var1.length; // string @@ -32,10 +32,10 @@ module m1 { } } // local module -module m2 { +namespace m2 { var var2: string | number; export var var3: string | number; - module m3 { + namespace m3 { // global vars in function declaration num = typeof var1 === "string" && var1.length; // string diff --git a/tests/baselines/reference/typeGuardsInModule.symbols b/tests/baselines/reference/typeGuardsInModule.symbols index 55b8a949ca3ce..c3f6198828a87 100644 --- a/tests/baselines/reference/typeGuardsInModule.symbols +++ b/tests/baselines/reference/typeGuardsInModule.symbols @@ -15,7 +15,7 @@ var var1: string | number; >var1 : Symbol(var1, Decl(typeGuardsInModule.ts, 6, 3)) // Inside module -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(typeGuardsInModule.ts, 6, 26)) // global vars in function declaration @@ -63,7 +63,7 @@ module m1 { } } // local module -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(typeGuardsInModule.ts, 29, 1)) var var2: string | number; @@ -72,7 +72,7 @@ module m2 { export var var3: string | number; >var3 : Symbol(var3, Decl(typeGuardsInModule.ts, 33, 14)) - module m3 { + namespace m3 { >m3 : Symbol(m3, Decl(typeGuardsInModule.ts, 33, 37)) // global vars in function declaration diff --git a/tests/baselines/reference/typeGuardsInModule.types b/tests/baselines/reference/typeGuardsInModule.types index ad8c1b95a8969..331b4141580d9 100644 --- a/tests/baselines/reference/typeGuardsInModule.types +++ b/tests/baselines/reference/typeGuardsInModule.types @@ -18,7 +18,7 @@ var var1: string | number; > : ^^^^^^^^^^^^^^^ // Inside module -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -116,7 +116,7 @@ module m1 { } } // local module -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -128,7 +128,7 @@ module m2 { >var3 : string | number > : ^^^^^^^^^^^^^^^ - module m3 { + namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/typeOfThisInFunctionExpression.js b/tests/baselines/reference/typeOfThisInFunctionExpression.js index f150662397694..4a85dabd8e0e4 100644 --- a/tests/baselines/reference/typeOfThisInFunctionExpression.js +++ b/tests/baselines/reference/typeOfThisInFunctionExpression.js @@ -29,7 +29,7 @@ class C { } } -module M { +namespace M { function fn() { var p = this; var p: any; diff --git a/tests/baselines/reference/typeOfThisInFunctionExpression.symbols b/tests/baselines/reference/typeOfThisInFunctionExpression.symbols index 77e1d78ed6289..d9f54c76bf347 100644 --- a/tests/baselines/reference/typeOfThisInFunctionExpression.symbols +++ b/tests/baselines/reference/typeOfThisInFunctionExpression.symbols @@ -58,11 +58,11 @@ class C { } } -module M { +namespace M { >M : Symbol(M, Decl(typeOfThisInFunctionExpression.ts, 26, 1)) function fn() { ->fn : Symbol(fn, Decl(typeOfThisInFunctionExpression.ts, 28, 10)) +>fn : Symbol(fn, Decl(typeOfThisInFunctionExpression.ts, 28, 13)) var p = this; >p : Symbol(p, Decl(typeOfThisInFunctionExpression.ts, 30, 11), Decl(typeOfThisInFunctionExpression.ts, 31, 11)) diff --git a/tests/baselines/reference/typeOfThisInFunctionExpression.types b/tests/baselines/reference/typeOfThisInFunctionExpression.types index 0c5cc889b9c95..ae00c84e572a2 100644 --- a/tests/baselines/reference/typeOfThisInFunctionExpression.types +++ b/tests/baselines/reference/typeOfThisInFunctionExpression.types @@ -79,7 +79,7 @@ class C { } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/typeResolution.js b/tests/baselines/reference/typeResolution.js index 1163aee887961..26a8bdb0c1ce0 100644 --- a/tests/baselines/reference/typeResolution.js +++ b/tests/baselines/reference/typeResolution.js @@ -1,9 +1,9 @@ //// [tests/cases/compiler/typeResolution.ts] //// //// [typeResolution.ts] -export module TopLevelModule1 { - export module SubModule1 { - export module SubSubModule1 { +export namespace TopLevelModule1 { + export namespace SubModule1 { + export namespace SubSubModule1 { export class ClassA { public AisIn1_1_1() { // Try all qualified names of this type @@ -76,8 +76,8 @@ export module TopLevelModule1 { } } - export module SubModule2 { - export module SubSubModule2 { + export namespace SubModule2 { + export namespace SubSubModule2 { // No code here since these are the mirror of the above calls export class ClassA { public AisIn1_2_2() { } } export class ClassB { public BisIn1_2_2() { } } @@ -97,13 +97,13 @@ export module TopLevelModule1 { YisIn1(); } - module NotExportedModule { + namespace NotExportedModule { export class ClassA { } } } -module TopLevelModule2 { - export module SubModule3 { +namespace TopLevelModule2 { + export namespace SubModule3 { export class ClassA { public AisIn2_3() { } } diff --git a/tests/baselines/reference/typeResolution.js.map b/tests/baselines/reference/typeResolution.js.map index 68d5c1e610c79..25cecaa71399d 100644 --- a/tests/baselines/reference/typeResolution.js.map +++ b/tests/baselines/reference/typeResolution.js.map @@ -1,3 +1,3 @@ //// [typeResolution.js.map] -{"version":3,"file":"typeResolution.js","sourceRoot":"","sources":["typeResolution.ts"],"names":[],"mappings":";;;;IAAA,IAAc,eAAe,CAmG5B;IAnGD,WAAc,eAAe;QACzB,IAAc,UAAU,CAwEvB;QAxED,WAAc,UAAU;YACpB,IAAc,aAAa,CAwD1B;YAxDD,WAAc,aAAa;gBACvB;oBAAA;oBAmBA,CAAC;oBAlBU,2BAAU,GAAjB;wBACI,uCAAuC;wBACvC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,yCAAyC;wBACzC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,qCAAqC;wBACrC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,sBAAsB;wBACtB,IAAI,EAAc,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;oBACL,aAAC;gBAAD,CAAC,AAnBD,IAmBC;gBAnBY,oBAAM,SAmBlB,CAAA;gBACD;oBAAA;oBAsBA,CAAC;oBArBU,2BAAU,GAAjB;wBACI,+CAA+C;wBAE/C,uCAAuC;wBACvC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,yCAAyC;wBACzC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,qCAAqC;wBACrC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzE,IAAI,EAAqC,CAAC;wBAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAEzD,sBAAsB;wBACtB,IAAI,EAAc,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;oBACL,aAAC;gBAAD,CAAC,AAtBD,IAsBC;gBAtBY,oBAAM,SAsBlB,CAAA;gBAED;oBACI;wBACI,SAAS,EAAE;4BACP,uCAAuC;4BACvC,IAAI,EAAmD,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACzE,IAAI,EAAmD,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACzE,IAAI,EAAc,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACpC,IAAI,EAAqC,CAAC;4BAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAC7D,CAAC;oBACL,CAAC;oBACL,wBAAC;gBAAD,CAAC,AAVD,IAUC;YACL,CAAC,EAxDa,aAAa,GAAb,wBAAa,KAAb,wBAAa,QAwD1B;YAED,0EAA0E;YAC1E;gBACI;oBACI,SAAS,EAAE;wBACP,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,sBAAsB;wBACtB,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;gBACL,CAAC;gBACL,aAAC;YAAD,CAAC,AAXD,IAWC;QACL,CAAC,EAxEa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAwEvB;QAED,IAAc,UAAU,CAWvB;QAXD,WAAc,UAAU;YACpB,IAAc,aAAa,CAO1B;YAPD,WAAc,aAAa;gBACvB,6DAA6D;gBAC7D;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;gBAC/C;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;gBAC/C;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;YAGnD,CAAC,EAPa,aAAa,GAAb,wBAAa,KAAb,wBAAa,QAO1B;QAGL,CAAC,EAXa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAWvB;QAED;YAAA;YAEA,CAAC;YADU,uBAAM,GAAb,cAAkB,CAAC;YACvB,aAAC;QAAD,CAAC,AAFD,IAEC;QAMD,IAAO,iBAAiB,CAEvB;QAFD,WAAO,iBAAiB;YACpB;gBAAA;gBAAsB,CAAC;gBAAD,aAAC;YAAD,CAAC,AAAvB,IAAuB;YAAV,wBAAM,SAAI,CAAA;QAC3B,CAAC,EAFM,iBAAiB,KAAjB,iBAAiB,QAEvB;IACL,CAAC,EAnGa,eAAe,+BAAf,eAAe,QAmG5B;IAED,IAAO,eAAe,CAMrB;IAND,WAAO,eAAe;QAClB,IAAc,UAAU,CAIvB;QAJD,WAAc,UAAU;YACpB;gBAAA;gBAEA,CAAC;gBADU,yBAAQ,GAAf,cAAoB,CAAC;gBACzB,aAAC;YAAD,CAAC,AAFD,IAEC;YAFY,iBAAM,SAElB,CAAA;QACL,CAAC,EAJa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAIvB;IACL,CAAC,EANM,eAAe,KAAf,eAAe,QAMrB"} -//// https://sokra.github.io/source-map-visualization#base64,define(["require", "exports"], function (require, exports) {
    "use strict";
    Object.defineProperty(exports, "__esModule", { value: true });
    exports.TopLevelModule1 = void 0;
    var TopLevelModule1;
    (function (TopLevelModule1) {
        var SubModule1;
        (function (SubModule1) {
            var SubSubModule1;
            (function (SubSubModule1) {
                var ClassA = /** @class */ (function () {
                    function ClassA() {
                    }
                    ClassA.prototype.AisIn1_1_1 = function () {
                        // Try all qualified names of this type
                        var a1;
                        a1.AisIn1_1_1();
                        var a2;
                        a2.AisIn1_1_1();
                        var a3;
                        a3.AisIn1_1_1();
                        var a4;
                        a4.AisIn1_1_1();
                        // Two variants of qualifying a peer type
                        var b1;
                        b1.BisIn1_1_1();
                        var b2;
                        b2.BisIn1_1_1();
                        // Type only accessible from the root
                        var c1;
                        c1.AisIn1_2_2();
                        // Interface reference
                        var d1;
                        d1.XisIn1_1_1();
                        var d2;
                        d2.XisIn1_1_1();
                    };
                    return ClassA;
                }());
                SubSubModule1.ClassA = ClassA;
                var ClassB = /** @class */ (function () {
                    function ClassB() {
                    }
                    ClassB.prototype.BisIn1_1_1 = function () {
                        /** Exactly the same as above in AisIn1_1_1 **/
                        // Try all qualified names of this type
                        var a1;
                        a1.AisIn1_1_1();
                        var a2;
                        a2.AisIn1_1_1();
                        var a3;
                        a3.AisIn1_1_1();
                        var a4;
                        a4.AisIn1_1_1();
                        // Two variants of qualifying a peer type
                        var b1;
                        b1.BisIn1_1_1();
                        var b2;
                        b2.BisIn1_1_1();
                        // Type only accessible from the root
                        var c1;
                        c1.AisIn1_2_2();
                        var c2;
                        c2.AisIn2_3();
                        // Interface reference
                        var d1;
                        d1.XisIn1_1_1();
                        var d2;
                        d2.XisIn1_1_1();
                    };
                    return ClassB;
                }());
                SubSubModule1.ClassB = ClassB;
                var NonExportedClassQ = /** @class */ (function () {
                    function NonExportedClassQ() {
                        function QQ() {
                            /* Sampling of stuff from AisIn1_1_1 */
                            var a4;
                            a4.AisIn1_1_1();
                            var c1;
                            c1.AisIn1_2_2();
                            var d1;
                            d1.XisIn1_1_1();
                            var c2;
                            c2.AisIn2_3();
                        }
                    }
                    return NonExportedClassQ;
                }());
            })(SubSubModule1 = SubModule1.SubSubModule1 || (SubModule1.SubSubModule1 = {}));
            // Should have no effect on S1.SS1.ClassA above because it is not exported
            var ClassA = /** @class */ (function () {
                function ClassA() {
                    function AA() {
                        var a2;
                        a2.AisIn1_1_1();
                        var a3;
                        a3.AisIn1_1_1();
                        var a4;
                        a4.AisIn1_1_1();
                        // Interface reference
                        var d2;
                        d2.XisIn1_1_1();
                    }
                }
                return ClassA;
            }());
        })(SubModule1 = TopLevelModule1.SubModule1 || (TopLevelModule1.SubModule1 = {}));
        var SubModule2;
        (function (SubModule2) {
            var SubSubModule2;
            (function (SubSubModule2) {
                // No code here since these are the mirror of the above calls
                var ClassA = /** @class */ (function () {
                    function ClassA() {
                    }
                    ClassA.prototype.AisIn1_2_2 = function () { };
                    return ClassA;
                }());
                SubSubModule2.ClassA = ClassA;
                var ClassB = /** @class */ (function () {
                    function ClassB() {
                    }
                    ClassB.prototype.BisIn1_2_2 = function () { };
                    return ClassB;
                }());
                SubSubModule2.ClassB = ClassB;
                var ClassC = /** @class */ (function () {
                    function ClassC() {
                    }
                    ClassC.prototype.CisIn1_2_2 = function () { };
                    return ClassC;
                }());
                SubSubModule2.ClassC = ClassC;
            })(SubSubModule2 = SubModule2.SubSubModule2 || (SubModule2.SubSubModule2 = {}));
        })(SubModule2 = TopLevelModule1.SubModule2 || (TopLevelModule1.SubModule2 = {}));
        var ClassA = /** @class */ (function () {
            function ClassA() {
            }
            ClassA.prototype.AisIn1 = function () { };
            return ClassA;
        }());
        var NotExportedModule;
        (function (NotExportedModule) {
            var ClassA = /** @class */ (function () {
                function ClassA() {
                }
                return ClassA;
            }());
            NotExportedModule.ClassA = ClassA;
        })(NotExportedModule || (NotExportedModule = {}));
    })(TopLevelModule1 || (exports.TopLevelModule1 = TopLevelModule1 = {}));
    var TopLevelModule2;
    (function (TopLevelModule2) {
        var SubModule3;
        (function (SubModule3) {
            var ClassA = /** @class */ (function () {
                function ClassA() {
                }
                ClassA.prototype.AisIn2_3 = function () { };
                return ClassA;
            }());
            SubModule3.ClassA = ClassA;
        })(SubModule3 = TopLevelModule2.SubModule3 || (TopLevelModule2.SubModule3 = {}));
    })(TopLevelModule2 || (TopLevelModule2 = {}));
});
//# sourceMappingURL=typeResolution.js.map,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZVJlc29sdXRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ0eXBlUmVzb2x1dGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0lBQUEsSUFBYyxlQUFlLENBbUc1QjtJQW5HRCxXQUFjLGVBQWU7UUFDekIsSUFBYyxVQUFVLENBd0V2QjtRQXhFRCxXQUFjLFVBQVU7WUFDcEIsSUFBYyxhQUFhLENBd0QxQjtZQXhERCxXQUFjLGFBQWE7Z0JBQ3ZCO29CQUFBO29CQW1CQSxDQUFDO29CQWxCVSwyQkFBVSxHQUFqQjt3QkFDSSx1Q0FBdUM7d0JBQ3ZDLElBQUksRUFBVSxDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFDaEMsSUFBSSxFQUF3QixDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFDOUMsSUFBSSxFQUFtQyxDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFDekQsSUFBSSxFQUFtRCxDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFFekUseUNBQXlDO3dCQUN6QyxJQUFJLEVBQVUsQ0FBQzt3QkFBQyxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUM7d0JBQ2hDLElBQUksRUFBbUQsQ0FBQzt3QkFBQyxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUM7d0JBRXpFLHFDQUFxQzt3QkFDckMsSUFBSSxFQUFtRCxDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFFekUsc0JBQXNCO3dCQUN0QixJQUFJLEVBQWMsQ0FBQzt3QkFBQyxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUM7d0JBQ3BDLElBQUksRUFBNEIsQ0FBQzt3QkFBQyxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUM7b0JBQ3RELENBQUM7b0JBQ0wsYUFBQztnQkFBRCxDQUFDLEFBbkJELElBbUJDO2dCQW5CWSxvQkFBTSxTQW1CbEIsQ0FBQTtnQkFDRDtvQkFBQTtvQkFzQkEsQ0FBQztvQkFyQlUsMkJBQVUsR0FBakI7d0JBQ0ksK0NBQStDO3dCQUUvQyx1Q0FBdUM7d0JBQ3ZDLElBQUksRUFBVSxDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFDaEMsSUFBSSxFQUF3QixDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFDOUMsSUFBSSxFQUFtQyxDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFDekQsSUFBSSxFQUFtRCxDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFFekUseUNBQXlDO3dCQUN6QyxJQUFJLEVBQVUsQ0FBQzt3QkFBQyxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUM7d0JBQ2hDLElBQUksRUFBbUQsQ0FBQzt3QkFBQyxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUM7d0JBRXpFLHFDQUFxQzt3QkFDckMsSUFBSSxFQUFtRCxDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFDekUsSUFBSSxFQUFxQyxDQUFDO3dCQUFDLEVBQUUsQ0FBQyxRQUFRLEVBQUUsQ0FBQzt3QkFFekQsc0JBQXNCO3dCQUN0QixJQUFJLEVBQWMsQ0FBQzt3QkFBQyxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUM7d0JBQ3BDLElBQUksRUFBNEIsQ0FBQzt3QkFBQyxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUM7b0JBQ3RELENBQUM7b0JBQ0wsYUFBQztnQkFBRCxDQUFDLEFBdEJELElBc0JDO2dCQXRCWSxvQkFBTSxTQXNCbEIsQ0FBQTtnQkFFRDtvQkFDSTt3QkFDSSxTQUFTLEVBQUU7NEJBQ1AsdUNBQXVDOzRCQUN2QyxJQUFJLEVBQW1ELENBQUM7NEJBQUMsRUFBRSxDQUFDLFVBQVUsRUFBRSxDQUFDOzRCQUN6RSxJQUFJLEVBQW1ELENBQUM7NEJBQUMsRUFBRSxDQUFDLFVBQVUsRUFBRSxDQUFDOzRCQUN6RSxJQUFJLEVBQWMsQ0FBQzs0QkFBQyxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUM7NEJBQ3BDLElBQUksRUFBcUMsQ0FBQzs0QkFBQyxFQUFFLENBQUMsUUFBUSxFQUFFLENBQUM7d0JBQzdELENBQUM7b0JBQ0wsQ0FBQztvQkFDTCx3QkFBQztnQkFBRCxDQUFDLEFBVkQsSUFVQztZQUNMLENBQUMsRUF4RGEsYUFBYSxHQUFiLHdCQUFhLEtBQWIsd0JBQWEsUUF3RDFCO1lBRUQsMEVBQTBFO1lBQzFFO2dCQUNJO29CQUNJLFNBQVMsRUFBRTt3QkFDUCxJQUFJLEVBQXdCLENBQUM7d0JBQUMsRUFBRSxDQUFDLFVBQVUsRUFBRSxDQUFDO3dCQUM5QyxJQUFJLEVBQW1DLENBQUM7d0JBQUMsRUFBRSxDQUFDLFVBQVUsRUFBRSxDQUFDO3dCQUN6RCxJQUFJLEVBQW1ELENBQUM7d0JBQUMsRUFBRSxDQUFDLFVBQVUsRUFBRSxDQUFDO3dCQUV6RSxzQkFBc0I7d0JBQ3RCLElBQUksRUFBNEIsQ0FBQzt3QkFBQyxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUM7b0JBQ3RELENBQUM7Z0JBQ0wsQ0FBQztnQkFDTCxhQUFDO1lBQUQsQ0FBQyxBQVhELElBV0M7UUFDTCxDQUFDLEVBeEVhLFVBQVUsR0FBViwwQkFBVSxLQUFWLDBCQUFVLFFBd0V2QjtRQUVELElBQWMsVUFBVSxDQVd2QjtRQVhELFdBQWMsVUFBVTtZQUNwQixJQUFjLGFBQWEsQ0FPMUI7WUFQRCxXQUFjLGFBQWE7Z0JBQ3ZCLDZEQUE2RDtnQkFDN0Q7b0JBQUE7b0JBQThDLENBQUM7b0JBQWxCLDJCQUFVLEdBQWpCLGNBQXNCLENBQUM7b0JBQUMsYUFBQztnQkFBRCxDQUFDLEFBQS9DLElBQStDO2dCQUFsQyxvQkFBTSxTQUE0QixDQUFBO2dCQUMvQztvQkFBQTtvQkFBOEMsQ0FBQztvQkFBbEIsMkJBQVUsR0FBakIsY0FBc0IsQ0FBQztvQkFBQyxhQUFDO2dCQUFELENBQUMsQUFBL0MsSUFBK0M7Z0JBQWxDLG9CQUFNLFNBQTRCLENBQUE7Z0JBQy9DO29CQUFBO29CQUE4QyxDQUFDO29CQUFsQiwyQkFBVSxHQUFqQixjQUFzQixDQUFDO29CQUFDLGFBQUM7Z0JBQUQsQ0FBQyxBQUEvQyxJQUErQztnQkFBbEMsb0JBQU0sU0FBNEIsQ0FBQTtZQUduRCxDQUFDLEVBUGEsYUFBYSxHQUFiLHdCQUFhLEtBQWIsd0JBQWEsUUFPMUI7UUFHTCxDQUFDLEVBWGEsVUFBVSxHQUFWLDBCQUFVLEtBQVYsMEJBQVUsUUFXdkI7UUFFRDtZQUFBO1lBRUEsQ0FBQztZQURVLHVCQUFNLEdBQWIsY0FBa0IsQ0FBQztZQUN2QixhQUFDO1FBQUQsQ0FBQyxBQUZELElBRUM7UUFNRCxJQUFPLGlCQUFpQixDQUV2QjtRQUZELFdBQU8saUJBQWlCO1lBQ3BCO2dCQUFBO2dCQUFzQixDQUFDO2dCQUFELGFBQUM7WUFBRCxDQUFDLEFBQXZCLElBQXVCO1lBQVYsd0JBQU0sU0FBSSxDQUFBO1FBQzNCLENBQUMsRUFGTSxpQkFBaUIsS0FBakIsaUJBQWlCLFFBRXZCO0lBQ0wsQ0FBQyxFQW5HYSxlQUFlLCtCQUFmLGVBQWUsUUFtRzVCO0lBRUQsSUFBTyxlQUFlLENBTXJCO0lBTkQsV0FBTyxlQUFlO1FBQ2xCLElBQWMsVUFBVSxDQUl2QjtRQUpELFdBQWMsVUFBVTtZQUNwQjtnQkFBQTtnQkFFQSxDQUFDO2dCQURVLHlCQUFRLEdBQWYsY0FBb0IsQ0FBQztnQkFDekIsYUFBQztZQUFELENBQUMsQUFGRCxJQUVDO1lBRlksaUJBQU0sU0FFbEIsQ0FBQTtRQUNMLENBQUMsRUFKYSxVQUFVLEdBQVYsMEJBQVUsS0FBViwwQkFBVSxRQUl2QjtJQUNMLENBQUMsRUFOTSxlQUFlLEtBQWYsZUFBZSxRQU1yQiJ9,ZXhwb3J0IG1vZHVsZSBUb3BMZXZlbE1vZHVsZTEgewogICAgZXhwb3J0IG1vZHVsZSBTdWJNb2R1bGUxIHsKICAgICAgICBleHBvcnQgbW9kdWxlIFN1YlN1Yk1vZHVsZTEgewogICAgICAgICAgICBleHBvcnQgY2xhc3MgQ2xhc3NBIHsKICAgICAgICAgICAgICAgIHB1YmxpYyBBaXNJbjFfMV8xKCkgewogICAgICAgICAgICAgICAgICAgIC8vIFRyeSBhbGwgcXVhbGlmaWVkIG5hbWVzIG9mIHRoaXMgdHlwZQogICAgICAgICAgICAgICAgICAgIHZhciBhMTogQ2xhc3NBOyBhMS5BaXNJbjFfMV8xKCk7CiAgICAgICAgICAgICAgICAgICAgdmFyIGEyOiBTdWJTdWJNb2R1bGUxLkNsYXNzQTsgYTIuQWlzSW4xXzFfMSgpOwogICAgICAgICAgICAgICAgICAgIHZhciBhMzogU3ViTW9kdWxlMS5TdWJTdWJNb2R1bGUxLkNsYXNzQTsgYTMuQWlzSW4xXzFfMSgpOwogICAgICAgICAgICAgICAgICAgIHZhciBhNDogVG9wTGV2ZWxNb2R1bGUxLlN1Yk1vZHVsZTEuU3ViU3ViTW9kdWxlMS5DbGFzc0E7IGE0LkFpc0luMV8xXzEoKTsKICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAvLyBUd28gdmFyaWFudHMgb2YgcXVhbGlmeWluZyBhIHBlZXIgdHlwZQogICAgICAgICAgICAgICAgICAgIHZhciBiMTogQ2xhc3NCOyBiMS5CaXNJbjFfMV8xKCk7CiAgICAgICAgICAgICAgICAgICAgdmFyIGIyOiBUb3BMZXZlbE1vZHVsZTEuU3ViTW9kdWxlMS5TdWJTdWJNb2R1bGUxLkNsYXNzQjsgYjIuQmlzSW4xXzFfMSgpOwogICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgIC8vIFR5cGUgb25seSBhY2Nlc3NpYmxlIGZyb20gdGhlIHJvb3QKICAgICAgICAgICAgICAgICAgICB2YXIgYzE6IFRvcExldmVsTW9kdWxlMS5TdWJNb2R1bGUyLlN1YlN1Yk1vZHVsZTIuQ2xhc3NBOyBjMS5BaXNJbjFfMl8yKCk7CiAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgLy8gSW50ZXJmYWNlIHJlZmVyZW5jZQogICAgICAgICAgICAgICAgICAgIHZhciBkMTogSW50ZXJmYWNlWDsgZDEuWGlzSW4xXzFfMSgpOwogICAgICAgICAgICAgICAgICAgIHZhciBkMjogU3ViU3ViTW9kdWxlMS5JbnRlcmZhY2VYOyBkMi5YaXNJbjFfMV8xKCk7CiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIH0KICAgICAgICAgICAgZXhwb3J0IGNsYXNzIENsYXNzQiB7CiAgICAgICAgICAgICAgICBwdWJsaWMgQmlzSW4xXzFfMSgpIHsKICAgICAgICAgICAgICAgICAgICAvKiogRXhhY3RseSB0aGUgc2FtZSBhcyBhYm92ZSBpbiBBaXNJbjFfMV8xICoqLwogICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgIC8vIFRyeSBhbGwgcXVhbGlmaWVkIG5hbWVzIG9mIHRoaXMgdHlwZQogICAgICAgICAgICAgICAgICAgIHZhciBhMTogQ2xhc3NBOyBhMS5BaXNJbjFfMV8xKCk7CiAgICAgICAgICAgICAgICAgICAgdmFyIGEyOiBTdWJTdWJNb2R1bGUxLkNsYXNzQTsgYTIuQWlzSW4xXzFfMSgpOwogICAgICAgICAgICAgICAgICAgIHZhciBhMzogU3ViTW9kdWxlMS5TdWJTdWJNb2R1bGUxLkNsYXNzQTsgYTMuQWlzSW4xXzFfMSgpOwogICAgICAgICAgICAgICAgICAgIHZhciBhNDogVG9wTGV2ZWxNb2R1bGUxLlN1Yk1vZHVsZTEuU3ViU3ViTW9kdWxlMS5DbGFzc0E7IGE0LkFpc0luMV8xXzEoKTsKICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAvLyBUd28gdmFyaWFudHMgb2YgcXVhbGlmeWluZyBhIHBlZXIgdHlwZQogICAgICAgICAgICAgICAgICAgIHZhciBiMTogQ2xhc3NCOyBiMS5CaXNJbjFfMV8xKCk7CiAgICAgICAgICAgICAgICAgICAgdmFyIGIyOiBUb3BMZXZlbE1vZHVsZTEuU3ViTW9kdWxlMS5TdWJTdWJNb2R1bGUxLkNsYXNzQjsgYjIuQmlzSW4xXzFfMSgpOwogICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgIC8vIFR5cGUgb25seSBhY2Nlc3NpYmxlIGZyb20gdGhlIHJvb3QKICAgICAgICAgICAgICAgICAgICB2YXIgYzE6IFRvcExldmVsTW9kdWxlMS5TdWJNb2R1bGUyLlN1YlN1Yk1vZHVsZTIuQ2xhc3NBOyBjMS5BaXNJbjFfMl8yKCk7CiAgICAgICAgICAgICAgICAgICAgdmFyIGMyOiBUb3BMZXZlbE1vZHVsZTIuU3ViTW9kdWxlMy5DbGFzc0E7IGMyLkFpc0luMl8zKCk7CiAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgLy8gSW50ZXJmYWNlIHJlZmVyZW5jZQogICAgICAgICAgICAgICAgICAgIHZhciBkMTogSW50ZXJmYWNlWDsgZDEuWGlzSW4xXzFfMSgpOwogICAgICAgICAgICAgICAgICAgIHZhciBkMjogU3ViU3ViTW9kdWxlMS5JbnRlcmZhY2VYOyBkMi5YaXNJbjFfMV8xKCk7CiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIH0KICAgICAgICAgICAgZXhwb3J0IGludGVyZmFjZSBJbnRlcmZhY2VYIHsgWGlzSW4xXzFfMSgpOyB9CiAgICAgICAgICAgIGNsYXNzIE5vbkV4cG9ydGVkQ2xhc3NRIHsKICAgICAgICAgICAgICAgIGNvbnN0cnVjdG9yKCkgewogICAgICAgICAgICAgICAgICAgIGZ1bmN0aW9uIFFRKCkgewogICAgICAgICAgICAgICAgICAgICAgICAvKiBTYW1wbGluZyBvZiBzdHVmZiBmcm9tIEFpc0luMV8xXzEgKi8KICAgICAgICAgICAgICAgICAgICAgICAgdmFyIGE0OiBUb3BMZXZlbE1vZHVsZTEuU3ViTW9kdWxlMS5TdWJTdWJNb2R1bGUxLkNsYXNzQTsgYTQuQWlzSW4xXzFfMSgpOwogICAgICAgICAgICAgICAgICAgICAgICB2YXIgYzE6IFRvcExldmVsTW9kdWxlMS5TdWJNb2R1bGUyLlN1YlN1Yk1vZHVsZTIuQ2xhc3NBOyBjMS5BaXNJbjFfMl8yKCk7CiAgICAgICAgICAgICAgICAgICAgICAgIHZhciBkMTogSW50ZXJmYWNlWDsgZDEuWGlzSW4xXzFfMSgpOwogICAgICAgICAgICAgICAgICAgICAgICB2YXIgYzI6IFRvcExldmVsTW9kdWxlMi5TdWJNb2R1bGUzLkNsYXNzQTsgYzIuQWlzSW4yXzMoKTsKICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIH0KICAgICAgICB9CiAgICAgICAgCiAgICAgICAgLy8gU2hvdWxkIGhhdmUgbm8gZWZmZWN0IG9uIFMxLlNTMS5DbGFzc0EgYWJvdmUgYmVjYXVzZSBpdCBpcyBub3QgZXhwb3J0ZWQKICAgICAgICBjbGFzcyBDbGFzc0EgewogICAgICAgICAgICBjb25zdHJ1Y3RvcigpIHsKICAgICAgICAgICAgICAgIGZ1bmN0aW9uIEFBKCkgewogICAgICAgICAgICAgICAgICAgIHZhciBhMjogU3ViU3ViTW9kdWxlMS5DbGFzc0E7IGEyLkFpc0luMV8xXzEoKTsKICAgICAgICAgICAgICAgICAgICB2YXIgYTM6IFN1Yk1vZHVsZTEuU3ViU3ViTW9kdWxlMS5DbGFzc0E7IGEzLkFpc0luMV8xXzEoKTsKICAgICAgICAgICAgICAgICAgICB2YXIgYTQ6IFRvcExldmVsTW9kdWxlMS5TdWJNb2R1bGUxLlN1YlN1Yk1vZHVsZTEuQ2xhc3NBOyBhNC5BaXNJbjFfMV8xKCk7CiAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgLy8gSW50ZXJmYWNlIHJlZmVyZW5jZQogICAgICAgICAgICAgICAgICAgIHZhciBkMjogU3ViU3ViTW9kdWxlMS5JbnRlcmZhY2VYOyBkMi5YaXNJbjFfMV8xKCk7CiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIH0KICAgICAgICB9CiAgICB9CgogICAgZXhwb3J0IG1vZHVsZSBTdWJNb2R1bGUyIHsKICAgICAgICBleHBvcnQgbW9kdWxlIFN1YlN1Yk1vZHVsZTIgewogICAgICAgICAgICAvLyBObyBjb2RlIGhlcmUgc2luY2UgdGhlc2UgYXJlIHRoZSBtaXJyb3Igb2YgdGhlIGFib3ZlIGNhbGxzCiAgICAgICAgICAgIGV4cG9ydCBjbGFzcyBDbGFzc0EgeyBwdWJsaWMgQWlzSW4xXzJfMigpIHsgfSB9CiAgICAgICAgICAgIGV4cG9ydCBjbGFzcyBDbGFzc0IgeyBwdWJsaWMgQmlzSW4xXzJfMigpIHsgfSB9CiAgICAgICAgICAgIGV4cG9ydCBjbGFzcyBDbGFzc0MgeyBwdWJsaWMgQ2lzSW4xXzJfMigpIHsgfSB9CiAgICAgICAgICAgIGV4cG9ydCBpbnRlcmZhY2UgSW50ZXJmYWNlWSB7IFlpc0luMV8yXzIoKTsgfQogICAgICAgICAgICBpbnRlcmZhY2UgTm9uRXhwb3J0ZWRJbnRlcmZhY2VRIHsgfQogICAgICAgIH0KICAgICAgICAKICAgICAgICBleHBvcnQgaW50ZXJmYWNlIEludGVyZmFjZVkgeyBZaXNJbjFfMigpOyB9CiAgICB9CiAgICAKICAgIGNsYXNzIENsYXNzQSB7CiAgICAgICAgcHVibGljIEFpc0luMSgpIHsgfQogICAgfQoKICAgIGludGVyZmFjZSBJbnRlcmZhY2VZIHsKICAgICAgICBZaXNJbjEoKTsKICAgIH0KICAgIAogICAgbW9kdWxlIE5vdEV4cG9ydGVkTW9kdWxlIHsKICAgICAgICBleHBvcnQgY2xhc3MgQ2xhc3NBIHsgfQogICAgfQp9Cgptb2R1bGUgVG9wTGV2ZWxNb2R1bGUyIHsKICAgIGV4cG9ydCBtb2R1bGUgU3ViTW9kdWxlMyB7CiAgICAgICAgZXhwb3J0IGNsYXNzIENsYXNzQSB7CiAgICAgICAgICAgIHB1YmxpYyBBaXNJbjJfMygpIHsgfQogICAgICAgIH0KICAgIH0KfQoK +{"version":3,"file":"typeResolution.js","sourceRoot":"","sources":["typeResolution.ts"],"names":[],"mappings":";;;;IAAA,IAAiB,eAAe,CAmG/B;IAnGD,WAAiB,eAAe;QAC5B,IAAiB,UAAU,CAwE1B;QAxED,WAAiB,UAAU;YACvB,IAAiB,aAAa,CAwD7B;YAxDD,WAAiB,aAAa;gBAC1B;oBAAA;oBAmBA,CAAC;oBAlBU,2BAAU,GAAjB;wBACI,uCAAuC;wBACvC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,yCAAyC;wBACzC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,qCAAqC;wBACrC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,sBAAsB;wBACtB,IAAI,EAAc,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;oBACL,aAAC;gBAAD,CAAC,AAnBD,IAmBC;gBAnBY,oBAAM,SAmBlB,CAAA;gBACD;oBAAA;oBAsBA,CAAC;oBArBU,2BAAU,GAAjB;wBACI,+CAA+C;wBAE/C,uCAAuC;wBACvC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,yCAAyC;wBACzC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,qCAAqC;wBACrC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzE,IAAI,EAAqC,CAAC;wBAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAEzD,sBAAsB;wBACtB,IAAI,EAAc,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;oBACL,aAAC;gBAAD,CAAC,AAtBD,IAsBC;gBAtBY,oBAAM,SAsBlB,CAAA;gBAED;oBACI;wBACI,SAAS,EAAE;4BACP,uCAAuC;4BACvC,IAAI,EAAmD,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACzE,IAAI,EAAmD,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACzE,IAAI,EAAc,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACpC,IAAI,EAAqC,CAAC;4BAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAC7D,CAAC;oBACL,CAAC;oBACL,wBAAC;gBAAD,CAAC,AAVD,IAUC;YACL,CAAC,EAxDgB,aAAa,GAAb,wBAAa,KAAb,wBAAa,QAwD7B;YAED,0EAA0E;YAC1E;gBACI;oBACI,SAAS,EAAE;wBACP,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,sBAAsB;wBACtB,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;gBACL,CAAC;gBACL,aAAC;YAAD,CAAC,AAXD,IAWC;QACL,CAAC,EAxEgB,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAwE1B;QAED,IAAiB,UAAU,CAW1B;QAXD,WAAiB,UAAU;YACvB,IAAiB,aAAa,CAO7B;YAPD,WAAiB,aAAa;gBAC1B,6DAA6D;gBAC7D;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;gBAC/C;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;gBAC/C;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;YAGnD,CAAC,EAPgB,aAAa,GAAb,wBAAa,KAAb,wBAAa,QAO7B;QAGL,CAAC,EAXgB,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAW1B;QAED;YAAA;YAEA,CAAC;YADU,uBAAM,GAAb,cAAkB,CAAC;YACvB,aAAC;QAAD,CAAC,AAFD,IAEC;QAMD,IAAU,iBAAiB,CAE1B;QAFD,WAAU,iBAAiB;YACvB;gBAAA;gBAAsB,CAAC;gBAAD,aAAC;YAAD,CAAC,AAAvB,IAAuB;YAAV,wBAAM,SAAI,CAAA;QAC3B,CAAC,EAFS,iBAAiB,KAAjB,iBAAiB,QAE1B;IACL,CAAC,EAnGgB,eAAe,+BAAf,eAAe,QAmG/B;IAED,IAAU,eAAe,CAMxB;IAND,WAAU,eAAe;QACrB,IAAiB,UAAU,CAI1B;QAJD,WAAiB,UAAU;YACvB;gBAAA;gBAEA,CAAC;gBADU,yBAAQ,GAAf,cAAoB,CAAC;gBACzB,aAAC;YAAD,CAAC,AAFD,IAEC;YAFY,iBAAM,SAElB,CAAA;QACL,CAAC,EAJgB,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAI1B;IACL,CAAC,EANS,eAAe,KAAf,eAAe,QAMxB"} +//// https://sokra.github.io/source-map-visualization#base64,define(["require", "exports"], function (require, exports) {
    "use strict";
    Object.defineProperty(exports, "__esModule", { value: true });
    exports.TopLevelModule1 = void 0;
    var TopLevelModule1;
    (function (TopLevelModule1) {
        var SubModule1;
        (function (SubModule1) {
            var SubSubModule1;
            (function (SubSubModule1) {
                var ClassA = /** @class */ (function () {
                    function ClassA() {
                    }
                    ClassA.prototype.AisIn1_1_1 = function () {
                        // Try all qualified names of this type
                        var a1;
                        a1.AisIn1_1_1();
                        var a2;
                        a2.AisIn1_1_1();
                        var a3;
                        a3.AisIn1_1_1();
                        var a4;
                        a4.AisIn1_1_1();
                        // Two variants of qualifying a peer type
                        var b1;
                        b1.BisIn1_1_1();
                        var b2;
                        b2.BisIn1_1_1();
                        // Type only accessible from the root
                        var c1;
                        c1.AisIn1_2_2();
                        // Interface reference
                        var d1;
                        d1.XisIn1_1_1();
                        var d2;
                        d2.XisIn1_1_1();
                    };
                    return ClassA;
                }());
                SubSubModule1.ClassA = ClassA;
                var ClassB = /** @class */ (function () {
                    function ClassB() {
                    }
                    ClassB.prototype.BisIn1_1_1 = function () {
                        /** Exactly the same as above in AisIn1_1_1 **/
                        // Try all qualified names of this type
                        var a1;
                        a1.AisIn1_1_1();
                        var a2;
                        a2.AisIn1_1_1();
                        var a3;
                        a3.AisIn1_1_1();
                        var a4;
                        a4.AisIn1_1_1();
                        // Two variants of qualifying a peer type
                        var b1;
                        b1.BisIn1_1_1();
                        var b2;
                        b2.BisIn1_1_1();
                        // Type only accessible from the root
                        var c1;
                        c1.AisIn1_2_2();
                        var c2;
                        c2.AisIn2_3();
                        // Interface reference
                        var d1;
                        d1.XisIn1_1_1();
                        var d2;
                        d2.XisIn1_1_1();
                    };
                    return ClassB;
                }());
                SubSubModule1.ClassB = ClassB;
                var NonExportedClassQ = /** @class */ (function () {
                    function NonExportedClassQ() {
                        function QQ() {
                            /* Sampling of stuff from AisIn1_1_1 */
                            var a4;
                            a4.AisIn1_1_1();
                            var c1;
                            c1.AisIn1_2_2();
                            var d1;
                            d1.XisIn1_1_1();
                            var c2;
                            c2.AisIn2_3();
                        }
                    }
                    return NonExportedClassQ;
                }());
            })(SubSubModule1 = SubModule1.SubSubModule1 || (SubModule1.SubSubModule1 = {}));
            // Should have no effect on S1.SS1.ClassA above because it is not exported
            var ClassA = /** @class */ (function () {
                function ClassA() {
                    function AA() {
                        var a2;
                        a2.AisIn1_1_1();
                        var a3;
                        a3.AisIn1_1_1();
                        var a4;
                        a4.AisIn1_1_1();
                        // Interface reference
                        var d2;
                        d2.XisIn1_1_1();
                    }
                }
                return ClassA;
            }());
        })(SubModule1 = TopLevelModule1.SubModule1 || (TopLevelModule1.SubModule1 = {}));
        var SubModule2;
        (function (SubModule2) {
            var SubSubModule2;
            (function (SubSubModule2) {
                // No code here since these are the mirror of the above calls
                var ClassA = /** @class */ (function () {
                    function ClassA() {
                    }
                    ClassA.prototype.AisIn1_2_2 = function () { };
                    return ClassA;
                }());
                SubSubModule2.ClassA = ClassA;
                var ClassB = /** @class */ (function () {
                    function ClassB() {
                    }
                    ClassB.prototype.BisIn1_2_2 = function () { };
                    return ClassB;
                }());
                SubSubModule2.ClassB = ClassB;
                var ClassC = /** @class */ (function () {
                    function ClassC() {
                    }
                    ClassC.prototype.CisIn1_2_2 = function () { };
                    return ClassC;
                }());
                SubSubModule2.ClassC = ClassC;
            })(SubSubModule2 = SubModule2.SubSubModule2 || (SubModule2.SubSubModule2 = {}));
        })(SubModule2 = TopLevelModule1.SubModule2 || (TopLevelModule1.SubModule2 = {}));
        var ClassA = /** @class */ (function () {
            function ClassA() {
            }
            ClassA.prototype.AisIn1 = function () { };
            return ClassA;
        }());
        var NotExportedModule;
        (function (NotExportedModule) {
            var ClassA = /** @class */ (function () {
                function ClassA() {
                }
                return ClassA;
            }());
            NotExportedModule.ClassA = ClassA;
        })(NotExportedModule || (NotExportedModule = {}));
    })(TopLevelModule1 || (exports.TopLevelModule1 = TopLevelModule1 = {}));
    var TopLevelModule2;
    (function (TopLevelModule2) {
        var SubModule3;
        (function (SubModule3) {
            var ClassA = /** @class */ (function () {
                function ClassA() {
                }
                ClassA.prototype.AisIn2_3 = function () { };
                return ClassA;
            }());
            SubModule3.ClassA = ClassA;
        })(SubModule3 = TopLevelModule2.SubModule3 || (TopLevelModule2.SubModule3 = {}));
    })(TopLevelModule2 || (TopLevelModule2 = {}));
});
//# sourceMappingURL=typeResolution.js.map,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZVJlc29sdXRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ0eXBlUmVzb2x1dGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0lBQUEsSUFBaUIsZUFBZSxDQW1HL0I7SUFuR0QsV0FBaUIsZUFBZTtRQUM1QixJQUFpQixVQUFVLENBd0UxQjtRQXhFRCxXQUFpQixVQUFVO1lBQ3ZCLElBQWlCLGFBQWEsQ0F3RDdCO1lBeERELFdBQWlCLGFBQWE7Z0JBQzFCO29CQUFBO29CQW1CQSxDQUFDO29CQWxCVSwyQkFBVSxHQUFqQjt3QkFDSSx1Q0FBdUM7d0JBQ3ZDLElBQUksRUFBVSxDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFDaEMsSUFBSSxFQUF3QixDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFDOUMsSUFBSSxFQUFtQyxDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFDekQsSUFBSSxFQUFtRCxDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFFekUseUNBQXlDO3dCQUN6QyxJQUFJLEVBQVUsQ0FBQzt3QkFBQyxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUM7d0JBQ2hDLElBQUksRUFBbUQsQ0FBQzt3QkFBQyxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUM7d0JBRXpFLHFDQUFxQzt3QkFDckMsSUFBSSxFQUFtRCxDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFFekUsc0JBQXNCO3dCQUN0QixJQUFJLEVBQWMsQ0FBQzt3QkFBQyxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUM7d0JBQ3BDLElBQUksRUFBNEIsQ0FBQzt3QkFBQyxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUM7b0JBQ3RELENBQUM7b0JBQ0wsYUFBQztnQkFBRCxDQUFDLEFBbkJELElBbUJDO2dCQW5CWSxvQkFBTSxTQW1CbEIsQ0FBQTtnQkFDRDtvQkFBQTtvQkFzQkEsQ0FBQztvQkFyQlUsMkJBQVUsR0FBakI7d0JBQ0ksK0NBQStDO3dCQUUvQyx1Q0FBdUM7d0JBQ3ZDLElBQUksRUFBVSxDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFDaEMsSUFBSSxFQUF3QixDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFDOUMsSUFBSSxFQUFtQyxDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFDekQsSUFBSSxFQUFtRCxDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFFekUseUNBQXlDO3dCQUN6QyxJQUFJLEVBQVUsQ0FBQzt3QkFBQyxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUM7d0JBQ2hDLElBQUksRUFBbUQsQ0FBQzt3QkFBQyxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUM7d0JBRXpFLHFDQUFxQzt3QkFDckMsSUFBSSxFQUFtRCxDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFDekUsSUFBSSxFQUFxQyxDQUFDO3dCQUFDLEVBQUUsQ0FBQyxRQUFRLEVBQUUsQ0FBQzt3QkFFekQsc0JBQXNCO3dCQUN0QixJQUFJLEVBQWMsQ0FBQzt3QkFBQyxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUM7d0JBQ3BDLElBQUksRUFBNEIsQ0FBQzt3QkFBQyxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUM7b0JBQ3RELENBQUM7b0JBQ0wsYUFBQztnQkFBRCxDQUFDLEFBdEJELElBc0JDO2dCQXRCWSxvQkFBTSxTQXNCbEIsQ0FBQTtnQkFFRDtvQkFDSTt3QkFDSSxTQUFTLEVBQUU7NEJBQ1AsdUNBQXVDOzRCQUN2QyxJQUFJLEVBQW1ELENBQUM7NEJBQUMsRUFBRSxDQUFDLFVBQVUsRUFBRSxDQUFDOzRCQUN6RSxJQUFJLEVBQW1ELENBQUM7NEJBQUMsRUFBRSxDQUFDLFVBQVUsRUFBRSxDQUFDOzRCQUN6RSxJQUFJLEVBQWMsQ0FBQzs0QkFBQyxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUM7NEJBQ3BDLElBQUksRUFBcUMsQ0FBQzs0QkFBQyxFQUFFLENBQUMsUUFBUSxFQUFFLENBQUM7d0JBQzdELENBQUM7b0JBQ0wsQ0FBQztvQkFDTCx3QkFBQztnQkFBRCxDQUFDLEFBVkQsSUFVQztZQUNMLENBQUMsRUF4RGdCLGFBQWEsR0FBYix3QkFBYSxLQUFiLHdCQUFhLFFBd0Q3QjtZQUVELDBFQUEwRTtZQUMxRTtnQkFDSTtvQkFDSSxTQUFTLEVBQUU7d0JBQ1AsSUFBSSxFQUF3QixDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFDOUMsSUFBSSxFQUFtQyxDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFDekQsSUFBSSxFQUFtRCxDQUFDO3dCQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQzt3QkFFekUsc0JBQXNCO3dCQUN0QixJQUFJLEVBQTRCLENBQUM7d0JBQUMsRUFBRSxDQUFDLFVBQVUsRUFBRSxDQUFDO29CQUN0RCxDQUFDO2dCQUNMLENBQUM7Z0JBQ0wsYUFBQztZQUFELENBQUMsQUFYRCxJQVdDO1FBQ0wsQ0FBQyxFQXhFZ0IsVUFBVSxHQUFWLDBCQUFVLEtBQVYsMEJBQVUsUUF3RTFCO1FBRUQsSUFBaUIsVUFBVSxDQVcxQjtRQVhELFdBQWlCLFVBQVU7WUFDdkIsSUFBaUIsYUFBYSxDQU83QjtZQVBELFdBQWlCLGFBQWE7Z0JBQzFCLDZEQUE2RDtnQkFDN0Q7b0JBQUE7b0JBQThDLENBQUM7b0JBQWxCLDJCQUFVLEdBQWpCLGNBQXNCLENBQUM7b0JBQUMsYUFBQztnQkFBRCxDQUFDLEFBQS9DLElBQStDO2dCQUFsQyxvQkFBTSxTQUE0QixDQUFBO2dCQUMvQztvQkFBQTtvQkFBOEMsQ0FBQztvQkFBbEIsMkJBQVUsR0FBakIsY0FBc0IsQ0FBQztvQkFBQyxhQUFDO2dCQUFELENBQUMsQUFBL0MsSUFBK0M7Z0JBQWxDLG9CQUFNLFNBQTRCLENBQUE7Z0JBQy9DO29CQUFBO29CQUE4QyxDQUFDO29CQUFsQiwyQkFBVSxHQUFqQixjQUFzQixDQUFDO29CQUFDLGFBQUM7Z0JBQUQsQ0FBQyxBQUEvQyxJQUErQztnQkFBbEMsb0JBQU0sU0FBNEIsQ0FBQTtZQUduRCxDQUFDLEVBUGdCLGFBQWEsR0FBYix3QkFBYSxLQUFiLHdCQUFhLFFBTzdCO1FBR0wsQ0FBQyxFQVhnQixVQUFVLEdBQVYsMEJBQVUsS0FBViwwQkFBVSxRQVcxQjtRQUVEO1lBQUE7WUFFQSxDQUFDO1lBRFUsdUJBQU0sR0FBYixjQUFrQixDQUFDO1lBQ3ZCLGFBQUM7UUFBRCxDQUFDLEFBRkQsSUFFQztRQU1ELElBQVUsaUJBQWlCLENBRTFCO1FBRkQsV0FBVSxpQkFBaUI7WUFDdkI7Z0JBQUE7Z0JBQXNCLENBQUM7Z0JBQUQsYUFBQztZQUFELENBQUMsQUFBdkIsSUFBdUI7WUFBVix3QkFBTSxTQUFJLENBQUE7UUFDM0IsQ0FBQyxFQUZTLGlCQUFpQixLQUFqQixpQkFBaUIsUUFFMUI7SUFDTCxDQUFDLEVBbkdnQixlQUFlLCtCQUFmLGVBQWUsUUFtRy9CO0lBRUQsSUFBVSxlQUFlLENBTXhCO0lBTkQsV0FBVSxlQUFlO1FBQ3JCLElBQWlCLFVBQVUsQ0FJMUI7UUFKRCxXQUFpQixVQUFVO1lBQ3ZCO2dCQUFBO2dCQUVBLENBQUM7Z0JBRFUseUJBQVEsR0FBZixjQUFvQixDQUFDO2dCQUN6QixhQUFDO1lBQUQsQ0FBQyxBQUZELElBRUM7WUFGWSxpQkFBTSxTQUVsQixDQUFBO1FBQ0wsQ0FBQyxFQUpnQixVQUFVLEdBQVYsMEJBQVUsS0FBViwwQkFBVSxRQUkxQjtJQUNMLENBQUMsRUFOUyxlQUFlLEtBQWYsZUFBZSxRQU14QiJ9,ZXhwb3J0IG5hbWVzcGFjZSBUb3BMZXZlbE1vZHVsZTEgewogICAgZXhwb3J0IG5hbWVzcGFjZSBTdWJNb2R1bGUxIHsKICAgICAgICBleHBvcnQgbmFtZXNwYWNlIFN1YlN1Yk1vZHVsZTEgewogICAgICAgICAgICBleHBvcnQgY2xhc3MgQ2xhc3NBIHsKICAgICAgICAgICAgICAgIHB1YmxpYyBBaXNJbjFfMV8xKCkgewogICAgICAgICAgICAgICAgICAgIC8vIFRyeSBhbGwgcXVhbGlmaWVkIG5hbWVzIG9mIHRoaXMgdHlwZQogICAgICAgICAgICAgICAgICAgIHZhciBhMTogQ2xhc3NBOyBhMS5BaXNJbjFfMV8xKCk7CiAgICAgICAgICAgICAgICAgICAgdmFyIGEyOiBTdWJTdWJNb2R1bGUxLkNsYXNzQTsgYTIuQWlzSW4xXzFfMSgpOwogICAgICAgICAgICAgICAgICAgIHZhciBhMzogU3ViTW9kdWxlMS5TdWJTdWJNb2R1bGUxLkNsYXNzQTsgYTMuQWlzSW4xXzFfMSgpOwogICAgICAgICAgICAgICAgICAgIHZhciBhNDogVG9wTGV2ZWxNb2R1bGUxLlN1Yk1vZHVsZTEuU3ViU3ViTW9kdWxlMS5DbGFzc0E7IGE0LkFpc0luMV8xXzEoKTsKICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAvLyBUd28gdmFyaWFudHMgb2YgcXVhbGlmeWluZyBhIHBlZXIgdHlwZQogICAgICAgICAgICAgICAgICAgIHZhciBiMTogQ2xhc3NCOyBiMS5CaXNJbjFfMV8xKCk7CiAgICAgICAgICAgICAgICAgICAgdmFyIGIyOiBUb3BMZXZlbE1vZHVsZTEuU3ViTW9kdWxlMS5TdWJTdWJNb2R1bGUxLkNsYXNzQjsgYjIuQmlzSW4xXzFfMSgpOwogICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgIC8vIFR5cGUgb25seSBhY2Nlc3NpYmxlIGZyb20gdGhlIHJvb3QKICAgICAgICAgICAgICAgICAgICB2YXIgYzE6IFRvcExldmVsTW9kdWxlMS5TdWJNb2R1bGUyLlN1YlN1Yk1vZHVsZTIuQ2xhc3NBOyBjMS5BaXNJbjFfMl8yKCk7CiAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgLy8gSW50ZXJmYWNlIHJlZmVyZW5jZQogICAgICAgICAgICAgICAgICAgIHZhciBkMTogSW50ZXJmYWNlWDsgZDEuWGlzSW4xXzFfMSgpOwogICAgICAgICAgICAgICAgICAgIHZhciBkMjogU3ViU3ViTW9kdWxlMS5JbnRlcmZhY2VYOyBkMi5YaXNJbjFfMV8xKCk7CiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIH0KICAgICAgICAgICAgZXhwb3J0IGNsYXNzIENsYXNzQiB7CiAgICAgICAgICAgICAgICBwdWJsaWMgQmlzSW4xXzFfMSgpIHsKICAgICAgICAgICAgICAgICAgICAvKiogRXhhY3RseSB0aGUgc2FtZSBhcyBhYm92ZSBpbiBBaXNJbjFfMV8xICoqLwogICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgIC8vIFRyeSBhbGwgcXVhbGlmaWVkIG5hbWVzIG9mIHRoaXMgdHlwZQogICAgICAgICAgICAgICAgICAgIHZhciBhMTogQ2xhc3NBOyBhMS5BaXNJbjFfMV8xKCk7CiAgICAgICAgICAgICAgICAgICAgdmFyIGEyOiBTdWJTdWJNb2R1bGUxLkNsYXNzQTsgYTIuQWlzSW4xXzFfMSgpOwogICAgICAgICAgICAgICAgICAgIHZhciBhMzogU3ViTW9kdWxlMS5TdWJTdWJNb2R1bGUxLkNsYXNzQTsgYTMuQWlzSW4xXzFfMSgpOwogICAgICAgICAgICAgICAgICAgIHZhciBhNDogVG9wTGV2ZWxNb2R1bGUxLlN1Yk1vZHVsZTEuU3ViU3ViTW9kdWxlMS5DbGFzc0E7IGE0LkFpc0luMV8xXzEoKTsKICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAvLyBUd28gdmFyaWFudHMgb2YgcXVhbGlmeWluZyBhIHBlZXIgdHlwZQogICAgICAgICAgICAgICAgICAgIHZhciBiMTogQ2xhc3NCOyBiMS5CaXNJbjFfMV8xKCk7CiAgICAgICAgICAgICAgICAgICAgdmFyIGIyOiBUb3BMZXZlbE1vZHVsZTEuU3ViTW9kdWxlMS5TdWJTdWJNb2R1bGUxLkNsYXNzQjsgYjIuQmlzSW4xXzFfMSgpOwogICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgIC8vIFR5cGUgb25seSBhY2Nlc3NpYmxlIGZyb20gdGhlIHJvb3QKICAgICAgICAgICAgICAgICAgICB2YXIgYzE6IFRvcExldmVsTW9kdWxlMS5TdWJNb2R1bGUyLlN1YlN1Yk1vZHVsZTIuQ2xhc3NBOyBjMS5BaXNJbjFfMl8yKCk7CiAgICAgICAgICAgICAgICAgICAgdmFyIGMyOiBUb3BMZXZlbE1vZHVsZTIuU3ViTW9kdWxlMy5DbGFzc0E7IGMyLkFpc0luMl8zKCk7CiAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgLy8gSW50ZXJmYWNlIHJlZmVyZW5jZQogICAgICAgICAgICAgICAgICAgIHZhciBkMTogSW50ZXJmYWNlWDsgZDEuWGlzSW4xXzFfMSgpOwogICAgICAgICAgICAgICAgICAgIHZhciBkMjogU3ViU3ViTW9kdWxlMS5JbnRlcmZhY2VYOyBkMi5YaXNJbjFfMV8xKCk7CiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIH0KICAgICAgICAgICAgZXhwb3J0IGludGVyZmFjZSBJbnRlcmZhY2VYIHsgWGlzSW4xXzFfMSgpOyB9CiAgICAgICAgICAgIGNsYXNzIE5vbkV4cG9ydGVkQ2xhc3NRIHsKICAgICAgICAgICAgICAgIGNvbnN0cnVjdG9yKCkgewogICAgICAgICAgICAgICAgICAgIGZ1bmN0aW9uIFFRKCkgewogICAgICAgICAgICAgICAgICAgICAgICAvKiBTYW1wbGluZyBvZiBzdHVmZiBmcm9tIEFpc0luMV8xXzEgKi8KICAgICAgICAgICAgICAgICAgICAgICAgdmFyIGE0OiBUb3BMZXZlbE1vZHVsZTEuU3ViTW9kdWxlMS5TdWJTdWJNb2R1bGUxLkNsYXNzQTsgYTQuQWlzSW4xXzFfMSgpOwogICAgICAgICAgICAgICAgICAgICAgICB2YXIgYzE6IFRvcExldmVsTW9kdWxlMS5TdWJNb2R1bGUyLlN1YlN1Yk1vZHVsZTIuQ2xhc3NBOyBjMS5BaXNJbjFfMl8yKCk7CiAgICAgICAgICAgICAgICAgICAgICAgIHZhciBkMTogSW50ZXJmYWNlWDsgZDEuWGlzSW4xXzFfMSgpOwogICAgICAgICAgICAgICAgICAgICAgICB2YXIgYzI6IFRvcExldmVsTW9kdWxlMi5TdWJNb2R1bGUzLkNsYXNzQTsgYzIuQWlzSW4yXzMoKTsKICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIH0KICAgICAgICB9CiAgICAgICAgCiAgICAgICAgLy8gU2hvdWxkIGhhdmUgbm8gZWZmZWN0IG9uIFMxLlNTMS5DbGFzc0EgYWJvdmUgYmVjYXVzZSBpdCBpcyBub3QgZXhwb3J0ZWQKICAgICAgICBjbGFzcyBDbGFzc0EgewogICAgICAgICAgICBjb25zdHJ1Y3RvcigpIHsKICAgICAgICAgICAgICAgIGZ1bmN0aW9uIEFBKCkgewogICAgICAgICAgICAgICAgICAgIHZhciBhMjogU3ViU3ViTW9kdWxlMS5DbGFzc0E7IGEyLkFpc0luMV8xXzEoKTsKICAgICAgICAgICAgICAgICAgICB2YXIgYTM6IFN1Yk1vZHVsZTEuU3ViU3ViTW9kdWxlMS5DbGFzc0E7IGEzLkFpc0luMV8xXzEoKTsKICAgICAgICAgICAgICAgICAgICB2YXIgYTQ6IFRvcExldmVsTW9kdWxlMS5TdWJNb2R1bGUxLlN1YlN1Yk1vZHVsZTEuQ2xhc3NBOyBhNC5BaXNJbjFfMV8xKCk7CiAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgLy8gSW50ZXJmYWNlIHJlZmVyZW5jZQogICAgICAgICAgICAgICAgICAgIHZhciBkMjogU3ViU3ViTW9kdWxlMS5JbnRlcmZhY2VYOyBkMi5YaXNJbjFfMV8xKCk7CiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIH0KICAgICAgICB9CiAgICB9CgogICAgZXhwb3J0IG5hbWVzcGFjZSBTdWJNb2R1bGUyIHsKICAgICAgICBleHBvcnQgbmFtZXNwYWNlIFN1YlN1Yk1vZHVsZTIgewogICAgICAgICAgICAvLyBObyBjb2RlIGhlcmUgc2luY2UgdGhlc2UgYXJlIHRoZSBtaXJyb3Igb2YgdGhlIGFib3ZlIGNhbGxzCiAgICAgICAgICAgIGV4cG9ydCBjbGFzcyBDbGFzc0EgeyBwdWJsaWMgQWlzSW4xXzJfMigpIHsgfSB9CiAgICAgICAgICAgIGV4cG9ydCBjbGFzcyBDbGFzc0IgeyBwdWJsaWMgQmlzSW4xXzJfMigpIHsgfSB9CiAgICAgICAgICAgIGV4cG9ydCBjbGFzcyBDbGFzc0MgeyBwdWJsaWMgQ2lzSW4xXzJfMigpIHsgfSB9CiAgICAgICAgICAgIGV4cG9ydCBpbnRlcmZhY2UgSW50ZXJmYWNlWSB7IFlpc0luMV8yXzIoKTsgfQogICAgICAgICAgICBpbnRlcmZhY2UgTm9uRXhwb3J0ZWRJbnRlcmZhY2VRIHsgfQogICAgICAgIH0KICAgICAgICAKICAgICAgICBleHBvcnQgaW50ZXJmYWNlIEludGVyZmFjZVkgeyBZaXNJbjFfMigpOyB9CiAgICB9CiAgICAKICAgIGNsYXNzIENsYXNzQSB7CiAgICAgICAgcHVibGljIEFpc0luMSgpIHsgfQogICAgfQoKICAgIGludGVyZmFjZSBJbnRlcmZhY2VZIHsKICAgICAgICBZaXNJbjEoKTsKICAgIH0KICAgIAogICAgbmFtZXNwYWNlIE5vdEV4cG9ydGVkTW9kdWxlIHsKICAgICAgICBleHBvcnQgY2xhc3MgQ2xhc3NBIHsgfQogICAgfQp9CgpuYW1lc3BhY2UgVG9wTGV2ZWxNb2R1bGUyIHsKICAgIGV4cG9ydCBuYW1lc3BhY2UgU3ViTW9kdWxlMyB7CiAgICAgICAgZXhwb3J0IGNsYXNzIENsYXNzQSB7CiAgICAgICAgICAgIHB1YmxpYyBBaXNJbjJfMygpIHsgfQogICAgICAgIH0KICAgIH0KfQoK diff --git a/tests/baselines/reference/typeResolution.sourcemap.txt b/tests/baselines/reference/typeResolution.sourcemap.txt index 6abe0213ce20a..f4a9c4de28ddb 100644 --- a/tests/baselines/reference/typeResolution.sourcemap.txt +++ b/tests/baselines/reference/typeResolution.sourcemap.txt @@ -19,11 +19,11 @@ sourceFile:typeResolution.ts 4 > ^ 5 > ^^^^^^^^^^-> 1 > -2 > export module +2 > export namespace 3 > TopLevelModule1 4 > { - > export module SubModule1 { - > export module SubSubModule1 { + > export namespace SubModule1 { + > export namespace SubSubModule1 { > export class ClassA { > public AisIn1_1_1() { > // Try all qualified names of this type @@ -96,8 +96,8 @@ sourceFile:typeResolution.ts > } > } > - > export module SubModule2 { - > export module SubSubModule2 { + > export namespace SubModule2 { + > export namespace SubSubModule2 { > // No code here since these are the mirror of the above calls > export class ClassA { public AisIn1_2_2() { } } > export class ClassB { public BisIn1_2_2() { } } @@ -117,13 +117,13 @@ sourceFile:typeResolution.ts > YisIn1(); > } > - > module NotExportedModule { + > namespace NotExportedModule { > export class ClassA { } > } > } 1 >Emitted(5, 5) Source(1, 1) + SourceIndex(0) -2 >Emitted(5, 9) Source(1, 15) + SourceIndex(0) -3 >Emitted(5, 24) Source(1, 30) + SourceIndex(0) +2 >Emitted(5, 9) Source(1, 18) + SourceIndex(0) +3 >Emitted(5, 24) Source(1, 33) + SourceIndex(0) 4 >Emitted(5, 25) Source(100, 2) + SourceIndex(0) --- >>> (function (TopLevelModule1) { @@ -131,11 +131,11 @@ sourceFile:typeResolution.ts 2 > ^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^ 1-> -2 > export module +2 > export namespace 3 > TopLevelModule1 1->Emitted(6, 5) Source(1, 1) + SourceIndex(0) -2 >Emitted(6, 16) Source(1, 15) + SourceIndex(0) -3 >Emitted(6, 31) Source(1, 30) + SourceIndex(0) +2 >Emitted(6, 16) Source(1, 18) + SourceIndex(0) +3 >Emitted(6, 31) Source(1, 33) + SourceIndex(0) --- >>> var SubModule1; 1 >^^^^^^^^ @@ -145,10 +145,10 @@ sourceFile:typeResolution.ts 5 > ^^^^^^^^^^-> 1 > { > -2 > export module +2 > export namespace 3 > SubModule1 4 > { - > export module SubSubModule1 { + > export namespace SubSubModule1 { > export class ClassA { > public AisIn1_1_1() { > // Try all qualified names of this type @@ -221,8 +221,8 @@ sourceFile:typeResolution.ts > } > } 1 >Emitted(7, 9) Source(2, 5) + SourceIndex(0) -2 >Emitted(7, 13) Source(2, 19) + SourceIndex(0) -3 >Emitted(7, 23) Source(2, 29) + SourceIndex(0) +2 >Emitted(7, 13) Source(2, 22) + SourceIndex(0) +3 >Emitted(7, 23) Source(2, 32) + SourceIndex(0) 4 >Emitted(7, 24) Source(74, 6) + SourceIndex(0) --- >>> (function (SubModule1) { @@ -231,11 +231,11 @@ sourceFile:typeResolution.ts 3 > ^^^^^^^^^^ 4 > ^^-> 1-> -2 > export module +2 > export namespace 3 > SubModule1 1->Emitted(8, 9) Source(2, 5) + SourceIndex(0) -2 >Emitted(8, 20) Source(2, 19) + SourceIndex(0) -3 >Emitted(8, 30) Source(2, 29) + SourceIndex(0) +2 >Emitted(8, 20) Source(2, 22) + SourceIndex(0) +3 >Emitted(8, 30) Source(2, 32) + SourceIndex(0) --- >>> var SubSubModule1; 1->^^^^^^^^^^^^ @@ -245,7 +245,7 @@ sourceFile:typeResolution.ts 5 > ^^^^^^^^^^-> 1-> { > -2 > export module +2 > export namespace 3 > SubSubModule1 4 > { > export class ClassA { @@ -305,8 +305,8 @@ sourceFile:typeResolution.ts > } > } 1->Emitted(9, 13) Source(3, 9) + SourceIndex(0) -2 >Emitted(9, 17) Source(3, 23) + SourceIndex(0) -3 >Emitted(9, 30) Source(3, 36) + SourceIndex(0) +2 >Emitted(9, 17) Source(3, 26) + SourceIndex(0) +3 >Emitted(9, 30) Source(3, 39) + SourceIndex(0) 4 >Emitted(9, 31) Source(59, 10) + SourceIndex(0) --- >>> (function (SubSubModule1) { @@ -315,11 +315,11 @@ sourceFile:typeResolution.ts 3 > ^^^^^^^^^^^^^ 4 > ^^^^^^^^^^^^^^^^^^^^^^-> 1-> -2 > export module +2 > export namespace 3 > SubSubModule1 1->Emitted(10, 13) Source(3, 9) + SourceIndex(0) -2 >Emitted(10, 24) Source(3, 23) + SourceIndex(0) -3 >Emitted(10, 37) Source(3, 36) + SourceIndex(0) +2 >Emitted(10, 24) Source(3, 26) + SourceIndex(0) +3 >Emitted(10, 37) Source(3, 39) + SourceIndex(0) --- >>> var ClassA = /** @class */ (function () { 1->^^^^^^^^^^^^^^^^ @@ -1700,12 +1700,12 @@ sourceFile:typeResolution.ts > } 1->Emitted(90, 13) Source(59, 9) + SourceIndex(0) 2 >Emitted(90, 14) Source(59, 10) + SourceIndex(0) -3 >Emitted(90, 16) Source(3, 23) + SourceIndex(0) -4 >Emitted(90, 29) Source(3, 36) + SourceIndex(0) -5 >Emitted(90, 32) Source(3, 23) + SourceIndex(0) -6 >Emitted(90, 56) Source(3, 36) + SourceIndex(0) -7 >Emitted(90, 61) Source(3, 23) + SourceIndex(0) -8 >Emitted(90, 85) Source(3, 36) + SourceIndex(0) +3 >Emitted(90, 16) Source(3, 26) + SourceIndex(0) +4 >Emitted(90, 29) Source(3, 39) + SourceIndex(0) +5 >Emitted(90, 32) Source(3, 26) + SourceIndex(0) +6 >Emitted(90, 56) Source(3, 39) + SourceIndex(0) +7 >Emitted(90, 61) Source(3, 26) + SourceIndex(0) +8 >Emitted(90, 85) Source(3, 39) + SourceIndex(0) 9 >Emitted(90, 93) Source(59, 10) + SourceIndex(0) --- >>> // Should have no effect on S1.SS1.ClassA above because it is not exported @@ -1974,7 +1974,7 @@ sourceFile:typeResolution.ts 7 > 8 > SubModule1 9 > { - > export module SubSubModule1 { + > export namespace SubSubModule1 { > export class ClassA { > public AisIn1_1_1() { > // Try all qualified names of this type @@ -2048,12 +2048,12 @@ sourceFile:typeResolution.ts > } 1->Emitted(108, 9) Source(74, 5) + SourceIndex(0) 2 >Emitted(108, 10) Source(74, 6) + SourceIndex(0) -3 >Emitted(108, 12) Source(2, 19) + SourceIndex(0) -4 >Emitted(108, 22) Source(2, 29) + SourceIndex(0) -5 >Emitted(108, 25) Source(2, 19) + SourceIndex(0) -6 >Emitted(108, 51) Source(2, 29) + SourceIndex(0) -7 >Emitted(108, 56) Source(2, 19) + SourceIndex(0) -8 >Emitted(108, 82) Source(2, 29) + SourceIndex(0) +3 >Emitted(108, 12) Source(2, 22) + SourceIndex(0) +4 >Emitted(108, 22) Source(2, 32) + SourceIndex(0) +5 >Emitted(108, 25) Source(2, 22) + SourceIndex(0) +6 >Emitted(108, 51) Source(2, 32) + SourceIndex(0) +7 >Emitted(108, 56) Source(2, 22) + SourceIndex(0) +8 >Emitted(108, 82) Source(2, 32) + SourceIndex(0) 9 >Emitted(108, 90) Source(74, 6) + SourceIndex(0) --- >>> var SubModule2; @@ -2065,10 +2065,10 @@ sourceFile:typeResolution.ts 1 > > > -2 > export module +2 > export namespace 3 > SubModule2 4 > { - > export module SubSubModule2 { + > export namespace SubSubModule2 { > // No code here since these are the mirror of the above calls > export class ClassA { public AisIn1_2_2() { } } > export class ClassB { public BisIn1_2_2() { } } @@ -2080,8 +2080,8 @@ sourceFile:typeResolution.ts > export interface InterfaceY { YisIn1_2(); } > } 1 >Emitted(109, 9) Source(76, 5) + SourceIndex(0) -2 >Emitted(109, 13) Source(76, 19) + SourceIndex(0) -3 >Emitted(109, 23) Source(76, 29) + SourceIndex(0) +2 >Emitted(109, 13) Source(76, 22) + SourceIndex(0) +3 >Emitted(109, 23) Source(76, 32) + SourceIndex(0) 4 >Emitted(109, 24) Source(87, 6) + SourceIndex(0) --- >>> (function (SubModule2) { @@ -2090,11 +2090,11 @@ sourceFile:typeResolution.ts 3 > ^^^^^^^^^^ 4 > ^^-> 1-> -2 > export module +2 > export namespace 3 > SubModule2 1->Emitted(110, 9) Source(76, 5) + SourceIndex(0) -2 >Emitted(110, 20) Source(76, 19) + SourceIndex(0) -3 >Emitted(110, 30) Source(76, 29) + SourceIndex(0) +2 >Emitted(110, 20) Source(76, 22) + SourceIndex(0) +3 >Emitted(110, 30) Source(76, 32) + SourceIndex(0) --- >>> var SubSubModule2; 1->^^^^^^^^^^^^ @@ -2104,7 +2104,7 @@ sourceFile:typeResolution.ts 5 > ^^^^^^^^^^-> 1-> { > -2 > export module +2 > export namespace 3 > SubSubModule2 4 > { > // No code here since these are the mirror of the above calls @@ -2115,8 +2115,8 @@ sourceFile:typeResolution.ts > interface NonExportedInterfaceQ { } > } 1->Emitted(111, 13) Source(77, 9) + SourceIndex(0) -2 >Emitted(111, 17) Source(77, 23) + SourceIndex(0) -3 >Emitted(111, 30) Source(77, 36) + SourceIndex(0) +2 >Emitted(111, 17) Source(77, 26) + SourceIndex(0) +3 >Emitted(111, 30) Source(77, 39) + SourceIndex(0) 4 >Emitted(111, 31) Source(84, 10) + SourceIndex(0) --- >>> (function (SubSubModule2) { @@ -2125,11 +2125,11 @@ sourceFile:typeResolution.ts 3 > ^^^^^^^^^^^^^ 4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> -2 > export module +2 > export namespace 3 > SubSubModule2 1->Emitted(112, 13) Source(77, 9) + SourceIndex(0) -2 >Emitted(112, 24) Source(77, 23) + SourceIndex(0) -3 >Emitted(112, 37) Source(77, 36) + SourceIndex(0) +2 >Emitted(112, 24) Source(77, 26) + SourceIndex(0) +3 >Emitted(112, 37) Source(77, 39) + SourceIndex(0) --- >>> // No code here since these are the mirror of the above calls 1->^^^^^^^^^^^^^^^^ @@ -2402,12 +2402,12 @@ sourceFile:typeResolution.ts > } 1->Emitted(135, 13) Source(84, 9) + SourceIndex(0) 2 >Emitted(135, 14) Source(84, 10) + SourceIndex(0) -3 >Emitted(135, 16) Source(77, 23) + SourceIndex(0) -4 >Emitted(135, 29) Source(77, 36) + SourceIndex(0) -5 >Emitted(135, 32) Source(77, 23) + SourceIndex(0) -6 >Emitted(135, 56) Source(77, 36) + SourceIndex(0) -7 >Emitted(135, 61) Source(77, 23) + SourceIndex(0) -8 >Emitted(135, 85) Source(77, 36) + SourceIndex(0) +3 >Emitted(135, 16) Source(77, 26) + SourceIndex(0) +4 >Emitted(135, 29) Source(77, 39) + SourceIndex(0) +5 >Emitted(135, 32) Source(77, 26) + SourceIndex(0) +6 >Emitted(135, 56) Source(77, 39) + SourceIndex(0) +7 >Emitted(135, 61) Source(77, 26) + SourceIndex(0) +8 >Emitted(135, 85) Source(77, 39) + SourceIndex(0) 9 >Emitted(135, 93) Source(84, 10) + SourceIndex(0) --- >>> })(SubModule2 = TopLevelModule1.SubModule2 || (TopLevelModule1.SubModule2 = {})); @@ -2432,7 +2432,7 @@ sourceFile:typeResolution.ts 7 > 8 > SubModule2 9 > { - > export module SubSubModule2 { + > export namespace SubSubModule2 { > // No code here since these are the mirror of the above calls > export class ClassA { public AisIn1_2_2() { } } > export class ClassB { public BisIn1_2_2() { } } @@ -2445,12 +2445,12 @@ sourceFile:typeResolution.ts > } 1 >Emitted(136, 9) Source(87, 5) + SourceIndex(0) 2 >Emitted(136, 10) Source(87, 6) + SourceIndex(0) -3 >Emitted(136, 12) Source(76, 19) + SourceIndex(0) -4 >Emitted(136, 22) Source(76, 29) + SourceIndex(0) -5 >Emitted(136, 25) Source(76, 19) + SourceIndex(0) -6 >Emitted(136, 51) Source(76, 29) + SourceIndex(0) -7 >Emitted(136, 56) Source(76, 19) + SourceIndex(0) -8 >Emitted(136, 82) Source(76, 29) + SourceIndex(0) +3 >Emitted(136, 12) Source(76, 22) + SourceIndex(0) +4 >Emitted(136, 22) Source(76, 32) + SourceIndex(0) +5 >Emitted(136, 25) Source(76, 22) + SourceIndex(0) +6 >Emitted(136, 51) Source(76, 32) + SourceIndex(0) +7 >Emitted(136, 56) Source(76, 22) + SourceIndex(0) +8 >Emitted(136, 82) Source(76, 32) + SourceIndex(0) 9 >Emitted(136, 90) Source(87, 6) + SourceIndex(0) --- >>> var ClassA = /** @class */ (function () { @@ -2534,14 +2534,14 @@ sourceFile:typeResolution.ts > } > > -2 > module +2 > namespace 3 > NotExportedModule 4 > { > export class ClassA { } > } 1->Emitted(143, 9) Source(97, 5) + SourceIndex(0) -2 >Emitted(143, 13) Source(97, 12) + SourceIndex(0) -3 >Emitted(143, 30) Source(97, 29) + SourceIndex(0) +2 >Emitted(143, 13) Source(97, 15) + SourceIndex(0) +3 >Emitted(143, 30) Source(97, 32) + SourceIndex(0) 4 >Emitted(143, 31) Source(99, 6) + SourceIndex(0) --- >>> (function (NotExportedModule) { @@ -2550,11 +2550,11 @@ sourceFile:typeResolution.ts 3 > ^^^^^^^^^^^^^^^^^ 4 > ^^^^^^^^^^^^^^^^^^-> 1-> -2 > module +2 > namespace 3 > NotExportedModule 1->Emitted(144, 9) Source(97, 5) + SourceIndex(0) -2 >Emitted(144, 20) Source(97, 12) + SourceIndex(0) -3 >Emitted(144, 37) Source(97, 29) + SourceIndex(0) +2 >Emitted(144, 20) Source(97, 15) + SourceIndex(0) +3 >Emitted(144, 37) Source(97, 32) + SourceIndex(0) --- >>> var ClassA = /** @class */ (function () { 1->^^^^^^^^^^^^ @@ -2637,10 +2637,10 @@ sourceFile:typeResolution.ts > } 1->Emitted(151, 9) Source(99, 5) + SourceIndex(0) 2 >Emitted(151, 10) Source(99, 6) + SourceIndex(0) -3 >Emitted(151, 12) Source(97, 12) + SourceIndex(0) -4 >Emitted(151, 29) Source(97, 29) + SourceIndex(0) -5 >Emitted(151, 34) Source(97, 12) + SourceIndex(0) -6 >Emitted(151, 51) Source(97, 29) + SourceIndex(0) +3 >Emitted(151, 12) Source(97, 15) + SourceIndex(0) +4 >Emitted(151, 29) Source(97, 32) + SourceIndex(0) +5 >Emitted(151, 34) Source(97, 15) + SourceIndex(0) +6 >Emitted(151, 51) Source(97, 32) + SourceIndex(0) 7 >Emitted(151, 59) Source(99, 6) + SourceIndex(0) --- >>> })(TopLevelModule1 || (exports.TopLevelModule1 = TopLevelModule1 = {})); @@ -2659,8 +2659,8 @@ sourceFile:typeResolution.ts 5 > 6 > TopLevelModule1 7 > { - > export module SubModule1 { - > export module SubSubModule1 { + > export namespace SubModule1 { + > export namespace SubSubModule1 { > export class ClassA { > public AisIn1_1_1() { > // Try all qualified names of this type @@ -2733,8 +2733,8 @@ sourceFile:typeResolution.ts > } > } > - > export module SubModule2 { - > export module SubSubModule2 { + > export namespace SubModule2 { + > export namespace SubSubModule2 { > // No code here since these are the mirror of the above calls > export class ClassA { public AisIn1_2_2() { } } > export class ClassB { public BisIn1_2_2() { } } @@ -2754,16 +2754,16 @@ sourceFile:typeResolution.ts > YisIn1(); > } > - > module NotExportedModule { + > namespace NotExportedModule { > export class ClassA { } > } > } 1->Emitted(152, 5) Source(100, 1) + SourceIndex(0) 2 >Emitted(152, 6) Source(100, 2) + SourceIndex(0) -3 >Emitted(152, 8) Source(1, 15) + SourceIndex(0) -4 >Emitted(152, 23) Source(1, 30) + SourceIndex(0) -5 >Emitted(152, 54) Source(1, 15) + SourceIndex(0) -6 >Emitted(152, 69) Source(1, 30) + SourceIndex(0) +3 >Emitted(152, 8) Source(1, 18) + SourceIndex(0) +4 >Emitted(152, 23) Source(1, 33) + SourceIndex(0) +5 >Emitted(152, 54) Source(1, 18) + SourceIndex(0) +6 >Emitted(152, 69) Source(1, 33) + SourceIndex(0) 7 >Emitted(152, 77) Source(100, 2) + SourceIndex(0) --- >>> var TopLevelModule2; @@ -2775,18 +2775,18 @@ sourceFile:typeResolution.ts 1 > > > -2 > module +2 > namespace 3 > TopLevelModule2 4 > { - > export module SubModule3 { + > export namespace SubModule3 { > export class ClassA { > public AisIn2_3() { } > } > } > } 1 >Emitted(153, 5) Source(102, 1) + SourceIndex(0) -2 >Emitted(153, 9) Source(102, 8) + SourceIndex(0) -3 >Emitted(153, 24) Source(102, 23) + SourceIndex(0) +2 >Emitted(153, 9) Source(102, 11) + SourceIndex(0) +3 >Emitted(153, 24) Source(102, 26) + SourceIndex(0) 4 >Emitted(153, 25) Source(108, 2) + SourceIndex(0) --- >>> (function (TopLevelModule2) { @@ -2794,11 +2794,11 @@ sourceFile:typeResolution.ts 2 > ^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^ 1-> -2 > module +2 > namespace 3 > TopLevelModule2 1->Emitted(154, 5) Source(102, 1) + SourceIndex(0) -2 >Emitted(154, 16) Source(102, 8) + SourceIndex(0) -3 >Emitted(154, 31) Source(102, 23) + SourceIndex(0) +2 >Emitted(154, 16) Source(102, 11) + SourceIndex(0) +3 >Emitted(154, 31) Source(102, 26) + SourceIndex(0) --- >>> var SubModule3; 1 >^^^^^^^^ @@ -2808,7 +2808,7 @@ sourceFile:typeResolution.ts 5 > ^^^^^^^^^^-> 1 > { > -2 > export module +2 > export namespace 3 > SubModule3 4 > { > export class ClassA { @@ -2816,8 +2816,8 @@ sourceFile:typeResolution.ts > } > } 1 >Emitted(155, 9) Source(103, 5) + SourceIndex(0) -2 >Emitted(155, 13) Source(103, 19) + SourceIndex(0) -3 >Emitted(155, 23) Source(103, 29) + SourceIndex(0) +2 >Emitted(155, 13) Source(103, 22) + SourceIndex(0) +3 >Emitted(155, 23) Source(103, 32) + SourceIndex(0) 4 >Emitted(155, 24) Source(107, 6) + SourceIndex(0) --- >>> (function (SubModule3) { @@ -2826,11 +2826,11 @@ sourceFile:typeResolution.ts 3 > ^^^^^^^^^^ 4 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> -2 > export module +2 > export namespace 3 > SubModule3 1->Emitted(156, 9) Source(103, 5) + SourceIndex(0) -2 >Emitted(156, 20) Source(103, 19) + SourceIndex(0) -3 >Emitted(156, 30) Source(103, 29) + SourceIndex(0) +2 >Emitted(156, 20) Source(103, 22) + SourceIndex(0) +3 >Emitted(156, 30) Source(103, 32) + SourceIndex(0) --- >>> var ClassA = /** @class */ (function () { 1->^^^^^^^^^^^^ @@ -2942,12 +2942,12 @@ sourceFile:typeResolution.ts > } 1->Emitted(164, 9) Source(107, 5) + SourceIndex(0) 2 >Emitted(164, 10) Source(107, 6) + SourceIndex(0) -3 >Emitted(164, 12) Source(103, 19) + SourceIndex(0) -4 >Emitted(164, 22) Source(103, 29) + SourceIndex(0) -5 >Emitted(164, 25) Source(103, 19) + SourceIndex(0) -6 >Emitted(164, 51) Source(103, 29) + SourceIndex(0) -7 >Emitted(164, 56) Source(103, 19) + SourceIndex(0) -8 >Emitted(164, 82) Source(103, 29) + SourceIndex(0) +3 >Emitted(164, 12) Source(103, 22) + SourceIndex(0) +4 >Emitted(164, 22) Source(103, 32) + SourceIndex(0) +5 >Emitted(164, 25) Source(103, 22) + SourceIndex(0) +6 >Emitted(164, 51) Source(103, 32) + SourceIndex(0) +7 >Emitted(164, 56) Source(103, 22) + SourceIndex(0) +8 >Emitted(164, 82) Source(103, 32) + SourceIndex(0) 9 >Emitted(164, 90) Source(107, 6) + SourceIndex(0) --- >>> })(TopLevelModule2 || (TopLevelModule2 = {})); @@ -2966,7 +2966,7 @@ sourceFile:typeResolution.ts 5 > 6 > TopLevelModule2 7 > { - > export module SubModule3 { + > export namespace SubModule3 { > export class ClassA { > public AisIn2_3() { } > } @@ -2974,10 +2974,10 @@ sourceFile:typeResolution.ts > } 1 >Emitted(165, 5) Source(108, 1) + SourceIndex(0) 2 >Emitted(165, 6) Source(108, 2) + SourceIndex(0) -3 >Emitted(165, 8) Source(102, 8) + SourceIndex(0) -4 >Emitted(165, 23) Source(102, 23) + SourceIndex(0) -5 >Emitted(165, 28) Source(102, 8) + SourceIndex(0) -6 >Emitted(165, 43) Source(102, 23) + SourceIndex(0) +3 >Emitted(165, 8) Source(102, 11) + SourceIndex(0) +4 >Emitted(165, 23) Source(102, 26) + SourceIndex(0) +5 >Emitted(165, 28) Source(102, 11) + SourceIndex(0) +6 >Emitted(165, 43) Source(102, 26) + SourceIndex(0) 7 >Emitted(165, 51) Source(108, 2) + SourceIndex(0) --- >>>}); diff --git a/tests/baselines/reference/typeResolution.symbols b/tests/baselines/reference/typeResolution.symbols index 062e3b7209054..1053d13fe98c8 100644 --- a/tests/baselines/reference/typeResolution.symbols +++ b/tests/baselines/reference/typeResolution.symbols @@ -1,17 +1,17 @@ //// [tests/cases/compiler/typeResolution.ts] //// === typeResolution.ts === -export module TopLevelModule1 { +export namespace TopLevelModule1 { >TopLevelModule1 : Symbol(TopLevelModule1, Decl(typeResolution.ts, 0, 0)) - export module SubModule1 { ->SubModule1 : Symbol(SubModule1, Decl(typeResolution.ts, 0, 31)) + export namespace SubModule1 { +>SubModule1 : Symbol(SubModule1, Decl(typeResolution.ts, 0, 34)) - export module SubSubModule1 { ->SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 30)) + export namespace SubSubModule1 { +>SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 33)) export class ClassA { ->ClassA : Symbol(ClassA, Decl(typeResolution.ts, 2, 37)) +>ClassA : Symbol(ClassA, Decl(typeResolution.ts, 2, 40)) public AisIn1_1_1() { >AisIn1_1_1 : Symbol(ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) @@ -19,24 +19,24 @@ export module TopLevelModule1 { // Try all qualified names of this type var a1: ClassA; a1.AisIn1_1_1(); >a1 : Symbol(a1, Decl(typeResolution.ts, 6, 23)) ->ClassA : Symbol(ClassA, Decl(typeResolution.ts, 2, 37)) +>ClassA : Symbol(ClassA, Decl(typeResolution.ts, 2, 40)) >a1.AisIn1_1_1 : Symbol(ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) >a1 : Symbol(a1, Decl(typeResolution.ts, 6, 23)) >AisIn1_1_1 : Symbol(ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); >a2 : Symbol(a2, Decl(typeResolution.ts, 7, 23)) ->SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 30)) ->ClassA : Symbol(ClassA, Decl(typeResolution.ts, 2, 37)) +>SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 33)) +>ClassA : Symbol(ClassA, Decl(typeResolution.ts, 2, 40)) >a2.AisIn1_1_1 : Symbol(ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) >a2 : Symbol(a2, Decl(typeResolution.ts, 7, 23)) >AisIn1_1_1 : Symbol(ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); >a3 : Symbol(a3, Decl(typeResolution.ts, 8, 23)) ->SubModule1 : Symbol(SubModule1, Decl(typeResolution.ts, 0, 31)) ->SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 30)) ->ClassA : Symbol(ClassA, Decl(typeResolution.ts, 2, 37)) +>SubModule1 : Symbol(SubModule1, Decl(typeResolution.ts, 0, 34)) +>SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 33)) +>ClassA : Symbol(ClassA, Decl(typeResolution.ts, 2, 40)) >a3.AisIn1_1_1 : Symbol(ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) >a3 : Symbol(a3, Decl(typeResolution.ts, 8, 23)) >AisIn1_1_1 : Symbol(ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) @@ -44,9 +44,9 @@ export module TopLevelModule1 { var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); >a4 : Symbol(a4, Decl(typeResolution.ts, 9, 23)) >TopLevelModule1 : Symbol(TopLevelModule1, Decl(typeResolution.ts, 0, 0)) ->SubModule1 : Symbol(SubModule1, Decl(typeResolution.ts, 0, 31)) ->SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 30)) ->ClassA : Symbol(ClassA, Decl(typeResolution.ts, 2, 37)) +>SubModule1 : Symbol(SubModule1, Decl(typeResolution.ts, 0, 34)) +>SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 33)) +>ClassA : Symbol(ClassA, Decl(typeResolution.ts, 2, 40)) >a4.AisIn1_1_1 : Symbol(ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) >a4 : Symbol(a4, Decl(typeResolution.ts, 9, 23)) >AisIn1_1_1 : Symbol(ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) @@ -62,8 +62,8 @@ export module TopLevelModule1 { var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); >b2 : Symbol(b2, Decl(typeResolution.ts, 13, 23)) >TopLevelModule1 : Symbol(TopLevelModule1, Decl(typeResolution.ts, 0, 0)) ->SubModule1 : Symbol(SubModule1, Decl(typeResolution.ts, 0, 31)) ->SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 30)) +>SubModule1 : Symbol(SubModule1, Decl(typeResolution.ts, 0, 34)) +>SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 33)) >ClassB : Symbol(ClassB, Decl(typeResolution.ts, 22, 13)) >b2.BisIn1_1_1 : Symbol(ClassB.BisIn1_1_1, Decl(typeResolution.ts, 23, 33)) >b2 : Symbol(b2, Decl(typeResolution.ts, 13, 23)) @@ -74,8 +74,8 @@ export module TopLevelModule1 { >c1 : Symbol(c1, Decl(typeResolution.ts, 16, 23)) >TopLevelModule1 : Symbol(TopLevelModule1, Decl(typeResolution.ts, 0, 0)) >SubModule2 : Symbol(SubModule2, Decl(typeResolution.ts, 73, 5)) ->SubSubModule2 : Symbol(SubModule2.SubSubModule2, Decl(typeResolution.ts, 75, 30)) ->ClassA : Symbol(SubModule2.SubSubModule2.ClassA, Decl(typeResolution.ts, 76, 37)) +>SubSubModule2 : Symbol(SubModule2.SubSubModule2, Decl(typeResolution.ts, 75, 33)) +>ClassA : Symbol(SubModule2.SubSubModule2.ClassA, Decl(typeResolution.ts, 76, 40)) >c1.AisIn1_2_2 : Symbol(SubModule2.SubSubModule2.ClassA.AisIn1_2_2, Decl(typeResolution.ts, 78, 33)) >c1 : Symbol(c1, Decl(typeResolution.ts, 16, 23)) >AisIn1_2_2 : Symbol(SubModule2.SubSubModule2.ClassA.AisIn1_2_2, Decl(typeResolution.ts, 78, 33)) @@ -90,7 +90,7 @@ export module TopLevelModule1 { var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); >d2 : Symbol(d2, Decl(typeResolution.ts, 20, 23)) ->SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 30)) +>SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 33)) >InterfaceX : Symbol(InterfaceX, Decl(typeResolution.ts, 45, 13)) >d2.XisIn1_1_1 : Symbol(InterfaceX.XisIn1_1_1, Decl(typeResolution.ts, 46, 41)) >d2 : Symbol(d2, Decl(typeResolution.ts, 20, 23)) @@ -108,24 +108,24 @@ export module TopLevelModule1 { // Try all qualified names of this type var a1: ClassA; a1.AisIn1_1_1(); >a1 : Symbol(a1, Decl(typeResolution.ts, 28, 23)) ->ClassA : Symbol(ClassA, Decl(typeResolution.ts, 2, 37)) +>ClassA : Symbol(ClassA, Decl(typeResolution.ts, 2, 40)) >a1.AisIn1_1_1 : Symbol(ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) >a1 : Symbol(a1, Decl(typeResolution.ts, 28, 23)) >AisIn1_1_1 : Symbol(ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); >a2 : Symbol(a2, Decl(typeResolution.ts, 29, 23)) ->SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 30)) ->ClassA : Symbol(ClassA, Decl(typeResolution.ts, 2, 37)) +>SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 33)) +>ClassA : Symbol(ClassA, Decl(typeResolution.ts, 2, 40)) >a2.AisIn1_1_1 : Symbol(ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) >a2 : Symbol(a2, Decl(typeResolution.ts, 29, 23)) >AisIn1_1_1 : Symbol(ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); >a3 : Symbol(a3, Decl(typeResolution.ts, 30, 23)) ->SubModule1 : Symbol(SubModule1, Decl(typeResolution.ts, 0, 31)) ->SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 30)) ->ClassA : Symbol(ClassA, Decl(typeResolution.ts, 2, 37)) +>SubModule1 : Symbol(SubModule1, Decl(typeResolution.ts, 0, 34)) +>SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 33)) +>ClassA : Symbol(ClassA, Decl(typeResolution.ts, 2, 40)) >a3.AisIn1_1_1 : Symbol(ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) >a3 : Symbol(a3, Decl(typeResolution.ts, 30, 23)) >AisIn1_1_1 : Symbol(ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) @@ -133,9 +133,9 @@ export module TopLevelModule1 { var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); >a4 : Symbol(a4, Decl(typeResolution.ts, 31, 23)) >TopLevelModule1 : Symbol(TopLevelModule1, Decl(typeResolution.ts, 0, 0)) ->SubModule1 : Symbol(SubModule1, Decl(typeResolution.ts, 0, 31)) ->SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 30)) ->ClassA : Symbol(ClassA, Decl(typeResolution.ts, 2, 37)) +>SubModule1 : Symbol(SubModule1, Decl(typeResolution.ts, 0, 34)) +>SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 33)) +>ClassA : Symbol(ClassA, Decl(typeResolution.ts, 2, 40)) >a4.AisIn1_1_1 : Symbol(ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) >a4 : Symbol(a4, Decl(typeResolution.ts, 31, 23)) >AisIn1_1_1 : Symbol(ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) @@ -151,8 +151,8 @@ export module TopLevelModule1 { var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); >b2 : Symbol(b2, Decl(typeResolution.ts, 35, 23)) >TopLevelModule1 : Symbol(TopLevelModule1, Decl(typeResolution.ts, 0, 0)) ->SubModule1 : Symbol(SubModule1, Decl(typeResolution.ts, 0, 31)) ->SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 30)) +>SubModule1 : Symbol(SubModule1, Decl(typeResolution.ts, 0, 34)) +>SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 33)) >ClassB : Symbol(ClassB, Decl(typeResolution.ts, 22, 13)) >b2.BisIn1_1_1 : Symbol(ClassB.BisIn1_1_1, Decl(typeResolution.ts, 23, 33)) >b2 : Symbol(b2, Decl(typeResolution.ts, 35, 23)) @@ -163,8 +163,8 @@ export module TopLevelModule1 { >c1 : Symbol(c1, Decl(typeResolution.ts, 38, 23)) >TopLevelModule1 : Symbol(TopLevelModule1, Decl(typeResolution.ts, 0, 0)) >SubModule2 : Symbol(SubModule2, Decl(typeResolution.ts, 73, 5)) ->SubSubModule2 : Symbol(SubModule2.SubSubModule2, Decl(typeResolution.ts, 75, 30)) ->ClassA : Symbol(SubModule2.SubSubModule2.ClassA, Decl(typeResolution.ts, 76, 37)) +>SubSubModule2 : Symbol(SubModule2.SubSubModule2, Decl(typeResolution.ts, 75, 33)) +>ClassA : Symbol(SubModule2.SubSubModule2.ClassA, Decl(typeResolution.ts, 76, 40)) >c1.AisIn1_2_2 : Symbol(SubModule2.SubSubModule2.ClassA.AisIn1_2_2, Decl(typeResolution.ts, 78, 33)) >c1 : Symbol(c1, Decl(typeResolution.ts, 38, 23)) >AisIn1_2_2 : Symbol(SubModule2.SubSubModule2.ClassA.AisIn1_2_2, Decl(typeResolution.ts, 78, 33)) @@ -172,8 +172,8 @@ export module TopLevelModule1 { var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); >c2 : Symbol(c2, Decl(typeResolution.ts, 39, 23)) >TopLevelModule2 : Symbol(TopLevelModule2, Decl(typeResolution.ts, 99, 1)) ->SubModule3 : Symbol(TopLevelModule2.SubModule3, Decl(typeResolution.ts, 101, 24)) ->ClassA : Symbol(TopLevelModule2.SubModule3.ClassA, Decl(typeResolution.ts, 102, 30)) +>SubModule3 : Symbol(TopLevelModule2.SubModule3, Decl(typeResolution.ts, 101, 27)) +>ClassA : Symbol(TopLevelModule2.SubModule3.ClassA, Decl(typeResolution.ts, 102, 33)) >c2.AisIn2_3 : Symbol(TopLevelModule2.SubModule3.ClassA.AisIn2_3, Decl(typeResolution.ts, 103, 29)) >c2 : Symbol(c2, Decl(typeResolution.ts, 39, 23)) >AisIn2_3 : Symbol(TopLevelModule2.SubModule3.ClassA.AisIn2_3, Decl(typeResolution.ts, 103, 29)) @@ -188,7 +188,7 @@ export module TopLevelModule1 { var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); >d2 : Symbol(d2, Decl(typeResolution.ts, 43, 23)) ->SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 30)) +>SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 33)) >InterfaceX : Symbol(InterfaceX, Decl(typeResolution.ts, 45, 13)) >d2.XisIn1_1_1 : Symbol(InterfaceX.XisIn1_1_1, Decl(typeResolution.ts, 46, 41)) >d2 : Symbol(d2, Decl(typeResolution.ts, 43, 23)) @@ -210,9 +210,9 @@ export module TopLevelModule1 { var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); >a4 : Symbol(a4, Decl(typeResolution.ts, 51, 27)) >TopLevelModule1 : Symbol(TopLevelModule1, Decl(typeResolution.ts, 0, 0)) ->SubModule1 : Symbol(SubModule1, Decl(typeResolution.ts, 0, 31)) ->SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 30)) ->ClassA : Symbol(ClassA, Decl(typeResolution.ts, 2, 37)) +>SubModule1 : Symbol(SubModule1, Decl(typeResolution.ts, 0, 34)) +>SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 33)) +>ClassA : Symbol(ClassA, Decl(typeResolution.ts, 2, 40)) >a4.AisIn1_1_1 : Symbol(ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) >a4 : Symbol(a4, Decl(typeResolution.ts, 51, 27)) >AisIn1_1_1 : Symbol(ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) @@ -221,8 +221,8 @@ export module TopLevelModule1 { >c1 : Symbol(c1, Decl(typeResolution.ts, 52, 27)) >TopLevelModule1 : Symbol(TopLevelModule1, Decl(typeResolution.ts, 0, 0)) >SubModule2 : Symbol(SubModule2, Decl(typeResolution.ts, 73, 5)) ->SubSubModule2 : Symbol(SubModule2.SubSubModule2, Decl(typeResolution.ts, 75, 30)) ->ClassA : Symbol(SubModule2.SubSubModule2.ClassA, Decl(typeResolution.ts, 76, 37)) +>SubSubModule2 : Symbol(SubModule2.SubSubModule2, Decl(typeResolution.ts, 75, 33)) +>ClassA : Symbol(SubModule2.SubSubModule2.ClassA, Decl(typeResolution.ts, 76, 40)) >c1.AisIn1_2_2 : Symbol(SubModule2.SubSubModule2.ClassA.AisIn1_2_2, Decl(typeResolution.ts, 78, 33)) >c1 : Symbol(c1, Decl(typeResolution.ts, 52, 27)) >AisIn1_2_2 : Symbol(SubModule2.SubSubModule2.ClassA.AisIn1_2_2, Decl(typeResolution.ts, 78, 33)) @@ -237,8 +237,8 @@ export module TopLevelModule1 { var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); >c2 : Symbol(c2, Decl(typeResolution.ts, 54, 27)) >TopLevelModule2 : Symbol(TopLevelModule2, Decl(typeResolution.ts, 99, 1)) ->SubModule3 : Symbol(TopLevelModule2.SubModule3, Decl(typeResolution.ts, 101, 24)) ->ClassA : Symbol(TopLevelModule2.SubModule3.ClassA, Decl(typeResolution.ts, 102, 30)) +>SubModule3 : Symbol(TopLevelModule2.SubModule3, Decl(typeResolution.ts, 101, 27)) +>ClassA : Symbol(TopLevelModule2.SubModule3.ClassA, Decl(typeResolution.ts, 102, 33)) >c2.AisIn2_3 : Symbol(TopLevelModule2.SubModule3.ClassA.AisIn2_3, Decl(typeResolution.ts, 103, 29)) >c2 : Symbol(c2, Decl(typeResolution.ts, 54, 27)) >AisIn2_3 : Symbol(TopLevelModule2.SubModule3.ClassA.AisIn2_3, Decl(typeResolution.ts, 103, 29)) @@ -257,17 +257,17 @@ export module TopLevelModule1 { var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); >a2 : Symbol(a2, Decl(typeResolution.ts, 64, 23)) ->SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 30)) ->ClassA : Symbol(SubSubModule1.ClassA, Decl(typeResolution.ts, 2, 37)) +>SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 33)) +>ClassA : Symbol(SubSubModule1.ClassA, Decl(typeResolution.ts, 2, 40)) >a2.AisIn1_1_1 : Symbol(SubSubModule1.ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) >a2 : Symbol(a2, Decl(typeResolution.ts, 64, 23)) >AisIn1_1_1 : Symbol(SubSubModule1.ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); >a3 : Symbol(a3, Decl(typeResolution.ts, 65, 23)) ->SubModule1 : Symbol(SubModule1, Decl(typeResolution.ts, 0, 31)) ->SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 30)) ->ClassA : Symbol(SubSubModule1.ClassA, Decl(typeResolution.ts, 2, 37)) +>SubModule1 : Symbol(SubModule1, Decl(typeResolution.ts, 0, 34)) +>SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 33)) +>ClassA : Symbol(SubSubModule1.ClassA, Decl(typeResolution.ts, 2, 40)) >a3.AisIn1_1_1 : Symbol(SubSubModule1.ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) >a3 : Symbol(a3, Decl(typeResolution.ts, 65, 23)) >AisIn1_1_1 : Symbol(SubSubModule1.ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) @@ -275,9 +275,9 @@ export module TopLevelModule1 { var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); >a4 : Symbol(a4, Decl(typeResolution.ts, 66, 23)) >TopLevelModule1 : Symbol(TopLevelModule1, Decl(typeResolution.ts, 0, 0)) ->SubModule1 : Symbol(SubModule1, Decl(typeResolution.ts, 0, 31)) ->SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 30)) ->ClassA : Symbol(SubSubModule1.ClassA, Decl(typeResolution.ts, 2, 37)) +>SubModule1 : Symbol(SubModule1, Decl(typeResolution.ts, 0, 34)) +>SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 33)) +>ClassA : Symbol(SubSubModule1.ClassA, Decl(typeResolution.ts, 2, 40)) >a4.AisIn1_1_1 : Symbol(SubSubModule1.ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) >a4 : Symbol(a4, Decl(typeResolution.ts, 66, 23)) >AisIn1_1_1 : Symbol(SubSubModule1.ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33)) @@ -285,7 +285,7 @@ export module TopLevelModule1 { // Interface reference var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); >d2 : Symbol(d2, Decl(typeResolution.ts, 69, 23)) ->SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 30)) +>SubSubModule1 : Symbol(SubSubModule1, Decl(typeResolution.ts, 1, 33)) >InterfaceX : Symbol(SubSubModule1.InterfaceX, Decl(typeResolution.ts, 45, 13)) >d2.XisIn1_1_1 : Symbol(SubSubModule1.InterfaceX.XisIn1_1_1, Decl(typeResolution.ts, 46, 41)) >d2 : Symbol(d2, Decl(typeResolution.ts, 69, 23)) @@ -295,15 +295,15 @@ export module TopLevelModule1 { } } - export module SubModule2 { + export namespace SubModule2 { >SubModule2 : Symbol(SubModule2, Decl(typeResolution.ts, 73, 5)) - export module SubSubModule2 { ->SubSubModule2 : Symbol(SubSubModule2, Decl(typeResolution.ts, 75, 30)) + export namespace SubSubModule2 { +>SubSubModule2 : Symbol(SubSubModule2, Decl(typeResolution.ts, 75, 33)) // No code here since these are the mirror of the above calls export class ClassA { public AisIn1_2_2() { } } ->ClassA : Symbol(ClassA, Decl(typeResolution.ts, 76, 37)) +>ClassA : Symbol(ClassA, Decl(typeResolution.ts, 76, 40)) >AisIn1_2_2 : Symbol(ClassA.AisIn1_2_2, Decl(typeResolution.ts, 78, 33)) export class ClassB { public BisIn1_2_2() { } } @@ -341,22 +341,22 @@ export module TopLevelModule1 { >YisIn1 : Symbol(InterfaceY.YisIn1, Decl(typeResolution.ts, 92, 26)) } - module NotExportedModule { + namespace NotExportedModule { >NotExportedModule : Symbol(NotExportedModule, Decl(typeResolution.ts, 94, 5)) export class ClassA { } ->ClassA : Symbol(ClassA, Decl(typeResolution.ts, 96, 30)) +>ClassA : Symbol(ClassA, Decl(typeResolution.ts, 96, 33)) } } -module TopLevelModule2 { +namespace TopLevelModule2 { >TopLevelModule2 : Symbol(TopLevelModule2, Decl(typeResolution.ts, 99, 1)) - export module SubModule3 { ->SubModule3 : Symbol(SubModule3, Decl(typeResolution.ts, 101, 24)) + export namespace SubModule3 { +>SubModule3 : Symbol(SubModule3, Decl(typeResolution.ts, 101, 27)) export class ClassA { ->ClassA : Symbol(ClassA, Decl(typeResolution.ts, 102, 30)) +>ClassA : Symbol(ClassA, Decl(typeResolution.ts, 102, 33)) public AisIn2_3() { } >AisIn2_3 : Symbol(ClassA.AisIn2_3, Decl(typeResolution.ts, 103, 29)) diff --git a/tests/baselines/reference/typeResolution.types b/tests/baselines/reference/typeResolution.types index fe3a18ca49aec..0f81eee98a3a2 100644 --- a/tests/baselines/reference/typeResolution.types +++ b/tests/baselines/reference/typeResolution.types @@ -1,15 +1,15 @@ //// [tests/cases/compiler/typeResolution.ts] //// === typeResolution.ts === -export module TopLevelModule1 { +export namespace TopLevelModule1 { >TopLevelModule1 : typeof TopLevelModule1 > : ^^^^^^^^^^^^^^^^^^^^^^ - export module SubModule1 { + export namespace SubModule1 { >SubModule1 : typeof SubModule1 > : ^^^^^^^^^^^^^^^^^ - export module SubSubModule1 { + export namespace SubSubModule1 { >SubSubModule1 : typeof SubSubModule1 > : ^^^^^^^^^^^^^^^^^^^^ @@ -478,11 +478,11 @@ export module TopLevelModule1 { } } - export module SubModule2 { + export namespace SubModule2 { >SubModule2 : typeof SubModule2 > : ^^^^^^^^^^^^^^^^^ - export module SubSubModule2 { + export namespace SubSubModule2 { >SubSubModule2 : typeof SubSubModule2 > : ^^^^^^^^^^^^^^^^^^^^ @@ -532,7 +532,7 @@ export module TopLevelModule1 { > : ^^^^^^^^^ } - module NotExportedModule { + namespace NotExportedModule { >NotExportedModule : typeof NotExportedModule > : ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -542,11 +542,11 @@ export module TopLevelModule1 { } } -module TopLevelModule2 { +namespace TopLevelModule2 { >TopLevelModule2 : typeof TopLevelModule2 > : ^^^^^^^^^^^^^^^^^^^^^^ - export module SubModule3 { + export namespace SubModule3 { >SubModule3 : typeof SubModule3 > : ^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/typeValueConflict1.errors.txt b/tests/baselines/reference/typeValueConflict1.errors.txt index 71d2f9a4d99bd..25bf2bd806bb0 100644 --- a/tests/baselines/reference/typeValueConflict1.errors.txt +++ b/tests/baselines/reference/typeValueConflict1.errors.txt @@ -2,11 +2,11 @@ typeValueConflict1.ts(8,21): error TS2339: Property 'A' does not exist on type ' ==== typeValueConflict1.ts (1 errors) ==== - module M1 { + namespace M1 { export class A { } } - module M2 { + namespace M2 { var M1 = 0; // Should error. M1 should bind to the variable, not to the module. class B extends M1.A { diff --git a/tests/baselines/reference/typeValueConflict1.js b/tests/baselines/reference/typeValueConflict1.js index 8973ae6b10c82..ee5228cbfca42 100644 --- a/tests/baselines/reference/typeValueConflict1.js +++ b/tests/baselines/reference/typeValueConflict1.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/typeValueConflict1.ts] //// //// [typeValueConflict1.ts] -module M1 { +namespace M1 { export class A { } } -module M2 { +namespace M2 { var M1 = 0; // Should error. M1 should bind to the variable, not to the module. class B extends M1.A { diff --git a/tests/baselines/reference/typeValueConflict1.symbols b/tests/baselines/reference/typeValueConflict1.symbols index 0ae60567baa26..1156193afdee0 100644 --- a/tests/baselines/reference/typeValueConflict1.symbols +++ b/tests/baselines/reference/typeValueConflict1.symbols @@ -1,14 +1,14 @@ //// [tests/cases/compiler/typeValueConflict1.ts] //// === typeValueConflict1.ts === -module M1 { +namespace M1 { >M1 : Symbol(M1, Decl(typeValueConflict1.ts, 0, 0)) export class A { ->A : Symbol(A, Decl(typeValueConflict1.ts, 0, 11)) +>A : Symbol(A, Decl(typeValueConflict1.ts, 0, 14)) } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(typeValueConflict1.ts, 3, 1)) var M1 = 0; @@ -17,9 +17,9 @@ module M2 { // Should error. M1 should bind to the variable, not to the module. class B extends M1.A { >B : Symbol(B, Decl(typeValueConflict1.ts, 5, 12)) ->M1.A : Symbol(M1.A, Decl(typeValueConflict1.ts, 0, 11)) +>M1.A : Symbol(M1.A, Decl(typeValueConflict1.ts, 0, 14)) >M1 : Symbol(M1, Decl(typeValueConflict1.ts, 0, 0)) ->A : Symbol(M1.A, Decl(typeValueConflict1.ts, 0, 11)) +>A : Symbol(M1.A, Decl(typeValueConflict1.ts, 0, 14)) } } diff --git a/tests/baselines/reference/typeValueConflict1.types b/tests/baselines/reference/typeValueConflict1.types index d9e127896eeab..03f3329181b46 100644 --- a/tests/baselines/reference/typeValueConflict1.types +++ b/tests/baselines/reference/typeValueConflict1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/typeValueConflict1.ts] //// === typeValueConflict1.ts === -module M1 { +namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ @@ -10,7 +10,7 @@ module M1 { > : ^ } } -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/typeValueConflict2.errors.txt b/tests/baselines/reference/typeValueConflict2.errors.txt index 49f677e4a8bec..b85cb0f3903ea 100644 --- a/tests/baselines/reference/typeValueConflict2.errors.txt +++ b/tests/baselines/reference/typeValueConflict2.errors.txt @@ -2,13 +2,13 @@ typeValueConflict2.ts(10,24): error TS2339: Property 'A' does not exist on type ==== typeValueConflict2.ts (1 errors) ==== - module M1 { + namespace M1 { export class A { constructor(a: T) { } } } - module M2 { + namespace M2 { var M1 = 0; // Should error. M1 should bind to the variable, not to the module. class B extends M1.A { @@ -16,7 +16,7 @@ typeValueConflict2.ts(10,24): error TS2339: Property 'A' does not exist on type !!! error TS2339: Property 'A' does not exist on type 'number'. } } - module M3 { + namespace M3 { // Shouldn't error class B extends M1.A { } diff --git a/tests/baselines/reference/typeValueConflict2.js b/tests/baselines/reference/typeValueConflict2.js index a5dc1d40e611a..25dd6ad7e1fcd 100644 --- a/tests/baselines/reference/typeValueConflict2.js +++ b/tests/baselines/reference/typeValueConflict2.js @@ -1,19 +1,19 @@ //// [tests/cases/compiler/typeValueConflict2.ts] //// //// [typeValueConflict2.ts] -module M1 { +namespace M1 { export class A { constructor(a: T) { } } } -module M2 { +namespace M2 { var M1 = 0; // Should error. M1 should bind to the variable, not to the module. class B extends M1.A { } } -module M3 { +namespace M3 { // Shouldn't error class B extends M1.A { } diff --git a/tests/baselines/reference/typeValueConflict2.symbols b/tests/baselines/reference/typeValueConflict2.symbols index 4b651c41235b4..f7d83b25dcf63 100644 --- a/tests/baselines/reference/typeValueConflict2.symbols +++ b/tests/baselines/reference/typeValueConflict2.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/typeValueConflict2.ts] //// === typeValueConflict2.ts === -module M1 { +namespace M1 { >M1 : Symbol(M1, Decl(typeValueConflict2.ts, 0, 0)) export class A { ->A : Symbol(A, Decl(typeValueConflict2.ts, 0, 11)) +>A : Symbol(A, Decl(typeValueConflict2.ts, 0, 14)) >T : Symbol(T, Decl(typeValueConflict2.ts, 1, 19)) constructor(a: T) { @@ -14,7 +14,7 @@ module M1 { } } } -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(typeValueConflict2.ts, 5, 1)) var M1 = 0; @@ -23,20 +23,20 @@ module M2 { // Should error. M1 should bind to the variable, not to the module. class B extends M1.A { >B : Symbol(B, Decl(typeValueConflict2.ts, 7, 15)) ->M1.A : Symbol(M1.A, Decl(typeValueConflict2.ts, 0, 11)) +>M1.A : Symbol(M1.A, Decl(typeValueConflict2.ts, 0, 14)) >M1 : Symbol(M1, Decl(typeValueConflict2.ts, 0, 0)) ->A : Symbol(M1.A, Decl(typeValueConflict2.ts, 0, 11)) +>A : Symbol(M1.A, Decl(typeValueConflict2.ts, 0, 14)) } } -module M3 { +namespace M3 { >M3 : Symbol(M3, Decl(typeValueConflict2.ts, 11, 1)) // Shouldn't error class B extends M1.A { ->B : Symbol(B, Decl(typeValueConflict2.ts, 12, 11)) ->M1.A : Symbol(M1.A, Decl(typeValueConflict2.ts, 0, 11)) +>B : Symbol(B, Decl(typeValueConflict2.ts, 12, 14)) +>M1.A : Symbol(M1.A, Decl(typeValueConflict2.ts, 0, 14)) >M1 : Symbol(M1, Decl(typeValueConflict2.ts, 0, 0)) ->A : Symbol(M1.A, Decl(typeValueConflict2.ts, 0, 11)) +>A : Symbol(M1.A, Decl(typeValueConflict2.ts, 0, 14)) } } diff --git a/tests/baselines/reference/typeValueConflict2.types b/tests/baselines/reference/typeValueConflict2.types index 614a1c4cb8415..dcd2789d2ced8 100644 --- a/tests/baselines/reference/typeValueConflict2.types +++ b/tests/baselines/reference/typeValueConflict2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/typeValueConflict2.ts] //// === typeValueConflict2.ts === -module M1 { +namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ @@ -15,7 +15,7 @@ module M1 { } } } -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ @@ -37,7 +37,7 @@ module M2 { > : ^^^ } } -module M3 { +namespace M3 { >M3 : typeof M3 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/typeofANonExportedType.errors.txt b/tests/baselines/reference/typeofANonExportedType.errors.txt index 54a6e6778175c..a76bd072b564a 100644 --- a/tests/baselines/reference/typeofANonExportedType.errors.txt +++ b/tests/baselines/reference/typeofANonExportedType.errors.txt @@ -30,7 +30,7 @@ typeofANonExportedType.ts(42,12): error TS2502: 'r12' is referenced directly or ~~ !!! error TS2323: Cannot redeclare exported variable 'r5'. - module M { + namespace M { export var foo = ''; export class C { foo: string; @@ -54,7 +54,7 @@ typeofANonExportedType.ts(42,12): error TS2502: 'r12' is referenced directly or !!! error TS2502: 'r12' is referenced directly or indirectly in its own type annotation. function foo() { } - module foo { + namespace foo { export var y = 1; export class C { foo: string; diff --git a/tests/baselines/reference/typeofANonExportedType.js b/tests/baselines/reference/typeofANonExportedType.js index 41ec4df61d74c..27caeeb69d8dc 100644 --- a/tests/baselines/reference/typeofANonExportedType.js +++ b/tests/baselines/reference/typeofANonExportedType.js @@ -23,7 +23,7 @@ var i2: I; export var r5: typeof i; export var r5: typeof i2; -module M { +namespace M { export var foo = ''; export class C { foo: string; @@ -45,7 +45,7 @@ export var r11: typeof E.A; export var r12: typeof r12; function foo() { } -module foo { +namespace foo { export var y = 1; export class C { foo: string; diff --git a/tests/baselines/reference/typeofANonExportedType.symbols b/tests/baselines/reference/typeofANonExportedType.symbols index d7b38f0ebd07e..9d4e960a0b851 100644 --- a/tests/baselines/reference/typeofANonExportedType.symbols +++ b/tests/baselines/reference/typeofANonExportedType.symbols @@ -64,7 +64,7 @@ export var r5: typeof i2; >r5 : Symbol(r5, Decl(typeofANonExportedType.ts, 19, 10), Decl(typeofANonExportedType.ts, 20, 10)) >i2 : Symbol(i2, Decl(typeofANonExportedType.ts, 18, 3)) -module M { +namespace M { >M : Symbol(M, Decl(typeofANonExportedType.ts, 20, 25)) export var foo = ''; @@ -124,7 +124,7 @@ export var r12: typeof r12; function foo() { } >foo : Symbol(foo, Decl(typeofANonExportedType.ts, 41, 27), Decl(typeofANonExportedType.ts, 43, 18)) -module foo { +namespace foo { >foo : Symbol(foo, Decl(typeofANonExportedType.ts, 41, 27), Decl(typeofANonExportedType.ts, 43, 18)) export var y = 1; diff --git a/tests/baselines/reference/typeofANonExportedType.types b/tests/baselines/reference/typeofANonExportedType.types index a856f7ae50120..c4c4526f7a3c8 100644 --- a/tests/baselines/reference/typeofANonExportedType.types +++ b/tests/baselines/reference/typeofANonExportedType.types @@ -88,7 +88,7 @@ export var r5: typeof i2; >i2 : I > : ^ -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -179,7 +179,7 @@ function foo() { } >foo : typeof foo > : ^^^^^^^^^^ -module foo { +namespace foo { >foo : typeof foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/typeofAnExportedType.errors.txt b/tests/baselines/reference/typeofAnExportedType.errors.txt index f252ad3c963f6..026a9f5c68614 100644 --- a/tests/baselines/reference/typeofAnExportedType.errors.txt +++ b/tests/baselines/reference/typeofAnExportedType.errors.txt @@ -30,7 +30,7 @@ typeofAnExportedType.ts(42,12): error TS2502: 'r12' is referenced directly or in ~~ !!! error TS2323: Cannot redeclare exported variable 'r5'. - export module M { + export namespace M { export var foo = ''; export class C { foo: string; @@ -54,7 +54,7 @@ typeofAnExportedType.ts(42,12): error TS2502: 'r12' is referenced directly or in !!! error TS2502: 'r12' is referenced directly or indirectly in its own type annotation. export function foo() { } - export module foo { + export namespace foo { export var y = 1; export class C { foo: string; diff --git a/tests/baselines/reference/typeofAnExportedType.js b/tests/baselines/reference/typeofAnExportedType.js index abfbe6605038a..469b38edbb0ca 100644 --- a/tests/baselines/reference/typeofAnExportedType.js +++ b/tests/baselines/reference/typeofAnExportedType.js @@ -23,7 +23,7 @@ var i2: I; export var r5: typeof i; export var r5: typeof i2; -export module M { +export namespace M { export var foo = ''; export class C { foo: string; @@ -45,7 +45,7 @@ export var r11: typeof E.A; export var r12: typeof r12; export function foo() { } -export module foo { +export namespace foo { export var y = 1; export class C { foo: string; diff --git a/tests/baselines/reference/typeofAnExportedType.symbols b/tests/baselines/reference/typeofAnExportedType.symbols index c8951cbdeb5c3..c9787f7bde30a 100644 --- a/tests/baselines/reference/typeofAnExportedType.symbols +++ b/tests/baselines/reference/typeofAnExportedType.symbols @@ -64,7 +64,7 @@ export var r5: typeof i2; >r5 : Symbol(r5, Decl(typeofAnExportedType.ts, 19, 10), Decl(typeofAnExportedType.ts, 20, 10)) >i2 : Symbol(i2, Decl(typeofAnExportedType.ts, 18, 3)) -export module M { +export namespace M { >M : Symbol(M, Decl(typeofAnExportedType.ts, 20, 25)) export var foo = ''; @@ -124,7 +124,7 @@ export var r12: typeof r12; export function foo() { } >foo : Symbol(foo, Decl(typeofAnExportedType.ts, 41, 27), Decl(typeofAnExportedType.ts, 43, 25)) -export module foo { +export namespace foo { >foo : Symbol(foo, Decl(typeofAnExportedType.ts, 41, 27), Decl(typeofAnExportedType.ts, 43, 25)) export var y = 1; diff --git a/tests/baselines/reference/typeofAnExportedType.types b/tests/baselines/reference/typeofAnExportedType.types index 0945a782bc2ae..1b00479888a4c 100644 --- a/tests/baselines/reference/typeofAnExportedType.types +++ b/tests/baselines/reference/typeofAnExportedType.types @@ -88,7 +88,7 @@ export var r5: typeof i2; >i2 : I > : ^ -export module M { +export namespace M { >M : typeof M > : ^^^^^^^^ @@ -179,7 +179,7 @@ export function foo() { } >foo : typeof foo > : ^^^^^^^^^^ -export module foo { +export namespace foo { >foo : typeof foo > : ^^^^^^^^^^ diff --git a/tests/baselines/reference/typeofInternalModules.errors.txt b/tests/baselines/reference/typeofInternalModules.errors.txt index 51b8052fcef8e..e952ac2dc146d 100644 --- a/tests/baselines/reference/typeofInternalModules.errors.txt +++ b/tests/baselines/reference/typeofInternalModules.errors.txt @@ -6,11 +6,11 @@ typeofInternalModules.ts(23,1): error TS2741: Property 'instantiated' is missing ==== typeofInternalModules.ts (5 errors) ==== - module Outer { - export module instantiated { + namespace Outer { + export namespace instantiated { export class C { } } - export module uninstantiated { + export namespace uninstantiated { export interface P { } } } @@ -40,5 +40,5 @@ typeofInternalModules.ts(23,1): error TS2741: Property 'instantiated' is missing x7 = importInst; ~~ !!! error TS2741: Property 'instantiated' is missing in type 'typeof instantiated' but required in type 'typeof Outer'. -!!! related TS2728 typeofInternalModules.ts:2:19: 'instantiated' is declared here. +!!! related TS2728 typeofInternalModules.ts:2:22: 'instantiated' is declared here. \ No newline at end of file diff --git a/tests/baselines/reference/typeofInternalModules.js b/tests/baselines/reference/typeofInternalModules.js index c48ce6478f4ff..a7bd2f75d561f 100644 --- a/tests/baselines/reference/typeofInternalModules.js +++ b/tests/baselines/reference/typeofInternalModules.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/typeofInternalModules.ts] //// //// [typeofInternalModules.ts] -module Outer { - export module instantiated { +namespace Outer { + export namespace instantiated { export class C { } } - export module uninstantiated { + export namespace uninstantiated { export interface P { } } } diff --git a/tests/baselines/reference/typeofInternalModules.symbols b/tests/baselines/reference/typeofInternalModules.symbols index 74f78bd7cb7fc..9a07988b1e03d 100644 --- a/tests/baselines/reference/typeofInternalModules.symbols +++ b/tests/baselines/reference/typeofInternalModules.symbols @@ -1,27 +1,27 @@ //// [tests/cases/compiler/typeofInternalModules.ts] //// === typeofInternalModules.ts === -module Outer { +namespace Outer { >Outer : Symbol(Outer, Decl(typeofInternalModules.ts, 0, 0)) - export module instantiated { ->instantiated : Symbol(instantiated, Decl(typeofInternalModules.ts, 0, 14)) + export namespace instantiated { +>instantiated : Symbol(instantiated, Decl(typeofInternalModules.ts, 0, 17)) export class C { } ->C : Symbol(C, Decl(typeofInternalModules.ts, 1, 32)) +>C : Symbol(C, Decl(typeofInternalModules.ts, 1, 35)) } - export module uninstantiated { + export namespace uninstantiated { >uninstantiated : Symbol(uninstantiated, Decl(typeofInternalModules.ts, 3, 5)) export interface P { } ->P : Symbol(P, Decl(typeofInternalModules.ts, 4, 34)) +>P : Symbol(P, Decl(typeofInternalModules.ts, 4, 37)) } } import importInst = Outer.instantiated; >importInst : Symbol(importInst, Decl(typeofInternalModules.ts, 7, 1)) >Outer : Symbol(Outer, Decl(typeofInternalModules.ts, 0, 0)) ->instantiated : Symbol(importInst, Decl(typeofInternalModules.ts, 0, 14)) +>instantiated : Symbol(importInst, Decl(typeofInternalModules.ts, 0, 17)) import importUninst = Outer.uninstantiated; >importUninst : Symbol(importUninst, Decl(typeofInternalModules.ts, 9, 39)) @@ -30,17 +30,17 @@ import importUninst = Outer.uninstantiated; var x1: typeof importInst.C = importInst.C; >x1 : Symbol(x1, Decl(typeofInternalModules.ts, 12, 3)) ->importInst.C : Symbol(importInst.C, Decl(typeofInternalModules.ts, 1, 32)) +>importInst.C : Symbol(importInst.C, Decl(typeofInternalModules.ts, 1, 35)) >importInst : Symbol(importInst, Decl(typeofInternalModules.ts, 7, 1)) ->C : Symbol(importInst.C, Decl(typeofInternalModules.ts, 1, 32)) ->importInst.C : Symbol(importInst.C, Decl(typeofInternalModules.ts, 1, 32)) +>C : Symbol(importInst.C, Decl(typeofInternalModules.ts, 1, 35)) +>importInst.C : Symbol(importInst.C, Decl(typeofInternalModules.ts, 1, 35)) >importInst : Symbol(importInst, Decl(typeofInternalModules.ts, 7, 1)) ->C : Symbol(importInst.C, Decl(typeofInternalModules.ts, 1, 32)) +>C : Symbol(importInst.C, Decl(typeofInternalModules.ts, 1, 35)) var x2: importInst.C = new x1(); >x2 : Symbol(x2, Decl(typeofInternalModules.ts, 13, 3)) >importInst : Symbol(importInst, Decl(typeofInternalModules.ts, 7, 1)) ->C : Symbol(importInst.C, Decl(typeofInternalModules.ts, 1, 32)) +>C : Symbol(importInst.C, Decl(typeofInternalModules.ts, 1, 35)) >x1 : Symbol(x1, Decl(typeofInternalModules.ts, 12, 3)) var x3: typeof importUninst.P; // Error again @@ -61,9 +61,9 @@ x5 = Outer; x5 = Outer.instantiated; >x5 : Symbol(x5, Decl(typeofInternalModules.ts, 17, 3)) ->Outer.instantiated : Symbol(importInst, Decl(typeofInternalModules.ts, 0, 14)) +>Outer.instantiated : Symbol(importInst, Decl(typeofInternalModules.ts, 0, 17)) >Outer : Symbol(Outer, Decl(typeofInternalModules.ts, 0, 0)) ->instantiated : Symbol(importInst, Decl(typeofInternalModules.ts, 0, 14)) +>instantiated : Symbol(importInst, Decl(typeofInternalModules.ts, 0, 17)) var x6: typeof importUninst; >x6 : Symbol(x6, Decl(typeofInternalModules.ts, 20, 3)) diff --git a/tests/baselines/reference/typeofInternalModules.types b/tests/baselines/reference/typeofInternalModules.types index 4e54bf4628c36..184699b41c609 100644 --- a/tests/baselines/reference/typeofInternalModules.types +++ b/tests/baselines/reference/typeofInternalModules.types @@ -1,11 +1,11 @@ //// [tests/cases/compiler/typeofInternalModules.ts] //// === typeofInternalModules.ts === -module Outer { +namespace Outer { >Outer : typeof Outer > : ^^^^^^^^^^^^ - export module instantiated { + export namespace instantiated { >instantiated : typeof instantiated > : ^^^^^^^^^^^^^^^^^^^ @@ -13,7 +13,7 @@ module Outer { >C : C > : ^ } - export module uninstantiated { + export namespace uninstantiated { export interface P { } } } diff --git a/tests/baselines/reference/typeofModuleWithoutExports.js b/tests/baselines/reference/typeofModuleWithoutExports.js index a9574768aaeea..6a97635c14fc5 100644 --- a/tests/baselines/reference/typeofModuleWithoutExports.js +++ b/tests/baselines/reference/typeofModuleWithoutExports.js @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/specifyingTypes/typeQueries/typeofModuleWithoutExports.ts] //// //// [typeofModuleWithoutExports.ts] -module M { +namespace M { var x = 1; class C { foo: number; diff --git a/tests/baselines/reference/typeofModuleWithoutExports.symbols b/tests/baselines/reference/typeofModuleWithoutExports.symbols index 5dc7b7da6d13c..21ba3dc17ed03 100644 --- a/tests/baselines/reference/typeofModuleWithoutExports.symbols +++ b/tests/baselines/reference/typeofModuleWithoutExports.symbols @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/specifyingTypes/typeQueries/typeofModuleWithoutExports.ts] //// === typeofModuleWithoutExports.ts === -module M { +namespace M { >M : Symbol(M, Decl(typeofModuleWithoutExports.ts, 0, 0)) var x = 1; diff --git a/tests/baselines/reference/typeofModuleWithoutExports.types b/tests/baselines/reference/typeofModuleWithoutExports.types index 3a7968091897e..d223d6062768b 100644 --- a/tests/baselines/reference/typeofModuleWithoutExports.types +++ b/tests/baselines/reference/typeofModuleWithoutExports.types @@ -1,7 +1,7 @@ //// [tests/cases/conformance/types/specifyingTypes/typeQueries/typeofModuleWithoutExports.ts] //// === typeofModuleWithoutExports.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/typeofOperatorWithAnyOtherType.errors.txt b/tests/baselines/reference/typeofOperatorWithAnyOtherType.errors.txt index 25c672a3767b1..4ff9a46c50111 100644 --- a/tests/baselines/reference/typeofOperatorWithAnyOtherType.errors.txt +++ b/tests/baselines/reference/typeofOperatorWithAnyOtherType.errors.txt @@ -24,7 +24,7 @@ typeofOperatorWithAnyOtherType.ts(58,1): error TS2695: Left side of comma operat return a; } } - module M { + namespace M { export var n: any; } var objA = new A(); diff --git a/tests/baselines/reference/typeofOperatorWithAnyOtherType.js b/tests/baselines/reference/typeofOperatorWithAnyOtherType.js index 0bd919c00cf9c..43be56aa759b5 100644 --- a/tests/baselines/reference/typeofOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/typeofOperatorWithAnyOtherType.js @@ -20,7 +20,7 @@ class A { return a; } } -module M { +namespace M { export var n: any; } var objA = new A(); diff --git a/tests/baselines/reference/typeofOperatorWithAnyOtherType.symbols b/tests/baselines/reference/typeofOperatorWithAnyOtherType.symbols index d052f3b8d47bb..7eacc9ce48e73 100644 --- a/tests/baselines/reference/typeofOperatorWithAnyOtherType.symbols +++ b/tests/baselines/reference/typeofOperatorWithAnyOtherType.symbols @@ -45,7 +45,7 @@ class A { >a : Symbol(a, Decl(typeofOperatorWithAnyOtherType.ts, 15, 11)) } } -module M { +namespace M { >M : Symbol(M, Decl(typeofOperatorWithAnyOtherType.ts, 18, 1)) export var n: any; diff --git a/tests/baselines/reference/typeofOperatorWithAnyOtherType.types b/tests/baselines/reference/typeofOperatorWithAnyOtherType.types index 1a1186d4972d6..76059fda5ea20 100644 --- a/tests/baselines/reference/typeofOperatorWithAnyOtherType.types +++ b/tests/baselines/reference/typeofOperatorWithAnyOtherType.types @@ -72,7 +72,7 @@ class A { > : ^^^ } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/typeofOperatorWithBooleanType.errors.txt b/tests/baselines/reference/typeofOperatorWithBooleanType.errors.txt index 19daef2333410..ef9d0afab04ca 100644 --- a/tests/baselines/reference/typeofOperatorWithBooleanType.errors.txt +++ b/tests/baselines/reference/typeofOperatorWithBooleanType.errors.txt @@ -11,7 +11,7 @@ typeofOperatorWithBooleanType.ts(36,1): error TS2695: Left side of comma operato public a: boolean; static foo() { return false; } } - module M { + namespace M { export var n: boolean; } diff --git a/tests/baselines/reference/typeofOperatorWithBooleanType.js b/tests/baselines/reference/typeofOperatorWithBooleanType.js index 9fb53bcf1a571..01766d4d3487c 100644 --- a/tests/baselines/reference/typeofOperatorWithBooleanType.js +++ b/tests/baselines/reference/typeofOperatorWithBooleanType.js @@ -10,7 +10,7 @@ class A { public a: boolean; static foo() { return false; } } -module M { +namespace M { export var n: boolean; } diff --git a/tests/baselines/reference/typeofOperatorWithBooleanType.symbols b/tests/baselines/reference/typeofOperatorWithBooleanType.symbols index 9bec45f0526d5..bfd6d4c5fe0c9 100644 --- a/tests/baselines/reference/typeofOperatorWithBooleanType.symbols +++ b/tests/baselines/reference/typeofOperatorWithBooleanType.symbols @@ -17,7 +17,7 @@ class A { static foo() { return false; } >foo : Symbol(A.foo, Decl(typeofOperatorWithBooleanType.ts, 6, 22)) } -module M { +namespace M { >M : Symbol(M, Decl(typeofOperatorWithBooleanType.ts, 8, 1)) export var n: boolean; diff --git a/tests/baselines/reference/typeofOperatorWithBooleanType.types b/tests/baselines/reference/typeofOperatorWithBooleanType.types index 7a523bce04bbe..a5a0e80d6504b 100644 --- a/tests/baselines/reference/typeofOperatorWithBooleanType.types +++ b/tests/baselines/reference/typeofOperatorWithBooleanType.types @@ -26,7 +26,7 @@ class A { >false : false > : ^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/typeofOperatorWithNumberType.errors.txt b/tests/baselines/reference/typeofOperatorWithNumberType.errors.txt index d42260f0f269d..d5e872341d8d8 100644 --- a/tests/baselines/reference/typeofOperatorWithNumberType.errors.txt +++ b/tests/baselines/reference/typeofOperatorWithNumberType.errors.txt @@ -12,7 +12,7 @@ typeofOperatorWithNumberType.ts(45,1): error TS2695: Left side of comma operator public a: number; static foo() { return 1; } } - module M { + namespace M { export var n: number; } diff --git a/tests/baselines/reference/typeofOperatorWithNumberType.js b/tests/baselines/reference/typeofOperatorWithNumberType.js index cc9ca6556caf9..7ceb527dd0d30 100644 --- a/tests/baselines/reference/typeofOperatorWithNumberType.js +++ b/tests/baselines/reference/typeofOperatorWithNumberType.js @@ -11,7 +11,7 @@ class A { public a: number; static foo() { return 1; } } -module M { +namespace M { export var n: number; } diff --git a/tests/baselines/reference/typeofOperatorWithNumberType.symbols b/tests/baselines/reference/typeofOperatorWithNumberType.symbols index e1c0b241c31a8..e9f80d00de00d 100644 --- a/tests/baselines/reference/typeofOperatorWithNumberType.symbols +++ b/tests/baselines/reference/typeofOperatorWithNumberType.symbols @@ -20,7 +20,7 @@ class A { static foo() { return 1; } >foo : Symbol(A.foo, Decl(typeofOperatorWithNumberType.ts, 7, 21)) } -module M { +namespace M { >M : Symbol(M, Decl(typeofOperatorWithNumberType.ts, 9, 1)) export var n: number; diff --git a/tests/baselines/reference/typeofOperatorWithNumberType.types b/tests/baselines/reference/typeofOperatorWithNumberType.types index a519d58e0ac58..70dc7b60b4707 100644 --- a/tests/baselines/reference/typeofOperatorWithNumberType.types +++ b/tests/baselines/reference/typeofOperatorWithNumberType.types @@ -36,7 +36,7 @@ class A { >1 : 1 > : ^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/typeofOperatorWithStringType.errors.txt b/tests/baselines/reference/typeofOperatorWithStringType.errors.txt index 8d60a1282ad7f..68a51040a9853 100644 --- a/tests/baselines/reference/typeofOperatorWithStringType.errors.txt +++ b/tests/baselines/reference/typeofOperatorWithStringType.errors.txt @@ -12,7 +12,7 @@ typeofOperatorWithStringType.ts(44,1): error TS2695: Left side of comma operator public a: string; static foo() { return ""; } } - module M { + namespace M { export var n: string; } diff --git a/tests/baselines/reference/typeofOperatorWithStringType.js b/tests/baselines/reference/typeofOperatorWithStringType.js index cb056afe1a513..2d350ea926f6a 100644 --- a/tests/baselines/reference/typeofOperatorWithStringType.js +++ b/tests/baselines/reference/typeofOperatorWithStringType.js @@ -11,7 +11,7 @@ class A { public a: string; static foo() { return ""; } } -module M { +namespace M { export var n: string; } diff --git a/tests/baselines/reference/typeofOperatorWithStringType.symbols b/tests/baselines/reference/typeofOperatorWithStringType.symbols index f6aca36bd2a6f..5bc71cf4d3cf8 100644 --- a/tests/baselines/reference/typeofOperatorWithStringType.symbols +++ b/tests/baselines/reference/typeofOperatorWithStringType.symbols @@ -20,7 +20,7 @@ class A { static foo() { return ""; } >foo : Symbol(A.foo, Decl(typeofOperatorWithStringType.ts, 7, 21)) } -module M { +namespace M { >M : Symbol(M, Decl(typeofOperatorWithStringType.ts, 9, 1)) export var n: string; diff --git a/tests/baselines/reference/typeofOperatorWithStringType.types b/tests/baselines/reference/typeofOperatorWithStringType.types index c40a3499d2564..b8b780e367fa6 100644 --- a/tests/baselines/reference/typeofOperatorWithStringType.types +++ b/tests/baselines/reference/typeofOperatorWithStringType.types @@ -36,7 +36,7 @@ class A { >"" : "" > : ^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/typeofThis.errors.txt b/tests/baselines/reference/typeofThis.errors.txt index 82ca3ffcf1d09..27f987cb0055b 100644 --- a/tests/baselines/reference/typeofThis.errors.txt +++ b/tests/baselines/reference/typeofThis.errors.txt @@ -66,7 +66,7 @@ typeofThis.ts(57,24): error TS7017: Element implicitly has an 'any' type because } } - module Test7 { + namespace Test7 { export let f = () => { let x: typeof this.no = 1; ~~~~ diff --git a/tests/baselines/reference/typeofThis.js b/tests/baselines/reference/typeofThis.js index ca0661ca715ea..4a962e0d00e6a 100644 --- a/tests/baselines/reference/typeofThis.js +++ b/tests/baselines/reference/typeofThis.js @@ -50,7 +50,7 @@ namespace Test6 { } } -module Test7 { +namespace Test7 { export let f = () => { let x: typeof this.no = 1; } diff --git a/tests/baselines/reference/typeofThis.symbols b/tests/baselines/reference/typeofThis.symbols index cbc3fb99db10d..42abceb44344a 100644 --- a/tests/baselines/reference/typeofThis.symbols +++ b/tests/baselines/reference/typeofThis.symbols @@ -122,7 +122,7 @@ namespace Test6 { } } -module Test7 { +namespace Test7 { >Test7 : Symbol(Test7, Decl(typeofThis.ts, 47, 1)) export let f = () => { diff --git a/tests/baselines/reference/typeofThis.types b/tests/baselines/reference/typeofThis.types index 5087396249b2a..0b766988a8143 100644 --- a/tests/baselines/reference/typeofThis.types +++ b/tests/baselines/reference/typeofThis.types @@ -226,7 +226,7 @@ namespace Test6 { } } -module Test7 { +namespace Test7 { >Test7 : typeof Test7 > : ^^^^^^^^^^^^ diff --git a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt index 557bdfb4dad0e..77bd5e84b9f28 100644 --- a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt +++ b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt @@ -17,7 +17,7 @@ foo_1.ts(5,5): error TS2741: Property 'M2' is missing in type 'typeof import("fo age: number; } - export module M2 { + export namespace M2 { export interface I2 { x: Person; } diff --git a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js index 8be5e7caa926b..7f25f94dad5fc 100644 --- a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js +++ b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js @@ -6,7 +6,7 @@ export interface Person { age: number; } -export module M2 { +export namespace M2 { export interface I2 { x: Person; } diff --git a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.symbols b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.symbols index ece64f57e191b..67f54b8d7b0c3 100644 --- a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.symbols +++ b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.symbols @@ -27,11 +27,11 @@ export interface Person { >age : Symbol(Person.age, Decl(foo_0.ts, 1, 14)) } -export module M2 { +export namespace M2 { >M2 : Symbol(M2, Decl(foo_0.ts, 3, 1)) export interface I2 { ->I2 : Symbol(I2, Decl(foo_0.ts, 5, 18)) +>I2 : Symbol(I2, Decl(foo_0.ts, 5, 21)) x: Person; >x : Symbol(I2.x, Decl(foo_0.ts, 6, 22)) diff --git a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.types b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.types index ec8db7ba7cf87..10627a4b467bf 100644 --- a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.types +++ b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.types @@ -34,7 +34,7 @@ export interface Person { > : ^^^^^^ } -export module M2 { +export namespace M2 { export interface I2 { x: Person; >x : Person diff --git a/tests/baselines/reference/undeclaredBase.errors.txt b/tests/baselines/reference/undeclaredBase.errors.txt index 49001bfc2b1f1..42573ae6ab485 100644 --- a/tests/baselines/reference/undeclaredBase.errors.txt +++ b/tests/baselines/reference/undeclaredBase.errors.txt @@ -1,9 +1,9 @@ -undeclaredBase.ts(1,37): error TS2339: Property 'I' does not exist on type 'typeof M'. +undeclaredBase.ts(1,40): error TS2339: Property 'I' does not exist on type 'typeof M'. ==== undeclaredBase.ts (1 errors) ==== - module M { export class C extends M.I { } } - ~ + namespace M { export class C extends M.I { } } + ~ !!! error TS2339: Property 'I' does not exist on type 'typeof M'. \ No newline at end of file diff --git a/tests/baselines/reference/undeclaredBase.js b/tests/baselines/reference/undeclaredBase.js index 5cbd5322a1322..aa1c6abfea42b 100644 --- a/tests/baselines/reference/undeclaredBase.js +++ b/tests/baselines/reference/undeclaredBase.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/undeclaredBase.ts] //// //// [undeclaredBase.ts] -module M { export class C extends M.I { } } +namespace M { export class C extends M.I { } } diff --git a/tests/baselines/reference/undeclaredBase.symbols b/tests/baselines/reference/undeclaredBase.symbols index b0d5e8e9edad4..cba5605923d99 100644 --- a/tests/baselines/reference/undeclaredBase.symbols +++ b/tests/baselines/reference/undeclaredBase.symbols @@ -1,9 +1,9 @@ //// [tests/cases/compiler/undeclaredBase.ts] //// === undeclaredBase.ts === -module M { export class C extends M.I { } } +namespace M { export class C extends M.I { } } >M : Symbol(M, Decl(undeclaredBase.ts, 0, 0)) ->C : Symbol(C, Decl(undeclaredBase.ts, 0, 10)) +>C : Symbol(C, Decl(undeclaredBase.ts, 0, 13)) >M : Symbol(M, Decl(undeclaredBase.ts, 0, 0)) diff --git a/tests/baselines/reference/undeclaredBase.types b/tests/baselines/reference/undeclaredBase.types index 310cdec747745..8245376a967f3 100644 --- a/tests/baselines/reference/undeclaredBase.types +++ b/tests/baselines/reference/undeclaredBase.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/undeclaredBase.ts] //// === undeclaredBase.ts === -module M { export class C extends M.I { } } +namespace M { export class C extends M.I { } } >M : typeof M > : ^^^^^^^^ >C : C diff --git a/tests/baselines/reference/undeclaredMethod.errors.txt b/tests/baselines/reference/undeclaredMethod.errors.txt index c1522ca0b1f88..80c127e705bff 100644 --- a/tests/baselines/reference/undeclaredMethod.errors.txt +++ b/tests/baselines/reference/undeclaredMethod.errors.txt @@ -2,7 +2,7 @@ undeclaredMethod.ts(10,3): error TS2339: Property 'saltbar' does not exist on ty ==== undeclaredMethod.ts (1 errors) ==== - module M { + namespace M { export class C { public salt() {} } diff --git a/tests/baselines/reference/undeclaredMethod.js b/tests/baselines/reference/undeclaredMethod.js index 3e435011a5c73..762ac939dd53e 100644 --- a/tests/baselines/reference/undeclaredMethod.js +++ b/tests/baselines/reference/undeclaredMethod.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/undeclaredMethod.ts] //// //// [undeclaredMethod.ts] -module M { +namespace M { export class C { public salt() {} } diff --git a/tests/baselines/reference/undeclaredMethod.symbols b/tests/baselines/reference/undeclaredMethod.symbols index d6496fde09a81..afdf6c848de90 100644 --- a/tests/baselines/reference/undeclaredMethod.symbols +++ b/tests/baselines/reference/undeclaredMethod.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/undeclaredMethod.ts] //// === undeclaredMethod.ts === -module M { +namespace M { >M : Symbol(M, Decl(undeclaredMethod.ts, 0, 0)) export class C { ->C : Symbol(C, Decl(undeclaredMethod.ts, 0, 10)) +>C : Symbol(C, Decl(undeclaredMethod.ts, 0, 13)) public salt() {} >salt : Symbol(C.salt, Decl(undeclaredMethod.ts, 1, 20)) @@ -15,10 +15,10 @@ module M { var c:M.C = new M.C(); >c : Symbol(c, Decl(undeclaredMethod.ts, 6, 3)) >M : Symbol(M, Decl(undeclaredMethod.ts, 0, 0)) ->C : Symbol(M.C, Decl(undeclaredMethod.ts, 0, 10)) ->M.C : Symbol(M.C, Decl(undeclaredMethod.ts, 0, 10)) +>C : Symbol(M.C, Decl(undeclaredMethod.ts, 0, 13)) +>M.C : Symbol(M.C, Decl(undeclaredMethod.ts, 0, 13)) >M : Symbol(M, Decl(undeclaredMethod.ts, 0, 0)) ->C : Symbol(M.C, Decl(undeclaredMethod.ts, 0, 10)) +>C : Symbol(M.C, Decl(undeclaredMethod.ts, 0, 13)) c.salt(); // cool >c.salt : Symbol(M.C.salt, Decl(undeclaredMethod.ts, 1, 20)) diff --git a/tests/baselines/reference/undeclaredMethod.types b/tests/baselines/reference/undeclaredMethod.types index bc96870828721..087c8831e0b45 100644 --- a/tests/baselines/reference/undeclaredMethod.types +++ b/tests/baselines/reference/undeclaredMethod.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/undeclaredMethod.ts] //// === undeclaredMethod.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/undefinedIsSubtypeOfEverything.js b/tests/baselines/reference/undefinedIsSubtypeOfEverything.js index fb9e2223d06b0..c59cfff63bdd5 100644 --- a/tests/baselines/reference/undefinedIsSubtypeOfEverything.js +++ b/tests/baselines/reference/undefinedIsSubtypeOfEverything.js @@ -82,7 +82,7 @@ class D11 extends Base { } function f() { } -module f { +namespace f { export var bar = 1; } class D12 extends Base { @@ -91,7 +91,7 @@ class D12 extends Base { class c { baz: string } -module c { +namespace c { export var bar = 1; } class D13 extends Base { diff --git a/tests/baselines/reference/undefinedIsSubtypeOfEverything.symbols b/tests/baselines/reference/undefinedIsSubtypeOfEverything.symbols index 7ef788fdf3f89..4074b379e91cb 100644 --- a/tests/baselines/reference/undefinedIsSubtypeOfEverything.symbols +++ b/tests/baselines/reference/undefinedIsSubtypeOfEverything.symbols @@ -168,7 +168,7 @@ class D11 extends Base { function f() { } >f : Symbol(f, Decl(undefinedIsSubtypeOfEverything.ts, 78, 1), Decl(undefinedIsSubtypeOfEverything.ts, 80, 16)) -module f { +namespace f { >f : Symbol(f, Decl(undefinedIsSubtypeOfEverything.ts, 78, 1), Decl(undefinedIsSubtypeOfEverything.ts, 80, 16)) export var bar = 1; @@ -188,7 +188,7 @@ class c { baz: string } >c : Symbol(c, Decl(undefinedIsSubtypeOfEverything.ts, 86, 1), Decl(undefinedIsSubtypeOfEverything.ts, 89, 23)) >baz : Symbol(c.baz, Decl(undefinedIsSubtypeOfEverything.ts, 89, 9)) -module c { +namespace c { >c : Symbol(c, Decl(undefinedIsSubtypeOfEverything.ts, 86, 1), Decl(undefinedIsSubtypeOfEverything.ts, 89, 23)) export var bar = 1; diff --git a/tests/baselines/reference/undefinedIsSubtypeOfEverything.types b/tests/baselines/reference/undefinedIsSubtypeOfEverything.types index 63a9eb50c7bef..110984bba7ea5 100644 --- a/tests/baselines/reference/undefinedIsSubtypeOfEverything.types +++ b/tests/baselines/reference/undefinedIsSubtypeOfEverything.types @@ -212,7 +212,7 @@ function f() { } >f : typeof f > : ^^^^^^^^ -module f { +namespace f { >f : typeof f > : ^^^^^^^^ @@ -242,7 +242,7 @@ class c { baz: string } >baz : string > : ^^^^^^ -module c { +namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/underscoreMapFirst.js b/tests/baselines/reference/underscoreMapFirst.js index 386a6a0a6a05f..c678cd1617bb6 100644 --- a/tests/baselines/reference/underscoreMapFirst.js +++ b/tests/baselines/reference/underscoreMapFirst.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/underscoreMapFirst.ts] //// //// [underscoreMapFirst.ts] -declare module _ { +declare namespace _ { interface Collection { } interface List extends Collection { [index: number]: T; diff --git a/tests/baselines/reference/underscoreMapFirst.symbols b/tests/baselines/reference/underscoreMapFirst.symbols index 9103a72660880..171e600337b6f 100644 --- a/tests/baselines/reference/underscoreMapFirst.symbols +++ b/tests/baselines/reference/underscoreMapFirst.symbols @@ -1,17 +1,17 @@ //// [tests/cases/compiler/underscoreMapFirst.ts] //// === underscoreMapFirst.ts === -declare module _ { +declare namespace _ { >_ : Symbol(_, Decl(underscoreMapFirst.ts, 0, 0)) interface Collection { } ->Collection : Symbol(Collection, Decl(underscoreMapFirst.ts, 0, 18)) +>Collection : Symbol(Collection, Decl(underscoreMapFirst.ts, 0, 21)) >T : Symbol(T, Decl(underscoreMapFirst.ts, 1, 25)) interface List extends Collection { >List : Symbol(List, Decl(underscoreMapFirst.ts, 1, 31)) >T : Symbol(T, Decl(underscoreMapFirst.ts, 2, 19)) ->Collection : Symbol(Collection, Decl(underscoreMapFirst.ts, 0, 18)) +>Collection : Symbol(Collection, Decl(underscoreMapFirst.ts, 0, 21)) >T : Symbol(T, Decl(underscoreMapFirst.ts, 2, 19)) [index: number]: T; @@ -39,7 +39,7 @@ declare module _ { interface Dictionary extends Collection { >Dictionary : Symbol(Dictionary, Decl(underscoreMapFirst.ts, 9, 5)) >T : Symbol(T, Decl(underscoreMapFirst.ts, 11, 25)) ->Collection : Symbol(Collection, Decl(underscoreMapFirst.ts, 0, 18)) +>Collection : Symbol(Collection, Decl(underscoreMapFirst.ts, 0, 21)) >T : Symbol(T, Decl(underscoreMapFirst.ts, 11, 25)) [index: string]: T; @@ -52,7 +52,7 @@ declare module _ { list: Collection, >list : Symbol(list, Decl(underscoreMapFirst.ts, 14, 40)) ->Collection : Symbol(Collection, Decl(underscoreMapFirst.ts, 0, 18)) +>Collection : Symbol(Collection, Decl(underscoreMapFirst.ts, 0, 21)) >T : Symbol(T, Decl(underscoreMapFirst.ts, 14, 26)) propertyName: string): any[]; diff --git a/tests/baselines/reference/underscoreMapFirst.types b/tests/baselines/reference/underscoreMapFirst.types index ed76e069050a6..3ef5ddbee3b89 100644 --- a/tests/baselines/reference/underscoreMapFirst.types +++ b/tests/baselines/reference/underscoreMapFirst.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/underscoreMapFirst.ts] //// === underscoreMapFirst.ts === -declare module _ { +declare namespace _ { >_ : typeof _ > : ^^^^^^^^ diff --git a/tests/baselines/reference/underscoreTest1.errors.txt b/tests/baselines/reference/underscoreTest1.errors.txt index f3070567b8d80..ab14202e8fc98 100644 --- a/tests/baselines/reference/underscoreTest1.errors.txt +++ b/tests/baselines/reference/underscoreTest1.errors.txt @@ -301,7 +301,7 @@ underscoreTest1_underscoreTests.ts(26,3): error TS2769: No overload matches this 3: T3; } - module Underscore { + namespace Underscore { export interface WrappedObject { keys(): string[]; values(): any[]; diff --git a/tests/baselines/reference/underscoreTest1.js b/tests/baselines/reference/underscoreTest1.js index 63e4c16ea1ea0..6e81cdc454014 100644 --- a/tests/baselines/reference/underscoreTest1.js +++ b/tests/baselines/reference/underscoreTest1.js @@ -31,7 +31,7 @@ interface Tuple4 extends Array { 3: T3; } -module Underscore { +namespace Underscore { export interface WrappedObject { keys(): string[]; values(): any[]; diff --git a/tests/baselines/reference/underscoreTest1.symbols b/tests/baselines/reference/underscoreTest1.symbols index b710d4f5ad78f..e65236214ea43 100644 --- a/tests/baselines/reference/underscoreTest1.symbols +++ b/tests/baselines/reference/underscoreTest1.symbols @@ -1066,11 +1066,11 @@ interface Tuple4 extends Array { >T3 : Symbol(T3, Decl(underscoreTest1_underscore.ts, 23, 28)) } -module Underscore { +namespace Underscore { >Underscore : Symbol(Underscore, Decl(underscoreTest1_underscore.ts, 28, 1)) export interface WrappedObject { ->WrappedObject : Symbol(WrappedObject, Decl(underscoreTest1_underscore.ts, 30, 19)) +>WrappedObject : Symbol(WrappedObject, Decl(underscoreTest1_underscore.ts, 30, 22)) >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 31, 35)) keys(): string[]; @@ -1185,7 +1185,7 @@ module Underscore { >WrappedFunction : Symbol(WrappedFunction, Decl(underscoreTest1_underscore.ts, 62, 5)) >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 64, 37)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->WrappedObject : Symbol(WrappedObject, Decl(underscoreTest1_underscore.ts, 30, 19)) +>WrappedObject : Symbol(WrappedObject, Decl(underscoreTest1_underscore.ts, 30, 22)) >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 64, 37)) bind(object: any): T; @@ -1257,7 +1257,7 @@ module Underscore { export interface WrappedArray extends WrappedObject> { >WrappedArray : Symbol(WrappedArray, Decl(underscoreTest1_underscore.ts, 77, 5)) >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34)) ->WrappedObject : Symbol(WrappedObject, Decl(underscoreTest1_underscore.ts, 30, 19)) +>WrappedObject : Symbol(WrappedObject, Decl(underscoreTest1_underscore.ts, 30, 22)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34)) @@ -1796,7 +1796,7 @@ module Underscore { export interface WrappedDictionary extends WrappedObject> { >WrappedDictionary : Symbol(WrappedDictionary, Decl(underscoreTest1_underscore.ts, 160, 5)) >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39)) ->WrappedObject : Symbol(WrappedObject, Decl(underscoreTest1_underscore.ts, 30, 19)) +>WrappedObject : Symbol(WrappedObject, Decl(underscoreTest1_underscore.ts, 30, 22)) >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0)) >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39)) @@ -3356,7 +3356,7 @@ module Underscore { >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 391, 9)) >obj : Symbol(obj, Decl(underscoreTest1_underscore.ts, 391, 12)) >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 391, 9)) ->WrappedObject : Symbol(WrappedObject, Decl(underscoreTest1_underscore.ts, 30, 19)) +>WrappedObject : Symbol(WrappedObject, Decl(underscoreTest1_underscore.ts, 30, 22)) >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 391, 9)) chain(list: T[]): ChainedArray; diff --git a/tests/baselines/reference/underscoreTest1.types b/tests/baselines/reference/underscoreTest1.types index fd15bcdfd0b50..2122d83657aff 100644 --- a/tests/baselines/reference/underscoreTest1.types +++ b/tests/baselines/reference/underscoreTest1.types @@ -3171,7 +3171,7 @@ interface Tuple4 extends Array { > : ^^ } -module Underscore { +namespace Underscore { export interface WrappedObject { keys(): string[]; >keys : () => string[] diff --git a/tests/baselines/reference/unexportedInstanceClassVariables.js b/tests/baselines/reference/unexportedInstanceClassVariables.js index d807bcfc3c4f2..ef47f868403fa 100644 --- a/tests/baselines/reference/unexportedInstanceClassVariables.js +++ b/tests/baselines/reference/unexportedInstanceClassVariables.js @@ -1,13 +1,13 @@ //// [tests/cases/compiler/unexportedInstanceClassVariables.ts] //// //// [unexportedInstanceClassVariables.ts] -module M{ +namespace M{ class A{ constructor(val:string){} } } -module M{ +namespace M{ class A {} var a = new A(); diff --git a/tests/baselines/reference/unexportedInstanceClassVariables.symbols b/tests/baselines/reference/unexportedInstanceClassVariables.symbols index 22099e203d41f..2984600d95964 100644 --- a/tests/baselines/reference/unexportedInstanceClassVariables.symbols +++ b/tests/baselines/reference/unexportedInstanceClassVariables.symbols @@ -1,25 +1,25 @@ //// [tests/cases/compiler/unexportedInstanceClassVariables.ts] //// === unexportedInstanceClassVariables.ts === -module M{ +namespace M{ >M : Symbol(M, Decl(unexportedInstanceClassVariables.ts, 0, 0), Decl(unexportedInstanceClassVariables.ts, 4, 1)) class A{ ->A : Symbol(A, Decl(unexportedInstanceClassVariables.ts, 0, 9)) +>A : Symbol(A, Decl(unexportedInstanceClassVariables.ts, 0, 12)) constructor(val:string){} >val : Symbol(val, Decl(unexportedInstanceClassVariables.ts, 2, 14)) } } -module M{ +namespace M{ >M : Symbol(M, Decl(unexportedInstanceClassVariables.ts, 0, 0), Decl(unexportedInstanceClassVariables.ts, 4, 1)) class A {} ->A : Symbol(A, Decl(unexportedInstanceClassVariables.ts, 6, 9)) +>A : Symbol(A, Decl(unexportedInstanceClassVariables.ts, 6, 12)) var a = new A(); >a : Symbol(a, Decl(unexportedInstanceClassVariables.ts, 9, 5)) ->A : Symbol(A, Decl(unexportedInstanceClassVariables.ts, 6, 9)) +>A : Symbol(A, Decl(unexportedInstanceClassVariables.ts, 6, 12)) } diff --git a/tests/baselines/reference/unexportedInstanceClassVariables.types b/tests/baselines/reference/unexportedInstanceClassVariables.types index 1377e17dc10a2..4457806b25916 100644 --- a/tests/baselines/reference/unexportedInstanceClassVariables.types +++ b/tests/baselines/reference/unexportedInstanceClassVariables.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/unexportedInstanceClassVariables.ts] //// === unexportedInstanceClassVariables.ts === -module M{ +namespace M{ >M : typeof M > : ^^^^^^^^ @@ -15,7 +15,7 @@ module M{ } } -module M{ +namespace M{ >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.errors.txt b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.errors.txt index 1219bb562c96c..cc962ed833188 100644 --- a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.errors.txt +++ b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.errors.txt @@ -183,7 +183,7 @@ unionSubtypeIfEveryConstituentTypeIsSubtype.ts(129,5): error TS2411: Property 'f function f() { } - module f { + namespace f { export var bar = 1; } interface I15 { @@ -198,7 +198,7 @@ unionSubtypeIfEveryConstituentTypeIsSubtype.ts(129,5): error TS2411: Property 'f class c { baz: string } - module c { + namespace c { export var bar = 1; } interface I16 { diff --git a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.js b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.js index bad8fcd3bc091..e73fba7298315 100644 --- a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.js +++ b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.js @@ -105,7 +105,7 @@ interface I14 { function f() { } -module f { +namespace f { export var bar = 1; } interface I15 { @@ -116,7 +116,7 @@ interface I15 { class c { baz: string } -module c { +namespace c { export var bar = 1; } interface I16 { diff --git a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.symbols b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.symbols index beba3b731f7e1..d86eaf0ec6b28 100644 --- a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.symbols +++ b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.symbols @@ -247,7 +247,7 @@ interface I14 { function f() { } >f : Symbol(f, Decl(unionSubtypeIfEveryConstituentTypeIsSubtype.ts, 100, 1), Decl(unionSubtypeIfEveryConstituentTypeIsSubtype.ts, 103, 16)) -module f { +namespace f { >f : Symbol(f, Decl(unionSubtypeIfEveryConstituentTypeIsSubtype.ts, 100, 1), Decl(unionSubtypeIfEveryConstituentTypeIsSubtype.ts, 103, 16)) export var bar = 1; @@ -273,7 +273,7 @@ class c { baz: string } >c : Symbol(c, Decl(unionSubtypeIfEveryConstituentTypeIsSubtype.ts, 111, 1), Decl(unionSubtypeIfEveryConstituentTypeIsSubtype.ts, 114, 23)) >baz : Symbol(c.baz, Decl(unionSubtypeIfEveryConstituentTypeIsSubtype.ts, 114, 9)) -module c { +namespace c { >c : Symbol(c, Decl(unionSubtypeIfEveryConstituentTypeIsSubtype.ts, 111, 1), Decl(unionSubtypeIfEveryConstituentTypeIsSubtype.ts, 114, 23)) export var bar = 1; diff --git a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.types b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.types index 8f81eee7e3f45..a88c65fe41bdd 100644 --- a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.types +++ b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.types @@ -249,7 +249,7 @@ function f() { } >f : typeof f > : ^^^^^^^^ -module f { +namespace f { >f : typeof f > : ^^^^^^^^ @@ -282,7 +282,7 @@ class c { baz: string } >baz : string > : ^^^^^^ -module c { +namespace c { >c : typeof c > : ^^^^^^^^ diff --git a/tests/baselines/reference/unknownSymbols2.errors.txt b/tests/baselines/reference/unknownSymbols2.errors.txt index 593a6a51bbf8f..b4fa0cb82a3fe 100644 --- a/tests/baselines/reference/unknownSymbols2.errors.txt +++ b/tests/baselines/reference/unknownSymbols2.errors.txt @@ -11,7 +11,7 @@ unknownSymbols2.ts(29,16): error TS2503: Cannot find namespace 'asdf'. ==== unknownSymbols2.ts (10 errors) ==== - module M { + namespace M { var x: asdf; ~~~~ !!! error TS2304: Cannot find name 'asdf'. @@ -53,7 +53,7 @@ unknownSymbols2.ts(29,16): error TS2503: Cannot find namespace 'asdf'. ~~~~~~ !!! error TS2304: Cannot find name 'qwerty'. - module N { + namespace N { var x = 1; } import c = N; diff --git a/tests/baselines/reference/unknownSymbols2.js b/tests/baselines/reference/unknownSymbols2.js index 3e3b3d8554276..2f8ef9b5957f3 100644 --- a/tests/baselines/reference/unknownSymbols2.js +++ b/tests/baselines/reference/unknownSymbols2.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/unknownSymbols2.ts] //// //// [unknownSymbols2.ts] -module M { +namespace M { var x: asdf; var y = x + asdf; var z = x; // should be an error @@ -25,7 +25,7 @@ module M { var a = () => asdf; var b = (asdf) => { return qwerty }; - module N { + namespace N { var x = 1; } import c = N; diff --git a/tests/baselines/reference/unknownSymbols2.symbols b/tests/baselines/reference/unknownSymbols2.symbols index 2db8b8872f613..1966f6bf96d51 100644 --- a/tests/baselines/reference/unknownSymbols2.symbols +++ b/tests/baselines/reference/unknownSymbols2.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/unknownSymbols2.ts] //// === unknownSymbols2.ts === -module M { +namespace M { >M : Symbol(M, Decl(unknownSymbols2.ts, 0, 0)) var x: asdf; @@ -42,7 +42,7 @@ module M { >b : Symbol(b, Decl(unknownSymbols2.ts, 22, 7)) >asdf : Symbol(asdf, Decl(unknownSymbols2.ts, 22, 13)) - module N { + namespace N { >N : Symbol(N, Decl(unknownSymbols2.ts, 22, 40)) var x = 1; diff --git a/tests/baselines/reference/unknownSymbols2.types b/tests/baselines/reference/unknownSymbols2.types index a93ecdcbc1d67..0092ab0d87ab9 100644 --- a/tests/baselines/reference/unknownSymbols2.types +++ b/tests/baselines/reference/unknownSymbols2.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/unknownSymbols2.ts] //// === unknownSymbols2.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ @@ -74,7 +74,7 @@ module M { >qwerty : any > : ^^^ - module N { + namespace N { >N : typeof N > : ^^^^^^^^ diff --git a/tests/baselines/reference/unspecializedConstraints.errors.txt b/tests/baselines/reference/unspecializedConstraints.errors.txt index 824b8fa2b45a3..8370474884059 100644 --- a/tests/baselines/reference/unspecializedConstraints.errors.txt +++ b/tests/baselines/reference/unspecializedConstraints.errors.txt @@ -2,7 +2,7 @@ unspecializedConstraints.ts(84,44): error TS2552: Cannot find name 'TypeParamete ==== unspecializedConstraints.ts (1 errors) ==== - module ts { + namespace ts { interface Map { [index: string]: T; } diff --git a/tests/baselines/reference/unspecializedConstraints.js b/tests/baselines/reference/unspecializedConstraints.js index f782c811aa2a8..ce2d0827bd325 100644 --- a/tests/baselines/reference/unspecializedConstraints.js +++ b/tests/baselines/reference/unspecializedConstraints.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/unspecializedConstraints.ts] //// //// [unspecializedConstraints.ts] -module ts { +namespace ts { interface Map { [index: string]: T; } diff --git a/tests/baselines/reference/unspecializedConstraints.symbols b/tests/baselines/reference/unspecializedConstraints.symbols index 0e2fe1d02cfed..e1f7371eb2d61 100644 --- a/tests/baselines/reference/unspecializedConstraints.symbols +++ b/tests/baselines/reference/unspecializedConstraints.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/unspecializedConstraints.ts] //// === unspecializedConstraints.ts === -module ts { +namespace ts { >ts : Symbol(ts, Decl(unspecializedConstraints.ts, 0, 0)) interface Map { ->Map : Symbol(Map, Decl(unspecializedConstraints.ts, 0, 11)) +>Map : Symbol(Map, Decl(unspecializedConstraints.ts, 0, 14)) >T : Symbol(T, Decl(unspecializedConstraints.ts, 1, 18)) [index: string]: T; @@ -409,7 +409,7 @@ module ts { >getProperty : Symbol(getProperty, Decl(unspecializedConstraints.ts, 115, 57)) >T : Symbol(T, Decl(unspecializedConstraints.ts, 117, 25)) >map : Symbol(map, Decl(unspecializedConstraints.ts, 117, 28)) ->Map : Symbol(Map, Decl(unspecializedConstraints.ts, 0, 11)) +>Map : Symbol(Map, Decl(unspecializedConstraints.ts, 0, 14)) >T : Symbol(T, Decl(unspecializedConstraints.ts, 117, 25)) >key : Symbol(key, Decl(unspecializedConstraints.ts, 117, 40)) >T : Symbol(T, Decl(unspecializedConstraints.ts, 117, 25)) @@ -431,7 +431,7 @@ module ts { >hasProperty : Symbol(hasProperty, Decl(unspecializedConstraints.ts, 120, 5)) >T : Symbol(T, Decl(unspecializedConstraints.ts, 122, 25)) >map : Symbol(map, Decl(unspecializedConstraints.ts, 122, 28)) ->Map : Symbol(Map, Decl(unspecializedConstraints.ts, 0, 11)) +>Map : Symbol(Map, Decl(unspecializedConstraints.ts, 0, 14)) >T : Symbol(T, Decl(unspecializedConstraints.ts, 122, 25)) >key : Symbol(key, Decl(unspecializedConstraints.ts, 122, 40)) diff --git a/tests/baselines/reference/unspecializedConstraints.types b/tests/baselines/reference/unspecializedConstraints.types index 7c1de3b0d2197..1b266e8c88c82 100644 --- a/tests/baselines/reference/unspecializedConstraints.types +++ b/tests/baselines/reference/unspecializedConstraints.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/unspecializedConstraints.ts] //// === unspecializedConstraints.ts === -module ts { +namespace ts { >ts : typeof ts > : ^^^^^^^^^ diff --git a/tests/baselines/reference/unusedClassesinModule1.errors.txt b/tests/baselines/reference/unusedClassesinModule1.errors.txt index c0956cabe423a..1bbd8f327a1f6 100644 --- a/tests/baselines/reference/unusedClassesinModule1.errors.txt +++ b/tests/baselines/reference/unusedClassesinModule1.errors.txt @@ -2,7 +2,7 @@ unusedClassesinModule1.ts(2,11): error TS6196: 'Calculator' is declared but neve ==== unusedClassesinModule1.ts (1 errors) ==== - module A { + namespace A { class Calculator { ~~~~~~~~~~ !!! error TS6196: 'Calculator' is declared but never used. diff --git a/tests/baselines/reference/unusedClassesinModule1.js b/tests/baselines/reference/unusedClassesinModule1.js index c51c8aa8986ce..497d41aad582d 100644 --- a/tests/baselines/reference/unusedClassesinModule1.js +++ b/tests/baselines/reference/unusedClassesinModule1.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/unusedClassesinModule1.ts] //// //// [unusedClassesinModule1.ts] -module A { +namespace A { class Calculator { public handelChar() { } diff --git a/tests/baselines/reference/unusedClassesinModule1.symbols b/tests/baselines/reference/unusedClassesinModule1.symbols index 63da30d17348b..204a5fdc4f6b2 100644 --- a/tests/baselines/reference/unusedClassesinModule1.symbols +++ b/tests/baselines/reference/unusedClassesinModule1.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/unusedClassesinModule1.ts] //// === unusedClassesinModule1.ts === -module A { +namespace A { >A : Symbol(A, Decl(unusedClassesinModule1.ts, 0, 0)) class Calculator { ->Calculator : Symbol(Calculator, Decl(unusedClassesinModule1.ts, 0, 10)) +>Calculator : Symbol(Calculator, Decl(unusedClassesinModule1.ts, 0, 13)) public handelChar() { >handelChar : Symbol(Calculator.handelChar, Decl(unusedClassesinModule1.ts, 1, 22)) diff --git a/tests/baselines/reference/unusedClassesinModule1.types b/tests/baselines/reference/unusedClassesinModule1.types index c06b4802714d4..f1f6288d892dd 100644 --- a/tests/baselines/reference/unusedClassesinModule1.types +++ b/tests/baselines/reference/unusedClassesinModule1.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/unusedClassesinModule1.ts] //// === unusedClassesinModule1.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ diff --git a/tests/baselines/reference/unusedImports10.errors.txt b/tests/baselines/reference/unusedImports10.errors.txt index 3720cbbe21c66..3501ad9c3370e 100644 --- a/tests/baselines/reference/unusedImports10.errors.txt +++ b/tests/baselines/reference/unusedImports10.errors.txt @@ -2,14 +2,14 @@ unusedImports10.ts(9,12): error TS6133: 'a' is declared but its value is never r ==== unusedImports10.ts (1 errors) ==== - module A { + namespace A { export class Calculator { public handelChar() { } } } - module B { + namespace B { import a = A; ~ !!! error TS6133: 'a' is declared but its value is never read. diff --git a/tests/baselines/reference/unusedImports10.js b/tests/baselines/reference/unusedImports10.js index 674dc0f1426d8..c0dc9f419b0f6 100644 --- a/tests/baselines/reference/unusedImports10.js +++ b/tests/baselines/reference/unusedImports10.js @@ -1,14 +1,14 @@ //// [tests/cases/compiler/unusedImports10.ts] //// //// [unusedImports10.ts] -module A { +namespace A { export class Calculator { public handelChar() { } } } -module B { +namespace B { import a = A; } diff --git a/tests/baselines/reference/unusedImports10.symbols b/tests/baselines/reference/unusedImports10.symbols index 6c402b14791fd..5a1b904889bfc 100644 --- a/tests/baselines/reference/unusedImports10.symbols +++ b/tests/baselines/reference/unusedImports10.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/unusedImports10.ts] //// === unusedImports10.ts === -module A { +namespace A { >A : Symbol(A, Decl(unusedImports10.ts, 0, 0)) export class Calculator { ->Calculator : Symbol(Calculator, Decl(unusedImports10.ts, 0, 10)) +>Calculator : Symbol(Calculator, Decl(unusedImports10.ts, 0, 13)) public handelChar() { >handelChar : Symbol(Calculator.handelChar, Decl(unusedImports10.ts, 1, 29)) @@ -13,10 +13,10 @@ module A { } } -module B { +namespace B { >B : Symbol(B, Decl(unusedImports10.ts, 5, 1)) import a = A; ->a : Symbol(a, Decl(unusedImports10.ts, 7, 10)) +>a : Symbol(a, Decl(unusedImports10.ts, 7, 13)) >A : Symbol(a, Decl(unusedImports10.ts, 0, 0)) } diff --git a/tests/baselines/reference/unusedImports10.types b/tests/baselines/reference/unusedImports10.types index 4d416d92738a9..91e7243d168f3 100644 --- a/tests/baselines/reference/unusedImports10.types +++ b/tests/baselines/reference/unusedImports10.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/unusedImports10.ts] //// === unusedImports10.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -16,7 +16,7 @@ module A { } } -module B { +namespace B { import a = A; >a : typeof a > : ^^^^^^^^ diff --git a/tests/baselines/reference/unusedModuleInModule.errors.txt b/tests/baselines/reference/unusedModuleInModule.errors.txt index 675be2bf4b31d..b7a3f2e710978 100644 --- a/tests/baselines/reference/unusedModuleInModule.errors.txt +++ b/tests/baselines/reference/unusedModuleInModule.errors.txt @@ -1,9 +1,9 @@ -unusedModuleInModule.ts(2,12): error TS6133: 'B' is declared but its value is never read. +unusedModuleInModule.ts(2,15): error TS6133: 'B' is declared but its value is never read. ==== unusedModuleInModule.ts (1 errors) ==== - module A { - module B {} - ~ + namespace A { + namespace B {} + ~ !!! error TS6133: 'B' is declared but its value is never read. } \ No newline at end of file diff --git a/tests/baselines/reference/unusedModuleInModule.js b/tests/baselines/reference/unusedModuleInModule.js index 390a39844efc0..de8f27a0b8cb2 100644 --- a/tests/baselines/reference/unusedModuleInModule.js +++ b/tests/baselines/reference/unusedModuleInModule.js @@ -1,8 +1,8 @@ //// [tests/cases/compiler/unusedModuleInModule.ts] //// //// [unusedModuleInModule.ts] -module A { - module B {} +namespace A { + namespace B {} } //// [unusedModuleInModule.js] diff --git a/tests/baselines/reference/unusedModuleInModule.symbols b/tests/baselines/reference/unusedModuleInModule.symbols index 6542a10f7e47c..503fb9b3e8759 100644 --- a/tests/baselines/reference/unusedModuleInModule.symbols +++ b/tests/baselines/reference/unusedModuleInModule.symbols @@ -1,9 +1,9 @@ //// [tests/cases/compiler/unusedModuleInModule.ts] //// === unusedModuleInModule.ts === -module A { +namespace A { >A : Symbol(A, Decl(unusedModuleInModule.ts, 0, 0)) - module B {} ->B : Symbol(B, Decl(unusedModuleInModule.ts, 0, 10)) + namespace B {} +>B : Symbol(B, Decl(unusedModuleInModule.ts, 0, 13)) } diff --git a/tests/baselines/reference/unusedModuleInModule.types b/tests/baselines/reference/unusedModuleInModule.types index 8860b44c54848..f309eb7aa788e 100644 --- a/tests/baselines/reference/unusedModuleInModule.types +++ b/tests/baselines/reference/unusedModuleInModule.types @@ -2,6 +2,6 @@ === unusedModuleInModule.ts === -module A { - module B {} +namespace A { + namespace B {} } diff --git a/tests/baselines/reference/unusedNamespaceInModule.errors.txt b/tests/baselines/reference/unusedNamespaceInModule.errors.txt index c0bb803d1719e..98e136bf85b1e 100644 --- a/tests/baselines/reference/unusedNamespaceInModule.errors.txt +++ b/tests/baselines/reference/unusedNamespaceInModule.errors.txt @@ -2,7 +2,7 @@ unusedNamespaceInModule.ts(2,15): error TS6133: 'B' is declared but its value is ==== unusedNamespaceInModule.ts (1 errors) ==== - module A { + namespace A { namespace B { } ~ !!! error TS6133: 'B' is declared but its value is never read. diff --git a/tests/baselines/reference/unusedNamespaceInModule.js b/tests/baselines/reference/unusedNamespaceInModule.js index 4c20f44556cf1..523693c2e6798 100644 --- a/tests/baselines/reference/unusedNamespaceInModule.js +++ b/tests/baselines/reference/unusedNamespaceInModule.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/unusedNamespaceInModule.ts] //// //// [unusedNamespaceInModule.ts] -module A { +namespace A { namespace B { } export namespace C {} } diff --git a/tests/baselines/reference/unusedNamespaceInModule.symbols b/tests/baselines/reference/unusedNamespaceInModule.symbols index 5dc64448e5212..1308b8662a9d4 100644 --- a/tests/baselines/reference/unusedNamespaceInModule.symbols +++ b/tests/baselines/reference/unusedNamespaceInModule.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/unusedNamespaceInModule.ts] //// === unusedNamespaceInModule.ts === -module A { +namespace A { >A : Symbol(A, Decl(unusedNamespaceInModule.ts, 0, 0)) namespace B { } ->B : Symbol(B, Decl(unusedNamespaceInModule.ts, 0, 10)) +>B : Symbol(B, Decl(unusedNamespaceInModule.ts, 0, 13)) export namespace C {} >C : Symbol(C, Decl(unusedNamespaceInModule.ts, 1, 19)) diff --git a/tests/baselines/reference/unusedNamespaceInModule.types b/tests/baselines/reference/unusedNamespaceInModule.types index 7ecec432d23de..73da7aae5561b 100644 --- a/tests/baselines/reference/unusedNamespaceInModule.types +++ b/tests/baselines/reference/unusedNamespaceInModule.types @@ -2,7 +2,7 @@ === unusedNamespaceInModule.ts === -module A { +namespace A { namespace B { } export namespace C {} } diff --git a/tests/baselines/reference/usingModuleWithExportImportInValuePosition.js b/tests/baselines/reference/usingModuleWithExportImportInValuePosition.js index 26207ed865876..31525dd2cb5cf 100644 --- a/tests/baselines/reference/usingModuleWithExportImportInValuePosition.js +++ b/tests/baselines/reference/usingModuleWithExportImportInValuePosition.js @@ -1,18 +1,18 @@ //// [tests/cases/compiler/usingModuleWithExportImportInValuePosition.ts] //// //// [usingModuleWithExportImportInValuePosition.ts] -module A { +namespace A { export var x = 'hello world' export class Point { constructor(public x: number, public y: number) { } } - export module B { + export namespace B { export interface Id { name: string; } } } -module C { +namespace C { export import a = A; } diff --git a/tests/baselines/reference/usingModuleWithExportImportInValuePosition.symbols b/tests/baselines/reference/usingModuleWithExportImportInValuePosition.symbols index 49a920acebd3d..3f4ca8ce26ed9 100644 --- a/tests/baselines/reference/usingModuleWithExportImportInValuePosition.symbols +++ b/tests/baselines/reference/usingModuleWithExportImportInValuePosition.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/usingModuleWithExportImportInValuePosition.ts] //// === usingModuleWithExportImportInValuePosition.ts === -module A { +namespace A { >A : Symbol(A, Decl(usingModuleWithExportImportInValuePosition.ts, 0, 0)) export var x = 'hello world' @@ -14,31 +14,31 @@ export class Point { >x : Symbol(Point.x, Decl(usingModuleWithExportImportInValuePosition.ts, 3, 20)) >y : Symbol(Point.y, Decl(usingModuleWithExportImportInValuePosition.ts, 3, 37)) } - export module B { + export namespace B { >B : Symbol(B, Decl(usingModuleWithExportImportInValuePosition.ts, 4, 5)) export interface Id { ->Id : Symbol(Id, Decl(usingModuleWithExportImportInValuePosition.ts, 5, 21)) +>Id : Symbol(Id, Decl(usingModuleWithExportImportInValuePosition.ts, 5, 24)) name: string; >name : Symbol(Id.name, Decl(usingModuleWithExportImportInValuePosition.ts, 6, 29)) } } } -module C { +namespace C { >C : Symbol(C, Decl(usingModuleWithExportImportInValuePosition.ts, 10, 1)) export import a = A; ->a : Symbol(a, Decl(usingModuleWithExportImportInValuePosition.ts, 11, 10)) +>a : Symbol(a, Decl(usingModuleWithExportImportInValuePosition.ts, 11, 13)) >A : Symbol(a, Decl(usingModuleWithExportImportInValuePosition.ts, 0, 0)) } var a: string = C.a.x; >a : Symbol(a, Decl(usingModuleWithExportImportInValuePosition.ts, 15, 3)) >C.a.x : Symbol(A.x, Decl(usingModuleWithExportImportInValuePosition.ts, 1, 10)) ->C.a : Symbol(C.a, Decl(usingModuleWithExportImportInValuePosition.ts, 11, 10)) +>C.a : Symbol(C.a, Decl(usingModuleWithExportImportInValuePosition.ts, 11, 13)) >C : Symbol(C, Decl(usingModuleWithExportImportInValuePosition.ts, 10, 1)) ->a : Symbol(C.a, Decl(usingModuleWithExportImportInValuePosition.ts, 11, 10)) +>a : Symbol(C.a, Decl(usingModuleWithExportImportInValuePosition.ts, 11, 13)) >x : Symbol(A.x, Decl(usingModuleWithExportImportInValuePosition.ts, 1, 10)) var b: { x: number; y: number; } = new C.a.Point(0, 0); @@ -46,9 +46,9 @@ var b: { x: number; y: number; } = new C.a.Point(0, 0); >x : Symbol(x, Decl(usingModuleWithExportImportInValuePosition.ts, 16, 8)) >y : Symbol(y, Decl(usingModuleWithExportImportInValuePosition.ts, 16, 19)) >C.a.Point : Symbol(A.Point, Decl(usingModuleWithExportImportInValuePosition.ts, 1, 28)) ->C.a : Symbol(C.a, Decl(usingModuleWithExportImportInValuePosition.ts, 11, 10)) +>C.a : Symbol(C.a, Decl(usingModuleWithExportImportInValuePosition.ts, 11, 13)) >C : Symbol(C, Decl(usingModuleWithExportImportInValuePosition.ts, 10, 1)) ->a : Symbol(C.a, Decl(usingModuleWithExportImportInValuePosition.ts, 11, 10)) +>a : Symbol(C.a, Decl(usingModuleWithExportImportInValuePosition.ts, 11, 13)) >Point : Symbol(A.Point, Decl(usingModuleWithExportImportInValuePosition.ts, 1, 28)) var c: { name: string }; @@ -58,7 +58,7 @@ var c: { name: string }; var c: C.a.B.Id; >c : Symbol(c, Decl(usingModuleWithExportImportInValuePosition.ts, 17, 3), Decl(usingModuleWithExportImportInValuePosition.ts, 18, 3)) >C : Symbol(C, Decl(usingModuleWithExportImportInValuePosition.ts, 10, 1)) ->a : Symbol(C.a, Decl(usingModuleWithExportImportInValuePosition.ts, 11, 10)) +>a : Symbol(C.a, Decl(usingModuleWithExportImportInValuePosition.ts, 11, 13)) >B : Symbol(A.B, Decl(usingModuleWithExportImportInValuePosition.ts, 4, 5)) ->Id : Symbol(A.B.Id, Decl(usingModuleWithExportImportInValuePosition.ts, 5, 21)) +>Id : Symbol(A.B.Id, Decl(usingModuleWithExportImportInValuePosition.ts, 5, 24)) diff --git a/tests/baselines/reference/usingModuleWithExportImportInValuePosition.types b/tests/baselines/reference/usingModuleWithExportImportInValuePosition.types index 1f9fe2da352e3..c032082c2c4e0 100644 --- a/tests/baselines/reference/usingModuleWithExportImportInValuePosition.types +++ b/tests/baselines/reference/usingModuleWithExportImportInValuePosition.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/usingModuleWithExportImportInValuePosition.ts] //// === usingModuleWithExportImportInValuePosition.ts === -module A { +namespace A { >A : typeof A > : ^^^^^^^^ @@ -21,7 +21,7 @@ export class Point { >y : number > : ^^^^^^ } - export module B { + export namespace B { export interface Id { name: string; >name : string @@ -29,7 +29,7 @@ export class Point { } } } -module C { +namespace C { >C : typeof C > : ^^^^^^^^ diff --git a/tests/baselines/reference/validNullAssignments.errors.txt b/tests/baselines/reference/validNullAssignments.errors.txt index d2ae508b11570..37c42a530db55 100644 --- a/tests/baselines/reference/validNullAssignments.errors.txt +++ b/tests/baselines/reference/validNullAssignments.errors.txt @@ -33,7 +33,7 @@ validNullAssignments.ts(30,1): error TS2630: Cannot assign to 'i' because it is ~ !!! error TS2693: 'I' only refers to a type, but is being used as a value here. - module M { export var x = 1; } + namespace M { export var x = 1; } M = null; // error ~ !!! error TS2631: Cannot assign to 'M' because it is a namespace. diff --git a/tests/baselines/reference/validNullAssignments.js b/tests/baselines/reference/validNullAssignments.js index 7bf07ed7049e9..c1ee9f525dbd1 100644 --- a/tests/baselines/reference/validNullAssignments.js +++ b/tests/baselines/reference/validNullAssignments.js @@ -22,7 +22,7 @@ var g: I; g = null; // ok I = null; // error -module M { export var x = 1; } +namespace M { export var x = 1; } M = null; // error var h: { f(): void } = null; diff --git a/tests/baselines/reference/validNullAssignments.symbols b/tests/baselines/reference/validNullAssignments.symbols index 6451fd499c1dc..ac8ebc46a5b80 100644 --- a/tests/baselines/reference/validNullAssignments.symbols +++ b/tests/baselines/reference/validNullAssignments.symbols @@ -56,9 +56,9 @@ g = null; // ok I = null; // error -module M { export var x = 1; } +namespace M { export var x = 1; } >M : Symbol(M, Decl(validNullAssignments.ts, 19, 9)) ->x : Symbol(x, Decl(validNullAssignments.ts, 21, 21)) +>x : Symbol(x, Decl(validNullAssignments.ts, 21, 24)) M = null; // error >M : Symbol(M, Decl(validNullAssignments.ts, 19, 9)) diff --git a/tests/baselines/reference/validNullAssignments.types b/tests/baselines/reference/validNullAssignments.types index 5e01c486a8f57..09d33516e51a4 100644 --- a/tests/baselines/reference/validNullAssignments.types +++ b/tests/baselines/reference/validNullAssignments.types @@ -87,7 +87,7 @@ I = null; // error >I : any > : ^^^ -module M { export var x = 1; } +namespace M { export var x = 1; } >M : typeof M > : ^^^^^^^^ >x : number diff --git a/tests/baselines/reference/varBlock.errors.txt b/tests/baselines/reference/varBlock.errors.txt index 28bf5f09e9d18..de6217925f9f0 100644 --- a/tests/baselines/reference/varBlock.errors.txt +++ b/tests/baselines/reference/varBlock.errors.txt @@ -21,12 +21,12 @@ varBlock.ts(39,17): error TS1039: Initializers are not allowed in ambient contex ==== varBlock.ts (20 errors) ==== - module m2 { + namespace m2 { export var a, b2: number = 10, b; } - declare module m3 { + declare namespace m3 { var a, b, c; var a1, b1 = 10; ~~ @@ -56,7 +56,7 @@ varBlock.ts(39,17): error TS1039: Initializers are not allowed in ambient contex ~~ !!! error TS1039: Initializers are not allowed in ambient contexts. - module m3 { + namespace m3 { declare var d = 10; ~~ !!! error TS1039: Initializers are not allowed in ambient contexts. @@ -75,7 +75,7 @@ varBlock.ts(39,17): error TS1039: Initializers are not allowed in ambient contex !!! error TS1039: Initializers are not allowed in ambient contexts. } - declare module m4 { + declare namespace m4 { var d = 10; ~~ !!! error TS1039: Initializers are not allowed in ambient contexts. diff --git a/tests/baselines/reference/varBlock.js b/tests/baselines/reference/varBlock.js index 3bce1c127846b..0f35e6ad03fd2 100644 --- a/tests/baselines/reference/varBlock.js +++ b/tests/baselines/reference/varBlock.js @@ -1,12 +1,12 @@ //// [tests/cases/compiler/varBlock.ts] //// //// [varBlock.ts] -module m2 { +namespace m2 { export var a, b2: number = 10, b; } -declare module m3 { +declare namespace m3 { var a, b, c; var a1, b1 = 10; @@ -24,14 +24,14 @@ declare var a2, b2, c2; declare var da = 10; declare var d3, d4 = 10; -module m3 { +namespace m3 { declare var d = 10; declare var d2, d3 = 10, d4 = 10; export declare var dE = 10; export declare var d2E, d3E = 10, d4E = 10; } -declare module m4 { +declare namespace m4 { var d = 10; var d2, d3 = 10, d4 =10; export var dE = 10; diff --git a/tests/baselines/reference/varBlock.symbols b/tests/baselines/reference/varBlock.symbols index 6001b0bf733b3..7e04ba0d2aa62 100644 --- a/tests/baselines/reference/varBlock.symbols +++ b/tests/baselines/reference/varBlock.symbols @@ -1,7 +1,7 @@ //// [tests/cases/compiler/varBlock.ts] //// === varBlock.ts === -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(varBlock.ts, 0, 0)) export var a, b2: number = 10, b; @@ -10,7 +10,7 @@ module m2 { >b : Symbol(b, Decl(varBlock.ts, 2, 34)) } -declare module m3 { +declare namespace m3 { >m3 : Symbol(m3, Decl(varBlock.ts, 3, 1), Decl(varBlock.ts, 21, 24)) var a, b, c; @@ -47,7 +47,7 @@ declare var d3, d4 = 10; >d3 : Symbol(d3, Decl(varBlock.ts, 21, 11)) >d4 : Symbol(d4, Decl(varBlock.ts, 21, 15)) -module m3 { +namespace m3 { >m3 : Symbol(m3, Decl(varBlock.ts, 3, 1), Decl(varBlock.ts, 21, 24)) declare var d = 10; @@ -67,7 +67,7 @@ module m3 { >d4E : Symbol(d4E, Decl(varBlock.ts, 27, 37)) } -declare module m4 { +declare namespace m4 { >m4 : Symbol(m4, Decl(varBlock.ts, 28, 1)) var d = 10; diff --git a/tests/baselines/reference/varBlock.types b/tests/baselines/reference/varBlock.types index c8813d93b41ef..54ff621a986fe 100644 --- a/tests/baselines/reference/varBlock.types +++ b/tests/baselines/reference/varBlock.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/varBlock.ts] //// === varBlock.ts === -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -16,7 +16,7 @@ module m2 { > : ^^^ } -declare module m3 { +declare namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ @@ -78,7 +78,7 @@ declare var d3, d4 = 10; >10 : 10 > : ^^ -module m3 { +namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ @@ -119,7 +119,7 @@ module m3 { > : ^^ } -declare module m4 { +declare namespace m4 { >m4 : typeof m4 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/varNameConflictsWithImportInDifferentPartOfModule.errors.txt b/tests/baselines/reference/varNameConflictsWithImportInDifferentPartOfModule.errors.txt index 3627685248c34..40ce57393bc47 100644 --- a/tests/baselines/reference/varNameConflictsWithImportInDifferentPartOfModule.errors.txt +++ b/tests/baselines/reference/varNameConflictsWithImportInDifferentPartOfModule.errors.txt @@ -2,11 +2,11 @@ varNameConflictsWithImportInDifferentPartOfModule.ts(6,5): error TS2440: Import ==== varNameConflictsWithImportInDifferentPartOfModule.ts (1 errors) ==== - module M1 { + namespace M1 { export var q = 5; export var s = ''; } - module M1 { + namespace M1 { export import q = M1.s; // Should be an error but isn't ~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2440: Import declaration conflicts with local declaration of 'q'. diff --git a/tests/baselines/reference/varNameConflictsWithImportInDifferentPartOfModule.js b/tests/baselines/reference/varNameConflictsWithImportInDifferentPartOfModule.js index 2677726dd7e5d..8cbd6590f0f06 100644 --- a/tests/baselines/reference/varNameConflictsWithImportInDifferentPartOfModule.js +++ b/tests/baselines/reference/varNameConflictsWithImportInDifferentPartOfModule.js @@ -1,11 +1,11 @@ //// [tests/cases/compiler/varNameConflictsWithImportInDifferentPartOfModule.ts] //// //// [varNameConflictsWithImportInDifferentPartOfModule.ts] -module M1 { +namespace M1 { export var q = 5; export var s = ''; } -module M1 { +namespace M1 { export import q = M1.s; // Should be an error but isn't } diff --git a/tests/baselines/reference/varNameConflictsWithImportInDifferentPartOfModule.symbols b/tests/baselines/reference/varNameConflictsWithImportInDifferentPartOfModule.symbols index 0cfc32ef3677d..efd8411608183 100644 --- a/tests/baselines/reference/varNameConflictsWithImportInDifferentPartOfModule.symbols +++ b/tests/baselines/reference/varNameConflictsWithImportInDifferentPartOfModule.symbols @@ -1,20 +1,20 @@ //// [tests/cases/compiler/varNameConflictsWithImportInDifferentPartOfModule.ts] //// === varNameConflictsWithImportInDifferentPartOfModule.ts === -module M1 { +namespace M1 { >M1 : Symbol(M1, Decl(varNameConflictsWithImportInDifferentPartOfModule.ts, 0, 0), Decl(varNameConflictsWithImportInDifferentPartOfModule.ts, 3, 1)) export var q = 5; ->q : Symbol(q, Decl(varNameConflictsWithImportInDifferentPartOfModule.ts, 1, 14), Decl(varNameConflictsWithImportInDifferentPartOfModule.ts, 4, 11)) +>q : Symbol(q, Decl(varNameConflictsWithImportInDifferentPartOfModule.ts, 1, 14), Decl(varNameConflictsWithImportInDifferentPartOfModule.ts, 4, 14)) export var s = ''; >s : Symbol(s, Decl(varNameConflictsWithImportInDifferentPartOfModule.ts, 2, 14)) } -module M1 { +namespace M1 { >M1 : Symbol(M1, Decl(varNameConflictsWithImportInDifferentPartOfModule.ts, 0, 0), Decl(varNameConflictsWithImportInDifferentPartOfModule.ts, 3, 1)) export import q = M1.s; // Should be an error but isn't ->q : Symbol(q, Decl(varNameConflictsWithImportInDifferentPartOfModule.ts, 1, 14), Decl(varNameConflictsWithImportInDifferentPartOfModule.ts, 4, 11)) +>q : Symbol(q, Decl(varNameConflictsWithImportInDifferentPartOfModule.ts, 1, 14), Decl(varNameConflictsWithImportInDifferentPartOfModule.ts, 4, 14)) >M1 : Symbol(M1, Decl(varNameConflictsWithImportInDifferentPartOfModule.ts, 0, 0), Decl(varNameConflictsWithImportInDifferentPartOfModule.ts, 3, 1)) >s : Symbol(s, Decl(varNameConflictsWithImportInDifferentPartOfModule.ts, 2, 14)) } diff --git a/tests/baselines/reference/varNameConflictsWithImportInDifferentPartOfModule.types b/tests/baselines/reference/varNameConflictsWithImportInDifferentPartOfModule.types index eeebb368e69b4..6b310667ca7f0 100644 --- a/tests/baselines/reference/varNameConflictsWithImportInDifferentPartOfModule.types +++ b/tests/baselines/reference/varNameConflictsWithImportInDifferentPartOfModule.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/varNameConflictsWithImportInDifferentPartOfModule.ts] //// === varNameConflictsWithImportInDifferentPartOfModule.ts === -module M1 { +namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ @@ -17,7 +17,7 @@ module M1 { >'' : "" > : ^^ } -module M1 { +namespace M1 { >M1 : typeof M1 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/vararg.errors.txt b/tests/baselines/reference/vararg.errors.txt index 5486ca8df10f3..12e2fcb1565aa 100644 --- a/tests/baselines/reference/vararg.errors.txt +++ b/tests/baselines/reference/vararg.errors.txt @@ -9,7 +9,7 @@ vararg.ts(33,17): error TS2345: Argument of type 'C' is not assignable to parame ==== vararg.ts (8 errors) ==== - module M { + namespace M { export class C { public f(x:string,...rest:number[]) { var sum=0; diff --git a/tests/baselines/reference/vararg.js b/tests/baselines/reference/vararg.js index 8de7bd7701c7a..095c5dd56f2e0 100644 --- a/tests/baselines/reference/vararg.js +++ b/tests/baselines/reference/vararg.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/vararg.ts] //// //// [vararg.ts] -module M { +namespace M { export class C { public f(x:string,...rest:number[]) { var sum=0; diff --git a/tests/baselines/reference/vararg.symbols b/tests/baselines/reference/vararg.symbols index e446f3285cbd0..d07fe183b78c8 100644 --- a/tests/baselines/reference/vararg.symbols +++ b/tests/baselines/reference/vararg.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/vararg.ts] //// === vararg.ts === -module M { +namespace M { >M : Symbol(M, Decl(vararg.ts, 0, 0)) export class C { ->C : Symbol(C, Decl(vararg.ts, 0, 10)) +>C : Symbol(C, Decl(vararg.ts, 0, 13)) public f(x:string,...rest:number[]) { >f : Symbol(C.f, Decl(vararg.ts, 1, 20)) @@ -68,9 +68,9 @@ module M { var x=new M.C(); >x : Symbol(x, Decl(vararg.ts, 25, 3)) ->M.C : Symbol(M.C, Decl(vararg.ts, 0, 10)) +>M.C : Symbol(M.C, Decl(vararg.ts, 0, 13)) >M : Symbol(M, Decl(vararg.ts, 0, 0)) ->C : Symbol(M.C, Decl(vararg.ts, 0, 10)) +>C : Symbol(M.C, Decl(vararg.ts, 0, 13)) var result=""; >result : Symbol(result, Decl(vararg.ts, 26, 3)) diff --git a/tests/baselines/reference/vararg.types b/tests/baselines/reference/vararg.types index 1c702db1e0211..ed00d4543355f 100644 --- a/tests/baselines/reference/vararg.types +++ b/tests/baselines/reference/vararg.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/vararg.ts] //// === vararg.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/vardecl.js b/tests/baselines/reference/vardecl.js index 1356ade167d92..bc0a8cb040906 100644 --- a/tests/baselines/reference/vardecl.js +++ b/tests/baselines/reference/vardecl.js @@ -61,7 +61,7 @@ var d4: { }; } -module m2 { +namespace m2 { export var a, b2: number = 10, b; var m1; diff --git a/tests/baselines/reference/vardecl.symbols b/tests/baselines/reference/vardecl.symbols index 6c9fed2bed0f3..60c0d8459db6c 100644 --- a/tests/baselines/reference/vardecl.symbols +++ b/tests/baselines/reference/vardecl.symbols @@ -129,7 +129,7 @@ var d4: { }; } -module m2 { +namespace m2 { >m2 : Symbol(m2, Decl(vardecl.ts, 58, 1)) export var a, b2: number = 10, b; diff --git a/tests/baselines/reference/vardecl.types b/tests/baselines/reference/vardecl.types index e74765d824481..d2a0f444720fb 100644 --- a/tests/baselines/reference/vardecl.types +++ b/tests/baselines/reference/vardecl.types @@ -194,7 +194,7 @@ var d4: { }; } -module m2 { +namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.errors.txt b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.errors.txt index 2211c228ad368..7d953b403c4f3 100644 --- a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.errors.txt +++ b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.errors.txt @@ -4,7 +4,7 @@ variableDeclaratorResolvedDuringContextualTyping.ts(116,43): error TS2304: Canno ==== variableDeclaratorResolvedDuringContextualTyping.ts (3 errors) ==== - module WinJS { + namespace WinJS { export interface ValueCallback { (value: any): any; } @@ -69,7 +69,7 @@ variableDeclaratorResolvedDuringContextualTyping.ts(116,43): error TS2304: Canno } } - module Services { + namespace Services { export interface IRequestService { /** * Returns the URL that can be used to access the provided service. The optional second argument can @@ -87,14 +87,14 @@ variableDeclaratorResolvedDuringContextualTyping.ts(116,43): error TS2304: Canno } } - module Errors { + namespace Errors { export class ConnectionError /* extends Error */ { constructor(request: XMLHttpRequest) { } } } - module Files { + namespace Files { export interface IUploadResult { stat: string; isNew: boolean; diff --git a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js index f6979d1261133..4e8f54de94ec7 100644 --- a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js +++ b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/variableDeclaratorResolvedDuringContextualTyping.ts] //// //// [variableDeclaratorResolvedDuringContextualTyping.ts] -module WinJS { +namespace WinJS { export interface ValueCallback { (value: any): any; } @@ -66,7 +66,7 @@ module WinJS { } } -module Services { +namespace Services { export interface IRequestService { /** * Returns the URL that can be used to access the provided service. The optional second argument can @@ -84,14 +84,14 @@ module Services { } } -module Errors { +namespace Errors { export class ConnectionError /* extends Error */ { constructor(request: XMLHttpRequest) { } } } -module Files { +namespace Files { export interface IUploadResult { stat: string; isNew: boolean; diff --git a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.symbols b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.symbols index 0db118260e82b..1ec22adbb7e14 100644 --- a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.symbols +++ b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/variableDeclaratorResolvedDuringContextualTyping.ts] //// === variableDeclaratorResolvedDuringContextualTyping.ts === -module WinJS { +namespace WinJS { >WinJS : Symbol(WinJS, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 0, 0)) export interface ValueCallback { ->ValueCallback : Symbol(ValueCallback, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 0, 14)) +>ValueCallback : Symbol(ValueCallback, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 0, 17)) (value: any): any; >value : Symbol(value, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 2, 9)) @@ -38,7 +38,7 @@ module WinJS { constructor(init: (complete: ValueCallback, error: ErrorCallback, progress: ProgressCallback) => void, oncancel?: any); >init : Symbol(init, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 18, 20)) >complete : Symbol(complete, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 18, 27)) ->ValueCallback : Symbol(ValueCallback, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 0, 14)) +>ValueCallback : Symbol(ValueCallback, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 0, 17)) >error : Symbol(error, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 18, 51)) >ErrorCallback : Symbol(ErrorCallback, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 7, 5)) >progress : Symbol(progress, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 18, 73)) @@ -92,7 +92,7 @@ module WinJS { public then(success?: ValueCallback, error?: ErrorCallback, progress?: ProgressCallback): Promise; >then : Symbol(Promise.then, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 27, 65)) >success : Symbol(success, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 29, 20)) ->ValueCallback : Symbol(ValueCallback, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 0, 14)) +>ValueCallback : Symbol(ValueCallback, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 0, 17)) >error : Symbol(error, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 29, 44)) >ErrorCallback : Symbol(ErrorCallback, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 7, 5)) >progress : Symbol(progress, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 29, 67)) @@ -102,7 +102,7 @@ module WinJS { public done(success?: ValueCallback, error?: ErrorCallback, progress?: ProgressCallback): void; >done : Symbol(Promise.done, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 29, 106)) >success : Symbol(success, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 30, 20)) ->ValueCallback : Symbol(ValueCallback, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 0, 14)) +>ValueCallback : Symbol(ValueCallback, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 0, 17)) >error : Symbol(error, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 30, 44)) >ErrorCallback : Symbol(ErrorCallback, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 7, 5)) >progress : Symbol(progress, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 30, 67)) @@ -273,11 +273,11 @@ module WinJS { } } -module Services { +namespace Services { >Services : Symbol(Services, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 63, 1)) export interface IRequestService { ->IRequestService : Symbol(IRequestService, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 65, 17)) +>IRequestService : Symbol(IRequestService, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 65, 20)) /** * Returns the URL that can be used to access the provided service. The optional second argument can @@ -309,11 +309,11 @@ module Services { } } -module Errors { +namespace Errors { >Errors : Symbol(Errors, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 81, 1)) export class ConnectionError /* extends Error */ { ->ConnectionError : Symbol(ConnectionError, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 83, 15)) +>ConnectionError : Symbol(ConnectionError, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 83, 18)) constructor(request: XMLHttpRequest) { >request : Symbol(request, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 85, 20)) @@ -322,11 +322,11 @@ module Errors { } } -module Files { +namespace Files { >Files : Symbol(Files, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 88, 1)) export interface IUploadResult { ->IUploadResult : Symbol(IUploadResult, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 90, 14)) +>IUploadResult : Symbol(IUploadResult, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 90, 17)) stat: string; >stat : Symbol(IUploadResult.stat, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 91, 36)) @@ -356,14 +356,14 @@ class FileService { private requestService: Services.IRequestService; >requestService : Symbol(FileService.requestService, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 104, 19)) >Services : Symbol(Services, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 63, 1)) ->IRequestService : Symbol(Services.IRequestService, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 65, 17)) +>IRequestService : Symbol(Services.IRequestService, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 65, 20)) public uploadData(): WinJS.TPromise { >uploadData : Symbol(FileService.uploadData, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 105, 53)) >WinJS : Symbol(WinJS, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 0, 0)) >TPromise : Symbol(WinJS.TPromise, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 32, 5)) >Files : Symbol(Files, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 88, 1)) ->IUploadResult : Symbol(Files.IUploadResult, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 90, 14)) +>IUploadResult : Symbol(Files.IUploadResult, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 90, 17)) var path = ""; >path : Symbol(path, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 107, 11)) @@ -422,7 +422,7 @@ class FileService { >TPromise : Symbol(WinJS.TPromise, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 32, 5)) >as : Symbol(WinJS.TPromise.as, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 44, 30)) >Files : Symbol(Files, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 88, 1)) ->IUploadResult : Symbol(Files.IUploadResult, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 90, 14)) +>IUploadResult : Symbol(Files.IUploadResult, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 90, 17)) >result : Symbol(result, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 114, 19)) }, (xhr: XMLHttpRequest) => { @@ -435,9 +435,9 @@ class FileService { >WinJS : Symbol(WinJS, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 0, 0)) >Promise : Symbol(WinJS.Promise, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 15, 5)) >wrapError : Symbol(WinJS.Promise.wrapError, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 24, 47)) ->Errors.ConnectionError : Symbol(Errors.ConnectionError, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 83, 15)) +>Errors.ConnectionError : Symbol(Errors.ConnectionError, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 83, 18)) >Errors : Symbol(Errors, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 81, 1)) ->ConnectionError : Symbol(Errors.ConnectionError, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 83, 15)) +>ConnectionError : Symbol(Errors.ConnectionError, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 83, 18)) >xhr : Symbol(xhr, Decl(variableDeclaratorResolvedDuringContextualTyping.ts, 120, 16)) }); diff --git a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.types b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.types index 979aeb580871f..1ecdab62e47e4 100644 --- a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.types +++ b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/variableDeclaratorResolvedDuringContextualTyping.ts] //// === variableDeclaratorResolvedDuringContextualTyping.ts === -module WinJS { +namespace WinJS { >WinJS : typeof WinJS > : ^^^^^^^^^^^^ @@ -284,7 +284,7 @@ module WinJS { } } -module Services { +namespace Services { export interface IRequestService { /** * Returns the URL that can be used to access the provided service. The optional second argument can @@ -325,7 +325,7 @@ module Services { } } -module Errors { +namespace Errors { >Errors : typeof Errors > : ^^^^^^^^^^^^^ @@ -340,7 +340,7 @@ module Errors { } } -module Files { +namespace Files { export interface IUploadResult { stat: string; >stat : string diff --git a/tests/baselines/reference/visSyntax.js b/tests/baselines/reference/visSyntax.js index 6d3d31d6dd840..a6d50fa744dad 100644 --- a/tests/baselines/reference/visSyntax.js +++ b/tests/baselines/reference/visSyntax.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/visSyntax.ts] //// //// [visSyntax.ts] -module M { +namespace M { export class C { } diff --git a/tests/baselines/reference/visSyntax.symbols b/tests/baselines/reference/visSyntax.symbols index 7de5e42037b5d..3ee75c51248b5 100644 --- a/tests/baselines/reference/visSyntax.symbols +++ b/tests/baselines/reference/visSyntax.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/visSyntax.ts] //// === visSyntax.ts === -module M { +namespace M { >M : Symbol(M, Decl(visSyntax.ts, 0, 0)) export class C { ->C : Symbol(C, Decl(visSyntax.ts, 0, 10)) +>C : Symbol(C, Decl(visSyntax.ts, 0, 13)) } export interface I { diff --git a/tests/baselines/reference/visSyntax.types b/tests/baselines/reference/visSyntax.types index a4e22c2b846a4..348f48c8b68de 100644 --- a/tests/baselines/reference/visSyntax.types +++ b/tests/baselines/reference/visSyntax.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/visSyntax.ts] //// === visSyntax.ts === -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/voidOperatorWithAnyOtherType.errors.txt b/tests/baselines/reference/voidOperatorWithAnyOtherType.errors.txt index 93c05ff427a3d..1dd68ac5d8482 100644 --- a/tests/baselines/reference/voidOperatorWithAnyOtherType.errors.txt +++ b/tests/baselines/reference/voidOperatorWithAnyOtherType.errors.txt @@ -23,7 +23,7 @@ voidOperatorWithAnyOtherType.ts(48,27): error TS2365: Operator '+' cannot be app return a; } } - module M { + namespace M { export var n: any; } var objA = new A(); diff --git a/tests/baselines/reference/voidOperatorWithAnyOtherType.js b/tests/baselines/reference/voidOperatorWithAnyOtherType.js index e3e2783cfc035..3774fac744ba6 100644 --- a/tests/baselines/reference/voidOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/voidOperatorWithAnyOtherType.js @@ -20,7 +20,7 @@ class A { return a; } } -module M { +namespace M { export var n: any; } var objA = new A(); diff --git a/tests/baselines/reference/voidOperatorWithAnyOtherType.symbols b/tests/baselines/reference/voidOperatorWithAnyOtherType.symbols index 64e8ef264880f..68042164ef765 100644 --- a/tests/baselines/reference/voidOperatorWithAnyOtherType.symbols +++ b/tests/baselines/reference/voidOperatorWithAnyOtherType.symbols @@ -45,7 +45,7 @@ class A { >a : Symbol(a, Decl(voidOperatorWithAnyOtherType.ts, 15, 11)) } } -module M { +namespace M { >M : Symbol(M, Decl(voidOperatorWithAnyOtherType.ts, 18, 1)) export var n: any; diff --git a/tests/baselines/reference/voidOperatorWithAnyOtherType.types b/tests/baselines/reference/voidOperatorWithAnyOtherType.types index 93cc0dfcb64ae..5b75774fe997a 100644 --- a/tests/baselines/reference/voidOperatorWithAnyOtherType.types +++ b/tests/baselines/reference/voidOperatorWithAnyOtherType.types @@ -72,7 +72,7 @@ class A { > : ^^^ } } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/voidOperatorWithBooleanType.js b/tests/baselines/reference/voidOperatorWithBooleanType.js index 225a8dc862a4f..3d5868877e493 100644 --- a/tests/baselines/reference/voidOperatorWithBooleanType.js +++ b/tests/baselines/reference/voidOperatorWithBooleanType.js @@ -10,7 +10,7 @@ class A { public a: boolean; static foo() { return false; } } -module M { +namespace M { export var n: boolean; } diff --git a/tests/baselines/reference/voidOperatorWithBooleanType.symbols b/tests/baselines/reference/voidOperatorWithBooleanType.symbols index 0bf4a95f71370..69d86cb0a9b67 100644 --- a/tests/baselines/reference/voidOperatorWithBooleanType.symbols +++ b/tests/baselines/reference/voidOperatorWithBooleanType.symbols @@ -17,7 +17,7 @@ class A { static foo() { return false; } >foo : Symbol(A.foo, Decl(voidOperatorWithBooleanType.ts, 6, 22)) } -module M { +namespace M { >M : Symbol(M, Decl(voidOperatorWithBooleanType.ts, 8, 1)) export var n: boolean; diff --git a/tests/baselines/reference/voidOperatorWithBooleanType.types b/tests/baselines/reference/voidOperatorWithBooleanType.types index 1dd4655d20984..b45574f764873 100644 --- a/tests/baselines/reference/voidOperatorWithBooleanType.types +++ b/tests/baselines/reference/voidOperatorWithBooleanType.types @@ -26,7 +26,7 @@ class A { >false : false > : ^^^^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/voidOperatorWithNumberType.js b/tests/baselines/reference/voidOperatorWithNumberType.js index 30d9992fdaf16..fe4d8e9ce28eb 100644 --- a/tests/baselines/reference/voidOperatorWithNumberType.js +++ b/tests/baselines/reference/voidOperatorWithNumberType.js @@ -11,7 +11,7 @@ class A { public a: number; static foo() { return 1; } } -module M { +namespace M { export var n: number; } diff --git a/tests/baselines/reference/voidOperatorWithNumberType.symbols b/tests/baselines/reference/voidOperatorWithNumberType.symbols index 72ed7a2f81e99..034476030be42 100644 --- a/tests/baselines/reference/voidOperatorWithNumberType.symbols +++ b/tests/baselines/reference/voidOperatorWithNumberType.symbols @@ -20,7 +20,7 @@ class A { static foo() { return 1; } >foo : Symbol(A.foo, Decl(voidOperatorWithNumberType.ts, 7, 21)) } -module M { +namespace M { >M : Symbol(M, Decl(voidOperatorWithNumberType.ts, 9, 1)) export var n: number; diff --git a/tests/baselines/reference/voidOperatorWithNumberType.types b/tests/baselines/reference/voidOperatorWithNumberType.types index 20fde2f006984..808e818670351 100644 --- a/tests/baselines/reference/voidOperatorWithNumberType.types +++ b/tests/baselines/reference/voidOperatorWithNumberType.types @@ -36,7 +36,7 @@ class A { >1 : 1 > : ^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/voidOperatorWithStringType.js b/tests/baselines/reference/voidOperatorWithStringType.js index 826f71a9404bf..8415529944a9a 100644 --- a/tests/baselines/reference/voidOperatorWithStringType.js +++ b/tests/baselines/reference/voidOperatorWithStringType.js @@ -11,7 +11,7 @@ class A { public a: string; static foo() { return ""; } } -module M { +namespace M { export var n: string; } diff --git a/tests/baselines/reference/voidOperatorWithStringType.symbols b/tests/baselines/reference/voidOperatorWithStringType.symbols index 01ff4a5c0cb09..1870f52089620 100644 --- a/tests/baselines/reference/voidOperatorWithStringType.symbols +++ b/tests/baselines/reference/voidOperatorWithStringType.symbols @@ -20,7 +20,7 @@ class A { static foo() { return ""; } >foo : Symbol(A.foo, Decl(voidOperatorWithStringType.ts, 7, 21)) } -module M { +namespace M { >M : Symbol(M, Decl(voidOperatorWithStringType.ts, 9, 1)) export var n: string; diff --git a/tests/baselines/reference/voidOperatorWithStringType.types b/tests/baselines/reference/voidOperatorWithStringType.types index cedab63d9e631..61d8c4dbb9914 100644 --- a/tests/baselines/reference/voidOperatorWithStringType.types +++ b/tests/baselines/reference/voidOperatorWithStringType.types @@ -36,7 +36,7 @@ class A { >"" : "" > : ^^ } -module M { +namespace M { >M : typeof M > : ^^^^^^^^ diff --git a/tests/baselines/reference/withExportDecl.js b/tests/baselines/reference/withExportDecl.js index 1d0b65091b9ad..300c71950cbb1 100644 --- a/tests/baselines/reference/withExportDecl.js +++ b/tests/baselines/reference/withExportDecl.js @@ -38,18 +38,18 @@ export function exportedFunction() { return simpleFunction(); } -module m1 { +namespace m1 { export function foo() { return "Hello"; } } -export declare module m2 { +export declare namespace m2 { export var a: number; } -export module m3 { +export namespace m3 { export function foo() { return m1.foo(); diff --git a/tests/baselines/reference/withExportDecl.symbols b/tests/baselines/reference/withExportDecl.symbols index c5070c8d1d84d..52d799ce3f784 100644 --- a/tests/baselines/reference/withExportDecl.symbols +++ b/tests/baselines/reference/withExportDecl.symbols @@ -87,16 +87,16 @@ export function exportedFunction() { >simpleFunction : Symbol(simpleFunction, Decl(withExportDecl.ts, 23, 52)) } -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(withExportDecl.ts, 35, 1)) export function foo() { ->foo : Symbol(foo, Decl(withExportDecl.ts, 37, 11)) +>foo : Symbol(foo, Decl(withExportDecl.ts, 37, 14)) return "Hello"; } } -export declare module m2 { +export declare namespace m2 { >m2 : Symbol(m2, Decl(withExportDecl.ts, 41, 1)) export var a: number; @@ -104,16 +104,16 @@ export declare module m2 { } -export module m3 { +export namespace m3 { >m3 : Symbol(m3, Decl(withExportDecl.ts, 45, 1)) export function foo() { ->foo : Symbol(foo, Decl(withExportDecl.ts, 48, 18)) +>foo : Symbol(foo, Decl(withExportDecl.ts, 48, 21)) return m1.foo(); ->m1.foo : Symbol(m1.foo, Decl(withExportDecl.ts, 37, 11)) +>m1.foo : Symbol(m1.foo, Decl(withExportDecl.ts, 37, 14)) >m1 : Symbol(m1, Decl(withExportDecl.ts, 35, 1)) ->foo : Symbol(m1.foo, Decl(withExportDecl.ts, 37, 11)) +>foo : Symbol(m1.foo, Decl(withExportDecl.ts, 37, 14)) } } diff --git a/tests/baselines/reference/withExportDecl.types b/tests/baselines/reference/withExportDecl.types index 1d45b9b0fc6f7..124a9fe99303c 100644 --- a/tests/baselines/reference/withExportDecl.types +++ b/tests/baselines/reference/withExportDecl.types @@ -161,7 +161,7 @@ export function exportedFunction() { > : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ } -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ @@ -174,7 +174,7 @@ module m1 { > : ^^^^^^^ } } -export declare module m2 { +export declare namespace m2 { >m2 : typeof m2 > : ^^^^^^^^^ @@ -184,7 +184,7 @@ export declare module m2 { } -export module m3 { +export namespace m3 { >m3 : typeof m3 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/withImportDecl.js b/tests/baselines/reference/withImportDecl.js index f789c998776e0..1abf88f8549b4 100644 --- a/tests/baselines/reference/withImportDecl.js +++ b/tests/baselines/reference/withImportDecl.js @@ -32,7 +32,7 @@ function simpleFunction() { }; } -module m1 { +namespace m1 { export function foo() { return "Hello"; } diff --git a/tests/baselines/reference/withImportDecl.symbols b/tests/baselines/reference/withImportDecl.symbols index b41dac33a8023..fc2ebdff32c10 100644 --- a/tests/baselines/reference/withImportDecl.symbols +++ b/tests/baselines/reference/withImportDecl.symbols @@ -55,11 +55,11 @@ function simpleFunction() { }; } -module m1 { +namespace m1 { >m1 : Symbol(m1, Decl(withImportDecl_1.ts, 26, 1)) export function foo() { ->foo : Symbol(foo, Decl(withImportDecl_1.ts, 28, 11)) +>foo : Symbol(foo, Decl(withImportDecl_1.ts, 28, 14)) return "Hello"; } diff --git a/tests/baselines/reference/withImportDecl.types b/tests/baselines/reference/withImportDecl.types index 7fc757fb6324f..f309e6c1297d1 100644 --- a/tests/baselines/reference/withImportDecl.types +++ b/tests/baselines/reference/withImportDecl.types @@ -93,7 +93,7 @@ function simpleFunction() { }; } -module m1 { +namespace m1 { >m1 : typeof m1 > : ^^^^^^^^^ diff --git a/tests/baselines/reference/withStatementErrors.errors.txt b/tests/baselines/reference/withStatementErrors.errors.txt index a4d59eb6f7b1d..082bc9f28fc2c 100644 --- a/tests/baselines/reference/withStatementErrors.errors.txt +++ b/tests/baselines/reference/withStatementErrors.errors.txt @@ -18,7 +18,7 @@ withStatementErrors.ts(3,1): error TS2410: The 'with' statement is not supported interface I {} // error - module M {} // error + namespace M {} // error } \ No newline at end of file diff --git a/tests/baselines/reference/withStatementErrors.js b/tests/baselines/reference/withStatementErrors.js index 12f8a0b9c5d77..f831d06285a21 100644 --- a/tests/baselines/reference/withStatementErrors.js +++ b/tests/baselines/reference/withStatementErrors.js @@ -15,7 +15,7 @@ with (ooo.eee.oo.ah_ah.ting.tang.walla.walla) { // error interface I {} // error - module M {} // error + namespace M {} // error } diff --git a/tests/baselines/reference/withStatementErrors.symbols b/tests/baselines/reference/withStatementErrors.symbols index dbf728414909b..909515d306820 100644 --- a/tests/baselines/reference/withStatementErrors.symbols +++ b/tests/baselines/reference/withStatementErrors.symbols @@ -18,7 +18,7 @@ with (ooo.eee.oo.ah_ah.ting.tang.walla.walla) { // error interface I {} // error - module M {} // error + namespace M {} // error } diff --git a/tests/baselines/reference/withStatementErrors.types b/tests/baselines/reference/withStatementErrors.types index 183237ce452a3..bb51e9e8fa410 100644 --- a/tests/baselines/reference/withStatementErrors.types +++ b/tests/baselines/reference/withStatementErrors.types @@ -69,7 +69,7 @@ with (ooo.eee.oo.ah_ah.ting.tang.walla.walla) { // error interface I {} // error - module M {} // error + namespace M {} // error } diff --git a/tests/baselines/reference/witness.errors.txt b/tests/baselines/reference/witness.errors.txt index 603db90af980e..f5883461341cf 100644 --- a/tests/baselines/reference/witness.errors.txt +++ b/tests/baselines/reference/witness.errors.txt @@ -182,7 +182,7 @@ witness.ts(128,19): error TS2729: Property 'q' is used before its initialization !!! related TS6203 witness.ts:107:5: 'propAcc1' was also declared here. // Property access of module member - module M2 { + namespace M2 { export var x = M2.x; var y = x; var y: any; diff --git a/tests/baselines/reference/witness.js b/tests/baselines/reference/witness.js index 5abdfe45ff6e9..17e054e1a3e9c 100644 --- a/tests/baselines/reference/witness.js +++ b/tests/baselines/reference/witness.js @@ -113,7 +113,7 @@ var propAcc1 = { var propAcc1: { m: any; } // Property access of module member -module M2 { +namespace M2 { export var x = M2.x; var y = x; var y: any; diff --git a/tests/baselines/reference/witness.symbols b/tests/baselines/reference/witness.symbols index d097a6158e04e..63431a726d27e 100644 --- a/tests/baselines/reference/witness.symbols +++ b/tests/baselines/reference/witness.symbols @@ -293,7 +293,7 @@ var propAcc1: { m: any; } >m : Symbol(m, Decl(witness.ts, 109, 15)) // Property access of module member -module M2 { +namespace M2 { >M2 : Symbol(M2, Decl(witness.ts, 109, 25)) export var x = M2.x; diff --git a/tests/baselines/reference/witness.types b/tests/baselines/reference/witness.types index d5fc24e1d6867..1581d05441c9a 100644 --- a/tests/baselines/reference/witness.types +++ b/tests/baselines/reference/witness.types @@ -541,7 +541,7 @@ var propAcc1: { m: any; } > : ^^^ // Property access of module member -module M2 { +namespace M2 { >M2 : typeof M2 > : ^^^^^^^^^ diff --git a/tests/cases/compiler/FunctionDeclaration7.ts b/tests/cases/compiler/FunctionDeclaration7.ts index 4a47c5e6736d1..3684110c82ca0 100644 --- a/tests/cases/compiler/FunctionDeclaration7.ts +++ b/tests/cases/compiler/FunctionDeclaration7.ts @@ -1,3 +1,3 @@ -module M { +namespace M { function foo(); } \ No newline at end of file diff --git a/tests/cases/compiler/acceptableAlias1.ts b/tests/cases/compiler/acceptableAlias1.ts index e954fd8d4fe62..c98c1111c07e8 100644 --- a/tests/cases/compiler/acceptableAlias1.ts +++ b/tests/cases/compiler/acceptableAlias1.ts @@ -1,5 +1,5 @@ -module M { - export module N { +namespace M { + export namespace N { } export import X = N; } diff --git a/tests/cases/compiler/accessorsInAmbientContext.ts b/tests/cases/compiler/accessorsInAmbientContext.ts index 2596097da1e06..9d9edd41958df 100644 --- a/tests/cases/compiler/accessorsInAmbientContext.ts +++ b/tests/cases/compiler/accessorsInAmbientContext.ts @@ -1,6 +1,6 @@ // @target: es5 -declare module M { +declare namespace M { class C { get X() { return 1; } set X(v) { } diff --git a/tests/cases/compiler/aliasBug.ts b/tests/cases/compiler/aliasBug.ts index 44de6c796c215..a5fcb700417a6 100644 --- a/tests/cases/compiler/aliasBug.ts +++ b/tests/cases/compiler/aliasBug.ts @@ -1,20 +1,20 @@ -// @module: commonjs - -module foo { - export class Provide { - } - - export module bar { export module baz {export class boo {}}} -} - -import provide = foo; -import booz = foo.bar.baz; - -var p = new provide.Provide(); - -function use() { - var p1: provide.Provide; // error here, but should be okay - var p2: foo.Provide; - var p3:booz.bar; - var p22 = new provide.Provide(); -} +// @module: commonjs + +namespace foo { + export class Provide { + } + + export namespace bar { export namespace baz {export class boo {}}} +} + +import provide = foo; +import booz = foo.bar.baz; + +var p = new provide.Provide(); + +function use() { + var p1: provide.Provide; // error here, but should be okay + var p2: foo.Provide; + var p3:booz.bar; + var p22 = new provide.Provide(); +} diff --git a/tests/cases/compiler/aliasErrors.ts b/tests/cases/compiler/aliasErrors.ts index f9259c32ca5a5..bfc91010b6b53 100644 --- a/tests/cases/compiler/aliasErrors.ts +++ b/tests/cases/compiler/aliasErrors.ts @@ -1,29 +1,29 @@ -module foo { - export class Provide { - } - export module bar { export module baz {export class boo {}}} -} - -import provide = foo; -import booz = foo.bar.baz; -import beez = foo.bar; - -import m = no; -import m2 = no.mod; -import n = 5; -import o = "s"; -import q = null; -import r = undefined; - - -var p = new provide.Provide(); - -function use() { - - beez.baz.boo; - var p1: provide.Provide; - var p2: foo.Provide; - var p3:booz.bar; - var p22 = new provide.Provide(); -} - +namespace foo { + export class Provide { + } + export namespace bar { export namespace baz {export class boo {}}} +} + +import provide = foo; +import booz = foo.bar.baz; +import beez = foo.bar; + +import m = no; +import m2 = no.mod; +import n = 5; +import o = "s"; +import q = null; +import r = undefined; + + +var p = new provide.Provide(); + +function use() { + + beez.baz.boo; + var p1: provide.Provide; + var p2: foo.Provide; + var p3:booz.bar; + var p22 = new provide.Provide(); +} + diff --git a/tests/cases/compiler/aliasInaccessibleModule.ts b/tests/cases/compiler/aliasInaccessibleModule.ts index 91f36d9d11883..4093bafadd7a9 100644 --- a/tests/cases/compiler/aliasInaccessibleModule.ts +++ b/tests/cases/compiler/aliasInaccessibleModule.ts @@ -1,6 +1,6 @@ // @declaration: true -module M { - module N { +namespace M { + namespace N { } export import X = N; } \ No newline at end of file diff --git a/tests/cases/compiler/aliasInaccessibleModule2.ts b/tests/cases/compiler/aliasInaccessibleModule2.ts index d970db79538a4..d6dcd2056e01b 100644 --- a/tests/cases/compiler/aliasInaccessibleModule2.ts +++ b/tests/cases/compiler/aliasInaccessibleModule2.ts @@ -1,6 +1,6 @@ // @declaration: true -module M { - module N { +namespace M { + namespace N { class C { } diff --git a/tests/cases/compiler/aliasOnMergedModuleInterface.ts b/tests/cases/compiler/aliasOnMergedModuleInterface.ts index dd1f707e092b9..bfa1835641447 100644 --- a/tests/cases/compiler/aliasOnMergedModuleInterface.ts +++ b/tests/cases/compiler/aliasOnMergedModuleInterface.ts @@ -2,7 +2,7 @@ // @Filename: aliasOnMergedModuleInterface_0.ts declare module "foo" { - module B { + namespace B { export interface A { } } diff --git a/tests/cases/compiler/aliasesInSystemModule1.ts b/tests/cases/compiler/aliasesInSystemModule1.ts index 33d205e5a0737..b6cffde048092 100644 --- a/tests/cases/compiler/aliasesInSystemModule1.ts +++ b/tests/cases/compiler/aliasesInSystemModule1.ts @@ -9,7 +9,7 @@ let x = new alias.Class(); let y = new cls(); let z = new cls2(); -module M { +namespace M { export import cls = alias.Class; let x = new alias.Class(); let y = new cls(); diff --git a/tests/cases/compiler/aliasesInSystemModule2.ts b/tests/cases/compiler/aliasesInSystemModule2.ts index 3daa7e5a7bdd1..a5791451be285 100644 --- a/tests/cases/compiler/aliasesInSystemModule2.ts +++ b/tests/cases/compiler/aliasesInSystemModule2.ts @@ -9,7 +9,7 @@ let x = new alias.Class(); let y = new cls(); let z = new cls2(); -module M { +namespace M { export import cls = alias.Class; let x = new alias.Class(); let y = new cls(); diff --git a/tests/cases/compiler/alwaysStrictModule.ts b/tests/cases/compiler/alwaysStrictModule.ts index b706f5869a6d3..7843c5e1e0508 100644 --- a/tests/cases/compiler/alwaysStrictModule.ts +++ b/tests/cases/compiler/alwaysStrictModule.ts @@ -1,7 +1,7 @@ // @module: commonjs // @alwaysStrict: true -module M { +namespace M { export function f() { var arguments = []; } diff --git a/tests/cases/compiler/alwaysStrictModule2.ts b/tests/cases/compiler/alwaysStrictModule2.ts index 6afecb0e77013..86eb81b990e51 100644 --- a/tests/cases/compiler/alwaysStrictModule2.ts +++ b/tests/cases/compiler/alwaysStrictModule2.ts @@ -2,14 +2,14 @@ // @outFile: out.js // @fileName: a.ts -module M { +namespace M { export function f() { var arguments = []; } } // @fileName: b.ts -module M { +namespace M { export function f2() { var arguments = []; } diff --git a/tests/cases/compiler/alwaysStrictNoImplicitUseStrict.ts b/tests/cases/compiler/alwaysStrictNoImplicitUseStrict.ts index d3173df8ab50c..8d8696b5d29de 100644 --- a/tests/cases/compiler/alwaysStrictNoImplicitUseStrict.ts +++ b/tests/cases/compiler/alwaysStrictNoImplicitUseStrict.ts @@ -2,7 +2,7 @@ // @alwaysStrict: true // @noImplicitUseStrict: true -module M { +namespace M { export function f() { var arguments = []; } diff --git a/tests/cases/compiler/ambientEnumElementInitializer6.ts b/tests/cases/compiler/ambientEnumElementInitializer6.ts index 09e6f1759d17a..daa4b039205c5 100644 --- a/tests/cases/compiler/ambientEnumElementInitializer6.ts +++ b/tests/cases/compiler/ambientEnumElementInitializer6.ts @@ -1,4 +1,4 @@ -declare module M { +declare namespace M { enum E { e = 3 } diff --git a/tests/cases/compiler/ambientExternalModuleWithInternalImportDeclaration.ts b/tests/cases/compiler/ambientExternalModuleWithInternalImportDeclaration.ts index 39a0cb96977f7..a9278c3b813f0 100644 --- a/tests/cases/compiler/ambientExternalModuleWithInternalImportDeclaration.ts +++ b/tests/cases/compiler/ambientExternalModuleWithInternalImportDeclaration.ts @@ -1,7 +1,7 @@ //@module: amd // @Filename: ambientExternalModuleWithInternalImportDeclaration_0.ts declare module 'M' { - module C { + namespace C { export var f: number; } class C { diff --git a/tests/cases/compiler/ambientExternalModuleWithoutInternalImportDeclaration.ts b/tests/cases/compiler/ambientExternalModuleWithoutInternalImportDeclaration.ts index 2738eea536ea6..c4b764a411b43 100644 --- a/tests/cases/compiler/ambientExternalModuleWithoutInternalImportDeclaration.ts +++ b/tests/cases/compiler/ambientExternalModuleWithoutInternalImportDeclaration.ts @@ -1,7 +1,7 @@ //@module: amd // @Filename: ambientExternalModuleWithoutInternalImportDeclaration_0.ts declare module 'M' { - module C { + namespace C { export var f: number; } class C { diff --git a/tests/cases/compiler/ambientFundule.ts b/tests/cases/compiler/ambientFundule.ts index 56c21d34292e6..772ae088eb1c0 100644 --- a/tests/cases/compiler/ambientFundule.ts +++ b/tests/cases/compiler/ambientFundule.ts @@ -1,3 +1,3 @@ declare function f(); -declare module f { var x } +declare namespace f { var x } declare function f(x); \ No newline at end of file diff --git a/tests/cases/compiler/ambientModuleExports.ts b/tests/cases/compiler/ambientModuleExports.ts index cc0b396834867..fe37cf93305fb 100644 --- a/tests/cases/compiler/ambientModuleExports.ts +++ b/tests/cases/compiler/ambientModuleExports.ts @@ -1,4 +1,4 @@ -declare module Foo { +declare namespace Foo { function a():void; var b:number; class C {} @@ -8,7 +8,7 @@ Foo.a(); Foo.b; var c = new Foo.C(); -declare module Foo2 { +declare namespace Foo2 { export function a(): void; export var b: number; export class C { } diff --git a/tests/cases/compiler/ambientModuleWithClassDeclarationWithExtends.ts b/tests/cases/compiler/ambientModuleWithClassDeclarationWithExtends.ts index d34f29b0ad6e5..66afd8c29ce1e 100644 --- a/tests/cases/compiler/ambientModuleWithClassDeclarationWithExtends.ts +++ b/tests/cases/compiler/ambientModuleWithClassDeclarationWithExtends.ts @@ -1,4 +1,4 @@ -declare module foo { +declare namespace foo { class A { } class B extends A { } } \ No newline at end of file diff --git a/tests/cases/compiler/ambientModuleWithTemplateLiterals.ts b/tests/cases/compiler/ambientModuleWithTemplateLiterals.ts index 74c1b29e52dce..ed2ce6c3c9e3b 100644 --- a/tests/cases/compiler/ambientModuleWithTemplateLiterals.ts +++ b/tests/cases/compiler/ambientModuleWithTemplateLiterals.ts @@ -1,4 +1,4 @@ -declare module Foo { +declare namespace Foo { enum Bar { a = `1`, b = '2', diff --git a/tests/cases/compiler/ambientStatement1.ts b/tests/cases/compiler/ambientStatement1.ts index b2d1bb9d49939..faf98c2dd675c 100644 --- a/tests/cases/compiler/ambientStatement1.ts +++ b/tests/cases/compiler/ambientStatement1.ts @@ -1,4 +1,4 @@ - declare module M1 { + declare namespace M1 { while(true); export var v1 = () => false; diff --git a/tests/cases/compiler/ambientWithStatements.ts b/tests/cases/compiler/ambientWithStatements.ts index 297776fafa617..d4dcc3a5b7d67 100644 --- a/tests/cases/compiler/ambientWithStatements.ts +++ b/tests/cases/compiler/ambientWithStatements.ts @@ -1,4 +1,4 @@ -declare module M { +declare namespace M { break; continue; debugger; diff --git a/tests/cases/compiler/anonterface.ts b/tests/cases/compiler/anonterface.ts index f8c0727d81370..175b562421054 100644 --- a/tests/cases/compiler/anonterface.ts +++ b/tests/cases/compiler/anonterface.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export class C { m(fn:{ (n:number):string; },n2:number):string { return fn(n2); diff --git a/tests/cases/compiler/anyDeclare.ts b/tests/cases/compiler/anyDeclare.ts index 5c3146ac798ce..bf125cec290c3 100644 --- a/tests/cases/compiler/anyDeclare.ts +++ b/tests/cases/compiler/anyDeclare.ts @@ -1,5 +1,5 @@ declare var x: any; -module myMod { +namespace myMod { var myFn; function myFn() { } } diff --git a/tests/cases/compiler/arrayAssignmentTest5.ts b/tests/cases/compiler/arrayAssignmentTest5.ts index 4309839875ff6..1310c20f16f29 100644 --- a/tests/cases/compiler/arrayAssignmentTest5.ts +++ b/tests/cases/compiler/arrayAssignmentTest5.ts @@ -1,4 +1,4 @@ -module Test { +namespace Test { interface IState { } interface IToken { diff --git a/tests/cases/compiler/arrayAssignmentTest6.ts b/tests/cases/compiler/arrayAssignmentTest6.ts index c459faa1cf823..8d2edd1758307 100644 --- a/tests/cases/compiler/arrayAssignmentTest6.ts +++ b/tests/cases/compiler/arrayAssignmentTest6.ts @@ -1,4 +1,4 @@ -module Test { +namespace Test { interface IState { } interface IToken { diff --git a/tests/cases/compiler/arrayBestCommonTypes.ts b/tests/cases/compiler/arrayBestCommonTypes.ts index c7466b5181e92..f94d4f0c48467 100644 --- a/tests/cases/compiler/arrayBestCommonTypes.ts +++ b/tests/cases/compiler/arrayBestCommonTypes.ts @@ -1,4 +1,4 @@ -module EmptyTypes { +namespace EmptyTypes { interface iface { } class base implements iface { } class base2 implements iface { } @@ -51,7 +51,7 @@ } } -module NonEmptyTypes { +namespace NonEmptyTypes { interface iface { x: string; } class base implements iface { x: string; y: string; } class base2 implements iface { x: string; z: string; } diff --git a/tests/cases/compiler/arraySigChecking.ts b/tests/cases/compiler/arraySigChecking.ts index a9536084de23c..191f13f5afb82 100644 --- a/tests/cases/compiler/arraySigChecking.ts +++ b/tests/cases/compiler/arraySigChecking.ts @@ -1,4 +1,4 @@ -declare module M { +declare namespace M { interface iBar { t: any; } interface iFoo extends iBar { s: any; diff --git a/tests/cases/compiler/arrayTypeInSignatureOfInterfaceAndClass.ts b/tests/cases/compiler/arrayTypeInSignatureOfInterfaceAndClass.ts index 8a92aaa34b43c..3f188884b8d51 100644 --- a/tests/cases/compiler/arrayTypeInSignatureOfInterfaceAndClass.ts +++ b/tests/cases/compiler/arrayTypeInSignatureOfInterfaceAndClass.ts @@ -1,9 +1,9 @@ -declare module WinJS { +declare namespace WinJS { class Promise { then(success?: (value: T) => Promise, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; } } -declare module Data { +declare namespace Data { export interface IListItem { itemIndex: number; key: any; diff --git a/tests/cases/compiler/arrowFunctionInExpressionStatement2.ts b/tests/cases/compiler/arrowFunctionInExpressionStatement2.ts index 997fcaa9578f3..5cf8dfb3c0973 100644 --- a/tests/cases/compiler/arrowFunctionInExpressionStatement2.ts +++ b/tests/cases/compiler/arrowFunctionInExpressionStatement2.ts @@ -1,3 +1,3 @@ -module M { +namespace M { () => 0; } \ No newline at end of file diff --git a/tests/cases/compiler/arrowFunctionsMissingTokens.ts b/tests/cases/compiler/arrowFunctionsMissingTokens.ts index bd3e25d56b4a7..13b17343c672c 100644 --- a/tests/cases/compiler/arrowFunctionsMissingTokens.ts +++ b/tests/cases/compiler/arrowFunctionsMissingTokens.ts @@ -1,5 +1,5 @@ -module missingArrowsWithCurly { +namespace missingArrowsWithCurly { var a = () { }; var b = (): void { } @@ -11,8 +11,8 @@ module missingArrowsWithCurly { var e = (x: number, y: string): void { }; } -module missingCurliesWithArrow { - module withStatement { +namespace missingCurliesWithArrow { + namespace withStatement { var a = () => var k = 10;}; var b = (): void => var k = 10;} @@ -26,7 +26,7 @@ module missingCurliesWithArrow { var f = () => var k = 10;} } - module withoutStatement { + namespace withoutStatement { var a = () => }; var b = (): void => } @@ -41,7 +41,7 @@ module missingCurliesWithArrow { } } -module ce_nEst_pas_une_arrow_function { +namespace ce_nEst_pas_une_arrow_function { var a = (); var b = (): void; @@ -53,7 +53,7 @@ module ce_nEst_pas_une_arrow_function { var e = (x: number, y: string): void; } -module okay { +namespace okay { var a = () => { }; var b = (): void => { } diff --git a/tests/cases/compiler/assign1.ts b/tests/cases/compiler/assign1.ts index 78f03f25aa227..fd7171bbf4f63 100644 --- a/tests/cases/compiler/assign1.ts +++ b/tests/cases/compiler/assign1.ts @@ -1,4 +1,4 @@ -module M { +namespace M { interface I { salt:number; pepper:number; diff --git a/tests/cases/compiler/assignToExistingClass.ts b/tests/cases/compiler/assignToExistingClass.ts index fb15526134993..737ea21fb4036 100644 --- a/tests/cases/compiler/assignToExistingClass.ts +++ b/tests/cases/compiler/assignToExistingClass.ts @@ -1,4 +1,4 @@ -module Test { +namespace Test { class Mocked { myProp: string; } diff --git a/tests/cases/compiler/assignToFn.ts b/tests/cases/compiler/assignToFn.ts index 5163fc1360de6..fca62272854be 100644 --- a/tests/cases/compiler/assignToFn.ts +++ b/tests/cases/compiler/assignToFn.ts @@ -1,4 +1,4 @@ -module M { +namespace M { interface I { f(n:number):boolean; } diff --git a/tests/cases/compiler/assignToModule.ts b/tests/cases/compiler/assignToModule.ts index cf42d5627e8d1..67f6733105e09 100644 --- a/tests/cases/compiler/assignToModule.ts +++ b/tests/cases/compiler/assignToModule.ts @@ -1,2 +1,2 @@ -module A {} +namespace A {} A = undefined; // invalid LHS \ No newline at end of file diff --git a/tests/cases/compiler/assignmentCompatability1.ts b/tests/cases/compiler/assignmentCompatability1.ts index 829b560f8814f..0529c35757d69 100644 --- a/tests/cases/compiler/assignmentCompatability1.ts +++ b/tests/cases/compiler/assignmentCompatability1.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa = {};; export var __val__aa = aa; } diff --git a/tests/cases/compiler/assignmentCompatability10.ts b/tests/cases/compiler/assignmentCompatability10.ts index 1e69e5459ed91..ecef1f982e9db 100644 --- a/tests/cases/compiler/assignmentCompatability10.ts +++ b/tests/cases/compiler/assignmentCompatability10.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export class classWithPublicAndOptional { constructor(public one: T, public two?: U) {} } var x4 = new classWithPublicAndOptional(1);; export var __val__x4 = x4; } diff --git a/tests/cases/compiler/assignmentCompatability11.ts b/tests/cases/compiler/assignmentCompatability11.ts index ca40ca24cdb94..472798ec94d32 100644 --- a/tests/cases/compiler/assignmentCompatability11.ts +++ b/tests/cases/compiler/assignmentCompatability11.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {two: 1}; export var __val__obj = obj; } diff --git a/tests/cases/compiler/assignmentCompatability12.ts b/tests/cases/compiler/assignmentCompatability12.ts index 66621b3a6204f..2ba2dbb3a90d1 100644 --- a/tests/cases/compiler/assignmentCompatability12.ts +++ b/tests/cases/compiler/assignmentCompatability12.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {one: "1"}; export var __val__obj = obj; } diff --git a/tests/cases/compiler/assignmentCompatability13.ts b/tests/cases/compiler/assignmentCompatability13.ts index 510bd1a1c6539..679a881c906a6 100644 --- a/tests/cases/compiler/assignmentCompatability13.ts +++ b/tests/cases/compiler/assignmentCompatability13.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {two: "1"}; export var __val__obj = obj; } diff --git a/tests/cases/compiler/assignmentCompatability14.ts b/tests/cases/compiler/assignmentCompatability14.ts index 0aabd9c28febf..b2f31e1afaa00 100644 --- a/tests/cases/compiler/assignmentCompatability14.ts +++ b/tests/cases/compiler/assignmentCompatability14.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {one: true}; export var __val__obj = obj; } diff --git a/tests/cases/compiler/assignmentCompatability15.ts b/tests/cases/compiler/assignmentCompatability15.ts index a11f3cce7d65d..61e53a4f6ee87 100644 --- a/tests/cases/compiler/assignmentCompatability15.ts +++ b/tests/cases/compiler/assignmentCompatability15.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {two: true}; export var __val__obj = obj; } diff --git a/tests/cases/compiler/assignmentCompatability16.ts b/tests/cases/compiler/assignmentCompatability16.ts index a780447fc35af..c963489ab6917 100644 --- a/tests/cases/compiler/assignmentCompatability16.ts +++ b/tests/cases/compiler/assignmentCompatability16.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {one: [1]}; export var __val__obj = obj; } diff --git a/tests/cases/compiler/assignmentCompatability17.ts b/tests/cases/compiler/assignmentCompatability17.ts index 4c3606c663590..554dbe3a56ce1 100644 --- a/tests/cases/compiler/assignmentCompatability17.ts +++ b/tests/cases/compiler/assignmentCompatability17.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {two: [1]}; export var __val__obj = obj; } diff --git a/tests/cases/compiler/assignmentCompatability18.ts b/tests/cases/compiler/assignmentCompatability18.ts index c4e9f1b05ebaf..c4bc8260dc6bd 100644 --- a/tests/cases/compiler/assignmentCompatability18.ts +++ b/tests/cases/compiler/assignmentCompatability18.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {one: [1]}; export var __val__obj = obj; } diff --git a/tests/cases/compiler/assignmentCompatability19.ts b/tests/cases/compiler/assignmentCompatability19.ts index a120eb1ea902b..57fe1e2b5e0f0 100644 --- a/tests/cases/compiler/assignmentCompatability19.ts +++ b/tests/cases/compiler/assignmentCompatability19.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {two: [1]}; export var __val__obj = obj; } diff --git a/tests/cases/compiler/assignmentCompatability2.ts b/tests/cases/compiler/assignmentCompatability2.ts index 0ea518687c8c7..fad21a4c4cef9 100644 --- a/tests/cases/compiler/assignmentCompatability2.ts +++ b/tests/cases/compiler/assignmentCompatability2.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{};; export var __val__aa = aa; } diff --git a/tests/cases/compiler/assignmentCompatability20.ts b/tests/cases/compiler/assignmentCompatability20.ts index d5f4ac433eb23..855b1a44428e8 100644 --- a/tests/cases/compiler/assignmentCompatability20.ts +++ b/tests/cases/compiler/assignmentCompatability20.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {one: ["1"]}; export var __val__obj = obj; } diff --git a/tests/cases/compiler/assignmentCompatability21.ts b/tests/cases/compiler/assignmentCompatability21.ts index feb77e6543143..90dc7dabbf51d 100644 --- a/tests/cases/compiler/assignmentCompatability21.ts +++ b/tests/cases/compiler/assignmentCompatability21.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {two: ["1"]}; export var __val__obj = obj; } diff --git a/tests/cases/compiler/assignmentCompatability22.ts b/tests/cases/compiler/assignmentCompatability22.ts index 2aa8c0fb7fce8..e263e0ca23572 100644 --- a/tests/cases/compiler/assignmentCompatability22.ts +++ b/tests/cases/compiler/assignmentCompatability22.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {one: [true]}; export var __val__obj = obj; } diff --git a/tests/cases/compiler/assignmentCompatability23.ts b/tests/cases/compiler/assignmentCompatability23.ts index 974099780325e..2be1ccd2d7ddb 100644 --- a/tests/cases/compiler/assignmentCompatability23.ts +++ b/tests/cases/compiler/assignmentCompatability23.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {two: [true]}; export var __val__obj = obj; } diff --git a/tests/cases/compiler/assignmentCompatability24.ts b/tests/cases/compiler/assignmentCompatability24.ts index 75d977b408164..3232516c78a33 100644 --- a/tests/cases/compiler/assignmentCompatability24.ts +++ b/tests/cases/compiler/assignmentCompatability24.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = function f(a: Tstring) { return a; };; export var __val__obj = obj; } diff --git a/tests/cases/compiler/assignmentCompatability25.ts b/tests/cases/compiler/assignmentCompatability25.ts index 9e8533511464f..d805e63156115 100644 --- a/tests/cases/compiler/assignmentCompatability25.ts +++ b/tests/cases/compiler/assignmentCompatability25.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{two:number;};; export var __val__aa = aa; } diff --git a/tests/cases/compiler/assignmentCompatability26.ts b/tests/cases/compiler/assignmentCompatability26.ts index 78eb6c0d5f8a3..e137f5d1ac6ae 100644 --- a/tests/cases/compiler/assignmentCompatability26.ts +++ b/tests/cases/compiler/assignmentCompatability26.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{one:string;};; export var __val__aa = aa; } diff --git a/tests/cases/compiler/assignmentCompatability27.ts b/tests/cases/compiler/assignmentCompatability27.ts index d0cef613ac510..857cf5f0882d2 100644 --- a/tests/cases/compiler/assignmentCompatability27.ts +++ b/tests/cases/compiler/assignmentCompatability27.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{two:string;};; export var __val__aa = aa; } diff --git a/tests/cases/compiler/assignmentCompatability28.ts b/tests/cases/compiler/assignmentCompatability28.ts index 73a6b784e59ea..86c932399fff8 100644 --- a/tests/cases/compiler/assignmentCompatability28.ts +++ b/tests/cases/compiler/assignmentCompatability28.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{one:boolean;};; export var __val__aa = aa; } diff --git a/tests/cases/compiler/assignmentCompatability29.ts b/tests/cases/compiler/assignmentCompatability29.ts index 2c8fb3e25f3e9..ecc9d4e0e63c6 100644 --- a/tests/cases/compiler/assignmentCompatability29.ts +++ b/tests/cases/compiler/assignmentCompatability29.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{one:any[];};; export var __val__aa = aa; } diff --git a/tests/cases/compiler/assignmentCompatability3.ts b/tests/cases/compiler/assignmentCompatability3.ts index 0b9c3838dc52c..540095f70789a 100644 --- a/tests/cases/compiler/assignmentCompatability3.ts +++ b/tests/cases/compiler/assignmentCompatability3.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj = {one: 1}; export var __val__obj = obj; } diff --git a/tests/cases/compiler/assignmentCompatability30.ts b/tests/cases/compiler/assignmentCompatability30.ts index 13a25b7141c4c..9268ae7a55c61 100644 --- a/tests/cases/compiler/assignmentCompatability30.ts +++ b/tests/cases/compiler/assignmentCompatability30.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{one:number[];};; export var __val__aa = aa; } diff --git a/tests/cases/compiler/assignmentCompatability31.ts b/tests/cases/compiler/assignmentCompatability31.ts index 36cf4e53a6d9a..90323e6e925ca 100644 --- a/tests/cases/compiler/assignmentCompatability31.ts +++ b/tests/cases/compiler/assignmentCompatability31.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{one:string[];};; export var __val__aa = aa; } diff --git a/tests/cases/compiler/assignmentCompatability32.ts b/tests/cases/compiler/assignmentCompatability32.ts index 9d024217e4f18..9de6cc70112bd 100644 --- a/tests/cases/compiler/assignmentCompatability32.ts +++ b/tests/cases/compiler/assignmentCompatability32.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{one:boolean[];};; export var __val__aa = aa; } diff --git a/tests/cases/compiler/assignmentCompatability33.ts b/tests/cases/compiler/assignmentCompatability33.ts index 12f28fbed608b..6688ba7ace607 100644 --- a/tests/cases/compiler/assignmentCompatability33.ts +++ b/tests/cases/compiler/assignmentCompatability33.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj: { (a: Tstring): Tstring; }; export var __val__obj = obj; } diff --git a/tests/cases/compiler/assignmentCompatability34.ts b/tests/cases/compiler/assignmentCompatability34.ts index 32aa07e9949bf..34481a64e8123 100644 --- a/tests/cases/compiler/assignmentCompatability34.ts +++ b/tests/cases/compiler/assignmentCompatability34.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var obj: { (a:Tnumber):Tnumber;}; export var __val__obj = obj; } diff --git a/tests/cases/compiler/assignmentCompatability35.ts b/tests/cases/compiler/assignmentCompatability35.ts index b3eeebc85cdec..384fefe3832d7 100644 --- a/tests/cases/compiler/assignmentCompatability35.ts +++ b/tests/cases/compiler/assignmentCompatability35.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{[index:number]:number;};; export var __val__aa = aa; } diff --git a/tests/cases/compiler/assignmentCompatability36.ts b/tests/cases/compiler/assignmentCompatability36.ts index 66bfbe1fe96a4..b534cef694c7c 100644 --- a/tests/cases/compiler/assignmentCompatability36.ts +++ b/tests/cases/compiler/assignmentCompatability36.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{[index:string]:any;};; export var __val__aa = aa; } diff --git a/tests/cases/compiler/assignmentCompatability37.ts b/tests/cases/compiler/assignmentCompatability37.ts index 23cfabb1d03a0..8e15f53297fc2 100644 --- a/tests/cases/compiler/assignmentCompatability37.ts +++ b/tests/cases/compiler/assignmentCompatability37.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{ new (param: Tnumber); };; export var __val__aa = aa; } diff --git a/tests/cases/compiler/assignmentCompatability38.ts b/tests/cases/compiler/assignmentCompatability38.ts index c7fc9970e0d62..8a95ffebde0b1 100644 --- a/tests/cases/compiler/assignmentCompatability38.ts +++ b/tests/cases/compiler/assignmentCompatability38.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{ new (param: Tstring); };; export var __val__aa = aa; } diff --git a/tests/cases/compiler/assignmentCompatability39.ts b/tests/cases/compiler/assignmentCompatability39.ts index b73eeba5059b5..070872dfa1512 100644 --- a/tests/cases/compiler/assignmentCompatability39.ts +++ b/tests/cases/compiler/assignmentCompatability39.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export class classWithTwoPublic { constructor(public one: T, public two: U) {} } var x2 = new classWithTwoPublic(1, "a");; export var __val__x2 = x2; } diff --git a/tests/cases/compiler/assignmentCompatability4.ts b/tests/cases/compiler/assignmentCompatability4.ts index 17b341be3c7dc..258491b79e05f 100644 --- a/tests/cases/compiler/assignmentCompatability4.ts +++ b/tests/cases/compiler/assignmentCompatability4.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export var aa:{one:number;};; export var __val__aa = aa; } diff --git a/tests/cases/compiler/assignmentCompatability40.ts b/tests/cases/compiler/assignmentCompatability40.ts index 46105c9e1f0d8..4d3a72e202f57 100644 --- a/tests/cases/compiler/assignmentCompatability40.ts +++ b/tests/cases/compiler/assignmentCompatability40.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export class classWithPrivate { constructor(private one: T) {} } var x5 = new classWithPrivate(1);; export var __val__x5 = x5; } diff --git a/tests/cases/compiler/assignmentCompatability41.ts b/tests/cases/compiler/assignmentCompatability41.ts index 3dd1d8d9d05c8..8fa8c52bb1d05 100644 --- a/tests/cases/compiler/assignmentCompatability41.ts +++ b/tests/cases/compiler/assignmentCompatability41.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export class classWithTwoPrivate { constructor(private one: T, private two: U) {} } var x6 = new classWithTwoPrivate(1, "a");; export var __val__x6 = x6; } diff --git a/tests/cases/compiler/assignmentCompatability42.ts b/tests/cases/compiler/assignmentCompatability42.ts index b59c1983bf1df..b86550c4739c6 100644 --- a/tests/cases/compiler/assignmentCompatability42.ts +++ b/tests/cases/compiler/assignmentCompatability42.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export class classWithPublicPrivate { constructor(public one: T, private two: U) {} } var x7 = new classWithPublicPrivate(1, "a");; export var __val__x7 = x7; } diff --git a/tests/cases/compiler/assignmentCompatability43.ts b/tests/cases/compiler/assignmentCompatability43.ts index fee32f8ece509..c52081370383f 100644 --- a/tests/cases/compiler/assignmentCompatability43.ts +++ b/tests/cases/compiler/assignmentCompatability43.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export interface interfaceTwo { one: T; two: U; }; var obj2: interfaceTwo = { one: 1, two: "a" };; export var __val__obj2 = obj2; } diff --git a/tests/cases/compiler/assignmentCompatability5.ts b/tests/cases/compiler/assignmentCompatability5.ts index 486a47bb9dff4..6f7ff3ff881b6 100644 --- a/tests/cases/compiler/assignmentCompatability5.ts +++ b/tests/cases/compiler/assignmentCompatability5.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export interface interfaceOne { one: T; }; var obj1: interfaceOne = { one: 1 };; export var __val__obj1 = obj1; } diff --git a/tests/cases/compiler/assignmentCompatability6.ts b/tests/cases/compiler/assignmentCompatability6.ts index ae8a67ef15dc0..c95cff1163a2e 100644 --- a/tests/cases/compiler/assignmentCompatability6.ts +++ b/tests/cases/compiler/assignmentCompatability6.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export interface interfaceWithOptional { one?: T; }; var obj3: interfaceWithOptional = { };; export var __val__obj3 = obj3; } diff --git a/tests/cases/compiler/assignmentCompatability7.ts b/tests/cases/compiler/assignmentCompatability7.ts index 87e56df1bf037..8d4de79461fff 100644 --- a/tests/cases/compiler/assignmentCompatability7.ts +++ b/tests/cases/compiler/assignmentCompatability7.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } diff --git a/tests/cases/compiler/assignmentCompatability8.ts b/tests/cases/compiler/assignmentCompatability8.ts index 9cdb47d51c38f..e74e323f8cd53 100644 --- a/tests/cases/compiler/assignmentCompatability8.ts +++ b/tests/cases/compiler/assignmentCompatability8.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export class classWithPublic { constructor(public one: T) {} } var x1 = new classWithPublic(1);; export var __val__x1 = x1; } diff --git a/tests/cases/compiler/assignmentCompatability9.ts b/tests/cases/compiler/assignmentCompatability9.ts index 61f3d07ae3b7c..f0fa2b620c807 100644 --- a/tests/cases/compiler/assignmentCompatability9.ts +++ b/tests/cases/compiler/assignmentCompatability9.ts @@ -1,8 +1,8 @@ -module __test1__ { +namespace __test1__ { export interface interfaceWithPublicAndOptional { one: T; two?: U; }; var obj4: interfaceWithPublicAndOptional = { one: 1 };; export var __val__obj4 = obj4; } -module __test2__ { +namespace __test2__ { export class classWithOptional { constructor(public one?: T) {} } var x3 = new classWithOptional();; export var __val__x3 = x3; } diff --git a/tests/cases/compiler/assignmentToFunction.ts b/tests/cases/compiler/assignmentToFunction.ts index 38205a1b048ae..dc94721be0bef 100644 --- a/tests/cases/compiler/assignmentToFunction.ts +++ b/tests/cases/compiler/assignmentToFunction.ts @@ -1,7 +1,7 @@ function fn() { } fn = () => 3; -module foo { +namespace foo { function xyz() { function bar() { } diff --git a/tests/cases/compiler/assignmentToObjectAndFunction.ts b/tests/cases/compiler/assignmentToObjectAndFunction.ts index 2d4c759135357..4e53cfabc6cd1 100644 --- a/tests/cases/compiler/assignmentToObjectAndFunction.ts +++ b/tests/cases/compiler/assignmentToObjectAndFunction.ts @@ -8,21 +8,21 @@ var goodObj: Object = { var errFun: Function = {}; // Error for no call signature function foo() { } -module foo { +namespace foo { export var boom = 0; } var goodFundule: Function = foo; // ok function bar() { } -module bar { +namespace bar { export function apply(thisArg: string, argArray?: string) { } } var goodFundule2: Function = bar; // ok function bad() { } -module bad { +namespace bad { export var apply = 0; } diff --git a/tests/cases/compiler/assignmentToReferenceTypes.ts b/tests/cases/compiler/assignmentToReferenceTypes.ts index 97997854026fe..876039a28fb7b 100644 --- a/tests/cases/compiler/assignmentToReferenceTypes.ts +++ b/tests/cases/compiler/assignmentToReferenceTypes.ts @@ -1,6 +1,6 @@ // Should all be allowed -module M { +namespace M { } M = null; diff --git a/tests/cases/compiler/augmentExportEquals5.ts b/tests/cases/compiler/augmentExportEquals5.ts index 3250a40f131ed..4cf23d60275da 100644 --- a/tests/cases/compiler/augmentExportEquals5.ts +++ b/tests/cases/compiler/augmentExportEquals5.ts @@ -1,82 +1,82 @@ -// @module: amd - -// @filename: express.d.ts - -declare module Express { - export interface Request { } - export interface Response { } - export interface Application { } -} - -declare module "express" { - function e(): e.Express; - namespace e { - interface IRoute { - all(...handler: RequestHandler[]): IRoute; - } - - interface IRouterMatcher { - (name: string|RegExp, ...handlers: RequestHandler[]): T; - } - - interface IRouter extends RequestHandler { - route(path: string): IRoute; - } - - export function Router(options?: any): Router; - - export interface Router extends IRouter {} - - interface Errback { (err: Error): void; } - - interface Request extends Express.Request { - - get (name: string): string; - } - - interface Response extends Express.Response { - charset: string; - } - - interface ErrorRequestHandler { - (err: any, req: Request, res: Response, next: Function): any; - } - - interface RequestHandler { - (req: Request, res: Response, next: Function): any; - } - - interface Handler extends RequestHandler {} - - interface RequestParamHandler { - (req: Request, res: Response, next: Function, param: any): any; - } - - interface Application extends IRouter, Express.Application { - routes: any; - } - - interface Express extends Application { - createApplication(): Application; - } - - var static: any; - } - - export = e; -} - -// @filename: augmentation.ts -/// -import * as e from "express"; -declare module "express" { - interface Request { - id: number; - } -} - -// @filename: consumer.ts -import { Request } from "express"; -import "./augmentation"; -let x: Request; +// @module: amd + +// @filename: express.d.ts + +declare namespace Express { + export interface Request { } + export interface Response { } + export interface Application { } +} + +declare module "express" { + function e(): e.Express; + namespace e { + interface IRoute { + all(...handler: RequestHandler[]): IRoute; + } + + interface IRouterMatcher { + (name: string|RegExp, ...handlers: RequestHandler[]): T; + } + + interface IRouter extends RequestHandler { + route(path: string): IRoute; + } + + export function Router(options?: any): Router; + + export interface Router extends IRouter {} + + interface Errback { (err: Error): void; } + + interface Request extends Express.Request { + + get (name: string): string; + } + + interface Response extends Express.Response { + charset: string; + } + + interface ErrorRequestHandler { + (err: any, req: Request, res: Response, next: Function): any; + } + + interface RequestHandler { + (req: Request, res: Response, next: Function): any; + } + + interface Handler extends RequestHandler {} + + interface RequestParamHandler { + (req: Request, res: Response, next: Function, param: any): any; + } + + interface Application extends IRouter, Express.Application { + routes: any; + } + + interface Express extends Application { + createApplication(): Application; + } + + var static: any; + } + + export = e; +} + +// @filename: augmentation.ts +/// +import * as e from "express"; +declare module "express" { + interface Request { + id: number; + } +} + +// @filename: consumer.ts +import { Request } from "express"; +import "./augmentation"; +let x: Request; const y = x.id; \ No newline at end of file diff --git a/tests/cases/compiler/augmentedClassWithPrototypePropertyOnModule.ts b/tests/cases/compiler/augmentedClassWithPrototypePropertyOnModule.ts index 3fa6f8f5dda07..f3881804c46d0 100644 --- a/tests/cases/compiler/augmentedClassWithPrototypePropertyOnModule.ts +++ b/tests/cases/compiler/augmentedClassWithPrototypePropertyOnModule.ts @@ -1,4 +1,4 @@ -declare module m { +declare namespace m { var f; var prototype; // This should be error since prototype would be static property on class m } diff --git a/tests/cases/compiler/augmentedTypesClass3.ts b/tests/cases/compiler/augmentedTypesClass3.ts index 65a1cec6bddea..a575d3dca86c9 100644 --- a/tests/cases/compiler/augmentedTypesClass3.ts +++ b/tests/cases/compiler/augmentedTypesClass3.ts @@ -1,12 +1,12 @@ // class then module class c5 { public foo() { } } -module c5 { } // should be ok +namespace c5 { } // should be ok class c5a { public foo() { } } -module c5a { var y = 2; } // should be ok +namespace c5a { var y = 2; } // should be ok class c5b { public foo() { } } -module c5b { export var y = 2; } // should be ok +namespace c5b { export var y = 2; } // should be ok //// class then import class c5c { public foo() { } } diff --git a/tests/cases/compiler/augmentedTypesEnum.ts b/tests/cases/compiler/augmentedTypesEnum.ts index 2efcde826ced4..88c72456a9fa8 100644 --- a/tests/cases/compiler/augmentedTypesEnum.ts +++ b/tests/cases/compiler/augmentedTypesEnum.ts @@ -22,13 +22,13 @@ enum e5a { One } // error // enum then internal module enum e6 { One } -module e6 { } // ok +namespace e6 { } // ok enum e6a { One } -module e6a { var y = 2; } // should be error +namespace e6a { var y = 2; } // should be error enum e6b { One } -module e6b { export var y = 2; } // should be error +namespace e6b { export var y = 2; } // should be error // enum then import, messes with error reporting //enum e7 { One } diff --git a/tests/cases/compiler/augmentedTypesEnum3.ts b/tests/cases/compiler/augmentedTypesEnum3.ts index 848535ef39b52..7e839d5dc46d0 100644 --- a/tests/cases/compiler/augmentedTypesEnum3.ts +++ b/tests/cases/compiler/augmentedTypesEnum3.ts @@ -1,12 +1,12 @@ -module E { +namespace E { var t; } enum E { } enum F { } -module F { var t; } +namespace F { var t; } -module A { +namespace A { var o; } enum A { @@ -15,6 +15,6 @@ enum A { enum A { c } -module A { +namespace A { var p; } \ No newline at end of file diff --git a/tests/cases/compiler/augmentedTypesExternalModule1.ts b/tests/cases/compiler/augmentedTypesExternalModule1.ts index fc30a186f1794..f7876453fa1cc 100644 --- a/tests/cases/compiler/augmentedTypesExternalModule1.ts +++ b/tests/cases/compiler/augmentedTypesExternalModule1.ts @@ -1,4 +1,4 @@ //@module: amd export var a = 1; class c5 { public foo() { } } -module c5 { } // should be ok everywhere \ No newline at end of file +namespace c5 { } // should be ok everywhere \ No newline at end of file diff --git a/tests/cases/compiler/augmentedTypesFunction.ts b/tests/cases/compiler/augmentedTypesFunction.ts index ab6627f94638a..660572d438085 100644 --- a/tests/cases/compiler/augmentedTypesFunction.ts +++ b/tests/cases/compiler/augmentedTypesFunction.ts @@ -22,16 +22,16 @@ enum y4 { One } // error // function then internal module function y5() { } -module y5 { } // ok since module is not instantiated +namespace y5 { } // ok since module is not instantiated function y5a() { } -module y5a { var y = 2; } // should be an error +namespace y5a { var y = 2; } // should be an error function y5b() { } -module y5b { export var y = 3; } // should be an error +namespace y5b { export var y = 3; } // should be an error function y5c() { } -module y5c { export interface I { foo(): void } } // should be an error +namespace y5c { export interface I { foo(): void } } // should be an error // function then import, messes with other errors //function y6() { } diff --git a/tests/cases/compiler/augmentedTypesModules.ts b/tests/cases/compiler/augmentedTypesModules.ts index 84f03549a42d0..a902f32ea18e1 100644 --- a/tests/cases/compiler/augmentedTypesModules.ts +++ b/tests/cases/compiler/augmentedTypesModules.ts @@ -1,96 +1,96 @@ // module then var -module m1 { } +namespace m1 { } var m1 = 1; // Should be allowed -module m1a { var y = 2; } // error +namespace m1a { var y = 2; } // error var m1a = 1; // error -module m1b { export var y = 2; } // error +namespace m1b { export var y = 2; } // error var m1b = 1; // error -module m1c { +namespace m1c { export interface I { foo(): void; } } var m1c = 1; // Should be allowed -module m1d { // error +namespace m1d { // error export class I { foo() { } } } var m1d = 1; // error // module then function -module m2 { } +namespace m2 { } function m2() { }; // ok since the module is not instantiated -module m2a { var y = 2; } +namespace m2a { var y = 2; } function m2a() { }; // error since the module is instantiated -module m2b { export var y = 2; } +namespace m2b { export var y = 2; } function m2b() { }; // error since the module is instantiated // should be errors to have function first function m2c() { }; -module m2c { export var y = 2; } +namespace m2c { export var y = 2; } -module m2d { } +namespace m2d { } declare function m2d(): void; declare function m2e(): void; -module m2e { } +namespace m2e { } function m2f() { }; -module m2f { export interface I { foo(): void } } +namespace m2f { export interface I { foo(): void } } function m2g() { }; -module m2g { export class C { foo() { } } } +namespace m2g { export class C { foo() { } } } // module then class -module m3 { } +namespace m3 { } class m3 { } // ok since the module is not instantiated -module m3a { var y = 2; } +namespace m3a { var y = 2; } class m3a { foo() { } } // error, class isn't ambient or declared before the module class m3b { foo() { } } -module m3b { var y = 2; } +namespace m3b { var y = 2; } class m3c { foo() { } } -module m3c { export var y = 2; } +namespace m3c { export var y = 2; } declare class m3d { foo(): void } -module m3d { export var y = 2; } +namespace m3d { export var y = 2; } -module m3e { export var y = 2; } +namespace m3e { export var y = 2; } declare class m3e { foo(): void } declare class m3f { foo(): void } -module m3f { export interface I { foo(): void } } +namespace m3f { export interface I { foo(): void } } declare class m3g { foo(): void } -module m3g { export class C { foo() { } } } +namespace m3g { export class C { foo() { } } } // module then enum // should be errors -module m4 { } +namespace m4 { } enum m4 { } -module m4a { var y = 2; } +namespace m4a { var y = 2; } enum m4a { One } -module m4b { export var y = 2; } +namespace m4b { export var y = 2; } enum m4b { One } -module m4c { interface I { foo(): void } } +namespace m4c { interface I { foo(): void } } enum m4c { One } -module m4d { class C { foo() { } } } +namespace m4d { class C { foo() { } } } enum m4d { One } //// module then module -module m5 { export var y = 2; } -module m5 { export interface I { foo(): void } } // should already be reasonably well covered +namespace m5 { export var y = 2; } +namespace m5 { export interface I { foo(): void } } // should already be reasonably well covered // module then import -module m6 { export var y = 2; } +namespace m6 { export var y = 2; } //import m6 = require(''); diff --git a/tests/cases/compiler/augmentedTypesModules2.ts b/tests/cases/compiler/augmentedTypesModules2.ts index daa4f04c167d4..f13bfcfec6729 100644 --- a/tests/cases/compiler/augmentedTypesModules2.ts +++ b/tests/cases/compiler/augmentedTypesModules2.ts @@ -1,27 +1,27 @@ // module then function -module m2 { } +namespace m2 { } function m2() { }; // ok since the module is not instantiated -module m2a { var y = 2; } +namespace m2a { var y = 2; } function m2a() { }; // error since the module is instantiated -module m2b { export var y = 2; } +namespace m2b { export var y = 2; } function m2b() { }; // error since the module is instantiated function m2c() { }; -module m2c { export var y = 2; } +namespace m2c { export var y = 2; } -module m2cc { export var y = 2; } +namespace m2cc { export var y = 2; } function m2cc() { }; // error to have module first -module m2d { } +namespace m2d { } declare function m2d(): void; declare function m2e(): void; -module m2e { } +namespace m2e { } function m2f() { }; -module m2f { export interface I { foo(): void } } +namespace m2f { export interface I { foo(): void } } function m2g() { }; -module m2g { export class C { foo() { } } } +namespace m2g { export class C { foo() { } } } diff --git a/tests/cases/compiler/augmentedTypesModules3.ts b/tests/cases/compiler/augmentedTypesModules3.ts index 62826d40d3608..612d10551a421 100644 --- a/tests/cases/compiler/augmentedTypesModules3.ts +++ b/tests/cases/compiler/augmentedTypesModules3.ts @@ -1,6 +1,6 @@ //// module then class -module m3 { } +namespace m3 { } class m3 { } // ok since the module is not instantiated -module m3a { var y = 2; } +namespace m3a { var y = 2; } class m3a { foo() { } } // error, class isn't ambient or declared before the module \ No newline at end of file diff --git a/tests/cases/compiler/augmentedTypesModules3b.ts b/tests/cases/compiler/augmentedTypesModules3b.ts index 8761fbc30fdb8..382005df3cf65 100644 --- a/tests/cases/compiler/augmentedTypesModules3b.ts +++ b/tests/cases/compiler/augmentedTypesModules3b.ts @@ -1,17 +1,17 @@ class m3b { foo() { } } -module m3b { var y = 2; } +namespace m3b { var y = 2; } class m3c { foo() { } } -module m3c { export var y = 2; } +namespace m3c { export var y = 2; } declare class m3d { foo(): void } -module m3d { export var y = 2; } +namespace m3d { export var y = 2; } -module m3e { export var y = 2; } +namespace m3e { export var y = 2; } declare class m3e { foo(): void } declare class m3f { foo(): void } -module m3f { export interface I { foo(): void } } +namespace m3f { export interface I { foo(): void } } declare class m3g { foo(): void } -module m3g { export class C { foo() { } } } +namespace m3g { export class C { foo() { } } } diff --git a/tests/cases/compiler/augmentedTypesModules4.ts b/tests/cases/compiler/augmentedTypesModules4.ts index 2ebf92bb18276..4a2051fa82ca2 100644 --- a/tests/cases/compiler/augmentedTypesModules4.ts +++ b/tests/cases/compiler/augmentedTypesModules4.ts @@ -1,21 +1,21 @@ // module then enum // should be errors -module m4 { } +namespace m4 { } enum m4 { } -module m4a { var y = 2; } +namespace m4a { var y = 2; } enum m4a { One } -module m4b { export var y = 2; } +namespace m4b { export var y = 2; } enum m4b { One } -module m4c { interface I { foo(): void } } +namespace m4c { interface I { foo(): void } } enum m4c { One } -module m4d { class C { foo() { } } } +namespace m4d { class C { foo() { } } } enum m4d { One } //// module then module -module m5 { export var y = 2; } -module m5 { export interface I { foo(): void } } // should already be reasonably well covered +namespace m5 { export var y = 2; } +namespace m5 { export interface I { foo(): void } } // should already be reasonably well covered diff --git a/tests/cases/compiler/augmentedTypesVar.ts b/tests/cases/compiler/augmentedTypesVar.ts index c7e40c8b0e769..35a2868caad15 100644 --- a/tests/cases/compiler/augmentedTypesVar.ts +++ b/tests/cases/compiler/augmentedTypesVar.ts @@ -22,13 +22,13 @@ enum x5 { One } // error // var then module var x6 = 1; -module x6 { } // ok since non-instantiated +namespace x6 { } // ok since non-instantiated var x6a = 1; // error -module x6a { var y = 2; } // error since instantiated +namespace x6a { var y = 2; } // error since instantiated var x6b = 1; // error -module x6b { export var y = 2; } // error +namespace x6b { export var y = 2; } // error // var then import, messes with other error reporting //var x7 = 1; diff --git a/tests/cases/compiler/bind1.ts b/tests/cases/compiler/bind1.ts index 9d41c56bba8f7..96fa1df500728 100644 --- a/tests/cases/compiler/bind1.ts +++ b/tests/cases/compiler/bind1.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export class C implements I {} // this should be an unresolved symbol I error } diff --git a/tests/cases/compiler/binopAssignmentShouldHaveType.ts b/tests/cases/compiler/binopAssignmentShouldHaveType.ts index 07ee7b7fa6bfd..9c4fc068f84e0 100644 --- a/tests/cases/compiler/binopAssignmentShouldHaveType.ts +++ b/tests/cases/compiler/binopAssignmentShouldHaveType.ts @@ -1,7 +1,7 @@ // @lib: es5 declare var console; "use strict"; -module Test { +namespace Test { export class Bug { getName():string { return "name"; diff --git a/tests/cases/compiler/bluebirdStaticThis.ts b/tests/cases/compiler/bluebirdStaticThis.ts index 21b4d244decc6..02dab6f350a52 100644 --- a/tests/cases/compiler/bluebirdStaticThis.ts +++ b/tests/cases/compiler/bluebirdStaticThis.ts @@ -108,7 +108,7 @@ export declare class Promise implements Promise.Thenable { static filter(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise; } -export declare module Promise { +export declare namespace Promise { export interface Thenable { then(onFulfilled: (value: R) => Thenable, onRejected: (error: any) => Thenable): Thenable; then(onFulfilled: (value: R) => Thenable, onRejected?: (error: any) => U): Thenable; diff --git a/tests/cases/compiler/cannotInvokeNewOnErrorExpression.ts b/tests/cases/compiler/cannotInvokeNewOnErrorExpression.ts index fed9cc82e5ef5..3cb995ad8adfa 100644 --- a/tests/cases/compiler/cannotInvokeNewOnErrorExpression.ts +++ b/tests/cases/compiler/cannotInvokeNewOnErrorExpression.ts @@ -1,4 +1,4 @@ -module M +namespace M { class ClassA {} } diff --git a/tests/cases/compiler/chainedImportAlias.ts b/tests/cases/compiler/chainedImportAlias.ts index 5b91c58f4bccf..3c727169c74d3 100644 --- a/tests/cases/compiler/chainedImportAlias.ts +++ b/tests/cases/compiler/chainedImportAlias.ts @@ -1,6 +1,6 @@ // @module: commonjs // @Filename: chainedImportAlias_file0.ts -export module m { +export namespace m { export function foo() { } } diff --git a/tests/cases/compiler/checkForObjectTooStrict.ts b/tests/cases/compiler/checkForObjectTooStrict.ts index 76598aa34ed66..915abd27c84bb 100644 --- a/tests/cases/compiler/checkForObjectTooStrict.ts +++ b/tests/cases/compiler/checkForObjectTooStrict.ts @@ -1,4 +1,4 @@ -module Foo { +namespace Foo { export class Object { diff --git a/tests/cases/compiler/circularModuleImports.ts b/tests/cases/compiler/circularModuleImports.ts index b251eab3335c3..af948e57f36a0 100644 --- a/tests/cases/compiler/circularModuleImports.ts +++ b/tests/cases/compiler/circularModuleImports.ts @@ -1,4 +1,4 @@ -module M +namespace M { diff --git a/tests/cases/compiler/classDeclarationMergedInModuleWithContinuation.ts b/tests/cases/compiler/classDeclarationMergedInModuleWithContinuation.ts index 7b03046304c9d..8d14aefdb71d0 100644 --- a/tests/cases/compiler/classDeclarationMergedInModuleWithContinuation.ts +++ b/tests/cases/compiler/classDeclarationMergedInModuleWithContinuation.ts @@ -1,11 +1,11 @@ -module M { +namespace M { export class N { } - export module N { + export namespace N { export var v = 0; } } -module M { +namespace M { export class O extends M.N { } } \ No newline at end of file diff --git a/tests/cases/compiler/classExtendingQualifiedName.ts b/tests/cases/compiler/classExtendingQualifiedName.ts index cac6c82636037..9a4ca47987120 100644 --- a/tests/cases/compiler/classExtendingQualifiedName.ts +++ b/tests/cases/compiler/classExtendingQualifiedName.ts @@ -1,4 +1,4 @@ -module M { +namespace M { class C { } diff --git a/tests/cases/compiler/classExtendingQualifiedName2.ts b/tests/cases/compiler/classExtendingQualifiedName2.ts index 2413f774a94f6..42ee548205e03 100644 --- a/tests/cases/compiler/classExtendingQualifiedName2.ts +++ b/tests/cases/compiler/classExtendingQualifiedName2.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export class C { } diff --git a/tests/cases/compiler/classExtendsClauseClassMergedWithModuleNotReferingConstructor.ts b/tests/cases/compiler/classExtendsClauseClassMergedWithModuleNotReferingConstructor.ts index 337ac5f86add5..9189203b2a9ad 100644 --- a/tests/cases/compiler/classExtendsClauseClassMergedWithModuleNotReferingConstructor.ts +++ b/tests/cases/compiler/classExtendsClauseClassMergedWithModuleNotReferingConstructor.ts @@ -1,11 +1,11 @@ class A { a: number; } -module A { +namespace A { export var v: string; } -module Foo { +namespace Foo { var A = 1; class B extends A { b: string; diff --git a/tests/cases/compiler/classExtendsClauseClassNotReferringConstructor.ts b/tests/cases/compiler/classExtendsClauseClassNotReferringConstructor.ts index 4a261fd2ad031..c4d5b1e6c5491 100644 --- a/tests/cases/compiler/classExtendsClauseClassNotReferringConstructor.ts +++ b/tests/cases/compiler/classExtendsClauseClassNotReferringConstructor.ts @@ -1,5 +1,5 @@ class A { a: number; } -module Foo { +namespace Foo { var A = 1; class B extends A { b: string; } } diff --git a/tests/cases/compiler/classExtendsInterfaceInModule.ts b/tests/cases/compiler/classExtendsInterfaceInModule.ts index 4ea24e5dd7d8d..c74ca58de245e 100644 --- a/tests/cases/compiler/classExtendsInterfaceInModule.ts +++ b/tests/cases/compiler/classExtendsInterfaceInModule.ts @@ -1,11 +1,11 @@ -module M { +namespace M { export interface I1 {} export interface I2 {} } class C1 extends M.I1 {} class C2 extends M.I2 {} -module Mod { +namespace Mod { export namespace Nested { export interface I {} } diff --git a/tests/cases/compiler/classImplementsImportedInterface.ts b/tests/cases/compiler/classImplementsImportedInterface.ts index ae4cbffede59a..88750e1dd3ccd 100644 --- a/tests/cases/compiler/classImplementsImportedInterface.ts +++ b/tests/cases/compiler/classImplementsImportedInterface.ts @@ -1,10 +1,10 @@ -module M1 { +namespace M1 { export interface I { foo(); } } -module M2 { +namespace M2 { import T = M1.I; class C implements T { foo() {} diff --git a/tests/cases/compiler/classTypeParametersInStatics.ts b/tests/cases/compiler/classTypeParametersInStatics.ts index e3a9ab6f93e36..7401d67dd517e 100644 --- a/tests/cases/compiler/classTypeParametersInStatics.ts +++ b/tests/cases/compiler/classTypeParametersInStatics.ts @@ -1,4 +1,4 @@ -module Editor { +namespace Editor { export class List { diff --git a/tests/cases/compiler/classdecl.ts b/tests/cases/compiler/classdecl.ts index 2b9a55a1f3ec0..3005d77d496fa 100644 --- a/tests/cases/compiler/classdecl.ts +++ b/tests/cases/compiler/classdecl.ts @@ -38,7 +38,7 @@ class a { class b extends a { } -module m1 { +namespace m1 { export class b { } class d { @@ -49,9 +49,9 @@ module m1 { } } -module m2 { +namespace m2 { - export module m3 { + export namespace m3 { export class c extends b { } export class ib2 implements m1.ib { diff --git a/tests/cases/compiler/clinterfaces.ts b/tests/cases/compiler/clinterfaces.ts index 6565bbd05e300..0829d4a20938d 100644 --- a/tests/cases/compiler/clinterfaces.ts +++ b/tests/cases/compiler/clinterfaces.ts @@ -1,5 +1,5 @@ //@module: commonjs -module M { +namespace M { class C { } interface C { } interface D { } diff --git a/tests/cases/compiler/cloduleAcrossModuleDefinitions.ts b/tests/cases/compiler/cloduleAcrossModuleDefinitions.ts index aa0801b356c14..0d76f6c4c24f4 100644 --- a/tests/cases/compiler/cloduleAcrossModuleDefinitions.ts +++ b/tests/cases/compiler/cloduleAcrossModuleDefinitions.ts @@ -1,12 +1,12 @@ -module A { +namespace A { export class B { foo() { } static bar() { } } } -module A { - export module B { +namespace A { + export namespace B { export var x = 1; } } diff --git a/tests/cases/compiler/cloduleAndTypeParameters.ts b/tests/cases/compiler/cloduleAndTypeParameters.ts index bf4ec86a358b4..c7dd8003e190d 100644 --- a/tests/cases/compiler/cloduleAndTypeParameters.ts +++ b/tests/cases/compiler/cloduleAndTypeParameters.ts @@ -3,7 +3,7 @@ class Foo { } } -module Foo { +namespace Foo { export interface Bar { bar(): void; } diff --git a/tests/cases/compiler/cloduleSplitAcrossFiles.ts b/tests/cases/compiler/cloduleSplitAcrossFiles.ts index 239b0d2022dae..661b91050c797 100644 --- a/tests/cases/compiler/cloduleSplitAcrossFiles.ts +++ b/tests/cases/compiler/cloduleSplitAcrossFiles.ts @@ -2,7 +2,7 @@ class D { } // @Filename: cloduleSplitAcrossFiles_module.ts -module D { +namespace D { export var y = "hi"; } D.y; \ No newline at end of file diff --git a/tests/cases/compiler/cloduleStaticMembers.ts b/tests/cases/compiler/cloduleStaticMembers.ts index 67b15d4d4167d..8bb7ba7eb7075 100644 --- a/tests/cases/compiler/cloduleStaticMembers.ts +++ b/tests/cases/compiler/cloduleStaticMembers.ts @@ -2,7 +2,7 @@ class Clod { private static x = 10; public static y = 10; } -module Clod { +namespace Clod { var p = Clod.x; var q = x; diff --git a/tests/cases/compiler/cloduleTest1.ts b/tests/cases/compiler/cloduleTest1.ts index d5bc88b42de49..e844b5b843e36 100644 --- a/tests/cases/compiler/cloduleTest1.ts +++ b/tests/cases/compiler/cloduleTest1.ts @@ -2,7 +2,7 @@ interface $ { addClass(className: string): $; } - module $ { + namespace $ { export interface AjaxSettings { } export function ajax(options: AjaxSettings) { } diff --git a/tests/cases/compiler/cloduleTest2.ts b/tests/cases/compiler/cloduleTest2.ts index 98acfe3b8a8f2..0a4403ec30a6c 100644 --- a/tests/cases/compiler/cloduleTest2.ts +++ b/tests/cases/compiler/cloduleTest2.ts @@ -1,17 +1,17 @@ -module T1 { - module m3d { export var y = 2; } +namespace T1 { + namespace m3d { export var y = 2; } declare class m3d { constructor(foo); foo(): void ; static bar(); } var r = new m3d(); // error } -module T2 { +namespace T2 { declare class m3d { constructor(foo); foo(): void; static bar(); } - module m3d { export var y = 2; } + namespace m3d { export var y = 2; } var r = new m3d(); // error } -module T3 { - module m3d { export var y = 2; } +namespace T3 { + namespace m3d { export var y = 2; } declare class m3d { foo(): void; static bar(); } var r = new m3d(); r.foo(); @@ -19,16 +19,16 @@ module T3 { r.y; // error } -module T4 { +namespace T4 { declare class m3d { foo(): void; static bar(); } - module m3d { export var y = 2; } + namespace m3d { export var y = 2; } var r = new m3d(); r.foo(); r.bar(); // error r.y; // error } -module m3d { export var y = 2; } +namespace m3d { export var y = 2; } declare class m3d { constructor(foo); foo(): void; static bar(); } var r = new m3d(); // error diff --git a/tests/cases/compiler/cloduleWithDuplicateMember1.ts b/tests/cases/compiler/cloduleWithDuplicateMember1.ts index 3e2ed95f7d578..c743814e143c7 100644 --- a/tests/cases/compiler/cloduleWithDuplicateMember1.ts +++ b/tests/cases/compiler/cloduleWithDuplicateMember1.ts @@ -6,10 +6,10 @@ class C { static foo() { } } -module C { +namespace C { export var x = 1; } -module C { +namespace C { export function foo() { } export function x() { } } \ No newline at end of file diff --git a/tests/cases/compiler/cloduleWithDuplicateMember2.ts b/tests/cases/compiler/cloduleWithDuplicateMember2.ts index 674bc5ee05013..acb019f0d305f 100644 --- a/tests/cases/compiler/cloduleWithDuplicateMember2.ts +++ b/tests/cases/compiler/cloduleWithDuplicateMember2.ts @@ -3,9 +3,9 @@ class C { static set y(z) { } } -module C { +namespace C { export var x = 1; } -module C { +namespace C { export function x() { } } \ No newline at end of file diff --git a/tests/cases/compiler/cloduleWithPriorInstantiatedModule.ts b/tests/cases/compiler/cloduleWithPriorInstantiatedModule.ts index c6423ce41a710..1eb800a74eb3f 100644 --- a/tests/cases/compiler/cloduleWithPriorInstantiatedModule.ts +++ b/tests/cases/compiler/cloduleWithPriorInstantiatedModule.ts @@ -1,5 +1,5 @@ // Non-ambient & instantiated module. -module Moclodule { +namespace Moclodule { export interface Someinterface { foo(): void; } @@ -10,7 +10,7 @@ class Moclodule { } // Instantiated module. -module Moclodule { +namespace Moclodule { export class Manager { } } \ No newline at end of file diff --git a/tests/cases/compiler/cloduleWithPriorUninstantiatedModule.ts b/tests/cases/compiler/cloduleWithPriorUninstantiatedModule.ts index 0c603b71a4dd0..c009c66935240 100644 --- a/tests/cases/compiler/cloduleWithPriorUninstantiatedModule.ts +++ b/tests/cases/compiler/cloduleWithPriorUninstantiatedModule.ts @@ -1,5 +1,5 @@ // Non-ambient & uninstantiated module. -module Moclodule { +namespace Moclodule { export interface Someinterface { foo(): void; } @@ -9,7 +9,7 @@ class Moclodule { } // Instantiated module. -module Moclodule { +namespace Moclodule { export class Manager { } } \ No newline at end of file diff --git a/tests/cases/compiler/cloduleWithRecursiveReference.ts b/tests/cases/compiler/cloduleWithRecursiveReference.ts index 4dd13c23c1763..0a01dc87abbba 100644 --- a/tests/cases/compiler/cloduleWithRecursiveReference.ts +++ b/tests/cases/compiler/cloduleWithRecursiveReference.ts @@ -1,7 +1,7 @@ -module M +namespace M { export class C { } - export module C { + export namespace C { export var C = M.C } } \ No newline at end of file diff --git a/tests/cases/compiler/clodulesDerivedClasses.ts b/tests/cases/compiler/clodulesDerivedClasses.ts index c8c2b3e331da4..a4cfefae8dafa 100644 --- a/tests/cases/compiler/clodulesDerivedClasses.ts +++ b/tests/cases/compiler/clodulesDerivedClasses.ts @@ -2,7 +2,7 @@ class Shape { id: number; } -module Shape.Utils { +namespace Shape.Utils { export function convert(): Shape { return null;} } @@ -11,7 +11,7 @@ class Path extends Shape { } -module Path.Utils { +namespace Path.Utils { export function convert2(): Path { return null; } diff --git a/tests/cases/compiler/collisionCodeGenModuleWithAccessorChildren.ts b/tests/cases/compiler/collisionCodeGenModuleWithAccessorChildren.ts index 77483b4ab9875..a16306a5a1b28 100644 --- a/tests/cases/compiler/collisionCodeGenModuleWithAccessorChildren.ts +++ b/tests/cases/compiler/collisionCodeGenModuleWithAccessorChildren.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export var x = 3; class c { private y; @@ -8,7 +8,7 @@ module M { } } -module M { +namespace M { class d { private y; set Z(p) { @@ -18,7 +18,7 @@ module M { } } -module M { // Shouldnt be _M +namespace M { // Shouldnt be _M class e { private y; set M(p) { @@ -27,7 +27,7 @@ module M { // Shouldnt be _M } } -module M { +namespace M { class f { get Z() { var M = 10; @@ -36,7 +36,7 @@ module M { } } -module M { // Shouldnt be _M +namespace M { // Shouldnt be _M class e { get M() { return x; diff --git a/tests/cases/compiler/collisionCodeGenModuleWithConstructorChildren.ts b/tests/cases/compiler/collisionCodeGenModuleWithConstructorChildren.ts index 5a1a9e013e7fa..1eb8d3c79a82b 100644 --- a/tests/cases/compiler/collisionCodeGenModuleWithConstructorChildren.ts +++ b/tests/cases/compiler/collisionCodeGenModuleWithConstructorChildren.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export var x = 3; class c { constructor(M, p = x) { @@ -6,14 +6,14 @@ module M { } } -module M { +namespace M { class d { constructor(private M, p = x) { } } } -module M { +namespace M { class d2 { constructor() { var M = 10; diff --git a/tests/cases/compiler/collisionCodeGenModuleWithEnumMemberConflict.ts b/tests/cases/compiler/collisionCodeGenModuleWithEnumMemberConflict.ts index 18a727847b7c1..7b81b77d0a66c 100644 --- a/tests/cases/compiler/collisionCodeGenModuleWithEnumMemberConflict.ts +++ b/tests/cases/compiler/collisionCodeGenModuleWithEnumMemberConflict.ts @@ -1,4 +1,4 @@ -module m1 { +namespace m1 { enum e { m1, m2 = m1 diff --git a/tests/cases/compiler/collisionCodeGenModuleWithFunctionChildren.ts b/tests/cases/compiler/collisionCodeGenModuleWithFunctionChildren.ts index 0cdb0884a2738..96f8d86be2449 100644 --- a/tests/cases/compiler/collisionCodeGenModuleWithFunctionChildren.ts +++ b/tests/cases/compiler/collisionCodeGenModuleWithFunctionChildren.ts @@ -1,16 +1,16 @@ -module M { +namespace M { export var x = 3; function fn(M, p = x) { } } -module M { +namespace M { function fn2() { var M; var p = x; } } -module M { +namespace M { function fn3() { function M() { var p = x; diff --git a/tests/cases/compiler/collisionCodeGenModuleWithMemberClassConflict.ts b/tests/cases/compiler/collisionCodeGenModuleWithMemberClassConflict.ts index cb95e9acc9d51..7f62acb361e3d 100644 --- a/tests/cases/compiler/collisionCodeGenModuleWithMemberClassConflict.ts +++ b/tests/cases/compiler/collisionCodeGenModuleWithMemberClassConflict.ts @@ -1,10 +1,10 @@ -module m1 { +namespace m1 { export class m1 { } } var foo = new m1.m1(); -module m2 { +namespace m2 { export class m2 { } diff --git a/tests/cases/compiler/collisionCodeGenModuleWithMemberInterfaceConflict.ts b/tests/cases/compiler/collisionCodeGenModuleWithMemberInterfaceConflict.ts index ecd4db562a636..f60bfe19c3f7d 100644 --- a/tests/cases/compiler/collisionCodeGenModuleWithMemberInterfaceConflict.ts +++ b/tests/cases/compiler/collisionCodeGenModuleWithMemberInterfaceConflict.ts @@ -1,4 +1,4 @@ -module m1 { +namespace m1 { export interface m1 { } export class m2 implements m1 { diff --git a/tests/cases/compiler/collisionCodeGenModuleWithMemberVariable.ts b/tests/cases/compiler/collisionCodeGenModuleWithMemberVariable.ts index a17891766faae..32862672a3a31 100644 --- a/tests/cases/compiler/collisionCodeGenModuleWithMemberVariable.ts +++ b/tests/cases/compiler/collisionCodeGenModuleWithMemberVariable.ts @@ -1,4 +1,4 @@ -module m1 { +namespace m1 { export var m1 = 10; var b = m1; } diff --git a/tests/cases/compiler/collisionCodeGenModuleWithMethodChildren.ts b/tests/cases/compiler/collisionCodeGenModuleWithMethodChildren.ts index b89d3d941430e..c4919a158e8d8 100644 --- a/tests/cases/compiler/collisionCodeGenModuleWithMethodChildren.ts +++ b/tests/cases/compiler/collisionCodeGenModuleWithMethodChildren.ts @@ -1,11 +1,11 @@ -module M { +namespace M { export var x = 3; class c { fn(M, p = x) { } } } -module M { +namespace M { class d { fn2() { var M; @@ -14,7 +14,7 @@ module M { } } -module M { +namespace M { class e { fn3() { function M() { @@ -24,7 +24,7 @@ module M { } } -module M { // Shouldnt bn _M +namespace M { // Shouldnt bn _M class f { M() { } diff --git a/tests/cases/compiler/collisionCodeGenModuleWithModuleChildren.ts b/tests/cases/compiler/collisionCodeGenModuleWithModuleChildren.ts index 66b8458ba27b4..f23b457246110 100644 --- a/tests/cases/compiler/collisionCodeGenModuleWithModuleChildren.ts +++ b/tests/cases/compiler/collisionCodeGenModuleWithModuleChildren.ts @@ -1,13 +1,13 @@ -module M { +namespace M { export var x = 3; - module m1 { + namespace m1 { var M = 10; var p = x; } } -module M { - module m2 { +namespace M { + namespace m2 { class M { } var p = x; @@ -15,8 +15,8 @@ module M { } } -module M { - module m3 { +namespace M { + namespace m3 { function M() { } var p = x; @@ -24,8 +24,8 @@ module M { } } -module M { // shouldnt be _M - module m3 { +namespace M { // shouldnt be _M + namespace m3 { interface M { } var p = x; @@ -33,9 +33,9 @@ module M { // shouldnt be _M } } -module M { - module m4 { - module M { +namespace M { + namespace m4 { + namespace M { var p = x; } } diff --git a/tests/cases/compiler/collisionCodeGenModuleWithModuleReopening.ts b/tests/cases/compiler/collisionCodeGenModuleWithModuleReopening.ts index 73915593fd929..7bfbd31ec259a 100644 --- a/tests/cases/compiler/collisionCodeGenModuleWithModuleReopening.ts +++ b/tests/cases/compiler/collisionCodeGenModuleWithModuleReopening.ts @@ -1,9 +1,9 @@ -module m1 { +namespace m1 { export class m1 { } } var foo = new m1.m1(); -module m1 { +namespace m1 { export class c1 { } var b = new c1(); @@ -11,14 +11,14 @@ module m1 { } var foo2 = new m1.c1(); -module m2 { +namespace m2 { export class c1 { } export var b10 = 10; var x = new c1(); } var foo3 = new m2.c1(); -module m2 { +namespace m2 { export class m2 { } var b = new m2(); diff --git a/tests/cases/compiler/collisionCodeGenModuleWithPrivateMember.ts b/tests/cases/compiler/collisionCodeGenModuleWithPrivateMember.ts index 5d75be811544e..35347eb8a290e 100644 --- a/tests/cases/compiler/collisionCodeGenModuleWithPrivateMember.ts +++ b/tests/cases/compiler/collisionCodeGenModuleWithPrivateMember.ts @@ -1,4 +1,4 @@ -module m1 { +namespace m1 { class m1 { } var x = new m1(); diff --git a/tests/cases/compiler/collisionExportsRequireAndAmbientClass.ts b/tests/cases/compiler/collisionExportsRequireAndAmbientClass.ts index 563c834c79c3a..ad703c2fddc0e 100644 --- a/tests/cases/compiler/collisionExportsRequireAndAmbientClass.ts +++ b/tests/cases/compiler/collisionExportsRequireAndAmbientClass.ts @@ -4,13 +4,13 @@ export declare class require { } export declare class exports { } -declare module m1 { +declare namespace m1 { class require { } class exports { } } -module m2 { +namespace m2 { export declare class require { } export declare class exports { @@ -22,13 +22,13 @@ declare class require { } declare class exports { } -declare module m3 { +declare namespace m3 { class require { } class exports { } } -module m4 { +namespace m4 { export declare class require { } export declare class exports { diff --git a/tests/cases/compiler/collisionExportsRequireAndAmbientEnum.ts b/tests/cases/compiler/collisionExportsRequireAndAmbientEnum.ts index 5366d5511f98a..c303a099b16ec 100644 --- a/tests/cases/compiler/collisionExportsRequireAndAmbientEnum.ts +++ b/tests/cases/compiler/collisionExportsRequireAndAmbientEnum.ts @@ -8,7 +8,7 @@ export declare enum exports { _thisVal1, _thisVal2, } -declare module m1 { +declare namespace m1 { enum require { _thisVal1, _thisVal2, @@ -18,7 +18,7 @@ declare module m1 { _thisVal2, } } -module m2 { +namespace m2 { export declare enum require { _thisVal1, _thisVal2, @@ -38,7 +38,7 @@ declare enum exports { _thisVal1, _thisVal2, } -declare module m3 { +declare namespace m3 { enum require { _thisVal1, _thisVal2, @@ -48,7 +48,7 @@ declare module m3 { _thisVal2, } } -module m4 { +namespace m4 { export declare enum require { _thisVal1, _thisVal2, diff --git a/tests/cases/compiler/collisionExportsRequireAndAmbientFunction.ts b/tests/cases/compiler/collisionExportsRequireAndAmbientFunction.ts index caabb75971a97..5b54298b5879d 100644 --- a/tests/cases/compiler/collisionExportsRequireAndAmbientFunction.ts +++ b/tests/cases/compiler/collisionExportsRequireAndAmbientFunction.ts @@ -3,11 +3,11 @@ export declare function exports(): number; export declare function require(): string[]; -declare module m1 { +declare namespace m1 { function exports(): string; function require(): number; } -module m2 { +namespace m2 { export declare function exports(): string; export declare function require(): string[]; var a = 10; diff --git a/tests/cases/compiler/collisionExportsRequireAndAmbientFunctionInGlobalFile.ts b/tests/cases/compiler/collisionExportsRequireAndAmbientFunctionInGlobalFile.ts index 2b3663f4d9eed..78f6591ff17a0 100644 --- a/tests/cases/compiler/collisionExportsRequireAndAmbientFunctionInGlobalFile.ts +++ b/tests/cases/compiler/collisionExportsRequireAndAmbientFunctionInGlobalFile.ts @@ -1,10 +1,10 @@ declare function exports(): number; declare function require(): string; -declare module m3 { +declare namespace m3 { function exports(): string[]; function require(): number[]; } -module m4 { +namespace m4 { export declare function exports(): string; export declare function require(): string; var a = 10; diff --git a/tests/cases/compiler/collisionExportsRequireAndAmbientModule.ts b/tests/cases/compiler/collisionExportsRequireAndAmbientModule.ts index b94fcb0cc32df..cc37a4cf670e0 100644 --- a/tests/cases/compiler/collisionExportsRequireAndAmbientModule.ts +++ b/tests/cases/compiler/collisionExportsRequireAndAmbientModule.ts @@ -1,6 +1,6 @@ //@module: amd //@filename: collisionExportsRequireAndAmbientModule_externalmodule.ts -export declare module require { +export declare namespace require { export interface I { } export class C { @@ -9,7 +9,7 @@ export declare module require { export function foo(): require.I { return null; } -export declare module exports { +export declare namespace exports { export interface I { } export class C { @@ -18,28 +18,28 @@ export declare module exports { export function foo2(): exports.I { return null; } -declare module m1 { - module require { +declare namespace m1 { + namespace require { export interface I { } export class C { } } - module exports { + namespace exports { export interface I { } export class C { } } } -module m2 { - export declare module require { +namespace m2 { + export declare namespace require { export interface I { } export class C { } } - export declare module exports { + export declare namespace exports { export interface I { } export class C { @@ -49,40 +49,40 @@ module m2 { } //@filename: collisionExportsRequireAndAmbientModule_globalFile.ts -declare module require { +declare namespace require { export interface I { } export class C { } } -declare module exports { +declare namespace exports { export interface I { } export class C { } } -declare module m3 { - module require { +declare namespace m3 { + namespace require { export interface I { } export class C { } } - module exports { + namespace exports { export interface I { } export class C { } } } -module m4 { - export declare module require { +namespace m4 { + export declare namespace require { export interface I { } export class C { } } - export declare module exports { + export declare namespace exports { export interface I { } export class C { diff --git a/tests/cases/compiler/collisionExportsRequireAndAmbientVar.ts b/tests/cases/compiler/collisionExportsRequireAndAmbientVar.ts index 0e17603c92585..25c98898c7277 100644 --- a/tests/cases/compiler/collisionExportsRequireAndAmbientVar.ts +++ b/tests/cases/compiler/collisionExportsRequireAndAmbientVar.ts @@ -2,11 +2,11 @@ //@filename: collisionExportsRequireAndAmbientVar_externalmodule.ts export declare var exports: number; export declare var require: string; -declare module m1 { +declare namespace m1 { var exports: string; var require: number; } -module m2 { +namespace m2 { export declare var exports: number; export declare var require: string; var a = 10; @@ -15,11 +15,11 @@ module m2 { //@filename: collisionExportsRequireAndAmbientVar_globalFile.ts declare var exports: number; declare var require: string; -declare module m3 { +declare namespace m3 { var exports: string; var require: number; } -module m4 { +namespace m4 { export declare var exports: string; export declare var require: number; var a = 10; diff --git a/tests/cases/compiler/collisionExportsRequireAndClass.ts b/tests/cases/compiler/collisionExportsRequireAndClass.ts index 0bc1e0e337ba0..995364b78f2e1 100644 --- a/tests/cases/compiler/collisionExportsRequireAndClass.ts +++ b/tests/cases/compiler/collisionExportsRequireAndClass.ts @@ -4,13 +4,13 @@ export class require { } export class exports { } -module m1 { +namespace m1 { class require { } class exports { } } -module m2 { +namespace m2 { export class require { } export class exports { @@ -22,13 +22,13 @@ class require { } class exports { } -module m3 { +namespace m3 { class require { } class exports { } } -module m4 { +namespace m4 { export class require { } export class exports { diff --git a/tests/cases/compiler/collisionExportsRequireAndEnum.ts b/tests/cases/compiler/collisionExportsRequireAndEnum.ts index b8bb172748024..ce7d611927e28 100644 --- a/tests/cases/compiler/collisionExportsRequireAndEnum.ts +++ b/tests/cases/compiler/collisionExportsRequireAndEnum.ts @@ -8,7 +8,7 @@ export enum exports { // Error _thisVal1, _thisVal2, } -module m1 { +namespace m1 { enum require { _thisVal1, _thisVal2, @@ -18,7 +18,7 @@ module m1 { _thisVal2, } } -module m2 { +namespace m2 { export enum require { _thisVal1, _thisVal2, @@ -38,7 +38,7 @@ enum exports { _thisVal1, _thisVal2, } -module m3 { +namespace m3 { enum require { _thisVal1, _thisVal2, @@ -48,7 +48,7 @@ module m3 { _thisVal2, } } -module m4 { +namespace m4 { export enum require { _thisVal1, _thisVal2, diff --git a/tests/cases/compiler/collisionExportsRequireAndFunction.ts b/tests/cases/compiler/collisionExportsRequireAndFunction.ts index 185b0a4180569..3adfa803f902e 100644 --- a/tests/cases/compiler/collisionExportsRequireAndFunction.ts +++ b/tests/cases/compiler/collisionExportsRequireAndFunction.ts @@ -5,7 +5,7 @@ export function exports() { export function require() { return "require"; } -module m1 { +namespace m1 { function exports() { return 1; } @@ -13,7 +13,7 @@ module m1 { return "require"; } } -module m2 { +namespace m2 { export function exports() { return 1; } diff --git a/tests/cases/compiler/collisionExportsRequireAndFunctionInGlobalFile.ts b/tests/cases/compiler/collisionExportsRequireAndFunctionInGlobalFile.ts index 050887580f761..dd0ac35b792b6 100644 --- a/tests/cases/compiler/collisionExportsRequireAndFunctionInGlobalFile.ts +++ b/tests/cases/compiler/collisionExportsRequireAndFunctionInGlobalFile.ts @@ -4,7 +4,7 @@ function exports() { function require() { return "require"; } -module m3 { +namespace m3 { function exports() { return 1; } @@ -12,7 +12,7 @@ module m3 { return "require"; } } -module m4 { +namespace m4 { export function exports() { return 1; } diff --git a/tests/cases/compiler/collisionExportsRequireAndInternalModuleAlias.ts b/tests/cases/compiler/collisionExportsRequireAndInternalModuleAlias.ts index e76fc572b7599..62158e2052ffe 100644 --- a/tests/cases/compiler/collisionExportsRequireAndInternalModuleAlias.ts +++ b/tests/cases/compiler/collisionExportsRequireAndInternalModuleAlias.ts @@ -1,5 +1,5 @@ //@module: amd -export module m { +export namespace m { export class c { } } @@ -8,14 +8,14 @@ import require = m.c; new exports(); new require(); -module m1 { +namespace m1 { import exports = m.c; import require = m.c; new exports(); new require(); } -module m2 { +namespace m2 { export import exports = m.c; export import require = m.c; new exports(); diff --git a/tests/cases/compiler/collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts b/tests/cases/compiler/collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts index d76da86891e07..4c5a6672c6660 100644 --- a/tests/cases/compiler/collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts +++ b/tests/cases/compiler/collisionExportsRequireAndInternalModuleAliasInGlobalFile.ts @@ -1,4 +1,4 @@ -module mOfGloalFile { +namespace mOfGloalFile { export class c { } } @@ -7,14 +7,14 @@ import require = mOfGloalFile.c; new exports(); new require(); -module m1 { +namespace m1 { import exports = mOfGloalFile.c; import require = mOfGloalFile.c; new exports(); new require(); } -module m2 { +namespace m2 { export import exports = mOfGloalFile.c; export import require = mOfGloalFile.c; new exports(); diff --git a/tests/cases/compiler/collisionExportsRequireAndModule.ts b/tests/cases/compiler/collisionExportsRequireAndModule.ts index dc79e15605cad..66fb1b0102f98 100644 --- a/tests/cases/compiler/collisionExportsRequireAndModule.ts +++ b/tests/cases/compiler/collisionExportsRequireAndModule.ts @@ -1,6 +1,6 @@ //@module: amd //@filename: collisionExportsRequireAndModule_externalmodule.ts -export module require { +export namespace require { export interface I { } export class C { @@ -9,7 +9,7 @@ export module require { export function foo(): require.I { return null; } -export module exports { +export namespace exports { export interface I { } export class C { @@ -18,28 +18,28 @@ export module exports { export function foo2(): exports.I { return null; } -module m1 { - module require { +namespace m1 { + namespace require { export interface I { } export class C { } } - module exports { + namespace exports { export interface I { } export class C { } } } -module m2 { - export module require { +namespace m2 { + export namespace require { export interface I { } export class C { } } - export module exports { + export namespace exports { export interface I { } export class C { @@ -48,40 +48,40 @@ module m2 { } //@filename: collisionExportsRequireAndModule_globalFile.ts -module require { +namespace require { export interface I { } export class C { } } -module exports { +namespace exports { export interface I { } export class C { } } -module m3 { - module require { +namespace m3 { + namespace require { export interface I { } export class C { } } - module exports { + namespace exports { export interface I { } export class C { } } } -module m4 { - export module require { +namespace m4 { + export namespace require { export interface I { } export class C { } } - export module exports { + export namespace exports { export interface I { } export class C { diff --git a/tests/cases/compiler/collisionExportsRequireAndUninstantiatedModule.ts b/tests/cases/compiler/collisionExportsRequireAndUninstantiatedModule.ts index a63972d15507a..2f6d038edfaba 100644 --- a/tests/cases/compiler/collisionExportsRequireAndUninstantiatedModule.ts +++ b/tests/cases/compiler/collisionExportsRequireAndUninstantiatedModule.ts @@ -1,12 +1,12 @@ //@module: amd -export module require { // no error +export namespace require { // no error export interface I { } } export function foo(): require.I { return null; } -export module exports { // no error +export namespace exports { // no error export interface I { } } diff --git a/tests/cases/compiler/collisionExportsRequireAndVar.ts b/tests/cases/compiler/collisionExportsRequireAndVar.ts index af98b1a7d092d..488192d483106 100644 --- a/tests/cases/compiler/collisionExportsRequireAndVar.ts +++ b/tests/cases/compiler/collisionExportsRequireAndVar.ts @@ -4,11 +4,11 @@ export function foo() { } var exports = 1; var require = "require"; -module m1 { +namespace m1 { var exports = 0; var require = "require"; } -module m2 { +namespace m2 { export var exports = 0; export var require = "require"; } @@ -16,11 +16,11 @@ module m2 { //@filename: collisionExportsRequireAndVar_globalFile.ts var exports = 0; var require = "require"; -module m3 { +namespace m3 { var exports = 0; var require = "require"; } -module m4 { +namespace m4 { export var exports = 0; export var require = "require"; } \ No newline at end of file diff --git a/tests/cases/compiler/collisionThisExpressionAndAliasInGlobal.ts b/tests/cases/compiler/collisionThisExpressionAndAliasInGlobal.ts index 3ab1eb6f5d558..6c4d9c768a7be 100644 --- a/tests/cases/compiler/collisionThisExpressionAndAliasInGlobal.ts +++ b/tests/cases/compiler/collisionThisExpressionAndAliasInGlobal.ts @@ -1,4 +1,4 @@ -module a { +namespace a { export var b = 10; } var f = () => this; diff --git a/tests/cases/compiler/collisionThisExpressionAndModuleInGlobal.ts b/tests/cases/compiler/collisionThisExpressionAndModuleInGlobal.ts index 75d8ce21a4ae8..d830f14a811a2 100644 --- a/tests/cases/compiler/collisionThisExpressionAndModuleInGlobal.ts +++ b/tests/cases/compiler/collisionThisExpressionAndModuleInGlobal.ts @@ -1,4 +1,4 @@ -module _this { //Error +namespace _this { //Error class c { } } diff --git a/tests/cases/compiler/commentEmitAtEndOfFile1.ts b/tests/cases/compiler/commentEmitAtEndOfFile1.ts index 5713ef006e5fc..3758a95231b7c 100644 --- a/tests/cases/compiler/commentEmitAtEndOfFile1.ts +++ b/tests/cases/compiler/commentEmitAtEndOfFile1.ts @@ -1,12 +1,12 @@ -// @allowUnusedLabels: true - -// test -var f = '' -// test #2 -module foo { - function bar() { } -} -// test #3 -module empty { -} +// @allowUnusedLabels: true + +// test +var f = '' +// test #2 +namespace foo { + function bar() { } +} +// test #3 +namespace empty { +} // test #4 \ No newline at end of file diff --git a/tests/cases/compiler/commentOnAmbientModule.ts b/tests/cases/compiler/commentOnAmbientModule.ts index a8aeab7efba13..d878760fa2df5 100644 --- a/tests/cases/compiler/commentOnAmbientModule.ts +++ b/tests/cases/compiler/commentOnAmbientModule.ts @@ -5,18 +5,18 @@ */ /*! Don't keep this pinned comment */ -declare module C { +declare namespace C { function foo(); } // Don't keep this comment. -declare module D { +declare namespace D { class bar { } } //@filename: b.ts /// -declare module E { +declare namespace E { class foobar extends D.bar { foo(); } diff --git a/tests/cases/compiler/commentOnElidedModule1.ts b/tests/cases/compiler/commentOnElidedModule1.ts index 0cdb769427309..b3edad59ba269 100644 --- a/tests/cases/compiler/commentOnElidedModule1.ts +++ b/tests/cases/compiler/commentOnElidedModule1.ts @@ -5,14 +5,14 @@ */ /*! Don't keep this pinned comment */ -module ElidedModule { +namespace ElidedModule { } // Don't keep this comment. -module ElidedModule2 { +namespace ElidedModule2 { } //@filename: b.ts /// -module ElidedModule3 { +namespace ElidedModule3 { } \ No newline at end of file diff --git a/tests/cases/compiler/commentsExternalModules.ts b/tests/cases/compiler/commentsExternalModules.ts index 0448961142738..808b717fda565 100644 --- a/tests/cases/compiler/commentsExternalModules.ts +++ b/tests/cases/compiler/commentsExternalModules.ts @@ -5,7 +5,7 @@ // @Filename: commentsExternalModules_0.ts /** Module comment*/ -export module m1 { +export namespace m1 { /** b's comment*/ export var b: number; /** foo's comment*/ @@ -13,7 +13,7 @@ export module m1 { return b; } /** m2 comments*/ - export module m2 { + export namespace m2 { /** class comment;*/ export class c { }; @@ -29,7 +29,7 @@ m1.fooExport(); var myvar = new m1.m2.c(); /** Module comment */ -export module m4 { +export namespace m4 { /** b's comment */ export var b: number; /** foo's comment @@ -39,7 +39,7 @@ export module m4 { } /** m2 comments */ - export module m2 { + export namespace m2 { /** class comment; */ export class c { }; diff --git a/tests/cases/compiler/commentsExternalModules2.ts b/tests/cases/compiler/commentsExternalModules2.ts index b1dfb04902ba8..538579e8adf72 100644 --- a/tests/cases/compiler/commentsExternalModules2.ts +++ b/tests/cases/compiler/commentsExternalModules2.ts @@ -5,7 +5,7 @@ // @Filename: commentsExternalModules2_0.ts /** Module comment*/ -export module m1 { +export namespace m1 { /** b's comment*/ export var b: number; /** foo's comment*/ @@ -13,7 +13,7 @@ export module m1 { return b; } /** m2 comments*/ - export module m2 { + export namespace m2 { /** class comment;*/ export class c { }; @@ -29,7 +29,7 @@ m1.fooExport(); var myvar = new m1.m2.c(); /** Module comment */ -export module m4 { +export namespace m4 { /** b's comment */ export var b: number; /** foo's comment @@ -39,7 +39,7 @@ export module m4 { } /** m2 comments */ - export module m2 { + export namespace m2 { /** class comment; */ export class c { }; diff --git a/tests/cases/compiler/commentsExternalModules3.ts b/tests/cases/compiler/commentsExternalModules3.ts index a59458893ca2d..07d1d4bd40ce3 100644 --- a/tests/cases/compiler/commentsExternalModules3.ts +++ b/tests/cases/compiler/commentsExternalModules3.ts @@ -5,7 +5,7 @@ // @Filename: commentsExternalModules2_0.ts /** Module comment*/ -export module m1 { +export namespace m1 { /** b's comment*/ export var b: number; /** foo's comment*/ @@ -13,7 +13,7 @@ export module m1 { return b; } /** m2 comments*/ - export module m2 { + export namespace m2 { /** class comment;*/ export class c { }; @@ -29,7 +29,7 @@ m1.fooExport(); var myvar = new m1.m2.c(); /** Module comment */ -export module m4 { +export namespace m4 { /** b's comment */ export var b: number; /** foo's comment @@ -39,7 +39,7 @@ export module m4 { } /** m2 comments */ - export module m2 { + export namespace m2 { /** class comment; */ export class c { }; diff --git a/tests/cases/compiler/commentsFormatting.ts b/tests/cases/compiler/commentsFormatting.ts index c0f2d3093f9bf..716c8acabca17 100644 --- a/tests/cases/compiler/commentsFormatting.ts +++ b/tests/cases/compiler/commentsFormatting.ts @@ -2,7 +2,7 @@ // @declaration: true // @removeComments: false -module m { +namespace m { /** this is first line - aligned to class declaration * this is 4 spaces left aligned * this is 3 spaces left aligned diff --git a/tests/cases/compiler/commentsModules.ts b/tests/cases/compiler/commentsModules.ts index 943ef640545ab..e01112634638f 100644 --- a/tests/cases/compiler/commentsModules.ts +++ b/tests/cases/compiler/commentsModules.ts @@ -1,100 +1,100 @@ -// @target: ES5 -// @declaration: true -// @removeComments: false -/** Module comment*/ -module m1 { - /** b's comment*/ - export var b: number; - /** foo's comment*/ - function foo() { - return b; - } - /** m2 comments*/ - export module m2 { - /** class comment;*/ - export class c { - }; - /** i*/ - export var i = new c(); - } - /** exported function*/ - export function fooExport() { - return foo(); - } - - // shouldn't appear - export function foo2Export(/**hm*/ a: string) { - } - - /** foo3Export - * comment - */ - export function foo3Export() { - } - - /** foo4Export - * comment - */ - function foo4Export() { - } -} // trailing comment module -m1.fooExport(); -var myvar = new m1.m2.c(); -/** module comment of m2.m3*/ -module m2.m3 { - /** Exported class comment*/ - export class c { - } -} /* trailing dotted module comment*/ -new m2.m3.c(); -/** module comment of m3.m4.m5*/ -module m3.m4.m5 { - /** Exported class comment*/ - export class c { - } -} // trailing dotted module 2 -new m3.m4.m5.c(); -/** module comment of m4.m5.m6*/ -module m4.m5.m6 { - export module m7 { - /** Exported class comment*/ - export class c { - } - } /* trailing inner module */ /* multiple comments*/ -} -new m4.m5.m6.m7.c(); -/** module comment of m5.m6.m7*/ -module m5.m6.m7 { - /** module m8 comment*/ - export module m8 { - /** Exported class comment*/ - export class c { - } - } -} -new m5.m6.m7.m8.c(); -module m6.m7 { - export module m8 { - /** Exported class comment*/ - export class c { - } - } -} -new m6.m7.m8.c(); -module m7.m8 { - /** module m9 comment*/ - export module m9 { - /** Exported class comment*/ - export class c { - } - - /** class d */ - class d { - } - - // class e - export class e { - } - } -} +// @target: ES5 +// @declaration: true +// @removeComments: false +/** Module comment*/ +namespace m1 { + /** b's comment*/ + export var b: number; + /** foo's comment*/ + function foo() { + return b; + } + /** m2 comments*/ + export namespace m2 { + /** class comment;*/ + export class c { + }; + /** i*/ + export var i = new c(); + } + /** exported function*/ + export function fooExport() { + return foo(); + } + + // shouldn't appear + export function foo2Export(/**hm*/ a: string) { + } + + /** foo3Export + * comment + */ + export function foo3Export() { + } + + /** foo4Export + * comment + */ + function foo4Export() { + } +} // trailing comment module +m1.fooExport(); +var myvar = new m1.m2.c(); +/** module comment of m2.m3*/ +namespace m2.m3 { + /** Exported class comment*/ + export class c { + } +} /* trailing dotted module comment*/ +new m2.m3.c(); +/** module comment of m3.m4.m5*/ +namespace m3.m4.m5 { + /** Exported class comment*/ + export class c { + } +} // trailing dotted module 2 +new m3.m4.m5.c(); +/** module comment of m4.m5.m6*/ +namespace m4.m5.m6 { + export namespace m7 { + /** Exported class comment*/ + export class c { + } + } /* trailing inner module */ /* multiple comments*/ +} +new m4.m5.m6.m7.c(); +/** module comment of m5.m6.m7*/ +namespace m5.m6.m7 { + /** module m8 comment*/ + export namespace m8 { + /** Exported class comment*/ + export class c { + } + } +} +new m5.m6.m7.m8.c(); +namespace m6.m7 { + export namespace m8 { + /** Exported class comment*/ + export class c { + } + } +} +new m6.m7.m8.c(); +namespace m7.m8 { + /** module m9 comment*/ + export namespace m9 { + /** Exported class comment*/ + export class c { + } + + /** class d */ + class d { + } + + // class e + export class e { + } + } +} new m7.m8.m9.c(); \ No newline at end of file diff --git a/tests/cases/compiler/commentsMultiModuleMultiFile.ts b/tests/cases/compiler/commentsMultiModuleMultiFile.ts index 04066b975ab53..058a6400365b0 100644 --- a/tests/cases/compiler/commentsMultiModuleMultiFile.ts +++ b/tests/cases/compiler/commentsMultiModuleMultiFile.ts @@ -5,13 +5,13 @@ // @Filename: commentsMultiModuleMultiFile_0.ts /** this is multi declare module*/ -export module multiM { +export namespace multiM { /// class b comment export class b { } } /** thi is multi module 2*/ -export module multiM { +export namespace multiM { /** class c comment*/ export class c { } @@ -27,7 +27,7 @@ new multiM.c(); // @Filename: commentsMultiModuleMultiFile_1.ts import m = require('commentsMultiModuleMultiFile_0'); /** this is multi module 3 comment*/ -export module multiM { +export namespace multiM { /** class d comment*/ export class d { } diff --git a/tests/cases/compiler/commentsMultiModuleSingleFile.ts b/tests/cases/compiler/commentsMultiModuleSingleFile.ts index 651a3cb07ba08..3f7668d18af79 100644 --- a/tests/cases/compiler/commentsMultiModuleSingleFile.ts +++ b/tests/cases/compiler/commentsMultiModuleSingleFile.ts @@ -3,7 +3,7 @@ // @removeComments: false /** this is multi declare module*/ -module multiM { +namespace multiM { /** class b*/ export class b { } @@ -14,7 +14,7 @@ module multiM { } /// this is multi module 2 -module multiM { +namespace multiM { /** class c comment*/ export class c { } diff --git a/tests/cases/compiler/commentsdoNotEmitComments.ts b/tests/cases/compiler/commentsdoNotEmitComments.ts index e2aaa269e1f94..af831c74d4891 100644 --- a/tests/cases/compiler/commentsdoNotEmitComments.ts +++ b/tests/cases/compiler/commentsdoNotEmitComments.ts @@ -73,7 +73,7 @@ interface i1 { var i1_i: i1; /** this is module comment*/ -module m1 { +namespace m1 { /** class b */ export class b { constructor(public x: number) { @@ -82,7 +82,7 @@ module m1 { } /// module m2 - export module m2 { + export namespace m2 { } } diff --git a/tests/cases/compiler/commentsemitComments.ts b/tests/cases/compiler/commentsemitComments.ts index b20fbb9641a38..449bacec8af7a 100644 --- a/tests/cases/compiler/commentsemitComments.ts +++ b/tests/cases/compiler/commentsemitComments.ts @@ -73,7 +73,7 @@ interface i1 { var i1_i: i1; /** this is module comment*/ -module m1 { +namespace m1 { /** class b */ export class b { constructor(public x: number) { @@ -82,7 +82,7 @@ module m1 { } /// module m2 - export module m2 { + export namespace m2 { } } diff --git a/tests/cases/compiler/complexRecursiveCollections.ts b/tests/cases/compiler/complexRecursiveCollections.ts index ed8906ff44163..ab4e142ecab60 100644 --- a/tests/cases/compiler/complexRecursiveCollections.ts +++ b/tests/cases/compiler/complexRecursiveCollections.ts @@ -25,7 +25,7 @@ interface N2 extends N1 { // Test that complex recursive collections can pass the `extends` assignability check without // running out of memory. This bug was exposed in Typescript 2.4 when more generic signatures // started being checked. -declare module Immutable { +declare namespace Immutable { export function fromJS(jsValue: any, reviver?: (key: string | number, sequence: Collection.Keyed | Collection.Indexed, path?: Array) => any): any; export function is(first: any, second: any): boolean; export function hash(value: any): number; @@ -40,7 +40,7 @@ declare module Immutable { equals(other: any): boolean; hashCode(): number; } - export module List { + export namespace List { function isList(maybeList: any): maybeList is List; function of(...values: Array): List; } @@ -85,7 +85,7 @@ declare module Immutable { filter(predicate: (value: T, index: number, iter: this) => value is F, context?: any): List; filter(predicate: (value: T, index: number, iter: this) => any, context?: any): this; } - export module Map { + export namespace Map { function isMap(maybeMap: any): maybeMap is Map; function of(...keyValues: Array): Map; } @@ -131,7 +131,7 @@ declare module Immutable { filter(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Map; filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this; } - export module OrderedMap { + export namespace OrderedMap { function isOrderedMap(maybeOrderedMap: any): maybeOrderedMap is OrderedMap; } export function OrderedMap(collection: Iterable<[K, V]>): OrderedMap; @@ -150,7 +150,7 @@ declare module Immutable { filter(predicate: (value: V, key: K, iter: this) => value is F, context?: any): OrderedMap; filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this; } - export module Set { + export namespace Set { function isSet(maybeSet: any): maybeSet is Set; function of(...values: Array): Set; function fromKeys(iter: Collection): Set; @@ -182,7 +182,7 @@ declare module Immutable { filter(predicate: (value: T, key: never, iter: this) => value is F, context?: any): Set; filter(predicate: (value: T, key: never, iter: this) => any, context?: any): this; } - export module OrderedSet { + export namespace OrderedSet { function isOrderedSet(maybeOrderedSet: any): boolean; function of(...values: Array): OrderedSet; function fromKeys(iter: Collection): OrderedSet; @@ -203,7 +203,7 @@ declare module Immutable { zipWith(zipper: (value: T, otherValue: U, thirdValue: V) => Z, otherCollection: Collection, thirdCollection: Collection): OrderedSet; zipWith(zipper: (...any: Array) => Z, ...collections: Array>): OrderedSet; } - export module Stack { + export namespace Stack { function isStack(maybeStack: any): maybeStack is Stack; function of(...values: Array): Stack; } @@ -234,7 +234,7 @@ declare module Immutable { } export function Range(start?: number, end?: number, step?: number): Seq.Indexed; export function Repeat(value: T, times?: number): Seq.Indexed; - export module Record { + export namespace Record { export function isRecord(maybeRecord: any): maybeRecord is Record.Instance; export function getDescriptiveName(record: Instance): string; export interface Class { @@ -283,10 +283,10 @@ declare module Immutable { } } export function Record(defaultValues: T, name?: string): Record.Class; - export module Seq { + export namespace Seq { function isSeq(maybeSeq: any): maybeSeq is Seq.Indexed | Seq.Keyed; function of(...values: Array): Seq.Indexed; - export module Keyed {} + export namespace Keyed {} export function Keyed(collection: Iterable<[K, V]>): Seq.Keyed; export function Keyed(obj: {[key: string]: V}): Seq.Keyed; export function Keyed(): Seq.Keyed; @@ -304,7 +304,7 @@ declare module Immutable { filter(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Seq.Keyed; filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this; } - module Indexed { + namespace Indexed { function of(...values: Array): Seq.Indexed; } export function Indexed(): Seq.Indexed; @@ -320,7 +320,7 @@ declare module Immutable { filter(predicate: (value: T, index: number, iter: this) => value is F, context?: any): Seq.Indexed; filter(predicate: (value: T, index: number, iter: this) => any, context?: any): this; } - export module Set { + export namespace Set { function of(...values: Array): Seq.Set; } export function Set(): Seq.Set; @@ -354,12 +354,12 @@ declare module Immutable { filter(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Seq; filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this; } - export module Collection { + export namespace Collection { function isKeyed(maybeKeyed: any): maybeKeyed is Collection.Keyed; function isIndexed(maybeIndexed: any): maybeIndexed is Collection.Indexed; function isAssociative(maybeAssociative: any): maybeAssociative is Collection.Keyed | Collection.Indexed; function isOrdered(maybeOrdered: any): boolean; - export module Keyed {} + export namespace Keyed {} export function Keyed(collection: Iterable<[K, V]>): Collection.Keyed; export function Keyed(obj: {[key: string]: V}): Collection.Keyed; export interface Keyed extends Collection { @@ -378,7 +378,7 @@ declare module Immutable { filter(predicate: (value: V, key: K, iter: this) => any, context?: any): this; [Symbol.iterator](): IterableIterator<[K, V]>; } - export module Indexed {} + export namespace Indexed {} export function Indexed(collection: Iterable): Collection.Indexed; export interface Indexed extends Collection { toJS(): Array; @@ -410,7 +410,7 @@ declare module Immutable { filter(predicate: (value: T, index: number, iter: this) => any, context?: any): this; [Symbol.iterator](): IterableIterator; } - export module Set {} + export namespace Set {} export function Set(collection: Iterable): Collection.Set; export interface Set extends Collection { toJS(): Array; diff --git a/tests/cases/compiler/complicatedPrivacy.ts b/tests/cases/compiler/complicatedPrivacy.ts index 6fe144d237c80..ec86b63660907 100644 --- a/tests/cases/compiler/complicatedPrivacy.ts +++ b/tests/cases/compiler/complicatedPrivacy.ts @@ -1,6 +1,6 @@ // @target: es5 -module m1 { - export module m2 { +namespace m1 { + export namespace m2 { export function f1(c1: C1) { @@ -42,7 +42,7 @@ module m1 { new (arg1: C1) : C1 }) { } - module m3 { + namespace m3 { function f2(f1: C1) { } @@ -68,8 +68,8 @@ module m1 { class C2 { } -module m2 { - export module m3 { +namespace m2 { + export namespace m3 { export class c_pr implements mglo5.i5, mglo5.i6 { f1() { @@ -77,12 +77,12 @@ module m2 { } } - module m4 { + namespace m4 { class C { } - module m5 { + namespace m5 { - export module m6 { + export namespace m6 { function f1() { return new C(); } @@ -93,7 +93,7 @@ module m2 { } } -module mglo5 { +namespace mglo5 { export interface i5 { f1(): string; } diff --git a/tests/cases/compiler/compoundVarDecl1.ts b/tests/cases/compiler/compoundVarDecl1.ts index fe5c799b2210a..db6ddd5cd84b8 100644 --- a/tests/cases/compiler/compoundVarDecl1.ts +++ b/tests/cases/compiler/compoundVarDecl1.ts @@ -1,3 +1,3 @@ -module Foo { var a = 1, b = 1; a = b + 2; } +namespace Foo { var a = 1, b = 1; a = b + 2; } var foo = 4, bar = 5; \ No newline at end of file diff --git a/tests/cases/compiler/constDeclarations-access3.ts b/tests/cases/compiler/constDeclarations-access3.ts index 370288dab9734..344af8229320f 100644 --- a/tests/cases/compiler/constDeclarations-access3.ts +++ b/tests/cases/compiler/constDeclarations-access3.ts @@ -1,7 +1,7 @@ // @target: ES6 -module M { +namespace M { export const x = 0; } diff --git a/tests/cases/compiler/constDeclarations-access4.ts b/tests/cases/compiler/constDeclarations-access4.ts index 492f6a31d6df7..3ea4f54e8dfd3 100644 --- a/tests/cases/compiler/constDeclarations-access4.ts +++ b/tests/cases/compiler/constDeclarations-access4.ts @@ -1,7 +1,7 @@ // @target: ES6 -declare module M { +declare namespace M { const x: number; } diff --git a/tests/cases/compiler/constDeclarations-ambient-errors.ts b/tests/cases/compiler/constDeclarations-ambient-errors.ts index c07bfb01810a5..ecc6521c208b7 100644 --- a/tests/cases/compiler/constDeclarations-ambient-errors.ts +++ b/tests/cases/compiler/constDeclarations-ambient-errors.ts @@ -5,7 +5,7 @@ declare const c1: boolean = true; declare const c2: number = 0; declare const c3 = null, c4 :string = "", c5: any = 0; -declare module M { +declare namespace M { const c6 = 0; const c7: number = 7; } \ No newline at end of file diff --git a/tests/cases/compiler/constDeclarations-ambient.ts b/tests/cases/compiler/constDeclarations-ambient.ts index dcd4cb9fc726d..e9fdab5faabb6 100644 --- a/tests/cases/compiler/constDeclarations-ambient.ts +++ b/tests/cases/compiler/constDeclarations-ambient.ts @@ -5,7 +5,7 @@ declare const c1: boolean; declare const c2: number; declare const c3, c4 :string, c5: any; -declare module M { +declare namespace M { const c6; const c7: number; } \ No newline at end of file diff --git a/tests/cases/compiler/constDeclarations-scopes.ts b/tests/cases/compiler/constDeclarations-scopes.ts index d0c1df425b618..3fe6bf707fd2c 100644 --- a/tests/cases/compiler/constDeclarations-scopes.ts +++ b/tests/cases/compiler/constDeclarations-scopes.ts @@ -101,7 +101,7 @@ var F3 = function () { }; // modules -module m { +namespace m { const c = 0; n = c; diff --git a/tests/cases/compiler/constDeclarations-validContexts.ts b/tests/cases/compiler/constDeclarations-validContexts.ts index 63af6d169597d..323eba564505a 100644 --- a/tests/cases/compiler/constDeclarations-validContexts.ts +++ b/tests/cases/compiler/constDeclarations-validContexts.ts @@ -86,7 +86,7 @@ var F3 = function () { }; // modules -module m { +namespace m { const c22 = 0; { diff --git a/tests/cases/compiler/constDeclarations2.ts b/tests/cases/compiler/constDeclarations2.ts index a221c3563bae0..75d39f8eb81bf 100644 --- a/tests/cases/compiler/constDeclarations2.ts +++ b/tests/cases/compiler/constDeclarations2.ts @@ -2,7 +2,7 @@ // @declaration: true // No error -module M { +namespace M { export const c1 = false; export const c2: number = 23; export const c3 = 0, c4 :string = "", c5 = null; diff --git a/tests/cases/compiler/constEnumErrors.ts b/tests/cases/compiler/constEnumErrors.ts index ca2289ef3bf33..68f87ca807097 100644 --- a/tests/cases/compiler/constEnumErrors.ts +++ b/tests/cases/compiler/constEnumErrors.ts @@ -3,7 +3,7 @@ const enum E { A } -module E { +namespace E { var x = 1; } diff --git a/tests/cases/compiler/constEnumMergingWithValues1.ts b/tests/cases/compiler/constEnumMergingWithValues1.ts index 0c2919c70df08..cb54a40624bf2 100644 --- a/tests/cases/compiler/constEnumMergingWithValues1.ts +++ b/tests/cases/compiler/constEnumMergingWithValues1.ts @@ -2,7 +2,7 @@ //@filename: m1.ts function foo() {} -module foo { +namespace foo { const enum E { X } } diff --git a/tests/cases/compiler/constEnumMergingWithValues2.ts b/tests/cases/compiler/constEnumMergingWithValues2.ts index 3f30fdf4d3ac2..be4ab146172a4 100644 --- a/tests/cases/compiler/constEnumMergingWithValues2.ts +++ b/tests/cases/compiler/constEnumMergingWithValues2.ts @@ -2,7 +2,7 @@ //@filename: m1.ts class foo {} -module foo { +namespace foo { const enum E { X } } diff --git a/tests/cases/compiler/constEnumMergingWithValues3.ts b/tests/cases/compiler/constEnumMergingWithValues3.ts index 8edadc2eb3871..e6dea73e8346e 100644 --- a/tests/cases/compiler/constEnumMergingWithValues3.ts +++ b/tests/cases/compiler/constEnumMergingWithValues3.ts @@ -2,7 +2,7 @@ //@filename: m1.ts enum foo { A } -module foo { +namespace foo { const enum E { X } } diff --git a/tests/cases/compiler/constEnumMergingWithValues4.ts b/tests/cases/compiler/constEnumMergingWithValues4.ts index 036c62c1de435..5047df678ce85 100644 --- a/tests/cases/compiler/constEnumMergingWithValues4.ts +++ b/tests/cases/compiler/constEnumMergingWithValues4.ts @@ -1,11 +1,11 @@ //@module: amd //@filename: m1.ts -module foo { +namespace foo { const enum E { X } } -module foo { +namespace foo { var x = 1; } diff --git a/tests/cases/compiler/constEnumMergingWithValues5.ts b/tests/cases/compiler/constEnumMergingWithValues5.ts index aebb0abfaec0e..847978bde5377 100644 --- a/tests/cases/compiler/constEnumMergingWithValues5.ts +++ b/tests/cases/compiler/constEnumMergingWithValues5.ts @@ -2,7 +2,7 @@ //@filename: m1.ts //@preserveConstEnums: true -module foo { +namespace foo { const enum E { X } } diff --git a/tests/cases/compiler/constEnumNamespaceReferenceCausesNoImport2.ts b/tests/cases/compiler/constEnumNamespaceReferenceCausesNoImport2.ts index 06abeafd1fbaa..2d6297c08e361 100644 --- a/tests/cases/compiler/constEnumNamespaceReferenceCausesNoImport2.ts +++ b/tests/cases/compiler/constEnumNamespaceReferenceCausesNoImport2.ts @@ -2,7 +2,7 @@ // @noTypesAndSymbols: true // @filename: foo.ts -export module ConstEnumOnlyModule { +export namespace ConstEnumOnlyModule { export const enum ConstFooEnum { Some, Values, diff --git a/tests/cases/compiler/constEnumOnlyModuleMerging.ts b/tests/cases/compiler/constEnumOnlyModuleMerging.ts index 0b1b9e3f0cba2..2c277c4acab29 100644 --- a/tests/cases/compiler/constEnumOnlyModuleMerging.ts +++ b/tests/cases/compiler/constEnumOnlyModuleMerging.ts @@ -1,12 +1,12 @@ -module Outer { +namespace Outer { export var x = 1; } -module Outer { +namespace Outer { export const enum A { X } } -module B { +namespace B { import O = Outer; var x = O.A.X; var y = O.x; diff --git a/tests/cases/compiler/constEnums.ts b/tests/cases/compiler/constEnums.ts index 00d5b2d6b72c3..77e5a8ec0da3a 100644 --- a/tests/cases/compiler/constEnums.ts +++ b/tests/cases/compiler/constEnums.ts @@ -47,9 +47,9 @@ const enum Comments { "-->", } -module A { - export module B { - export module C { +namespace A { + export namespace B { + export namespace C { export const enum E { V1 = 1, V2 = A.B.C.E.V1 | 100 @@ -58,9 +58,9 @@ module A { } } -module A { - export module B { - export module C { +namespace A { + export namespace B { + export namespace C { export const enum E { V3 = A.B.C.E["V2"] & 200, V4 = A.B.C.E[`V1`] << 1, @@ -69,9 +69,9 @@ module A { } } -module A1 { - export module B { - export module C { +namespace A1 { + export namespace B { + export namespace C { export const enum E { V1 = 10, V2 = 110, @@ -80,16 +80,16 @@ module A1 { } } -module A2 { - export module B { - export module C { +namespace A2 { + export namespace B { + export namespace C { export const enum E { V1 = 10, V2 = 110, } } // module C will be classified as value - export module C { + export namespace C { var x = 1 } } diff --git a/tests/cases/compiler/constructorArgWithGenericCallSignature.ts b/tests/cases/compiler/constructorArgWithGenericCallSignature.ts index 42601614cb305..dabfeccc148d1 100644 --- a/tests/cases/compiler/constructorArgWithGenericCallSignature.ts +++ b/tests/cases/compiler/constructorArgWithGenericCallSignature.ts @@ -1,4 +1,4 @@ -module Test { +namespace Test { export interface MyFunc { (value1: T): T; } diff --git a/tests/cases/compiler/constructorOverloads4.ts b/tests/cases/compiler/constructorOverloads4.ts index c6fc7dc062548..03481da12e15a 100644 --- a/tests/cases/compiler/constructorOverloads4.ts +++ b/tests/cases/compiler/constructorOverloads4.ts @@ -1,4 +1,4 @@ -declare module M { +declare namespace M { export class Function { constructor(...args: string[]); } diff --git a/tests/cases/compiler/constructorOverloads5.ts b/tests/cases/compiler/constructorOverloads5.ts index 18cc4803a2a60..eb949cd85522b 100644 --- a/tests/cases/compiler/constructorOverloads5.ts +++ b/tests/cases/compiler/constructorOverloads5.ts @@ -1,6 +1,6 @@ interface IArguments {} - declare module M { + declare namespace M { export function RegExp(pattern: string): RegExp; export function RegExp(pattern: string, flags: string): RegExp; export class RegExp { diff --git a/tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts b/tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts index 3cfe651a160d6..060470e1b454f 100644 --- a/tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts +++ b/tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts @@ -14,7 +14,7 @@ declare module "fs" { import fs = module("fs"); -module TypeScriptAllInOne { +namespace TypeScriptAllInOne { export class Program { static Main(...args: string[]) { try { diff --git a/tests/cases/compiler/contextualTyping.ts b/tests/cases/compiler/contextualTyping.ts index 73a75d0146623..c8df0a473403c 100644 --- a/tests/cases/compiler/contextualTyping.ts +++ b/tests/cases/compiler/contextualTyping.ts @@ -19,7 +19,7 @@ class C1T5 { } // CONTEXT: Module property declaration -module C2T5 { +namespace C2T5 { export var foo: (i: number, s: string) => number = function(i) { return i; } @@ -64,7 +64,7 @@ class C4T5 { } // CONTEXT: Module property assignment -module C5T5 { +namespace C5T5 { export var foo: (i: number, s: string) => string; foo = function(i, s) { return s; diff --git a/tests/cases/compiler/convertKeywordsYes.ts b/tests/cases/compiler/convertKeywordsYes.ts index ad50ce50e8edf..feb273bb688fa 100644 --- a/tests/cases/compiler/convertKeywordsYes.ts +++ b/tests/cases/compiler/convertKeywordsYes.ts @@ -287,7 +287,7 @@ enum bigEnum { with, } -module bigModule { +namespace bigModule { class constructor { } class implements { } class interface { } diff --git a/tests/cases/compiler/covariance1.ts b/tests/cases/compiler/covariance1.ts index b2f5698cee20b..35c2ddeccee1e 100644 --- a/tests/cases/compiler/covariance1.ts +++ b/tests/cases/compiler/covariance1.ts @@ -1,4 +1,4 @@ -module M { +namespace M { interface X { m1:number; } export class XX implements X { constructor(public m1:number) { } } diff --git a/tests/cases/compiler/crashRegressionTest.ts b/tests/cases/compiler/crashRegressionTest.ts index 1e890932a01cd..fb7b1696369f1 100644 --- a/tests/cases/compiler/crashRegressionTest.ts +++ b/tests/cases/compiler/crashRegressionTest.ts @@ -1,4 +1,4 @@ -module MsPortal.Util.TemplateEngine { +namespace MsPortal.Util.TemplateEngine { "use strict"; interface TemplateKeyValue { diff --git a/tests/cases/compiler/declFileAliasUseBeforeDeclaration2.ts b/tests/cases/compiler/declFileAliasUseBeforeDeclaration2.ts index 25f19ec276e33..76412db373da4 100644 --- a/tests/cases/compiler/declFileAliasUseBeforeDeclaration2.ts +++ b/tests/cases/compiler/declFileAliasUseBeforeDeclaration2.ts @@ -2,7 +2,7 @@ //@declaration: true declare module "test" { - module A { + namespace A { class C { } } diff --git a/tests/cases/compiler/declFileAmbientExternalModuleWithSingleExportedModule.ts b/tests/cases/compiler/declFileAmbientExternalModuleWithSingleExportedModule.ts index ba71f1248eb45..e339aa38ed303 100644 --- a/tests/cases/compiler/declFileAmbientExternalModuleWithSingleExportedModule.ts +++ b/tests/cases/compiler/declFileAmbientExternalModuleWithSingleExportedModule.ts @@ -1,18 +1,18 @@ -//@module: commonjs -// @declaration: true - -// @Filename: declFileAmbientExternalModuleWithSingleExportedModule_0.ts -declare module "SubModule" { - export module m { - export module m3 { - interface c { - } - } - } -} - -// @Filename: declFileAmbientExternalModuleWithSingleExportedModule_1.ts -/// -import SubModule = require('SubModule'); -export var x: SubModule.m.m3.c; - +//@module: commonjs +// @declaration: true + +// @Filename: declFileAmbientExternalModuleWithSingleExportedModule_0.ts +declare module "SubModule" { + export namespace m { + export namespace m3 { + interface c { + } + } + } +} + +// @Filename: declFileAmbientExternalModuleWithSingleExportedModule_1.ts +/// +import SubModule = require('SubModule'); +export var x: SubModule.m.m3.c; + diff --git a/tests/cases/compiler/declFileExportAssignmentImportInternalModule.ts b/tests/cases/compiler/declFileExportAssignmentImportInternalModule.ts index 147d90d8e0684..08e2af20a2e52 100644 --- a/tests/cases/compiler/declFileExportAssignmentImportInternalModule.ts +++ b/tests/cases/compiler/declFileExportAssignmentImportInternalModule.ts @@ -1,7 +1,7 @@ //@module: commonjs // @declaration: true -module m3 { - export module m2 { +namespace m3 { + export namespace m2 { export interface connectModule { (res, req, next): void; } diff --git a/tests/cases/compiler/declFileExportImportChain.ts b/tests/cases/compiler/declFileExportImportChain.ts index deeb2a89952af..e83a26f6a81d7 100644 --- a/tests/cases/compiler/declFileExportImportChain.ts +++ b/tests/cases/compiler/declFileExportImportChain.ts @@ -2,8 +2,8 @@ //@declaration: true // @Filename: declFileExportImportChain_a.ts -module m1 { - export module m2 { +namespace m1 { + export namespace m2 { export class c1 { } } diff --git a/tests/cases/compiler/declFileExportImportChain2.ts b/tests/cases/compiler/declFileExportImportChain2.ts index 6cf915c967332..c36eb6e06bedb 100644 --- a/tests/cases/compiler/declFileExportImportChain2.ts +++ b/tests/cases/compiler/declFileExportImportChain2.ts @@ -2,8 +2,8 @@ //@declaration: true // @Filename: declFileExportImportChain2_a.ts -module m1 { - export module m2 { +namespace m1 { + export namespace m2 { export class c1 { } } diff --git a/tests/cases/compiler/declFileGenericType.ts b/tests/cases/compiler/declFileGenericType.ts index c001707acc981..940d727415fdc 100644 --- a/tests/cases/compiler/declFileGenericType.ts +++ b/tests/cases/compiler/declFileGenericType.ts @@ -1,6 +1,6 @@ //@module: commonjs // @declaration: true -export module C { +export namespace C { export class A{ } export class B { } diff --git a/tests/cases/compiler/declFileGenericType2.ts b/tests/cases/compiler/declFileGenericType2.ts index fbff9ce4c0280..aa4a17c0502d2 100644 --- a/tests/cases/compiler/declFileGenericType2.ts +++ b/tests/cases/compiler/declFileGenericType2.ts @@ -17,12 +17,12 @@ declare module templa.mvc.composite { getControllers(): mvc.IController[]; } } -module templa.dom.mvc { +namespace templa.dom.mvc { export interface IElementController extends templa.mvc.IController { } } // Module -module templa.dom.mvc { +namespace templa.dom.mvc { export class AbstractElementController extends templa.mvc.AbstractController implements IElementController { constructor() { @@ -31,7 +31,7 @@ module templa.dom.mvc { } } // Module -module templa.dom.mvc.composite { +namespace templa.dom.mvc.composite { export class AbstractCompositeElementController extends templa.dom.mvc.AbstractElementController { public _controllers: templa.mvc.IController[]; constructor() { diff --git a/tests/cases/compiler/declFileImportChainInExportAssignment.ts b/tests/cases/compiler/declFileImportChainInExportAssignment.ts index da18e81a6c651..7a5f2b771a637 100644 --- a/tests/cases/compiler/declFileImportChainInExportAssignment.ts +++ b/tests/cases/compiler/declFileImportChainInExportAssignment.ts @@ -1,7 +1,7 @@ // @declaration: true // @module: commonjs -module m { - export module c { +namespace m { + export namespace c { export class c { } } diff --git a/tests/cases/compiler/declFileImportModuleWithExportAssignment.ts b/tests/cases/compiler/declFileImportModuleWithExportAssignment.ts index 3a619905768c1..fbc78ef134449 100644 --- a/tests/cases/compiler/declFileImportModuleWithExportAssignment.ts +++ b/tests/cases/compiler/declFileImportModuleWithExportAssignment.ts @@ -2,7 +2,7 @@ // @declaration: true // @Filename: declFileImportModuleWithExportAssignment_0.ts -module m2 { +namespace m2 { export interface connectModule { (res, req, next): void; } diff --git a/tests/cases/compiler/declFileInternalAliases.ts b/tests/cases/compiler/declFileInternalAliases.ts index 3378a794c2f9b..be54b4a1857bd 100644 --- a/tests/cases/compiler/declFileInternalAliases.ts +++ b/tests/cases/compiler/declFileInternalAliases.ts @@ -1,13 +1,13 @@ // @declaration: true -module m { +namespace m { export class c { } } -module m1 { +namespace m1 { import x = m.c; export var d = new x(); // emit the type as m.c } -module m2 { +namespace m2 { export import x = m.c; export var d = new x(); // emit the type as x } \ No newline at end of file diff --git a/tests/cases/compiler/declFileModuleAssignmentInObjectLiteralProperty.ts b/tests/cases/compiler/declFileModuleAssignmentInObjectLiteralProperty.ts index 3ec1a0cda0133..e009d0fc78752 100644 --- a/tests/cases/compiler/declFileModuleAssignmentInObjectLiteralProperty.ts +++ b/tests/cases/compiler/declFileModuleAssignmentInObjectLiteralProperty.ts @@ -1,6 +1,6 @@ // @declaration: true -module m1 { +namespace m1 { export class c { } } diff --git a/tests/cases/compiler/declFileModuleContinuation.ts b/tests/cases/compiler/declFileModuleContinuation.ts index 7cacfc5168212..8f343960ea26a 100644 --- a/tests/cases/compiler/declFileModuleContinuation.ts +++ b/tests/cases/compiler/declFileModuleContinuation.ts @@ -1,10 +1,10 @@ -// @declaration: true -module A.C { - export interface Z { - } -} - -module A.B.C { - export class W implements A.C.Z { - } +// @declaration: true +namespace A.C { + export interface Z { + } +} + +namespace A.B.C { + export class W implements A.C.Z { + } } \ No newline at end of file diff --git a/tests/cases/compiler/declFileModuleWithPropertyOfTypeModule.ts b/tests/cases/compiler/declFileModuleWithPropertyOfTypeModule.ts index fba7b8ad397a0..8d9f3ba6f6f4c 100644 --- a/tests/cases/compiler/declFileModuleWithPropertyOfTypeModule.ts +++ b/tests/cases/compiler/declFileModuleWithPropertyOfTypeModule.ts @@ -1,6 +1,6 @@ // @declaration: true -module m { +namespace m { export class c { } diff --git a/tests/cases/compiler/declFileTypeAnnotationArrayType.ts b/tests/cases/compiler/declFileTypeAnnotationArrayType.ts index 4bb99032a6089..5a179596690aa 100644 --- a/tests/cases/compiler/declFileTypeAnnotationArrayType.ts +++ b/tests/cases/compiler/declFileTypeAnnotationArrayType.ts @@ -3,7 +3,7 @@ class c { } -module m { +namespace m { export class c { } export class g { diff --git a/tests/cases/compiler/declFileTypeAnnotationTupleType.ts b/tests/cases/compiler/declFileTypeAnnotationTupleType.ts index aafbfd02eae1b..2df63f55004ad 100644 --- a/tests/cases/compiler/declFileTypeAnnotationTupleType.ts +++ b/tests/cases/compiler/declFileTypeAnnotationTupleType.ts @@ -3,7 +3,7 @@ class c { } -module m { +namespace m { export class c { } export class g { diff --git a/tests/cases/compiler/declFileTypeAnnotationTypeAlias.ts b/tests/cases/compiler/declFileTypeAnnotationTypeAlias.ts index 447921f3f4a16..5af929c20166c 100644 --- a/tests/cases/compiler/declFileTypeAnnotationTypeAlias.ts +++ b/tests/cases/compiler/declFileTypeAnnotationTypeAlias.ts @@ -2,7 +2,7 @@ // @module: commonjs // @declaration: true -module M { +namespace M { export type Value = string | number | boolean; export var x: Value; @@ -11,7 +11,7 @@ module M { export type C = c; - export module m { + export namespace m { export class c { } } @@ -25,9 +25,9 @@ interface Window { someMethod(); } -module M { +namespace M { export type W = Window | string; - export module N { + export namespace N { export class Window { } export var p: W; } diff --git a/tests/cases/compiler/declFileTypeAnnotationTypeLiteral.ts b/tests/cases/compiler/declFileTypeAnnotationTypeLiteral.ts index e41495b68de15..9d1ed91f3e51a 100644 --- a/tests/cases/compiler/declFileTypeAnnotationTypeLiteral.ts +++ b/tests/cases/compiler/declFileTypeAnnotationTypeLiteral.ts @@ -5,7 +5,7 @@ class c { } class g { } -module m { +namespace m { export class c { } } diff --git a/tests/cases/compiler/declFileTypeAnnotationTypeQuery.ts b/tests/cases/compiler/declFileTypeAnnotationTypeQuery.ts index d3cde6a1faa97..487e9a6c97b07 100644 --- a/tests/cases/compiler/declFileTypeAnnotationTypeQuery.ts +++ b/tests/cases/compiler/declFileTypeAnnotationTypeQuery.ts @@ -3,7 +3,7 @@ class c { } -module m { +namespace m { export class c { } export class g { diff --git a/tests/cases/compiler/declFileTypeAnnotationTypeReference.ts b/tests/cases/compiler/declFileTypeAnnotationTypeReference.ts index e20ecff32f0f6..5e551be023d08 100644 --- a/tests/cases/compiler/declFileTypeAnnotationTypeReference.ts +++ b/tests/cases/compiler/declFileTypeAnnotationTypeReference.ts @@ -3,7 +3,7 @@ class c { } -module m { +namespace m { export class c { } export class g { diff --git a/tests/cases/compiler/declFileTypeAnnotationUnionType.ts b/tests/cases/compiler/declFileTypeAnnotationUnionType.ts index 4a9738349152e..d2a5e71a3219c 100644 --- a/tests/cases/compiler/declFileTypeAnnotationUnionType.ts +++ b/tests/cases/compiler/declFileTypeAnnotationUnionType.ts @@ -4,7 +4,7 @@ class c { private p: string; } -module m { +namespace m { export class c { private q: string; } diff --git a/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts b/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts index 6625973717f6a..ae660b97c9f7f 100644 --- a/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts +++ b/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts @@ -2,14 +2,14 @@ // @module: commonjs // @declaration: true -module m { +namespace m { class private1 { } export class public1 { } - module m2 { + namespace m2 { export class public2 { } } diff --git a/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts b/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts index 8ae9d5bcf3fe4..06b544f26fd49 100644 --- a/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts +++ b/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts @@ -2,7 +2,7 @@ // @module: commonjs // @declaration: true -module m { +namespace m { class private1 { } @@ -30,7 +30,7 @@ module m { export function foo14(param = new public1()) { } - module m2 { + namespace m2 { export class public2 { } } diff --git a/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts b/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts index 880cba6d0cbea..b5f250e1126ba 100644 --- a/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts +++ b/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts @@ -2,7 +2,7 @@ // @module: commonjs // @declaration: true -module m { +namespace m { class private1 { } @@ -38,7 +38,7 @@ module m { return new public1(); } - module m2 { + namespace m2 { export class public2 { } } diff --git a/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts b/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts index 6431dffd20fb0..f43d2b1073c9f 100644 --- a/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts +++ b/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts @@ -6,28 +6,28 @@ interface Window { someMethod(); } -module M { +namespace M { type W = Window | string; - export module N { + export namespace N { export class Window { } export var p: W; // Should report error that W is private } } -module M1 { +namespace M1 { export type W = Window | string; - export module N { + export namespace N { export class Window { } export var p: W; // No error } } -module M2 { +namespace M2 { class private1 { } class public1 { } - module m3 { + namespace m3 { export class public1 { } } diff --git a/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts b/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts index 65af116c193a0..9a32ae8e8723b 100644 --- a/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts +++ b/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts @@ -2,10 +2,10 @@ // @module: commonjs // @declaration: true -module m { +namespace m { class private1 { } - module m2 { + namespace m2 { export class public1 { } } diff --git a/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts b/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts index fa2558f5a1547..856abc334f530 100644 --- a/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts +++ b/tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts @@ -2,7 +2,7 @@ // @module: commonjs // @declaration: true -module m { +namespace m { class private1 { } @@ -22,7 +22,7 @@ module m { export var k2: public1; export var l2 = new public1(); - module m2 { + namespace m2 { export class public2 { } } diff --git a/tests/cases/compiler/declFileTypeofInAnonymousType.ts b/tests/cases/compiler/declFileTypeofInAnonymousType.ts index 928052bbffb61..9715e61ba307e 100644 --- a/tests/cases/compiler/declFileTypeofInAnonymousType.ts +++ b/tests/cases/compiler/declFileTypeofInAnonymousType.ts @@ -1,6 +1,6 @@ // @declaration: true -module m1 { +namespace m1 { export class c { } export enum e { diff --git a/tests/cases/compiler/declFileTypeofModule.ts b/tests/cases/compiler/declFileTypeofModule.ts index 0f786709aa1d2..c85bfbe253900 100644 --- a/tests/cases/compiler/declFileTypeofModule.ts +++ b/tests/cases/compiler/declFileTypeofModule.ts @@ -1,12 +1,12 @@ // @declaration: true -module m1 { +namespace m1 { export var c: string; } var m1_1 = m1; var m1_2: typeof m1; -module m2 { +namespace m2 { export var d: typeof m2; } diff --git a/tests/cases/compiler/declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts b/tests/cases/compiler/declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts index 2fd1b0af9a03f..27385dfc3f686 100644 --- a/tests/cases/compiler/declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts +++ b/tests/cases/compiler/declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts @@ -5,14 +5,14 @@ declare module A.B.Base { id: number; } } -module X.Y.base { +namespace X.Y.base { export class W extends A.B.Base.W { name: string; } } -module X.Y.base.Z { +namespace X.Y.base.Z { export class W extends X.Y.base.W { value: boolean; diff --git a/tests/cases/compiler/declFileWithErrorsInInputDeclarationFile.ts b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFile.ts index fa29ce429d469..2c1e9f518719b 100644 --- a/tests/cases/compiler/declFileWithErrorsInInputDeclarationFile.ts +++ b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFile.ts @@ -1,11 +1,11 @@ // @declaration: true // @Filename: declFile.d.ts -declare module M { +declare namespace M { declare var x; declare function f(); - declare module N { } + declare namespace N { } declare class C { } } diff --git a/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts index 3bad7e60698a9..7a79a1db225f5 100644 --- a/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts +++ b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts @@ -2,11 +2,11 @@ // @outFile: out.js // @Filename: declFile.d.ts -declare module M { +declare namespace M { declare var x; declare function f(); - declare module N { } + declare namespace N { } declare class C { } } diff --git a/tests/cases/compiler/declFileWithExtendsClauseThatHasItsContainerNameConflict.ts b/tests/cases/compiler/declFileWithExtendsClauseThatHasItsContainerNameConflict.ts index 27f57cbbb8793..5d41efdb0c6bf 100644 --- a/tests/cases/compiler/declFileWithExtendsClauseThatHasItsContainerNameConflict.ts +++ b/tests/cases/compiler/declFileWithExtendsClauseThatHasItsContainerNameConflict.ts @@ -5,14 +5,14 @@ declare module A.B.C { } } -module A.B { +namespace A.B { export class EventManager { id: number; } } -module A.B.C { +namespace A.B.C { export class ContextMenu extends EventManager { name: string; } diff --git a/tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause1.ts b/tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause1.ts index 03e4f6f742552..c0dcd6fc1eb10 100644 --- a/tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause1.ts +++ b/tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause1.ts @@ -1,12 +1,12 @@ // @declaration: true -module X.A.C { - export interface Z { - } +namespace X.A.C { + export interface Z { + } } -module X.A.B.C { - module A { - } - export class W implements X.A.C.Z { // This needs to be referred as X.A.C.Z as A has conflict - } +namespace X.A.B.C { + namespace A { + } + export class W implements X.A.C.Z { // This needs to be referred as X.A.C.Z as A has conflict + } } \ No newline at end of file diff --git a/tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause2.ts b/tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause2.ts index 2b27d4353053c..3699300751e52 100644 --- a/tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause2.ts +++ b/tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause2.ts @@ -1,15 +1,15 @@ // @declaration: true -module X.A.C { - export interface Z { - } -} -module X.A.B.C { - export class W implements A.C.Z { // This can refer to it as A.C.Z - } -} - -module X.A.B.C { - module A { - } +namespace X.A.C { + export interface Z { + } +} +namespace X.A.B.C { + export class W implements A.C.Z { // This can refer to it as A.C.Z + } +} + +namespace X.A.B.C { + namespace A { + } } \ No newline at end of file diff --git a/tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause3.ts b/tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause3.ts index 86f6862f1456c..7487e4a6a2aa2 100644 --- a/tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause3.ts +++ b/tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause3.ts @@ -1,15 +1,15 @@ // @declaration: true -module X.A.C { - export interface Z { - } -} -module X.A.B.C { - export class W implements X.A.C.Z { // This needs to be referred as X.A.C.Z as A has conflict - } -} - -module X.A.B.C { - export module A { - } +namespace X.A.C { + export interface Z { + } +} +namespace X.A.B.C { + export class W implements X.A.C.Z { // This needs to be referred as X.A.C.Z as A has conflict + } +} + +namespace X.A.B.C { + export namespace A { + } } \ No newline at end of file diff --git a/tests/cases/compiler/declInput-2.ts b/tests/cases/compiler/declInput-2.ts index 206dcd968fd60..7a90a2f1a60aa 100644 --- a/tests/cases/compiler/declInput-2.ts +++ b/tests/cases/compiler/declInput-2.ts @@ -1,5 +1,5 @@ // @declaration: true -module M { +namespace M { class C { } export class E {} export interface I1 {} diff --git a/tests/cases/compiler/declInput4.ts b/tests/cases/compiler/declInput4.ts index a613995225fd9..57f4c10ccd507 100644 --- a/tests/cases/compiler/declInput4.ts +++ b/tests/cases/compiler/declInput4.ts @@ -1,5 +1,5 @@ // @declaration: true -module M { +namespace M { class C { } export class E {} export interface I1 {} diff --git a/tests/cases/compiler/declarationEmitDestructuringArrayPattern3.ts b/tests/cases/compiler/declarationEmitDestructuringArrayPattern3.ts index 9cdc6c2ec90ff..a50d8a8b0e591 100644 --- a/tests/cases/compiler/declarationEmitDestructuringArrayPattern3.ts +++ b/tests/cases/compiler/declarationEmitDestructuringArrayPattern3.ts @@ -1,4 +1,4 @@ // @declaration: true -module M { +namespace M { export var [a, b] = [1, 2]; } \ No newline at end of file diff --git a/tests/cases/compiler/declarationEmitDestructuringObjectLiteralPattern.ts b/tests/cases/compiler/declarationEmitDestructuringObjectLiteralPattern.ts index 89e5b65a9d3b3..bf1676428d319 100644 --- a/tests/cases/compiler/declarationEmitDestructuringObjectLiteralPattern.ts +++ b/tests/cases/compiler/declarationEmitDestructuringObjectLiteralPattern.ts @@ -18,6 +18,6 @@ function f15() { } var { a4, b4, c4 } = f15(); -module m { +namespace m { export var { a4, b4, c4 } = f15(); } \ No newline at end of file diff --git a/tests/cases/compiler/declarationEmitDestructuringObjectLiteralPattern2.ts b/tests/cases/compiler/declarationEmitDestructuringObjectLiteralPattern2.ts index f700e68e39727..b45a248c19567 100644 --- a/tests/cases/compiler/declarationEmitDestructuringObjectLiteralPattern2.ts +++ b/tests/cases/compiler/declarationEmitDestructuringObjectLiteralPattern2.ts @@ -10,6 +10,6 @@ function f15() { } var { a4, b4, c4 } = f15(); -module m { +namespace m { export var { a4, b4, c4 } = f15(); } \ No newline at end of file diff --git a/tests/cases/compiler/declarationEmitDestructuringPrivacyError.ts b/tests/cases/compiler/declarationEmitDestructuringPrivacyError.ts index 987fb67a08ba4..20c0ef39ef914 100644 --- a/tests/cases/compiler/declarationEmitDestructuringPrivacyError.ts +++ b/tests/cases/compiler/declarationEmitDestructuringPrivacyError.ts @@ -1,5 +1,5 @@ // @declaration: true -module m { +namespace m { class c { } export var [x, y, z] = [10, new c(), 30]; diff --git a/tests/cases/compiler/declarationEmitImportInExportAssignmentModule.ts b/tests/cases/compiler/declarationEmitImportInExportAssignmentModule.ts index b246ba32ba4b6..666262f680773 100644 --- a/tests/cases/compiler/declarationEmitImportInExportAssignmentModule.ts +++ b/tests/cases/compiler/declarationEmitImportInExportAssignmentModule.ts @@ -1,8 +1,8 @@ // @declaration: true // @module: commonjs -module m { - export module c { +namespace m { + export namespace c { export class c { } } diff --git a/tests/cases/compiler/declarationEmitNameConflicts.ts b/tests/cases/compiler/declarationEmitNameConflicts.ts index a30f4b2ff1b1a..ad713675856f0 100644 --- a/tests/cases/compiler/declarationEmitNameConflicts.ts +++ b/tests/cases/compiler/declarationEmitNameConflicts.ts @@ -1,15 +1,15 @@ // @declaration: true // @module: commonjs // @Filename: declarationEmit_nameConflicts_1.ts -module f { export class c { } } +namespace f { export class c { } } export = f; // @Filename: declarationEmit_nameConflicts_0.ts import im = require('./declarationEmit_nameConflicts_1'); -export module M { +export namespace M { export function f() { } export class C { } - export module N { + export namespace N { export function g() { }; export interface I { } } @@ -20,10 +20,10 @@ export module M { export import d = im; } -export module M.P { +export namespace M.P { export function f() { } export class C { } - export module N { + export namespace N { export function g() { }; export interface I { } } @@ -35,16 +35,16 @@ export module M.P { export var d = M.d; // emitted incorrectly as typeof im } -export module M.Q { +export namespace M.Q { export function f() { } export class C { } - export module N { + export namespace N { export function g() { }; export interface I { } } export interface b extends M.b { } // ok export interface I extends M.c.I { } // ok - export module c { + export namespace c { export interface I extends M.c.I { } // ok } } \ No newline at end of file diff --git a/tests/cases/compiler/declarationEmitNameConflicts2.ts b/tests/cases/compiler/declarationEmitNameConflicts2.ts index f0112fa9501d1..9921b13c8957c 100644 --- a/tests/cases/compiler/declarationEmitNameConflicts2.ts +++ b/tests/cases/compiler/declarationEmitNameConflicts2.ts @@ -1,14 +1,14 @@ // @declaration: true -module X.Y.base { +namespace X.Y.base { export function f() { } export class C { } - export module M { + export namespace M { export var v; } export enum E { } } -module X.Y.base.Z { +namespace X.Y.base.Z { export var f = X.Y.base.f; // Should be base.f export var C = X.Y.base.C; // Should be base.C export var M = X.Y.base.M; // Should be base.M diff --git a/tests/cases/compiler/declarationEmitNameConflicts3.ts b/tests/cases/compiler/declarationEmitNameConflicts3.ts index 6edc1056fa2de..bd0fa42628dbc 100644 --- a/tests/cases/compiler/declarationEmitNameConflicts3.ts +++ b/tests/cases/compiler/declarationEmitNameConflicts3.ts @@ -1,19 +1,19 @@ // @declaration: true // @module: commonjs -module M { +namespace M { export interface D { } - export module D { + export namespace D { export function f() { } } - export module C { + export namespace C { export function f() { } } - export module E { + export namespace E { export function f() { } } } -module M.P { +namespace M.P { export class C { static f() { } } diff --git a/tests/cases/compiler/declarationEmitNameConflictsWithAlias.ts b/tests/cases/compiler/declarationEmitNameConflictsWithAlias.ts index 50fc2484a4ab5..7f3ca5c2c4529 100644 --- a/tests/cases/compiler/declarationEmitNameConflictsWithAlias.ts +++ b/tests/cases/compiler/declarationEmitNameConflictsWithAlias.ts @@ -1,8 +1,8 @@ // @declaration: true // @module: commonjs -export module C { export interface I { } } +export namespace C { export interface I { } } export import v = C; -export module M { - export module C { export interface I { } } +export namespace M { + export namespace C { export interface I { } } export var w: v.I; // Gets emitted as C.I, which is the wrong interface } \ No newline at end of file diff --git a/tests/cases/compiler/declarationMaps.ts b/tests/cases/compiler/declarationMaps.ts index cb7883359432b..d338b9993c714 100644 --- a/tests/cases/compiler/declarationMaps.ts +++ b/tests/cases/compiler/declarationMaps.ts @@ -1,6 +1,6 @@ // @declaration: true // @declarationMap: true -module m2 { +namespace m2 { export interface connectModule { (res, req, next): void; } diff --git a/tests/cases/compiler/declarationMapsWithoutDeclaration.ts b/tests/cases/compiler/declarationMapsWithoutDeclaration.ts index 266b0760bb126..30070a04d9087 100644 --- a/tests/cases/compiler/declarationMapsWithoutDeclaration.ts +++ b/tests/cases/compiler/declarationMapsWithoutDeclaration.ts @@ -1,5 +1,5 @@ // @declarationMap: true -module m2 { +namespace m2 { export interface connectModule { (res, req, next): void; } diff --git a/tests/cases/compiler/declareAlreadySeen.ts b/tests/cases/compiler/declareAlreadySeen.ts index 62ee588be4d83..a640061dec188 100644 --- a/tests/cases/compiler/declareAlreadySeen.ts +++ b/tests/cases/compiler/declareAlreadySeen.ts @@ -1,8 +1,8 @@ -module M { - declare declare var x; - declare declare function f(); - - declare declare module N { } - - declare declare class C { } +namespace M { + declare declare var x; + declare declare function f(); + + declare declare namespace N { } + + declare declare class C { } } \ No newline at end of file diff --git a/tests/cases/compiler/declareDottedModuleName.ts b/tests/cases/compiler/declareDottedModuleName.ts index 456e22c5e89e1..6126ad8259504 100644 --- a/tests/cases/compiler/declareDottedModuleName.ts +++ b/tests/cases/compiler/declareDottedModuleName.ts @@ -1,11 +1,11 @@ -// @declaration: true -module M { - module P.Q { } // This shouldnt be emitted -} - -module M { - export module R.S { } //This should be emitted -} - -module T.U { // This needs to be emitted +// @declaration: true +namespace M { + namespace P.Q { } // This shouldnt be emitted +} + +namespace M { + export namespace R.S { } //This should be emitted +} + +namespace T.U { // This needs to be emitted } \ No newline at end of file diff --git a/tests/cases/compiler/declareExternalModuleWithExportAssignedFundule.ts b/tests/cases/compiler/declareExternalModuleWithExportAssignedFundule.ts index c432bcc0909e0..41bf794ec9c7c 100644 --- a/tests/cases/compiler/declareExternalModuleWithExportAssignedFundule.ts +++ b/tests/cases/compiler/declareExternalModuleWithExportAssignedFundule.ts @@ -4,7 +4,7 @@ declare module "express" { function express(): express.ExpressServer; - module express { + namespace express { export interface ExpressServer { diff --git a/tests/cases/compiler/declareFileExportAssignment.ts b/tests/cases/compiler/declareFileExportAssignment.ts index b0db02ede8172..19a4da31f08ec 100644 --- a/tests/cases/compiler/declareFileExportAssignment.ts +++ b/tests/cases/compiler/declareFileExportAssignment.ts @@ -1,6 +1,6 @@ //@module: commonjs // @declaration: true -module m2 { +namespace m2 { export interface connectModule { (res, req, next): void; } diff --git a/tests/cases/compiler/declareFileExportAssignmentWithVarFromVariableStatement.ts b/tests/cases/compiler/declareFileExportAssignmentWithVarFromVariableStatement.ts index 4333b9c1050f8..3c591015ebcf6 100644 --- a/tests/cases/compiler/declareFileExportAssignmentWithVarFromVariableStatement.ts +++ b/tests/cases/compiler/declareFileExportAssignmentWithVarFromVariableStatement.ts @@ -1,6 +1,6 @@ //@module: commonjs // @declaration: true -module m2 { +namespace m2 { export interface connectModule { (res, req, next): void; } diff --git a/tests/cases/compiler/defaultArgsInFunctionExpressions.ts b/tests/cases/compiler/defaultArgsInFunctionExpressions.ts index 040d7d9c63967..cfbdb9a55b3f0 100644 --- a/tests/cases/compiler/defaultArgsInFunctionExpressions.ts +++ b/tests/cases/compiler/defaultArgsInFunctionExpressions.ts @@ -20,8 +20,8 @@ var f4: (a: number) => void = function (a = "") { }; var f5: (a: (s: string) => any) => void = function (a = s => s) { }; // Instantiated module -module T { } -module U { +namespace T { } +namespace U { export var x; } diff --git a/tests/cases/compiler/differentTypesWithSameName.ts b/tests/cases/compiler/differentTypesWithSameName.ts index 2b40e23c6420a..2cac2adc6ed0c 100644 --- a/tests/cases/compiler/differentTypesWithSameName.ts +++ b/tests/cases/compiler/differentTypesWithSameName.ts @@ -1,4 +1,4 @@ -module m { +namespace m { export class variable{ s: string; } diff --git a/tests/cases/compiler/dottedModuleName.ts b/tests/cases/compiler/dottedModuleName.ts index 664303f23ec36..88e55f98087ce 100644 --- a/tests/cases/compiler/dottedModuleName.ts +++ b/tests/cases/compiler/dottedModuleName.ts @@ -1,18 +1,18 @@ -module M { - export module N { - export function f(x:number)=>2*x; - export module X.Y.Z { - export var v2=f(v); - } - } -} - - - -module M.N { - export module X { - export module Y.Z { - export var v=f(10); - } - } -} +namespace M { + export namespace N { + export function f(x:number)=>2*x; + export namespace X.Y.Z { + export var v2=f(v); + } + } +} + + + +namespace M.N { + export namespace X { + export namespace Y.Z { + export var v=f(10); + } + } +} diff --git a/tests/cases/compiler/dottedModuleName2.ts b/tests/cases/compiler/dottedModuleName2.ts index bc0f503d3d02e..792d62979c07b 100644 --- a/tests/cases/compiler/dottedModuleName2.ts +++ b/tests/cases/compiler/dottedModuleName2.ts @@ -1,42 +1,42 @@ -module A.B { - - export var x = 1; - -} - - - -module AA { export module B { - - export var x = 1; - -} } - - - -var tmpOK = AA.B.x; - -var tmpError = A.B.x; - - -module A.B.C - -{ - - export var x = 1; - -} - - - -module M - -{ - - import X1 = A; - - import X2 = A.B; - - import X3 = A.B.C; - -} +namespace A.B { + + export var x = 1; + +} + + + +namespace AA { export namespace B { + + export var x = 1; + +} } + + + +var tmpOK = AA.B.x; + +var tmpError = A.B.x; + + +namespace A.B.C + +{ + + export var x = 1; + +} + + + +namespace M + +{ + + import X1 = A; + + import X2 = A.B; + + import X3 = A.B.C; + +} diff --git a/tests/cases/compiler/downlevelLetConst13.ts b/tests/cases/compiler/downlevelLetConst13.ts index af803e079bc3f..7332bcdf184e8 100644 --- a/tests/cases/compiler/downlevelLetConst13.ts +++ b/tests/cases/compiler/downlevelLetConst13.ts @@ -11,7 +11,7 @@ export const [bar2] = [2]; export let {a: bar3} = { a: 1 }; export const {a: bar4} = { a: 1 }; -export module M { +export namespace M { export let baz = 100; export const baz2 = true; export let [bar5] = [1]; diff --git a/tests/cases/compiler/downlevelLetConst16.ts b/tests/cases/compiler/downlevelLetConst16.ts index b30f26b4b82f9..4a2bc0a055cdb 100644 --- a/tests/cases/compiler/downlevelLetConst16.ts +++ b/tests/cases/compiler/downlevelLetConst16.ts @@ -101,7 +101,7 @@ function bar2() { use(x); } -module M1 { +namespace M1 { let x = 1; use(x); let [y] = [1]; @@ -110,7 +110,7 @@ module M1 { use(z); } -module M2 { +namespace M2 { { let x = 1; use(x); @@ -122,7 +122,7 @@ module M2 { use(x); } -module M3 { +namespace M3 { const x = 1; use(x); const [y] = [1]; @@ -132,7 +132,7 @@ module M3 { } -module M4 { +namespace M4 { { const x = 1; use(x); diff --git a/tests/cases/compiler/duplicateAnonymousInners1.ts b/tests/cases/compiler/duplicateAnonymousInners1.ts index c2d30e567c9b7..37c17f092904b 100644 --- a/tests/cases/compiler/duplicateAnonymousInners1.ts +++ b/tests/cases/compiler/duplicateAnonymousInners1.ts @@ -1,4 +1,4 @@ -module Foo { +namespace Foo { class Helper { @@ -11,7 +11,7 @@ module Foo { } -module Foo { +namespace Foo { // Should not be an error class Helper { diff --git a/tests/cases/compiler/duplicateAnonymousModuleClasses.ts b/tests/cases/compiler/duplicateAnonymousModuleClasses.ts index 20a24e31ae702..1db75b4ca527e 100644 --- a/tests/cases/compiler/duplicateAnonymousModuleClasses.ts +++ b/tests/cases/compiler/duplicateAnonymousModuleClasses.ts @@ -1,4 +1,4 @@ -module F { +namespace F { class Helper { @@ -7,7 +7,7 @@ module F { } -module F { +namespace F { // Should not be an error class Helper { @@ -16,7 +16,7 @@ module F { } -module Foo { +namespace Foo { class Helper { @@ -25,7 +25,7 @@ module Foo { } -module Foo { +namespace Foo { // Should not be an error class Helper { @@ -34,8 +34,8 @@ module Foo { } -module Gar { - module Foo { +namespace Gar { + namespace Foo { class Helper { @@ -44,7 +44,7 @@ module Gar { } - module Foo { + namespace Foo { // Should not be an error class Helper { diff --git a/tests/cases/compiler/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.ts b/tests/cases/compiler/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.ts index aa26e567b6d81..b4a67f0f6a074 100644 --- a/tests/cases/compiler/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.ts +++ b/tests/cases/compiler/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.ts @@ -2,7 +2,7 @@ // @FileName: duplicateIdentifierShouldNotShortCircuitBaseTypeBinding_0.ts export interface IPoint {} -export module Shapes { +export namespace Shapes { export class Point implements IPoint {} diff --git a/tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts b/tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts index 93d694443621d..81f45ff82e3a7 100644 --- a/tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts +++ b/tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts @@ -1,35 +1,35 @@ -module M { +namespace M { export interface I { } } -module M { +namespace M { export class I { } } -module M { +namespace M { export function f() { } } -module M { +namespace M { export class f { } // error } -module M { +namespace M { function g() { } } -module M { +namespace M { export class g { } // no error } -module M { +namespace M { export class C { } } -module M { +namespace M { function C() { } // no error } -module M { +namespace M { export var v = 3; } -module M { +namespace M { export var v = 3; // error for redeclaring var in a different parent } @@ -37,15 +37,15 @@ class Foo { static x: number; } -module Foo { +namespace Foo { export var x: number; // error for redeclaring var in a different parent } -module N { - export module F { +namespace N { + export namespace F { var t; } } -declare module N { +declare namespace N { export function F(); // no error because function is ambient } diff --git a/tests/cases/compiler/duplicateIdentifiersAcrossFileBoundaries.ts b/tests/cases/compiler/duplicateIdentifiersAcrossFileBoundaries.ts index 94e5cd94ab188..005bfd306d177 100644 --- a/tests/cases/compiler/duplicateIdentifiersAcrossFileBoundaries.ts +++ b/tests/cases/compiler/duplicateIdentifiersAcrossFileBoundaries.ts @@ -11,8 +11,8 @@ class Foo { static x: number; } -module N { - export module F { +namespace N { + export namespace F { var t; } } @@ -24,10 +24,10 @@ function C2() { } // error -- cannot merge function with non-ambient class class f { } // error -- cannot merge function with non-ambient class var v = 3; -module Foo { +namespace Foo { export var x: number; // error for redeclaring var in a different parent } -declare module N { +declare namespace N { export function F(); // no error because function is ambient } diff --git a/tests/cases/compiler/duplicateSymbolsExportMatching.ts b/tests/cases/compiler/duplicateSymbolsExportMatching.ts index 3c82b745f33a7..1fbd5e2aea00e 100644 --- a/tests/cases/compiler/duplicateSymbolsExportMatching.ts +++ b/tests/cases/compiler/duplicateSymbolsExportMatching.ts @@ -1,27 +1,27 @@ //@module: amd -module M { +namespace M { export interface E { } interface I { } } -module M { +namespace M { export interface E { } // ok interface I { } // ok } // Doesn't match export visibility, but it's in a different parent, so it's ok -module M { +namespace M { interface E { } // ok export interface I { } // ok } -module N { +namespace N { interface I { } interface I { } // ok export interface E { } export interface E { } // ok } -module N2 { +namespace N2 { interface I { } export interface I { } // error export interface E { } @@ -29,34 +29,34 @@ module N2 { } // Should report error only once for instantiated module -module M { - module inst { +namespace M { + namespace inst { var t; } - export module inst { // one error + export namespace inst { // one error var t; } } // Variables of the same / different type -module M2 { +namespace M2 { var v: string; export var v: string; // one error (visibility) var w: number; export var w: string; // two errors (visibility and type mismatch) } -module M { - module F { +namespace M { + namespace F { var t; } export function F() { } // Only one error for duplicate identifier (don't consider visibility) } -module M { +namespace M { class C { } - module C { } - export module C { // Two visibility errors (one for the clodule symbol, and one for the merged container symbol) + namespace C { } + export namespace C { // Two visibility errors (one for the clodule symbol, and one for the merged container symbol) var t; } } diff --git a/tests/cases/compiler/duplicateVarAndImport.ts b/tests/cases/compiler/duplicateVarAndImport.ts index f8daf5ea9c916..c277648855e52 100644 --- a/tests/cases/compiler/duplicateVarAndImport.ts +++ b/tests/cases/compiler/duplicateVarAndImport.ts @@ -1,5 +1,5 @@ // no error since module is not instantiated var a; -module M { } +namespace M { } import a = M; \ No newline at end of file diff --git a/tests/cases/compiler/duplicateVarAndImport2.ts b/tests/cases/compiler/duplicateVarAndImport2.ts index f42b2bcf50bdd..cf6479c09d696 100644 --- a/tests/cases/compiler/duplicateVarAndImport2.ts +++ b/tests/cases/compiler/duplicateVarAndImport2.ts @@ -1,4 +1,4 @@ // error since module is instantiated var a; -module M { export var x = 1; } +namespace M { export var x = 1; } import a = M; \ No newline at end of file diff --git a/tests/cases/compiler/duplicateVariablesByScope.ts b/tests/cases/compiler/duplicateVariablesByScope.ts index dc811130d4fb7..48c9dfd80ab06 100644 --- a/tests/cases/compiler/duplicateVariablesByScope.ts +++ b/tests/cases/compiler/duplicateVariablesByScope.ts @@ -2,7 +2,7 @@ // duplicate local variables are only reported at global scope -module M { +namespace M { for (var j = 0; j < 10; j++) { } diff --git a/tests/cases/compiler/duplicateVariablesWithAny.ts b/tests/cases/compiler/duplicateVariablesWithAny.ts index cbed791dc506f..ab9b7502b9a41 100644 --- a/tests/cases/compiler/duplicateVariablesWithAny.ts +++ b/tests/cases/compiler/duplicateVariablesWithAny.ts @@ -5,7 +5,7 @@ var x = 2; //error var y = ""; var y; //error -module N { +namespace N { var x: any; var x = 2; //error diff --git a/tests/cases/compiler/duplicateVarsAcrossFileBoundaries.ts b/tests/cases/compiler/duplicateVarsAcrossFileBoundaries.ts index 03de4077caf88..c037241f2d9f5 100644 --- a/tests/cases/compiler/duplicateVarsAcrossFileBoundaries.ts +++ b/tests/cases/compiler/duplicateVarsAcrossFileBoundaries.ts @@ -17,11 +17,11 @@ var y = ""; var z = 0; // @Filename: duplicateVarsAcrossFileBoundaries_4.ts -module P { } +namespace P { } import p = P; var q; // @Filename: duplicateVarsAcrossFileBoundaries_5.ts -module Q { } +namespace Q { } import q = Q; var p; \ No newline at end of file diff --git a/tests/cases/compiler/emitMemberAccessExpression.ts b/tests/cases/compiler/emitMemberAccessExpression.ts index af4bbf9bc8d38..98c6e1c8b5934 100644 --- a/tests/cases/compiler/emitMemberAccessExpression.ts +++ b/tests/cases/compiler/emitMemberAccessExpression.ts @@ -5,7 +5,7 @@ // @Filename: emitMemberAccessExpression_file2.ts /// "use strict"; -module Microsoft.PeopleAtWork.Model { +namespace Microsoft.PeopleAtWork.Model { export class _Person { public populate(raw: any) { var res = Model.KnockoutExtentions; @@ -17,7 +17,7 @@ module Microsoft.PeopleAtWork.Model { /// /// declare var OData: any; -module Microsoft.PeopleAtWork.Model { +namespace Microsoft.PeopleAtWork.Model { export class KnockoutExtentions { } } \ No newline at end of file diff --git a/tests/cases/compiler/enumAssignmentCompat.ts b/tests/cases/compiler/enumAssignmentCompat.ts index d7539e7db8576..55027e32757e6 100644 --- a/tests/cases/compiler/enumAssignmentCompat.ts +++ b/tests/cases/compiler/enumAssignmentCompat.ts @@ -1,4 +1,4 @@ -module W { +namespace W { export class D { } } diff --git a/tests/cases/compiler/enumAssignmentCompat2.ts b/tests/cases/compiler/enumAssignmentCompat2.ts index 71a96cfcfe14a..a01db1d80aaf7 100644 --- a/tests/cases/compiler/enumAssignmentCompat2.ts +++ b/tests/cases/compiler/enumAssignmentCompat2.ts @@ -4,7 +4,7 @@ enum W { } -module W { +namespace W { export class D { } } diff --git a/tests/cases/compiler/enumAssignmentCompat3.ts b/tests/cases/compiler/enumAssignmentCompat3.ts index a706be4ce2176..4b987b97f7463 100644 --- a/tests/cases/compiler/enumAssignmentCompat3.ts +++ b/tests/cases/compiler/enumAssignmentCompat3.ts @@ -49,7 +49,7 @@ namespace Merged2 { export enum E { a, b, c } - export module E { + export namespace E { export let d = 5; } } diff --git a/tests/cases/compiler/enumBasics3.ts b/tests/cases/compiler/enumBasics3.ts index d0cb27c790ecd..d39c1c6f0283f 100644 --- a/tests/cases/compiler/enumBasics3.ts +++ b/tests/cases/compiler/enumBasics3.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export namespace N { export enum E1 { a = 1, @@ -7,7 +7,7 @@ module M { } } -module M { +namespace M { export namespace N { export enum E2 { b = M.N.E1.a, diff --git a/tests/cases/compiler/enumDecl1.ts b/tests/cases/compiler/enumDecl1.ts index 0077c62600fc9..70cb5803276e4 100644 --- a/tests/cases/compiler/enumDecl1.ts +++ b/tests/cases/compiler/enumDecl1.ts @@ -1,6 +1,6 @@ // @declaration: true -declare module mAmbient { +declare namespace mAmbient { enum e { x, y, diff --git a/tests/cases/compiler/enumLiteralAssignableToEnumInsideUnion.ts b/tests/cases/compiler/enumLiteralAssignableToEnumInsideUnion.ts index 19cd98fd5e823..97c268f2bf9c7 100644 --- a/tests/cases/compiler/enumLiteralAssignableToEnumInsideUnion.ts +++ b/tests/cases/compiler/enumLiteralAssignableToEnumInsideUnion.ts @@ -1,20 +1,20 @@ -module X { +namespace X { export enum Foo { A, B } } -module Y { +namespace Y { export enum Foo { A, B } } -module Z { +namespace Z { export enum Foo { A = 1 << 1, B = 1 << 2, } } -module Ka { +namespace Ka { export enum Foo { A = 1 << 10, B = 1 << 11, diff --git a/tests/cases/compiler/enumsWithMultipleDeclarations3.ts b/tests/cases/compiler/enumsWithMultipleDeclarations3.ts index 108a0569afeca..eb84498cdde75 100644 --- a/tests/cases/compiler/enumsWithMultipleDeclarations3.ts +++ b/tests/cases/compiler/enumsWithMultipleDeclarations3.ts @@ -1,4 +1,4 @@ -module E { +namespace E { } enum E { diff --git a/tests/cases/compiler/es5ExportEqualsDts.ts b/tests/cases/compiler/es5ExportEqualsDts.ts index 1253c9ac22096..3bb8cb2c0465b 100644 --- a/tests/cases/compiler/es5ExportEqualsDts.ts +++ b/tests/cases/compiler/es5ExportEqualsDts.ts @@ -9,7 +9,7 @@ class A { } } -module A { +namespace A { export interface B { } } diff --git a/tests/cases/compiler/es5ModuleInternalNamedImports.ts b/tests/cases/compiler/es5ModuleInternalNamedImports.ts index 62b976a7df750..b527ec23c20a8 100644 --- a/tests/cases/compiler/es5ModuleInternalNamedImports.ts +++ b/tests/cases/compiler/es5ModuleInternalNamedImports.ts @@ -1,7 +1,7 @@ // @target: ES5 // @module: AMD -export module M { +export namespace M { // variable export var M_V = 0; // interface @@ -9,9 +9,9 @@ export module M { //calss export class M_C { } // instantiated module - export module M_M { var x; } + export namespace M_M { var x; } // uninstantiated module - export module M_MU { } + export namespace M_MU { } // function export function M_F() { } // enum diff --git a/tests/cases/compiler/es6ClassTest.ts b/tests/cases/compiler/es6ClassTest.ts index 77f1c402c9e77..73d1c2bc6f0e9 100644 --- a/tests/cases/compiler/es6ClassTest.ts +++ b/tests/cases/compiler/es6ClassTest.ts @@ -31,7 +31,7 @@ class Foo extends Bar { var f = new Foo(); -declare module AmbientMod { +declare namespace AmbientMod { export class Provide { foo:number; zoo:string; diff --git a/tests/cases/compiler/es6ClassTest3.ts b/tests/cases/compiler/es6ClassTest3.ts index d02bcedc05b6a..392acbe952911 100644 --- a/tests/cases/compiler/es6ClassTest3.ts +++ b/tests/cases/compiler/es6ClassTest3.ts @@ -1,4 +1,4 @@ -module M { +namespace M { class Visibility { public foo() { }; private bar() { }; diff --git a/tests/cases/compiler/es6ClassTest5.ts b/tests/cases/compiler/es6ClassTest5.ts index 21c630c6f9798..51b37575b0d43 100644 --- a/tests/cases/compiler/es6ClassTest5.ts +++ b/tests/cases/compiler/es6ClassTest5.ts @@ -4,7 +4,7 @@ class C1T5 { return i; } } -module C2T5 {} +namespace C2T5 {} class bigClass { public break = 1; diff --git a/tests/cases/compiler/es6ClassTest7.ts b/tests/cases/compiler/es6ClassTest7.ts index 89517ed17814c..1cfdb3dcf5e3d 100644 --- a/tests/cases/compiler/es6ClassTest7.ts +++ b/tests/cases/compiler/es6ClassTest7.ts @@ -1,4 +1,4 @@ -declare module M { +declare namespace M { export class Foo { } } diff --git a/tests/cases/compiler/es6ExportAll.ts b/tests/cases/compiler/es6ExportAll.ts index ed2b47c23c454..7830e2b171bbd 100644 --- a/tests/cases/compiler/es6ExportAll.ts +++ b/tests/cases/compiler/es6ExportAll.ts @@ -6,11 +6,11 @@ export class c { } export interface i { } -export module m { +export namespace m { export var x = 10; } export var x = 10; -export module uninstantiated { +export namespace uninstantiated { } // @filename: client.ts diff --git a/tests/cases/compiler/es6ExportAllInEs5.ts b/tests/cases/compiler/es6ExportAllInEs5.ts index 3ee95e1a217d0..29e26b8923036 100644 --- a/tests/cases/compiler/es6ExportAllInEs5.ts +++ b/tests/cases/compiler/es6ExportAllInEs5.ts @@ -7,11 +7,11 @@ export class c { } export interface i { } -export module m { +export namespace m { export var x = 10; } export var x = 10; -export module uninstantiated { +export namespace uninstantiated { } // @filename: client.ts diff --git a/tests/cases/compiler/es6ExportClause.ts b/tests/cases/compiler/es6ExportClause.ts index a16e2c9e7aa69..685ed75f3e0ed 100644 --- a/tests/cases/compiler/es6ExportClause.ts +++ b/tests/cases/compiler/es6ExportClause.ts @@ -6,11 +6,11 @@ class c { } interface i { } -module m { +namespace m { export var x = 10; } var x = 10; -module uninstantiated { +namespace uninstantiated { } export { c }; export { c as c2 }; diff --git a/tests/cases/compiler/es6ExportClauseInEs5.ts b/tests/cases/compiler/es6ExportClauseInEs5.ts index 675f302bcb613..b4688ed06245f 100644 --- a/tests/cases/compiler/es6ExportClauseInEs5.ts +++ b/tests/cases/compiler/es6ExportClauseInEs5.ts @@ -7,11 +7,11 @@ class c { } interface i { } -module m { +namespace m { export var x = 10; } var x = 10; -module uninstantiated { +namespace uninstantiated { } export { c }; export { c as c2 }; diff --git a/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifier.ts b/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifier.ts index 22a6cef420322..07cae1c7da7f2 100644 --- a/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifier.ts +++ b/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifier.ts @@ -6,11 +6,11 @@ export class c { } export interface i { } -export module m { +export namespace m { export var x = 10; } export var x = 10; -export module uninstantiated { +export namespace uninstantiated { } // @filename: client.ts diff --git a/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifierInEs5.ts b/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifierInEs5.ts index 24dbc77e98f8e..455552916b155 100644 --- a/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifierInEs5.ts +++ b/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifierInEs5.ts @@ -7,11 +7,11 @@ export class c { } export interface i { } -export module m { +export namespace m { export var x = 10; } export var x = 10; -export module uninstantiated { +export namespace uninstantiated { } // @filename: client.ts diff --git a/tests/cases/compiler/es6ExportEqualsInterop.ts b/tests/cases/compiler/es6ExportEqualsInterop.ts index 7b1f6700dd98b..26fec1a30de31 100644 --- a/tests/cases/compiler/es6ExportEqualsInterop.ts +++ b/tests/cases/compiler/es6ExportEqualsInterop.ts @@ -30,7 +30,7 @@ declare module "interface-variable" { } declare module "module" { - module Foo { + namespace Foo { export var a: number; export var b: number; } @@ -42,7 +42,7 @@ declare module "interface-module" { x: number; y: number; } - module Foo { + namespace Foo { export var a: number; export var b: number; } @@ -50,7 +50,7 @@ declare module "interface-module" { } declare module "variable-module" { - module Foo { + namespace Foo { interface Bar { x: number; y: number; @@ -70,7 +70,7 @@ declare module "function" { declare module "function-module" { function foo(); - module foo { + namespace foo { export var a: number; export var b: number; } @@ -90,7 +90,7 @@ declare module "class-module" { x: number; y: number; } - module Foo { + namespace Foo { export var a: number; export var b: number; } diff --git a/tests/cases/compiler/es6ImportEqualsDeclaration2.ts b/tests/cases/compiler/es6ImportEqualsDeclaration2.ts index 554740d80e1f5..ba41e854d7460 100644 --- a/tests/cases/compiler/es6ImportEqualsDeclaration2.ts +++ b/tests/cases/compiler/es6ImportEqualsDeclaration2.ts @@ -8,7 +8,7 @@ declare module "other" { declare module "server" { import events = require("other"); // Ambient declaration, no error expected. - module S { + namespace S { export var a: number; } diff --git a/tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts b/tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts index 381a21f58ea6c..c0595cf324a3d 100644 --- a/tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts +++ b/tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts @@ -2,7 +2,7 @@ // @declaration: true // @filename: es6ImportNamedImportInIndirectExportAssignment_0.ts -export module a { +export namespace a { export class c { } } diff --git a/tests/cases/compiler/es6ModuleClassDeclaration.ts b/tests/cases/compiler/es6ModuleClassDeclaration.ts index 3b36e53037f30..1e4f6f996323d 100644 --- a/tests/cases/compiler/es6ModuleClassDeclaration.ts +++ b/tests/cases/compiler/es6ModuleClassDeclaration.ts @@ -34,7 +34,7 @@ class c2 { new c(); new c2(); -export module m1 { +export namespace m1 { export class c3 { constructor() { } @@ -72,7 +72,7 @@ export module m1 { new c3(); new c4(); } -module m2 { +namespace m2 { export class c3 { constructor() { } diff --git a/tests/cases/compiler/es6ModuleConst.ts b/tests/cases/compiler/es6ModuleConst.ts index 42bf24698a943..293ece2f9a413 100644 --- a/tests/cases/compiler/es6ModuleConst.ts +++ b/tests/cases/compiler/es6ModuleConst.ts @@ -3,13 +3,13 @@ export const a = "hello"; export const x: string = a, y = x; const b = y; const c: string = b, d = c; -export module m1 { +export namespace m1 { export const k = a; export const l: string = b, m = k; const n = m1.k; const o: string = n, p = k; } -module m2 { +namespace m2 { export const k = a; export const l: string = b, m = k; const n = m1.k; diff --git a/tests/cases/compiler/es6ModuleConstEnumDeclaration.ts b/tests/cases/compiler/es6ModuleConstEnumDeclaration.ts index c3490093d3ecd..21906d6f42898 100644 --- a/tests/cases/compiler/es6ModuleConstEnumDeclaration.ts +++ b/tests/cases/compiler/es6ModuleConstEnumDeclaration.ts @@ -11,7 +11,7 @@ const enum e2 { } var x = e1.a; var y = e2.x; -export module m1 { +export namespace m1 { export const enum e3 { a, b, @@ -27,7 +27,7 @@ export module m1 { var x2 = e3.a; var y2 = e4.x; } -module m2 { +namespace m2 { export const enum e5 { a, b, diff --git a/tests/cases/compiler/es6ModuleConstEnumDeclaration2.ts b/tests/cases/compiler/es6ModuleConstEnumDeclaration2.ts index 6dddea09d8a65..0ed98259b04be 100644 --- a/tests/cases/compiler/es6ModuleConstEnumDeclaration2.ts +++ b/tests/cases/compiler/es6ModuleConstEnumDeclaration2.ts @@ -13,7 +13,7 @@ const enum e2 { } var x = e1.a; var y = e2.x; -export module m1 { +export namespace m1 { export const enum e3 { a, b, @@ -29,7 +29,7 @@ export module m1 { var x2 = e3.a; var y2 = e4.x; } -module m2 { +namespace m2 { export const enum e5 { a, b, diff --git a/tests/cases/compiler/es6ModuleEnumDeclaration.ts b/tests/cases/compiler/es6ModuleEnumDeclaration.ts index a0cebde9947e1..377914da90e38 100644 --- a/tests/cases/compiler/es6ModuleEnumDeclaration.ts +++ b/tests/cases/compiler/es6ModuleEnumDeclaration.ts @@ -11,7 +11,7 @@ enum e2 { } var x = e1.a; var y = e2.x; -export module m1 { +export namespace m1 { export enum e3 { a, b, @@ -27,7 +27,7 @@ export module m1 { var x2 = e3.a; var y2 = e4.x; } -module m2 { +namespace m2 { export enum e5 { a, b, diff --git a/tests/cases/compiler/es6ModuleFunctionDeclaration.ts b/tests/cases/compiler/es6ModuleFunctionDeclaration.ts index 82eebb1580ef7..f591b0a887741 100644 --- a/tests/cases/compiler/es6ModuleFunctionDeclaration.ts +++ b/tests/cases/compiler/es6ModuleFunctionDeclaration.ts @@ -6,7 +6,7 @@ function foo2() { foo(); foo2(); -export module m1 { +export namespace m1 { export function foo3() { } function foo4() { @@ -16,7 +16,7 @@ export module m1 { foo3(); foo4(); } -module m2 { +namespace m2 { export function foo3() { } function foo4() { diff --git a/tests/cases/compiler/es6ModuleInternalImport.ts b/tests/cases/compiler/es6ModuleInternalImport.ts index 24e209a87f656..94847afc585fe 100644 --- a/tests/cases/compiler/es6ModuleInternalImport.ts +++ b/tests/cases/compiler/es6ModuleInternalImport.ts @@ -1,17 +1,17 @@ // @target: ES6 -export module m { +export namespace m { export var a = 10; } export import a1 = m.a; import a2 = m.a; var x = a1 + a2; -export module m1 { +export namespace m1 { export import a3 = m.a; import a4 = m.a; var x = a1 + a2; var x2 = a3 + a4; } -module m2 { +namespace m2 { export import a3 = m.a; import a4 = m.a; var x = a1 + a2; diff --git a/tests/cases/compiler/es6ModuleInternalNamedImports.ts b/tests/cases/compiler/es6ModuleInternalNamedImports.ts index f696cee0aa350..cdd8b56c433e6 100644 --- a/tests/cases/compiler/es6ModuleInternalNamedImports.ts +++ b/tests/cases/compiler/es6ModuleInternalNamedImports.ts @@ -1,6 +1,6 @@ // @target: ES6 -export module M { +export namespace M { // variable export var M_V = 0; // interface @@ -8,9 +8,9 @@ export module M { //calss export class M_C { } // instantiated module - export module M_M { var x; } + export namespace M_M { var x; } // uninstantiated module - export module M_MU { } + export namespace M_MU { } // function export function M_F() { } // enum diff --git a/tests/cases/compiler/es6ModuleInternalNamedImports2.ts b/tests/cases/compiler/es6ModuleInternalNamedImports2.ts index 6f235af52bd63..c5cfc8b96b53a 100644 --- a/tests/cases/compiler/es6ModuleInternalNamedImports2.ts +++ b/tests/cases/compiler/es6ModuleInternalNamedImports2.ts @@ -1,6 +1,6 @@ // @target: ES6 -export module M { +export namespace M { // variable export var M_V = 0; // interface @@ -8,9 +8,9 @@ export module M { //calss export class M_C { } // instantiated module - export module M_M { var x; } + export namespace M_M { var x; } // uninstantiated module - export module M_MU { } + export namespace M_MU { } // function export function M_F() { } // enum @@ -21,7 +21,7 @@ export module M { export import M_A = M_M; } -export module M { +export namespace M { // Reexports export {M_V as v}; export {M_I as i}; diff --git a/tests/cases/compiler/es6ModuleLet.ts b/tests/cases/compiler/es6ModuleLet.ts index fc5dfc94bd50a..973a454c2cf99 100644 --- a/tests/cases/compiler/es6ModuleLet.ts +++ b/tests/cases/compiler/es6ModuleLet.ts @@ -3,13 +3,13 @@ export let a = "hello"; export let x: string = a, y = x; let b = y; let c: string = b, d = c; -export module m1 { +export namespace m1 { export let k = a; export let l: string = b, m = k; let n = m1.k; let o: string = n, p = k; } -module m2 { +namespace m2 { export let k = a; export let l: string = b, m = k; let n = m1.k; diff --git a/tests/cases/compiler/es6ModuleModuleDeclaration.ts b/tests/cases/compiler/es6ModuleModuleDeclaration.ts index 99868f6087b23..21082e28c0bcb 100644 --- a/tests/cases/compiler/es6ModuleModuleDeclaration.ts +++ b/tests/cases/compiler/es6ModuleModuleDeclaration.ts @@ -1,24 +1,24 @@ // @target: ES6 -export module m1 { +export namespace m1 { export var a = 10; var b = 10; - export module innerExportedModule { + export namespace innerExportedModule { export var k = 10; var l = 10; } - export module innerNonExportedModule { + export namespace innerNonExportedModule { export var x = 10; var y = 10; } } -module m2 { +namespace m2 { export var a = 10; var b = 10; - export module innerExportedModule { + export namespace innerExportedModule { export var k = 10; var l = 10; } - export module innerNonExportedModule { + export namespace innerNonExportedModule { export var x = 10; var y = 10; } diff --git a/tests/cases/compiler/es6ModuleVariableStatement.ts b/tests/cases/compiler/es6ModuleVariableStatement.ts index a3ae29fbe6a22..8e6541b8b0c3e 100644 --- a/tests/cases/compiler/es6ModuleVariableStatement.ts +++ b/tests/cases/compiler/es6ModuleVariableStatement.ts @@ -3,13 +3,13 @@ export var a = "hello"; export var x: string = a, y = x; var b = y; var c: string = b, d = c; -export module m1 { +export namespace m1 { export var k = a; export var l: string = b, m = k; var n = m1.k; var o: string = n, p = k; } -module m2 { +namespace m2 { export var k = a; export var l: string = b, m = k; var n = m1.k; diff --git a/tests/cases/compiler/escapedIdentifiers.ts b/tests/cases/compiler/escapedIdentifiers.ts index c58c59d9b4241..b253a00cc2139 100644 --- a/tests/cases/compiler/escapedIdentifiers.ts +++ b/tests/cases/compiler/escapedIdentifiers.ts @@ -22,11 +22,11 @@ b ++; \u0062 ++; // modules -module moduleType1 { +namespace moduleType1 { export var baz1: number; } -module moduleType\u0032 { - export var baz2: number; +namespace moduleType\u0032 { + export var baz2: number; } moduleType1.baz1 = 3; diff --git a/tests/cases/compiler/exportAlreadySeen.ts b/tests/cases/compiler/exportAlreadySeen.ts index f5d38f0d170d3..4a62972657d72 100644 --- a/tests/cases/compiler/exportAlreadySeen.ts +++ b/tests/cases/compiler/exportAlreadySeen.ts @@ -1,19 +1,19 @@ -module M { - export export var x = 1; - export export function f() { } - - export export module N { - export export class C { } - export export interface I { } - } -} - -declare module A { - export export var x; - export export function f() - - export export module N { - export export class C { } - export export interface I { } - } +namespace M { + export export var x = 1; + export export function f() { } + + export export namespace N { + export export class C { } + export export interface I { } + } +} + +declare namespace A { + export export var x; + export export function f() + + export export namespace N { + export export class C { } + export export interface I { } + } } \ No newline at end of file diff --git a/tests/cases/compiler/exportAssignClassAndModule.ts b/tests/cases/compiler/exportAssignClassAndModule.ts index 0ac65454b00db..bea2a35afb41c 100644 --- a/tests/cases/compiler/exportAssignClassAndModule.ts +++ b/tests/cases/compiler/exportAssignClassAndModule.ts @@ -3,7 +3,7 @@ class Foo { x: Foo.Bar; } -module Foo { +namespace Foo { export interface Bar { } } diff --git a/tests/cases/compiler/exportAssignValueAndType.ts b/tests/cases/compiler/exportAssignValueAndType.ts index 34ca4278584f0..69235b217f19b 100644 --- a/tests/cases/compiler/exportAssignValueAndType.ts +++ b/tests/cases/compiler/exportAssignValueAndType.ts @@ -1,5 +1,5 @@ //@module: commonjs -declare module http { +declare namespace http { export interface Server { openPort: number; } } diff --git a/tests/cases/compiler/exportAssignmentError.ts b/tests/cases/compiler/exportAssignmentError.ts index a2d8267841c12..69d4777cda25f 100644 --- a/tests/cases/compiler/exportAssignmentError.ts +++ b/tests/cases/compiler/exportAssignmentError.ts @@ -1,6 +1,6 @@ //@module: amd // @Filename: exportEqualsModule_A.ts -module M { +namespace M { export var x; } diff --git a/tests/cases/compiler/exportAssignmentInternalModule.ts b/tests/cases/compiler/exportAssignmentInternalModule.ts index a4911e5b7db2e..e1ef4fcc6d4cb 100644 --- a/tests/cases/compiler/exportAssignmentInternalModule.ts +++ b/tests/cases/compiler/exportAssignmentInternalModule.ts @@ -1,6 +1,6 @@ //@module: amd // @Filename: exportAssignmentInternalModule_A.ts -module M { +namespace M { export var x; } diff --git a/tests/cases/compiler/exportAssignmentWithImportStatementPrivacyError.ts b/tests/cases/compiler/exportAssignmentWithImportStatementPrivacyError.ts index b9a00bad3d969..1d7a9f3bbc25a 100644 --- a/tests/cases/compiler/exportAssignmentWithImportStatementPrivacyError.ts +++ b/tests/cases/compiler/exportAssignmentWithImportStatementPrivacyError.ts @@ -1,5 +1,5 @@ //@module: amd -module m2 { +namespace m2 { export interface connectModule { (res, req, next): void; } @@ -10,7 +10,7 @@ module m2 { } -module M { +namespace M { export var server: { (): m2.connectExport; test1: m2.connectModule; diff --git a/tests/cases/compiler/exportDeclarationInInternalModule.ts b/tests/cases/compiler/exportDeclarationInInternalModule.ts index 0b9ba7600a42f..b033aec79927f 100644 --- a/tests/cases/compiler/exportDeclarationInInternalModule.ts +++ b/tests/cases/compiler/exportDeclarationInInternalModule.ts @@ -7,11 +7,11 @@ class Bbb { class Aaa extends Bbb { } -module Aaa { +namespace Aaa { export class SomeType { } } -module Bbb { +namespace Bbb { export class SomeType { } export * from Aaa; // this line causes the nullref diff --git a/tests/cases/compiler/exportDefaultForNonInstantiatedModule.ts b/tests/cases/compiler/exportDefaultForNonInstantiatedModule.ts index a1d1cab94b6aa..2c97853c38bcd 100644 --- a/tests/cases/compiler/exportDefaultForNonInstantiatedModule.ts +++ b/tests/cases/compiler/exportDefaultForNonInstantiatedModule.ts @@ -1,6 +1,6 @@ // @target: ES6 -module m { +namespace m { export interface foo { } } diff --git a/tests/cases/compiler/exportEqualErrorType.ts b/tests/cases/compiler/exportEqualErrorType.ts index f23a203a54404..d5195c411ac6d 100644 --- a/tests/cases/compiler/exportEqualErrorType.ts +++ b/tests/cases/compiler/exportEqualErrorType.ts @@ -1,6 +1,6 @@ //@module: amd // @Filename: exportEqualErrorType_0.ts -module server { +namespace server { export interface connectModule { (res, req, next): void; } diff --git a/tests/cases/compiler/exportEqualMemberMissing.ts b/tests/cases/compiler/exportEqualMemberMissing.ts index 89b328f0536ea..0751aea85e813 100644 --- a/tests/cases/compiler/exportEqualMemberMissing.ts +++ b/tests/cases/compiler/exportEqualMemberMissing.ts @@ -1,6 +1,6 @@ // @module: commonjs // @Filename: exportEqualMemberMissing_0.ts -module server { +namespace server { export interface connectModule { (res, req, next): void; } diff --git a/tests/cases/compiler/exportEqualNamespaces.ts b/tests/cases/compiler/exportEqualNamespaces.ts index ccb5b6cde2106..059fa6650c5ac 100644 --- a/tests/cases/compiler/exportEqualNamespaces.ts +++ b/tests/cases/compiler/exportEqualNamespaces.ts @@ -1,5 +1,5 @@ //@module: amd -declare module server { +declare namespace server { interface Server extends Object { } } diff --git a/tests/cases/compiler/exportImportAndClodule.ts b/tests/cases/compiler/exportImportAndClodule.ts index fd60ae5c92cf7..cb713807c2edc 100644 --- a/tests/cases/compiler/exportImportAndClodule.ts +++ b/tests/cases/compiler/exportImportAndClodule.ts @@ -1,8 +1,8 @@ -module K { +namespace K { export class L { constructor(public name: string) { } } - export module L { + export namespace L { export var y = 12; export interface Point { x: number; @@ -10,7 +10,7 @@ module K { } } } -module M { +namespace M { export import D = K.L; } var o: { name: string }; diff --git a/tests/cases/compiler/exportImportCanSubstituteConstEnumForValue.ts b/tests/cases/compiler/exportImportCanSubstituteConstEnumForValue.ts index 71c8a29df2625..3ca2ea1b72792 100644 --- a/tests/cases/compiler/exportImportCanSubstituteConstEnumForValue.ts +++ b/tests/cases/compiler/exportImportCanSubstituteConstEnumForValue.ts @@ -1,7 +1,7 @@ // @module: amd // @declaration: true // @target: es5 -module MsPortalFx.ViewModels.Dialogs { +namespace MsPortalFx.ViewModels.Dialogs { export const enum DialogResult { Abort, @@ -31,7 +31,7 @@ module MsPortalFx.ViewModels.Dialogs { } -module MsPortalFx.ViewModels { +namespace MsPortalFx.ViewModels { /** * For some reason javascript code is emitted for this re-exported const enum. diff --git a/tests/cases/compiler/exportImportNonInstantiatedModule.ts b/tests/cases/compiler/exportImportNonInstantiatedModule.ts index 2c5d59dea6d22..87720406e8f6f 100644 --- a/tests/cases/compiler/exportImportNonInstantiatedModule.ts +++ b/tests/cases/compiler/exportImportNonInstantiatedModule.ts @@ -1,8 +1,8 @@ -module A { +namespace A { export interface I { x: number } } -module B { +namespace B { export import A1 = A } diff --git a/tests/cases/compiler/exportPrivateType.ts b/tests/cases/compiler/exportPrivateType.ts index 9103d3afca5b7..4c69b16f2de22 100644 --- a/tests/cases/compiler/exportPrivateType.ts +++ b/tests/cases/compiler/exportPrivateType.ts @@ -1,4 +1,4 @@ -module foo { +namespace foo { class C1 { x: string; y: C1; diff --git a/tests/cases/compiler/exportSpecifierAndExportedMemberDeclaration.ts b/tests/cases/compiler/exportSpecifierAndExportedMemberDeclaration.ts index 1c20ffb04373d..88026693bd49b 100644 --- a/tests/cases/compiler/exportSpecifierAndExportedMemberDeclaration.ts +++ b/tests/cases/compiler/exportSpecifierAndExportedMemberDeclaration.ts @@ -1,12 +1,12 @@ -declare module "m2" { - export module X { - interface I { } - } - function Y(); - export { Y as X }; - function Z(): X.I; -} - -declare module "m2" { - function Z2(): X.I; +declare module "m2" { + export namespace X { + interface I { } + } + function Y(); + export { Y as X }; + function Z(): X.I; +} + +declare module "m2" { + function Z2(): X.I; } \ No newline at end of file diff --git a/tests/cases/compiler/exportSpecifierAndLocalMemberDeclaration.ts b/tests/cases/compiler/exportSpecifierAndLocalMemberDeclaration.ts index 5f942a75a74c4..cb781c36ba57c 100644 --- a/tests/cases/compiler/exportSpecifierAndLocalMemberDeclaration.ts +++ b/tests/cases/compiler/exportSpecifierAndLocalMemberDeclaration.ts @@ -1,5 +1,5 @@ declare module "m2" { - module X { + namespace X { interface I { } } function Y(); diff --git a/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration1.ts b/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration1.ts index e3d0a9000abe0..fb95ba85e02cc 100644 --- a/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration1.ts +++ b/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration1.ts @@ -1,5 +1,5 @@ -declare module X { export interface bar { } } -declare module "m" { - export { X }; - export function foo(): X.bar; +declare namespace X { export interface bar { } } +declare module "m" { + export { X }; + export function foo(): X.bar; } \ No newline at end of file diff --git a/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2.ts b/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2.ts index 683358a0e3be6..db327b27bf622 100644 --- a/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2.ts +++ b/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2.ts @@ -1,6 +1,6 @@ // @module: commonjs // @Filename: exportSpecifierReferencingOuterDeclaration2_A.ts -declare module X { export interface bar { } } +declare namespace X { export interface bar { } } // @Filename: exportSpecifierReferencingOuterDeclaration2_B.ts export { X }; diff --git a/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration3.ts b/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration3.ts index d4ddf3cc4a6e4..b6f9bae6976ed 100644 --- a/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration3.ts +++ b/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration3.ts @@ -1,6 +1,6 @@ -declare module X { export interface bar { } } +declare namespace X { export interface bar { } } declare module "m" { - module X { export interface foo { } } + namespace X { export interface foo { } } export { X }; export function foo(): X.foo; export function bar(): X.bar; // error diff --git a/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration4.ts b/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration4.ts index 5beaf1de12631..008fe44860e4e 100644 --- a/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration4.ts +++ b/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration4.ts @@ -1,9 +1,9 @@ // @module: commonjs // @Filename: exportSpecifierReferencingOuterDeclaration2_A.ts -declare module X { export interface bar { } } +declare namespace X { export interface bar { } } // @Filename: exportSpecifierReferencingOuterDeclaration2_B.ts -declare module X { export interface foo { } } +declare namespace X { export interface foo { } } export { X }; export declare function foo(): X.foo; export declare function bar(): X.bar; // error \ No newline at end of file diff --git a/tests/cases/compiler/extBaseClass1.ts b/tests/cases/compiler/extBaseClass1.ts index 44ec01bf31be5..659cbcb9693fb 100644 --- a/tests/cases/compiler/extBaseClass1.ts +++ b/tests/cases/compiler/extBaseClass1.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export class B { public x=10; } @@ -7,12 +7,12 @@ module M { } } -module M { +namespace M { export class C2 extends B { } } -module N { +namespace N { export class C3 extends M.B { } } diff --git a/tests/cases/compiler/extBaseClass2.ts b/tests/cases/compiler/extBaseClass2.ts index 17ec5917a6dea..f907ac3ff95e8 100644 --- a/tests/cases/compiler/extBaseClass2.ts +++ b/tests/cases/compiler/extBaseClass2.ts @@ -1,9 +1,9 @@ -module N { +namespace N { export class C4 extends M.B { } } -module M { +namespace M { export class C5 extends B { } } diff --git a/tests/cases/compiler/extendArray.ts b/tests/cases/compiler/extendArray.ts index e1b4a45803659..781765257b5e1 100644 --- a/tests/cases/compiler/extendArray.ts +++ b/tests/cases/compiler/extendArray.ts @@ -2,7 +2,7 @@ var a = [1,2]; a.forEach(function (v,i,a) {}); -declare module _Core { +declare namespace _Core { interface Array { collect(fn:(e:_element) => _element[]) : any[]; } diff --git a/tests/cases/compiler/extension.ts b/tests/cases/compiler/extension.ts index afa57d2ceaae7..f412c4d700d7e 100644 --- a/tests/cases/compiler/extension.ts +++ b/tests/cases/compiler/extension.ts @@ -6,13 +6,13 @@ interface I { y; } -declare module M { +declare namespace M { export class C { public p:number; } } -declare module M { +declare namespace M { export extension class C { public pe:string; } diff --git a/tests/cases/compiler/externModuleClobber.ts b/tests/cases/compiler/externModuleClobber.ts index e99634f9f37d1..1434daafe5863 100644 --- a/tests/cases/compiler/externModuleClobber.ts +++ b/tests/cases/compiler/externModuleClobber.ts @@ -1,4 +1,4 @@ -declare module EM { +declare namespace EM { export class Position { } export class EC { diff --git a/tests/cases/compiler/externSyntax.ts b/tests/cases/compiler/externSyntax.ts index 9036834d94c39..429f94201572f 100644 --- a/tests/cases/compiler/externSyntax.ts +++ b/tests/cases/compiler/externSyntax.ts @@ -1,5 +1,5 @@ declare var v; -declare module M { +declare namespace M { export class D { public p; } diff --git a/tests/cases/compiler/externalModuleResolution.ts b/tests/cases/compiler/externalModuleResolution.ts index 8c0d3bf7e3fe9..fd88eeeb0f879 100644 --- a/tests/cases/compiler/externalModuleResolution.ts +++ b/tests/cases/compiler/externalModuleResolution.ts @@ -1,12 +1,12 @@ //@module: commonjs // @Filename: foo.d.ts -declare module M1 { +declare namespace M1 { export var X:number; } export = M1 // @Filename: foo.ts -module M2 { +namespace M2 { export var Y = 1; } export = M2 diff --git a/tests/cases/compiler/externalModuleResolution2.ts b/tests/cases/compiler/externalModuleResolution2.ts index 28d9c44f0618d..07dc25a6d15dc 100644 --- a/tests/cases/compiler/externalModuleResolution2.ts +++ b/tests/cases/compiler/externalModuleResolution2.ts @@ -1,12 +1,12 @@ //@module: commonjs // @Filename: foo.ts -module M2 { +namespace M2 { export var X = 1; } export = M2 // @Filename: foo.d.ts -declare module M1 { +declare namespace M1 { export var Y:number; } export = M1 diff --git a/tests/cases/compiler/externalModuleWithoutCompilerFlag1.ts b/tests/cases/compiler/externalModuleWithoutCompilerFlag1.ts index 875e320540756..0c1e2162a7d83 100644 --- a/tests/cases/compiler/externalModuleWithoutCompilerFlag1.ts +++ b/tests/cases/compiler/externalModuleWithoutCompilerFlag1.ts @@ -1,4 +1,4 @@ // Not on line 0 because we want to verify the error is placed in the appropriate location. - export module M { + export namespace M { } \ No newline at end of file diff --git a/tests/cases/compiler/fatArrowSelf.ts b/tests/cases/compiler/fatArrowSelf.ts index f1662fb994f7a..28e63dba1f45a 100644 --- a/tests/cases/compiler/fatArrowSelf.ts +++ b/tests/cases/compiler/fatArrowSelf.ts @@ -1,4 +1,4 @@ -module Events { +namespace Events { export interface ListenerCallback { (value:any):void; } @@ -8,7 +8,7 @@ module Events { } } -module Consumer { +namespace Consumer { class EventEmitterConsummer { constructor (private emitter: Events.EventEmitter) { } diff --git a/tests/cases/compiler/forInModule.ts b/tests/cases/compiler/forInModule.ts index dfe90d70d399c..92ef2b0eb1b1d 100644 --- a/tests/cases/compiler/forInModule.ts +++ b/tests/cases/compiler/forInModule.ts @@ -1,4 +1,4 @@ -module Foo { +namespace Foo { for (var i = 0; i < 1; i++) { i+i; } diff --git a/tests/cases/compiler/funClodule.ts b/tests/cases/compiler/funClodule.ts index 6182e172157d7..24836852384ff 100644 --- a/tests/cases/compiler/funClodule.ts +++ b/tests/cases/compiler/funClodule.ts @@ -1,19 +1,19 @@ declare function foo(); -declare module foo { +declare namespace foo { export function x(): any; } declare class foo { } // Should error declare class foo2 { } -declare module foo2 { +declare namespace foo2 { export function x(): any; } declare function foo2(); // Should error function foo3() { } -module foo3 { +namespace foo3 { export function x(): any { } } class foo3 { } // Should error \ No newline at end of file diff --git a/tests/cases/compiler/funcdecl.ts b/tests/cases/compiler/funcdecl.ts index b09bb2e41d1be..b4ef1a3cbafc8 100644 --- a/tests/cases/compiler/funcdecl.ts +++ b/tests/cases/compiler/funcdecl.ts @@ -49,7 +49,7 @@ var withOverloadSignature = overload1; function f(n: () => void) { } -module m2 { +namespace m2 { export function foo(n: () => void ) { } diff --git a/tests/cases/compiler/functionCall5.ts b/tests/cases/compiler/functionCall5.ts index 084bf9bac135c..7b253d0c78ffa 100644 --- a/tests/cases/compiler/functionCall5.ts +++ b/tests/cases/compiler/functionCall5.ts @@ -1,3 +1,3 @@ -module m1 { export class c1 { public a; }} +namespace m1 { export class c1 { public a; }} function foo():m1.c1{return new m1.c1();}; var x = foo(); \ No newline at end of file diff --git a/tests/cases/compiler/functionCall7.ts b/tests/cases/compiler/functionCall7.ts index c37dc55093b89..e36c4ec36ae35 100644 --- a/tests/cases/compiler/functionCall7.ts +++ b/tests/cases/compiler/functionCall7.ts @@ -1,4 +1,4 @@ -module m1 { export class c1 { public a; }} +namespace m1 { export class c1 { public a; }} function foo(a:m1.c1){ a.a = 1; }; var myC = new m1.c1(); foo(myC); diff --git a/tests/cases/compiler/functionInIfStatementInModule.ts b/tests/cases/compiler/functionInIfStatementInModule.ts index 1bb53ee9b19cf..485928b0b9892 100644 --- a/tests/cases/compiler/functionInIfStatementInModule.ts +++ b/tests/cases/compiler/functionInIfStatementInModule.ts @@ -1,5 +1,5 @@ -module Midori +namespace Midori { if (false) { function Foo(src) diff --git a/tests/cases/compiler/functionMergedWithModule.ts b/tests/cases/compiler/functionMergedWithModule.ts index 8d4294f99b555..f47937b2aba5b 100644 --- a/tests/cases/compiler/functionMergedWithModule.ts +++ b/tests/cases/compiler/functionMergedWithModule.ts @@ -1,14 +1,14 @@ -function foo(title: string) { - var x = 10; -} - -module foo.Bar { - export function f() { - } -} - -module foo.Baz { - export function g() { - Bar.f(); - } +function foo(title: string) { + var x = 10; +} + +namespace foo.Bar { + export function f() { + } +} + +namespace foo.Baz { + export function g() { + Bar.f(); + } } \ No newline at end of file diff --git a/tests/cases/compiler/functionTypeArgumentArrayAssignment.ts b/tests/cases/compiler/functionTypeArgumentArrayAssignment.ts index 91cf2d551b9d4..577e4428b263b 100644 --- a/tests/cases/compiler/functionTypeArgumentArrayAssignment.ts +++ b/tests/cases/compiler/functionTypeArgumentArrayAssignment.ts @@ -1,4 +1,4 @@ -module test { +namespace test { interface Array { foo: T; length: number; diff --git a/tests/cases/compiler/funduleExportedClassIsUsedBeforeDeclaration.ts b/tests/cases/compiler/funduleExportedClassIsUsedBeforeDeclaration.ts index 9188908e27fa4..b85ebd54d3426 100644 --- a/tests/cases/compiler/funduleExportedClassIsUsedBeforeDeclaration.ts +++ b/tests/cases/compiler/funduleExportedClassIsUsedBeforeDeclaration.ts @@ -2,7 +2,7 @@ interface A { // interface before module declaration (): B.C; // uses defined below class in module } declare function B(): B.C; // function merged with module -declare module B { +declare namespace B { export class C { // class defined in module } } diff --git a/tests/cases/compiler/funduleOfFunctionWithoutReturnTypeAnnotation.ts b/tests/cases/compiler/funduleOfFunctionWithoutReturnTypeAnnotation.ts index 3964804796e7d..97855bc109928 100644 --- a/tests/cases/compiler/funduleOfFunctionWithoutReturnTypeAnnotation.ts +++ b/tests/cases/compiler/funduleOfFunctionWithoutReturnTypeAnnotation.ts @@ -1,6 +1,6 @@ function fn() { return fn.n; } -module fn { +namespace fn { export var n = 1; } diff --git a/tests/cases/compiler/funduleSplitAcrossFiles.ts b/tests/cases/compiler/funduleSplitAcrossFiles.ts index 605acb98f9bd7..fffce243c8986 100644 --- a/tests/cases/compiler/funduleSplitAcrossFiles.ts +++ b/tests/cases/compiler/funduleSplitAcrossFiles.ts @@ -2,7 +2,7 @@ function D() { } // @Filename: funduleSplitAcrossFiles_module.ts -module D { +namespace D { export var y = "hi"; } D.y; \ No newline at end of file diff --git a/tests/cases/compiler/funduleUsedAcrossFileBoundary.ts b/tests/cases/compiler/funduleUsedAcrossFileBoundary.ts index 12d4c296cdfcb..b94f63fd80d7d 100644 --- a/tests/cases/compiler/funduleUsedAcrossFileBoundary.ts +++ b/tests/cases/compiler/funduleUsedAcrossFileBoundary.ts @@ -1,6 +1,6 @@ // @Filename: funduleUsedAcrossFileBoundary_file1.ts declare function Q(value: T): string; -declare module Q { +declare namespace Q { interface Promise { foo: string; } diff --git a/tests/cases/compiler/fuzzy.ts b/tests/cases/compiler/fuzzy.ts index 1f921fa0c7b26..91bc359dcd132 100644 --- a/tests/cases/compiler/fuzzy.ts +++ b/tests/cases/compiler/fuzzy.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export interface I { works:()=>R; alsoWorks:()=>R; diff --git a/tests/cases/compiler/generativeRecursionWithTypeOf.ts b/tests/cases/compiler/generativeRecursionWithTypeOf.ts index 31da58ce8f8ac..827aa3a4d68d9 100644 --- a/tests/cases/compiler/generativeRecursionWithTypeOf.ts +++ b/tests/cases/compiler/generativeRecursionWithTypeOf.ts @@ -3,7 +3,7 @@ class C { type: T; } -module M { +namespace M { export function f(x: typeof C) { return new x(); } diff --git a/tests/cases/compiler/genericArgumentCallSigAssignmentCompat.ts b/tests/cases/compiler/genericArgumentCallSigAssignmentCompat.ts index c8ce2d01be01a..a796daefecc32 100644 --- a/tests/cases/compiler/genericArgumentCallSigAssignmentCompat.ts +++ b/tests/cases/compiler/genericArgumentCallSigAssignmentCompat.ts @@ -1,4 +1,4 @@ -module Underscore { +namespace Underscore { export interface Iterator { (value: T, index: any, list: any): U; } diff --git a/tests/cases/compiler/genericCallbacksAndClassHierarchy.ts b/tests/cases/compiler/genericCallbacksAndClassHierarchy.ts index c59fcb17d92b1..3f1eba3777ada 100644 --- a/tests/cases/compiler/genericCallbacksAndClassHierarchy.ts +++ b/tests/cases/compiler/genericCallbacksAndClassHierarchy.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export interface I { subscribe(callback: (newValue: T) => void ): any; } diff --git a/tests/cases/compiler/genericClassImplementingGenericInterfaceFromAnotherModule.ts b/tests/cases/compiler/genericClassImplementingGenericInterfaceFromAnotherModule.ts index b5fc7b356e100..36cae5e5cbc93 100644 --- a/tests/cases/compiler/genericClassImplementingGenericInterfaceFromAnotherModule.ts +++ b/tests/cases/compiler/genericClassImplementingGenericInterfaceFromAnotherModule.ts @@ -1,7 +1,7 @@ // @declaration: true -module foo { +namespace foo { export interface IFoo { } } -module bar { +namespace bar { export class Foo implements foo.IFoo { } } diff --git a/tests/cases/compiler/genericClassPropertyInheritanceSpecialization.ts b/tests/cases/compiler/genericClassPropertyInheritanceSpecialization.ts index 2c8741ee18f0f..ae0763e712f8e 100644 --- a/tests/cases/compiler/genericClassPropertyInheritanceSpecialization.ts +++ b/tests/cases/compiler/genericClassPropertyInheritanceSpecialization.ts @@ -33,11 +33,11 @@ interface KnockoutObservableArrayStatic { (value?: T[]): KnockoutObservableArray; } -declare module ko { +declare namespace ko { export var observableArray: KnockoutObservableArrayStatic; } -module Portal.Controls.Validators { +namespace Portal.Controls.Validators { export class Validator { private _subscription; @@ -50,7 +50,7 @@ module Portal.Controls.Validators { } } -module PortalFx.ViewModels.Controls.Validators { +namespace PortalFx.ViewModels.Controls.Validators { export class Validator extends Portal.Controls.Validators.Validator { diff --git a/tests/cases/compiler/genericClassWithStaticFactory.ts b/tests/cases/compiler/genericClassWithStaticFactory.ts index c5ab1032b6f25..48b6bf43293a7 100644 --- a/tests/cases/compiler/genericClassWithStaticFactory.ts +++ b/tests/cases/compiler/genericClassWithStaticFactory.ts @@ -1,4 +1,4 @@ -module Editor { +namespace Editor { export class List { public next: List; diff --git a/tests/cases/compiler/genericClassesInModule.ts b/tests/cases/compiler/genericClassesInModule.ts index e8cf415af8f69..4cc150e42b032 100644 --- a/tests/cases/compiler/genericClassesInModule.ts +++ b/tests/cases/compiler/genericClassesInModule.ts @@ -1,6 +1,6 @@ // @declaration: true -module Foo { +namespace Foo { export class B{ } diff --git a/tests/cases/compiler/genericClassesRedeclaration.ts b/tests/cases/compiler/genericClassesRedeclaration.ts index 59c8bf3e0c22c..2967943cad558 100644 --- a/tests/cases/compiler/genericClassesRedeclaration.ts +++ b/tests/cases/compiler/genericClassesRedeclaration.ts @@ -1,4 +1,4 @@ -declare module TypeScript { +declare namespace TypeScript { interface IIndexable { [s: string]: T; } @@ -37,7 +37,7 @@ declare module TypeScript { } } -declare module TypeScript { +declare namespace TypeScript { interface IIndexable { [s: string]: T; } diff --git a/tests/cases/compiler/genericCloduleInModule.ts b/tests/cases/compiler/genericCloduleInModule.ts index bddd1a7667314..c15d1dd6aab62 100644 --- a/tests/cases/compiler/genericCloduleInModule.ts +++ b/tests/cases/compiler/genericCloduleInModule.ts @@ -1,9 +1,9 @@ -module A { +namespace A { export class B { foo() { } static bar() { } } - export module B { + export namespace B { export var x = 1; } } diff --git a/tests/cases/compiler/genericCloduleInModule2.ts b/tests/cases/compiler/genericCloduleInModule2.ts index 28e522217bb39..7dc503ef67ee9 100644 --- a/tests/cases/compiler/genericCloduleInModule2.ts +++ b/tests/cases/compiler/genericCloduleInModule2.ts @@ -1,12 +1,12 @@ -module A { +namespace A { export class B { foo() { } static bar() { } } } -module A { - export module B { +namespace A { + export namespace B { export var x = 1; } } diff --git a/tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes.ts b/tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes.ts index 8e7fb9fa58df5..e72ecb8b5e76e 100644 --- a/tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes.ts +++ b/tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes.ts @@ -1,4 +1,4 @@ -declare module EndGate { +declare namespace EndGate { export interface ICloneable { Clone(): any; } @@ -6,7 +6,7 @@ declare module EndGate { interface Number extends EndGate.ICloneable { } -module EndGate.Tweening { +namespace EndGate.Tweening { export class Tween{ private _from: T; @@ -17,7 +17,7 @@ module EndGate.Tweening { } } -module EndGate.Tweening { +namespace EndGate.Tweening { export class NumberTween extends Tween{ constructor(from: number) { super(from); diff --git a/tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes2.ts b/tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes2.ts index 1fcc60f865d45..958f8cada96be 100644 --- a/tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes2.ts +++ b/tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes2.ts @@ -1,4 +1,4 @@ -module EndGate { +namespace EndGate { export interface ICloneable { Clone(): any; } @@ -6,7 +6,7 @@ module EndGate { interface Number extends EndGate.ICloneable { } -module EndGate.Tweening { +namespace EndGate.Tweening { export class Tween{ private _from: T; @@ -16,7 +16,7 @@ module EndGate.Tweening { } } -module EndGate.Tweening { +namespace EndGate.Tweening { export class NumberTween extends Tween{ constructor(from: number) { super(from); diff --git a/tests/cases/compiler/genericFunduleInModule.ts b/tests/cases/compiler/genericFunduleInModule.ts index e6e8759bd6d34..5cc890ace9967 100644 --- a/tests/cases/compiler/genericFunduleInModule.ts +++ b/tests/cases/compiler/genericFunduleInModule.ts @@ -1,6 +1,6 @@ -module A { +namespace A { export function B(x: T) { return x; } - export module B { + export namespace B { export var x = 1; } } diff --git a/tests/cases/compiler/genericFunduleInModule2.ts b/tests/cases/compiler/genericFunduleInModule2.ts index 52f01c72dc97f..8c3dbb0e8c4b9 100644 --- a/tests/cases/compiler/genericFunduleInModule2.ts +++ b/tests/cases/compiler/genericFunduleInModule2.ts @@ -1,9 +1,9 @@ -module A { +namespace A { export function B(x: T) { return x; } } -module A { - export module B { +namespace A { + export namespace B { export var x = 1; } } diff --git a/tests/cases/compiler/genericInference2.ts b/tests/cases/compiler/genericInference2.ts index 633961ca03dd8..f50e4368d0f9d 100644 --- a/tests/cases/compiler/genericInference2.ts +++ b/tests/cases/compiler/genericInference2.ts @@ -1,4 +1,4 @@ - declare module ko { + declare namespace ko { export interface Observable { (): T; (value: T): any; diff --git a/tests/cases/compiler/genericMergedDeclarationUsingTypeParameter.ts b/tests/cases/compiler/genericMergedDeclarationUsingTypeParameter.ts index 6d8270e6304d2..122bc49ee8cf4 100644 --- a/tests/cases/compiler/genericMergedDeclarationUsingTypeParameter.ts +++ b/tests/cases/compiler/genericMergedDeclarationUsingTypeParameter.ts @@ -1,5 +1,5 @@ function foo(y: T, z: U) { return y; } -module foo { +namespace foo { export var x: T; var y = 1; } diff --git a/tests/cases/compiler/genericMergedDeclarationUsingTypeParameter2.ts b/tests/cases/compiler/genericMergedDeclarationUsingTypeParameter2.ts index 188b6b7c4d8d3..f16f185bd5bd4 100644 --- a/tests/cases/compiler/genericMergedDeclarationUsingTypeParameter2.ts +++ b/tests/cases/compiler/genericMergedDeclarationUsingTypeParameter2.ts @@ -1,5 +1,5 @@ class foo { constructor(x: T) { } } -module foo { +namespace foo { export var x: T; var y = 1; } diff --git a/tests/cases/compiler/genericOfACloduleType1.ts b/tests/cases/compiler/genericOfACloduleType1.ts index 781cedab35723..9d6318b6cec5a 100644 --- a/tests/cases/compiler/genericOfACloduleType1.ts +++ b/tests/cases/compiler/genericOfACloduleType1.ts @@ -1,7 +1,7 @@ class G{ bar(x: T) { return x; } } -module M { +namespace M { export class C { foo() { } } - export module C { + export namespace C { export class X { } } diff --git a/tests/cases/compiler/genericOfACloduleType2.ts b/tests/cases/compiler/genericOfACloduleType2.ts index ea3418cc9e2db..51448d6b7a012 100644 --- a/tests/cases/compiler/genericOfACloduleType2.ts +++ b/tests/cases/compiler/genericOfACloduleType2.ts @@ -1,7 +1,7 @@ class G{ bar(x: T) { return x; } } -module M { +namespace M { export class C { foo() { } } - export module C { + export namespace C { export class X { } } @@ -10,6 +10,6 @@ module M { g1.bar(null).foo(); // no error } -module N { +namespace N { var g2 = new G() } \ No newline at end of file diff --git a/tests/cases/compiler/genericRecursiveImplicitConstructorErrors1.ts b/tests/cases/compiler/genericRecursiveImplicitConstructorErrors1.ts index 299e88e67c5ef..6ba2e2cc93685 100644 --- a/tests/cases/compiler/genericRecursiveImplicitConstructorErrors1.ts +++ b/tests/cases/compiler/genericRecursiveImplicitConstructorErrors1.ts @@ -1,5 +1,5 @@ //@module: amd -export declare module TypeScript { +export declare namespace TypeScript { class PullSymbol { } class PullSignatureSymbol extends PullSymbol { public addSpecialization(signature: PullSignatureSymbol, typeArguments: PullTypeSymbol[]): void; diff --git a/tests/cases/compiler/genericRecursiveImplicitConstructorErrors2.ts b/tests/cases/compiler/genericRecursiveImplicitConstructorErrors2.ts index 60bc06a8e2e9e..980b03ba234f4 100644 --- a/tests/cases/compiler/genericRecursiveImplicitConstructorErrors2.ts +++ b/tests/cases/compiler/genericRecursiveImplicitConstructorErrors2.ts @@ -1,4 +1,4 @@ -module TypeScript2 { +namespace TypeScript2 { export interface DeclKind { }; export interface PullTypesymbol { }; export interface SymbolLinkKind { }; diff --git a/tests/cases/compiler/genericRecursiveImplicitConstructorErrors3.ts b/tests/cases/compiler/genericRecursiveImplicitConstructorErrors3.ts index 3d94ffbdbe631..95f3bfa191416 100644 --- a/tests/cases/compiler/genericRecursiveImplicitConstructorErrors3.ts +++ b/tests/cases/compiler/genericRecursiveImplicitConstructorErrors3.ts @@ -1,11 +1,11 @@ -module TypeScript { +namespace TypeScript { export class MemberName { static create(arg1: any, arg2?: any, arg3?: any): MemberName { } } } -module TypeScript { +namespace TypeScript { export class PullSymbol { public type: PullTypeSymbol = null; } diff --git a/tests/cases/compiler/genericTypeArgumentInference1.ts b/tests/cases/compiler/genericTypeArgumentInference1.ts index dbdf503d76fa1..a448916d85acb 100644 --- a/tests/cases/compiler/genericTypeArgumentInference1.ts +++ b/tests/cases/compiler/genericTypeArgumentInference1.ts @@ -1,4 +1,4 @@ -module Underscore { +namespace Underscore { export interface Iterator { (value: T, index: any, list: any): U; } diff --git a/tests/cases/compiler/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts b/tests/cases/compiler/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts index c80106b3dd63d..fcaaf1ee5cf2f 100644 --- a/tests/cases/compiler/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts +++ b/tests/cases/compiler/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts @@ -1,7 +1,7 @@ declare function _(value: Array): _; declare function _(value: T): _; -declare module _ { +declare namespace _ { export function each( //list: List, //iterator: ListIterator, @@ -16,7 +16,7 @@ declare class _ { each(iterator: _.ListIterator, context?: any): void; } -module MyModule { +namespace MyModule { export class MyClass { public get myGetter() { var obj:any = {}; diff --git a/tests/cases/compiler/giant.ts b/tests/cases/compiler/giant.ts index 09d1787fcaada..f88c914ca8114 100644 --- a/tests/cases/compiler/giant.ts +++ b/tests/cases/compiler/giant.ts @@ -78,7 +78,7 @@ interface I { p7(pa1, pa2): void; p7? (pa1, pa2): void; } -module M { +namespace M { var V; function F() { }; class C { @@ -142,21 +142,21 @@ module M { p7(pa1, pa2): void; p7? (pa1, pa2): void; } - module M { + namespace M { var V; function F() { }; class C { }; interface I { }; - module M { }; + namespace M { }; export var eV; export function eF() { }; export class eC { }; export interface eI { }; - export module eM { }; + export namespace eM { }; export declare var eaV; export declare function eaF() { }; export declare class eaC { }; - export declare module eaM { }; + export declare namespace eaM { }; } export var eV; export function eF() { }; @@ -221,21 +221,21 @@ module M { p7(pa1, pa2): void; p7? (pa1, pa2): void; } - export module eM { + export namespace eM { var V; function F() { }; class C { }; interface I { }; - module M { }; + namespace M { }; export var eV; export function eF() { }; export class eC { }; export interface eI { }; - export module eM { }; + export namespace eM { }; export declare var eaV; export declare function eaF() { }; export declare class eaC { }; - export declare module eaM { }; + export declare namespace eaM { }; } export declare var eaV; export declare function eaF() { }; @@ -260,17 +260,17 @@ module M { static tgF() { } static get tgF() } - export declare module eaM { + export declare namespace eaM { var V; function F() { }; class C { } interface I { } - module M { } + namespace M { } export var eV; export function eF() { }; export class eC { } export interface eI { } - export module eM { } + export namespace eM { } } } export var eV; @@ -336,7 +336,7 @@ export interface eI { p7(pa1, pa2): void; p7? (pa1, pa2): void; } -export module eM { +export namespace eM { var V; function F() { }; class C { @@ -400,21 +400,21 @@ export module eM { p7(pa1, pa2): void; p7? (pa1, pa2): void; } - module M { + namespace M { var V; function F() { }; class C { }; interface I { }; - module M { }; + namespace M { }; export var eV; export function eF() { }; export class eC { }; export interface eI { }; - export module eM { }; + export namespace eM { }; export declare var eaV; export declare function eaF() { }; export declare class eaC { }; - export declare module eaM { }; + export declare namespace eaM { }; } export var eV; export function eF() { }; @@ -479,21 +479,21 @@ export module eM { p7(pa1, pa2): void; p7? (pa1, pa2): void; } - export module eM { + export namespace eM { var V; function F() { }; class C { }; interface I { }; - module M { }; + namespace M { }; export var eV; export function eF() { }; export class eC { }; export interface eI { }; - export module eM { }; + export namespace eM { }; export declare var eaV; export declare function eaF() { }; export declare class eaC { }; - export declare module eaM { }; + export declare namespace eaM { }; } export declare var eaV; export declare function eaF() { }; @@ -518,17 +518,17 @@ export module eM { static tgF() { } static get tgF() } - export declare module eaM { + export declare namespace eaM { var V; function F() { }; class C { } interface I { } - module M { } + namespace M { } export var eV; export function eF() { }; export class eC { } export interface eI { } - export module eM { } + export namespace eM { } } } export declare var eaV; @@ -554,7 +554,7 @@ export declare class eaC { static tgF() { } static get tgF() } -export declare module eaM { +export declare namespace eaM { var V; function F() { }; class C { @@ -604,21 +604,21 @@ export declare module eaM { p7(pa1, pa2): void; p7? (pa1, pa2): void; } - module M { + namespace M { var V; function F() { }; class C { } interface I { } - module M { } + namespace M { } export var eV; export function eF() { }; export class eC { } export interface eI { } - export module eM { } + export namespace eM { } export declare var eaV export declare function eaF() { }; export declare class eaC { } - export declare module eaM { } + export declare namespace eaM { } } export var eV; export function eF() { }; @@ -670,15 +670,15 @@ export declare module eaM { p7(pa1, pa2): void; p7? (pa1, pa2): void; } - export module eM { + export namespace eM { var V; function F() { }; class C { } - module M { } + namespace M { } export var eV; export function eF() { }; export class eC { } export interface eI { } - export module eM { } + export namespace eM { } } } \ No newline at end of file diff --git a/tests/cases/compiler/global.ts b/tests/cases/compiler/global.ts index 5e4d8ab693fbc..23157da26cb1e 100644 --- a/tests/cases/compiler/global.ts +++ b/tests/cases/compiler/global.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export function f(y:number) { return x+y; } diff --git a/tests/cases/compiler/implicitAnyAmbients.ts b/tests/cases/compiler/implicitAnyAmbients.ts index 8786f5f93e468..26804256c1021 100644 --- a/tests/cases/compiler/implicitAnyAmbients.ts +++ b/tests/cases/compiler/implicitAnyAmbients.ts @@ -1,6 +1,6 @@ // @noimplicitany: true -declare module m { +declare namespace m { var x; // error var y: any; @@ -20,7 +20,7 @@ declare module m { foo3(x: any): any; } - module n { + namespace n { var y; // error } diff --git a/tests/cases/compiler/implicitAnyInAmbientDeclaration.ts b/tests/cases/compiler/implicitAnyInAmbientDeclaration.ts index 3d9325c04cffa..f4592ae01c73c 100644 --- a/tests/cases/compiler/implicitAnyInAmbientDeclaration.ts +++ b/tests/cases/compiler/implicitAnyInAmbientDeclaration.ts @@ -1,5 +1,5 @@ //@noimplicitany: true -module Test { +namespace Test { declare class C { public publicMember; // this should be an error private privateMember; // this should not be an error diff --git a/tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule.ts b/tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule.ts index 0743ac6f4ca18..f642bb964e111 100644 --- a/tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule.ts +++ b/tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule.ts @@ -1,11 +1,11 @@ // @Filename: importAliasAnExternalModuleInsideAnInternalModule_file0.ts -export module m { +export namespace m { export function foo() { } } // @Filename: importAliasAnExternalModuleInsideAnInternalModule_file1.ts import r = require('./importAliasAnExternalModuleInsideAnInternalModule_file0'); -module m_private { +namespace m_private { //import r2 = require('m'); // would be error export import C = r; // no error C.m.foo(); diff --git a/tests/cases/compiler/importAliasWithDottedName.ts b/tests/cases/compiler/importAliasWithDottedName.ts index 4f741182b56be..61b97b9b0d6cd 100644 --- a/tests/cases/compiler/importAliasWithDottedName.ts +++ b/tests/cases/compiler/importAliasWithDottedName.ts @@ -1,11 +1,11 @@ -module M { +namespace M { export var x = 1; - export module N { + export namespace N { export var y = 2; } } -module A { +namespace A { import N = M.N; var r = N.y; var r2 = M.N.y; diff --git a/tests/cases/compiler/importAnImport.ts b/tests/cases/compiler/importAnImport.ts index 2fd8e4e7d02b0..cafec0fae21c2 100644 --- a/tests/cases/compiler/importAnImport.ts +++ b/tests/cases/compiler/importAnImport.ts @@ -1,7 +1,7 @@ -module c.a.b { +namespace c.a.b { import ma = a; } -module m0 { +namespace m0 { import m8 = c.a.b.ma; } \ No newline at end of file diff --git a/tests/cases/compiler/importAndVariableDeclarationConflict1.ts b/tests/cases/compiler/importAndVariableDeclarationConflict1.ts index 9bb368fe87e87..6de01d9ea58d8 100644 --- a/tests/cases/compiler/importAndVariableDeclarationConflict1.ts +++ b/tests/cases/compiler/importAndVariableDeclarationConflict1.ts @@ -1,4 +1,4 @@ -module m { +namespace m { export var m = ''; } diff --git a/tests/cases/compiler/importAndVariableDeclarationConflict2.ts b/tests/cases/compiler/importAndVariableDeclarationConflict2.ts index ca6f3cf55c352..64ce717b2c08a 100644 --- a/tests/cases/compiler/importAndVariableDeclarationConflict2.ts +++ b/tests/cases/compiler/importAndVariableDeclarationConflict2.ts @@ -1,4 +1,4 @@ -module m { +namespace m { export var m = ''; } diff --git a/tests/cases/compiler/importAndVariableDeclarationConflict3.ts b/tests/cases/compiler/importAndVariableDeclarationConflict3.ts index 3bca8655f4cb8..f5088cbfe967c 100644 --- a/tests/cases/compiler/importAndVariableDeclarationConflict3.ts +++ b/tests/cases/compiler/importAndVariableDeclarationConflict3.ts @@ -1,4 +1,4 @@ -module m { +namespace m { export var m = ''; } diff --git a/tests/cases/compiler/importAndVariableDeclarationConflict4.ts b/tests/cases/compiler/importAndVariableDeclarationConflict4.ts index 0ab02a8715f5b..81205b9b279bb 100644 --- a/tests/cases/compiler/importAndVariableDeclarationConflict4.ts +++ b/tests/cases/compiler/importAndVariableDeclarationConflict4.ts @@ -1,4 +1,4 @@ -module m { +namespace m { export var m = ''; } diff --git a/tests/cases/compiler/importDecl.ts b/tests/cases/compiler/importDecl.ts index e7c3a0789ced7..6abe77078c869 100644 --- a/tests/cases/compiler/importDecl.ts +++ b/tests/cases/compiler/importDecl.ts @@ -43,7 +43,7 @@ export var x4 = m4.x; export var d4 = m4.d; export var f4 = m4.foo(); -export module m1 { +export namespace m1 { export var x2 = m4.x; export var d2 = m4.d; export var f2 = m4.foo(); @@ -64,7 +64,7 @@ export var useFncOnly_m4_f4 = fncOnly_m4.foo(); // only used privately no need to emit import private_m4 = require("./importDecl_require3"); -export module usePrivate_m4_m1 { +export namespace usePrivate_m4_m1 { var x3 = private_m4.x; var d3 = private_m4.d; var f3 = private_m4.foo(); diff --git a/tests/cases/compiler/importDeclWithClassModifiers.ts b/tests/cases/compiler/importDeclWithClassModifiers.ts index fa83d44de32ca..2a5f92d5a30a8 100644 --- a/tests/cases/compiler/importDeclWithClassModifiers.ts +++ b/tests/cases/compiler/importDeclWithClassModifiers.ts @@ -1,5 +1,5 @@ //@module: amd -module x { +namespace x { interface c { } } diff --git a/tests/cases/compiler/importDeclWithDeclareModifier.ts b/tests/cases/compiler/importDeclWithDeclareModifier.ts index a800be7379730..9c16b9bfafb19 100644 --- a/tests/cases/compiler/importDeclWithDeclareModifier.ts +++ b/tests/cases/compiler/importDeclWithDeclareModifier.ts @@ -1,4 +1,4 @@ -module x { +namespace x { interface c { } } diff --git a/tests/cases/compiler/importDeclWithDeclareModifierInAmbientContext.ts b/tests/cases/compiler/importDeclWithDeclareModifierInAmbientContext.ts index 5d42c1eb61539..b0ad82a993e4b 100644 --- a/tests/cases/compiler/importDeclWithDeclareModifierInAmbientContext.ts +++ b/tests/cases/compiler/importDeclWithDeclareModifierInAmbientContext.ts @@ -1,5 +1,5 @@ declare module "m" { - module x { + namespace x { interface c { } } diff --git a/tests/cases/compiler/importDeclWithExportModifier.ts b/tests/cases/compiler/importDeclWithExportModifier.ts index 7f4b909a8eff4..47c043995634b 100644 --- a/tests/cases/compiler/importDeclWithExportModifier.ts +++ b/tests/cases/compiler/importDeclWithExportModifier.ts @@ -1,5 +1,5 @@ //@module: amd -module x { +namespace x { interface c { } } diff --git a/tests/cases/compiler/importDeclWithExportModifierAndExportAssignment.ts b/tests/cases/compiler/importDeclWithExportModifierAndExportAssignment.ts index 853cc4e9e594d..1ec51288cea34 100644 --- a/tests/cases/compiler/importDeclWithExportModifierAndExportAssignment.ts +++ b/tests/cases/compiler/importDeclWithExportModifierAndExportAssignment.ts @@ -1,5 +1,5 @@ //@module: commonjs -module x { +namespace x { interface c { } } diff --git a/tests/cases/compiler/importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts b/tests/cases/compiler/importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts index 0b280166cfd5e..c1ceeca5e03fa 100644 --- a/tests/cases/compiler/importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts +++ b/tests/cases/compiler/importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts @@ -1,5 +1,5 @@ declare module "m" { - module x { + namespace x { interface c { } } diff --git a/tests/cases/compiler/importDeclWithExportModifierInAmbientContext.ts b/tests/cases/compiler/importDeclWithExportModifierInAmbientContext.ts index d475ae34bfd80..006f14ef36ce7 100644 --- a/tests/cases/compiler/importDeclWithExportModifierInAmbientContext.ts +++ b/tests/cases/compiler/importDeclWithExportModifierInAmbientContext.ts @@ -1,5 +1,5 @@ declare module "m" { - module x { + namespace x { interface c { } } diff --git a/tests/cases/compiler/importDeclarationInModuleDeclaration1.ts b/tests/cases/compiler/importDeclarationInModuleDeclaration1.ts index 9f7f9ed7ccdb0..73f380d6ebcea 100644 --- a/tests/cases/compiler/importDeclarationInModuleDeclaration1.ts +++ b/tests/cases/compiler/importDeclarationInModuleDeclaration1.ts @@ -1,3 +1,3 @@ -module m2 { +namespace m2 { import m3 = require("use_glo_M1_public"); } \ No newline at end of file diff --git a/tests/cases/compiler/importInTypePosition.ts b/tests/cases/compiler/importInTypePosition.ts index 9460e4fc8f51f..d7be902466bf0 100644 --- a/tests/cases/compiler/importInTypePosition.ts +++ b/tests/cases/compiler/importInTypePosition.ts @@ -1,4 +1,4 @@ -module A { +namespace A { export class Point { constructor(public x: number, public y: number) { } } @@ -6,12 +6,12 @@ module A { } // no code gen expected -module B { +namespace B { import a = A; //Error generates 'var = ;' } // no code gen expected -module C { +namespace C { import a = A; //Error generates 'var = ;' var m: typeof a; diff --git a/tests/cases/compiler/importInsideModule.ts b/tests/cases/compiler/importInsideModule.ts index 44c2deec33119..852d7e5614d3f 100644 --- a/tests/cases/compiler/importInsideModule.ts +++ b/tests/cases/compiler/importInsideModule.ts @@ -3,7 +3,7 @@ export var x = 1; // @Filename: importInsideModule_file2.ts -export module myModule { +export namespace myModule { import foo = require("importInsideModule_file1"); var a = foo.x; } \ No newline at end of file diff --git a/tests/cases/compiler/importOnAliasedIdentifiers.ts b/tests/cases/compiler/importOnAliasedIdentifiers.ts index bfacd19b6b1ce..010d3f3242c0f 100644 --- a/tests/cases/compiler/importOnAliasedIdentifiers.ts +++ b/tests/cases/compiler/importOnAliasedIdentifiers.ts @@ -1,8 +1,8 @@ -module A { +namespace A { export interface X { s: string } export var X: X; } -module B { +namespace B { interface A { n: number } import Y = A; // Alias only for module A import Z = A.X; // Alias for both type and member A.X diff --git a/tests/cases/compiler/import_reference-exported-alias.ts b/tests/cases/compiler/import_reference-exported-alias.ts index f04b2c2b323f6..181d9775bea64 100644 --- a/tests/cases/compiler/import_reference-exported-alias.ts +++ b/tests/cases/compiler/import_reference-exported-alias.ts @@ -1,6 +1,6 @@ // @Filename: file1.ts -module App { - export module Services { +namespace App { + export namespace Services { export class UserServices { public getUserName(): string { return "Bill Gates"; diff --git a/tests/cases/compiler/import_reference-to-type-alias.ts b/tests/cases/compiler/import_reference-to-type-alias.ts index afe304bf67f7e..f325f942d545b 100644 --- a/tests/cases/compiler/import_reference-to-type-alias.ts +++ b/tests/cases/compiler/import_reference-to-type-alias.ts @@ -1,6 +1,6 @@ // @Filename: file1.ts -export module App { - export module Services { +export namespace App { + export namespace Services { export class UserServices { public getUserName(): string { return "Bill Gates"; diff --git a/tests/cases/compiler/importedAliasesInTypePositions.ts b/tests/cases/compiler/importedAliasesInTypePositions.ts index f1dd66f60a713..676e7e2a26c22 100644 --- a/tests/cases/compiler/importedAliasesInTypePositions.ts +++ b/tests/cases/compiler/importedAliasesInTypePositions.ts @@ -1,10 +1,10 @@ -// @module:amd -// @Filename: file1.ts -export module elaborate.nested.mod.name { - export class ReferredTo { - doSomething(): void { - } - } +// @module:amd +// @Filename: file1.ts +export namespace elaborate.nested.mod.name { + export class ReferredTo { + doSomething(): void { + } + } } // @Filename: file2.ts @@ -12,7 +12,7 @@ export module elaborate.nested.mod.name { import RT_ALIAS = require("file1"); import ReferredTo = RT_ALIAS.elaborate.nested.mod.name.ReferredTo; -export module ImportingModule { +export namespace ImportingModule { class UsesReferredType { constructor(private referred: ReferredTo) { } } diff --git a/tests/cases/compiler/importedModuleAddToGlobal.ts b/tests/cases/compiler/importedModuleAddToGlobal.ts index 4bff5df0e58c5..ceedaea532550 100644 --- a/tests/cases/compiler/importedModuleAddToGlobal.ts +++ b/tests/cases/compiler/importedModuleAddToGlobal.ts @@ -1,16 +1,16 @@ // Binding for an import statement in a typeref position is being added to the global scope // Shouldn't compile b.B is not defined in C -module A { +namespace A { import b = B; import c = C; } -module B { +namespace B { import a = A; export class B { } } -module C { +namespace C { import a = A; function hello(): b.B { return null; } } \ No newline at end of file diff --git a/tests/cases/compiler/importedModuleClassNameClash.ts b/tests/cases/compiler/importedModuleClassNameClash.ts index 6883cadb36966..cbcf01622cde3 100644 --- a/tests/cases/compiler/importedModuleClassNameClash.ts +++ b/tests/cases/compiler/importedModuleClassNameClash.ts @@ -1,6 +1,6 @@ //@module: amd import foo = m1; -export module m1 { } +export namespace m1 { } class foo { } diff --git a/tests/cases/compiler/incompatibleExports1.ts b/tests/cases/compiler/incompatibleExports1.ts index d0ebd5585af83..9c2cd323e02a5 100644 --- a/tests/cases/compiler/incompatibleExports1.ts +++ b/tests/cases/compiler/incompatibleExports1.ts @@ -5,11 +5,11 @@ declare module "foo" { } declare module "baz" { - export module a { + export namespace a { export var b: number; } - module c { + namespace c { export var c: string; } diff --git a/tests/cases/compiler/indexIntoEnum.ts b/tests/cases/compiler/indexIntoEnum.ts index 70dc85c46b1f4..80100d52dc6ef 100644 --- a/tests/cases/compiler/indexIntoEnum.ts +++ b/tests/cases/compiler/indexIntoEnum.ts @@ -1,4 +1,4 @@ -module M { +namespace M { enum E { } diff --git a/tests/cases/compiler/inheritanceOfGenericConstructorMethod2.ts b/tests/cases/compiler/inheritanceOfGenericConstructorMethod2.ts index ea279444fb91a..8b5f53695fbfd 100644 --- a/tests/cases/compiler/inheritanceOfGenericConstructorMethod2.ts +++ b/tests/cases/compiler/inheritanceOfGenericConstructorMethod2.ts @@ -1,8 +1,8 @@ -module M { +namespace M { export class C1 { } export class C2 { } } -module N { +namespace N { export class D1 extends M.C1 { } export class D2 extends M.C2 { } } diff --git a/tests/cases/compiler/inheritedModuleMembersForClodule.ts b/tests/cases/compiler/inheritedModuleMembersForClodule.ts index 8af61bfa12386..294ee2ae4e9e4 100644 --- a/tests/cases/compiler/inheritedModuleMembersForClodule.ts +++ b/tests/cases/compiler/inheritedModuleMembersForClodule.ts @@ -7,7 +7,7 @@ class C { class D extends C { } -module D { +namespace D { export function foo(): number { return 0; }; diff --git a/tests/cases/compiler/innerAliases.ts b/tests/cases/compiler/innerAliases.ts index ac551bd6deecf..8621755783bf6 100644 --- a/tests/cases/compiler/innerAliases.ts +++ b/tests/cases/compiler/innerAliases.ts @@ -1,17 +1,17 @@ -module A { - export module B { - export module C { +namespace A { + export namespace B { + export namespace C { export class Class1 {} } } } -module D { +namespace D { import inner = A.B.C; var c1 = new inner.Class1(); - export module E { + export namespace E { export class Class2 {} } } diff --git a/tests/cases/compiler/innerAliases2.ts b/tests/cases/compiler/innerAliases2.ts index 9bf08bd8faf08..78ef92a8e5ba3 100644 --- a/tests/cases/compiler/innerAliases2.ts +++ b/tests/cases/compiler/innerAliases2.ts @@ -1,11 +1,11 @@ -module _provider { +namespace _provider { export class UsefulClass { public foo() { } } } -module consumer { +namespace consumer { import provider = _provider; var g:provider.UsefulClass= null; diff --git a/tests/cases/compiler/innerBoundLambdaEmit.ts b/tests/cases/compiler/innerBoundLambdaEmit.ts index f6b9697a72f7d..7c76fc07855b0 100644 --- a/tests/cases/compiler/innerBoundLambdaEmit.ts +++ b/tests/cases/compiler/innerBoundLambdaEmit.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export class Foo { } var bar = () => { }; diff --git a/tests/cases/compiler/innerExtern.ts b/tests/cases/compiler/innerExtern.ts index d906079e508f1..212181124aeeb 100644 --- a/tests/cases/compiler/innerExtern.ts +++ b/tests/cases/compiler/innerExtern.ts @@ -1,8 +1,8 @@ -module A { - export declare module BB { +namespace A { + export declare namespace BB { export var Elephant; } - export module B { + export namespace B { export class C { x = BB.Elephant.X; } diff --git a/tests/cases/compiler/innerFunc.ts b/tests/cases/compiler/innerFunc.ts index 6501ac5b4e216..afaef11a0eafb 100644 --- a/tests/cases/compiler/innerFunc.ts +++ b/tests/cases/compiler/innerFunc.ts @@ -3,7 +3,7 @@ function salt() { return pepper(); } -module M { +namespace M { export function tungsten() { function oxygen() { return 6; }; return oxygen(); diff --git a/tests/cases/compiler/innerModExport1.ts b/tests/cases/compiler/innerModExport1.ts index 7ffeb614e9be3..986fc45572131 100644 --- a/tests/cases/compiler/innerModExport1.ts +++ b/tests/cases/compiler/innerModExport1.ts @@ -1,4 +1,4 @@ -module Outer { +namespace Outer { // inner mod 1 var non_export_var: number; diff --git a/tests/cases/compiler/innerModExport2.ts b/tests/cases/compiler/innerModExport2.ts index dfcf8ba490a01..e9b2dac1ea60b 100644 --- a/tests/cases/compiler/innerModExport2.ts +++ b/tests/cases/compiler/innerModExport2.ts @@ -1,4 +1,4 @@ -module Outer { +namespace Outer { // inner mod 1 var non_export_var: number; diff --git a/tests/cases/compiler/interMixingModulesInterfaces0.ts b/tests/cases/compiler/interMixingModulesInterfaces0.ts index 2c3c9a26493ae..d7d90760a984e 100644 --- a/tests/cases/compiler/interMixingModulesInterfaces0.ts +++ b/tests/cases/compiler/interMixingModulesInterfaces0.ts @@ -1,6 +1,6 @@ -module A { +namespace A { - export module B { + export namespace B { export function createB(): B { return null; } diff --git a/tests/cases/compiler/interMixingModulesInterfaces1.ts b/tests/cases/compiler/interMixingModulesInterfaces1.ts index b0cca5f2ee656..3970ed9252658 100644 --- a/tests/cases/compiler/interMixingModulesInterfaces1.ts +++ b/tests/cases/compiler/interMixingModulesInterfaces1.ts @@ -1,11 +1,11 @@ -module A { +namespace A { export interface B { name: string; value: number; } - export module B { + export namespace B { export function createB(): B { return null; } diff --git a/tests/cases/compiler/interMixingModulesInterfaces2.ts b/tests/cases/compiler/interMixingModulesInterfaces2.ts index 91736eb95e18d..09960b256ce3b 100644 --- a/tests/cases/compiler/interMixingModulesInterfaces2.ts +++ b/tests/cases/compiler/interMixingModulesInterfaces2.ts @@ -1,11 +1,11 @@ -module A { +namespace A { export interface B { name: string; value: number; } - module B { + namespace B { export function createB(): B { return null; } diff --git a/tests/cases/compiler/interMixingModulesInterfaces3.ts b/tests/cases/compiler/interMixingModulesInterfaces3.ts index e32787c927d90..1bf0dc2415284 100644 --- a/tests/cases/compiler/interMixingModulesInterfaces3.ts +++ b/tests/cases/compiler/interMixingModulesInterfaces3.ts @@ -1,6 +1,6 @@ -module A { +namespace A { - module B { + namespace B { export function createB(): B { return null; } diff --git a/tests/cases/compiler/interMixingModulesInterfaces4.ts b/tests/cases/compiler/interMixingModulesInterfaces4.ts index 6a717e10d08da..9d38def2ff0d8 100644 --- a/tests/cases/compiler/interMixingModulesInterfaces4.ts +++ b/tests/cases/compiler/interMixingModulesInterfaces4.ts @@ -1,6 +1,6 @@ -module A { +namespace A { - export module B { + export namespace B { export function createB(): number { return null; } diff --git a/tests/cases/compiler/interMixingModulesInterfaces5.ts b/tests/cases/compiler/interMixingModulesInterfaces5.ts index 6ebf84c241bfa..0a2965aac844b 100644 --- a/tests/cases/compiler/interMixingModulesInterfaces5.ts +++ b/tests/cases/compiler/interMixingModulesInterfaces5.ts @@ -1,11 +1,11 @@ -module A { +namespace A { interface B { name: string; value: number; } - export module B { + export namespace B { export function createB(): number { return null; } diff --git a/tests/cases/compiler/interfaceAssignmentCompat.ts b/tests/cases/compiler/interfaceAssignmentCompat.ts index 030463cd9a5b9..d384dc530aee2 100644 --- a/tests/cases/compiler/interfaceAssignmentCompat.ts +++ b/tests/cases/compiler/interfaceAssignmentCompat.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export enum Color { Green, Blue, diff --git a/tests/cases/compiler/interfaceDeclaration2.ts b/tests/cases/compiler/interfaceDeclaration2.ts index 35c4337db0a6b..b81550239d1b2 100644 --- a/tests/cases/compiler/interfaceDeclaration2.ts +++ b/tests/cases/compiler/interfaceDeclaration2.ts @@ -1,5 +1,5 @@ interface I1 { } -module I1 { } +namespace I1 { } interface I2 { } class I2 { } diff --git a/tests/cases/compiler/interfaceDeclaration3.ts b/tests/cases/compiler/interfaceDeclaration3.ts index 5f944c1269678..6dd9e787e3e20 100644 --- a/tests/cases/compiler/interfaceDeclaration3.ts +++ b/tests/cases/compiler/interfaceDeclaration3.ts @@ -1,7 +1,7 @@ //@module: amd interface I1 { item:number; } -module M1 { +namespace M1 { interface I1 { item:string; } interface I2 { item:number; } class C1 implements I1 { @@ -23,10 +23,10 @@ module M1 { } } -export module M2 { +export namespace M2 { export interface I1 { item:string; } export interface I2 { item:string; } - export module M3 { + export namespace M3 { export interface I1 { item:string; } } class C1 implements I1 { diff --git a/tests/cases/compiler/interfaceDeclaration4.ts b/tests/cases/compiler/interfaceDeclaration4.ts index e82549c9f2cd2..2f18fdeccaff1 100644 --- a/tests/cases/compiler/interfaceDeclaration4.ts +++ b/tests/cases/compiler/interfaceDeclaration4.ts @@ -1,6 +1,6 @@ // Import this module when test harness supports external modules. Also remove the internal module below. // import Foo = require("interfaceDeclaration5") -module Foo { +namespace Foo { export interface I1 { item: string; } export class C1 { } } diff --git a/tests/cases/compiler/interfaceInReopenedModule.ts b/tests/cases/compiler/interfaceInReopenedModule.ts index 05f3736566ff3..775e522d2b3f5 100644 --- a/tests/cases/compiler/interfaceInReopenedModule.ts +++ b/tests/cases/compiler/interfaceInReopenedModule.ts @@ -1,8 +1,8 @@ -module m { +namespace m { } // In second instance of same module, exported interface is not visible -module m { +namespace m { interface f {} export class n { private n: f; diff --git a/tests/cases/compiler/interfaceNameAsIdentifier.ts b/tests/cases/compiler/interfaceNameAsIdentifier.ts index 484a627fb5645..34e4e7da30e2d 100644 --- a/tests/cases/compiler/interfaceNameAsIdentifier.ts +++ b/tests/cases/compiler/interfaceNameAsIdentifier.ts @@ -3,7 +3,7 @@ interface C { } C(); -module m2 { +namespace m2 { export interface C { (): void; } diff --git a/tests/cases/compiler/interfacePropertiesWithSameName2.ts b/tests/cases/compiler/interfacePropertiesWithSameName2.ts index 115e809c56e59..2c9094b77c2b8 100644 --- a/tests/cases/compiler/interfacePropertiesWithSameName2.ts +++ b/tests/cases/compiler/interfacePropertiesWithSameName2.ts @@ -12,7 +12,7 @@ interface MoverShaker extends Mover, Shaker { } // Inside a module -declare module MoversAndShakers { +declare namespace MoversAndShakers { export class Mover { move(): void; getStatus(): { speed: number; }; diff --git a/tests/cases/compiler/internalAliasClass.ts b/tests/cases/compiler/internalAliasClass.ts index bdf702d93dd1a..4f881bc089c9e 100644 --- a/tests/cases/compiler/internalAliasClass.ts +++ b/tests/cases/compiler/internalAliasClass.ts @@ -1,10 +1,10 @@ // @declaration: true -module a { +namespace a { export class c { } } -module c { +namespace c { import b = a.c; export var x: b = new b(); } \ No newline at end of file diff --git a/tests/cases/compiler/internalAliasClassInsideLocalModuleWithExport.ts b/tests/cases/compiler/internalAliasClassInsideLocalModuleWithExport.ts index c326692bae58b..f1d231f3c206c 100644 --- a/tests/cases/compiler/internalAliasClassInsideLocalModuleWithExport.ts +++ b/tests/cases/compiler/internalAliasClassInsideLocalModuleWithExport.ts @@ -1,6 +1,6 @@ //@module: commonjs // @declaration: true -export module x { +export namespace x { export class c { foo(a: number) { return a; @@ -8,8 +8,8 @@ export module x { } } -export module m2 { - export module m3 { +export namespace m2 { + export namespace m3 { export import c = x.c; export var cProp = new c(); var cReturnVal = cProp.foo(10); diff --git a/tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExport.ts b/tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExport.ts index f5f821a5a24c5..e8245bdb67efb 100644 --- a/tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExport.ts +++ b/tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExport.ts @@ -1,6 +1,6 @@ //@module: commonjs // @declaration: true -export module x { +export namespace x { export class c { foo(a: number) { return a; @@ -8,8 +8,8 @@ export module x { } } -export module m2 { - export module m3 { +export namespace m2 { + export namespace m3 { import c = x.c; export var cProp = new c(); var cReturnVal = cProp.foo(10); diff --git a/tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExportAccessError.ts b/tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExportAccessError.ts index fc456b8896e7c..92f15b8237040 100644 --- a/tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExportAccessError.ts +++ b/tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExportAccessError.ts @@ -1,5 +1,5 @@ //@module: commonjs -export module x { +export namespace x { export class c { foo(a: number) { return a; @@ -7,8 +7,8 @@ export module x { } } -export module m2 { - export module m3 { +export namespace m2 { + export namespace m3 { import c = x.c; export var cProp = new c(); var cReturnVal = cProp.foo(10); diff --git a/tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithExport.ts b/tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithExport.ts index d0feb0735ad85..598db2394b9c6 100644 --- a/tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithExport.ts +++ b/tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithExport.ts @@ -1,6 +1,6 @@ //@module: commonjs // @declaration: true -export module x { +export namespace x { export class c { foo(a: number) { return a; diff --git a/tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithoutExport.ts b/tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithoutExport.ts index 059d5bf3199c8..6202f50240954 100644 --- a/tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithoutExport.ts +++ b/tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithoutExport.ts @@ -1,6 +1,6 @@ //@module: commonjs // @declaration: true -export module x { +export namespace x { export class c { foo(a: number) { return a; diff --git a/tests/cases/compiler/internalAliasEnum.ts b/tests/cases/compiler/internalAliasEnum.ts index 310c8b07f5b14..83bcbc7af7f7e 100644 --- a/tests/cases/compiler/internalAliasEnum.ts +++ b/tests/cases/compiler/internalAliasEnum.ts @@ -1,5 +1,5 @@ // @declaration: true -module a { +namespace a { export enum weekend { Friday, Saturday, @@ -7,7 +7,7 @@ module a { } } -module c { +namespace c { import b = a.weekend; export var bVal: b = b.Sunday; } diff --git a/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithExport.ts b/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithExport.ts index ad1f7c113c802..52a76bd605802 100644 --- a/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithExport.ts +++ b/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithExport.ts @@ -1,6 +1,6 @@ //@module: commonjs // @declaration: true -export module a { +export namespace a { export enum weekend { Friday, Saturday, @@ -8,7 +8,7 @@ export module a { } } -export module c { +export namespace c { export import b = a.weekend; export var bVal: b = b.Sunday; } diff --git a/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExport.ts b/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExport.ts index 8cdf446ae710a..66b36ab0da8d9 100644 --- a/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExport.ts +++ b/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExport.ts @@ -1,6 +1,6 @@ //@module: commonjs // @declaration: true -export module a { +export namespace a { export enum weekend { Friday, Saturday, @@ -8,7 +8,7 @@ export module a { } } -export module c { +export namespace c { import b = a.weekend; export var bVal: b = b.Sunday; } diff --git a/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts b/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts index 01d2f7b643003..13eb2d8ef7dcd 100644 --- a/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts +++ b/tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExportAccessError.ts @@ -1,5 +1,5 @@ //@module: commonjs -export module a { +export namespace a { export enum weekend { Friday, Saturday, @@ -7,7 +7,7 @@ export module a { } } -export module c { +export namespace c { import b = a.weekend; export var bVal: b = b.Sunday; } diff --git a/tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithExport.ts b/tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithExport.ts index 29af9d1f69ac2..6522421bc5b6a 100644 --- a/tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithExport.ts +++ b/tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithExport.ts @@ -1,6 +1,6 @@ //@module: amd // @declaration: true -export module a { +export namespace a { export enum weekend { Friday, Saturday, diff --git a/tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithoutExport.ts b/tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithoutExport.ts index ffc558fbf9c92..90df2ff58178b 100644 --- a/tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithoutExport.ts +++ b/tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithoutExport.ts @@ -1,6 +1,6 @@ //@module: amd // @declaration: true -export module a { +export namespace a { export enum weekend { Friday, Saturday, diff --git a/tests/cases/compiler/internalAliasFunction.ts b/tests/cases/compiler/internalAliasFunction.ts index c62ab5b8248b0..cdf70ff6057c8 100644 --- a/tests/cases/compiler/internalAliasFunction.ts +++ b/tests/cases/compiler/internalAliasFunction.ts @@ -1,11 +1,11 @@ // @declaration: true -module a { +namespace a { export function foo(x: number) { return x; } } -module c { +namespace c { import b = a.foo; export var bVal = b(10); export var bVal2 = b; diff --git a/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithExport.ts b/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithExport.ts index fadf16cbea3e8..e9ed5dff05353 100644 --- a/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithExport.ts +++ b/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithExport.ts @@ -1,12 +1,12 @@ //@module: commonjs // @declaration: true -export module a { +export namespace a { export function foo(x: number) { return x; } } -export module c { +export namespace c { export import b = a.foo; export var bVal = b(10); export var bVal2 = b; diff --git a/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExport.ts b/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExport.ts index 9b56b079c309a..a04f28fa52ec4 100644 --- a/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExport.ts +++ b/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExport.ts @@ -1,12 +1,12 @@ //@module: commonjs // @declaration: true -export module a { +export namespace a { export function foo(x: number) { return x; } } -export module c { +export namespace c { import b = a.foo; var bVal = b(10); export var bVal2 = b; diff --git a/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts b/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts index 07d9637444874..0e705189a3fbc 100644 --- a/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts +++ b/tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.ts @@ -1,11 +1,11 @@ //@module: commonjs -export module a { +export namespace a { export function foo(x: number) { return x; } } -export module c { +export namespace c { import b = a.foo; var bVal = b(10); export var bVal2 = b; diff --git a/tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithExport.ts b/tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithExport.ts index 3859a16e678db..bb25a349937f9 100644 --- a/tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithExport.ts +++ b/tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithExport.ts @@ -1,6 +1,6 @@ //@module: amd // @declaration: true -export module a { +export namespace a { export function foo(x: number) { return x; } diff --git a/tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithoutExport.ts b/tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithoutExport.ts index 0ecf9fa75f308..a53a2f5b175cf 100644 --- a/tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithoutExport.ts +++ b/tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithoutExport.ts @@ -1,6 +1,6 @@ //@module: commonjs // @declaration: true -export module a { +export namespace a { export function foo(x: number) { return x; } diff --git a/tests/cases/compiler/internalAliasInitializedModule.ts b/tests/cases/compiler/internalAliasInitializedModule.ts index af4d88db3b258..13bc699fb7592 100644 --- a/tests/cases/compiler/internalAliasInitializedModule.ts +++ b/tests/cases/compiler/internalAliasInitializedModule.ts @@ -1,12 +1,12 @@ // @declaration: true -module a { - export module b { +namespace a { + export namespace b { export class c { } } } -module c { +namespace c { import b = a.b; export var x: b.c = new b.c(); } \ No newline at end of file diff --git a/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithExport.ts b/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithExport.ts index f36c242fa99e9..8abb8a8e2621e 100644 --- a/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithExport.ts +++ b/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithExport.ts @@ -1,13 +1,13 @@ //@module: amd // @declaration: true -export module a { - export module b { +export namespace a { + export namespace b { export class c { } } } -export module c { +export namespace c { export import b = a.b; export var x: b.c = new b.c(); } \ No newline at end of file diff --git a/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts b/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts index 8e3e7b1fa2c6e..810964fbf6b40 100644 --- a/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts +++ b/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts @@ -1,13 +1,13 @@ //@module: commonjs // @declaration: true -export module a { - export module b { +export namespace a { + export namespace b { export class c { } } } -export module c { +export namespace c { import b = a.b; export var x: b.c = new b.c(); } \ No newline at end of file diff --git a/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts b/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts index 019973618d023..8867c4ec1e76c 100644 --- a/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts +++ b/tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.ts @@ -1,12 +1,12 @@ //@module: commonjs -export module a { - export module b { +export namespace a { + export namespace b { export class c { } } } -export module c { +export namespace c { import b = a.b; export var x: b.c = new b.c(); } diff --git a/tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts b/tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts index 0d8bc703e8bb9..ee812083d452d 100644 --- a/tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts +++ b/tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts @@ -1,7 +1,7 @@ //@module: commonjs // @declaration: true -export module a { - export module b { +export namespace a { + export namespace b { export class c { } } diff --git a/tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts b/tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts index b02e689934893..a866934e6996d 100644 --- a/tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts +++ b/tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts @@ -1,7 +1,7 @@ //@module: amd // @declaration: true -export module a { - export module b { +export namespace a { + export namespace b { export class c { } } diff --git a/tests/cases/compiler/internalAliasInterface.ts b/tests/cases/compiler/internalAliasInterface.ts index e4dae7ffeb312..1e9205de023bb 100644 --- a/tests/cases/compiler/internalAliasInterface.ts +++ b/tests/cases/compiler/internalAliasInterface.ts @@ -1,10 +1,10 @@ // @declaration: true -module a { +namespace a { export interface I { } } -module c { +namespace c { import b = a.I; export var x: b; } diff --git a/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithExport.ts b/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithExport.ts index faaa0c29a49e6..ce3272c00d1e5 100644 --- a/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithExport.ts +++ b/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithExport.ts @@ -1,11 +1,11 @@ //@module: amd // @declaration: true -export module a { +export namespace a { export interface I { } } -export module c { +export namespace c { export import b = a.I; export var x: b; } diff --git a/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExport.ts b/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExport.ts index 7084cbc99b6b6..b15c334f467b3 100644 --- a/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExport.ts +++ b/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExport.ts @@ -1,11 +1,11 @@ //@module: amd // @declaration: true -export module a { +export namespace a { export interface I { } } -export module c { +export namespace c { import b = a.I; export var x: b; } diff --git a/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts b/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts index 23629661799ab..fb1764a7ca241 100644 --- a/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts +++ b/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts @@ -1,10 +1,10 @@ //@module: amd -export module a { +export namespace a { export interface I { } } -export module c { +export namespace c { import b = a.I; export var x: b; } diff --git a/tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithExport.ts b/tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithExport.ts index 5498eedd60e25..d99007a610a1b 100644 --- a/tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithExport.ts +++ b/tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithExport.ts @@ -1,6 +1,6 @@ //@module: commonjs // @declaration: true -export module a { +export namespace a { export interface I { } } diff --git a/tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts b/tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts index 60f951276447f..f2f6bd1397146 100644 --- a/tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts +++ b/tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts @@ -1,6 +1,6 @@ //@module: amd // @declaration: true -export module a { +export namespace a { export interface I { } } diff --git a/tests/cases/compiler/internalAliasUninitializedModule.ts b/tests/cases/compiler/internalAliasUninitializedModule.ts index ad4c28b4c720c..eec8d3420e9f7 100644 --- a/tests/cases/compiler/internalAliasUninitializedModule.ts +++ b/tests/cases/compiler/internalAliasUninitializedModule.ts @@ -1,13 +1,13 @@ // @declaration: true -module a { - export module b { +namespace a { + export namespace b { export interface I { foo(); } } } -module c { +namespace c { import b = a.b; export var x: b.I; x.foo(); diff --git a/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithExport.ts b/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithExport.ts index 12969ab59d617..9c148ca2d2e48 100644 --- a/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithExport.ts +++ b/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithExport.ts @@ -1,14 +1,14 @@ //@module: commonjs // @declaration: true -export module a { - export module b { +export namespace a { + export namespace b { export interface I { foo(); } } } -export module c { +export namespace c { export import b = a.b; export var x: b.I; x.foo(); diff --git a/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts b/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts index fcaed7d34a0e3..b7d84962869fc 100644 --- a/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts +++ b/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts @@ -1,14 +1,14 @@ //@module: commonjs // @declaration: true -export module a { - export module b { +export namespace a { + export namespace b { export interface I { foo(); } } } -export module c { +export namespace c { import b = a.b; export var x: b.I; x.foo(); diff --git a/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts b/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts index 36cfcf7e8cede..39b5a8ec24654 100644 --- a/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts +++ b/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts @@ -1,13 +1,13 @@ //@module: amd -export module a { - export module b { +export namespace a { + export namespace b { export interface I { foo(); } } } -export module c { +export namespace c { import b = a.b; export var x: b.I; x.foo(); diff --git a/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts b/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts index 1caa77efc6d68..9ef9aba771d68 100644 --- a/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts +++ b/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts @@ -1,7 +1,7 @@ //@module: amd // @declaration: true -export module a { - export module b { +export namespace a { + export namespace b { export interface I { foo(); } diff --git a/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts b/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts index 794f2c9d976b1..03d2121e7b1ed 100644 --- a/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts +++ b/tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts @@ -1,7 +1,7 @@ //@module: commonjs // @declaration: true -export module a { - export module b { +export namespace a { + export namespace b { export interface I { foo(); } diff --git a/tests/cases/compiler/internalAliasVar.ts b/tests/cases/compiler/internalAliasVar.ts index 3dc8cb8cf9f34..e9fa82f083547 100644 --- a/tests/cases/compiler/internalAliasVar.ts +++ b/tests/cases/compiler/internalAliasVar.ts @@ -1,9 +1,9 @@ // @declaration: true -module a { +namespace a { export var x = 10; } -module c { +namespace c { import b = a.x; export var bVal = b; } diff --git a/tests/cases/compiler/internalAliasVarInsideLocalModuleWithExport.ts b/tests/cases/compiler/internalAliasVarInsideLocalModuleWithExport.ts index ab2d0eddff0dd..19c52736c0b8c 100644 --- a/tests/cases/compiler/internalAliasVarInsideLocalModuleWithExport.ts +++ b/tests/cases/compiler/internalAliasVarInsideLocalModuleWithExport.ts @@ -1,10 +1,10 @@ //@module: amd // @declaration: true -export module a { +export namespace a { export var x = 10; } -export module c { +export namespace c { export import b = a.x; export var bVal = b; } diff --git a/tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExport.ts b/tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExport.ts index a262a24e685bc..09edf8fb0c603 100644 --- a/tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExport.ts +++ b/tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExport.ts @@ -1,10 +1,10 @@ //@module: amd // @declaration: true -export module a { +export namespace a { export var x = 10; } -export module c { +export namespace c { import b = a.x; export var bVal = b; } diff --git a/tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExportAccessError.ts b/tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExportAccessError.ts index dbda086e70586..6065ede8fd819 100644 --- a/tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExportAccessError.ts +++ b/tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExportAccessError.ts @@ -1,9 +1,9 @@ //@module: commonjs -export module a { +export namespace a { export var x = 10; } -export module c { +export namespace c { import b = a.x; export var bVal = b; } diff --git a/tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithExport.ts b/tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithExport.ts index ec37a80eb3d50..186de6eeebcf6 100644 --- a/tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithExport.ts +++ b/tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithExport.ts @@ -1,6 +1,6 @@ //@module: amd // @declaration: true -export module a { +export namespace a { export var x = 10; } diff --git a/tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithoutExport.ts b/tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithoutExport.ts index b6af17ee9ec3f..bfeb5bcc9ccbf 100644 --- a/tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithoutExport.ts +++ b/tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithoutExport.ts @@ -1,6 +1,6 @@ //@module: commonjs // @declaration: true -export module a { +export namespace a { export var x = 10; } diff --git a/tests/cases/compiler/internalAliasWithDottedNameEmit.ts b/tests/cases/compiler/internalAliasWithDottedNameEmit.ts index 231922571259c..ee7e3fbb1946b 100644 --- a/tests/cases/compiler/internalAliasWithDottedNameEmit.ts +++ b/tests/cases/compiler/internalAliasWithDottedNameEmit.ts @@ -1,7 +1,7 @@ // @declaration: true -module a.b.c { +namespace a.b.c { export var d; } -module a.e.f { +namespace a.e.f { import g = b.c; } diff --git a/tests/cases/compiler/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.ts b/tests/cases/compiler/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.ts index ebabd3e1f94dd..9f37dac658642 100644 --- a/tests/cases/compiler/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.ts +++ b/tests/cases/compiler/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.ts @@ -1,12 +1,12 @@ class A { aProp: string; } -module A { +namespace A { export interface X { s: string } export var a = 10; } -module B { +namespace B { var A = 1; import Y = A; } diff --git a/tests/cases/compiler/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts b/tests/cases/compiler/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts index 3817ebbd9795e..44d8010366c9b 100644 --- a/tests/cases/compiler/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts +++ b/tests/cases/compiler/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts @@ -1,11 +1,11 @@ class A { aProp: string; } -module A { +namespace A { export interface X { s: string } export var a = 10; } -module B { +namespace B { import Y = A; } diff --git a/tests/cases/compiler/internalImportInstantiatedModuleNotReferencingInstance.ts b/tests/cases/compiler/internalImportInstantiatedModuleNotReferencingInstance.ts index 79e8f652afbe3..761962c29662a 100644 --- a/tests/cases/compiler/internalImportInstantiatedModuleNotReferencingInstance.ts +++ b/tests/cases/compiler/internalImportInstantiatedModuleNotReferencingInstance.ts @@ -1,9 +1,9 @@ -module A { +namespace A { export interface X { s: string } export var a = 10; } -module B { +namespace B { var A = 1; import Y = A; } diff --git a/tests/cases/compiler/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.ts b/tests/cases/compiler/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.ts index 6546804ef7eed..8d195bc62c78e 100644 --- a/tests/cases/compiler/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.ts +++ b/tests/cases/compiler/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.ts @@ -1,11 +1,11 @@ class A { aProp: string; } -module A { +namespace A { export interface X { s: string } } -module B { +namespace B { var A = 1; import Y = A; } diff --git a/tests/cases/compiler/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts b/tests/cases/compiler/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts index f264b5df7f902..b5d0ff67256b1 100644 --- a/tests/cases/compiler/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts +++ b/tests/cases/compiler/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts @@ -1,10 +1,10 @@ class A { aProp: string; } -module A { +namespace A { export interface X { s: string } } -module B { +namespace B { import Y = A; } diff --git a/tests/cases/compiler/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.ts b/tests/cases/compiler/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.ts index adce53349a9c6..2dac103b2d371 100644 --- a/tests/cases/compiler/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.ts +++ b/tests/cases/compiler/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.ts @@ -1,8 +1,8 @@ -module A { +namespace A { export interface X { s: string } } -module B { +namespace B { var A = 1; import Y = A; } diff --git a/tests/cases/compiler/intrinsics.ts b/tests/cases/compiler/intrinsics.ts index 2391e45e83b3a..0a1f9431b4dc9 100644 --- a/tests/cases/compiler/intrinsics.ts +++ b/tests/cases/compiler/intrinsics.ts @@ -2,7 +2,7 @@ var hasOwnProperty: hasOwnProperty; // Error -module m1 { +namespace m1 { export var __proto__; interface __proto__ {} diff --git a/tests/cases/compiler/isDeclarationVisibleNodeKinds.ts b/tests/cases/compiler/isDeclarationVisibleNodeKinds.ts index 0434c40ee6a7a..5351379b55c3b 100644 --- a/tests/cases/compiler/isDeclarationVisibleNodeKinds.ts +++ b/tests/cases/compiler/isDeclarationVisibleNodeKinds.ts @@ -2,28 +2,28 @@ // @target: es5 // Function types -module schema { +namespace schema { export function createValidator1(schema: any): (data: T) => T { return undefined; } } // Constructor types -module schema { +namespace schema { export function createValidator2(schema: any): new (data: T) => T { return undefined; } } // union types -module schema { +namespace schema { export function createValidator3(schema: any): number | { new (data: T): T; } { return undefined; } } // Array types -module schema { +namespace schema { export function createValidator4(schema: any): { new (data: T): T; }[] { return undefined; } @@ -31,35 +31,35 @@ module schema { // TypeLiterals -module schema { +namespace schema { export function createValidator5(schema: any): { new (data: T): T } { return undefined; } } // Tuple types -module schema { +namespace schema { export function createValidator6(schema: any): [ new (data: T) => T, number] { return undefined; } } // Paren Types -module schema { +namespace schema { export function createValidator7(schema: any): (new (data: T)=>T )[] { return undefined; } } // Type reference -module schema { +namespace schema { export function createValidator8(schema: any): Array<{ (data: T) : T}> { return undefined; } } -module schema { +namespace schema { export class T { get createValidator9(): (data: T) => T { return undefined; diff --git a/tests/cases/compiler/jsFileCompilationModuleSyntax.ts b/tests/cases/compiler/jsFileCompilationModuleSyntax.ts index f7d1a9070f6e7..ee19b2050fba4 100644 --- a/tests/cases/compiler/jsFileCompilationModuleSyntax.ts +++ b/tests/cases/compiler/jsFileCompilationModuleSyntax.ts @@ -1,3 +1,3 @@ // @allowJs: true // @filename: a.js -module M { } \ No newline at end of file +namespace M { } \ No newline at end of file diff --git a/tests/cases/compiler/jsxFactoryIdentifierAsParameter.ts b/tests/cases/compiler/jsxFactoryIdentifierAsParameter.ts index bd92a47342843..b420d3fd3adc5 100644 --- a/tests/cases/compiler/jsxFactoryIdentifierAsParameter.ts +++ b/tests/cases/compiler/jsxFactoryIdentifierAsParameter.ts @@ -5,7 +5,7 @@ //@sourcemap: true // @filename: test.tsx -declare module JSX { +declare namespace JSX { interface IntrinsicElements { [s: string]: any; } diff --git a/tests/cases/compiler/jsxFactoryIdentifierWithAbsentParameter.ts b/tests/cases/compiler/jsxFactoryIdentifierWithAbsentParameter.ts index 49e485a1085f6..e2d101c5f0998 100644 --- a/tests/cases/compiler/jsxFactoryIdentifierWithAbsentParameter.ts +++ b/tests/cases/compiler/jsxFactoryIdentifierWithAbsentParameter.ts @@ -5,7 +5,7 @@ //@sourcemap: true // @filename: test.tsx -declare module JSX { +declare namespace JSX { interface IntrinsicElements { [s: string]: any; } diff --git a/tests/cases/compiler/jsxFactoryQualifiedNameResolutionError.ts b/tests/cases/compiler/jsxFactoryQualifiedNameResolutionError.ts index a899624513851..9b6d23e283e81 100644 --- a/tests/cases/compiler/jsxFactoryQualifiedNameResolutionError.ts +++ b/tests/cases/compiler/jsxFactoryQualifiedNameResolutionError.ts @@ -5,7 +5,7 @@ //@sourcemap: true // @filename: test.tsx -declare module JSX { +declare namespace JSX { interface IntrinsicElements { [s: string]: any; } diff --git a/tests/cases/compiler/knockout.ts b/tests/cases/compiler/knockout.ts index cccfeef24db8f..dfe072d1a5728 100644 --- a/tests/cases/compiler/knockout.ts +++ b/tests/cases/compiler/knockout.ts @@ -1,4 +1,4 @@ - declare module ko { + declare namespace ko { export interface Observable { (): T; (value: T): any; diff --git a/tests/cases/compiler/lambdaPropSelf.ts b/tests/cases/compiler/lambdaPropSelf.ts index 0a1f5c19392fa..2b80447755a11 100644 --- a/tests/cases/compiler/lambdaPropSelf.ts +++ b/tests/cases/compiler/lambdaPropSelf.ts @@ -17,6 +17,6 @@ class T { } } -module M { +namespace M { var x = this; } diff --git a/tests/cases/compiler/letAndVarRedeclaration.ts b/tests/cases/compiler/letAndVarRedeclaration.ts index aaf2ce1a68cde..6615de3cff7c0 100644 --- a/tests/cases/compiler/letAndVarRedeclaration.ts +++ b/tests/cases/compiler/letAndVarRedeclaration.ts @@ -22,13 +22,13 @@ function f1() { } } -module M0 { +namespace M0 { let x2; var x2; function x2() { } } -module M1 { +namespace M1 { let x2; { var x2; @@ -48,7 +48,7 @@ function f2() { } } -module M2 { +namespace M2 { let x11; for (var x11; ;) { } diff --git a/tests/cases/compiler/letDeclarations-scopes.ts b/tests/cases/compiler/letDeclarations-scopes.ts index b050a5e9bd0ff..1597bb441c075 100644 --- a/tests/cases/compiler/letDeclarations-scopes.ts +++ b/tests/cases/compiler/letDeclarations-scopes.ts @@ -112,7 +112,7 @@ var F3 = function () { }; // modules -module m { +namespace m { let l = 0; n = l; diff --git a/tests/cases/compiler/letDeclarations-validContexts.ts b/tests/cases/compiler/letDeclarations-validContexts.ts index 2a4022901c151..c7558d2c0aca5 100644 --- a/tests/cases/compiler/letDeclarations-validContexts.ts +++ b/tests/cases/compiler/letDeclarations-validContexts.ts @@ -88,7 +88,7 @@ var F3 = function () { }; // modules -module m { +namespace m { let l22 = 0; { @@ -139,7 +139,7 @@ function f3() { } } -module m3 { +namespace m3 { label: let l34 = 0; { label2: let l35 = 0; diff --git a/tests/cases/compiler/letDeclarations2.ts b/tests/cases/compiler/letDeclarations2.ts index e7e09f0849a3a..9b38845651a09 100644 --- a/tests/cases/compiler/letDeclarations2.ts +++ b/tests/cases/compiler/letDeclarations2.ts @@ -1,7 +1,7 @@ // @target: ES6 // @declaration: true -module M { +namespace M { let l1 = "s"; export let l2 = 0; } \ No newline at end of file diff --git a/tests/cases/compiler/letKeepNamesOfTopLevelItems.ts b/tests/cases/compiler/letKeepNamesOfTopLevelItems.ts index b5fc5fc031c2e..b1c9eac74996d 100644 --- a/tests/cases/compiler/letKeepNamesOfTopLevelItems.ts +++ b/tests/cases/compiler/letKeepNamesOfTopLevelItems.ts @@ -3,6 +3,6 @@ function foo() { let x; } -module A { +namespace A { let x; } \ No newline at end of file diff --git a/tests/cases/compiler/libMembers.ts b/tests/cases/compiler/libMembers.ts index 4470041632e78..38111f20be342 100644 --- a/tests/cases/compiler/libMembers.ts +++ b/tests/cases/compiler/libMembers.ts @@ -3,7 +3,7 @@ s.substring(0); s.substring(3,4); s.subby(12); // error unresolved String.fromCharCode(12); -module M { +namespace M { export class C { } var a=new C[]; diff --git a/tests/cases/compiler/listFailure.ts b/tests/cases/compiler/listFailure.ts index a70bfe9579733..2f7e7a9ea2d6a 100644 --- a/tests/cases/compiler/listFailure.ts +++ b/tests/cases/compiler/listFailure.ts @@ -1,4 +1,4 @@ -module Editor { +namespace Editor { export class Buffer { lines: List = ListMakeHead(); diff --git a/tests/cases/compiler/localImportNameVsGlobalName.ts b/tests/cases/compiler/localImportNameVsGlobalName.ts index 1153bba6ba12b..59ce499b359d9 100644 --- a/tests/cases/compiler/localImportNameVsGlobalName.ts +++ b/tests/cases/compiler/localImportNameVsGlobalName.ts @@ -1,8 +1,8 @@ -module Keyboard { +namespace Keyboard { export enum Key { UP, DOWN, LEFT, RIGHT } } -module App { +namespace App { import Key = Keyboard.Key; export function foo(key: Key): void {} diff --git a/tests/cases/compiler/memberScope.ts b/tests/cases/compiler/memberScope.ts index 102c7884250e5..c39124d3a99e3 100644 --- a/tests/cases/compiler/memberScope.ts +++ b/tests/cases/compiler/memberScope.ts @@ -1,6 +1,6 @@ -module Salt { +namespace Salt { export class Pepper {} - export module Basil { } + export namespace Basil { } var z = Basil.Pepper; } diff --git a/tests/cases/compiler/mergedDeclarations1.ts b/tests/cases/compiler/mergedDeclarations1.ts index 18e31c0d1d9e2..fd29e1ac595d9 100644 --- a/tests/cases/compiler/mergedDeclarations1.ts +++ b/tests/cases/compiler/mergedDeclarations1.ts @@ -5,7 +5,7 @@ interface Point { function point(x: number, y: number): Point { return { x: x, y: y }; } -module point { +namespace point { export var origin = point(0, 0); export function equals(p1: Point, p2: Point) { return p1.x == p2.x && p1.y == p2.y; diff --git a/tests/cases/compiler/mergedDeclarations2.ts b/tests/cases/compiler/mergedDeclarations2.ts index 745b4f01fc5e1..f009e9e320045 100644 --- a/tests/cases/compiler/mergedDeclarations2.ts +++ b/tests/cases/compiler/mergedDeclarations2.ts @@ -5,6 +5,6 @@ enum Foo { a = b } -module Foo { +namespace Foo { export var x = b } \ No newline at end of file diff --git a/tests/cases/compiler/mergedDeclarations3.ts b/tests/cases/compiler/mergedDeclarations3.ts index b2754c6227775..4b234499fa152 100644 --- a/tests/cases/compiler/mergedDeclarations3.ts +++ b/tests/cases/compiler/mergedDeclarations3.ts @@ -1,34 +1,34 @@ -module M { +namespace M { export enum Color { Red, Green } } -module M { - export module Color { +namespace M { + export namespace Color { export var Blue = 4; } } var p = M.Color.Blue; // ok -module M { +namespace M { export function foo() { } } -module M { - module foo { +namespace M { + namespace foo { export var x = 1; } } -module M { - export module foo { +namespace M { + export namespace foo { export var y = 2 } } -module M { - module foo { +namespace M { + namespace foo { export var z = 1; } } diff --git a/tests/cases/compiler/mergedDeclarations4.ts b/tests/cases/compiler/mergedDeclarations4.ts index a45384415a288..2619b59527bd4 100644 --- a/tests/cases/compiler/mergedDeclarations4.ts +++ b/tests/cases/compiler/mergedDeclarations4.ts @@ -1,12 +1,12 @@ -module M { +namespace M { export function f() { } f(); M.f(); var r = f.hello; } -module M { - export module f { +namespace M { + export namespace f { export var hello = 1; } f(); diff --git a/tests/cases/compiler/mergedModuleDeclarationCodeGen.ts b/tests/cases/compiler/mergedModuleDeclarationCodeGen.ts index 9a0a5fbb17bd6..168a21e7b90e6 100644 --- a/tests/cases/compiler/mergedModuleDeclarationCodeGen.ts +++ b/tests/cases/compiler/mergedModuleDeclarationCodeGen.ts @@ -1,5 +1,5 @@ -export module X { - export module Y { +export namespace X { + export namespace Y { class A { constructor(Y: any) { new B(); @@ -7,8 +7,8 @@ export module X { } } } -export module X { - export module Y { +export namespace X { + export namespace Y { export class B { } } diff --git a/tests/cases/compiler/mergedModuleDeclarationCodeGen2.ts b/tests/cases/compiler/mergedModuleDeclarationCodeGen2.ts index 82051c76abc66..6ece3a4964514 100644 --- a/tests/cases/compiler/mergedModuleDeclarationCodeGen2.ts +++ b/tests/cases/compiler/mergedModuleDeclarationCodeGen2.ts @@ -1,7 +1,7 @@ -module my.data.foo { +namespace my.data.foo { export function buz() { } } -module my.data { +namespace my.data { function data(my) { foo.buz(); } diff --git a/tests/cases/compiler/mergedModuleDeclarationCodeGen3.ts b/tests/cases/compiler/mergedModuleDeclarationCodeGen3.ts index 0430bf27c7cfb..9b11e62d2892d 100644 --- a/tests/cases/compiler/mergedModuleDeclarationCodeGen3.ts +++ b/tests/cases/compiler/mergedModuleDeclarationCodeGen3.ts @@ -1,7 +1,7 @@ -module my.data { +namespace my.data { export function buz() { } } -module my.data.foo { +namespace my.data.foo { function data(my, foo) { buz(); } diff --git a/tests/cases/compiler/mergedModuleDeclarationCodeGen4.ts b/tests/cases/compiler/mergedModuleDeclarationCodeGen4.ts index f6c17b1e673ad..8b58b1f545f39 100644 --- a/tests/cases/compiler/mergedModuleDeclarationCodeGen4.ts +++ b/tests/cases/compiler/mergedModuleDeclarationCodeGen4.ts @@ -1,12 +1,12 @@ -module superContain { - export module contain { - export module my.buz { - export module data { +namespace superContain { + export namespace contain { + export namespace my.buz { + export namespace data { export function foo() { } } } - export module my.buz { - export module data { + export namespace my.buz { + export namespace data { export function bar(contain, my, buz, data) { foo(); } diff --git a/tests/cases/compiler/mergedModuleDeclarationCodeGen5.ts b/tests/cases/compiler/mergedModuleDeclarationCodeGen5.ts index 344b693b7caeb..894ef732a60d9 100644 --- a/tests/cases/compiler/mergedModuleDeclarationCodeGen5.ts +++ b/tests/cases/compiler/mergedModuleDeclarationCodeGen5.ts @@ -1,8 +1,8 @@ -module M.buz.plop { +namespace M.buz.plop { export function doom() { } export function M() { } } -module M.buz.plop { +namespace M.buz.plop { function gunk() { } function buz() { } export class fudge { } diff --git a/tests/cases/compiler/mergedModuleDeclarationWithSharedExportedVar.ts b/tests/cases/compiler/mergedModuleDeclarationWithSharedExportedVar.ts index d075ae378b5f1..6e36f2e020720 100644 --- a/tests/cases/compiler/mergedModuleDeclarationWithSharedExportedVar.ts +++ b/tests/cases/compiler/mergedModuleDeclarationWithSharedExportedVar.ts @@ -1,7 +1,7 @@ -module M { +namespace M { export var v = 10; v; } -module M { +namespace M { v; } \ No newline at end of file diff --git a/tests/cases/compiler/metadataOfClassFromModule.ts b/tests/cases/compiler/metadataOfClassFromModule.ts index aca356f22471a..a7aa5fbcce018 100644 --- a/tests/cases/compiler/metadataOfClassFromModule.ts +++ b/tests/cases/compiler/metadataOfClassFromModule.ts @@ -1,7 +1,7 @@ // @experimentalDecorators: true // @emitDecoratorMetadata: true // @target: es5 -module MyModule { +namespace MyModule { export function inject(target: any, key: string): void { } diff --git a/tests/cases/compiler/methodContainingLocalFunction.ts b/tests/cases/compiler/methodContainingLocalFunction.ts index 8acddf7511b48..420ac612b2cde 100644 --- a/tests/cases/compiler/methodContainingLocalFunction.ts +++ b/tests/cases/compiler/methodContainingLocalFunction.ts @@ -33,7 +33,7 @@ class C { } } -module M { +namespace M { export function exhibitBug() { function localFunction() { } var x: { (): void; }; diff --git a/tests/cases/compiler/missingReturnStatement.ts b/tests/cases/compiler/missingReturnStatement.ts index 5e513aa6d7af7..3c2af2b12b85f 100644 --- a/tests/cases/compiler/missingReturnStatement.ts +++ b/tests/cases/compiler/missingReturnStatement.ts @@ -1,4 +1,4 @@ -module Test { +namespace Test { export class Bug { public foo():string { } diff --git a/tests/cases/compiler/missingTypeArguments3.ts b/tests/cases/compiler/missingTypeArguments3.ts index 0f86411e2e4f3..a0644803af4eb 100644 --- a/tests/cases/compiler/missingTypeArguments3.ts +++ b/tests/cases/compiler/missingTypeArguments3.ts @@ -1,4 +1,4 @@ -declare module linq { +declare namespace linq { interface Enumerable { OrderByDescending(keySelector?: string): OrderedEnumerable; diff --git a/tests/cases/compiler/mixedExports.ts b/tests/cases/compiler/mixedExports.ts index c3ad54846a92a..896cb550f4879 100644 --- a/tests/cases/compiler/mixedExports.ts +++ b/tests/cases/compiler/mixedExports.ts @@ -1,16 +1,16 @@ -declare module M { +declare namespace M { function foo(); export function foo(); function foo(); } -declare module M1 { +declare namespace M1 { export interface Foo {} interface Foo {} } -module A { +namespace A { interface X {x} - export module X {} + export namespace X {} interface X {y} } \ No newline at end of file diff --git a/tests/cases/compiler/mixingFunctionAndAmbientModule1.ts b/tests/cases/compiler/mixingFunctionAndAmbientModule1.ts index 199e3ac7dfc51..f6271a80ce33e 100644 --- a/tests/cases/compiler/mixingFunctionAndAmbientModule1.ts +++ b/tests/cases/compiler/mixingFunctionAndAmbientModule1.ts @@ -1,27 +1,27 @@ -module A { - declare module My { +namespace A { + declare namespace My { export var x: number; } function My(s: string) { } } -module B { - declare module My { +namespace B { + declare namespace My { export var x: number; } function My(s: boolean); function My(s: any) { } } -module C { - declare module My { +namespace C { + declare namespace My { export var x: number; } declare function My(s: boolean); } -module D { - declare module My { +namespace D { + declare namespace My { export var x: number; } declare function My(s: boolean); @@ -29,12 +29,12 @@ module D { } -module E { - declare module My { +namespace E { + declare namespace My { export var x: number; } declare function My(s: boolean); - declare module My { + declare namespace My { export var y: number; } declare function My(s: any); diff --git a/tests/cases/compiler/modFunctionCrash.ts b/tests/cases/compiler/modFunctionCrash.ts index 038fb40f7c8f3..c1099f974bb59 100644 --- a/tests/cases/compiler/modFunctionCrash.ts +++ b/tests/cases/compiler/modFunctionCrash.ts @@ -1,4 +1,4 @@ -declare module Q { +declare namespace Q { function f(fn:()=>void); // typechecking the function type shouldnot crash the compiler } diff --git a/tests/cases/compiler/moduleAliasInterface.ts b/tests/cases/compiler/moduleAliasInterface.ts index d92599cae0969..36e0abc4d4da4 100644 --- a/tests/cases/compiler/moduleAliasInterface.ts +++ b/tests/cases/compiler/moduleAliasInterface.ts @@ -1,4 +1,4 @@ -module _modes { +namespace _modes { export interface IMode { } @@ -10,7 +10,7 @@ module _modes { // _modes. // produces an internal error - please implement in derived class -module editor { +namespace editor { import modes = _modes; var i : modes.IMode; @@ -25,7 +25,7 @@ module editor { } import modesOuter = _modes; -module editor2 { +namespace editor2 { var i : modesOuter.IMode; @@ -34,19 +34,19 @@ module editor2 { } - module Foo { export class Bar{} } + namespace Foo { export class Bar{} } class Bug2 { constructor(p1: Foo.Bar, p2: modesOuter.Mode) { } } } -module A1 { +namespace A1 { export interface A1I1 {} export class A1C1 {} } -module B1 { +namespace B1 { import A1Alias1 = A1; var i : A1Alias1.A1I1; diff --git a/tests/cases/compiler/moduleAndInterfaceSharingName.ts b/tests/cases/compiler/moduleAndInterfaceSharingName.ts index 4e4456672b362..ae5fc4c03e73e 100644 --- a/tests/cases/compiler/moduleAndInterfaceSharingName.ts +++ b/tests/cases/compiler/moduleAndInterfaceSharingName.ts @@ -1,5 +1,5 @@ -module X { - export module Y { +namespace X { + export namespace Y { export interface Z { } } export interface Y { } diff --git a/tests/cases/compiler/moduleAndInterfaceSharingName2.ts b/tests/cases/compiler/moduleAndInterfaceSharingName2.ts index f5775be46797f..2f695e96bd0c2 100644 --- a/tests/cases/compiler/moduleAndInterfaceSharingName2.ts +++ b/tests/cases/compiler/moduleAndInterfaceSharingName2.ts @@ -1,5 +1,5 @@ -module X { - export module Y { +namespace X { + export namespace Y { export interface Z { } } export interface Y { } diff --git a/tests/cases/compiler/moduleAndInterfaceSharingName3.ts b/tests/cases/compiler/moduleAndInterfaceSharingName3.ts index 9db8182c51f3a..d493bffd365b0 100644 --- a/tests/cases/compiler/moduleAndInterfaceSharingName3.ts +++ b/tests/cases/compiler/moduleAndInterfaceSharingName3.ts @@ -1,5 +1,5 @@ -module X { - export module Y { +namespace X { + export namespace Y { export interface Z { } } export interface Y { } diff --git a/tests/cases/compiler/moduleAndInterfaceSharingName4.ts b/tests/cases/compiler/moduleAndInterfaceSharingName4.ts index 7be873e944419..1fbd0d96a2fad 100644 --- a/tests/cases/compiler/moduleAndInterfaceSharingName4.ts +++ b/tests/cases/compiler/moduleAndInterfaceSharingName4.ts @@ -1,7 +1,7 @@ -declare module D3 { +declare namespace D3 { var x: D3.Color.Color; - module Color { + namespace Color { export interface Color { darker: Color; } diff --git a/tests/cases/compiler/moduleAndInterfaceWithSameName.ts b/tests/cases/compiler/moduleAndInterfaceWithSameName.ts index 6e265a58a7584..3c84570779e84 100644 --- a/tests/cases/compiler/moduleAndInterfaceWithSameName.ts +++ b/tests/cases/compiler/moduleAndInterfaceWithSameName.ts @@ -1,5 +1,5 @@ -module Foo1 { - export module Bar { +namespace Foo1 { + export namespace Bar { export var x = 42; } @@ -8,8 +8,8 @@ module Foo1 { } } -module Foo2 { - module Bar { +namespace Foo2 { + namespace Bar { export var x = 42; } @@ -20,8 +20,8 @@ module Foo2 { var z2 = Foo2.Bar.y; // Error for using interface name as a value. -module Foo3 { - export module Bar { +namespace Foo3 { + export namespace Bar { export var x = 42; } diff --git a/tests/cases/compiler/moduleAsBaseType.ts b/tests/cases/compiler/moduleAsBaseType.ts index 5ff686635f0c7..20afdcc29f3ea 100644 --- a/tests/cases/compiler/moduleAsBaseType.ts +++ b/tests/cases/compiler/moduleAsBaseType.ts @@ -1,4 +1,4 @@ -module M {} +namespace M {} class C extends M {} interface I extends M { } class C2 implements M { } \ No newline at end of file diff --git a/tests/cases/compiler/moduleAssignmentCompat1.ts b/tests/cases/compiler/moduleAssignmentCompat1.ts index 4adeba4b69ad1..e5134a439b1d2 100644 --- a/tests/cases/compiler/moduleAssignmentCompat1.ts +++ b/tests/cases/compiler/moduleAssignmentCompat1.ts @@ -1,7 +1,7 @@ -module A { +namespace A { export class C { } } -module B { +namespace B { export class C { } class D { } } diff --git a/tests/cases/compiler/moduleAssignmentCompat2.ts b/tests/cases/compiler/moduleAssignmentCompat2.ts index 49a931db90907..985e90cba4ab6 100644 --- a/tests/cases/compiler/moduleAssignmentCompat2.ts +++ b/tests/cases/compiler/moduleAssignmentCompat2.ts @@ -1,7 +1,7 @@ -module A { +namespace A { export class C { } } -module B { +namespace B { export class C { } export class D { } } diff --git a/tests/cases/compiler/moduleAssignmentCompat3.ts b/tests/cases/compiler/moduleAssignmentCompat3.ts index c641f48a2e61a..8ea60fa662f2e 100644 --- a/tests/cases/compiler/moduleAssignmentCompat3.ts +++ b/tests/cases/compiler/moduleAssignmentCompat3.ts @@ -1,7 +1,7 @@ -module A { +namespace A { export var x = 1; } -module B { +namespace B { export var x = ""; } diff --git a/tests/cases/compiler/moduleAssignmentCompat4.ts b/tests/cases/compiler/moduleAssignmentCompat4.ts index 5e30d4e2c805c..f1b762a6848c9 100644 --- a/tests/cases/compiler/moduleAssignmentCompat4.ts +++ b/tests/cases/compiler/moduleAssignmentCompat4.ts @@ -1,10 +1,10 @@ -module A { - export module M { +namespace A { + export namespace M { class C { } } } -module B { - export module M { +namespace B { + export namespace M { export class D { } } } diff --git a/tests/cases/compiler/moduleAugmentationNoNewNames.ts b/tests/cases/compiler/moduleAugmentationNoNewNames.ts index 2ab82ba5f0b5c..f0e8f93f0cfd9 100644 --- a/tests/cases/compiler/moduleAugmentationNoNewNames.ts +++ b/tests/cases/compiler/moduleAugmentationNoNewNames.ts @@ -12,7 +12,7 @@ declare module "./observable" { class Bar {} let y: number, z: string; let {a: x, b: x1}: {a: number, b: number}; - module Z {} + namespace Z {} } // @filename: observable.ts diff --git a/tests/cases/compiler/moduleClassArrayCodeGenTest.ts b/tests/cases/compiler/moduleClassArrayCodeGenTest.ts index 3d30b9a9fa821..07a9b8dd7c260 100644 --- a/tests/cases/compiler/moduleClassArrayCodeGenTest.ts +++ b/tests/cases/compiler/moduleClassArrayCodeGenTest.ts @@ -1,6 +1,6 @@ // Invalid code gen for Array of Module class -module M +namespace M { export class A { } class B{ } diff --git a/tests/cases/compiler/moduleCodeGenTest3.ts b/tests/cases/compiler/moduleCodeGenTest3.ts index 29127a29e7a75..2004ccb846429 100644 --- a/tests/cases/compiler/moduleCodeGenTest3.ts +++ b/tests/cases/compiler/moduleCodeGenTest3.ts @@ -1,3 +1,3 @@ -module Baz { export var x = "hello"; } +namespace Baz { export var x = "hello"; } Baz.x = "goodbye"; \ No newline at end of file diff --git a/tests/cases/compiler/moduleCodegenTest4.ts b/tests/cases/compiler/moduleCodegenTest4.ts index fbf540b4a274e..7f57b26d6cecc 100644 --- a/tests/cases/compiler/moduleCodegenTest4.ts +++ b/tests/cases/compiler/moduleCodegenTest4.ts @@ -1,5 +1,5 @@ //@module: commonjs -export module Baz { export var x = "hello"; } +export namespace Baz { export var x = "hello"; } Baz.x = "goodbye"; void 0; \ No newline at end of file diff --git a/tests/cases/compiler/moduleCrashBug1.ts b/tests/cases/compiler/moduleCrashBug1.ts index fa394c83c7665..dabbd0264ffff 100644 --- a/tests/cases/compiler/moduleCrashBug1.ts +++ b/tests/cases/compiler/moduleCrashBug1.ts @@ -1,4 +1,4 @@ -module _modes { +namespace _modes { export interface IMode { } @@ -10,7 +10,7 @@ module _modes { //_modes. // produces an internal error - please implement in derived class -module editor { +namespace editor { import modes = _modes; } diff --git a/tests/cases/compiler/moduleElementsInWrongContext.ts b/tests/cases/compiler/moduleElementsInWrongContext.ts index 778e2775467c1..4f7d0d33878a9 100644 --- a/tests/cases/compiler/moduleElementsInWrongContext.ts +++ b/tests/cases/compiler/moduleElementsInWrongContext.ts @@ -1,5 +1,5 @@ { - module M { } + namespace M { } export namespace N { export interface I { } } diff --git a/tests/cases/compiler/moduleElementsInWrongContext2.ts b/tests/cases/compiler/moduleElementsInWrongContext2.ts index 936893b96c2df..204e621fbad1c 100644 --- a/tests/cases/compiler/moduleElementsInWrongContext2.ts +++ b/tests/cases/compiler/moduleElementsInWrongContext2.ts @@ -1,5 +1,5 @@ function blah () { - module M { } + namespace M { } export namespace N { export interface I { } } diff --git a/tests/cases/compiler/moduleElementsInWrongContext3.ts b/tests/cases/compiler/moduleElementsInWrongContext3.ts index efc69016269e7..73fad4ba3c797 100644 --- a/tests/cases/compiler/moduleElementsInWrongContext3.ts +++ b/tests/cases/compiler/moduleElementsInWrongContext3.ts @@ -1,6 +1,6 @@ -module P { +namespace P { { - module M { } + namespace M { } export namespace N { export interface I { } } diff --git a/tests/cases/compiler/moduleExports1.ts b/tests/cases/compiler/moduleExports1.ts index 3533c6bea6c36..7f13845bd751b 100644 --- a/tests/cases/compiler/moduleExports1.ts +++ b/tests/cases/compiler/moduleExports1.ts @@ -1,8 +1,8 @@ -//@module: amd -export module TypeScript.Strasse.Street { - export class Rue { - public address:string; - } +//@module: amd +export namespace TypeScript.Strasse.Street { + export class Rue { + public address:string; + } } var rue = new TypeScript.Strasse.Street.Rue(); diff --git a/tests/cases/compiler/moduleIdentifiers.ts b/tests/cases/compiler/moduleIdentifiers.ts index 1d9de2f16d233..b612c527fda4b 100644 --- a/tests/cases/compiler/moduleIdentifiers.ts +++ b/tests/cases/compiler/moduleIdentifiers.ts @@ -1,4 +1,4 @@ -module M { +namespace M { interface P { x: number; y: number; } export var a = 1 } diff --git a/tests/cases/compiler/moduleImport.ts b/tests/cases/compiler/moduleImport.ts index ddc41dd17c511..5684090935abb 100644 --- a/tests/cases/compiler/moduleImport.ts +++ b/tests/cases/compiler/moduleImport.ts @@ -1,11 +1,11 @@ -module A.B.C { - import XYZ = X.Y.Z; - export function ping(x: number) { - if (x>0) XYZ.pong (x-1); - } +namespace A.B.C { + import XYZ = X.Y.Z; + export function ping(x: number) { + if (x>0) XYZ.pong (x-1); + } } -module X { +namespace X { import ABC = A.B.C; export function pong(x: number) { if (x > 0) ABC.ping(x-1); diff --git a/tests/cases/compiler/moduleMemberWithoutTypeAnnotation1.ts b/tests/cases/compiler/moduleMemberWithoutTypeAnnotation1.ts index 1c4da98ed84f9..fb09ad049facc 100644 --- a/tests/cases/compiler/moduleMemberWithoutTypeAnnotation1.ts +++ b/tests/cases/compiler/moduleMemberWithoutTypeAnnotation1.ts @@ -1,45 +1,45 @@ -module TypeScript.Parser { - class SyntaxCursor { - public currentNode(): SyntaxNode { - return null; - } - } -} - -module TypeScript { - export interface ISyntaxElement { }; - export interface ISyntaxToken { }; - - export class PositionedElement { - public childIndex(child: ISyntaxElement) { - return Syntax.childIndex(); - } - } - - export class PositionedToken { - constructor(parent: PositionedElement, token: ISyntaxToken, fullStart: number) { - } - } -} - -module TypeScript { - export class SyntaxNode { - public findToken(position: number, includeSkippedTokens: boolean = false): PositionedToken { - var positionedToken = this.findTokenInternal(null, position, 0); - return null; - } - findTokenInternal(x, y, z) { - return null; - } - } -} - -module TypeScript.Syntax { - export function childIndex() { } - - export class VariableWidthTokenWithTrailingTrivia implements ISyntaxToken { - private findTokenInternal(parent: PositionedElement, position: number, fullStart: number) { - return new PositionedToken(parent, this, fullStart); - } - } -} +namespace TypeScript.Parser { + class SyntaxCursor { + public currentNode(): SyntaxNode { + return null; + } + } +} + +namespace TypeScript { + export interface ISyntaxElement { }; + export interface ISyntaxToken { }; + + export class PositionedElement { + public childIndex(child: ISyntaxElement) { + return Syntax.childIndex(); + } + } + + export class PositionedToken { + constructor(parent: PositionedElement, token: ISyntaxToken, fullStart: number) { + } + } +} + +namespace TypeScript { + export class SyntaxNode { + public findToken(position: number, includeSkippedTokens: boolean = false): PositionedToken { + var positionedToken = this.findTokenInternal(null, position, 0); + return null; + } + findTokenInternal(x, y, z) { + return null; + } + } +} + +namespace TypeScript.Syntax { + export function childIndex() { } + + export class VariableWidthTokenWithTrailingTrivia implements ISyntaxToken { + private findTokenInternal(parent: PositionedElement, position: number, fullStart: number) { + return new PositionedToken(parent, this, fullStart); + } + } +} diff --git a/tests/cases/compiler/moduleMemberWithoutTypeAnnotation2.ts b/tests/cases/compiler/moduleMemberWithoutTypeAnnotation2.ts index fec033dd8c01b..68d60977d6204 100644 --- a/tests/cases/compiler/moduleMemberWithoutTypeAnnotation2.ts +++ b/tests/cases/compiler/moduleMemberWithoutTypeAnnotation2.ts @@ -1,5 +1,5 @@ -module TypeScript { - export module CompilerDiagnostics { +namespace TypeScript { + export namespace CompilerDiagnostics { export interface IDiagnosticWriter { Alert(output: string): void; diff --git a/tests/cases/compiler/moduleMerge.ts b/tests/cases/compiler/moduleMerge.ts index 94ca217fc115e..de1ae22d58106 100644 --- a/tests/cases/compiler/moduleMerge.ts +++ b/tests/cases/compiler/moduleMerge.ts @@ -1,6 +1,6 @@ // This should not compile both B classes are in the same module this should be a collission -module A +namespace A { class B { @@ -11,7 +11,7 @@ module A } } -module A +namespace A { export class B { diff --git a/tests/cases/compiler/moduleNewExportBug.ts b/tests/cases/compiler/moduleNewExportBug.ts index b696a2840383b..37575a9117dad 100644 --- a/tests/cases/compiler/moduleNewExportBug.ts +++ b/tests/cases/compiler/moduleNewExportBug.ts @@ -1,4 +1,4 @@ -module mod1 { +namespace mod1 { interface mInt { new (bar:any):any; foo (bar:any):any; diff --git a/tests/cases/compiler/moduleNoEmit.ts b/tests/cases/compiler/moduleNoEmit.ts index 7c811ed7c4cdd..29b8c51ca7d2a 100644 --- a/tests/cases/compiler/moduleNoEmit.ts +++ b/tests/cases/compiler/moduleNoEmit.ts @@ -1,3 +1,3 @@ -module Foo { +namespace Foo { 1+1; } \ No newline at end of file diff --git a/tests/cases/compiler/moduleOuterQualification.ts b/tests/cases/compiler/moduleOuterQualification.ts index 08cdd34addd63..a725a1a2458db 100644 --- a/tests/cases/compiler/moduleOuterQualification.ts +++ b/tests/cases/compiler/moduleOuterQualification.ts @@ -1,8 +1,8 @@ // @declaration: true -declare module outer { +declare namespace outer { interface Beta { } - module inner { + namespace inner { // .d.ts emit: should be 'extends outer.Beta' export interface Beta extends outer.Beta { } } diff --git a/tests/cases/compiler/moduleProperty1.ts b/tests/cases/compiler/moduleProperty1.ts index 8005b6ed3e9fa..6dc399edeab1f 100644 --- a/tests/cases/compiler/moduleProperty1.ts +++ b/tests/cases/compiler/moduleProperty1.ts @@ -1,10 +1,10 @@ -module M { +namespace M { var x=10; // variable local to this module body var y=x; // property visible only in module export var z=y; // property visible to any code } -module M2 { +namespace M2 { var x = 10; // variable local to this module body private y = x; // can't use private in modules export var z = y; // property visible to any code diff --git a/tests/cases/compiler/moduleProperty2.ts b/tests/cases/compiler/moduleProperty2.ts index 16a2c13f8d0fb..2603148161d24 100644 --- a/tests/cases/compiler/moduleProperty2.ts +++ b/tests/cases/compiler/moduleProperty2.ts @@ -1,4 +1,4 @@ -module M { +namespace M { function f() { var x; } @@ -8,7 +8,7 @@ module M { var test2=y; // y visible because same module } -module N { +namespace N { var test3=M.y; // nope y private property of M var test4=M.z; // ok public property of M } \ No newline at end of file diff --git a/tests/cases/compiler/moduleRedifinitionErrors.ts b/tests/cases/compiler/moduleRedifinitionErrors.ts index 5539d78722014..e8e94cf5eecc2 100644 --- a/tests/cases/compiler/moduleRedifinitionErrors.ts +++ b/tests/cases/compiler/moduleRedifinitionErrors.ts @@ -1,4 +1,4 @@ class A { } -module A { +namespace A { } diff --git a/tests/cases/compiler/moduleReopenedTypeOtherBlock.ts b/tests/cases/compiler/moduleReopenedTypeOtherBlock.ts index cebd261323634..6179d7763f5e5 100644 --- a/tests/cases/compiler/moduleReopenedTypeOtherBlock.ts +++ b/tests/cases/compiler/moduleReopenedTypeOtherBlock.ts @@ -1,7 +1,7 @@ -module M { +namespace M { export class C1 { } export interface I { n: number; } } -module M { +namespace M { export class C2 { f(): I { return null; } } } diff --git a/tests/cases/compiler/moduleReopenedTypeSameBlock.ts b/tests/cases/compiler/moduleReopenedTypeSameBlock.ts index 5cae6d6dbf4cf..e63aba22e9a4f 100644 --- a/tests/cases/compiler/moduleReopenedTypeSameBlock.ts +++ b/tests/cases/compiler/moduleReopenedTypeSameBlock.ts @@ -1,5 +1,5 @@ -module M { export class C1 { } } -module M { +namespace M { export class C1 { } } +namespace M { export interface I { n: number; } export class C2 { f(): I { return null; } } } diff --git a/tests/cases/compiler/moduleScopingBug.ts b/tests/cases/compiler/moduleScopingBug.ts index 838318f8f76eb..3b33be8e18324 100644 --- a/tests/cases/compiler/moduleScopingBug.ts +++ b/tests/cases/compiler/moduleScopingBug.ts @@ -1,4 +1,4 @@ -module M +namespace M { @@ -18,7 +18,7 @@ module M } - module X { + namespace X { var inner = outer; // Error: outer not visible diff --git a/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt.ts b/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt.ts index dfb21cccbe724..935450ce2de58 100644 --- a/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt.ts +++ b/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt.ts @@ -1,11 +1,11 @@ -module Z.M { - export function bar() { - return ""; - } -} -module A.M { - import M = Z.M; - export function bar() { - } - M.bar(); // Should call Z.M.bar +namespace Z.M { + export function bar() { + return ""; + } +} +namespace A.M { + import M = Z.M; + export function bar() { + } + M.bar(); // Should call Z.M.bar } \ No newline at end of file diff --git a/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt2.ts b/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt2.ts index f81fe17a624b8..be48267c8eb85 100644 --- a/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt2.ts +++ b/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt2.ts @@ -1,11 +1,11 @@ -module Z.M { - export function bar() { - return ""; - } -} -module A.M { - export import M = Z.M; - export function bar() { - } - M.bar(); // Should call Z.M.bar +namespace Z.M { + export function bar() { + return ""; + } +} +namespace A.M { + export import M = Z.M; + export function bar() { + } + M.bar(); // Should call Z.M.bar } \ No newline at end of file diff --git a/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt3.ts b/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt3.ts index 417d6aad8fd82..88ac9af8805b6 100644 --- a/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt3.ts +++ b/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt3.ts @@ -1,12 +1,12 @@ -module Z { - export module M { +namespace Z { + export namespace M { export function bar() { return ""; } } export interface I { } } -module A.M { +namespace A.M { import M = Z.M; import M = Z.I; diff --git a/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt4.ts b/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt4.ts index 1c7993c596ea9..947cc5aee660b 100644 --- a/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt4.ts +++ b/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt4.ts @@ -1,12 +1,12 @@ -module Z.M { - export function bar() { - return ""; - } -} -module A.M { - interface M { } - import M = Z.M; - export function bar() { - } - M.bar(); // Should call Z.M.bar +namespace Z.M { + export function bar() { + return ""; + } +} +namespace A.M { + interface M { } + import M = Z.M; + export function bar() { + } + M.bar(); // Should call Z.M.bar } \ No newline at end of file diff --git a/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt5.ts b/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt5.ts index fa224b1b7f978..f32b5cbb1f9f3 100644 --- a/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt5.ts +++ b/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt5.ts @@ -1,12 +1,12 @@ -module Z { - export module M { +namespace Z { + export namespace M { export function bar() { return ""; } } export interface I { } } -module A.M { +namespace A.M { import M = Z.I; import M = Z.M; diff --git a/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt6.ts b/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt6.ts index f488a5de070ab..d5256f7ea2c11 100644 --- a/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt6.ts +++ b/tests/cases/compiler/moduleSharesNameWithImportDeclarationInsideIt6.ts @@ -1,10 +1,10 @@ -module Z.M { - export function bar() { - return ""; - } -} -module A.M { - import M = Z.M; - export function bar() { - } +namespace Z.M { + export function bar() { + return ""; + } +} +namespace A.M { + import M = Z.M; + export function bar() { + } } \ No newline at end of file diff --git a/tests/cases/compiler/moduleSymbolMerging.ts b/tests/cases/compiler/moduleSymbolMerging.ts index 8caf60b4910d7..5d239cb296abd 100644 --- a/tests/cases/compiler/moduleSymbolMerging.ts +++ b/tests/cases/compiler/moduleSymbolMerging.ts @@ -1,12 +1,12 @@ // @declaration: true // @Filename: A.ts -module A { export interface I {} } +namespace A { export interface I {} } // @Filename: B.ts /// -module A { ; } -module B { +namespace A { ; } +namespace B { export function f(): A.I { return null; } } diff --git a/tests/cases/compiler/moduleUnassignedVariable.ts b/tests/cases/compiler/moduleUnassignedVariable.ts index 77f471811f44c..6d154df39773b 100644 --- a/tests/cases/compiler/moduleUnassignedVariable.ts +++ b/tests/cases/compiler/moduleUnassignedVariable.ts @@ -1,4 +1,4 @@ -module Bar { +namespace Bar { export var a = 1; function fooA() { return a; } // Correct: return Bar.a diff --git a/tests/cases/compiler/moduleVariableArrayIndexer.ts b/tests/cases/compiler/moduleVariableArrayIndexer.ts index e2423f31f34f1..4c1f32bf15287 100644 --- a/tests/cases/compiler/moduleVariableArrayIndexer.ts +++ b/tests/cases/compiler/moduleVariableArrayIndexer.ts @@ -1,4 +1,4 @@ -module Bar { +namespace Bar { export var a = 1; var t = undefined[a][a]; // CG: var t = undefined[Bar.a][a]; } diff --git a/tests/cases/compiler/moduleVariables.ts b/tests/cases/compiler/moduleVariables.ts index b53b43a5ba2df..f209d42439afa 100644 --- a/tests/cases/compiler/moduleVariables.ts +++ b/tests/cases/compiler/moduleVariables.ts @@ -2,16 +2,16 @@ declare var console: any; var x = 1; -module M { +namespace M { export var x = 2; console.log(x); // 2 } -module M { +namespace M { console.log(x); // 2 } -module M { +namespace M { var x = 3; console.log(x); // 3 } diff --git a/tests/cases/compiler/moduleVisibilityTest1.ts b/tests/cases/compiler/moduleVisibilityTest1.ts index 2b691be932714..6e71c4b10d9a5 100644 --- a/tests/cases/compiler/moduleVisibilityTest1.ts +++ b/tests/cases/compiler/moduleVisibilityTest1.ts @@ -1,18 +1,18 @@ -module OuterMod { +namespace OuterMod { export function someExportedOuterFunc() { return -1; } - export module OuterInnerMod { + export namespace OuterInnerMod { export function someExportedOuterInnerFunc() { return "foo"; } } } import OuterInnerAlias = OuterMod.OuterInnerMod; -module M { +namespace M { - export module InnerMod { + export namespace InnerMod { export function someExportedInnerFunc() { return -2; } } @@ -52,7 +52,7 @@ module M { function someModuleFunction() { return 5;} } -module M { +namespace M { export var c = x; export var meb = M.E.B; } diff --git a/tests/cases/compiler/moduleVisibilityTest2.ts b/tests/cases/compiler/moduleVisibilityTest2.ts index 5b2478dcf227a..79c6187d7b895 100644 --- a/tests/cases/compiler/moduleVisibilityTest2.ts +++ b/tests/cases/compiler/moduleVisibilityTest2.ts @@ -1,18 +1,18 @@ -module OuterMod { +namespace OuterMod { export function someExportedOuterFunc() { return -1; } - export module OuterInnerMod { + export namespace OuterInnerMod { export function someExportedOuterInnerFunc() { return "foo"; } } } import OuterInnerAlias = OuterMod.OuterInnerMod; -module M { +namespace M { - module InnerMod { + namespace InnerMod { export function someExportedInnerFunc() { return -2; } } @@ -53,7 +53,7 @@ module M { function someModuleFunction() { return 5;} } -module M { +namespace M { export var c = x; export var meb = M.E.B; } diff --git a/tests/cases/compiler/moduleVisibilityTest3.ts b/tests/cases/compiler/moduleVisibilityTest3.ts index 6b5ea820ff46c..b9cf7a49aed4a 100644 --- a/tests/cases/compiler/moduleVisibilityTest3.ts +++ b/tests/cases/compiler/moduleVisibilityTest3.ts @@ -1,4 +1,4 @@ -module _modes { +namespace _modes { export interface IMode { } @@ -10,7 +10,7 @@ module _modes { //_modes. // produces an internal error - please implement in derived class -module editor { +namespace editor { import modes = _modes; var i : modes.IMode; diff --git a/tests/cases/compiler/moduleVisibilityTest4.ts b/tests/cases/compiler/moduleVisibilityTest4.ts index ee749b6f7f25f..00e1fec4879d9 100644 --- a/tests/cases/compiler/moduleVisibilityTest4.ts +++ b/tests/cases/compiler/moduleVisibilityTest4.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export type nums = number; } diff --git a/tests/cases/compiler/moduleWithNoValuesAsType.ts b/tests/cases/compiler/moduleWithNoValuesAsType.ts index 06508c19c57b9..849a8de767b9b 100644 --- a/tests/cases/compiler/moduleWithNoValuesAsType.ts +++ b/tests/cases/compiler/moduleWithNoValuesAsType.ts @@ -1,13 +1,13 @@ -module A { } +namespace A { } var a: A; // error -module B { +namespace B { interface I {} } var b: B; // error -module C { - module M { +namespace C { + namespace M { interface I {} } } diff --git a/tests/cases/compiler/moduleWithTryStatement1.ts b/tests/cases/compiler/moduleWithTryStatement1.ts index d87b77652dc46..88bf96c0fe06e 100644 --- a/tests/cases/compiler/moduleWithTryStatement1.ts +++ b/tests/cases/compiler/moduleWithTryStatement1.ts @@ -1,4 +1,4 @@ -module M { +namespace M { try { } catch (e) { diff --git a/tests/cases/compiler/moduleWithValuesAsType.ts b/tests/cases/compiler/moduleWithValuesAsType.ts index c3e710e61e7c5..e053e823e252e 100644 --- a/tests/cases/compiler/moduleWithValuesAsType.ts +++ b/tests/cases/compiler/moduleWithValuesAsType.ts @@ -1,4 +1,4 @@ -module A { +namespace A { var b = 1; } diff --git a/tests/cases/compiler/module_augmentExistingAmbientVariable.ts b/tests/cases/compiler/module_augmentExistingAmbientVariable.ts index 4972714a82fdb..a6c6a5828b77d 100644 --- a/tests/cases/compiler/module_augmentExistingAmbientVariable.ts +++ b/tests/cases/compiler/module_augmentExistingAmbientVariable.ts @@ -1,6 +1,6 @@ // @lib: es5 declare var console: any; -module console { +namespace console { export var x = 2; } \ No newline at end of file diff --git a/tests/cases/compiler/module_augmentExistingVariable.ts b/tests/cases/compiler/module_augmentExistingVariable.ts index 266c3ad4d7fc1..653535a20e869 100644 --- a/tests/cases/compiler/module_augmentExistingVariable.ts +++ b/tests/cases/compiler/module_augmentExistingVariable.ts @@ -1,6 +1,6 @@ // @lib: es5 var console: any; -module console { +namespace console { export var x = 2; } \ No newline at end of file diff --git a/tests/cases/compiler/module_augmentUninstantiatedModule2.ts b/tests/cases/compiler/module_augmentUninstantiatedModule2.ts index a388837758646..2117140ad37c3 100644 --- a/tests/cases/compiler/module_augmentUninstantiatedModule2.ts +++ b/tests/cases/compiler/module_augmentUninstantiatedModule2.ts @@ -1,33 +1,33 @@ -// @module: commonjs -// @moduleResolution: bundler - - -// @fileName: app.ts -import ng = require("angular"); -import "./moduleAugmentation"; - -var x: number = ng.getNumber(); - -// @filename: moduleAugmentation.ts -import * as ng from "angular" -declare module "angular" { - export interface IAngularStatic { - getNumber: () => number; - } -} - -// @filename: node_modules/angular/index.d.ts -declare var ng: ng.IAngularStatic; - -declare module ng { - export interface IModule { - name: string; - } - - export interface IAngularStatic { - module: (s: string) => IModule; - } -} - -export = ng; - +// @module: commonjs +// @moduleResolution: bundler + + +// @fileName: app.ts +import ng = require("angular"); +import "./moduleAugmentation"; + +var x: number = ng.getNumber(); + +// @filename: moduleAugmentation.ts +import * as ng from "angular" +declare module "angular" { + export interface IAngularStatic { + getNumber: () => number; + } +} + +// @filename: node_modules/angular/index.d.ts +declare var ng: ng.IAngularStatic; + +declare namespace ng { + export interface IModule { + name: string; + } + + export interface IAngularStatic { + module: (s: string) => IModule; + } +} + +export = ng; + diff --git a/tests/cases/compiler/moduledecl.ts b/tests/cases/compiler/moduledecl.ts index eac2e9ff78c2a..8d97e7e73e7a3 100644 --- a/tests/cases/compiler/moduledecl.ts +++ b/tests/cases/compiler/moduledecl.ts @@ -1,24 +1,24 @@ // @declaration: true // @target: es5 -module a { +namespace a { } -module b.a { +namespace b.a { } -module c.a.b { +namespace c.a.b { import ma = a; } -module mImport { +namespace mImport { import d = a; import e = b.a; import d1 = a; import e1 = b.a; } -module m0 { +namespace m0 { function f1() { } @@ -47,7 +47,7 @@ module m0 { import m7 = c.a.b; } -module m1 { +namespace m1 { export function f1() { } @@ -84,30 +84,30 @@ module m1 { import m7 = c.a.b; } -module m { - export module m2 { +namespace m { + export namespace m2 { var a = 10; export var b: number; } - export module m3 { + export namespace m3 { export var c: number; } } -module m { +namespace m { - export module m25 { - export module m5 { + export namespace m25 { + export namespace m5 { export var c: number; } } } -module m13 { - export module m4 { - export module m2 { - export module m3 { +namespace m13 { + export namespace m4 { + export namespace m2 { + export namespace m3 { export var c: number; } } @@ -118,19 +118,19 @@ module m13 { } } -declare module m4 { +declare namespace m4 { export var b; } -declare module m5 { +declare namespace m5 { export var c; } -declare module m43 { +declare namespace m43 { export var b; } -declare module m55 { +declare namespace m55 { export var c; } @@ -138,7 +138,7 @@ declare module "m3" { export var b: number; } -module exportTests { +namespace exportTests { export class C1_public { private f2() { return 30; @@ -178,7 +178,7 @@ module exportTests { } } -declare module mAmbient { +declare namespace mAmbient { class C { public myProp: number; } @@ -195,7 +195,7 @@ declare module mAmbient { z } - module m3 { + namespace m3 { class C { public myProp: number; } diff --git a/tests/cases/compiler/multiModuleClodule1.ts b/tests/cases/compiler/multiModuleClodule1.ts index 15ee53b8b6b7e..9cb6961defddc 100644 --- a/tests/cases/compiler/multiModuleClodule1.ts +++ b/tests/cases/compiler/multiModuleClodule1.ts @@ -5,11 +5,11 @@ class C { static boo() { } } -module C { +namespace C { export var x = 1; var y = 2; } -module C { +namespace C { export function foo() { } function baz() { return ''; } } diff --git a/tests/cases/compiler/multiModuleFundule1.ts b/tests/cases/compiler/multiModuleFundule1.ts index c93aea8566d02..0ab97b6db18fc 100644 --- a/tests/cases/compiler/multiModuleFundule1.ts +++ b/tests/cases/compiler/multiModuleFundule1.ts @@ -1,9 +1,9 @@ function C(x: number) { } -module C { +namespace C { export var x = 1; } -module C { +namespace C { export function foo() { } } diff --git a/tests/cases/compiler/multipleExports.ts b/tests/cases/compiler/multipleExports.ts index b8d16ea18a80a..0a56c9a719009 100644 --- a/tests/cases/compiler/multipleExports.ts +++ b/tests/cases/compiler/multipleExports.ts @@ -1,12 +1,12 @@ // @module: commonjs -export module M { +export namespace M { export var v = 0; export let x; } const x = 0; -export module M { +export namespace M { v; export {x}; } diff --git a/tests/cases/compiler/multivar.ts b/tests/cases/compiler/multivar.ts index 1c6e59edecd5f..421d32b760d64 100644 --- a/tests/cases/compiler/multivar.ts +++ b/tests/cases/compiler/multivar.ts @@ -1,7 +1,7 @@ var a,b,c; var x=1,y=2,z=3; -module m2 { +namespace m2 { export var a, b2: number = 10, b; var m1; diff --git a/tests/cases/compiler/nameCollisionWithBlockScopedVariable1.ts b/tests/cases/compiler/nameCollisionWithBlockScopedVariable1.ts index 231476ee339df..6ad20da899fd1 100644 --- a/tests/cases/compiler/nameCollisionWithBlockScopedVariable1.ts +++ b/tests/cases/compiler/nameCollisionWithBlockScopedVariable1.ts @@ -1,8 +1,8 @@ // @target: es6 -module M { +namespace M { export class C { } } -module M { +namespace M { { let M = 0; new C(); diff --git a/tests/cases/compiler/nameCollisions.ts b/tests/cases/compiler/nameCollisions.ts index 90b2967fa5fb4..648fa5522bc3d 100644 --- a/tests/cases/compiler/nameCollisions.ts +++ b/tests/cases/compiler/nameCollisions.ts @@ -1,25 +1,25 @@ -module T { +namespace T { var x = 2; - module x { // error + namespace x { // error export class Bar { test: number; } } - module z { + namespace z { var t; } var z; // error - module y { + namespace y { var b; } class y { } // error var w; - module w { } //ok + namespace w { } //ok var f; function f() { } //error diff --git a/tests/cases/compiler/namedFunctionExpressionInModule.ts b/tests/cases/compiler/namedFunctionExpressionInModule.ts index 66a6b7a545edc..f4da02d6ad273 100644 --- a/tests/cases/compiler/namedFunctionExpressionInModule.ts +++ b/tests/cases/compiler/namedFunctionExpressionInModule.ts @@ -1,4 +1,4 @@ -module Variables{ +namespace Variables{ var x = function bar(a, b, c) { } x(1, 2, 3); diff --git a/tests/cases/compiler/namespaces1.ts b/tests/cases/compiler/namespaces1.ts index fe85edf315da6..e0dc095d25425 100644 --- a/tests/cases/compiler/namespaces1.ts +++ b/tests/cases/compiler/namespaces1.ts @@ -1,5 +1,5 @@ -module X { - export module Y { +namespace X { + export namespace Y { export interface Z { } } export interface Y { } diff --git a/tests/cases/compiler/namespaces2.ts b/tests/cases/compiler/namespaces2.ts index 00482a2b6f238..02d8a2ba652f7 100644 --- a/tests/cases/compiler/namespaces2.ts +++ b/tests/cases/compiler/namespaces2.ts @@ -1,5 +1,5 @@ -module A { - export module B { +namespace A { + export namespace B { export class C { } } } diff --git a/tests/cases/compiler/namespacesDeclaration1.ts b/tests/cases/compiler/namespacesDeclaration1.ts index a231cf2d9d116..cf491bf5fbee9 100644 --- a/tests/cases/compiler/namespacesDeclaration1.ts +++ b/tests/cases/compiler/namespacesDeclaration1.ts @@ -1,8 +1,8 @@ // @declaration: true -module M { +namespace M { export namespace N { - export module M2 { + export namespace M2 { export interface I {} } } diff --git a/tests/cases/compiler/namespacesDeclaration2.ts b/tests/cases/compiler/namespacesDeclaration2.ts index 6c4a1790354c5..17bb3c91aca7d 100644 --- a/tests/cases/compiler/namespacesDeclaration2.ts +++ b/tests/cases/compiler/namespacesDeclaration2.ts @@ -3,7 +3,7 @@ namespace N { function S() {} } -module M { +namespace M { function F() {} } diff --git a/tests/cases/compiler/nestedModulePrivateAccess.ts b/tests/cases/compiler/nestedModulePrivateAccess.ts index 6770321fd4685..7625d4b8af074 100644 --- a/tests/cases/compiler/nestedModulePrivateAccess.ts +++ b/tests/cases/compiler/nestedModulePrivateAccess.ts @@ -1,6 +1,6 @@ -module a{ +namespace a{ var x:number; - module b{ + namespace b{ var y = x; // should not be an error } } \ No newline at end of file diff --git a/tests/cases/compiler/nestedSelf.ts b/tests/cases/compiler/nestedSelf.ts index 00fc089698c38..5824925021896 100644 --- a/tests/cases/compiler/nestedSelf.ts +++ b/tests/cases/compiler/nestedSelf.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export class C { public n = 42; public foo() { [1,2,3].map((x) => { return this.n * x; })} diff --git a/tests/cases/compiler/newArrays.ts b/tests/cases/compiler/newArrays.ts index c66924ffc6060..2aa9f90ef80a6 100644 --- a/tests/cases/compiler/newArrays.ts +++ b/tests/cases/compiler/newArrays.ts @@ -1,4 +1,4 @@ -module M { +namespace M { class Foo {} class Gar { public fa: Foo[]; diff --git a/tests/cases/compiler/newOperator.ts b/tests/cases/compiler/newOperator.ts index 6bb28daabb1c8..fea9c595fd84b 100644 --- a/tests/cases/compiler/newOperator.ts +++ b/tests/cases/compiler/newOperator.ts @@ -45,7 +45,7 @@ new ctorUnion(""); declare const ctorUnion2: (new (a: T) => void) | (new (a: string) => void) new ctorUnion2(""); -module M { +namespace M { export class T { x: number; } diff --git a/tests/cases/compiler/noImplicitAnyModule.ts b/tests/cases/compiler/noImplicitAnyModule.ts index a67ecf255860c..0dc5d22d6955f 100644 --- a/tests/cases/compiler/noImplicitAnyModule.ts +++ b/tests/cases/compiler/noImplicitAnyModule.ts @@ -1,6 +1,6 @@ //@noImplicitAny: true -declare module Module { +declare namespace Module { interface Interface { // Should return error for implicit any on return type. new (); diff --git a/tests/cases/compiler/noImplicitAnyParametersInAmbientModule.ts b/tests/cases/compiler/noImplicitAnyParametersInAmbientModule.ts index 5ccc82bf69049..78e2304709cb9 100644 --- a/tests/cases/compiler/noImplicitAnyParametersInAmbientModule.ts +++ b/tests/cases/compiler/noImplicitAnyParametersInAmbientModule.ts @@ -1,6 +1,6 @@ //@noImplicitAny: true -declare module D_M { +declare namespace D_M { // No implicit-'any' errors. function dm_f1(): void; diff --git a/tests/cases/compiler/noImplicitAnyParametersInModule.ts b/tests/cases/compiler/noImplicitAnyParametersInModule.ts index 69dd3c8c647cb..be3064f106fdc 100644 --- a/tests/cases/compiler/noImplicitAnyParametersInModule.ts +++ b/tests/cases/compiler/noImplicitAnyParametersInModule.ts @@ -1,6 +1,6 @@ //@noImplicitAny: true -module M { +namespace M { // No implicit-'any' errors. function m_f1(): void { } diff --git a/tests/cases/compiler/nonExportedElementsOfMergedModules.ts b/tests/cases/compiler/nonExportedElementsOfMergedModules.ts index bb1199ab5de7b..280af189c59bd 100644 --- a/tests/cases/compiler/nonExportedElementsOfMergedModules.ts +++ b/tests/cases/compiler/nonExportedElementsOfMergedModules.ts @@ -1,13 +1,13 @@ -module One { +namespace One { enum A { X } - module B { + namespace B { export var x; } } -module One { +namespace One { enum A { Y } - module B { + namespace B { export var y; } B.x; diff --git a/tests/cases/compiler/objectLitArrayDeclNoNew.ts b/tests/cases/compiler/objectLitArrayDeclNoNew.ts index f089a99e67b94..34b6eea40657c 100644 --- a/tests/cases/compiler/objectLitArrayDeclNoNew.ts +++ b/tests/cases/compiler/objectLitArrayDeclNoNew.ts @@ -1,7 +1,7 @@ // @lib: es5 declare var console; "use strict"; -module Test { +namespace Test { export interface IState { } diff --git a/tests/cases/compiler/overload1.ts b/tests/cases/compiler/overload1.ts index aff1b2ec07b9b..39434cebf9286 100644 --- a/tests/cases/compiler/overload1.ts +++ b/tests/cases/compiler/overload1.ts @@ -1,4 +1,4 @@ -module O { +namespace O { export class A { } diff --git a/tests/cases/compiler/overloadResolutionOverNonCTLambdas.ts b/tests/cases/compiler/overloadResolutionOverNonCTLambdas.ts index fd75839ade15e..eadaf7c77d749 100644 --- a/tests/cases/compiler/overloadResolutionOverNonCTLambdas.ts +++ b/tests/cases/compiler/overloadResolutionOverNonCTLambdas.ts @@ -1,4 +1,4 @@ -module Bugs { +namespace Bugs { class A { } diff --git a/tests/cases/compiler/overloadResolutionOverNonCTObjectLit.ts b/tests/cases/compiler/overloadResolutionOverNonCTObjectLit.ts index 88f112404248a..0929650b0655f 100644 --- a/tests/cases/compiler/overloadResolutionOverNonCTObjectLit.ts +++ b/tests/cases/compiler/overloadResolutionOverNonCTObjectLit.ts @@ -1,4 +1,4 @@ -module Bugs { +namespace Bugs { export interface IToken { startIndex:number; type:string; diff --git a/tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts b/tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts index eb22f0a2447dc..e177363ced6a0 100644 --- a/tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts +++ b/tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts @@ -1,8 +1,8 @@ -declare module M { +declare namespace M { // Error because body is not ambient and this overload is export function f(); } -module M { +namespace M { export function f() { } } \ No newline at end of file diff --git a/tests/cases/compiler/parameterPropertyInConstructor1.ts b/tests/cases/compiler/parameterPropertyInConstructor1.ts index 5de50cf9b211b..0168f4af21fb7 100644 --- a/tests/cases/compiler/parameterPropertyInConstructor1.ts +++ b/tests/cases/compiler/parameterPropertyInConstructor1.ts @@ -1,4 +1,4 @@ -declare module mod { +declare namespace mod { class Customers { constructor(public names: string); } diff --git a/tests/cases/compiler/parameterPropertyInConstructor2.ts b/tests/cases/compiler/parameterPropertyInConstructor2.ts index 7a606fe291001..6890f21032bf0 100644 --- a/tests/cases/compiler/parameterPropertyInConstructor2.ts +++ b/tests/cases/compiler/parameterPropertyInConstructor2.ts @@ -1,4 +1,4 @@ -module mod { +namespace mod { class Customers { constructor(public names: string); constructor(public names: string, public ages: number) { diff --git a/tests/cases/compiler/partiallyAmbientClodule.ts b/tests/cases/compiler/partiallyAmbientClodule.ts index 211b165b73a21..694477675945d 100644 --- a/tests/cases/compiler/partiallyAmbientClodule.ts +++ b/tests/cases/compiler/partiallyAmbientClodule.ts @@ -1,4 +1,4 @@ -declare module foo { +declare namespace foo { export function x(): any; } class foo { } // Legal, because module is ambient \ No newline at end of file diff --git a/tests/cases/compiler/partiallyAmbientFundule.ts b/tests/cases/compiler/partiallyAmbientFundule.ts index 0ceb7f30cae1f..1c87f79d70c1c 100644 --- a/tests/cases/compiler/partiallyAmbientFundule.ts +++ b/tests/cases/compiler/partiallyAmbientFundule.ts @@ -1,4 +1,4 @@ -declare module foo { +declare namespace foo { export function x(): any; } function foo () { } // Legal, because module is ambient \ No newline at end of file diff --git a/tests/cases/compiler/primaryExpressionMods.ts b/tests/cases/compiler/primaryExpressionMods.ts index 7474d8b1e36d0..a0c571435f498 100644 --- a/tests/cases/compiler/primaryExpressionMods.ts +++ b/tests/cases/compiler/primaryExpressionMods.ts @@ -1,4 +1,4 @@ -module M +namespace M { export interface P { x: number; y: number; } export var a = 1; diff --git a/tests/cases/compiler/primitiveTypeAsmoduleName.ts b/tests/cases/compiler/primitiveTypeAsmoduleName.ts index 9b4b955b891b0..5899e9a79d141 100644 --- a/tests/cases/compiler/primitiveTypeAsmoduleName.ts +++ b/tests/cases/compiler/primitiveTypeAsmoduleName.ts @@ -1 +1 @@ -module string {} \ No newline at end of file +namespace string {} \ No newline at end of file diff --git a/tests/cases/compiler/privacyAccessorDeclFile.ts b/tests/cases/compiler/privacyAccessorDeclFile.ts index 25d590c0d37b0..9df33cee7c7aa 100644 --- a/tests/cases/compiler/privacyAccessorDeclFile.ts +++ b/tests/cases/compiler/privacyAccessorDeclFile.ts @@ -205,7 +205,7 @@ class privateClassWithPrivateModuleSetAccessorTypes { } } -export module publicModule { +export namespace publicModule { class privateClass { } @@ -408,7 +408,7 @@ export module publicModule { } } -module privateModule { +namespace privateModule { class privateClass { } @@ -653,14 +653,14 @@ class publicClassInGlobalWithWithPublicSetAccessorTypes { } } -module publicModuleInGlobal { +namespace publicModuleInGlobal { class privateClass { } export class publicClass { } - module privateModule { + namespace privateModule { class privateClass { } diff --git a/tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts b/tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts index 70369c478958b..97c723988b348 100644 --- a/tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts +++ b/tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts @@ -1,138 +1,138 @@ -// @target: ES5 -// @module: commonjs -// @declaration: true - -// @Filename: privacyCannotNameAccessorDeclFile_GlobalWidgets.ts -declare module "GlobalWidgets" { - export class Widget3 { - name: string; - } - export function createWidget3(): Widget3; - - export module SpecializedGlobalWidget { - export class Widget4 { - name: string; - } - function createWidget4(): Widget4; - } -} - -// @Filename: privacyCannotNameAccessorDeclFile_Widgets.ts -export class Widget1 { - name = 'one'; -} -export function createWidget1() { - return new Widget1(); -} - -export module SpecializedWidget { - export class Widget2 { - name = 'one'; - } - export function createWidget2() { - return new Widget2(); - } -} - -// @Filename:privacyCannotNameAccessorDeclFile_exporter.ts -/// -import Widgets = require("./privacyCannotNameAccessorDeclFile_Widgets"); -import Widgets1 = require("GlobalWidgets"); -export function createExportedWidget1() { - return Widgets.createWidget1(); -} -export function createExportedWidget2() { - return Widgets.SpecializedWidget.createWidget2(); -} -export function createExportedWidget3() { - return Widgets1.createWidget3(); -} -export function createExportedWidget4() { - return Widgets1.SpecializedGlobalWidget.createWidget4(); -} - -// @Filename:privacyCannotNameAccessorDeclFile_consumer.ts -import exporter = require("./privacyCannotNameAccessorDeclFile_exporter"); -export class publicClassWithWithPrivateGetAccessorTypes { - static get myPublicStaticMethod() { // Error - return exporter.createExportedWidget1(); - } - private static get myPrivateStaticMethod() { - return exporter.createExportedWidget1(); - } - get myPublicMethod() { // Error - return exporter.createExportedWidget1(); - } - private get myPrivateMethod() { - return exporter.createExportedWidget1(); - } - static get myPublicStaticMethod1() { // Error - return exporter.createExportedWidget3(); - } - private static get myPrivateStaticMethod1() { - return exporter.createExportedWidget3(); - } - get myPublicMethod1() { // Error - return exporter.createExportedWidget3(); - } - private get myPrivateMethod1() { - return exporter.createExportedWidget3(); - } -} - -class privateClassWithWithPrivateGetAccessorTypes { - static get myPublicStaticMethod() { - return exporter.createExportedWidget1(); - } - private static get myPrivateStaticMethod() { - return exporter.createExportedWidget1(); - } - get myPublicMethod() { - return exporter.createExportedWidget1(); - } - private get myPrivateMethod() { - return exporter.createExportedWidget1(); - } - static get myPublicStaticMethod1() { - return exporter.createExportedWidget3(); - } - private static get myPrivateStaticMethod1() { - return exporter.createExportedWidget3(); - } - get myPublicMethod1() { - return exporter.createExportedWidget3(); - } - private get myPrivateMethod1() { - return exporter.createExportedWidget3(); - } -} - -export class publicClassWithPrivateModuleGetAccessorTypes { - static get myPublicStaticMethod() { // Error - return exporter.createExportedWidget2(); - } - get myPublicMethod() { // Error - return exporter.createExportedWidget2(); - } - static get myPublicStaticMethod1() { // Error - return exporter.createExportedWidget4(); - } - get myPublicMethod1() { // Error - return exporter.createExportedWidget4(); - } -} - -class privateClassWithPrivateModuleGetAccessorTypes { - static get myPublicStaticMethod() { - return exporter.createExportedWidget2(); - } - get myPublicMethod() { - return exporter.createExportedWidget2(); - } - static get myPublicStaticMethod1() { - return exporter.createExportedWidget4(); - } - get myPublicMethod1() { - return exporter.createExportedWidget4(); - } +// @target: ES5 +// @module: commonjs +// @declaration: true + +// @Filename: privacyCannotNameAccessorDeclFile_GlobalWidgets.ts +declare module "GlobalWidgets" { + export class Widget3 { + name: string; + } + export function createWidget3(): Widget3; + + export namespace SpecializedGlobalWidget { + export class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } +} + +// @Filename: privacyCannotNameAccessorDeclFile_Widgets.ts +export class Widget1 { + name = 'one'; +} +export function createWidget1() { + return new Widget1(); +} + +export namespace SpecializedWidget { + export class Widget2 { + name = 'one'; + } + export function createWidget2() { + return new Widget2(); + } +} + +// @Filename:privacyCannotNameAccessorDeclFile_exporter.ts +/// +import Widgets = require("./privacyCannotNameAccessorDeclFile_Widgets"); +import Widgets1 = require("GlobalWidgets"); +export function createExportedWidget1() { + return Widgets.createWidget1(); +} +export function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); +} +export function createExportedWidget3() { + return Widgets1.createWidget3(); +} +export function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); +} + +// @Filename:privacyCannotNameAccessorDeclFile_consumer.ts +import exporter = require("./privacyCannotNameAccessorDeclFile_exporter"); +export class publicClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod() { // Error + return exporter.createExportedWidget1(); + } + private static get myPrivateStaticMethod() { + return exporter.createExportedWidget1(); + } + get myPublicMethod() { // Error + return exporter.createExportedWidget1(); + } + private get myPrivateMethod() { + return exporter.createExportedWidget1(); + } + static get myPublicStaticMethod1() { // Error + return exporter.createExportedWidget3(); + } + private static get myPrivateStaticMethod1() { + return exporter.createExportedWidget3(); + } + get myPublicMethod1() { // Error + return exporter.createExportedWidget3(); + } + private get myPrivateMethod1() { + return exporter.createExportedWidget3(); + } +} + +class privateClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod() { + return exporter.createExportedWidget1(); + } + private static get myPrivateStaticMethod() { + return exporter.createExportedWidget1(); + } + get myPublicMethod() { + return exporter.createExportedWidget1(); + } + private get myPrivateMethod() { + return exporter.createExportedWidget1(); + } + static get myPublicStaticMethod1() { + return exporter.createExportedWidget3(); + } + private static get myPrivateStaticMethod1() { + return exporter.createExportedWidget3(); + } + get myPublicMethod1() { + return exporter.createExportedWidget3(); + } + private get myPrivateMethod1() { + return exporter.createExportedWidget3(); + } +} + +export class publicClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod() { // Error + return exporter.createExportedWidget2(); + } + get myPublicMethod() { // Error + return exporter.createExportedWidget2(); + } + static get myPublicStaticMethod1() { // Error + return exporter.createExportedWidget4(); + } + get myPublicMethod1() { // Error + return exporter.createExportedWidget4(); + } +} + +class privateClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod() { + return exporter.createExportedWidget2(); + } + get myPublicMethod() { + return exporter.createExportedWidget2(); + } + static get myPublicStaticMethod1() { + return exporter.createExportedWidget4(); + } + get myPublicMethod1() { + return exporter.createExportedWidget4(); + } } \ No newline at end of file diff --git a/tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts b/tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts index 1135e3c86f468..5c1429553176f 100644 --- a/tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts +++ b/tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts @@ -1,101 +1,101 @@ -// @module: commonjs -// @declaration: true - - -// @Filename: privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts -declare module "GlobalWidgets" { - export class Widget3 { - name: string; - } - export function createWidget3(): Widget3; - - export module SpecializedGlobalWidget { - export class Widget4 { - name: string; - } - function createWidget4(): Widget4; - } -} - -// @Filename: privacyCannotNameVarTypeDeclFile_Widgets.ts -export class Widget1 { - name = 'one'; -} -export function createWidget1() { - return new Widget1(); -} - -export module SpecializedWidget { - export class Widget2 { - name = 'one'; - } - export function createWidget2() { - return new Widget2(); - } -} - -// @Filename:privacyCannotNameVarTypeDeclFile_exporter.ts -/// -import Widgets = require("./privacyCannotNameVarTypeDeclFile_Widgets"); -import Widgets1 = require("GlobalWidgets"); -export function createExportedWidget1() { - return Widgets.createWidget1(); -} -export function createExportedWidget2() { - return Widgets.SpecializedWidget.createWidget2(); -} -export function createExportedWidget3() { - return Widgets1.createWidget3(); -} -export function createExportedWidget4() { - return Widgets1.SpecializedGlobalWidget.createWidget4(); -} - -// @Filename:privacyCannotNameVarTypeDeclFile_consumer.ts -import exporter = require("./privacyCannotNameVarTypeDeclFile_exporter"); -export class publicClassWithWithPrivatePropertyTypes { - static myPublicStaticProperty = exporter.createExportedWidget1(); // Error - private static myPrivateStaticProperty = exporter.createExportedWidget1(); - myPublicProperty = exporter.createExportedWidget1(); // Error - private myPrivateProperty = exporter.createExportedWidget1(); - - static myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error - private static myPrivateStaticProperty1 = exporter.createExportedWidget3(); - myPublicProperty1 = exporter.createExportedWidget3(); // Error - private myPrivateProperty1 = exporter.createExportedWidget3(); -} - -class privateClassWithWithPrivatePropertyTypes { - static myPublicStaticProperty = exporter.createExportedWidget1(); - private static myPrivateStaticProperty = exporter.createExportedWidget1(); - myPublicProperty = exporter.createExportedWidget1(); - private myPrivateProperty = exporter.createExportedWidget1(); - - static myPublicStaticProperty1 = exporter.createExportedWidget3(); - private static myPrivateStaticProperty1 = exporter.createExportedWidget3(); - myPublicProperty1 = exporter.createExportedWidget3(); - private myPrivateProperty1 = exporter.createExportedWidget3(); -} - -export var publicVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); // Error -var privateVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); -export var publicVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); // Error -var privateVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); - -export class publicClassWithPrivateModulePropertyTypes { - static myPublicStaticProperty= exporter.createExportedWidget2(); // Error - myPublicProperty = exporter.createExportedWidget2(); // Error - static myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error - myPublicProperty1 = exporter.createExportedWidget4(); // Error -} -export var publicVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); // Error -export var publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); // Error - -class privateClassWithPrivateModulePropertyTypes { - static myPublicStaticProperty= exporter.createExportedWidget2(); - myPublicProperty= exporter.createExportedWidget2(); - static myPublicStaticProperty1 = exporter.createExportedWidget4(); - myPublicProperty1 = exporter.createExportedWidget4(); -} -var privateVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); +// @module: commonjs +// @declaration: true + + +// @Filename: privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts +declare module "GlobalWidgets" { + export class Widget3 { + name: string; + } + export function createWidget3(): Widget3; + + export namespace SpecializedGlobalWidget { + export class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } +} + +// @Filename: privacyCannotNameVarTypeDeclFile_Widgets.ts +export class Widget1 { + name = 'one'; +} +export function createWidget1() { + return new Widget1(); +} + +export namespace SpecializedWidget { + export class Widget2 { + name = 'one'; + } + export function createWidget2() { + return new Widget2(); + } +} + +// @Filename:privacyCannotNameVarTypeDeclFile_exporter.ts +/// +import Widgets = require("./privacyCannotNameVarTypeDeclFile_Widgets"); +import Widgets1 = require("GlobalWidgets"); +export function createExportedWidget1() { + return Widgets.createWidget1(); +} +export function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); +} +export function createExportedWidget3() { + return Widgets1.createWidget3(); +} +export function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); +} + +// @Filename:privacyCannotNameVarTypeDeclFile_consumer.ts +import exporter = require("./privacyCannotNameVarTypeDeclFile_exporter"); +export class publicClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty = exporter.createExportedWidget1(); // Error + private static myPrivateStaticProperty = exporter.createExportedWidget1(); + myPublicProperty = exporter.createExportedWidget1(); // Error + private myPrivateProperty = exporter.createExportedWidget1(); + + static myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error + private static myPrivateStaticProperty1 = exporter.createExportedWidget3(); + myPublicProperty1 = exporter.createExportedWidget3(); // Error + private myPrivateProperty1 = exporter.createExportedWidget3(); +} + +class privateClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty = exporter.createExportedWidget1(); + private static myPrivateStaticProperty = exporter.createExportedWidget1(); + myPublicProperty = exporter.createExportedWidget1(); + private myPrivateProperty = exporter.createExportedWidget1(); + + static myPublicStaticProperty1 = exporter.createExportedWidget3(); + private static myPrivateStaticProperty1 = exporter.createExportedWidget3(); + myPublicProperty1 = exporter.createExportedWidget3(); + private myPrivateProperty1 = exporter.createExportedWidget3(); +} + +export var publicVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); // Error +var privateVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); +export var publicVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); // Error +var privateVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); + +export class publicClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty= exporter.createExportedWidget2(); // Error + myPublicProperty = exporter.createExportedWidget2(); // Error + static myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error + myPublicProperty1 = exporter.createExportedWidget4(); // Error +} +export var publicVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); // Error +export var publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); // Error + +class privateClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty= exporter.createExportedWidget2(); + myPublicProperty= exporter.createExportedWidget2(); + static myPublicStaticProperty1 = exporter.createExportedWidget4(); + myPublicProperty1 = exporter.createExportedWidget4(); +} +var privateVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); \ No newline at end of file diff --git a/tests/cases/compiler/privacyCheckAnonymousFunctionParameter.ts b/tests/cases/compiler/privacyCheckAnonymousFunctionParameter.ts index c867a664520a1..c4a36e3882b0f 100644 --- a/tests/cases/compiler/privacyCheckAnonymousFunctionParameter.ts +++ b/tests/cases/compiler/privacyCheckAnonymousFunctionParameter.ts @@ -4,7 +4,7 @@ export var x = 1; // Makes this an external module interface Iterator { } -module Query { +namespace Query { export function fromDoWhile(doWhile: (test: Iterator) => boolean): Iterator { return null; } diff --git a/tests/cases/compiler/privacyCheckAnonymousFunctionParameter2.ts b/tests/cases/compiler/privacyCheckAnonymousFunctionParameter2.ts index 1aea1a17e984c..de07ee4bb0fc8 100644 --- a/tests/cases/compiler/privacyCheckAnonymousFunctionParameter2.ts +++ b/tests/cases/compiler/privacyCheckAnonymousFunctionParameter2.ts @@ -3,13 +3,13 @@ export var x = 1; // Makes this an external module interface Iterator { x: T } -module Q { +namespace Q { export function foo(x: (a: Iterator) => number) { return x; } } -module Q { +namespace Q { function bar() { foo(null); } diff --git a/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.ts b/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.ts index b2a5e374f48c5..11400b7df1f80 100644 --- a/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.ts +++ b/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.ts @@ -1,6 +1,6 @@ //@module: commonjs //@declaration: true -module Foo { +namespace Foo { export interface A { } } diff --git a/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface2.ts b/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface2.ts index 42c121ac80e90..e918a2f5f3ddc 100644 --- a/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface2.ts +++ b/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface2.ts @@ -9,6 +9,6 @@ function Foo(array: T[]): Foo { return undefined; } -module Foo { +namespace Foo { export var x = "hello"; } diff --git a/tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts b/tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts index b37fb72677bdb..ea6607d7acfb4 100644 --- a/tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts +++ b/tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts @@ -1,6 +1,6 @@ //@declaration: true -module Outer { - module Inner { +namespace Outer { + namespace Inner { export var m: typeof Inner; } diff --git a/tests/cases/compiler/privacyCheckTypeOfInvisibleModuleNoError.ts b/tests/cases/compiler/privacyCheckTypeOfInvisibleModuleNoError.ts index f5cee38a1e3b9..fafabc6729825 100644 --- a/tests/cases/compiler/privacyCheckTypeOfInvisibleModuleNoError.ts +++ b/tests/cases/compiler/privacyCheckTypeOfInvisibleModuleNoError.ts @@ -1,6 +1,6 @@ // @declaration: true -module Outer { - module Inner { +namespace Outer { + namespace Inner { export var m: number; } diff --git a/tests/cases/compiler/privacyClass.ts b/tests/cases/compiler/privacyClass.ts index e589e07039901..a00a1b0c4873d 100644 --- a/tests/cases/compiler/privacyClass.ts +++ b/tests/cases/compiler/privacyClass.ts @@ -1,5 +1,5 @@ //@module: commonjs -export module m1 { +export namespace m1 { export interface m1_i_public { } @@ -43,7 +43,7 @@ export module m1 { } -module m2 { +namespace m2 { export interface m2_i_public { } diff --git a/tests/cases/compiler/privacyClassExtendsClauseDeclFile.ts b/tests/cases/compiler/privacyClassExtendsClauseDeclFile.ts index 4feb4a691b72e..9befa0f04d2a1 100644 --- a/tests/cases/compiler/privacyClassExtendsClauseDeclFile.ts +++ b/tests/cases/compiler/privacyClassExtendsClauseDeclFile.ts @@ -2,7 +2,7 @@ // @declaration: true // @Filename: privacyClassExtendsClauseDeclFile_externalModule.ts -export module publicModule { +export namespace publicModule { export class publicClassInPublicModule { private f1() { } @@ -26,7 +26,7 @@ export module publicModule { } } -module privateModule { +namespace privateModule { export class publicClassInPrivateModule { private f1() { } @@ -73,7 +73,7 @@ export class publicClassExtendingFromPrivateModuleClass extends privateModule.pu } // @Filename: privacyClassExtendsClauseDeclFile_GlobalFile.ts -module publicModuleInGlobal { +namespace publicModuleInGlobal { export class publicClassInPublicModule { private f1() { } diff --git a/tests/cases/compiler/privacyClassImplementsClauseDeclFile.ts b/tests/cases/compiler/privacyClassImplementsClauseDeclFile.ts index 17791e49f862d..f4eb7e7f490d7 100644 --- a/tests/cases/compiler/privacyClassImplementsClauseDeclFile.ts +++ b/tests/cases/compiler/privacyClassImplementsClauseDeclFile.ts @@ -2,7 +2,7 @@ // @declaration: true // @Filename: privacyClassImplementsClauseDeclFile_externalModule.ts -export module publicModule { +export namespace publicModule { export interface publicInterfaceInPublicModule { } @@ -27,7 +27,7 @@ export module publicModule { } } -module privateModule { +namespace privateModule { export interface publicInterfaceInPrivateModule { } @@ -72,7 +72,7 @@ export class publicClassImplementingFromPrivateModuleInterface implements privat } // @Filename: privacyClassImplementsClauseDeclFile_GlobalFile.ts -module publicModuleInGlobal { +namespace publicModuleInGlobal { export interface publicInterfaceInPublicModule { } diff --git a/tests/cases/compiler/privacyFunc.ts b/tests/cases/compiler/privacyFunc.ts index bb9ad25e8674f..8d910ad9d5623 100644 --- a/tests/cases/compiler/privacyFunc.ts +++ b/tests/cases/compiler/privacyFunc.ts @@ -1,4 +1,4 @@ -module m1 { +namespace m1 { export class C1_public { private f1() { } diff --git a/tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts b/tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts index dd5eaf82bdf27..450e1f0575ff2 100644 --- a/tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts +++ b/tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts @@ -1,157 +1,157 @@ -// @module: commonjs -// @declaration: true - - -// @Filename: privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts -declare module "GlobalWidgets" { - export class Widget3 { - name: string; - } - export function createWidget3(): Widget3; - - export module SpecializedGlobalWidget { - export class Widget4 { - name: string; - } - function createWidget4(): Widget4; - } -} - -// @Filename: privacyFunctionCannotNameParameterTypeDeclFile_Widgets.ts -export class Widget1 { - name = 'one'; -} -export function createWidget1() { - return new Widget1(); -} - -export module SpecializedWidget { - export class Widget2 { - name = 'one'; - } - export function createWidget2() { - return new Widget2(); - } -} - -// @Filename:privacyFunctionCannotNameParameterTypeDeclFile_exporter.ts -/// -import Widgets = require("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets"); -import Widgets1 = require("GlobalWidgets"); -export function createExportedWidget1() { - return Widgets.createWidget1(); -} -export function createExportedWidget2() { - return Widgets.SpecializedWidget.createWidget2(); -} -export function createExportedWidget3() { - return Widgets1.createWidget3(); -} -export function createExportedWidget4() { - return Widgets1.SpecializedGlobalWidget.createWidget4(); -} - -// @Filename:privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts -import exporter = require("./privacyFunctionCannotNameParameterTypeDeclFile_exporter"); -export class publicClassWithWithPrivateParmeterTypes { - static myPublicStaticMethod(param = exporter.createExportedWidget1()) { // Error - } - private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) { - } - myPublicMethod(param = exporter.createExportedWidget1()) { // Error - } - private myPrivateMethod(param = exporter.createExportedWidget1()) { - } - constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { // Error - } -} -export class publicClassWithWithPrivateParmeterTypes1 { - static myPublicStaticMethod(param = exporter.createExportedWidget3()) { // Error - } - private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) { - } - myPublicMethod(param = exporter.createExportedWidget3()) { // Error - } - private myPrivateMethod(param = exporter.createExportedWidget3()) { - } - constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) { // Error - } -} - -class privateClassWithWithPrivateParmeterTypes { - static myPublicStaticMethod(param = exporter.createExportedWidget1()) { - } - private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) { - } - myPublicMethod(param = exporter.createExportedWidget1()) { - } - private myPrivateMethod(param = exporter.createExportedWidget1()) { - } - constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { - } -} -class privateClassWithWithPrivateParmeterTypes2 { - static myPublicStaticMethod(param = exporter.createExportedWidget3()) { - } - private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) { - } - myPublicMethod(param = exporter.createExportedWidget3()) { - } - private myPrivateMethod(param = exporter.createExportedWidget3()) { - } - constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) { - } -} - -export function publicFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { // Error -} -function privateFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { -} -export function publicFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { // Error -} -function privateFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { -} - - -export class publicClassWithPrivateModuleParameterTypes { - static myPublicStaticMethod(param= exporter.createExportedWidget2()) { // Error - } - myPublicMethod(param= exporter.createExportedWidget2()) { // Error - } - constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { // Error - } -} -export class publicClassWithPrivateModuleParameterTypes2 { - static myPublicStaticMethod(param= exporter.createExportedWidget4()) { // Error - } - myPublicMethod(param= exporter.createExportedWidget4()) { // Error - } - constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) { // Error - } -} -export function publicFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { // Error -} -export function publicFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { // Error -} - - -class privateClassWithPrivateModuleParameterTypes { - static myPublicStaticMethod(param= exporter.createExportedWidget2()) { - } - myPublicMethod(param= exporter.createExportedWidget2()) { - } - constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { - } -} -class privateClassWithPrivateModuleParameterTypes1 { - static myPublicStaticMethod(param= exporter.createExportedWidget4()) { - } - myPublicMethod(param= exporter.createExportedWidget4()) { - } - constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) { - } -} -function privateFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { -} -function privateFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { +// @module: commonjs +// @declaration: true + + +// @Filename: privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts +declare module "GlobalWidgets" { + export class Widget3 { + name: string; + } + export function createWidget3(): Widget3; + + export namespace SpecializedGlobalWidget { + export class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } +} + +// @Filename: privacyFunctionCannotNameParameterTypeDeclFile_Widgets.ts +export class Widget1 { + name = 'one'; +} +export function createWidget1() { + return new Widget1(); +} + +export namespace SpecializedWidget { + export class Widget2 { + name = 'one'; + } + export function createWidget2() { + return new Widget2(); + } +} + +// @Filename:privacyFunctionCannotNameParameterTypeDeclFile_exporter.ts +/// +import Widgets = require("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets"); +import Widgets1 = require("GlobalWidgets"); +export function createExportedWidget1() { + return Widgets.createWidget1(); +} +export function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); +} +export function createExportedWidget3() { + return Widgets1.createWidget3(); +} +export function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); +} + +// @Filename:privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts +import exporter = require("./privacyFunctionCannotNameParameterTypeDeclFile_exporter"); +export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param = exporter.createExportedWidget1()) { // Error + } + private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) { + } + myPublicMethod(param = exporter.createExportedWidget1()) { // Error + } + private myPrivateMethod(param = exporter.createExportedWidget1()) { + } + constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { // Error + } +} +export class publicClassWithWithPrivateParmeterTypes1 { + static myPublicStaticMethod(param = exporter.createExportedWidget3()) { // Error + } + private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) { + } + myPublicMethod(param = exporter.createExportedWidget3()) { // Error + } + private myPrivateMethod(param = exporter.createExportedWidget3()) { + } + constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) { // Error + } +} + +class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param = exporter.createExportedWidget1()) { + } + private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) { + } + myPublicMethod(param = exporter.createExportedWidget1()) { + } + private myPrivateMethod(param = exporter.createExportedWidget1()) { + } + constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { + } +} +class privateClassWithWithPrivateParmeterTypes2 { + static myPublicStaticMethod(param = exporter.createExportedWidget3()) { + } + private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) { + } + myPublicMethod(param = exporter.createExportedWidget3()) { + } + private myPrivateMethod(param = exporter.createExportedWidget3()) { + } + constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) { + } +} + +export function publicFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { // Error +} +function privateFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { +} +export function publicFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { // Error +} +function privateFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { +} + + +export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param= exporter.createExportedWidget2()) { // Error + } + myPublicMethod(param= exporter.createExportedWidget2()) { // Error + } + constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { // Error + } +} +export class publicClassWithPrivateModuleParameterTypes2 { + static myPublicStaticMethod(param= exporter.createExportedWidget4()) { // Error + } + myPublicMethod(param= exporter.createExportedWidget4()) { // Error + } + constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) { // Error + } +} +export function publicFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { // Error +} +export function publicFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { // Error +} + + +class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param= exporter.createExportedWidget2()) { + } + myPublicMethod(param= exporter.createExportedWidget2()) { + } + constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { + } +} +class privateClassWithPrivateModuleParameterTypes1 { + static myPublicStaticMethod(param= exporter.createExportedWidget4()) { + } + myPublicMethod(param= exporter.createExportedWidget4()) { + } + constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) { + } +} +function privateFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { +} +function privateFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { } \ No newline at end of file diff --git a/tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts b/tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts index cb1993286a45f..cd97ef7fef0c2 100644 --- a/tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts +++ b/tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts @@ -1,163 +1,163 @@ -// @module: commonjs -// @declaration: true - - -// @Filename: privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts -declare module "GlobalWidgets" { - export class Widget3 { - name: string; - } - export function createWidget3(): Widget3; - - export module SpecializedGlobalWidget { - export class Widget4 { - name: string; - } - function createWidget4(): Widget4; - } -} - -// @Filename: privacyFunctionReturnTypeDeclFile_Widgets.ts -export class Widget1 { - name = 'one'; -} -export function createWidget1() { - return new Widget1(); -} - -export module SpecializedWidget { - export class Widget2 { - name = 'one'; - } - export function createWidget2() { - return new Widget2(); - } -} - -// @Filename:privacyFunctionReturnTypeDeclFile_exporter.ts -/// -import Widgets = require("./privacyFunctionReturnTypeDeclFile_Widgets"); -import Widgets1 = require("GlobalWidgets"); -export function createExportedWidget1() { - return Widgets.createWidget1(); -} -export function createExportedWidget2() { - return Widgets.SpecializedWidget.createWidget2(); -} -export function createExportedWidget3() { - return Widgets1.createWidget3(); -} -export function createExportedWidget4() { - return Widgets1.SpecializedGlobalWidget.createWidget4(); -} - -// @Filename:privacyFunctionReturnTypeDeclFile_consumer.ts -import exporter = require("./privacyFunctionReturnTypeDeclFile_exporter"); -export class publicClassWithWithPrivateParmeterTypes { - static myPublicStaticMethod() { // Error - return exporter.createExportedWidget1(); - } - private static myPrivateStaticMethod() { - return exporter.createExportedWidget1();; - } - myPublicMethod() { // Error - return exporter.createExportedWidget1();; - } - private myPrivateMethod() { - return exporter.createExportedWidget1();; - } - static myPublicStaticMethod1() { // Error - return exporter.createExportedWidget3(); - } - private static myPrivateStaticMethod1() { - return exporter.createExportedWidget3();; - } - myPublicMethod1() { // Error - return exporter.createExportedWidget3();; - } - private myPrivateMethod1() { - return exporter.createExportedWidget3();; - } -} - -class privateClassWithWithPrivateParmeterTypes { - static myPublicStaticMethod() { - return exporter.createExportedWidget1(); - } - private static myPrivateStaticMethod() { - return exporter.createExportedWidget1();; - } - myPublicMethod() { - return exporter.createExportedWidget1();; - } - private myPrivateMethod() { - return exporter.createExportedWidget1();; - } - static myPublicStaticMethod1() { - return exporter.createExportedWidget3(); - } - private static myPrivateStaticMethod1() { - return exporter.createExportedWidget3();; - } - myPublicMethod1() { - return exporter.createExportedWidget3();; - } - private myPrivateMethod1() { - return exporter.createExportedWidget3();; - } -} - -export function publicFunctionWithPrivateParmeterTypes() { // Error - return exporter.createExportedWidget1(); -} -function privateFunctionWithPrivateParmeterTypes() { - return exporter.createExportedWidget1(); -} -export function publicFunctionWithPrivateParmeterTypes1() { // Error - return exporter.createExportedWidget3(); -} -function privateFunctionWithPrivateParmeterTypes1() { - return exporter.createExportedWidget3(); -} - -export class publicClassWithPrivateModuleReturnTypes { - static myPublicStaticMethod() { // Error - return exporter.createExportedWidget2(); - } - myPublicMethod() { // Error - return exporter.createExportedWidget2(); - } - static myPublicStaticMethod1() { // Error - return exporter.createExportedWidget4(); - } - myPublicMethod1() { // Error - return exporter.createExportedWidget4(); - } -} -export function publicFunctionWithPrivateModuleReturnTypes() { // Error - return exporter.createExportedWidget2(); -} -export function publicFunctionWithPrivateModuleReturnTypes1() { // Error - return exporter.createExportedWidget4(); -} - -class privateClassWithPrivateModuleReturnTypes { - static myPublicStaticMethod() { - return exporter.createExportedWidget2(); - } - myPublicMethod() { - return exporter.createExportedWidget2(); - } - static myPublicStaticMethod1() { // Error - return exporter.createExportedWidget4(); - } - myPublicMethod1() { // Error - return exporter.createExportedWidget4(); - } -} -function privateFunctionWithPrivateModuleReturnTypes() { - return exporter.createExportedWidget2(); -} -function privateFunctionWithPrivateModuleReturnTypes1() { - return exporter.createExportedWidget4(); -} +// @module: commonjs +// @declaration: true + + +// @Filename: privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts +declare module "GlobalWidgets" { + export class Widget3 { + name: string; + } + export function createWidget3(): Widget3; + + export namespace SpecializedGlobalWidget { + export class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } +} + +// @Filename: privacyFunctionReturnTypeDeclFile_Widgets.ts +export class Widget1 { + name = 'one'; +} +export function createWidget1() { + return new Widget1(); +} + +export namespace SpecializedWidget { + export class Widget2 { + name = 'one'; + } + export function createWidget2() { + return new Widget2(); + } +} + +// @Filename:privacyFunctionReturnTypeDeclFile_exporter.ts +/// +import Widgets = require("./privacyFunctionReturnTypeDeclFile_Widgets"); +import Widgets1 = require("GlobalWidgets"); +export function createExportedWidget1() { + return Widgets.createWidget1(); +} +export function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); +} +export function createExportedWidget3() { + return Widgets1.createWidget3(); +} +export function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); +} + +// @Filename:privacyFunctionReturnTypeDeclFile_consumer.ts +import exporter = require("./privacyFunctionReturnTypeDeclFile_exporter"); +export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod() { // Error + return exporter.createExportedWidget1(); + } + private static myPrivateStaticMethod() { + return exporter.createExportedWidget1();; + } + myPublicMethod() { // Error + return exporter.createExportedWidget1();; + } + private myPrivateMethod() { + return exporter.createExportedWidget1();; + } + static myPublicStaticMethod1() { // Error + return exporter.createExportedWidget3(); + } + private static myPrivateStaticMethod1() { + return exporter.createExportedWidget3();; + } + myPublicMethod1() { // Error + return exporter.createExportedWidget3();; + } + private myPrivateMethod1() { + return exporter.createExportedWidget3();; + } +} + +class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod() { + return exporter.createExportedWidget1(); + } + private static myPrivateStaticMethod() { + return exporter.createExportedWidget1();; + } + myPublicMethod() { + return exporter.createExportedWidget1();; + } + private myPrivateMethod() { + return exporter.createExportedWidget1();; + } + static myPublicStaticMethod1() { + return exporter.createExportedWidget3(); + } + private static myPrivateStaticMethod1() { + return exporter.createExportedWidget3();; + } + myPublicMethod1() { + return exporter.createExportedWidget3();; + } + private myPrivateMethod1() { + return exporter.createExportedWidget3();; + } +} + +export function publicFunctionWithPrivateParmeterTypes() { // Error + return exporter.createExportedWidget1(); +} +function privateFunctionWithPrivateParmeterTypes() { + return exporter.createExportedWidget1(); +} +export function publicFunctionWithPrivateParmeterTypes1() { // Error + return exporter.createExportedWidget3(); +} +function privateFunctionWithPrivateParmeterTypes1() { + return exporter.createExportedWidget3(); +} + +export class publicClassWithPrivateModuleReturnTypes { + static myPublicStaticMethod() { // Error + return exporter.createExportedWidget2(); + } + myPublicMethod() { // Error + return exporter.createExportedWidget2(); + } + static myPublicStaticMethod1() { // Error + return exporter.createExportedWidget4(); + } + myPublicMethod1() { // Error + return exporter.createExportedWidget4(); + } +} +export function publicFunctionWithPrivateModuleReturnTypes() { // Error + return exporter.createExportedWidget2(); +} +export function publicFunctionWithPrivateModuleReturnTypes1() { // Error + return exporter.createExportedWidget4(); +} + +class privateClassWithPrivateModuleReturnTypes { + static myPublicStaticMethod() { + return exporter.createExportedWidget2(); + } + myPublicMethod() { + return exporter.createExportedWidget2(); + } + static myPublicStaticMethod1() { // Error + return exporter.createExportedWidget4(); + } + myPublicMethod1() { // Error + return exporter.createExportedWidget4(); + } +} +function privateFunctionWithPrivateModuleReturnTypes() { + return exporter.createExportedWidget2(); +} +function privateFunctionWithPrivateModuleReturnTypes1() { + return exporter.createExportedWidget4(); +} diff --git a/tests/cases/compiler/privacyFunctionParameterDeclFile.ts b/tests/cases/compiler/privacyFunctionParameterDeclFile.ts index baa2ed4bee6bb..16c0ff7d3f479 100644 --- a/tests/cases/compiler/privacyFunctionParameterDeclFile.ts +++ b/tests/cases/compiler/privacyFunctionParameterDeclFile.ts @@ -132,7 +132,7 @@ function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.pub } declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; -export module publicModule { +export namespace publicModule { class privateClass { } @@ -266,7 +266,7 @@ export module publicModule { } -module privateModule { +namespace privateModule { class privateClass { } @@ -422,14 +422,14 @@ function publicFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGloba } declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal): void; -module publicModuleInGlobal { +namespace publicModuleInGlobal { class privateClass { } export class publicClass { } - module privateModule { + namespace privateModule { class privateClass { } diff --git a/tests/cases/compiler/privacyFunctionReturnTypeDeclFile.ts b/tests/cases/compiler/privacyFunctionReturnTypeDeclFile.ts index c09c4b123f2a6..730e1aa4c9bff 100644 --- a/tests/cases/compiler/privacyFunctionReturnTypeDeclFile.ts +++ b/tests/cases/compiler/privacyFunctionReturnTypeDeclFile.ts @@ -230,7 +230,7 @@ function privateFunctionWithPrivateModuleParameterTypes1() { } declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; -export module publicModule { +export namespace publicModule { class privateClass { } @@ -460,7 +460,7 @@ export module publicModule { declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; } -module privateModule { +namespace privateModule { class privateClass { } @@ -733,14 +733,14 @@ function publicFunctionWithPublicParmeterTypesInGlobal1() { } declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal; -module publicModuleInGlobal { +namespace publicModuleInGlobal { class privateClass { } export class publicClass { } - module privateModule { + namespace privateModule { class privateClass { } diff --git a/tests/cases/compiler/privacyGetter.ts b/tests/cases/compiler/privacyGetter.ts index aab0cb22a0e72..be469c8a537e1 100644 --- a/tests/cases/compiler/privacyGetter.ts +++ b/tests/cases/compiler/privacyGetter.ts @@ -1,6 +1,6 @@ // @target: ES5 //@module: amd -export module m1 { +export namespace m1 { export class C1_public { private f1() { } @@ -70,7 +70,7 @@ export module m1 { } } -module m2 { +namespace m2 { export class m2_C1_public { private f1() { } diff --git a/tests/cases/compiler/privacyGloClass.ts b/tests/cases/compiler/privacyGloClass.ts index 79b018adc6e41..01da2899eb99a 100644 --- a/tests/cases/compiler/privacyGloClass.ts +++ b/tests/cases/compiler/privacyGloClass.ts @@ -1,4 +1,4 @@ -module m1 { +namespace m1 { export interface m1_i_public { } diff --git a/tests/cases/compiler/privacyGloFunc.ts b/tests/cases/compiler/privacyGloFunc.ts index 55be524308ed9..d76e23bc7bb68 100644 --- a/tests/cases/compiler/privacyGloFunc.ts +++ b/tests/cases/compiler/privacyGloFunc.ts @@ -1,5 +1,5 @@ //@module: amd -export module m1 { +export namespace m1 { export class C1_public { private f1() { } @@ -177,7 +177,7 @@ export module m1 { } } -module m2 { +namespace m2 { export class m2_C1_public { private f() { } diff --git a/tests/cases/compiler/privacyGloGetter.ts b/tests/cases/compiler/privacyGloGetter.ts index c892c2e75daf9..b1e37317df45f 100644 --- a/tests/cases/compiler/privacyGloGetter.ts +++ b/tests/cases/compiler/privacyGloGetter.ts @@ -1,5 +1,5 @@ // @target: ES5 -module m1 { +namespace m1 { export class C1_public { private f1() { } diff --git a/tests/cases/compiler/privacyGloImport.ts b/tests/cases/compiler/privacyGloImport.ts index 19bf100986763..a589e9e6ab288 100644 --- a/tests/cases/compiler/privacyGloImport.ts +++ b/tests/cases/compiler/privacyGloImport.ts @@ -1,6 +1,6 @@ //@declaration: true -module m1 { - export module m1_M1_public { +namespace m1 { + export namespace m1_M1_public { export class c1 { } export function f1() { @@ -10,7 +10,7 @@ module m1 { export var v2: c1; } - module m1_M2_private { + namespace m1_M2_private { export class c1 { } export function f1() { @@ -83,7 +83,7 @@ module m1 { //export import m1_im4_public = require("m1_M4_private"); } -module glo_M1_public { +namespace glo_M1_public { export class c1 { } export function f1() { @@ -118,11 +118,11 @@ declare module "use_glo_M1_public" { var use_glo_M2_public_v2_private: typeof use_glo_M2_public; var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1; - module m2 { + namespace m2 { //import errorImport = require("glo_M2_public"); import nonerrorImport = glo_M1_public; - module m5 { + namespace m5 { //import m5_errorImport = require("glo_M2_public"); import m5_nonerrorImport = glo_M1_public; } @@ -130,12 +130,12 @@ declare module "use_glo_M1_public" { } declare module "anotherParseError" { - module m2 { + namespace m2 { //declare module "abc" { //} } - module m2 { + namespace m2 { //module "abc2" { //} } @@ -143,9 +143,9 @@ declare module "anotherParseError" { //} } -module m2 { +namespace m2 { //import m3 = require("use_glo_M1_public"); - module m4 { + namespace m4 { var a = 10; //import m2 = require("use_glo_M1_public"); } diff --git a/tests/cases/compiler/privacyGloImportParseErrors.ts b/tests/cases/compiler/privacyGloImportParseErrors.ts index 8419f6737ea17..0d725488952da 100644 --- a/tests/cases/compiler/privacyGloImportParseErrors.ts +++ b/tests/cases/compiler/privacyGloImportParseErrors.ts @@ -1,6 +1,6 @@ //@declaration: true -module m1 { - export module m1_M1_public { +namespace m1 { + export namespace m1_M1_public { export class c1 { } export function f1() { @@ -10,7 +10,7 @@ module m1 { export var v2: c1; } - module m1_M2_private { + namespace m1_M2_private { export class c1 { } export function f1() { @@ -83,7 +83,7 @@ module m1 { export import m1_im4_public = require("m1_M4_private"); } -module glo_M1_public { +namespace glo_M1_public { export class c1 { } export function f1() { @@ -118,11 +118,11 @@ declare module "use_glo_M1_public" { var use_glo_M2_public_v2_private: typeof use_glo_M2_public; var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1; - module m2 { + namespace m2 { import errorImport = require("glo_M2_public"); import nonerrorImport = glo_M1_public; - module m5 { + namespace m5 { import m5_errorImport = require("glo_M2_public"); import m5_nonerrorImport = glo_M1_public; } @@ -130,12 +130,12 @@ declare module "use_glo_M1_public" { } declare module "anotherParseError" { - module m2 { + namespace m2 { declare module "abc" { } } - module m2 { + namespace m2 { module "abc2" { } } @@ -143,9 +143,9 @@ declare module "anotherParseError" { } } -module m2 { +namespace m2 { import m3 = require("use_glo_M1_public"); - module m4 { + namespace m4 { var a = 10; import m2 = require("use_glo_M1_public"); } diff --git a/tests/cases/compiler/privacyGloInterface.ts b/tests/cases/compiler/privacyGloInterface.ts index 931a7e21b6f8f..b56a1da706387 100644 --- a/tests/cases/compiler/privacyGloInterface.ts +++ b/tests/cases/compiler/privacyGloInterface.ts @@ -1,4 +1,4 @@ -module m1 { +namespace m1 { export class C1_public { private f1() { } @@ -86,7 +86,7 @@ interface C7_public { f3(): C5_public; } -module m3 { +namespace m3 { export interface m3_i_public { f1(): number; } diff --git a/tests/cases/compiler/privacyGloVar.ts b/tests/cases/compiler/privacyGloVar.ts index c56f72ebfd321..7fcc879353152 100644 --- a/tests/cases/compiler/privacyGloVar.ts +++ b/tests/cases/compiler/privacyGloVar.ts @@ -1,4 +1,4 @@ -module m1 { +namespace m1 { export class C1_public { private f1() { } diff --git a/tests/cases/compiler/privacyImport.ts b/tests/cases/compiler/privacyImport.ts index dff16781d56fc..3a3236f1c7b40 100644 --- a/tests/cases/compiler/privacyImport.ts +++ b/tests/cases/compiler/privacyImport.ts @@ -1,7 +1,7 @@ //@module: commonjs //@declaration: true -export module m1 { - export module m1_M1_public { +export namespace m1 { + export namespace m1_M1_public { export class c1 { } export function f1() { @@ -11,7 +11,7 @@ export module m1 { export var v2: c1; } - module m1_M2_private { + namespace m1_M2_private { export class c1 { } export function f1() { @@ -84,8 +84,8 @@ export module m1 { //export import m1_im4_public = require("m1_M4_private"); } -module m2 { - export module m2_M1_public { +namespace m2 { + export namespace m2_M1_public { export class c1 { } export function f1() { @@ -95,7 +95,7 @@ module m2 { export var v2: c1; } - module m2_M2_private { + namespace m2_M2_private { export class c1 { } export function f1() { @@ -169,7 +169,7 @@ module m2 { //export import m1_im4_public = require("m2_M4_private"); } -export module glo_M1_public { +export namespace glo_M1_public { export class c1 { } export function f1() { @@ -187,7 +187,7 @@ export module glo_M1_public { // export var v2: c1; //} -export module glo_M3_private { +export namespace glo_M3_private { export class c1 { } export function f1() { @@ -339,18 +339,18 @@ export import glo_im2_public = glo_M3_private; // } //} -module m2 { +namespace m2 { //import m3 = require("use_glo_M1_public"); - module m4 { + namespace m4 { var a = 10; //import m2 = require("use_glo_M1_public"); } } -export module m3 { +export namespace m3 { //import m3 = require("use_glo_M1_public"); - module m4 { + namespace m4 { var a = 10; //import m2 = require("use_glo_M1_public"); } diff --git a/tests/cases/compiler/privacyImportParseErrors.ts b/tests/cases/compiler/privacyImportParseErrors.ts index 04d789a37498e..fb9b58ae62995 100644 --- a/tests/cases/compiler/privacyImportParseErrors.ts +++ b/tests/cases/compiler/privacyImportParseErrors.ts @@ -1,6 +1,6 @@ //@module: commonjs -export module m1 { - export module m1_M1_public { +export namespace m1 { + export namespace m1_M1_public { export class c1 { } export function f1() { @@ -10,7 +10,7 @@ export module m1 { export var v2: c1; } - module m1_M2_private { + namespace m1_M2_private { export class c1 { } export function f1() { @@ -83,8 +83,8 @@ export module m1 { export import m1_im4_public = require("m1_M4_private"); } -module m2 { - export module m2_M1_public { +namespace m2 { + export namespace m2_M1_public { export class c1 { } export function f1() { @@ -94,7 +94,7 @@ module m2 { export var v2: c1; } - module m2_M2_private { + namespace m2_M2_private { export class c1 { } export function f1() { @@ -168,7 +168,7 @@ module m2 { export import m1_im4_public = require("m2_M4_private"); } -export module glo_M1_public { +export namespace glo_M1_public { export class c1 { } export function f1() { @@ -186,7 +186,7 @@ export declare module "glo_M2_public" { export var v2: c1; } -export module glo_M3_private { +export namespace glo_M3_private { export class c1 { } export function f1() { @@ -270,11 +270,11 @@ export declare module "use_glo_M1_public" { var use_glo_M2_public_v2_private: use_glo_M2_public; var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1; - module m2 { + namespace m2 { import errorImport = require("glo_M2_public"); import nonerrorImport = glo_M1_public; - module m5 { + namespace m5 { import m5_errorImport = require("glo_M2_public"); import m5_nonerrorImport = glo_M1_public; } @@ -299,11 +299,11 @@ declare module "use_glo_M3_private" { var use_glo_M4_private_v2_private: use_glo_M4_private; var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1; - module m2 { + namespace m2 { import errorImport = require("glo_M4_private"); import nonerrorImport = glo_M3_private; - module m5 { + namespace m5 { import m5_errorImport = require("glo_M4_private"); import m5_nonerrorImport = glo_M3_private; } @@ -311,12 +311,12 @@ declare module "use_glo_M3_private" { } declare module "anotherParseError" { - module m2 { + namespace m2 { declare module "abc" { } } - module m2 { + namespace m2 { module "abc2" { } } @@ -325,12 +325,12 @@ declare module "anotherParseError" { } declare export module "anotherParseError2" { - module m2 { + namespace m2 { declare module "abc" { } } - module m2 { + namespace m2 { module "abc2" { } } @@ -338,18 +338,18 @@ declare export module "anotherParseError2" { } } -module m2 { +namespace m2 { import m3 = require("use_glo_M1_public"); - module m4 { + namespace m4 { var a = 10; import m2 = require("use_glo_M1_public"); } } -export module m3 { +export namespace m3 { import m3 = require("use_glo_M1_public"); - module m4 { + namespace m4 { var a = 10; import m2 = require("use_glo_M1_public"); } diff --git a/tests/cases/compiler/privacyInterface.ts b/tests/cases/compiler/privacyInterface.ts index 176fe4adf766f..13e0d107c09d4 100644 --- a/tests/cases/compiler/privacyInterface.ts +++ b/tests/cases/compiler/privacyInterface.ts @@ -1,5 +1,5 @@ //@module: commonjs -export module m1 { +export namespace m1 { export class C1_public { private f1() { } @@ -65,7 +65,7 @@ export module m1 { } -module m2 { +namespace m2 { export class C1_public { private f1() { } @@ -193,7 +193,7 @@ interface C8_private { } -export module m3 { +export namespace m3 { export interface m3_i_public { f1(): number; } @@ -218,7 +218,7 @@ export module m3 { } -module m4 { +namespace m4 { export interface m4_i_public { f1(): number; } diff --git a/tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts b/tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts index d1c73724bb9a7..8f2ab891ff891 100644 --- a/tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts +++ b/tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts @@ -2,7 +2,7 @@ // @declaration: true // @Filename: privacyInterfaceExtendsClauseDeclFile_externalModule.ts -export module publicModule { +export namespace publicModule { export interface publicInterfaceInPublicModule { } @@ -27,7 +27,7 @@ export module publicModule { } } -module privateModule { +namespace privateModule { export interface publicInterfaceInPrivateModule { } @@ -72,7 +72,7 @@ export interface publicInterfaceImplementingFromPrivateModuleInterface extends p } // @Filename: privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts -module publicModuleInGlobal { +namespace publicModuleInGlobal { export interface publicInterfaceInPublicModule { } diff --git a/tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts b/tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts index 89bd95e6a6494..cc12ab4111e9b 100644 --- a/tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts +++ b/tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts @@ -1,7 +1,7 @@ //@module: commonjs //@declaration: true // private elements -module m_private { +namespace m_private { export class c_private { } export enum e_private { @@ -14,18 +14,18 @@ module m_private { export var v_private = new c_private(); export interface i_private { } - export module mi_private { + export namespace mi_private { export class c { } } - export module mu_private { + export namespace mu_private { export interface i { } } } // Public elements -export module m_public { +export namespace m_public { export class c_public { } export enum e_public { @@ -38,17 +38,17 @@ export module m_public { export var v_public = 10; export interface i_public { } - export module mi_public { + export namespace mi_public { export class c { } } - export module mu_public { + export namespace mu_public { export interface i { } } } -export module import_public { +export namespace import_public { // Privacy errors - importing private elements export import im_public_c_private = m_private.c_private; export import im_public_e_private = m_private.e_private; @@ -101,7 +101,7 @@ export module import_public { export var publicUse_im_public_mu_public: im_public_mu_public.i; } -module import_private { +namespace import_private { // No Privacy errors - importing private elements export import im_private_c_private = m_private.c_private; export import im_private_e_private = m_private.e_private; diff --git a/tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts b/tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts index 454212f2e3183..9462c129b0cfb 100644 --- a/tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts +++ b/tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts @@ -1,7 +1,7 @@ //@module: amd //@declaration: true // private elements -module m_private { +namespace m_private { export class c_private { } export enum e_private { @@ -14,18 +14,18 @@ module m_private { export var v_private = new c_private(); export interface i_private { } - export module mi_private { + export namespace mi_private { export class c { } } - export module mu_private { + export namespace mu_private { export interface i { } } } // Public elements -export module m_public { +export namespace m_public { export class c_public { } export enum e_public { @@ -38,17 +38,17 @@ export module m_public { export var v_public = 10; export interface i_public { } - export module mi_public { + export namespace mi_public { export class c { } } - export module mu_public { + export namespace mu_public { export interface i { } } } -export module import_public { +export namespace import_public { // No Privacy errors - importing private elements import im_private_c_private = m_private.c_private; import im_private_e_private = m_private.e_private; @@ -101,7 +101,7 @@ export module import_public { export var publicUse_im_private_mu_public: im_private_mu_public.i; } -module import_private { +namespace import_private { // No Privacy errors - importing private elements import im_private_c_private = m_private.c_private; import im_private_e_private = m_private.e_private; diff --git a/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts b/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts index 987c35c73253f..5fb4b1dcba347 100644 --- a/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts +++ b/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts @@ -1,7 +1,7 @@ //@module: amd //@declaration: true // private elements -module m_private { +namespace m_private { export class c_private { } export enum e_private { @@ -14,18 +14,18 @@ module m_private { export var v_private = new c_private(); export interface i_private { } - export module mi_private { + export namespace mi_private { export class c { } } - export module mu_private { + export namespace mu_private { export interface i { } } } // Public elements -export module m_public { +export namespace m_public { export class c_public { } export enum e_public { @@ -38,11 +38,11 @@ export module m_public { export var v_public = 10; export interface i_public { } - export module mi_public { + export namespace mi_public { export class c { } } - export module mu_public { + export namespace mu_public { export interface i { } } diff --git a/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts b/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts index 8f241c5ab0179..7a8f3c024daee 100644 --- a/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts +++ b/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts @@ -2,7 +2,7 @@ //@declaration: true // private elements -module m_private { +namespace m_private { export class c_private { } export enum e_private { @@ -15,18 +15,18 @@ module m_private { export var v_private = new c_private(); export interface i_private { } - export module mi_private { + export namespace mi_private { export class c { } } - export module mu_private { + export namespace mu_private { export interface i { } } } // Public elements -export module m_public { +export namespace m_public { export class c_public { } export enum e_public { @@ -39,11 +39,11 @@ export module m_public { export var v_public = 10; export interface i_public { } - export module mi_public { + export namespace mi_public { export class c { } } - export module mu_public { + export namespace mu_public { export interface i { } } diff --git a/tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts b/tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts index 7ea908e9cfb34..ea22fe0353b49 100644 --- a/tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts +++ b/tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts @@ -155,7 +155,7 @@ function privateFunctionWithPrivateMopduleTypeParameters { // Error } -export module publicModule { +export namespace publicModule { class privateClassInPublicModule { } @@ -131,7 +131,7 @@ export module publicModule { } } -module privateModule { +namespace privateModule { class privateClassInPrivateModule { } diff --git a/tests/cases/compiler/privacyVar.ts b/tests/cases/compiler/privacyVar.ts index ce1f060d2698b..d79fd9e31904b 100644 --- a/tests/cases/compiler/privacyVar.ts +++ b/tests/cases/compiler/privacyVar.ts @@ -1,5 +1,5 @@ //@module: commonjs -export module m1 { +export namespace m1 { export class C1_public { private f1() { } @@ -58,7 +58,7 @@ export module m1 { export var m1_v24_public: C2_private = new C2_private(); // error } -module m2 { +namespace m2 { export class m2_C1_public { private f1() { } diff --git a/tests/cases/compiler/privacyVarDeclFile.ts b/tests/cases/compiler/privacyVarDeclFile.ts index 46012bc9d9f75..95be414c8a069 100644 --- a/tests/cases/compiler/privacyVarDeclFile.ts +++ b/tests/cases/compiler/privacyVarDeclFile.ts @@ -82,7 +82,7 @@ class privateClassWithPrivateModulePropertyTypes { var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass; declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; -export module publicModule { +export namespace publicModule { class privateClass { } @@ -164,7 +164,7 @@ export module publicModule { declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; } -module privateModule { +namespace privateModule { class privateClass { } @@ -261,14 +261,14 @@ class publicClassWithWithPublicPropertyTypesInGlobal { var publicVarWithPublicPropertyTypesInGlobal: publicClassInGlobal; declare var publicAmbientVarWithPublicPropertyTypesInGlobal: publicClassInGlobal; -module publicModuleInGlobal { +namespace publicModuleInGlobal { class privateClass { } export class publicClass { } - module privateModule { + namespace privateModule { class privateClass { } diff --git a/tests/cases/compiler/privateInstanceVisibility.ts b/tests/cases/compiler/privateInstanceVisibility.ts index 2a4541290e47b..bb92976310aeb 100644 --- a/tests/cases/compiler/privateInstanceVisibility.ts +++ b/tests/cases/compiler/privateInstanceVisibility.ts @@ -1,4 +1,4 @@ -module Test { +namespace Test { export class Example { diff --git a/tests/cases/compiler/privateVisibility.ts b/tests/cases/compiler/privateVisibility.ts index 3ab51f595af5f..53f073631fa44 100644 --- a/tests/cases/compiler/privateVisibility.ts +++ b/tests/cases/compiler/privateVisibility.ts @@ -12,7 +12,7 @@ f.privProp; // should not work f.pubMeth(); // should work f.pubProp; // should work -module M { +namespace M { export class C { public pub = 0; private priv = 1; } export var V = 0; } diff --git a/tests/cases/compiler/propertyNamesWithStringLiteral.ts b/tests/cases/compiler/propertyNamesWithStringLiteral.ts index f72c9c2399216..74f804a5d1a34 100644 --- a/tests/cases/compiler/propertyNamesWithStringLiteral.ts +++ b/tests/cases/compiler/propertyNamesWithStringLiteral.ts @@ -7,7 +7,7 @@ interface NamedColors { "blue": _Color; "pale blue": _Color; } -module Color { +namespace Color { export var namedColors: NamedColors; } var a = Color.namedColors["azure"]; diff --git a/tests/cases/compiler/qualifiedModuleLocals.ts b/tests/cases/compiler/qualifiedModuleLocals.ts index 0d9fdc1758180..fc9469abd0933 100644 --- a/tests/cases/compiler/qualifiedModuleLocals.ts +++ b/tests/cases/compiler/qualifiedModuleLocals.ts @@ -1,4 +1,4 @@ -module A { +namespace A { function b() {} diff --git a/tests/cases/compiler/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.ts b/tests/cases/compiler/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.ts index 267b2feaf5c02..e3dff51dc6b84 100644 --- a/tests/cases/compiler/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.ts +++ b/tests/cases/compiler/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.ts @@ -1,8 +1,8 @@ -module Alpha { +namespace Alpha { export var x = 100; } -module Beta { +namespace Beta { import p = Alpha.x; } diff --git a/tests/cases/compiler/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.ts b/tests/cases/compiler/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.ts index 7a9fc225903fa..31b34b20b7ac9 100644 --- a/tests/cases/compiler/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.ts +++ b/tests/cases/compiler/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.ts @@ -1,4 +1,4 @@ -module Alpha { +namespace Alpha { export var x = 100; } diff --git a/tests/cases/compiler/qualify.ts b/tests/cases/compiler/qualify.ts index 18e10ce77c872..0e2db204238dd 100644 --- a/tests/cases/compiler/qualify.ts +++ b/tests/cases/compiler/qualify.ts @@ -1,23 +1,23 @@ -module M { +namespace M { export var m=0; - export module N { + export namespace N { export var n=1; } } -module M { - export module N { +namespace M { + export namespace N { var y=m; var x=n+y; } } -module T { +namespace T { export interface I { p; } - export module U { + export namespace U { var z:I=3; export interface I2 { q; @@ -25,19 +25,19 @@ module T { } } -module Peer { - export module U2 { +namespace Peer { + export namespace U2 { var z:T.U.I2=3; } } -module Everest { - export module K1 { +namespace Everest { + export namespace K1 { export interface I3 { zeep; } } - export module K2 { + export namespace K2 { export interface I4 { z; } diff --git a/tests/cases/compiler/reachabilityChecks1.ts b/tests/cases/compiler/reachabilityChecks1.ts index 6430556a203b7..fbe742b383f2d 100644 --- a/tests/cases/compiler/reachabilityChecks1.ts +++ b/tests/cases/compiler/reachabilityChecks1.ts @@ -4,33 +4,33 @@ while (true); var x = 1; -module A { +namespace A { while (true); let x; } -module A1 { +namespace A1 { do {} while(true); - module A { + namespace A { interface F {} } } -module A2 { +namespace A2 { while (true); - module A { + namespace A { var x = 1; } } -module A3 { +namespace A3 { while (true); type T = string; } -module A4 { +namespace A4 { while (true); - module A { + namespace A { const enum E { X } } } @@ -51,9 +51,9 @@ function f2() { } } -module B { +namespace B { for (; ;); - module C { + namespace C { } } diff --git a/tests/cases/compiler/reachabilityChecks2.ts b/tests/cases/compiler/reachabilityChecks2.ts index 5a7a8aaab58e3..60f454fca39a8 100644 --- a/tests/cases/compiler/reachabilityChecks2.ts +++ b/tests/cases/compiler/reachabilityChecks2.ts @@ -4,9 +4,9 @@ while (true) { } const enum E { X } -module A4 { +namespace A4 { while (true); - module A { + namespace A { const enum E { X } } } diff --git a/tests/cases/compiler/reboundBaseClassSymbol.ts b/tests/cases/compiler/reboundBaseClassSymbol.ts index 4dbaf75cc721a..66d5f12db7553 100644 --- a/tests/cases/compiler/reboundBaseClassSymbol.ts +++ b/tests/cases/compiler/reboundBaseClassSymbol.ts @@ -1,5 +1,5 @@ interface A { a: number; } -module Foo { +namespace Foo { var A = 1; interface B extends A { b: string; } } \ No newline at end of file diff --git a/tests/cases/compiler/reboundIdentifierOnImportAlias.ts b/tests/cases/compiler/reboundIdentifierOnImportAlias.ts index 242e8e9048b4f..31e152a4b5841 100644 --- a/tests/cases/compiler/reboundIdentifierOnImportAlias.ts +++ b/tests/cases/compiler/reboundIdentifierOnImportAlias.ts @@ -1,7 +1,7 @@ -module Foo { +namespace Foo { export var x = "hello"; } -module Bar { +namespace Bar { var Foo = 1; import F = Foo; } \ No newline at end of file diff --git a/tests/cases/compiler/rectype.ts b/tests/cases/compiler/rectype.ts index 2bf712782a888..bd2eec6802b4c 100644 --- a/tests/cases/compiler/rectype.ts +++ b/tests/cases/compiler/rectype.ts @@ -1,4 +1,4 @@ -module M { +namespace M { interface I { (i:I):I; } export function f(p: I) { return f }; diff --git a/tests/cases/compiler/recursiveBaseCheck.ts b/tests/cases/compiler/recursiveBaseCheck.ts index 9042a3e0d2f93..d6fca21cc8c9b 100644 --- a/tests/cases/compiler/recursiveBaseCheck.ts +++ b/tests/cases/compiler/recursiveBaseCheck.ts @@ -1,4 +1,4 @@ -declare module Module { +declare namespace Module { class C extends D { } export class B extends Module.C { diff --git a/tests/cases/compiler/recursiveClassInstantiationsWithDefaultConstructors.ts b/tests/cases/compiler/recursiveClassInstantiationsWithDefaultConstructors.ts index 9f008cd2b1ea8..737decda46e80 100644 --- a/tests/cases/compiler/recursiveClassInstantiationsWithDefaultConstructors.ts +++ b/tests/cases/compiler/recursiveClassInstantiationsWithDefaultConstructors.ts @@ -1,4 +1,4 @@ -module TypeScript2 { +namespace TypeScript2 { export class MemberName { public prefix: string = ""; } diff --git a/tests/cases/compiler/recursiveClassReferenceTest.ts b/tests/cases/compiler/recursiveClassReferenceTest.ts index 0c4619eb2421d..283bb08ce074b 100644 --- a/tests/cases/compiler/recursiveClassReferenceTest.ts +++ b/tests/cases/compiler/recursiveClassReferenceTest.ts @@ -31,7 +31,7 @@ declare module Sample.Thing { } } -module Sample.Actions.Thing.Find { +namespace Sample.Actions.Thing.Find { export class StartFindAction implements Sample.Thing.IAction { public getId() { return "yo"; } @@ -43,7 +43,7 @@ module Sample.Actions.Thing.Find { } } -module Sample.Thing.Widgets { +namespace Sample.Thing.Widgets { export class FindWidget implements Sample.Thing.IWidget { public gar(runner:(widget:Sample.Thing.IWidget)=>any) { if (true) {return runner(this);}} @@ -75,7 +75,7 @@ interface Window { } declare var self: Window; -module Sample.Thing.Languages.PlainText { +namespace Sample.Thing.Languages.PlainText { export class State implements IState { constructor(private mode: IMode) { } diff --git a/tests/cases/compiler/recursiveCloduleReference.ts b/tests/cases/compiler/recursiveCloduleReference.ts index b62481618bf17..d54c1a92935ce 100644 --- a/tests/cases/compiler/recursiveCloduleReference.ts +++ b/tests/cases/compiler/recursiveCloduleReference.ts @@ -1,8 +1,8 @@ -module M +namespace M { export class C { } - export module C { + export namespace C { export var C = M.C }; }; diff --git a/tests/cases/compiler/recursiveGenericUnionType1.ts b/tests/cases/compiler/recursiveGenericUnionType1.ts index c1c7b3e81ada5..84e4c33a72dc5 100644 --- a/tests/cases/compiler/recursiveGenericUnionType1.ts +++ b/tests/cases/compiler/recursiveGenericUnionType1.ts @@ -1,11 +1,11 @@ -declare module Test1 { +declare namespace Test1 { export type Container = T | { [i: string]: Container; }; export type IStringContainer = Container; } -declare module Test2 { +declare namespace Test2 { export type Container = T | { [i: string]: Container; }; diff --git a/tests/cases/compiler/recursiveGenericUnionType2.ts b/tests/cases/compiler/recursiveGenericUnionType2.ts index 784ddefeb1fe1..18168149d92e0 100644 --- a/tests/cases/compiler/recursiveGenericUnionType2.ts +++ b/tests/cases/compiler/recursiveGenericUnionType2.ts @@ -1,11 +1,11 @@ -declare module Test1 { +declare namespace Test1 { export type Container = T | { [i: string]: Container[]; }; export type IStringContainer = Container; } -declare module Test2 { +declare namespace Test2 { export type Container = T | { [i: string]: Container[]; }; diff --git a/tests/cases/compiler/recursiveIdenticalOverloadResolution.ts b/tests/cases/compiler/recursiveIdenticalOverloadResolution.ts index a0ec51412e9e0..eaebcb13d10ac 100644 --- a/tests/cases/compiler/recursiveIdenticalOverloadResolution.ts +++ b/tests/cases/compiler/recursiveIdenticalOverloadResolution.ts @@ -1,5 +1,5 @@ -module M { +namespace M { interface I { (i: I): I; } diff --git a/tests/cases/compiler/recursiveMods.ts b/tests/cases/compiler/recursiveMods.ts index 84dbafff55829..acc5db8d84d16 100644 --- a/tests/cases/compiler/recursiveMods.ts +++ b/tests/cases/compiler/recursiveMods.ts @@ -1,11 +1,11 @@ // @allowUnreachableCode: true // @module: commonjs -export module Foo { +export namespace Foo { export class C {} } -export module Foo { +export namespace Foo { function Bar() : C { if (true) { return Bar();} diff --git a/tests/cases/compiler/recursiveTypeComparison2.ts b/tests/cases/compiler/recursiveTypeComparison2.ts index 6a781437abe56..7efec96dac58e 100644 --- a/tests/cases/compiler/recursiveTypeComparison2.ts +++ b/tests/cases/compiler/recursiveTypeComparison2.ts @@ -1,6 +1,6 @@ // Before fix this would cause compiler to hang (#1170) -declare module Bacon { +declare namespace Bacon { interface Event { } interface Error extends Event { diff --git a/tests/cases/compiler/recursivelySpecializedConstructorDeclaration.ts b/tests/cases/compiler/recursivelySpecializedConstructorDeclaration.ts index 66dcd01641d11..15857fb017df3 100644 --- a/tests/cases/compiler/recursivelySpecializedConstructorDeclaration.ts +++ b/tests/cases/compiler/recursivelySpecializedConstructorDeclaration.ts @@ -1,4 +1,4 @@ -module MsPortal.Controls.Base.ItemList { +namespace MsPortal.Controls.Base.ItemList { export interface Interface { // Removing this line fixes the constructor of ItemValue diff --git a/tests/cases/compiler/requireEmitSemicolon.ts b/tests/cases/compiler/requireEmitSemicolon.ts index b0122e9bbc650..dfaeb8664d0ee 100644 --- a/tests/cases/compiler/requireEmitSemicolon.ts +++ b/tests/cases/compiler/requireEmitSemicolon.ts @@ -1,6 +1,6 @@ //@module: amd // @Filename: requireEmitSemicolon_0.ts -export module Models { +export namespace Models { export class Person { constructor(name: string) { } } @@ -10,7 +10,7 @@ export module Models { /// import P = require("requireEmitSemicolon_0"); // bug was we were not emitting a ; here and causing runtime failures in node -export module Database { +export namespace Database { export class DB { public findPerson(id: number): P.Models.Person { return new P.Models.Person("Rock"); diff --git a/tests/cases/compiler/reservedNameOnInterfaceImport.ts b/tests/cases/compiler/reservedNameOnInterfaceImport.ts index 0a706a9acba03..901a307a83252 100644 --- a/tests/cases/compiler/reservedNameOnInterfaceImport.ts +++ b/tests/cases/compiler/reservedNameOnInterfaceImport.ts @@ -1,4 +1,4 @@ -declare module test { +declare namespace test { interface istring { } // Should error; 'test.istring' is a type, so this import conflicts with the 'string' type. diff --git a/tests/cases/compiler/reservedNameOnModuleImport.ts b/tests/cases/compiler/reservedNameOnModuleImport.ts index de0344f56f3ae..e0085c9f45b6f 100644 --- a/tests/cases/compiler/reservedNameOnModuleImport.ts +++ b/tests/cases/compiler/reservedNameOnModuleImport.ts @@ -1,5 +1,5 @@ -declare module test { - module mstring { } +declare namespace test { + namespace mstring { } // Should be fine; this does not clobber any declared values. export import string = mstring; diff --git a/tests/cases/compiler/reservedNameOnModuleImportWithInterface.ts b/tests/cases/compiler/reservedNameOnModuleImportWithInterface.ts index bde58f92795fb..981d988b74fae 100644 --- a/tests/cases/compiler/reservedNameOnModuleImportWithInterface.ts +++ b/tests/cases/compiler/reservedNameOnModuleImportWithInterface.ts @@ -1,6 +1,6 @@ -declare module test { +declare namespace test { interface mi_string { } - module mi_string { } + namespace mi_string { } // Should error; imports both a type and a module, which means it conflicts with the 'string' type. import string = mi_string; diff --git a/tests/cases/compiler/reservedWords2.ts b/tests/cases/compiler/reservedWords2.ts index e74b403d27be9..6e2915ae2cc9e 100644 --- a/tests/cases/compiler/reservedWords2.ts +++ b/tests/cases/compiler/reservedWords2.ts @@ -3,7 +3,7 @@ import * as while from "foo" var typeof = 10; function throw() {} -module void {} +namespace void {} var {while, return} = { while: 1, return: 2 }; var {this, switch: { continue} } = { this: 1, switch: { continue: 2 }}; var [debugger, if] = [1, 2]; diff --git a/tests/cases/compiler/resolveModuleNameWithSameLetDeclarationName1.ts b/tests/cases/compiler/resolveModuleNameWithSameLetDeclarationName1.ts index d76a3b0ba0da2..9aa33108a7166 100644 --- a/tests/cases/compiler/resolveModuleNameWithSameLetDeclarationName1.ts +++ b/tests/cases/compiler/resolveModuleNameWithSameLetDeclarationName1.ts @@ -1,4 +1,4 @@ -declare module foo { +declare namespace foo { interface Bar { diff --git a/tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts b/tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts index de8ad75b0eb69..5cfdbad015f3e 100644 --- a/tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts +++ b/tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts @@ -1,5 +1,5 @@ // @declaration: true -module rionegrensis { +namespace rionegrensis { export class caniventer extends Lanthanum.nitidus { salomonseni() : caniventer { var x : caniventer; () => { var y = this; }; return x; } uchidai() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; } @@ -15,7 +15,7 @@ module rionegrensis { nivicola() : samarensis.pallidus { var x : samarensis.pallidus; () => { var y = this; }; return x; } } } -module julianae { +namespace julianae { export class steerii { } export class nudicaudus { @@ -100,13 +100,13 @@ module julianae { phrudus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; } } } -module ruatanica { +namespace ruatanica { export class hector { humulis() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; } eurycerus() : panamensis.linulus, lavali.wilsoni> { var x : panamensis.linulus, lavali.wilsoni>; () => { var y = this; }; return x; } } } -module Lanthanum { +namespace Lanthanum { export class suillus { spilosoma() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; } tumbalensis() : caurinus.megaphyllus { var x : caurinus.megaphyllus; () => { var y = this; }; return x; } @@ -151,7 +151,7 @@ module Lanthanum { ileile() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; } } } -module rendalli { +namespace rendalli { export class zuluensis extends julianae.steerii { telfairi() : argurus.wetmorei { var x : argurus.wetmorei; () => { var y = this; }; return x; } keyensis() : quasiater.wattsi { var x : quasiater.wattsi; () => { var y = this; }; return x; } @@ -186,7 +186,7 @@ module rendalli { edax() : lutreolus.cor>, rionegrensis.caniventer> { var x : lutreolus.cor>, rionegrensis.caniventer>; () => { var y = this; }; return x; } } } -module trivirgatus { +namespace trivirgatus { export class tumidifrons { nivalis() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; } vestitus() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; } @@ -236,7 +236,7 @@ module trivirgatus { ralli() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; } } } -module quasiater { +namespace quasiater { export class bobrinskoi { crassicaudatus() : samarensis.cahirinus { var x : samarensis.cahirinus; () => { var y = this; }; return x; } mulatta() : argurus.oreas { var x : argurus.oreas; () => { var y = this; }; return x; } @@ -244,7 +244,7 @@ module quasiater { Copper() : argurus.netscheri { var x : argurus.netscheri; () => { var y = this; }; return x; } } } -module ruatanica { +namespace ruatanica { export class americanus extends imperfecta.ciliolabrum { nasoloi() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; } mystacalis() : howi.angulatus { var x : howi.angulatus; () => { var y = this; }; return x; } @@ -252,7 +252,7 @@ module ruatanica { tumidus() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; } } } -module lavali { +namespace lavali { export class wilsoni extends Lanthanum.nitidus { setiger() : nigra.thalia { var x : nigra.thalia; () => { var y = this; }; return x; } lorentzii() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; } @@ -314,7 +314,7 @@ module lavali { aequalis() : sagitta.cinereus>, petrophilus.minutilla>, Lanthanum.jugularis> { var x : sagitta.cinereus>, petrophilus.minutilla>, Lanthanum.jugularis>; () => { var y = this; }; return x; } } } -module dogramacii { +namespace dogramacii { export class robustulus extends lavali.wilsoni { fossor() : minutus.inez { var x : minutus.inez; () => { var y = this; }; return x; } humboldti() : sagitta.cinereus { var x : sagitta.cinereus; () => { var y = this; }; return x; } @@ -355,7 +355,7 @@ module dogramacii { erythromos() : caurinus.johorensis, nigra.dolichurus> { var x : caurinus.johorensis, nigra.dolichurus>; () => { var y = this; }; return x; } } } -module lutreolus { +namespace lutreolus { export class schlegeli extends lavali.beisa { mittendorfi() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; } blicki() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; } @@ -373,7 +373,7 @@ module lutreolus { dispar() : panamensis.linulus { var x : panamensis.linulus; () => { var y = this; }; return x; } } } -module argurus { +namespace argurus { export class dauricus { chinensis() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; } duodecimcostatus() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; } @@ -388,7 +388,7 @@ module argurus { misionensis() : macrorhinos.marmosurus, gabriellae.echinatus> { var x : macrorhinos.marmosurus, gabriellae.echinatus>; () => { var y = this; }; return x; } } } -module nigra { +namespace nigra { export class dolichurus { solomonis() : panglima.abidi, argurus.netscheri, julianae.oralis>>> { var x : panglima.abidi, argurus.netscheri, julianae.oralis>>>; () => { var y = this; }; return x; } alfredi() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; } @@ -400,7 +400,7 @@ module nigra { sagei() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; } } } -module panglima { +namespace panglima { export class amphibius extends caurinus.johorensis, Lanthanum.jugularis> { bottegi(): macrorhinos.marmosurus, gabriellae.echinatus>, sagitta.stolzmanni> { var x: macrorhinos.marmosurus, gabriellae.echinatus>, sagitta.stolzmanni>; () => { var y = this; }; return x; } jerdoni(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; } @@ -422,7 +422,7 @@ module panglima { ega(): imperfecta.lasiurus> { var x: imperfecta.lasiurus>; () => { var y = this; }; return x; } } } -module quasiater { +namespace quasiater { export class carolinensis { concinna(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; } aeneus(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; } @@ -433,7 +433,7 @@ module quasiater { patrizii(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; } } } -module minutus { +namespace minutus { export class himalayana extends lutreolus.punicus { simoni(): argurus.netscheri> { var x: argurus.netscheri>; () => { var y = this; }; return x; } lobata(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; } @@ -449,7 +449,7 @@ module minutus { olympus(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; } } } -module caurinus { +namespace caurinus { export class mahaganus extends panglima.fundatus { martiniquensis(): ruatanica.hector>> { var x: ruatanica.hector>>; () => { var y = this; }; return x; } devius(): samarensis.pelurus, trivirgatus.falconeri>> { var x: samarensis.pelurus, trivirgatus.falconeri>>; () => { var y = this; }; return x; } @@ -461,21 +461,21 @@ module caurinus { acticola(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; } } } -module macrorhinos { +namespace macrorhinos { export class marmosurus { tansaniana(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; } } } -module howi { +namespace howi { export class angulatus extends sagitta.stolzmanni { pennatus(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; } } } -module daubentonii { +namespace daubentonii { export class nesiotes { } } -module nigra { +namespace nigra { export class thalia { dichotomus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } arnuxii(): panamensis.linulus, lavali.beisa> { var x: panamensis.linulus, lavali.beisa>; () => { var y = this; }; return x; } @@ -487,21 +487,21 @@ module nigra { brucei(): chrysaeolus.sarasinorum { var x: chrysaeolus.sarasinorum; () => { var y = this; }; return x; } } } -module sagitta { +namespace sagitta { export class walkeri extends minutus.portoricensis { maracajuensis(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } } } -module minutus { +namespace minutus { export class inez extends samarensis.pelurus { vexillaris(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } } } -module macrorhinos { +namespace macrorhinos { export class konganensis extends imperfecta.lasiurus { } } -module panamensis { +namespace panamensis { export class linulus extends ruatanica.hector> { goslingi(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } taki(): patas.uralensis { var x: patas.uralensis; () => { var y = this; }; return x; } @@ -514,7 +514,7 @@ module panamensis { gomantongensis(): rionegrensis.veraecrucis> { var x: rionegrensis.veraecrucis>; () => { var y = this; }; return x; } } } -module nigra { +namespace nigra { export class gracilis { weddellii(): nigra.dolichurus { var x: nigra.dolichurus; () => { var y = this; }; return x; } echinothrix(): Lanthanum.nitidus, argurus.oreas> { var x: Lanthanum.nitidus, argurus.oreas>; () => { var y = this; }; return x; } @@ -531,7 +531,7 @@ module nigra { ramirohitra(): panglima.amphibius { var x: panglima.amphibius; () => { var y = this; }; return x; } } } -module samarensis { +namespace samarensis { export class pelurus extends sagitta.stolzmanni { Palladium(): panamensis.linulus { var x: panamensis.linulus; () => { var y = this; }; return x; } castanea(): argurus.netscheri, julianae.oralis> { var x: argurus.netscheri, julianae.oralis>; () => { var y = this; }; return x; } @@ -577,7 +577,7 @@ module samarensis { saussurei(): rendalli.crenulata, argurus.netscheri, julianae.oralis>> { var x: rendalli.crenulata, argurus.netscheri, julianae.oralis>>; () => { var y = this; }; return x; } } } -module sagitta { +namespace sagitta { export class leptoceros extends caurinus.johorensis> { victus(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; } hoplomyoides(): panglima.fundatus, nigra.gracilis> { var x: panglima.fundatus, nigra.gracilis>; () => { var y = this; }; return x; } @@ -586,23 +586,23 @@ module sagitta { bolami(): trivirgatus.tumidifrons { var x: trivirgatus.tumidifrons; () => { var y = this; }; return x; } } } -module daubentonii { +namespace daubentonii { export class nigricans extends sagitta.stolzmanni { woosnami(): dogramacii.robustulus { var x: dogramacii.robustulus; () => { var y = this; }; return x; } } } -module dammermani { +namespace dammermani { export class siberu { } } -module argurus { +namespace argurus { export class pygmaea extends rendalli.moojeni { pajeros(): gabriellae.echinatus { var x: gabriellae.echinatus; () => { var y = this; }; return x; } capucinus(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; } cuvieri(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; } } } -module chrysaeolus { +namespace chrysaeolus { export class sarasinorum extends caurinus.psilurus { belzebul(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; } hinpoon(): nigra.caucasica { var x: nigra.caucasica; () => { var y = this; }; return x; } @@ -613,7 +613,7 @@ module chrysaeolus { princeps(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; } } } -module argurus { +namespace argurus { export class wetmorei { leucoptera(): petrophilus.rosalia { var x: petrophilus.rosalia; () => { var y = this; }; return x; } ochraventer(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; } @@ -624,7 +624,7 @@ module argurus { mayori(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; } } } -module argurus { +namespace argurus { export class oreas extends lavali.wilsoni { salamonis(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; } paniscus(): ruatanica.Praseodymium { var x: ruatanica.Praseodymium; () => { var y = this; }; return x; } @@ -636,7 +636,7 @@ module argurus { univittatus(): argurus.peninsulae { var x: argurus.peninsulae; () => { var y = this; }; return x; } } } -module daubentonii { +namespace daubentonii { export class arboreus { capreolus(): rendalli.crenulata, lavali.wilsoni> { var x: rendalli.crenulata, lavali.wilsoni>; () => { var y = this; }; return x; } moreni(): panglima.abidi { var x: panglima.abidi; () => { var y = this; }; return x; } @@ -652,7 +652,7 @@ module daubentonii { tianshanica(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; } } } -module patas { +namespace patas { export class uralensis { cartilagonodus(): Lanthanum.nitidus { var x: Lanthanum.nitidus; () => { var y = this; }; return x; } pyrrhinus(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; } @@ -669,19 +669,19 @@ module patas { albiventer(): rendalli.crenulata { var x: rendalli.crenulata; () => { var y = this; }; return x; } } } -module provocax { +namespace provocax { export class melanoleuca extends lavali.wilsoni { Neodymium(): macrorhinos.marmosurus, lutreolus.foina> { var x: macrorhinos.marmosurus, lutreolus.foina>; () => { var y = this; }; return x; } baeri(): imperfecta.lasiurus { var x: imperfecta.lasiurus; () => { var y = this; }; return x; } } } -module sagitta { +namespace sagitta { export class sicarius { Chlorine(): samarensis.cahirinus, dogramacii.robustulus> { var x: samarensis.cahirinus, dogramacii.robustulus>; () => { var y = this; }; return x; } simulator(): macrorhinos.marmosurus, macrorhinos.marmosurus, gabriellae.echinatus>, sagitta.stolzmanni>> { var x: macrorhinos.marmosurus, macrorhinos.marmosurus, gabriellae.echinatus>, sagitta.stolzmanni>>; () => { var y = this; }; return x; } } } -module howi { +namespace howi { export class marcanoi extends Lanthanum.megalonyx { formosae(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; } dudui(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; } @@ -699,7 +699,7 @@ module howi { hyaena(): julianae.oralis { var x: julianae.oralis; () => { var y = this; }; return x; } } } -module argurus { +namespace argurus { export class gilbertii { nasutus(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; } poecilops(): julianae.steerii { var x: julianae.steerii; () => { var y = this; }; return x; } @@ -715,11 +715,11 @@ module argurus { amurensis(): daubentonii.arboreus { var x: daubentonii.arboreus; () => { var y = this; }; return x; } } } -module petrophilus { +namespace petrophilus { export class minutilla { } } -module lutreolus { +namespace lutreolus { export class punicus { strandi(): gabriellae.klossii { var x: gabriellae.klossii; () => { var y = this; }; return x; } lar(): caurinus.mahaganus { var x: caurinus.mahaganus; () => { var y = this; }; return x; } @@ -736,7 +736,7 @@ module lutreolus { Helium(): julianae.acariensis { var x: julianae.acariensis; () => { var y = this; }; return x; } } } -module macrorhinos { +namespace macrorhinos { export class daphaenodon { bredanensis(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; } othus(): howi.coludo { var x: howi.coludo; () => { var y = this; }; return x; } @@ -746,7 +746,7 @@ module macrorhinos { callosus(): trivirgatus.lotor { var x: trivirgatus.lotor; () => { var y = this; }; return x; } } } -module sagitta { +namespace sagitta { export class cinereus { zunigae(): rendalli.crenulata> { var x: rendalli.crenulata>; () => { var y = this; }; return x; } microps(): daubentonii.nigricans> { var x: daubentonii.nigricans>; () => { var y = this; }; return x; } @@ -762,11 +762,11 @@ module sagitta { pittieri(): samarensis.fuscus { var x: samarensis.fuscus; () => { var y = this; }; return x; } } } -module nigra { +namespace nigra { export class caucasica { } } -module gabriellae { +namespace gabriellae { export class klossii extends imperfecta.lasiurus { } export class amicus { @@ -785,7 +785,7 @@ module gabriellae { tenuipes(): howi.coludo> { var x: howi.coludo>; () => { var y = this; }; return x; } } } -module imperfecta { +namespace imperfecta { export class lasiurus { marisae(): lavali.thaeleri { var x: lavali.thaeleri; () => { var y = this; }; return x; } fulvus(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; } @@ -813,7 +813,7 @@ module imperfecta { sinicus(): macrorhinos.marmosurus { var x: macrorhinos.marmosurus; () => { var y = this; }; return x; } } } -module quasiater { +namespace quasiater { export class wattsi { lagotis(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; } hussoni(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; } @@ -821,9 +821,9 @@ module quasiater { cabrerae(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; } } } -module butleri { +namespace butleri { } -module petrophilus { +namespace petrophilus { export class sodyi extends quasiater.bobrinskoi { saundersiae(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; } imberbis(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } @@ -836,7 +836,7 @@ module petrophilus { bairdii(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; } } } -module caurinus { +namespace caurinus { export class megaphyllus extends imperfecta.lasiurus> { montana(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; } amatus(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; } @@ -848,14 +848,14 @@ module caurinus { cirrhosus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } } } -module minutus { +namespace minutus { export class portoricensis { relictus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } aequatorianus(): gabriellae.klossii { var x: gabriellae.klossii; () => { var y = this; }; return x; } rhinogradoides(): samarensis.cahirinus { var x: samarensis.cahirinus; () => { var y = this; }; return x; } } } -module lutreolus { +namespace lutreolus { export class foina { tarfayensis(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; } Promethium(): samarensis.pelurus { var x: samarensis.pelurus; () => { var y = this; }; return x; } @@ -872,7 +872,7 @@ module lutreolus { argentiventer(): trivirgatus.mixtus { var x: trivirgatus.mixtus; () => { var y = this; }; return x; } } } -module lutreolus { +namespace lutreolus { export class cor extends panglima.fundatus, lavali.beisa>, dammermani.melanops> { antinorii(): petrophilus.sodyi { var x: petrophilus.sodyi; () => { var y = this; }; return x; } voi(): caurinus.johorensis { var x: caurinus.johorensis; () => { var y = this; }; return x; } @@ -886,19 +886,19 @@ module lutreolus { castroviejoi(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; } } } -module howi { +namespace howi { export class coludo { bernhardi(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; } isseli(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; } } } -module argurus { +namespace argurus { export class germaini extends gabriellae.amicus { sharpei(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; } palmarum(): macrorhinos.marmosurus { var x: macrorhinos.marmosurus; () => { var y = this; }; return x; } } } -module sagitta { +namespace sagitta { export class stolzmanni { riparius(): nigra.dolichurus { var x: nigra.dolichurus; () => { var y = this; }; return x; } dhofarensis(): lutreolus.foina { var x: lutreolus.foina; () => { var y = this; }; return x; } @@ -913,7 +913,7 @@ module sagitta { florium(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; } } } -module dammermani { +namespace dammermani { export class melanops extends minutus.inez { blarina(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; } harwoodi(): rionegrensis.veraecrucis, lavali.wilsoni> { var x: rionegrensis.veraecrucis, lavali.wilsoni>; () => { var y = this; }; return x; } @@ -930,7 +930,7 @@ module dammermani { bocagei(): julianae.albidens { var x: julianae.albidens; () => { var y = this; }; return x; } } } -module argurus { +namespace argurus { export class peninsulae extends patas.uralensis { aitkeni(): trivirgatus.mixtus, panglima.amphibius> { var x: trivirgatus.mixtus, panglima.amphibius>; () => { var y = this; }; return x; } novaeangliae(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; } @@ -942,7 +942,7 @@ module argurus { cavernarum(): minutus.inez { var x: minutus.inez; () => { var y = this; }; return x; } } } -module argurus { +namespace argurus { export class netscheri { gravis(): nigra.caucasica, dogramacii.kaiseri> { var x: nigra.caucasica, dogramacii.kaiseri>; () => { var y = this; }; return x; } ruschii(): imperfecta.lasiurus> { var x: imperfecta.lasiurus>; () => { var y = this; }; return x; } @@ -959,7 +959,7 @@ module argurus { ruemmleri(): panglima.amphibius, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum> { var x: panglima.amphibius, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum>; () => { var y = this; }; return x; } } } -module ruatanica { +namespace ruatanica { export class Praseodymium extends ruatanica.hector { clara(): panglima.amphibius, argurus.dauricus> { var x: panglima.amphibius, argurus.dauricus>; () => { var y = this; }; return x; } spectabilis(): petrophilus.sodyi { var x: petrophilus.sodyi; () => { var y = this; }; return x; } @@ -976,17 +976,17 @@ module ruatanica { soricinus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; } } } -module caurinus { +namespace caurinus { export class johorensis extends lutreolus.punicus { maini(): ruatanica.Praseodymium { var x: ruatanica.Praseodymium; () => { var y = this; }; return x; } } } -module argurus { +namespace argurus { export class luctuosa { loriae(): rendalli.moojeni, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus> { var x: rendalli.moojeni, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus>; () => { var y = this; }; return x; } } } -module panamensis { +namespace panamensis { export class setulosus { duthieae(): caurinus.mahaganus, dogramacii.aurata> { var x: caurinus.mahaganus, dogramacii.aurata>; () => { var y = this; }; return x; } guereza(): howi.coludo { var x: howi.coludo; () => { var y = this; }; return x; } @@ -998,7 +998,7 @@ module panamensis { vampyrus(): julianae.oralis { var x: julianae.oralis; () => { var y = this; }; return x; } } } -module petrophilus { +namespace petrophilus { export class rosalia { palmeri(): panglima.amphibius>, trivirgatus.mixtus, panglima.amphibius>> { var x: panglima.amphibius>, trivirgatus.mixtus, panglima.amphibius>>; () => { var y = this; }; return x; } baeops(): Lanthanum.nitidus { var x: Lanthanum.nitidus; () => { var y = this; }; return x; } @@ -1007,7 +1007,7 @@ module petrophilus { montivaga(): panamensis.setulosus> { var x: panamensis.setulosus>; () => { var y = this; }; return x; } } } -module caurinus { +namespace caurinus { export class psilurus extends lutreolus.punicus { socialis(): panglima.amphibius { var x: panglima.amphibius; () => { var y = this; }; return x; } lundi(): petrophilus.sodyi { var x: petrophilus.sodyi; () => { var y = this; }; return x; } diff --git a/tests/cases/compiler/returnTypeParameterWithModules.ts b/tests/cases/compiler/returnTypeParameterWithModules.ts index 113d45c6df8f2..3b934b6b60408 100644 --- a/tests/cases/compiler/returnTypeParameterWithModules.ts +++ b/tests/cases/compiler/returnTypeParameterWithModules.ts @@ -1,9 +1,9 @@ -module M1 { +namespace M1 { export function reduce(ar, f, e?): Array { return Array.prototype.reduce.apply(ar, e ? [f, e] : [f]); }; }; -module M2 { +namespace M2 { import A = M1 export function compose() { A.reduce(arguments, compose2); diff --git a/tests/cases/compiler/reuseInnerModuleMember.ts b/tests/cases/compiler/reuseInnerModuleMember.ts index e2f9900e73f21..18911203770d0 100644 --- a/tests/cases/compiler/reuseInnerModuleMember.ts +++ b/tests/cases/compiler/reuseInnerModuleMember.ts @@ -1,14 +1,14 @@ // @module: commonjs // @Filename: reuseInnerModuleMember_0.ts -export module M { } +export namespace M { } // @Filename: reuseInnerModuleMember_1.ts /// -declare module bar { +declare namespace bar { interface alpha { } } import f = require('./reuseInnerModuleMember_0'); -module bar { +namespace bar { var x: alpha; } diff --git a/tests/cases/compiler/selfRef.ts b/tests/cases/compiler/selfRef.ts index 1f8a079789c71..1dd2b09907ebd 100644 --- a/tests/cases/compiler/selfRef.ts +++ b/tests/cases/compiler/selfRef.ts @@ -1,5 +1,5 @@ // @lib: es5 -module M +namespace M { export class Test { diff --git a/tests/cases/compiler/semicolonsInModuleDeclarations.ts b/tests/cases/compiler/semicolonsInModuleDeclarations.ts index 97ef92a52e30f..8be37d169863d 100644 --- a/tests/cases/compiler/semicolonsInModuleDeclarations.ts +++ b/tests/cases/compiler/semicolonsInModuleDeclarations.ts @@ -1,4 +1,4 @@ -declare module ambiModule { +declare namespace ambiModule { export interface i1 { }; export interface i2 { } } diff --git a/tests/cases/compiler/separate1-2.ts b/tests/cases/compiler/separate1-2.ts index e649b3efbeaca..504f2330a15cb 100644 --- a/tests/cases/compiler/separate1-2.ts +++ b/tests/cases/compiler/separate1-2.ts @@ -1,3 +1,3 @@ -module X { +namespace X { export function f() { } } \ No newline at end of file diff --git a/tests/cases/compiler/sourceMap-Comments.ts b/tests/cases/compiler/sourceMap-Comments.ts index 6b810858d6e3d..67ea08a43d6d5 100644 --- a/tests/cases/compiler/sourceMap-Comments.ts +++ b/tests/cases/compiler/sourceMap-Comments.ts @@ -1,6 +1,6 @@ // @target: ES5 // @sourcemap: true -module sas.tools { +namespace sas.tools { export class Test { public doX(): void { let f: number = 2; diff --git a/tests/cases/compiler/sourceMap-FileWithComments.ts b/tests/cases/compiler/sourceMap-FileWithComments.ts index 5dcf602c3de91..6d2e940de85ba 100644 --- a/tests/cases/compiler/sourceMap-FileWithComments.ts +++ b/tests/cases/compiler/sourceMap-FileWithComments.ts @@ -7,7 +7,7 @@ interface IPoint { } // Module -module Shapes { +namespace Shapes { // Class export class Point implements IPoint { diff --git a/tests/cases/compiler/sourceMap-StringLiteralWithNewLine.ts b/tests/cases/compiler/sourceMap-StringLiteralWithNewLine.ts index a4103a0b62c25..1f800cf995aaa 100644 --- a/tests/cases/compiler/sourceMap-StringLiteralWithNewLine.ts +++ b/tests/cases/compiler/sourceMap-StringLiteralWithNewLine.ts @@ -9,7 +9,7 @@ interface Window { } declare var window: Window; -module Foo { +namespace Foo { var x = "test1"; var y = "test 2\ isn't this a lot of fun"; diff --git a/tests/cases/compiler/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts b/tests/cases/compiler/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts index d12e894b0a9ea..707fec23b70ec 100644 --- a/tests/cases/compiler/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts +++ b/tests/cases/compiler/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts @@ -1,5 +1,5 @@ //@sourceMap: true -module Q { +namespace Q { function P() { // Test this var a = 1; diff --git a/tests/cases/compiler/sourceMapSample.ts b/tests/cases/compiler/sourceMapSample.ts index 3161ca8c8f7b2..c23e8b85f7db0 100644 --- a/tests/cases/compiler/sourceMapSample.ts +++ b/tests/cases/compiler/sourceMapSample.ts @@ -1,5 +1,5 @@ // @sourcemap: true -module Foo.Bar { +namespace Foo.Bar { "use strict"; class Greeter { diff --git a/tests/cases/compiler/sourceMapValidationClasses.ts b/tests/cases/compiler/sourceMapValidationClasses.ts index ce27571c3fc41..87c5b236cb5a1 100644 --- a/tests/cases/compiler/sourceMapValidationClasses.ts +++ b/tests/cases/compiler/sourceMapValidationClasses.ts @@ -1,5 +1,5 @@ // @sourcemap: true -module Foo.Bar { +namespace Foo.Bar { "use strict"; class Greeter { diff --git a/tests/cases/compiler/sourceMapValidationImport.ts b/tests/cases/compiler/sourceMapValidationImport.ts index 70633de7a74d4..2987ccf2485a0 100644 --- a/tests/cases/compiler/sourceMapValidationImport.ts +++ b/tests/cases/compiler/sourceMapValidationImport.ts @@ -1,6 +1,6 @@ //@module: commonjs // @sourcemap: true -export module m { +export namespace m { export class c { } } diff --git a/tests/cases/compiler/sourceMapValidationModule.ts b/tests/cases/compiler/sourceMapValidationModule.ts index 8617d26a5b243..2ec0311b18afa 100644 --- a/tests/cases/compiler/sourceMapValidationModule.ts +++ b/tests/cases/compiler/sourceMapValidationModule.ts @@ -1,10 +1,10 @@ // @sourcemap: true -module m2 { +namespace m2 { var a = 10; a++; } -module m3 { - module m4 { +namespace m3 { + namespace m4 { export var x = 30; } diff --git a/tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts b/tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts index 3705ade75c7f1..26f56667016a2 100644 --- a/tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts +++ b/tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts @@ -1,7 +1,7 @@ // @outFile: fooResult.js // @sourcemap: true // @Filename: a.ts -module M { +namespace M { export var X = 1; } interface Navigator { @@ -12,7 +12,7 @@ interface Navigator { } // @Filename: b.ts -module m1 { +namespace m1 { export class c1 { } } diff --git a/tests/cases/compiler/sourcemapValidationDuplicateNames.ts b/tests/cases/compiler/sourcemapValidationDuplicateNames.ts index 7d928054a2d2f..f2949f46be1ad 100644 --- a/tests/cases/compiler/sourcemapValidationDuplicateNames.ts +++ b/tests/cases/compiler/sourcemapValidationDuplicateNames.ts @@ -1,9 +1,9 @@ // @sourcemap: true -module m1 { +namespace m1 { var x = 10; export class c { } } -module m1 { +namespace m1 { var b = new m1.c(); } \ No newline at end of file diff --git a/tests/cases/compiler/specializationOfExportedClass.ts b/tests/cases/compiler/specializationOfExportedClass.ts index 8efe07276c1e7..3e4bff613023f 100644 --- a/tests/cases/compiler/specializationOfExportedClass.ts +++ b/tests/cases/compiler/specializationOfExportedClass.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export class C { } diff --git a/tests/cases/compiler/spellingSuggestionModule.ts b/tests/cases/compiler/spellingSuggestionModule.ts index 4b3078630d41f..464b0e5ae2445 100644 --- a/tests/cases/compiler/spellingSuggestionModule.ts +++ b/tests/cases/compiler/spellingSuggestionModule.ts @@ -4,5 +4,5 @@ foobar; declare module 'barfoo' { export const x: number; } barfoo; -declare module farboo { export const x: number; } +declare namespace farboo { export const x: number; } faroo; diff --git a/tests/cases/compiler/staticMemberExportAccess.ts b/tests/cases/compiler/staticMemberExportAccess.ts index bdb26427efb14..e508d10b7fe3f 100644 --- a/tests/cases/compiler/staticMemberExportAccess.ts +++ b/tests/cases/compiler/staticMemberExportAccess.ts @@ -4,7 +4,7 @@ class Sammy { return -1; } } -module Sammy { +namespace Sammy { export var x = 1; } interface JQueryStatic { diff --git a/tests/cases/compiler/staticMethodReferencingTypeArgument1.ts b/tests/cases/compiler/staticMethodReferencingTypeArgument1.ts index 9c68687c71ccf..f81238170c9a5 100644 --- a/tests/cases/compiler/staticMethodReferencingTypeArgument1.ts +++ b/tests/cases/compiler/staticMethodReferencingTypeArgument1.ts @@ -1,4 +1,4 @@ -module Editor { +namespace Editor { export class List { next: List; prev: List; diff --git a/tests/cases/compiler/statics.ts b/tests/cases/compiler/statics.ts index 5d87a6832f12e..ffb0b195fd04b 100644 --- a/tests/cases/compiler/statics.ts +++ b/tests/cases/compiler/statics.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export class C { x: number; constructor(public c1: number, public c2: number, c3: number) { diff --git a/tests/cases/compiler/staticsNotInScopeInClodule.ts b/tests/cases/compiler/staticsNotInScopeInClodule.ts index dc7143f556523..a5f0fba75dbb3 100644 --- a/tests/cases/compiler/staticsNotInScopeInClodule.ts +++ b/tests/cases/compiler/staticsNotInScopeInClodule.ts @@ -2,6 +2,6 @@ class Clod { static x = 10; } -module Clod { +namespace Clod { var p = x; // x isn't in scope here } \ No newline at end of file diff --git a/tests/cases/compiler/strictModeReservedWordInModuleDeclaration.ts b/tests/cases/compiler/strictModeReservedWordInModuleDeclaration.ts index 24c4b7d617726..3f98e6fedf515 100644 --- a/tests/cases/compiler/strictModeReservedWordInModuleDeclaration.ts +++ b/tests/cases/compiler/strictModeReservedWordInModuleDeclaration.ts @@ -1,6 +1,6 @@ -"use strict" -module public { } -module private { } -module public.whatever { -} -module private.public.foo { } \ No newline at end of file +"use strict" +namespace public { } +namespace private { } +namespace public.whatever { +} +namespace private.public.foo { } \ No newline at end of file diff --git a/tests/cases/compiler/stringLiteralObjectLiteralDeclaration1.ts b/tests/cases/compiler/stringLiteralObjectLiteralDeclaration1.ts index 2d88a86f791ca..9752f928c48fe 100644 --- a/tests/cases/compiler/stringLiteralObjectLiteralDeclaration1.ts +++ b/tests/cases/compiler/stringLiteralObjectLiteralDeclaration1.ts @@ -1,4 +1,4 @@ // @declaration: true -module m1 { +namespace m1 { export var n = { 'foo bar': 4 }; } diff --git a/tests/cases/compiler/structural1.ts b/tests/cases/compiler/structural1.ts index b07c2f2252c0c..c4417057140c0 100644 --- a/tests/cases/compiler/structural1.ts +++ b/tests/cases/compiler/structural1.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export interface I { salt:number; pepper:number; diff --git a/tests/cases/compiler/structuralTypeInDeclareFileForModule.ts b/tests/cases/compiler/structuralTypeInDeclareFileForModule.ts index abc833d839a9b..12aec8fedfc6d 100644 --- a/tests/cases/compiler/structuralTypeInDeclareFileForModule.ts +++ b/tests/cases/compiler/structuralTypeInDeclareFileForModule.ts @@ -1,4 +1,4 @@ // @declaration: true -module M { export var x; } +namespace M { export var x; } var m = M; \ No newline at end of file diff --git a/tests/cases/compiler/super1.ts b/tests/cases/compiler/super1.ts index f4b509a9cb7fe..c982bc89e69ee 100644 --- a/tests/cases/compiler/super1.ts +++ b/tests/cases/compiler/super1.ts @@ -44,7 +44,7 @@ class SubE3 extends Base3 { } // Case 4 -module Base4 { +namespace Base4 { class Sub4 { public x(){ return "hello"; diff --git a/tests/cases/compiler/superAccessInFatArrow1.ts b/tests/cases/compiler/superAccessInFatArrow1.ts index 077a9659a2504..a0125ad58e9aa 100644 --- a/tests/cases/compiler/superAccessInFatArrow1.ts +++ b/tests/cases/compiler/superAccessInFatArrow1.ts @@ -1,4 +1,4 @@ -module test { +namespace test { export class A { foo() { } diff --git a/tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts b/tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts index f472736c35f1d..b585ef890c784 100644 --- a/tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts +++ b/tests/cases/compiler/super_inside-object-literal-getters-and-setters.ts @@ -1,4 +1,4 @@ -module ObjectLiteral { +namespace ObjectLiteral { var ThisInObjectLiteral = { _foo: '1', get foo(): string { diff --git a/tests/cases/compiler/systemDefaultImportCallable.ts b/tests/cases/compiler/systemDefaultImportCallable.ts index a0ea02823c31b..88690f191aea2 100644 --- a/tests/cases/compiler/systemDefaultImportCallable.ts +++ b/tests/cases/compiler/systemDefaultImportCallable.ts @@ -1,15 +1,15 @@ -// @module: system -// @filename: core-js.d.ts -declare module core { - var String: { - repeat(text: string, count: number): string; - }; -} -declare module "core-js/fn/string/repeat" { - var repeat: typeof core.String.repeat; - export default repeat; -} -// @filename: greeter.ts -import repeat from "core-js/fn/string/repeat"; - +// @module: system +// @filename: core-js.d.ts +declare namespace core { + var String: { + repeat(text: string, count: number): string; + }; +} +declare module "core-js/fn/string/repeat" { + var repeat: typeof core.String.repeat; + export default repeat; +} +// @filename: greeter.ts +import repeat from "core-js/fn/string/repeat"; + const _: string = repeat(new Date().toUTCString() + " ", 2); \ No newline at end of file diff --git a/tests/cases/compiler/systemModule7.ts b/tests/cases/compiler/systemModule7.ts index bb22822d0d1a9..62e3110e273bf 100644 --- a/tests/cases/compiler/systemModule7.ts +++ b/tests/cases/compiler/systemModule7.ts @@ -1,11 +1,11 @@ // @module: system // filename: instantiatedModule.ts -export module M { +export namespace M { var x = 1; } // filename: nonInstantiatedModule.ts -export module M { +export namespace M { interface I {} } \ No newline at end of file diff --git a/tests/cases/compiler/systemModuleAmbientDeclarations.ts b/tests/cases/compiler/systemModuleAmbientDeclarations.ts index 690d0c65c1346..5cc0bb98b1e48 100644 --- a/tests/cases/compiler/systemModuleAmbientDeclarations.ts +++ b/tests/cases/compiler/systemModuleAmbientDeclarations.ts @@ -25,4 +25,4 @@ export declare var v: number; export declare enum E {X = 1} // @filename: file6.ts -export declare module M { var v: number; } +export declare namespace M { var v: number; } diff --git a/tests/cases/compiler/systemModuleConstEnums.ts b/tests/cases/compiler/systemModuleConstEnums.ts index 6ad7f31ef912b..c3e37e3dbccd7 100644 --- a/tests/cases/compiler/systemModuleConstEnums.ts +++ b/tests/cases/compiler/systemModuleConstEnums.ts @@ -8,6 +8,6 @@ export function foo() { use(M.NonTopLevelConstEnum.X); } -module M { +namespace M { export const enum NonTopLevelConstEnum { X } } \ No newline at end of file diff --git a/tests/cases/compiler/systemModuleConstEnumsSeparateCompilation.ts b/tests/cases/compiler/systemModuleConstEnumsSeparateCompilation.ts index 3813017639fc4..0a50934847cd4 100644 --- a/tests/cases/compiler/systemModuleConstEnumsSeparateCompilation.ts +++ b/tests/cases/compiler/systemModuleConstEnumsSeparateCompilation.ts @@ -9,6 +9,6 @@ export function foo() { use(M.NonTopLevelConstEnum.X); } -module M { +namespace M { export const enum NonTopLevelConstEnum { X } } \ No newline at end of file diff --git a/tests/cases/compiler/systemModuleDeclarationMerging.ts b/tests/cases/compiler/systemModuleDeclarationMerging.ts index ae8b3a8dd0b25..d0007a7ff2ef4 100644 --- a/tests/cases/compiler/systemModuleDeclarationMerging.ts +++ b/tests/cases/compiler/systemModuleDeclarationMerging.ts @@ -2,10 +2,10 @@ // @isolatedModules: true export function F() {} -export module F { var x; } +export namespace F { var x; } export class C {} -export module C { var x; } +export namespace C { var x; } export enum E {} -export module E { var x; } \ No newline at end of file +export namespace E { var x; } \ No newline at end of file diff --git a/tests/cases/compiler/systemModuleNonTopLevelModuleMembers.ts b/tests/cases/compiler/systemModuleNonTopLevelModuleMembers.ts index b5617970339c1..cfe759919adc1 100644 --- a/tests/cases/compiler/systemModuleNonTopLevelModuleMembers.ts +++ b/tests/cases/compiler/systemModuleNonTopLevelModuleMembers.ts @@ -2,13 +2,13 @@ // @isolatedModules: true export class TopLevelClass {} -export module TopLevelModule {var v;} +export namespace TopLevelModule {var v;} export function TopLevelFunction(): void {} export enum TopLevelEnum {E} -export module TopLevelModule2 { +export namespace TopLevelModule2 { export class NonTopLevelClass {} - export module NonTopLevelModule {var v;} + export namespace NonTopLevelModule {var v;} export function NonTopLevelFunction(): void {} export enum NonTopLevelEnum {E} } \ No newline at end of file diff --git a/tests/cases/compiler/testContainerList.ts b/tests/cases/compiler/testContainerList.ts index 29a4fbd206c11..f1ff9e72a0e3d 100644 --- a/tests/cases/compiler/testContainerList.ts +++ b/tests/cases/compiler/testContainerList.ts @@ -1,5 +1,5 @@ // Regression test for #325 -module A { +namespace A { class C { constructor(public d: {}) { } } diff --git a/tests/cases/compiler/thisAssignmentInNamespaceDeclaration1.ts b/tests/cases/compiler/thisAssignmentInNamespaceDeclaration1.ts index 4f17a3432d43b..46cd5bb19ad91 100644 --- a/tests/cases/compiler/thisAssignmentInNamespaceDeclaration1.ts +++ b/tests/cases/compiler/thisAssignmentInNamespaceDeclaration1.ts @@ -2,7 +2,7 @@ // @outDir: out/ // @filename: a.js -module foo { +namespace foo { this.bar = 4; } diff --git a/tests/cases/compiler/thisBinding.ts b/tests/cases/compiler/thisBinding.ts index 3381694d4dfb7..86a5bc89aa0e9 100644 --- a/tests/cases/compiler/thisBinding.ts +++ b/tests/cases/compiler/thisBinding.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export interface I { z; } diff --git a/tests/cases/compiler/thisInModule.ts b/tests/cases/compiler/thisInModule.ts index 5d89fae1ca1ea..a96a674edcbc9 100644 --- a/tests/cases/compiler/thisInModule.ts +++ b/tests/cases/compiler/thisInModule.ts @@ -1,4 +1,4 @@ -module myMod { +namespace myMod { var x; this.x = 5; } \ No newline at end of file diff --git a/tests/cases/compiler/thisInModuleFunction1.ts b/tests/cases/compiler/thisInModuleFunction1.ts index a265cd80a56eb..8568f1c84e513 100644 --- a/tests/cases/compiler/thisInModuleFunction1.ts +++ b/tests/cases/compiler/thisInModuleFunction1.ts @@ -1,4 +1,4 @@ -module bar { +namespace bar { export function bar() { return this; } diff --git a/tests/cases/compiler/thisKeyword.ts b/tests/cases/compiler/thisKeyword.ts index cb0a4a4cc842f..c625fe8776b4b 100644 --- a/tests/cases/compiler/thisKeyword.ts +++ b/tests/cases/compiler/thisKeyword.ts @@ -1,3 +1,3 @@ -module foo { +namespace foo { this.bar = 4; } \ No newline at end of file diff --git a/tests/cases/compiler/this_inside-enum-should-not-be-allowed.ts b/tests/cases/compiler/this_inside-enum-should-not-be-allowed.ts index e47e0d885eb7c..4dff237959ee9 100644 --- a/tests/cases/compiler/this_inside-enum-should-not-be-allowed.ts +++ b/tests/cases/compiler/this_inside-enum-should-not-be-allowed.ts @@ -2,7 +2,7 @@ enum TopLevelEnum { ThisWasAllowedButShouldNotBe = this // Should not be allowed } -module ModuleEnum { +namespace ModuleEnum { enum EnumInModule { WasADifferentError = this // this was handled as if this was in a module } diff --git a/tests/cases/compiler/this_inside-object-literal-getters-and-setters.ts b/tests/cases/compiler/this_inside-object-literal-getters-and-setters.ts index d23c2e5745fab..18fc3e6ac1855 100644 --- a/tests/cases/compiler/this_inside-object-literal-getters-and-setters.ts +++ b/tests/cases/compiler/this_inside-object-literal-getters-and-setters.ts @@ -1,4 +1,4 @@ -module ObjectLiteral { +namespace ObjectLiteral { var ThisInObjectLiteral = { _foo: '1', get foo(): string { diff --git a/tests/cases/compiler/topLevel.ts b/tests/cases/compiler/topLevel.ts index 8a755a1dfba33..f65df62a850ea 100644 --- a/tests/cases/compiler/topLevel.ts +++ b/tests/cases/compiler/topLevel.ts @@ -18,7 +18,7 @@ class Point implements IPoint { var result=""; result+=(new Point(3,4).move(2,2)); -module M { +namespace M { export var origin=new Point(0,0); } diff --git a/tests/cases/compiler/topLevelLambda.ts b/tests/cases/compiler/topLevelLambda.ts index c7d5945066f7d..32172be6cd10d 100644 --- a/tests/cases/compiler/topLevelLambda.ts +++ b/tests/cases/compiler/topLevelLambda.ts @@ -1,3 +1,3 @@ -module M { +namespace M { var f = () => {this.window;} } diff --git a/tests/cases/compiler/typeAliasDoesntMakeModuleInstantiated.ts b/tests/cases/compiler/typeAliasDoesntMakeModuleInstantiated.ts index 89faf9e45159e..5a16c751cc68e 100644 --- a/tests/cases/compiler/typeAliasDoesntMakeModuleInstantiated.ts +++ b/tests/cases/compiler/typeAliasDoesntMakeModuleInstantiated.ts @@ -1,4 +1,4 @@ -declare module m { +declare namespace m { // type alias declaration here shouldnt make the module declaration instantiated type Selector = string| string[] |Function; diff --git a/tests/cases/compiler/typeResolution.ts b/tests/cases/compiler/typeResolution.ts index 8c87c0cdfe252..34832a8d9b2de 100644 --- a/tests/cases/compiler/typeResolution.ts +++ b/tests/cases/compiler/typeResolution.ts @@ -1,8 +1,8 @@ //@module: amd // @sourcemap: true -export module TopLevelModule1 { - export module SubModule1 { - export module SubSubModule1 { +export namespace TopLevelModule1 { + export namespace SubModule1 { + export namespace SubSubModule1 { export class ClassA { public AisIn1_1_1() { // Try all qualified names of this type @@ -75,8 +75,8 @@ export module TopLevelModule1 { } } - export module SubModule2 { - export module SubSubModule2 { + export namespace SubModule2 { + export namespace SubSubModule2 { // No code here since these are the mirror of the above calls export class ClassA { public AisIn1_2_2() { } } export class ClassB { public BisIn1_2_2() { } } @@ -96,13 +96,13 @@ export module TopLevelModule1 { YisIn1(); } - module NotExportedModule { + namespace NotExportedModule { export class ClassA { } } } -module TopLevelModule2 { - export module SubModule3 { +namespace TopLevelModule2 { + export namespace SubModule3 { export class ClassA { public AisIn2_3() { } } diff --git a/tests/cases/compiler/typeValueConflict1.ts b/tests/cases/compiler/typeValueConflict1.ts index 96be66ded0447..bc60a91a395cb 100644 --- a/tests/cases/compiler/typeValueConflict1.ts +++ b/tests/cases/compiler/typeValueConflict1.ts @@ -1,8 +1,8 @@ -module M1 { +namespace M1 { export class A { } } -module M2 { +namespace M2 { var M1 = 0; // Should error. M1 should bind to the variable, not to the module. class B extends M1.A { diff --git a/tests/cases/compiler/typeValueConflict2.ts b/tests/cases/compiler/typeValueConflict2.ts index 67c149bed557d..83c6e3cd6596b 100644 --- a/tests/cases/compiler/typeValueConflict2.ts +++ b/tests/cases/compiler/typeValueConflict2.ts @@ -1,16 +1,16 @@ -module M1 { +namespace M1 { export class A { constructor(a: T) { } } } -module M2 { +namespace M2 { var M1 = 0; // Should error. M1 should bind to the variable, not to the module. class B extends M1.A { } } -module M3 { +namespace M3 { // Shouldn't error class B extends M1.A { } diff --git a/tests/cases/compiler/typeofInternalModules.ts b/tests/cases/compiler/typeofInternalModules.ts index b7f7508b7afc8..7b29c76813dff 100644 --- a/tests/cases/compiler/typeofInternalModules.ts +++ b/tests/cases/compiler/typeofInternalModules.ts @@ -1,8 +1,8 @@ -module Outer { - export module instantiated { +namespace Outer { + export namespace instantiated { export class C { } } - export module uninstantiated { + export namespace uninstantiated { export interface P { } } } diff --git a/tests/cases/compiler/undeclaredBase.ts b/tests/cases/compiler/undeclaredBase.ts index 8852a5b4355d5..ad07d58f57502 100644 --- a/tests/cases/compiler/undeclaredBase.ts +++ b/tests/cases/compiler/undeclaredBase.ts @@ -1,2 +1,2 @@ -module M { export class C extends M.I { } } +namespace M { export class C extends M.I { } } diff --git a/tests/cases/compiler/undeclaredMethod.ts b/tests/cases/compiler/undeclaredMethod.ts index 184102087a8b0..8b1b486266b2b 100644 --- a/tests/cases/compiler/undeclaredMethod.ts +++ b/tests/cases/compiler/undeclaredMethod.ts @@ -1,5 +1,5 @@ -module M { +namespace M { export class C { public salt() {} } diff --git a/tests/cases/compiler/underscoreMapFirst.ts b/tests/cases/compiler/underscoreMapFirst.ts index e50cb508b4575..2f6af6fb4fc7c 100644 --- a/tests/cases/compiler/underscoreMapFirst.ts +++ b/tests/cases/compiler/underscoreMapFirst.ts @@ -1,4 +1,4 @@ -declare module _ { +declare namespace _ { interface Collection { } interface List extends Collection { [index: number]: T; diff --git a/tests/cases/compiler/underscoreTest1.ts b/tests/cases/compiler/underscoreTest1.ts index dfe10cf02e288..92e16788e0240 100644 --- a/tests/cases/compiler/underscoreTest1.ts +++ b/tests/cases/compiler/underscoreTest1.ts @@ -29,7 +29,7 @@ interface Tuple4 extends Array { 3: T3; } -module Underscore { +namespace Underscore { export interface WrappedObject { keys(): string[]; values(): any[]; diff --git a/tests/cases/compiler/unexportedInstanceClassVariables.ts b/tests/cases/compiler/unexportedInstanceClassVariables.ts index 1a45b5c0211f0..1d09e27b67638 100644 --- a/tests/cases/compiler/unexportedInstanceClassVariables.ts +++ b/tests/cases/compiler/unexportedInstanceClassVariables.ts @@ -1,10 +1,10 @@ -module M{ +namespace M{ class A{ constructor(val:string){} } } -module M{ +namespace M{ class A {} var a = new A(); diff --git a/tests/cases/compiler/unknownSymbols2.ts b/tests/cases/compiler/unknownSymbols2.ts index 1568863652b73..73b1706ec7060 100644 --- a/tests/cases/compiler/unknownSymbols2.ts +++ b/tests/cases/compiler/unknownSymbols2.ts @@ -1,4 +1,4 @@ -module M { +namespace M { var x: asdf; var y = x + asdf; var z = x; // should be an error @@ -22,7 +22,7 @@ module M { var a = () => asdf; var b = (asdf) => { return qwerty }; - module N { + namespace N { var x = 1; } import c = N; diff --git a/tests/cases/compiler/unspecializedConstraints.ts b/tests/cases/compiler/unspecializedConstraints.ts index dd67a6f00135f..f2d927acea497 100644 --- a/tests/cases/compiler/unspecializedConstraints.ts +++ b/tests/cases/compiler/unspecializedConstraints.ts @@ -1,4 +1,4 @@ -module ts { +namespace ts { interface Map { [index: string]: T; } diff --git a/tests/cases/compiler/unusedClassesinModule1.ts b/tests/cases/compiler/unusedClassesinModule1.ts index 0efc49663882b..37e5c65c5227d 100644 --- a/tests/cases/compiler/unusedClassesinModule1.ts +++ b/tests/cases/compiler/unusedClassesinModule1.ts @@ -1,7 +1,7 @@ //@noUnusedLocals:true //@noUnusedParameters:true -module A { +namespace A { class Calculator { public handelChar() { } diff --git a/tests/cases/compiler/unusedImports10.ts b/tests/cases/compiler/unusedImports10.ts index 1cccfbd38bb49..f7470e29d8d7b 100644 --- a/tests/cases/compiler/unusedImports10.ts +++ b/tests/cases/compiler/unusedImports10.ts @@ -1,13 +1,13 @@ //@noUnusedLocals:true //@noUnusedParameters:true -module A { +namespace A { export class Calculator { public handelChar() { } } } -module B { +namespace B { import a = A; } \ No newline at end of file diff --git a/tests/cases/compiler/unusedModuleInModule.ts b/tests/cases/compiler/unusedModuleInModule.ts index dc5f55398a7b5..2a6a98b900a08 100644 --- a/tests/cases/compiler/unusedModuleInModule.ts +++ b/tests/cases/compiler/unusedModuleInModule.ts @@ -1,6 +1,6 @@ //@noUnusedLocals:true //@noUnusedParameters:true -module A { - module B {} +namespace A { + namespace B {} } \ No newline at end of file diff --git a/tests/cases/compiler/unusedNamespaceInModule.ts b/tests/cases/compiler/unusedNamespaceInModule.ts index adca8a84187ae..8de3768a2014e 100644 --- a/tests/cases/compiler/unusedNamespaceInModule.ts +++ b/tests/cases/compiler/unusedNamespaceInModule.ts @@ -1,7 +1,7 @@ //@noUnusedLocals:true //@noUnusedParameters:true -module A { +namespace A { namespace B { } export namespace C {} } \ No newline at end of file diff --git a/tests/cases/compiler/usingModuleWithExportImportInValuePosition.ts b/tests/cases/compiler/usingModuleWithExportImportInValuePosition.ts index 6a8c3680254e4..4f3588d59bdd1 100644 --- a/tests/cases/compiler/usingModuleWithExportImportInValuePosition.ts +++ b/tests/cases/compiler/usingModuleWithExportImportInValuePosition.ts @@ -1,15 +1,15 @@ -module A { +namespace A { export var x = 'hello world' export class Point { constructor(public x: number, public y: number) { } } - export module B { + export namespace B { export interface Id { name: string; } } } -module C { +namespace C { export import a = A; } diff --git a/tests/cases/compiler/varBlock.ts b/tests/cases/compiler/varBlock.ts index 50ca198633342..5f3121656ba39 100644 --- a/tests/cases/compiler/varBlock.ts +++ b/tests/cases/compiler/varBlock.ts @@ -1,9 +1,9 @@ -module m2 { +namespace m2 { export var a, b2: number = 10, b; } -declare module m3 { +declare namespace m3 { var a, b, c; var a1, b1 = 10; @@ -21,14 +21,14 @@ declare var a2, b2, c2; declare var da = 10; declare var d3, d4 = 10; -module m3 { +namespace m3 { declare var d = 10; declare var d2, d3 = 10, d4 = 10; export declare var dE = 10; export declare var d2E, d3E = 10, d4E = 10; } -declare module m4 { +declare namespace m4 { var d = 10; var d2, d3 = 10, d4 =10; export var dE = 10; diff --git a/tests/cases/compiler/varNameConflictsWithImportInDifferentPartOfModule.ts b/tests/cases/compiler/varNameConflictsWithImportInDifferentPartOfModule.ts index 45d68eb17f42c..7f240962a00b0 100644 --- a/tests/cases/compiler/varNameConflictsWithImportInDifferentPartOfModule.ts +++ b/tests/cases/compiler/varNameConflictsWithImportInDifferentPartOfModule.ts @@ -1,7 +1,7 @@ -module M1 { +namespace M1 { export var q = 5; export var s = ''; } -module M1 { +namespace M1 { export import q = M1.s; // Should be an error but isn't } \ No newline at end of file diff --git a/tests/cases/compiler/vararg.ts b/tests/cases/compiler/vararg.ts index 327b7fac2c3da..f1da4b9f1fd79 100644 --- a/tests/cases/compiler/vararg.ts +++ b/tests/cases/compiler/vararg.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export class C { public f(x:string,...rest:number[]) { var sum=0; diff --git a/tests/cases/compiler/vardecl.ts b/tests/cases/compiler/vardecl.ts index e5b96d6ef6d18..8cdb4c8df225f 100644 --- a/tests/cases/compiler/vardecl.ts +++ b/tests/cases/compiler/vardecl.ts @@ -59,7 +59,7 @@ var d4: { }; } -module m2 { +namespace m2 { export var a, b2: number = 10, b; var m1; diff --git a/tests/cases/compiler/variableDeclaratorResolvedDuringContextualTyping.ts b/tests/cases/compiler/variableDeclaratorResolvedDuringContextualTyping.ts index e794087e01ec4..af0f733837910 100644 --- a/tests/cases/compiler/variableDeclaratorResolvedDuringContextualTyping.ts +++ b/tests/cases/compiler/variableDeclaratorResolvedDuringContextualTyping.ts @@ -1,5 +1,5 @@ // @lib: es5 -module WinJS { +namespace WinJS { export interface ValueCallback { (value: any): any; } @@ -64,7 +64,7 @@ module WinJS { } } -module Services { +namespace Services { export interface IRequestService { /** * Returns the URL that can be used to access the provided service. The optional second argument can @@ -82,14 +82,14 @@ module Services { } } -module Errors { +namespace Errors { export class ConnectionError /* extends Error */ { constructor(request: XMLHttpRequest) { } } } -module Files { +namespace Files { export interface IUploadResult { stat: string; isNew: boolean; diff --git a/tests/cases/compiler/visSyntax.ts b/tests/cases/compiler/visSyntax.ts index 8dda6f91366aa..7c2686e00f7a3 100644 --- a/tests/cases/compiler/visSyntax.ts +++ b/tests/cases/compiler/visSyntax.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export class C { } diff --git a/tests/cases/compiler/withExportDecl.ts b/tests/cases/compiler/withExportDecl.ts index f3c926ad7071a..0b13755c7ad1b 100644 --- a/tests/cases/compiler/withExportDecl.ts +++ b/tests/cases/compiler/withExportDecl.ts @@ -37,18 +37,18 @@ export function exportedFunction() { return simpleFunction(); } -module m1 { +namespace m1 { export function foo() { return "Hello"; } } -export declare module m2 { +export declare namespace m2 { export var a: number; } -export module m3 { +export namespace m3 { export function foo() { return m1.foo(); diff --git a/tests/cases/compiler/withImportDecl.ts b/tests/cases/compiler/withImportDecl.ts index fa21d3f231577..5da2eb17be2a3 100644 --- a/tests/cases/compiler/withImportDecl.ts +++ b/tests/cases/compiler/withImportDecl.ts @@ -32,7 +32,7 @@ function simpleFunction() { }; } -module m1 { +namespace m1 { export function foo() { return "Hello"; } diff --git a/tests/cases/compiler/withStatementErrors.ts b/tests/cases/compiler/withStatementErrors.ts index 163424548c0cd..cf7440822e21c 100644 --- a/tests/cases/compiler/withStatementErrors.ts +++ b/tests/cases/compiler/withStatementErrors.ts @@ -12,6 +12,6 @@ with (ooo.eee.oo.ah_ah.ting.tang.walla.walla) { // error interface I {} // error - module M {} // error + namespace M {} // error } diff --git a/tests/cases/conformance/Symbols/ES5SymbolProperty2.ts b/tests/cases/conformance/Symbols/ES5SymbolProperty2.ts index 6bfce5fc58ddb..58dfe44801310 100644 --- a/tests/cases/conformance/Symbols/ES5SymbolProperty2.ts +++ b/tests/cases/conformance/Symbols/ES5SymbolProperty2.ts @@ -1,5 +1,5 @@ //@target: ES5 -module M { +namespace M { var Symbol: any; export class C { diff --git a/tests/cases/conformance/ambient/ambientDeclarations.ts b/tests/cases/conformance/ambient/ambientDeclarations.ts index 379f5a5440a76..65312ebe82661 100644 --- a/tests/cases/conformance/ambient/ambientDeclarations.ts +++ b/tests/cases/conformance/ambient/ambientDeclarations.ts @@ -52,13 +52,13 @@ declare enum E2 { declare enum E3 { A } -declare module E3 { +declare namespace E3 { var B; } var x = E3.B; // Ambient module -declare module M1 { +declare namespace M1 { var x; function fn(): number; } diff --git a/tests/cases/conformance/ambient/ambientErrors.ts b/tests/cases/conformance/ambient/ambientErrors.ts index 81ee57c6ec944..ea0c92ab4fa37 100644 --- a/tests/cases/conformance/ambient/ambientErrors.ts +++ b/tests/cases/conformance/ambient/ambientErrors.ts @@ -30,7 +30,7 @@ declare enum E2 { } // Ambient module with initializers for values, bodies for functions / classes -declare module M1 { +declare namespace M1 { var x = 3; function fn() { } class C { @@ -43,7 +43,7 @@ declare module M1 { } // Ambient external module not in the global module -module M2 { +namespace M2 { declare module 'nope' { } } diff --git a/tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts b/tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts index 9a7264437297f..37f85249d6c98 100644 --- a/tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts +++ b/tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts @@ -1,3 +1,3 @@ -module M { +namespace M { export declare module "M" { } } \ No newline at end of file diff --git a/tests/cases/conformance/ambient/ambientInsideNonAmbient.ts b/tests/cases/conformance/ambient/ambientInsideNonAmbient.ts index e2f24113c94fa..a1b6cf479226f 100644 --- a/tests/cases/conformance/ambient/ambientInsideNonAmbient.ts +++ b/tests/cases/conformance/ambient/ambientInsideNonAmbient.ts @@ -1,15 +1,15 @@ -module M { +namespace M { export declare var x; export declare function f(); export declare class C { } export declare enum E { } - export declare module M { } + export declare namespace M { } } -module M2 { +namespace M2 { declare var x; declare function f(); declare class C { } declare enum E { } - declare module M { } + declare namespace M { } } \ No newline at end of file diff --git a/tests/cases/conformance/ambient/ambientInsideNonAmbientExternalModule.ts b/tests/cases/conformance/ambient/ambientInsideNonAmbientExternalModule.ts index dbdc315c7432e..937246c92dffb 100644 --- a/tests/cases/conformance/ambient/ambientInsideNonAmbientExternalModule.ts +++ b/tests/cases/conformance/ambient/ambientInsideNonAmbientExternalModule.ts @@ -3,4 +3,4 @@ export declare var x; export declare function f(); export declare class C { } export declare enum E { } -export declare module M { } \ No newline at end of file +export declare namespace M { } \ No newline at end of file diff --git a/tests/cases/conformance/ambient/ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts b/tests/cases/conformance/ambient/ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts index 5871010878546..0332fbcb8f3c8 100644 --- a/tests/cases/conformance/ambient/ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts +++ b/tests/cases/conformance/ambient/ambientModuleDeclarationWithReservedIdentifierInDottedPath.ts @@ -10,4 +10,4 @@ export const tabId = chrome.debugger.tabId; declare module test.class {} -declare module debugger {} // still an error +declare namespace debugger {} // still an error diff --git a/tests/cases/conformance/async/es2017/asyncAwaitIsolatedModules_es2017.ts b/tests/cases/conformance/async/es2017/asyncAwaitIsolatedModules_es2017.ts index c0ab4838f70f2..506f233bc9434 100644 --- a/tests/cases/conformance/async/es2017/asyncAwaitIsolatedModules_es2017.ts +++ b/tests/cases/conformance/async/es2017/asyncAwaitIsolatedModules_es2017.ts @@ -36,6 +36,6 @@ class C { static async m6(): MyPromise { } } -module M { +namespace M { export async function f1() { } } \ No newline at end of file diff --git a/tests/cases/conformance/async/es2017/asyncAwait_es2017.ts b/tests/cases/conformance/async/es2017/asyncAwait_es2017.ts index 7256762788b1b..49ad54f8c515f 100644 --- a/tests/cases/conformance/async/es2017/asyncAwait_es2017.ts +++ b/tests/cases/conformance/async/es2017/asyncAwait_es2017.ts @@ -35,7 +35,7 @@ class C { static async m6(): MyPromise { } } -module M { +namespace M { export async function f1() { } } diff --git a/tests/cases/conformance/async/es5/asyncAwaitIsolatedModules_es5.ts b/tests/cases/conformance/async/es5/asyncAwaitIsolatedModules_es5.ts index 4ee04b2b3e9b5..3f62db2891571 100644 --- a/tests/cases/conformance/async/es5/asyncAwaitIsolatedModules_es5.ts +++ b/tests/cases/conformance/async/es5/asyncAwaitIsolatedModules_es5.ts @@ -37,6 +37,6 @@ class C { static async m6(): MyPromise { } } -module M { +namespace M { export async function f1() { } } \ No newline at end of file diff --git a/tests/cases/conformance/async/es5/asyncAwait_es5.ts b/tests/cases/conformance/async/es5/asyncAwait_es5.ts index 5c33a42ab7467..0254869bfd1c3 100644 --- a/tests/cases/conformance/async/es5/asyncAwait_es5.ts +++ b/tests/cases/conformance/async/es5/asyncAwait_es5.ts @@ -36,7 +36,7 @@ class C { static async m6(): MyPromise { } } -module M { +namespace M { export async function f1() { } } diff --git a/tests/cases/conformance/async/es6/asyncAwaitIsolatedModules_es6.ts b/tests/cases/conformance/async/es6/asyncAwaitIsolatedModules_es6.ts index 8e2cfd8c6c578..9033ec0478c6c 100644 --- a/tests/cases/conformance/async/es6/asyncAwaitIsolatedModules_es6.ts +++ b/tests/cases/conformance/async/es6/asyncAwaitIsolatedModules_es6.ts @@ -36,6 +36,6 @@ class C { static async m6(): MyPromise { } } -module M { +namespace M { export async function f1() { } } \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/asyncAwait_es6.ts b/tests/cases/conformance/async/es6/asyncAwait_es6.ts index 203d748e114e7..e462305f0ab37 100644 --- a/tests/cases/conformance/async/es6/asyncAwait_es6.ts +++ b/tests/cases/conformance/async/es6/asyncAwait_es6.ts @@ -35,7 +35,7 @@ class C { static async m6(): MyPromise { } } -module M { +namespace M { export async function f1() { } } diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractImportInstantiation.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractImportInstantiation.ts index 165a3d7a2e6ce..fa3adef4ac664 100644 --- a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractImportInstantiation.ts +++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractImportInstantiation.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export abstract class A {} new A; diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInAModule.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInAModule.ts index f31dd41436ebb..47beda288b627 100644 --- a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInAModule.ts +++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInAModule.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export abstract class A {} export class B extends A {} } diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts index 6e5686feb2562..71dd571925a89 100644 --- a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts +++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractMergedDeclaration.ts @@ -1,7 +1,7 @@ abstract class CM {} -module CM {} +namespace CM {} -module MC {} +namespace MC {} abstract class MC {} abstract class CI {} diff --git a/tests/cases/conformance/classes/classDeclarations/classAndInterfaceMerge.d.ts b/tests/cases/conformance/classes/classDeclarations/classAndInterfaceMerge.d.ts index 1ef7724f81d30..6cd791ca15b57 100644 --- a/tests/cases/conformance/classes/classDeclarations/classAndInterfaceMerge.d.ts +++ b/tests/cases/conformance/classes/classDeclarations/classAndInterfaceMerge.d.ts @@ -7,7 +7,7 @@ interface C { } interface C { } -declare module M { +declare namespace M { interface C1 { } @@ -20,6 +20,6 @@ declare module M { export class C2 { } } -declare module M { +declare namespace M { export interface C2 { } } \ No newline at end of file diff --git a/tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts b/tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts index 27ea77644a6c8..2f64647e6088b 100644 --- a/tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts +++ b/tests/cases/conformance/classes/classDeclarations/classAndInterfaceWithSameName.ts @@ -1,7 +1,7 @@ class C { foo: string; } interface C { foo: string; } -module M { +namespace M { class D { bar: string; } diff --git a/tests/cases/conformance/classes/classDeclarations/classAndVariableWithSameName.ts b/tests/cases/conformance/classes/classDeclarations/classAndVariableWithSameName.ts index cd42d74210144..f0cb739e3c8a5 100644 --- a/tests/cases/conformance/classes/classDeclarations/classAndVariableWithSameName.ts +++ b/tests/cases/conformance/classes/classDeclarations/classAndVariableWithSameName.ts @@ -1,7 +1,7 @@ class C { foo: string; } // error var C = ''; // error -module M { +namespace M { class D { // error bar: string; } diff --git a/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType.ts b/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType.ts index a7250cd1330e9..f2eef7c7ce10e 100644 --- a/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType.ts +++ b/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType.ts @@ -7,7 +7,7 @@ class C2 extends { foo: string; } { } // error var x: { foo: string; } class C3 extends x { } // error -module M { export var x = 1; } +namespace M { export var x = 1; } class C4 extends M { } // error function foo() { } diff --git a/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly2.ts b/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly2.ts index 2806b30a18518..548d0d6e8ffc9 100644 --- a/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly2.ts +++ b/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly2.ts @@ -1,22 +1,22 @@ class C extends N.E { foo: string; } // error -module M { +namespace M { export class D extends C { bar: string; } } -module N { +namespace N { export class E extends M.D { baz: number; } } -module O { +namespace O { class C2 extends Q.E2 { foo: T; } // error - module P { + namespace P { export class D2 extends C2 { bar: T; } } - module Q { + namespace Q { export class E2 extends P.D2 { baz: T; } } } \ No newline at end of file diff --git a/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsShadowedConstructorFunction.ts b/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsShadowedConstructorFunction.ts index c30f3fceab6e2..011da17831c49 100644 --- a/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsShadowedConstructorFunction.ts +++ b/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsShadowedConstructorFunction.ts @@ -1,6 +1,6 @@ class C { foo: string; } -module M { +namespace M { var C = 1; class D extends C { // error, C must evaluate to constructor function bar: string; diff --git a/tests/cases/conformance/classes/classDeclarations/mergeClassInterfaceAndModule.ts b/tests/cases/conformance/classes/classDeclarations/mergeClassInterfaceAndModule.ts index d39c56ed07e4e..19033bcef0124 100644 --- a/tests/cases/conformance/classes/classDeclarations/mergeClassInterfaceAndModule.ts +++ b/tests/cases/conformance/classes/classDeclarations/mergeClassInterfaceAndModule.ts @@ -1,16 +1,16 @@ interface C1 {} declare class C1 {} -module C1 {} +namespace C1 {} declare class C2 {} interface C2 {} -module C2 {} +namespace C2 {} declare class C3 {} -module C3 {} +namespace C3 {} interface C3 {} -module C4 {} +namespace C4 {} declare class C4 {} // error -- class declaration must precede module declaration interface C4 {} \ No newline at end of file diff --git a/tests/cases/conformance/classes/classExpression.ts b/tests/cases/conformance/classes/classExpression.ts index 31d234bf13672..8264dc3b16966 100644 --- a/tests/cases/conformance/classes/classExpression.ts +++ b/tests/cases/conformance/classes/classExpression.ts @@ -6,7 +6,7 @@ var y = { } } -module M { +namespace M { var z = class C4 { } } \ No newline at end of file diff --git a/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts b/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts index 1c9a801429db5..a958d9923fb04 100644 --- a/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts +++ b/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts @@ -16,7 +16,7 @@ var c = new C(1); var d = new D(1); // error var e = new E(1); // error -module Generic { +namespace Generic { class C { public constructor(public x: T) { } } diff --git a/tests/cases/conformance/classes/members/accessibility/privateStaticNotAccessibleInClodule.ts b/tests/cases/conformance/classes/members/accessibility/privateStaticNotAccessibleInClodule.ts index 876c71630f32b..180e20b882958 100644 --- a/tests/cases/conformance/classes/members/accessibility/privateStaticNotAccessibleInClodule.ts +++ b/tests/cases/conformance/classes/members/accessibility/privateStaticNotAccessibleInClodule.ts @@ -5,6 +5,6 @@ class C { private static bar: string; } -module C { +namespace C { export var y = C.bar; // error } \ No newline at end of file diff --git a/tests/cases/conformance/classes/members/accessibility/privateStaticNotAccessibleInClodule2.ts b/tests/cases/conformance/classes/members/accessibility/privateStaticNotAccessibleInClodule2.ts index ac054d51c263f..0a306041b8f89 100644 --- a/tests/cases/conformance/classes/members/accessibility/privateStaticNotAccessibleInClodule2.ts +++ b/tests/cases/conformance/classes/members/accessibility/privateStaticNotAccessibleInClodule2.ts @@ -9,6 +9,6 @@ class D extends C { baz: number; } -module D { +namespace D { export var y = D.bar; // error } \ No newline at end of file diff --git a/tests/cases/conformance/classes/members/accessibility/protectedStaticNotAccessibleInClodule.ts b/tests/cases/conformance/classes/members/accessibility/protectedStaticNotAccessibleInClodule.ts index 10b1e58699647..ec8dd63e4dcdf 100644 --- a/tests/cases/conformance/classes/members/accessibility/protectedStaticNotAccessibleInClodule.ts +++ b/tests/cases/conformance/classes/members/accessibility/protectedStaticNotAccessibleInClodule.ts @@ -5,7 +5,7 @@ class C { protected static bar: string; } -module C { +namespace C { export var f = C.foo; // OK export var b = C.bar; // error } \ No newline at end of file diff --git a/tests/cases/conformance/classes/members/classTypes/genericSetterInClassType.ts b/tests/cases/conformance/classes/members/classTypes/genericSetterInClassType.ts index ce695924992c5..bcf138e2db687 100644 --- a/tests/cases/conformance/classes/members/classTypes/genericSetterInClassType.ts +++ b/tests/cases/conformance/classes/members/classTypes/genericSetterInClassType.ts @@ -1,6 +1,6 @@ // @target: esnext -module Generic { +namespace Generic { class C { get y(): T { return 1 as never; diff --git a/tests/cases/conformance/classes/members/classTypes/instancePropertiesInheritedIntoClassType.ts b/tests/cases/conformance/classes/members/classTypes/instancePropertiesInheritedIntoClassType.ts index 050729d4d478b..c83805b73f277 100644 --- a/tests/cases/conformance/classes/members/classTypes/instancePropertiesInheritedIntoClassType.ts +++ b/tests/cases/conformance/classes/members/classTypes/instancePropertiesInheritedIntoClassType.ts @@ -1,4 +1,4 @@ -module NonGeneric { +namespace NonGeneric { class C { x: string; get y() { @@ -20,7 +20,7 @@ module NonGeneric { } -module Generic { +namespace Generic { class C { x: T; get y() { diff --git a/tests/cases/conformance/classes/members/classTypes/instancePropertyInClassType.ts b/tests/cases/conformance/classes/members/classTypes/instancePropertyInClassType.ts index c0c0c2572efa1..43f250f249879 100644 --- a/tests/cases/conformance/classes/members/classTypes/instancePropertyInClassType.ts +++ b/tests/cases/conformance/classes/members/classTypes/instancePropertyInClassType.ts @@ -1,4 +1,4 @@ -module NonGeneric { +namespace NonGeneric { class C { x: string; get y() { @@ -18,7 +18,7 @@ module NonGeneric { } -module Generic { +namespace Generic { class C { x: T; get y() { diff --git a/tests/cases/conformance/classes/members/classTypes/staticPropertyNotInClassType.ts b/tests/cases/conformance/classes/members/classTypes/staticPropertyNotInClassType.ts index ce8203f58a53c..4f0eb44fcbcf6 100644 --- a/tests/cases/conformance/classes/members/classTypes/staticPropertyNotInClassType.ts +++ b/tests/cases/conformance/classes/members/classTypes/staticPropertyNotInClassType.ts @@ -1,4 +1,4 @@ -module NonGeneric { +namespace NonGeneric { class C { fn() { return this; } static get x() { return 1; } @@ -7,7 +7,7 @@ module NonGeneric { static foo: string; // not reflected in class type } - module C { + namespace C { export var bar = ''; // not reflected in class type } @@ -18,7 +18,7 @@ module NonGeneric { var r6 = c.x; // error } -module Generic { +namespace Generic { class C { fn() { return this; } static get x() { return 1; } @@ -27,7 +27,7 @@ module Generic { static foo: T; // not reflected in class type } - module C { + namespace C { export var bar = ''; // not reflected in class type } diff --git a/tests/cases/conformance/classes/members/constructorFunctionTypes/classWithConstructors.ts b/tests/cases/conformance/classes/members/constructorFunctionTypes/classWithConstructors.ts index 5444dcd6845e0..c401c60c98603 100644 --- a/tests/cases/conformance/classes/members/constructorFunctionTypes/classWithConstructors.ts +++ b/tests/cases/conformance/classes/members/constructorFunctionTypes/classWithConstructors.ts @@ -1,4 +1,4 @@ -module NonGeneric { +namespace NonGeneric { class C { constructor(x: string) { } } @@ -23,7 +23,7 @@ module NonGeneric { var d3 = new D(''); // ok } -module Generics { +namespace Generics { class C { constructor(x: T) { } } diff --git a/tests/cases/conformance/classes/members/constructorFunctionTypes/constructorHasPrototypeProperty.ts b/tests/cases/conformance/classes/members/constructorFunctionTypes/constructorHasPrototypeProperty.ts index 11c5124d28ded..5532872d53552 100644 --- a/tests/cases/conformance/classes/members/constructorFunctionTypes/constructorHasPrototypeProperty.ts +++ b/tests/cases/conformance/classes/members/constructorFunctionTypes/constructorHasPrototypeProperty.ts @@ -1,4 +1,4 @@ -module NonGeneric { +namespace NonGeneric { class C { foo: string; } @@ -13,7 +13,7 @@ module NonGeneric { r2.bar; } -module Generic { +namespace Generic { class C { foo: T; bar: U; diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/staticPropertyNameConflicts.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/staticPropertyNameConflicts.ts index 71096e7b8f313..1ecd80f7b0dda 100644 --- a/tests/cases/conformance/classes/propertyMemberDeclarations/staticPropertyNameConflicts.ts +++ b/tests/cases/conformance/classes/propertyMemberDeclarations/staticPropertyNameConflicts.ts @@ -226,7 +226,7 @@ var StaticArgumentsFn_Anonymous2 = class { // === Static properties on default exported classes === // name -module TestOnDefaultExportedClass_1 { +namespace TestOnDefaultExportedClass_1 { class StaticName { static name: number; // error without useDefineForClassFields name: string; // ok @@ -238,7 +238,7 @@ export class ExportedStaticName { [FunctionPropertyNames.name]: string; // ok } -module TestOnDefaultExportedClass_2 { +namespace TestOnDefaultExportedClass_2 { class StaticNameFn { static name() {} // error without useDefineForClassFields name() {} // ok @@ -251,7 +251,7 @@ export class ExportedStaticNameFn { } // length -module TestOnDefaultExportedClass_3 { +namespace TestOnDefaultExportedClass_3 { export default class StaticLength { static length: number; // error without useDefineForClassFields length: string; // ok @@ -263,7 +263,7 @@ export class ExportedStaticLength { [FunctionPropertyNames.length]: string; // ok } -module TestOnDefaultExportedClass_4 { +namespace TestOnDefaultExportedClass_4 { export default class StaticLengthFn { static length() {} // error without useDefineForClassFields length() {} // ok @@ -276,7 +276,7 @@ export class ExportedStaticLengthFn { } // prototype -module TestOnDefaultExportedClass_5 { +namespace TestOnDefaultExportedClass_5 { export default class StaticPrototype { static prototype: number; // always an error prototype: string; // ok @@ -288,7 +288,7 @@ export class ExportedStaticPrototype { [FunctionPropertyNames.prototype]: string; // ok } -module TestOnDefaultExportedClass_6 { +namespace TestOnDefaultExportedClass_6 { export default class StaticPrototypeFn { static prototype() {} // always an error prototype() {} // ok @@ -301,7 +301,7 @@ export class ExportedStaticPrototypeFn { } // caller -module TestOnDefaultExportedClass_7 { +namespace TestOnDefaultExportedClass_7 { export default class StaticCaller { static caller: number; // error without useDefineForClassFields caller: string; // ok @@ -313,7 +313,7 @@ export class ExportedStaticCaller { [FunctionPropertyNames.caller]: string; // ok } -module TestOnDefaultExportedClass_8 { +namespace TestOnDefaultExportedClass_8 { export default class StaticCallerFn { static caller() {} // error without useDefineForClassFields caller() {} // ok @@ -326,7 +326,7 @@ export class ExportedStaticCallerFn { } // arguments -module TestOnDefaultExportedClass_9 { +namespace TestOnDefaultExportedClass_9 { export default class StaticArguments { static arguments: number; // error without useDefineForClassFields arguments: string; // ok @@ -338,7 +338,7 @@ export class ExportedStaticArguments { [FunctionPropertyNames.arguments]: string; // ok } -module TestOnDefaultExportedClass_10 { +namespace TestOnDefaultExportedClass_10 { export default class StaticArgumentsFn { static arguments() {} // error without useDefineForClassFields arguments() {} // ok diff --git a/tests/cases/conformance/declarationEmit/classDoesNotDependOnPrivateMember.ts b/tests/cases/conformance/declarationEmit/classDoesNotDependOnPrivateMember.ts index 4f0e9f7f4e5e1..e8c55518382aa 100644 --- a/tests/cases/conformance/declarationEmit/classDoesNotDependOnPrivateMember.ts +++ b/tests/cases/conformance/declarationEmit/classDoesNotDependOnPrivateMember.ts @@ -1,5 +1,5 @@ //@declaration: true -module M { +namespace M { interface I { } export class C { private x: I; diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod11.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod11.ts index 26a01cb855b9c..991c2fab49b16 100644 --- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod11.ts +++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod11.ts @@ -1,6 +1,6 @@ // @target: ES5 // @experimentaldecorators: true -module M { +namespace M { class C { decorator(target: Object, key: string): void { } diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod12.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod12.ts index e353d0db587ee..a2df01509fb17 100644 --- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod12.ts +++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod12.ts @@ -1,6 +1,6 @@ // @target: ES5 // @experimentaldecorators: true -module M { +namespace M { class S { decorator(target: Object, key: string): void { } } diff --git a/tests/cases/conformance/decorators/invalid/decoratorOnImportEquals1.ts b/tests/cases/conformance/decorators/invalid/decoratorOnImportEquals1.ts index b5990252355f1..c5558fcb07b66 100644 --- a/tests/cases/conformance/decorators/invalid/decoratorOnImportEquals1.ts +++ b/tests/cases/conformance/decorators/invalid/decoratorOnImportEquals1.ts @@ -1,10 +1,10 @@ declare function dec(target: T): T; -module M1 { +namespace M1 { export var X: number; } -module M2 { +namespace M2 { @dec import X = M1.X; } \ No newline at end of file diff --git a/tests/cases/conformance/decorators/invalid/decoratorOnInternalModule.ts b/tests/cases/conformance/decorators/invalid/decoratorOnInternalModule.ts index 3f7c57b6ae9eb..03970473c87b1 100644 --- a/tests/cases/conformance/decorators/invalid/decoratorOnInternalModule.ts +++ b/tests/cases/conformance/decorators/invalid/decoratorOnInternalModule.ts @@ -1,6 +1,6 @@ declare function dec(target: T): T; @dec -module M { +namespace M { } \ No newline at end of file diff --git a/tests/cases/conformance/enums/enumMerging.ts b/tests/cases/conformance/enums/enumMerging.ts index 6f1061c338f79..80a38fd1cffc1 100644 --- a/tests/cases/conformance/enums/enumMerging.ts +++ b/tests/cases/conformance/enums/enumMerging.ts @@ -1,6 +1,6 @@ // Enum with only constant members across 2 declarations with the same root module // Enum with initializer in all declarations with constant members with the same root module -module M1 { +namespace M1 { enum EImpl1 { A, B, C } @@ -21,7 +21,7 @@ module M1 { } // Enum with only computed members across 2 declarations with the same root module -module M2 { +namespace M2 { export enum EComp2 { A = 'foo'.length, B = 'foo'.length, C = 'foo'.length } @@ -34,7 +34,7 @@ module M2 { } // Enum with initializer in only one of two declarations with constant members with the same root module -module M3 { +namespace M3 { enum EInit { A, B @@ -46,18 +46,18 @@ module M3 { } // Enums with same name but different root module -module M4 { +namespace M4 { export enum Color { Red, Green, Blue } } -module M5 { +namespace M5 { export enum Color { Red, Green, Blue } } -module M6.A { +namespace M6.A { export enum Color { Red, Green, Blue } } -module M6 { - export module A { +namespace M6 { + export namespace A { export enum Color { Yellow = 1 } } var t = A.Color.Yellow; diff --git a/tests/cases/conformance/enums/enumMergingErrors.ts b/tests/cases/conformance/enums/enumMergingErrors.ts index 6904b14da3343..995058556fb8e 100644 --- a/tests/cases/conformance/enums/enumMergingErrors.ts +++ b/tests/cases/conformance/enums/enumMergingErrors.ts @@ -1,40 +1,40 @@ // Enum with constant, computed, constant members split across 3 declarations with the same root module -module M { +namespace M { export enum E1 { A = 0 } export enum E2 { C } export enum E3 { A = 0 } } -module M { +namespace M { export enum E1 { B = 'foo'.length } export enum E2 { B = 'foo'.length } export enum E3 { C } } -module M { +namespace M { export enum E1 { C } export enum E2 { A = 0 } export enum E3 { B = 'foo'.length } } // Enum with no initializer in either declaration with constant members with the same root module -module M1 { +namespace M1 { export enum E1 { A = 0 } } -module M1 { +namespace M1 { export enum E1 { B } } -module M1 { +namespace M1 { export enum E1 { C } } // Enum with initializer in only one of three declarations with constant members with the same root module -module M2 { +namespace M2 { export enum E1 { A } } -module M2 { +namespace M2 { export enum E1 { B = 0 } } -module M2 { +namespace M2 { export enum E1 { C } } diff --git a/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts b/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts index 8422b1ec016de..4205cf198f9f0 100644 --- a/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts +++ b/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts @@ -1,6 +1,6 @@ //@target: ES6 //@declaration: true -module M { +namespace M { interface I { } export class C { [Symbol.iterator]: I; diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty48.ts b/tests/cases/conformance/es6/Symbols/symbolProperty48.ts index 77ce9303b4425..b8d63f74fe8c2 100644 --- a/tests/cases/conformance/es6/Symbols/symbolProperty48.ts +++ b/tests/cases/conformance/es6/Symbols/symbolProperty48.ts @@ -1,5 +1,5 @@ //@target: ES6 -module M { +namespace M { var Symbol; class C { diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty49.ts b/tests/cases/conformance/es6/Symbols/symbolProperty49.ts index bc34e146f2c2e..aa1ae1290c9a1 100644 --- a/tests/cases/conformance/es6/Symbols/symbolProperty49.ts +++ b/tests/cases/conformance/es6/Symbols/symbolProperty49.ts @@ -1,5 +1,5 @@ //@target: ES6 -module M { +namespace M { export var Symbol; class C { diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty50.ts b/tests/cases/conformance/es6/Symbols/symbolProperty50.ts index 8bcf25fab2906..1d42bd4ef31bf 100644 --- a/tests/cases/conformance/es6/Symbols/symbolProperty50.ts +++ b/tests/cases/conformance/es6/Symbols/symbolProperty50.ts @@ -1,5 +1,5 @@ //@target: ES6 -module M { +namespace M { interface Symbol { } class C { diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty51.ts b/tests/cases/conformance/es6/Symbols/symbolProperty51.ts index 3da5d45bf8403..523083d2370af 100644 --- a/tests/cases/conformance/es6/Symbols/symbolProperty51.ts +++ b/tests/cases/conformance/es6/Symbols/symbolProperty51.ts @@ -1,6 +1,6 @@ //@target: ES6 -module M { - module Symbol { } +namespace M { + namespace Symbol { } class C { [Symbol.iterator]() { } diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty55.ts b/tests/cases/conformance/es6/Symbols/symbolProperty55.ts index 3c6ceb69b0e44..03b368be884d9 100644 --- a/tests/cases/conformance/es6/Symbols/symbolProperty55.ts +++ b/tests/cases/conformance/es6/Symbols/symbolProperty55.ts @@ -3,7 +3,7 @@ var obj = { [Symbol.iterator]: 0 }; -module M { +namespace M { var Symbol: SymbolConstructor; // The following should be of type 'any'. This is because even though obj has a property keyed by Symbol.iterator, // the key passed in here is the *wrong* Symbol.iterator. It is not the iterator property of the global Symbol. diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty56.ts b/tests/cases/conformance/es6/Symbols/symbolProperty56.ts index ae9e5232b9bd4..a77c88a563752 100644 --- a/tests/cases/conformance/es6/Symbols/symbolProperty56.ts +++ b/tests/cases/conformance/es6/Symbols/symbolProperty56.ts @@ -3,7 +3,7 @@ var obj = { [Symbol.iterator]: 0 }; -module M { +namespace M { var Symbol: {}; // The following should be of type 'any'. This is because even though obj has a property keyed by Symbol.iterator, // the key passed in here is the *wrong* Symbol.iterator. It is not the iterator property of the global Symbol. diff --git a/tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts b/tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts index bd984ba4da0e1..6b932ded4400c 100644 --- a/tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts +++ b/tests/cases/conformance/es6/arrowFunction/disallowLineTerminatorBeforeArrow.ts @@ -53,7 +53,7 @@ foo(() foo(() => { return false; }); -module m { +namespace m { class City { constructor(x: number, thing = () => 100) { diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES5.ts index 87a1bf8117841..1b924d4f8d7cc 100644 --- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES5.ts +++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES5.ts @@ -1,5 +1,5 @@ // @target: es5 -module M { +namespace M { var obj = { [this.bar]: 0 } diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES6.ts index 3dbf97d7f7ae9..0dacc40f0fc22 100644 --- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES6.ts +++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES6.ts @@ -1,5 +1,5 @@ // @target: es6 -module M { +namespace M { var obj = { [this.bar]: 0 } diff --git a/tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts b/tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts index 9167239cefdfd..a5e663640fbe5 100644 --- a/tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts +++ b/tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts @@ -105,7 +105,7 @@ f14([2, ["abc", { x: 0, y: true }]]); f14([2, ["abc", { x: 0 }]]); f14([2, ["abc", { y: false }]]); // Error, no x -module M { +namespace M { export var [a, b] = [1, 2]; } diff --git a/tests/cases/conformance/es6/modules/exportsAndImports1-amd.ts b/tests/cases/conformance/es6/modules/exportsAndImports1-amd.ts index e688c0467babf..a1d005c8fa99e 100644 --- a/tests/cases/conformance/es6/modules/exportsAndImports1-amd.ts +++ b/tests/cases/conformance/es6/modules/exportsAndImports1-amd.ts @@ -14,10 +14,10 @@ enum E { const enum D { A, B, C } -module M { +namespace M { export var x; } -module N { +namespace N { export interface I { } } diff --git a/tests/cases/conformance/es6/modules/exportsAndImports1-es6.ts b/tests/cases/conformance/es6/modules/exportsAndImports1-es6.ts index 16d8f2addf404..7e29bc0b79e9b 100644 --- a/tests/cases/conformance/es6/modules/exportsAndImports1-es6.ts +++ b/tests/cases/conformance/es6/modules/exportsAndImports1-es6.ts @@ -14,10 +14,10 @@ enum E { const enum D { A, B, C } -module M { +namespace M { export var x; } -module N { +namespace N { export interface I { } } diff --git a/tests/cases/conformance/es6/modules/exportsAndImports1.ts b/tests/cases/conformance/es6/modules/exportsAndImports1.ts index 5b91d1d6ccd97..7775a425b2e9f 100644 --- a/tests/cases/conformance/es6/modules/exportsAndImports1.ts +++ b/tests/cases/conformance/es6/modules/exportsAndImports1.ts @@ -13,10 +13,10 @@ enum E { const enum D { A, B, C } -module M { +namespace M { export var x; } -module N { +namespace N { export interface I { } } diff --git a/tests/cases/conformance/es6/modules/exportsAndImports3-amd.ts b/tests/cases/conformance/es6/modules/exportsAndImports3-amd.ts index f804d98a44ec4..260e9499b5d1a 100644 --- a/tests/cases/conformance/es6/modules/exportsAndImports3-amd.ts +++ b/tests/cases/conformance/es6/modules/exportsAndImports3-amd.ts @@ -14,10 +14,10 @@ export enum E { export const enum D { A, B, C } -export module M { +export namespace M { export var x; } -export module N { +export namespace N { export interface I { } } diff --git a/tests/cases/conformance/es6/modules/exportsAndImports3-es6.ts b/tests/cases/conformance/es6/modules/exportsAndImports3-es6.ts index 77cb5b9df9b2a..bf09ccde0b119 100644 --- a/tests/cases/conformance/es6/modules/exportsAndImports3-es6.ts +++ b/tests/cases/conformance/es6/modules/exportsAndImports3-es6.ts @@ -14,10 +14,10 @@ export enum E { export const enum D { A, B, C } -export module M { +export namespace M { export var x; } -export module N { +export namespace N { export interface I { } } diff --git a/tests/cases/conformance/es6/modules/exportsAndImports3.ts b/tests/cases/conformance/es6/modules/exportsAndImports3.ts index 806a5e2779e6f..1abfb5301cd7e 100644 --- a/tests/cases/conformance/es6/modules/exportsAndImports3.ts +++ b/tests/cases/conformance/es6/modules/exportsAndImports3.ts @@ -13,10 +13,10 @@ export enum E { export const enum D { A, B, C } -export module M { +export namespace M { export var x; } -export module N { +export namespace N { export interface I { } } diff --git a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorWithModule.ts b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorWithModule.ts index 7da6e7b0c709f..8d69d1efdb2e2 100644 --- a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorWithModule.ts +++ b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorWithModule.ts @@ -1,10 +1,10 @@ // module export var x = "Foo"; -module m { +namespace m { export var x; } -module n { +namespace n { var z = 10000; export var y = { m.x // error diff --git a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModule.ts b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModule.ts index 005885bb9018f..e5c14eb4bc59e 100644 --- a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModule.ts +++ b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModule.ts @@ -1,10 +1,10 @@ // module export -module m { +namespace m { export var x; } -module m { +namespace m { var z = x; var y = { a: x, diff --git a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModuleES6.ts b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModuleES6.ts index f8937625afefa..0fb20b3a15a6e 100644 --- a/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModuleES6.ts +++ b/tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesWithModuleES6.ts @@ -1,10 +1,10 @@ // @target: es6 -module m { +namespace m { export var x; } -module m { +namespace m { var z = x; var y = { a: x, diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext2.ts b/tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext2.ts index f4d560c521fcd..b74d0beb4b69a 100644 --- a/tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext2.ts +++ b/tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext2.ts @@ -1,4 +1,4 @@ //@target: ES6 -declare module M { +declare namespace M { function *generator(): any; } \ No newline at end of file diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext4.d.ts b/tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext4.d.ts index f4d560c521fcd..b74d0beb4b69a 100644 --- a/tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext4.d.ts +++ b/tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext4.d.ts @@ -1,4 +1,4 @@ //@target: ES6 -declare module M { +declare namespace M { function *generator(): any; } \ No newline at end of file diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext6.ts b/tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext6.ts index fb7c358f189e2..4d939cecd137d 100644 --- a/tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext6.ts +++ b/tests/cases/conformance/es6/yieldExpressions/generatorInAmbientContext6.ts @@ -1,5 +1,5 @@ //@target: ES6 //@declaration: true -module M { +namespace M { export function *generator(): any { } } \ No newline at end of file diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorOverloads1.ts b/tests/cases/conformance/es6/yieldExpressions/generatorOverloads1.ts index c21ecea78268e..8efc62152d515 100644 --- a/tests/cases/conformance/es6/yieldExpressions/generatorOverloads1.ts +++ b/tests/cases/conformance/es6/yieldExpressions/generatorOverloads1.ts @@ -1,5 +1,5 @@ //@target: ES6 -module M { +namespace M { function* f(s: string): Iterable; function* f(s: number): Iterable; function* f(s: any): Iterable { } diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorOverloads2.ts b/tests/cases/conformance/es6/yieldExpressions/generatorOverloads2.ts index de362aedc8b36..b941140c4040b 100644 --- a/tests/cases/conformance/es6/yieldExpressions/generatorOverloads2.ts +++ b/tests/cases/conformance/es6/yieldExpressions/generatorOverloads2.ts @@ -1,5 +1,5 @@ //@target: ES6 -declare module M { +declare namespace M { function* f(s: string): Iterable; function* f(s: number): Iterable; function* f(s: any): Iterable; diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorOverloads5.ts b/tests/cases/conformance/es6/yieldExpressions/generatorOverloads5.ts index 1efa9af0839de..4c18b288ab44e 100644 --- a/tests/cases/conformance/es6/yieldExpressions/generatorOverloads5.ts +++ b/tests/cases/conformance/es6/yieldExpressions/generatorOverloads5.ts @@ -1,5 +1,5 @@ //@target: ES6 -module M { +namespace M { function f(s: string): Iterable; function f(s: number): Iterable; function* f(s: any): Iterable { } diff --git a/tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsValue.ts b/tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsValue.ts index 2964561dc6302..14bbc3c4be7a5 100644 --- a/tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsValue.ts +++ b/tests/cases/conformance/es7/exponentiationOperator/compoundExponentiationAssignmentLHSIsValue.ts @@ -22,7 +22,7 @@ function foo() { this **= value; // identifiers: module, class, enum, function -module M { export var a; } +namespace M { export var a; } M **= value; C **= value; diff --git a/tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts b/tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts index 30b8df4268a39..47c6ab7ccda7e 100644 --- a/tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts +++ b/tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts @@ -13,7 +13,7 @@ function foo() { this = value; } this = value; // identifiers: module, class, enum, function -module M { export var a; } +namespace M { export var a; } M = value; C = value; diff --git a/tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts b/tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts index 8eb50d2f64ad5..e91216d959a7c 100644 --- a/tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts +++ b/tests/cases/conformance/expressions/assignmentOperator/compoundAssignmentLHSIsValue.ts @@ -28,7 +28,7 @@ this *= value; this += value; // identifiers: module, class, enum, function -module M { export var a; } +namespace M { export var a; } M *= value; M += value; diff --git a/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithAnyAndEveryType.ts b/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithAnyAndEveryType.ts index 87e2d134bf77d..cf4e0b44b8812 100644 --- a/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithAnyAndEveryType.ts +++ b/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithAnyAndEveryType.ts @@ -4,7 +4,7 @@ class C { static foo() { } } enum E { a, b, c } -module M { export var a } +namespace M { export var a } var a: any; var b: boolean; diff --git a/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithInvalidOperands.ts b/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithInvalidOperands.ts index 910ec6674dd34..59153b0a33ca5 100644 --- a/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithInvalidOperands.ts +++ b/tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithInvalidOperands.ts @@ -4,7 +4,7 @@ class C { static foo() { } } enum E { a, b, c } -module M { export var a } +namespace M { export var a } var a: boolean; var b: number; diff --git a/tests/cases/conformance/expressions/contextualTyping/generatedContextualTyping.ts b/tests/cases/conformance/expressions/contextualTyping/generatedContextualTyping.ts index d6bfd84fd9a8c..5900614debb4e 100644 --- a/tests/cases/conformance/expressions/contextualTyping/generatedContextualTyping.ts +++ b/tests/cases/conformance/expressions/contextualTyping/generatedContextualTyping.ts @@ -185,30 +185,30 @@ var x177: () => { [n: number]: Base; } = function() { return [d1, d2]; }; var x178: () => {n: Base[]; } = function() { return { n: [d1, d2] }; }; var x179: () => (s: Base[]) => any = function() { return n => { var n: Base[]; return null; }; }; var x180: () => Genric = function() { return { func: n => { return [d1, d2]; } }; }; -module x181 { var t: () => Base[] = () => [d1, d2]; } -module x182 { var t: () => Base[] = function() { return [d1, d2] }; } -module x183 { var t: () => Base[] = function named() { return [d1, d2] }; } -module x184 { var t: { (): Base[]; } = () => [d1, d2]; } -module x185 { var t: { (): Base[]; } = function() { return [d1, d2] }; } -module x186 { var t: { (): Base[]; } = function named() { return [d1, d2] }; } -module x187 { var t: Base[] = [d1, d2]; } -module x188 { var t: Array = [d1, d2]; } -module x189 { var t: { [n: number]: Base; } = [d1, d2]; } -module x190 { var t: {n: Base[]; } = { n: [d1, d2] }; } -module x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } -module x192 { var t: Genric = { func: n => { return [d1, d2]; } }; } -module x193 { export var t: () => Base[] = () => [d1, d2]; } -module x194 { export var t: () => Base[] = function() { return [d1, d2] }; } -module x195 { export var t: () => Base[] = function named() { return [d1, d2] }; } -module x196 { export var t: { (): Base[]; } = () => [d1, d2]; } -module x197 { export var t: { (): Base[]; } = function() { return [d1, d2] }; } -module x198 { export var t: { (): Base[]; } = function named() { return [d1, d2] }; } -module x199 { export var t: Base[] = [d1, d2]; } -module x200 { export var t: Array = [d1, d2]; } -module x201 { export var t: { [n: number]: Base; } = [d1, d2]; } -module x202 { export var t: {n: Base[]; } = { n: [d1, d2] }; } -module x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } -module x204 { export var t: Genric = { func: n => { return [d1, d2]; } }; } +namespace x181 { var t: () => Base[] = () => [d1, d2]; } +namespace x182 { var t: () => Base[] = function() { return [d1, d2] }; } +namespace x183 { var t: () => Base[] = function named() { return [d1, d2] }; } +namespace x184 { var t: { (): Base[]; } = () => [d1, d2]; } +namespace x185 { var t: { (): Base[]; } = function() { return [d1, d2] }; } +namespace x186 { var t: { (): Base[]; } = function named() { return [d1, d2] }; } +namespace x187 { var t: Base[] = [d1, d2]; } +namespace x188 { var t: Array = [d1, d2]; } +namespace x189 { var t: { [n: number]: Base; } = [d1, d2]; } +namespace x190 { var t: {n: Base[]; } = { n: [d1, d2] }; } +namespace x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } +namespace x192 { var t: Genric = { func: n => { return [d1, d2]; } }; } +namespace x193 { export var t: () => Base[] = () => [d1, d2]; } +namespace x194 { export var t: () => Base[] = function() { return [d1, d2] }; } +namespace x195 { export var t: () => Base[] = function named() { return [d1, d2] }; } +namespace x196 { export var t: { (): Base[]; } = () => [d1, d2]; } +namespace x197 { export var t: { (): Base[]; } = function() { return [d1, d2] }; } +namespace x198 { export var t: { (): Base[]; } = function named() { return [d1, d2] }; } +namespace x199 { export var t: Base[] = [d1, d2]; } +namespace x200 { export var t: Array = [d1, d2]; } +namespace x201 { export var t: { [n: number]: Base; } = [d1, d2]; } +namespace x202 { export var t: {n: Base[]; } = { n: [d1, d2] }; } +namespace x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; } +namespace x204 { export var t: Genric = { func: n => { return [d1, d2]; } }; } var x206 = <() => Base[]>function() { return [d1, d2] }; var x207 = <() => Base[]>function named() { return [d1, d2] }; var x209 = <{ (): Base[]; }>function() { return [d1, d2] }; diff --git a/tests/cases/conformance/expressions/functionCalls/forgottenNew.ts b/tests/cases/conformance/expressions/functionCalls/forgottenNew.ts index 9b7f2e695f7ef..a0147c9263e28 100644 --- a/tests/cases/conformance/expressions/functionCalls/forgottenNew.ts +++ b/tests/cases/conformance/expressions/functionCalls/forgottenNew.ts @@ -1,4 +1,4 @@ -module Tools { +namespace Tools { export class NullLogger { } } diff --git a/tests/cases/conformance/expressions/functions/arrowFunctionContexts.ts b/tests/cases/conformance/expressions/functions/arrowFunctionContexts.ts index 811beec796bd5..a3aa4eafc0723 100644 --- a/tests/cases/conformance/expressions/functions/arrowFunctionContexts.ts +++ b/tests/cases/conformance/expressions/functions/arrowFunctionContexts.ts @@ -33,13 +33,13 @@ enum E { } // Arrow function as module variable initializer -module M { +namespace M { export var a = (s) => ''; var b = (s) => s; } // Repeat above for module members that are functions? (necessary to redo all of them?) -module M2 { +namespace M2 { // Arrow function used in with statement with (window) { var p = () => this; @@ -74,7 +74,7 @@ module M2 { } // Arrow function as module variable initializer - module M { + namespace M { export var a = (s) => ''; var b = (s) => s; } diff --git a/tests/cases/conformance/expressions/functions/typeOfThisInFunctionExpression.ts b/tests/cases/conformance/expressions/functions/typeOfThisInFunctionExpression.ts index 846b833f3a1a1..f9604531152d2 100644 --- a/tests/cases/conformance/expressions/functions/typeOfThisInFunctionExpression.ts +++ b/tests/cases/conformance/expressions/functions/typeOfThisInFunctionExpression.ts @@ -26,7 +26,7 @@ class C { } } -module M { +namespace M { function fn() { var p = this; var p: any; diff --git a/tests/cases/conformance/expressions/identifiers/scopeResolutionIdentifiers.ts b/tests/cases/conformance/expressions/identifiers/scopeResolutionIdentifiers.ts index 8b0a1d4893917..cfaf6a177888b 100644 --- a/tests/cases/conformance/expressions/identifiers/scopeResolutionIdentifiers.ts +++ b/tests/cases/conformance/expressions/identifiers/scopeResolutionIdentifiers.ts @@ -1,13 +1,13 @@ // EveryType used in a nested scope of a different EveryType with the same name, type of the identifier is the one defined in the inner scope var s: string; -module M1 { +namespace M1 { export var s: number; var n = s; var n: number; } -module M2 { +namespace M2 { var s: number; var n = s; var n: number; @@ -28,9 +28,9 @@ class C { } } -module M3 { +namespace M3 { var s: any; - module M4 { + namespace M4 { var n = s; var n: any; } diff --git a/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts b/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts index fdcb9c410b401..3d408c1af3378 100644 --- a/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts +++ b/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts @@ -18,7 +18,7 @@ class ClassWithInitializer extends BaseErrClass { } } -module M { +namespace M { //'this' in module variable var x = this; // Error } diff --git a/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts b/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts index 7791be14650f4..bf017ea70843f 100644 --- a/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts +++ b/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts @@ -18,7 +18,7 @@ class ClassWithInitializer extends BaseErrClass { } } -module M { +namespace M { //'this' in module variable var x = this; // Error } diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardsInFunctionAndModuleBlock.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardsInFunctionAndModuleBlock.ts index f1ba854394bdc..f73a2672d4410 100644 --- a/tests/cases/conformance/expressions/typeGuards/typeGuardsInFunctionAndModuleBlock.ts +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardsInFunctionAndModuleBlock.ts @@ -49,9 +49,9 @@ function foo5(x: number | string | boolean) { } } } -module m { +namespace m { var x: number | string | boolean; - module m2 { + namespace m2 { var b = x; // new scope - number | boolean | string var y: string; if (typeof x === "string") { @@ -63,7 +63,7 @@ module m { } } } -module m1 { +namespace m1 { var x: number | string | boolean; module m2.m3 { var b = x; // new scope - number | boolean | string diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardsInModule.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardsInModule.ts index fd5f432ebdb7b..dc0ab5dfdd3b5 100644 --- a/tests/cases/conformance/expressions/typeGuards/typeGuardsInModule.ts +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardsInModule.ts @@ -6,7 +6,7 @@ var num: number; var strOrNum: string | number; var var1: string | number; // Inside module -module m1 { +namespace m1 { // global vars in function declaration num = typeof var1 === "string" && var1.length; // string @@ -29,10 +29,10 @@ module m1 { } } // local module -module m2 { +namespace m2 { var var2: string | number; export var var3: string | number; - module m3 { + namespace m3 { // global vars in function declaration num = typeof var1 === "string" && var1.length; // string diff --git a/tests/cases/conformance/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithAnyOtherType.ts b/tests/cases/conformance/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithAnyOtherType.ts index 115706d5d379b..b7b63b1371dcd 100644 --- a/tests/cases/conformance/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithAnyOtherType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithAnyOtherType.ts @@ -19,7 +19,7 @@ class A { return a; } } -module M { +namespace M { export var n: any; } var objA = new A(); diff --git a/tests/cases/conformance/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithBooleanType.ts b/tests/cases/conformance/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithBooleanType.ts index 3235901d6229d..449c0079c2120 100644 --- a/tests/cases/conformance/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithBooleanType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithBooleanType.ts @@ -9,7 +9,7 @@ class A { public a: boolean; static foo() { return false; } } -module M { +namespace M { export var n: boolean; } diff --git a/tests/cases/conformance/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithNumberType.ts b/tests/cases/conformance/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithNumberType.ts index b41a114503d75..f80a73f7c59a0 100644 --- a/tests/cases/conformance/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithNumberType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithNumberType.ts @@ -10,7 +10,7 @@ class A { public a: number; static foo() { return 1; } } -module M { +namespace M { export var n: number; } diff --git a/tests/cases/conformance/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithStringType.ts b/tests/cases/conformance/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithStringType.ts index 0b60c73ef94f0..e0b261cf484cc 100644 --- a/tests/cases/conformance/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithStringType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/bitwiseNotOperator/bitwiseNotOperatorWithStringType.ts @@ -10,7 +10,7 @@ class A { public a: string; static foo() { return ""; } } -module M { +namespace M { export var n: string; } diff --git a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherType.ts b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherType.ts index f8efeb81ecb24..b6562299cb7de 100644 --- a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherType.ts @@ -7,7 +7,7 @@ var obj = {x:1,y:null}; class A { public a: any; } -module M { +namespace M { export var n: any; } var objA = new A(); diff --git a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherTypeInvalidOperations.ts b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherTypeInvalidOperations.ts index d5dd62de442bb..610fea7443c4a 100644 --- a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherTypeInvalidOperations.ts +++ b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithAnyOtherTypeInvalidOperations.ts @@ -15,7 +15,7 @@ class A { return a; } } -module M { +namespace M { export var n: any; } var objA = new A(); diff --git a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithNumberType.ts b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithNumberType.ts index 45a2d1fc4a92d..7cbccbcf0ccab 100644 --- a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithNumberType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithNumberType.ts @@ -5,7 +5,7 @@ var NUMBER1: number[] = [1, 2]; class A { public a: number; } -module M { +namespace M { export var n: number; } diff --git a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithNumberTypeInvalidOperations.ts b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithNumberTypeInvalidOperations.ts index 833646b0dfadb..1e9d96107c888 100644 --- a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithNumberTypeInvalidOperations.ts +++ b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithNumberTypeInvalidOperations.ts @@ -8,7 +8,7 @@ class A { public a: number; static foo() { return 1; } } -module M { +namespace M { export var n: number; } diff --git a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedBooleanType.ts b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedBooleanType.ts index 7bc8d827bdaad..617417c72520a 100644 --- a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedBooleanType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedBooleanType.ts @@ -7,7 +7,7 @@ class A { public a: boolean; static foo() { return true; } } -module M { +namespace M { export var n: boolean; } diff --git a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedStringType.ts b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedStringType.ts index f9a990f2b495b..4b9658a207728 100644 --- a/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedStringType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithUnsupportedStringType.ts @@ -8,7 +8,7 @@ class A { public a: string; static foo() { return ""; } } -module M { +namespace M { export var n: string; } diff --git a/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithAnyOtherType.ts b/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithAnyOtherType.ts index c39523913a92d..3954f64481f97 100644 --- a/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithAnyOtherType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithAnyOtherType.ts @@ -16,7 +16,7 @@ class A { return a; } } -module M { +namespace M { export var n: any; } var objA = new A(); diff --git a/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithBooleanType.ts b/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithBooleanType.ts index 36fd43f5ed0ed..c574445954352 100644 --- a/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithBooleanType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithBooleanType.ts @@ -7,7 +7,7 @@ class A { public a: boolean; static foo() { return false; } } -module M { +namespace M { export var n: boolean; } diff --git a/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithNumberType.ts b/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithNumberType.ts index 457ce8cc30284..8ce9862705d94 100644 --- a/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithNumberType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithNumberType.ts @@ -8,7 +8,7 @@ class A { public a: number; static foo() { return 1; } } -module M { +namespace M { export var n: number; } diff --git a/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithStringType.ts b/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithStringType.ts index 0d404d4f51070..90a2a9bc3a9f1 100644 --- a/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithStringType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/deleteOperator/deleteOperatorWithStringType.ts @@ -8,7 +8,7 @@ class A { public a: string; static foo() { return ""; } } -module M { +namespace M { export var n: string; } diff --git a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherType.ts b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherType.ts index 09f272442e1ee..c36cd5ca480b0 100644 --- a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherType.ts @@ -7,7 +7,7 @@ var obj = {x:1,y:null}; class A { public a: any; } -module M { +namespace M { export var n: any; } var objA = new A(); diff --git a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherTypeInvalidOperations.ts b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherTypeInvalidOperations.ts index 397024d45d631..c5df5cb53a022 100644 --- a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherTypeInvalidOperations.ts +++ b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithAnyOtherTypeInvalidOperations.ts @@ -15,7 +15,7 @@ class A { return a; } } -module M { +namespace M { export var n: any; } var objA = new A(); diff --git a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithNumberType.ts b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithNumberType.ts index 0c5464b879bff..b0c39836ae09e 100644 --- a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithNumberType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithNumberType.ts @@ -5,7 +5,7 @@ var NUMBER1: number[] = [1, 2]; class A { public a: number; } -module M { +namespace M { export var n: number; } diff --git a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithNumberTypeInvalidOperations.ts b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithNumberTypeInvalidOperations.ts index acc2d50b477c2..6485392c3e4bc 100644 --- a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithNumberTypeInvalidOperations.ts +++ b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithNumberTypeInvalidOperations.ts @@ -8,7 +8,7 @@ class A { public a: number; static foo() { return 1; } } -module M { +namespace M { export var n: number; } diff --git a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedBooleanType.ts b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedBooleanType.ts index c4988e5521411..7985957cee984 100644 --- a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedBooleanType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedBooleanType.ts @@ -7,7 +7,7 @@ class A { public a: boolean; static foo() { return true; } } -module M { +namespace M { export var n: boolean; } diff --git a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedStringType.ts b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedStringType.ts index b2342e6d90e55..af73a815238f9 100644 --- a/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedStringType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithUnsupportedStringType.ts @@ -8,7 +8,7 @@ class A { public a: string; static foo() { return ""; } } -module M { +namespace M { export var n: string; } diff --git a/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithAnyOtherType.ts b/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithAnyOtherType.ts index 6a80c443afd12..a82a6e9625d77 100644 --- a/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithAnyOtherType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithAnyOtherType.ts @@ -16,7 +16,7 @@ class A { return a; } } -module M { +namespace M { export var n: any; } var objA = new A(); diff --git a/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithBooleanType.ts b/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithBooleanType.ts index d89d2e4744526..f8e530b348541 100644 --- a/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithBooleanType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithBooleanType.ts @@ -7,7 +7,7 @@ class A { public a: boolean; static foo() { return false; } } -module M { +namespace M { export var n: boolean; } diff --git a/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithNumberType.ts b/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithNumberType.ts index dd1d402c5ce71..492d06084dcb6 100644 --- a/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithNumberType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithNumberType.ts @@ -8,7 +8,7 @@ class A { public a: number; static foo() { return 1; } } -module M { +namespace M { export var n: number; } diff --git a/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithStringType.ts b/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithStringType.ts index 5726610921fee..84c311fcfffa6 100644 --- a/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithStringType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorWithStringType.ts @@ -8,7 +8,7 @@ class A { public a: string; static foo() { return ""; } } -module M { +namespace M { export var n: string; } diff --git a/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithAnyOtherType.ts b/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithAnyOtherType.ts index d29b1a845eba2..1bc646fc84dda 100644 --- a/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithAnyOtherType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithAnyOtherType.ts @@ -17,7 +17,7 @@ class A { return a; } } -module M { +namespace M { export var n: any; } var objA = new A(); diff --git a/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithBooleanType.ts b/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithBooleanType.ts index c2c556320c1b5..9f2a6a21c2a88 100644 --- a/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithBooleanType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithBooleanType.ts @@ -7,7 +7,7 @@ class A { public a: boolean; static foo() { return false; } } -module M { +namespace M { export var n: boolean; } diff --git a/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithNumberType.ts b/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithNumberType.ts index 0560035d1e606..681b71e87bb7a 100644 --- a/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithNumberType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithNumberType.ts @@ -8,7 +8,7 @@ class A { public a: number; static foo() { return 1; } } -module M { +namespace M { export var n: number; } diff --git a/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithStringType.ts b/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithStringType.ts index 858819dd73d3d..d2f4480689b2f 100644 --- a/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithStringType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/negateOperator/negateOperatorWithStringType.ts @@ -8,7 +8,7 @@ class A { public a: string; static foo() { return ""; } } -module M { +namespace M { export var n: string; } diff --git a/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithAnyOtherType.ts b/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithAnyOtherType.ts index ec90e29f50a61..0f858adad6068 100644 --- a/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithAnyOtherType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithAnyOtherType.ts @@ -17,7 +17,7 @@ class A { return a; } } -module M { +namespace M { export var n: any; } var objA = new A(); diff --git a/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithBooleanType.ts b/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithBooleanType.ts index dc8c1f97557a0..f636ee849fd96 100644 --- a/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithBooleanType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithBooleanType.ts @@ -7,7 +7,7 @@ class A { public a: boolean; static foo() { return false; } } -module M { +namespace M { export var n: boolean; } diff --git a/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithNumberType.ts b/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithNumberType.ts index 9ab553d54538d..eae2f4a373f02 100644 --- a/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithNumberType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithNumberType.ts @@ -8,7 +8,7 @@ class A { public a: number; static foo() { return 1; } } -module M { +namespace M { export var n: number; } diff --git a/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithStringType.ts b/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithStringType.ts index 7d64596ad5674..2ba0f993c0fa1 100644 --- a/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithStringType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/plusOperator/plusOperatorWithStringType.ts @@ -8,7 +8,7 @@ class A { public a: string; static foo() { return ""; } } -module M { +namespace M { export var n: string; } diff --git a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithAnyOtherType.ts b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithAnyOtherType.ts index 3ff53d71dc754..1914d968045c2 100644 --- a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithAnyOtherType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithAnyOtherType.ts @@ -17,7 +17,7 @@ class A { return a; } } -module M { +namespace M { export var n: any; } var objA = new A(); diff --git a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithBooleanType.ts b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithBooleanType.ts index c22ed94087b6b..5a4bf1abe9e4c 100644 --- a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithBooleanType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithBooleanType.ts @@ -9,7 +9,7 @@ class A { public a: boolean; static foo() { return false; } } -module M { +namespace M { export var n: boolean; } diff --git a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithNumberType.ts b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithNumberType.ts index 81687e4f86098..eec41e9ba6c44 100644 --- a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithNumberType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithNumberType.ts @@ -9,7 +9,7 @@ class A { public a: number; static foo() { return 1; } } -module M { +namespace M { export var n: number; } diff --git a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithStringType.ts b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithStringType.ts index 38e57e1ec5584..4e9a19464fb64 100644 --- a/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithStringType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/typeofOperator/typeofOperatorWithStringType.ts @@ -8,7 +8,7 @@ class A { public a: string; static foo() { return ""; } } -module M { +namespace M { export var n: string; } diff --git a/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithAnyOtherType.ts b/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithAnyOtherType.ts index 761c22b925294..2a0057158e361 100644 --- a/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithAnyOtherType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithAnyOtherType.ts @@ -17,7 +17,7 @@ class A { return a; } } -module M { +namespace M { export var n: any; } var objA = new A(); diff --git a/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithBooleanType.ts b/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithBooleanType.ts index bbdd7187e0a34..ffbe615132f41 100644 --- a/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithBooleanType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithBooleanType.ts @@ -7,7 +7,7 @@ class A { public a: boolean; static foo() { return false; } } -module M { +namespace M { export var n: boolean; } diff --git a/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithNumberType.ts b/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithNumberType.ts index 52f57b8d87062..aad5daf7586f1 100644 --- a/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithNumberType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithNumberType.ts @@ -8,7 +8,7 @@ class A { public a: number; static foo() { return 1; } } -module M { +namespace M { export var n: number; } diff --git a/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithStringType.ts b/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithStringType.ts index 858e9d3890715..fe4d83149a735 100644 --- a/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithStringType.ts +++ b/tests/cases/conformance/expressions/unaryOperators/voidOperator/voidOperatorWithStringType.ts @@ -8,7 +8,7 @@ class A { public a: string; static foo() { return ""; } } -module M { +namespace M { export var n: string; } diff --git a/tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts b/tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts index 38b52a2c70b20..fa6cd60cb6155 100644 --- a/tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts +++ b/tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts @@ -4,7 +4,7 @@ x = 3; // OK x = ''; // Error (x) = ''; // Error -module M { +namespace M { export var y: number; } M.y = 3; // OK @@ -17,8 +17,8 @@ M.y = ''; // Error M = { y: 3 }; // Error (M) = { y: 3 }; // Error -module M2 { - export module M3 { +namespace M2 { + export namespace M3 { export var x: number; } diff --git a/tests/cases/conformance/expressions/valuesAndReferences/assignments.ts b/tests/cases/conformance/expressions/valuesAndReferences/assignments.ts index c50a541523cd2..5746716b10665 100644 --- a/tests/cases/conformance/expressions/valuesAndReferences/assignments.ts +++ b/tests/cases/conformance/expressions/valuesAndReferences/assignments.ts @@ -7,7 +7,7 @@ // Assign to a parameter // Assign to an interface -module M { } +namespace M { } M = null; // Error class C { } diff --git a/tests/cases/conformance/externalModules/amdImportNotAsPrimaryExpression.ts b/tests/cases/conformance/externalModules/amdImportNotAsPrimaryExpression.ts index 63db6f2ec3343..6abd14942e529 100644 --- a/tests/cases/conformance/externalModules/amdImportNotAsPrimaryExpression.ts +++ b/tests/cases/conformance/externalModules/amdImportNotAsPrimaryExpression.ts @@ -10,7 +10,7 @@ export interface I1 { age: number; } -export module M1 { +export namespace M1 { export interface I2 { foo: string; } diff --git a/tests/cases/conformance/externalModules/asiPreventsParsingAsAmbientExternalModule02.ts b/tests/cases/conformance/externalModules/asiPreventsParsingAsAmbientExternalModule02.ts index ba0b2d48d62a3..27dbe1659609d 100644 --- a/tests/cases/conformance/externalModules/asiPreventsParsingAsAmbientExternalModule02.ts +++ b/tests/cases/conformance/externalModules/asiPreventsParsingAsAmbientExternalModule02.ts @@ -2,7 +2,7 @@ var declare: number; var module: string; -module container { +namespace container { declare // this is the identifier 'declare' module // this is the identifier 'module' "my external module" // this is just a string diff --git a/tests/cases/conformance/externalModules/circularReference.ts b/tests/cases/conformance/externalModules/circularReference.ts index 86afa6b314d0b..acefd7b3ed067 100644 --- a/tests/cases/conformance/externalModules/circularReference.ts +++ b/tests/cases/conformance/externalModules/circularReference.ts @@ -1,6 +1,6 @@ // @Filename: foo1.ts import foo2 = require('./foo2'); -export module M1 { +export namespace M1 { export class C1 { m1: foo2.M1.C1; x: number; @@ -14,7 +14,7 @@ export module M1 { // @Filename: foo2.ts import foo1 = require('./foo1'); -export module M1 { +export namespace M1 { export class C1 { m1: foo1.M1.C1; y: number diff --git a/tests/cases/conformance/externalModules/commonJSImportNotAsPrimaryExpression.ts b/tests/cases/conformance/externalModules/commonJSImportNotAsPrimaryExpression.ts index b7ee8892908f9..4550f89fdf6a5 100644 --- a/tests/cases/conformance/externalModules/commonJSImportNotAsPrimaryExpression.ts +++ b/tests/cases/conformance/externalModules/commonJSImportNotAsPrimaryExpression.ts @@ -10,7 +10,7 @@ export interface I1 { age: number; } -export module M1 { +export namespace M1 { export interface I2 { foo: string; } diff --git a/tests/cases/conformance/externalModules/duplicateExportAssignments.ts b/tests/cases/conformance/externalModules/duplicateExportAssignments.ts index 5d9cb441435f9..a34fc806b2e8c 100644 --- a/tests/cases/conformance/externalModules/duplicateExportAssignments.ts +++ b/tests/cases/conformance/externalModules/duplicateExportAssignments.ts @@ -11,7 +11,7 @@ export = x; export = y; // @Filename: foo3.ts -module x { +namespace x { export var x = 10; } class y { diff --git a/tests/cases/conformance/externalModules/exportAssignmentCircularModules.ts b/tests/cases/conformance/externalModules/exportAssignmentCircularModules.ts index 1863fb83d632e..025e4f93c9886 100644 --- a/tests/cases/conformance/externalModules/exportAssignmentCircularModules.ts +++ b/tests/cases/conformance/externalModules/exportAssignmentCircularModules.ts @@ -1,21 +1,21 @@ // @module: amd // @Filename: foo_0.ts import foo1 = require('./foo_1'); -module Foo { +namespace Foo { export var x = foo1.x; } export = Foo; // @Filename: foo_1.ts import foo2 = require("./foo_2"); -module Foo { +namespace Foo { export var x = foo2.x; } export = Foo; // @Filename: foo_2.ts import foo0 = require("./foo_0"); -module Foo { +namespace Foo { export var x = foo0.x; } export = Foo; diff --git a/tests/cases/conformance/externalModules/exportAssignmentMergedModule.ts b/tests/cases/conformance/externalModules/exportAssignmentMergedModule.ts index 123b4251cdc98..1746a7a2f6e90 100644 --- a/tests/cases/conformance/externalModules/exportAssignmentMergedModule.ts +++ b/tests/cases/conformance/externalModules/exportAssignmentMergedModule.ts @@ -1,16 +1,16 @@ // @module: commonjs // @Filename: foo_0.ts -module Foo { +namespace Foo { export function a(){ return 5; } export var b = true; } -module Foo { +namespace Foo { export function c(a: number){ return a; } - export module Test { + export namespace Test { export var answer = 42; } } diff --git a/tests/cases/conformance/externalModules/exportAssignmentTopLevelClodule.ts b/tests/cases/conformance/externalModules/exportAssignmentTopLevelClodule.ts index 66e3286a730cd..db57293cf32f3 100644 --- a/tests/cases/conformance/externalModules/exportAssignmentTopLevelClodule.ts +++ b/tests/cases/conformance/externalModules/exportAssignmentTopLevelClodule.ts @@ -3,7 +3,7 @@ class Foo { test = "test"; } -module Foo { +namespace Foo { export var answer = 42; } export = Foo; diff --git a/tests/cases/conformance/externalModules/exportAssignmentTopLevelEnumdule.ts b/tests/cases/conformance/externalModules/exportAssignmentTopLevelEnumdule.ts index 10d9f64bdd923..e34e50f50e9a9 100644 --- a/tests/cases/conformance/externalModules/exportAssignmentTopLevelEnumdule.ts +++ b/tests/cases/conformance/externalModules/exportAssignmentTopLevelEnumdule.ts @@ -3,7 +3,7 @@ enum foo { red, green, blue } -module foo { +namespace foo { export var answer = 42; } export = foo; diff --git a/tests/cases/conformance/externalModules/exportAssignmentTopLevelFundule.ts b/tests/cases/conformance/externalModules/exportAssignmentTopLevelFundule.ts index 2df3e7cd52dce..bf97c490170f5 100644 --- a/tests/cases/conformance/externalModules/exportAssignmentTopLevelFundule.ts +++ b/tests/cases/conformance/externalModules/exportAssignmentTopLevelFundule.ts @@ -3,7 +3,7 @@ function foo() { return "test"; } -module foo { +namespace foo { export var answer = 42; } export = foo; diff --git a/tests/cases/conformance/externalModules/exportAssignmentTopLevelIdentifier.ts b/tests/cases/conformance/externalModules/exportAssignmentTopLevelIdentifier.ts index 684b7a10c6230..85f759962f4bb 100644 --- a/tests/cases/conformance/externalModules/exportAssignmentTopLevelIdentifier.ts +++ b/tests/cases/conformance/externalModules/exportAssignmentTopLevelIdentifier.ts @@ -1,6 +1,6 @@ // @module: amd // @Filename: foo_0.ts -module Foo { +namespace Foo { export var answer = 42; } export = Foo; diff --git a/tests/cases/conformance/externalModules/exportDeclaredModule.ts b/tests/cases/conformance/externalModules/exportDeclaredModule.ts index 6038b79f3bae5..fe72c1eff26bf 100644 --- a/tests/cases/conformance/externalModules/exportDeclaredModule.ts +++ b/tests/cases/conformance/externalModules/exportDeclaredModule.ts @@ -1,6 +1,6 @@ // @Filename: foo1.ts -declare module M1 { +declare namespace M1 { export var a: string; export function b(): number; } diff --git a/tests/cases/conformance/externalModules/exportNonInitializedVariablesAMD.ts b/tests/cases/conformance/externalModules/exportNonInitializedVariablesAMD.ts index f6ad233d4f6af..4875a90842487 100644 --- a/tests/cases/conformance/externalModules/exportNonInitializedVariablesAMD.ts +++ b/tests/cases/conformance/externalModules/exportNonInitializedVariablesAMD.ts @@ -17,7 +17,7 @@ namespace B { export let x, y, z; } -module C { +namespace C { export var a = 1, b, c = 2; export var x, y, z; } diff --git a/tests/cases/conformance/externalModules/exportNonInitializedVariablesCommonJS.ts b/tests/cases/conformance/externalModules/exportNonInitializedVariablesCommonJS.ts index dd43474972ce3..a4a9bbc997d83 100644 --- a/tests/cases/conformance/externalModules/exportNonInitializedVariablesCommonJS.ts +++ b/tests/cases/conformance/externalModules/exportNonInitializedVariablesCommonJS.ts @@ -17,7 +17,7 @@ namespace B { export let x, y, z; } -module C { +namespace C { export var a = 1, b, c = 2; export var x, y, z; } diff --git a/tests/cases/conformance/externalModules/exportNonInitializedVariablesES6.ts b/tests/cases/conformance/externalModules/exportNonInitializedVariablesES6.ts index 86319311f96fa..0daf3e422d70c 100644 --- a/tests/cases/conformance/externalModules/exportNonInitializedVariablesES6.ts +++ b/tests/cases/conformance/externalModules/exportNonInitializedVariablesES6.ts @@ -17,7 +17,7 @@ namespace B { export let x, y, z; } -module C { +namespace C { export var a = 1, b, c = 2; export var x, y, z; } diff --git a/tests/cases/conformance/externalModules/exportNonInitializedVariablesSystem.ts b/tests/cases/conformance/externalModules/exportNonInitializedVariablesSystem.ts index 2105dd61b1c15..a10175975e56a 100644 --- a/tests/cases/conformance/externalModules/exportNonInitializedVariablesSystem.ts +++ b/tests/cases/conformance/externalModules/exportNonInitializedVariablesSystem.ts @@ -17,7 +17,7 @@ namespace B { export let x, y, z; } -module C { +namespace C { export var a = 1, b, c = 2; export var x, y, z; } diff --git a/tests/cases/conformance/externalModules/exportNonInitializedVariablesUMD.ts b/tests/cases/conformance/externalModules/exportNonInitializedVariablesUMD.ts index b4d767a223c65..c92632defd812 100644 --- a/tests/cases/conformance/externalModules/exportNonInitializedVariablesUMD.ts +++ b/tests/cases/conformance/externalModules/exportNonInitializedVariablesUMD.ts @@ -17,7 +17,7 @@ namespace B { export let x, y, z; } -module C { +namespace C { export var a = 1, b, c = 2; export var x, y, z; } diff --git a/tests/cases/conformance/externalModules/importNonExternalModule.ts b/tests/cases/conformance/externalModules/importNonExternalModule.ts index 5e7d43f0ef82f..c0df030aa941e 100644 --- a/tests/cases/conformance/externalModules/importNonExternalModule.ts +++ b/tests/cases/conformance/externalModules/importNonExternalModule.ts @@ -1,6 +1,6 @@ // @module: amd // @Filename: foo_0.ts -module foo { +namespace foo { export var answer = 42; } diff --git a/tests/cases/conformance/externalModules/initializersInDeclarations.ts b/tests/cases/conformance/externalModules/initializersInDeclarations.ts index 2821c693f5293..b1b5ed6d7c438 100644 --- a/tests/cases/conformance/externalModules/initializersInDeclarations.ts +++ b/tests/cases/conformance/externalModules/initializersInDeclarations.ts @@ -13,7 +13,7 @@ declare class Foo { declare var x = []; declare var y = {}; -declare module M1 { +declare namespace M1 { while(true); export var v1 = () => false; diff --git a/tests/cases/conformance/externalModules/nameWithRelativePaths.ts b/tests/cases/conformance/externalModules/nameWithRelativePaths.ts index 72545d1b3a07d..87006ca52af86 100644 --- a/tests/cases/conformance/externalModules/nameWithRelativePaths.ts +++ b/tests/cases/conformance/externalModules/nameWithRelativePaths.ts @@ -8,7 +8,7 @@ export function f(){ } // @Filename: test/foo_2.ts -export module M2 { +export namespace M2 { export var x = true; } diff --git a/tests/cases/conformance/externalModules/relativePathToDeclarationFile.ts b/tests/cases/conformance/externalModules/relativePathToDeclarationFile.ts index 71b8a1eb1a2f8..3569bf175956a 100644 --- a/tests/cases/conformance/externalModules/relativePathToDeclarationFile.ts +++ b/tests/cases/conformance/externalModules/relativePathToDeclarationFile.ts @@ -1,11 +1,11 @@ // @ModuleResolution: classic // @Filename: test/foo.d.ts -export declare module M2 { +export declare namespace M2 { export var x: boolean; } // @Filename: test/other.d.ts -export declare module M2 { +export declare namespace M2 { export var x: string; } diff --git a/tests/cases/conformance/externalModules/typesOnlyExternalModuleStillHasInstance.ts b/tests/cases/conformance/externalModules/typesOnlyExternalModuleStillHasInstance.ts index 3f7bc3fa42c07..52ce0a383896c 100644 --- a/tests/cases/conformance/externalModules/typesOnlyExternalModuleStillHasInstance.ts +++ b/tests/cases/conformance/externalModules/typesOnlyExternalModuleStillHasInstance.ts @@ -5,7 +5,7 @@ export interface Person { age: number; } -export module M2 { +export namespace M2 { export interface I2 { x: Person; } diff --git a/tests/cases/conformance/functions/functionNameConflicts.ts b/tests/cases/conformance/functions/functionNameConflicts.ts index b9560baca2951..0b12a231fb7ea 100644 --- a/tests/cases/conformance/functions/functionNameConflicts.ts +++ b/tests/cases/conformance/functions/functionNameConflicts.ts @@ -1,7 +1,7 @@ //Function and variable of the same name in same declaration space //Function overload with different name from implementation signature -module M { +namespace M { function fn1() { } var fn1; diff --git a/tests/cases/conformance/functions/functionOverloadErrors.ts b/tests/cases/conformance/functions/functionOverloadErrors.ts index cf323163aa3d8..1f917b17fa215 100644 --- a/tests/cases/conformance/functions/functionOverloadErrors.ts +++ b/tests/cases/conformance/functions/functionOverloadErrors.ts @@ -71,7 +71,7 @@ class cls { } //Function overloads with differing export -module M { +namespace M { export function fn1(); function fn1(n: string); function fn1() { } diff --git a/tests/cases/conformance/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName.ts b/tests/cases/conformance/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName.ts index e5aa617adb8ab..d9ff11cdc74c3 100644 --- a/tests/cases/conformance/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName.ts +++ b/tests/cases/conformance/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName.ts @@ -8,7 +8,7 @@ interface A { // error bar: T; } -module M { +namespace M { interface A { bar: T; } @@ -18,25 +18,25 @@ module M { } } -module M2 { +namespace M2 { interface A { foo: string; } } -module M2 { +namespace M2 { interface A { // ok, different declaration space than other M2 bar: T; } } -module M3 { +namespace M3 { export interface A { foo: string; } } -module M3 { +namespace M3 { export interface A { // error bar: T; } diff --git a/tests/cases/conformance/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName2.ts b/tests/cases/conformance/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName2.ts index 8a3ba591776c4..f2e38faa75fed 100644 --- a/tests/cases/conformance/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName2.ts +++ b/tests/cases/conformance/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName2.ts @@ -1,25 +1,25 @@ // generic and non-generic interfaces with the same name do not merge -module M { +namespace M { interface A { bar: T; } } -module M2 { +namespace M2 { interface A { // ok foo: string; } } -module N { - module M { +namespace N { + namespace M { interface A { bar: T; } } - module M2 { + namespace M2 { interface A { // ok foo: string; } diff --git a/tests/cases/conformance/interfaces/declarationMerging/mergeThreeInterfaces.ts b/tests/cases/conformance/interfaces/declarationMerging/mergeThreeInterfaces.ts index cd545ed1c6b59..3c2aa75593b11 100644 --- a/tests/cases/conformance/interfaces/declarationMerging/mergeThreeInterfaces.ts +++ b/tests/cases/conformance/interfaces/declarationMerging/mergeThreeInterfaces.ts @@ -37,7 +37,7 @@ var r5 = b.bar; var r6 = b.baz; // basic non-generic and generic case inside a module -module M { +namespace M { interface A { foo: string; } diff --git a/tests/cases/conformance/interfaces/declarationMerging/mergeThreeInterfaces2.ts b/tests/cases/conformance/interfaces/declarationMerging/mergeThreeInterfaces2.ts index 6eb10b9ce013b..26acec745eb0c 100644 --- a/tests/cases/conformance/interfaces/declarationMerging/mergeThreeInterfaces2.ts +++ b/tests/cases/conformance/interfaces/declarationMerging/mergeThreeInterfaces2.ts @@ -1,7 +1,7 @@ // two interfaces with the same root module should merge // root module now multiple module declarations -module M2 { +namespace M2 { export interface A { foo: string; } @@ -11,7 +11,7 @@ module M2 { var r2 = a.bar; } -module M2 { +namespace M2 { export interface A { bar: number; } @@ -27,8 +27,8 @@ module M2 { } // same as above but with an additional level of nesting and third module declaration -module M2 { - export module M3 { +namespace M2 { + export namespace M3 { export interface A { foo: string; } @@ -39,8 +39,8 @@ module M2 { } } -module M2 { - export module M3 { +namespace M2 { + export namespace M3 { export interface A { bar: number; } @@ -53,8 +53,8 @@ module M2 { } } -module M2 { - export module M3 { +namespace M2 { + export namespace M3 { export interface A { baz: boolean; } diff --git a/tests/cases/conformance/interfaces/declarationMerging/mergeTwoInterfaces.ts b/tests/cases/conformance/interfaces/declarationMerging/mergeTwoInterfaces.ts index 60b01ac378785..52e2908285ba6 100644 --- a/tests/cases/conformance/interfaces/declarationMerging/mergeTwoInterfaces.ts +++ b/tests/cases/conformance/interfaces/declarationMerging/mergeTwoInterfaces.ts @@ -28,7 +28,7 @@ var r3 = b.foo var r4 = b.bar; // basic non-generic and generic case inside a module -module M { +namespace M { interface A { foo: string; } diff --git a/tests/cases/conformance/interfaces/declarationMerging/mergeTwoInterfaces2.ts b/tests/cases/conformance/interfaces/declarationMerging/mergeTwoInterfaces2.ts index 3b8840ece0440..44201975122e9 100644 --- a/tests/cases/conformance/interfaces/declarationMerging/mergeTwoInterfaces2.ts +++ b/tests/cases/conformance/interfaces/declarationMerging/mergeTwoInterfaces2.ts @@ -1,7 +1,7 @@ // two interfaces with the same root module should merge // root module now multiple module declarations -module M2 { +namespace M2 { export interface A { foo: string; } @@ -11,7 +11,7 @@ module M2 { var r2 = a.bar; } -module M2 { +namespace M2 { export interface A { bar: number; } @@ -22,8 +22,8 @@ module M2 { } // same as above but with an additional level of nesting -module M2 { - export module M3 { +namespace M2 { + export namespace M3 { export interface A { foo: string; } @@ -34,8 +34,8 @@ module M2 { } } -module M2 { - export module M3 { +namespace M2 { + export namespace M3 { export interface A { bar: number; } diff --git a/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithConflictingPropertyNames.ts b/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithConflictingPropertyNames.ts index 6b0d65770f952..c3f470a93be63 100644 --- a/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithConflictingPropertyNames.ts +++ b/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithConflictingPropertyNames.ts @@ -6,7 +6,7 @@ interface A { x: number; } -module M { +namespace M { interface A { x: T; } @@ -16,25 +16,25 @@ module M { } } -module M2 { +namespace M2 { interface A { x: T; } } -module M2 { +namespace M2 { interface A { x: number; // ok, different declaration space than other M2 } } -module M3 { +namespace M3 { export interface A { x: T; } } -module M3 { +namespace M3 { export interface A { x: number; // error } diff --git a/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithConflictingPropertyNames2.ts b/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithConflictingPropertyNames2.ts index 00d35e64c349b..9040cd2b90ca2 100644 --- a/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithConflictingPropertyNames2.ts +++ b/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithConflictingPropertyNames2.ts @@ -6,7 +6,7 @@ interface A { x: string; // error } -module M { +namespace M { interface A { x: T; } @@ -16,25 +16,25 @@ module M { } } -module M2 { +namespace M2 { interface A { x: T; } } -module M2 { +namespace M2 { interface A { x: T; // ok, different declaration space than other M2 } } -module M3 { +namespace M3 { export interface A { x: T; } } -module M3 { +namespace M3 { export interface A { x: T; // error } diff --git a/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates3.ts b/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates3.ts index 56295627fe38b..4216860e7824e 100644 --- a/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates3.ts +++ b/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates3.ts @@ -19,7 +19,7 @@ class D extends C implements A { // error z: string; } -module M { +namespace M { class C { private x: string; } diff --git a/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithMultipleBases.ts b/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithMultipleBases.ts index b58360babacbe..f12b7adc3ba43 100644 --- a/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithMultipleBases.ts +++ b/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithMultipleBases.ts @@ -28,7 +28,7 @@ var a: A; var r = a.a; // generic interfaces in a module -module M { +namespace M { class C { a: T; } diff --git a/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithMultipleBases2.ts b/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithMultipleBases2.ts index 3b830f117056d..e3e21915e845a 100644 --- a/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithMultipleBases2.ts +++ b/tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithMultipleBases2.ts @@ -39,7 +39,7 @@ var a: A; var r = a.a; // generic interfaces in a module -module M { +namespace M { class C { a: T; } diff --git a/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName.ts b/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName.ts index 61695c0f869e8..901482569828d 100644 --- a/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName.ts +++ b/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName.ts @@ -16,7 +16,7 @@ interface B { // error y: V; } -module M { +namespace M { interface A { x: T; } @@ -34,25 +34,25 @@ module M { } } -module M2 { +namespace M2 { interface B { x: U; } } -module M2 { +namespace M2 { interface B { // ok, different declaration space than other M2 y: V; } } -module M3 { +namespace M3 { export interface B { x: U; } } -module M3 { +namespace M3 { export interface B { // error y: V; } diff --git a/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName2.ts b/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName2.ts index 8f2639a2e1134..1a3913bc20556 100644 --- a/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName2.ts +++ b/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName2.ts @@ -8,7 +8,7 @@ interface B { // error y: V; } -module M { +namespace M { interface B { x: U; } @@ -18,25 +18,25 @@ module M { } } -module M2 { +namespace M2 { interface B { x: U; } } -module M2 { +namespace M2 { interface B { // ok, different declaration space than other M2 y: T; } } -module M3 { +namespace M3 { export interface B { x: U; } } -module M3 { +namespace M3 { export interface B { // error y: T; } diff --git a/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts b/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts index 6963277915af1..e5901942e756f 100644 --- a/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts +++ b/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts @@ -6,7 +6,7 @@ interface A { // error y: T; } -module M { +namespace M { interface B> { x: T; } @@ -16,25 +16,25 @@ module M { } } -module M2 { +namespace M2 { interface A { x: T; } } -module M2 { +namespace M2 { interface A { // ok, different declaration space from other M2.A y: T; } } -module M3 { +namespace M3 { export interface A { x: T; } } -module M3 { +namespace M3 { export interface A { // error y: T; } diff --git a/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithTheSameNameButDifferentArity.ts b/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithTheSameNameButDifferentArity.ts index cfaa1c04d3bed..888d21be751b1 100644 --- a/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithTheSameNameButDifferentArity.ts +++ b/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithTheSameNameButDifferentArity.ts @@ -6,7 +6,7 @@ interface A { // error y: T; } -module M { +namespace M { interface A { x: T; } @@ -16,25 +16,25 @@ module M { } } -module M2 { +namespace M2 { interface A { x: T; } } -module M2 { +namespace M2 { interface A { // ok, different declaration space than other M2 y: T; } } -module M3 { +namespace M3 { export interface A { x: T; } } -module M3 { +namespace M3 { export interface A { // error y: T; } diff --git a/tests/cases/conformance/interfaces/declarationMerging/twoInterfacesDifferentRootModule.ts b/tests/cases/conformance/interfaces/declarationMerging/twoInterfacesDifferentRootModule.ts index 36d5ea4f66c0c..d827c65d5035c 100644 --- a/tests/cases/conformance/interfaces/declarationMerging/twoInterfacesDifferentRootModule.ts +++ b/tests/cases/conformance/interfaces/declarationMerging/twoInterfacesDifferentRootModule.ts @@ -1,6 +1,6 @@ // two interfaces with different root modules should not merge -module M { +namespace M { export interface A { foo: string; } @@ -10,7 +10,7 @@ module M { } } -module M2 { +namespace M2 { export interface A { bar: number; } diff --git a/tests/cases/conformance/interfaces/declarationMerging/twoInterfacesDifferentRootModule2.ts b/tests/cases/conformance/interfaces/declarationMerging/twoInterfacesDifferentRootModule2.ts index 49159a0aecda0..1ff421812249d 100644 --- a/tests/cases/conformance/interfaces/declarationMerging/twoInterfacesDifferentRootModule2.ts +++ b/tests/cases/conformance/interfaces/declarationMerging/twoInterfacesDifferentRootModule2.ts @@ -1,6 +1,6 @@ // two interfaces with different root modules should not merge -module M { +namespace M { export interface A { foo: string; } @@ -9,7 +9,7 @@ module M { foo: T; } - module M2 { + namespace M2 { export interface A { bar: number; } diff --git a/tests/cases/conformance/interfaces/declarationMerging/twoMergedInterfacesWithDifferingOverloads2.ts b/tests/cases/conformance/interfaces/declarationMerging/twoMergedInterfacesWithDifferingOverloads2.ts index 63700a2230ef8..0cdcccf19d3c5 100644 --- a/tests/cases/conformance/interfaces/declarationMerging/twoMergedInterfacesWithDifferingOverloads2.ts +++ b/tests/cases/conformance/interfaces/declarationMerging/twoMergedInterfacesWithDifferingOverloads2.ts @@ -12,7 +12,7 @@ var r = a(); var r2 = a(1); var r3 = a(1, 2); -module G { +namespace G { interface A { (): string; (x: T): T; diff --git a/tests/cases/conformance/interfaces/interfaceDeclarations/interfaceThatIndirectlyInheritsFromItself.ts b/tests/cases/conformance/interfaces/interfaceDeclarations/interfaceThatIndirectlyInheritsFromItself.ts index 6febcc798cc4a..1b6a5241c0cbc 100644 --- a/tests/cases/conformance/interfaces/interfaceDeclarations/interfaceThatIndirectlyInheritsFromItself.ts +++ b/tests/cases/conformance/interfaces/interfaceDeclarations/interfaceThatIndirectlyInheritsFromItself.ts @@ -10,7 +10,7 @@ interface Derived2 extends Derived { z: string; } -module Generic { +namespace Generic { interface Base extends Derived2 { // error x: string; } diff --git a/tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithMultipleBaseTypes.ts b/tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithMultipleBaseTypes.ts index 2ad1b2bbfe763..8ad61657b5ae7 100644 --- a/tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithMultipleBaseTypes.ts +++ b/tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithMultipleBaseTypes.ts @@ -24,7 +24,7 @@ interface Derived2 extends Base1, Base2 { // error } } -module Generic { +namespace Generic { interface Base1 { x: { a: T; diff --git a/tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithPropertyOfEveryType.ts b/tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithPropertyOfEveryType.ts index 6979b4057980b..e82d41ae20e4c 100644 --- a/tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithPropertyOfEveryType.ts +++ b/tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithPropertyOfEveryType.ts @@ -1,6 +1,6 @@ class C { foo: string; } function f1() { } -module M { +namespace M { export var y = 1; } enum E { A } diff --git a/tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts b/tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts index f1935e0063154..79ebfd94dd6d5 100644 --- a/tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts +++ b/tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts @@ -21,7 +21,7 @@ class Bar3 extends Foo implements I { // error } // another level of indirection -module M { +namespace M { class Foo { private x: string; } @@ -51,7 +51,7 @@ module M { } // two levels of privates -module M2 { +namespace M2 { class Foo { private x: string; } diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.ts index 62814fd2c3e8b..ef0dc1b2002fc 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.ts @@ -1,5 +1,5 @@ // @filename: module.d.ts -declare module Point { +declare namespace Point { export var Origin: { x: number; y: number; } } diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientWithSameNameAndCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientWithSameNameAndCommonRoot.ts index 12f51f90a7491..6902f30eb7d3e 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientWithSameNameAndCommonRoot.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndAmbientWithSameNameAndCommonRoot.ts @@ -1,6 +1,6 @@ // @filename: module.d.ts -declare module A { - export module Point { +declare namespace A { + export namespace Point { export var Origin: { x: number; y: number; @@ -9,7 +9,7 @@ declare module A { } // @filename: class.d.ts -declare module A { +declare namespace A { export class Point { constructor(x: number, y: number); x: number; diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.ts index e923f1f002d2f..5729188115883 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.ts @@ -1,6 +1,6 @@ // @filename: module.d.ts -declare module A { - export module Point { +declare namespace A { + export namespace Point { export var Origin: { x: number; y: number; @@ -9,7 +9,7 @@ declare module A { } // @filename: classPoint.ts -module A { +namespace A { export class Point { constructor(public x: number, public y: number) { } } diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.ts index 5e6c12e817ada..cc13a9196deb4 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.ts @@ -1,5 +1,5 @@ // @filename: module.d.ts -declare module Point { +declare namespace Point { export var Origin: { x: number; y: number; } } diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts index 596eae2500c46..e568f40712304 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.ts @@ -6,7 +6,7 @@ class clodule1{ value: T; } -module clodule1 { +namespace clodule1 { function f(x: T) { } } @@ -16,7 +16,7 @@ class clodule2{ value: T; } -module clodule2 { +namespace clodule2 { var x: T; class D{ @@ -31,7 +31,7 @@ class clodule3{ value: T; } -module clodule3 { +namespace clodule3 { export var y = { id: T }; } @@ -41,7 +41,7 @@ class clodule4{ value: T; } -module clodule4 { +namespace clodule4 { class D { name: T; } diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts index 95667d95f8da3..0276c30cc6358 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.ts @@ -5,7 +5,7 @@ class clodule { static fn(id: U) { } } -module clodule { +namespace clodule { // error: duplicate identifier expected export function fn(x: T, y: T): T { return x; diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts index 6779d4af7fdc6..7e81a08988cbc 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.ts @@ -5,7 +5,7 @@ class clodule { static fn(id: string) { } } -module clodule { +namespace clodule { // error: duplicate identifier expected export function fn(x: T, y: T): T { return x; diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts index 7342768217826..2441be116ddb9 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts @@ -5,7 +5,7 @@ class clodule { private static sfn(id: string) { return 42; } } -module clodule { +namespace clodule { // error: duplicate identifier expected export function fn(x: T, y: T): number { return clodule.sfn('a'); diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts index 2d19c355e157c..d81e0b09e936f 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.ts @@ -4,19 +4,19 @@ class Point { static Origin(): Point { return { x: 0, y: 0 }; } // unexpected error here bug 840246 } -module Point { +namespace Point { export function Origin() { return null; } //expected duplicate identifier error } -module A { +namespace A { export class Point { constructor(public x: number, public y: number) { } static Origin(): Point { return { x: 0, y: 0 }; } // unexpected error here bug 840246 } - export module Point { + export namespace Point { export function Origin() { return ""; }//expected duplicate identifier error } } \ No newline at end of file diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts index d285d9b422512..43125e9c0ce3f 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts @@ -4,19 +4,19 @@ class Point { static Origin(): Point { return { x: 0, y: 0 }; } } -module Point { +namespace Point { function Origin() { return ""; }// not an error, since not exported } -module A { +namespace A { export class Point { constructor(public x: number, public y: number) { } static Origin(): Point { return { x: 0, y: 0 }; } } - export module Point { + export namespace Point { function Origin() { return ""; }// not an error since not exported } } \ No newline at end of file diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts index 3d70bc65d8d43..8349f7b0999b0 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.ts @@ -4,19 +4,19 @@ class Point { static Origin: Point = { x: 0, y: 0 }; } -module Point { +namespace Point { export var Origin = ""; //expected duplicate identifier error } -module A { +namespace A { export class Point { constructor(public x: number, public y: number) { } static Origin: Point = { x: 0, y: 0 }; } - export module Point { + export namespace Point { export var Origin = ""; //expected duplicate identifier error } } \ No newline at end of file diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts index 6de64190c9701..7de34febe2d85 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts @@ -4,19 +4,19 @@ class Point { static Origin: Point = { x: 0, y: 0 }; } -module Point { +namespace Point { var Origin = ""; // not an error, since not exported } -module A { +namespace A { export class Point { constructor(public x: number, public y: number) { } static Origin: Point = { x: 0, y: 0 }; } - export module Point { + export namespace Point { var Origin = ""; // not an error since not exported } } \ No newline at end of file diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRoot.ts index 37ebf3b64c19e..2fff1261162dd 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRoot.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRoot.ts @@ -12,7 +12,7 @@ module X.Y { // @filename: module.ts module X.Y { - export module Point { + export namespace Point { export var Origin = new Point(0, 0); } } @@ -28,7 +28,7 @@ class A { id: string; } -module A { +namespace A { export var Instance = new A(); } diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRootES6.ts b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRootES6.ts index 3827c06dff0f8..df3e0d1eda49d 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRootES6.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleWithSameNameAndCommonRootES6.ts @@ -13,7 +13,7 @@ module X.Y { // @filename: module.ts module X.Y { - export module Point { + export namespace Point { export var Origin = new Point(0, 0); } } @@ -29,7 +29,7 @@ class A { id: string; } -module A { +namespace A { export var Instance = new A(); } diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/EnumAndModuleWithSameNameAndCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/EnumAndModuleWithSameNameAndCommonRoot.ts index dbb83f27cb747..08e86bf058533 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/EnumAndModuleWithSameNameAndCommonRoot.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/EnumAndModuleWithSameNameAndCommonRoot.ts @@ -2,7 +2,7 @@ enum enumdule { Red, Blue } -module enumdule { +namespace enumdule { export class Point { constructor(public x: number, public y: number) { } diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndCommonRoot.ts index ff496cc50cd53..df056ee05c2af 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndCommonRoot.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndCommonRoot.ts @@ -1,13 +1,13 @@ // @filename: function.ts -module A { +namespace A { export function Point() { return { x: 0, y: 0 }; } } // @filename: module.ts -module A { - export module Point { +namespace A { + export namespace Point { export var Origin = { x: 0, y: 0 }; } } @@ -22,13 +22,13 @@ var cl = A.Point.Origin; // not expected to be an error. // @filename: simple.ts -module B { +namespace B { export function Point() { return { x: 0, y: 0 }; } - export module Point { + export namespace Point { export var Origin = { x: 0, y: 0 }; } } diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndDifferentCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndDifferentCommonRoot.ts index 48776f7ec5268..703d0486efd7c 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndDifferentCommonRoot.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/FunctionAndModuleWithSameNameAndDifferentCommonRoot.ts @@ -1,13 +1,13 @@ // @filename: function.ts -module A { +namespace A { export function Point() { return { x: 0, y: 0 }; } } // @filename: module.ts -module B { - export module Point { +namespace B { + export namespace Point { export var Origin = { x: 0, y: 0 }; } } diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndClassWithSameNameAndCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndClassWithSameNameAndCommonRoot.ts index a08eeecaa5714..f32f00f2c0735 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndClassWithSameNameAndCommonRoot.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndClassWithSameNameAndCommonRoot.ts @@ -1,6 +1,6 @@ // @Filename: module.ts module X.Y { - export module Point { + export namespace Point { export var Origin = new Point(0, 0); } } @@ -19,7 +19,7 @@ module X.Y { } // @Filename: simple.ts -module A { +namespace A { export var Instance = new A(); } diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndEnumWithSameNameAndCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndEnumWithSameNameAndCommonRoot.ts index 8b7ff083f03a7..97ff671777028 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndEnumWithSameNameAndCommonRoot.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndEnumWithSameNameAndCommonRoot.ts @@ -1,4 +1,4 @@ -module enumdule { +namespace enumdule { export class Point { constructor(public x: number, public y: number) { } diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndFunctionWithSameNameAndCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndFunctionWithSameNameAndCommonRoot.ts index 162a9ea5a924c..86527e110f972 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndFunctionWithSameNameAndCommonRoot.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndFunctionWithSameNameAndCommonRoot.ts @@ -1,12 +1,12 @@ // @filename: module.ts -module A { - export module Point { +namespace A { + export namespace Point { export var Origin = { x: 0, y: 0 }; } } // @filename: function.ts -module A { +namespace A { // duplicate identifier error export function Point() { return { x: 0, y: 0 }; @@ -14,9 +14,9 @@ module A { } // @filename: simple.ts -module B { +namespace B { - export module Point { + export namespace Point { export var Origin = { x: 0, y: 0 }; } diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts index 7d88bf62922e1..2281ae73f1af3 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts @@ -1,11 +1,11 @@ -module A { +namespace A { export class Point { x: number; y: number; } } -module A { +namespace A { class Point { fromCarthesian(p: A.Point) { return { x: p.x, y: p.y }; @@ -23,9 +23,9 @@ module X.Y.Z { } } -module X { - export module Y { - export module Z { +namespace X { + export namespace Y { + export namespace Z { class Line { name: string; } diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts index 6ab72d626d955..cf559af81d553 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts @@ -1,4 +1,4 @@ -module A { +namespace A { export interface Point { x: number; y: number; @@ -6,7 +6,7 @@ module A { } } -module A { +namespace A { interface Point { fromCarth(): Point; } @@ -22,7 +22,7 @@ module X.Y.Z { } } -module X { +namespace X { export module Y.Z { interface Line { start: A.Point; diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.ts index d3cad2e424d0a..7fa8af21d42d8 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.ts @@ -1,11 +1,11 @@ //@filename: part1.ts -module A { +namespace A { export interface Point { x: number; y: number; } - export module Utils { + export namespace Utils { export function mirror(p: T) { return { x: p.y, y: p.x }; } @@ -14,11 +14,11 @@ module A { } //@filename: part2.ts -module A { +namespace A { // not a collision, since we don't export var Origin: string = "0,0"; - export module Utils { + export namespace Utils { export class Plane { constructor(public tl: Point, public br: Point) { } } diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts index ab793b91bfae4..ac8072200361f 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.ts @@ -1,11 +1,11 @@ -module A { +namespace A { export class Point { x: number; y: number; } } -module A{ +namespace A{ // expected error export class Point { origin: number; @@ -19,9 +19,9 @@ module X.Y.Z { } } -module X { - export module Y { - export module Z { +namespace X { + export namespace Y { + export namespace Z { // expected error export class Line { name: string; diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts index d82f9d921866a..73ae79211601b 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts @@ -1,4 +1,4 @@ -module A { +namespace A { export interface Point { x: number; y: number; @@ -6,7 +6,7 @@ module A { } } -module A { +namespace A { export interface Point { fromCarth(): Point; } @@ -22,7 +22,7 @@ module X.Y.Z { } } -module X { +namespace X { export module Y.Z { export interface Line { start: A.Point; diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.ts index 99da64e6c06c0..369c0f7f20144 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.ts @@ -1,11 +1,11 @@ //@filename: part1.ts -export module A { +export namespace A { export interface Point { x: number; y: number; } - export module Utils { + export namespace Utils { export function mirror(p: T) { return { x: p.y, y: p.x }; } @@ -15,11 +15,11 @@ export module A { } //@filename: part2.ts -export module A { +export namespace A { // collision with 'Origin' var in other part of merged module export var Origin: Point = { x: 0, y: 0 }; - export module Utils { + export namespace Utils { export class Plane { constructor(public tl: Point, public br: Point) { } } diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts index 449e6e76a27c4..8026ec81844a7 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts @@ -2,8 +2,8 @@ module A.B { export var x: number; } -module A{ - module B { +namespace A{ + namespace B { export var x: string; } } @@ -18,9 +18,9 @@ module X.Y.Z { } } -module X { - export module Y { - module Z { +namespace X { + export namespace Y { + namespace Z { export class Line { name: string; } diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.ts index 11210453649ca..ba5c22ba967fa 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.ts @@ -1,12 +1,12 @@ //@filename: part1.ts -module Root { - export module A { +namespace Root { + export namespace A { export interface Point { x: number; y: number; } - export module Utils { + export namespace Utils { export function mirror(p: T) { return { x: p.y, y: p.x }; } @@ -15,12 +15,12 @@ module Root { } //@filename: part2.ts -module otherRoot { - export module A { +namespace otherRoot { + export namespace A { // have to be fully qualified since in different root export var Origin: Root.A.Point = { x: 0, y: 0 }; - export module Utils { + export namespace Utils { export class Plane { constructor(public tl: Root.A.Point, public br: Root.A.Point) { } } diff --git a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndSameCommonRoot.ts b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndSameCommonRoot.ts index 6f75c9c4d0617..f56c42550ee2f 100644 --- a/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndSameCommonRoot.ts +++ b/tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesWithTheSameNameAndSameCommonRoot.ts @@ -1,11 +1,11 @@ //@filename: part1.ts -module A { +namespace A { export interface Point { x: number; y: number; } - export module Utils { + export namespace Utils { export function mirror(p: T) { return { x: p.y, y: p.x }; } @@ -13,10 +13,10 @@ module A { } //@filename: part2.ts -module A { +namespace A { export var Origin: Point = { x: 0, y: 0 }; - export module Utils { + export namespace Utils { export class Plane { constructor(public tl: Point, public br: Point) { } } diff --git a/tests/cases/conformance/internalModules/codeGeneration/exportCodeGen.ts b/tests/cases/conformance/internalModules/codeGeneration/exportCodeGen.ts index 02398acbbbf59..41681da242c87 100644 --- a/tests/cases/conformance/internalModules/codeGeneration/exportCodeGen.ts +++ b/tests/cases/conformance/internalModules/codeGeneration/exportCodeGen.ts @@ -1,7 +1,7 @@ // should replace all refs to 'x' in the body, // with fully qualified -module A { +namespace A { export var x = 12; function lt12() { return x < 12; @@ -9,7 +9,7 @@ module A { } // should not fully qualify 'x' -module B { +namespace B { var x = 12; function lt12() { return x < 12; @@ -17,38 +17,38 @@ module B { } // not copied, since not exported -module C { +namespace C { function no() { return false; } } // copies, since exported -module D { +namespace D { export function yes() { return true; } } // validate all exportable statements -module E { +namespace E { export enum Color { Red } export function fn() { } export interface I { id: number } export class C { name: string } - export module M { + export namespace M { export var x = 42; } } // validate all exportable statements, // which are not exported -module F { +namespace F { enum Color { Red } function fn() { } interface I { id: number } class C { name: string } - module M { + namespace M { var x = 42; } } \ No newline at end of file diff --git a/tests/cases/conformance/internalModules/codeGeneration/importStatements.ts b/tests/cases/conformance/internalModules/codeGeneration/importStatements.ts index c984379a15a63..a4d97172147ec 100644 --- a/tests/cases/conformance/internalModules/codeGeneration/importStatements.ts +++ b/tests/cases/conformance/internalModules/codeGeneration/importStatements.ts @@ -1,4 +1,4 @@ -module A { +namespace A { export class Point { constructor(public x: number, public y: number) { } } @@ -7,12 +7,12 @@ module A { } // no code gen expected -module B { +namespace B { import a = A; //Error generates 'var = ;' } // no code gen expected -module C { +namespace C { import a = A; //Error generates 'var = ;' var m: typeof a; var p: a.Point; @@ -20,13 +20,13 @@ module C { } // code gen expected -module D { +namespace D { import a = A; var p = new a.Point(1, 1); } -module E { +namespace E { import a = A; export function xDist(x: a.Point) { return (a.Origin.x - x.x); diff --git a/tests/cases/conformance/internalModules/codeGeneration/importStatementsInterfaces.ts b/tests/cases/conformance/internalModules/codeGeneration/importStatementsInterfaces.ts index 34195045b2d51..51711bfd05434 100644 --- a/tests/cases/conformance/internalModules/codeGeneration/importStatementsInterfaces.ts +++ b/tests/cases/conformance/internalModules/codeGeneration/importStatementsInterfaces.ts @@ -1,10 +1,10 @@ -module A { +namespace A { export interface Point { x: number; y: number; } - export module inA { + export namespace inA { export interface Point3D extends Point { z: number; } @@ -12,12 +12,12 @@ module A { } // no code gen expected -module B { +namespace B { import a = A; } // no code gen expected -module C { +namespace C { import a = A; import b = a.inA; var m: typeof a; @@ -26,14 +26,14 @@ module C { } // no code gen expected -module D { +namespace D { import a = A; var p : a.Point; } // no code gen expected -module E { +namespace E { import a = A.inA; export function xDist(x: a.Point3D) { return 0 - x.x; diff --git a/tests/cases/conformance/internalModules/codeGeneration/nameCollision.ts b/tests/cases/conformance/internalModules/codeGeneration/nameCollision.ts index aef48103cd544..749b258e27f34 100644 --- a/tests/cases/conformance/internalModules/codeGeneration/nameCollision.ts +++ b/tests/cases/conformance/internalModules/codeGeneration/nameCollision.ts @@ -1,15 +1,15 @@ -module A { +namespace A { // these 2 statements force an underscore before the 'A' // in the generated function call. var A = 12; var _A = ''; } -module B { +namespace B { var A = 12; } -module B { +namespace B { // re-opened module with colliding name // this should add an underscore. class B { @@ -17,11 +17,11 @@ module B { } } -module X { +namespace X { var X = 13; - export module Y { + export namespace Y { var Y = 13; - export module Z { + export namespace Z { var X = 12; var Y = 12; var Z = 12; @@ -37,7 +37,7 @@ module Y.Y { // no collision, since interface doesn't // generate code. -module D { +namespace D { export interface D { id: number; } diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ExportClassWhichExtendsInterfaceWithInaccessibleType.ts b/tests/cases/conformance/internalModules/exportDeclarations/ExportClassWhichExtendsInterfaceWithInaccessibleType.ts index 171541d51b5e4..c02b073123d45 100644 --- a/tests/cases/conformance/internalModules/exportDeclarations/ExportClassWhichExtendsInterfaceWithInaccessibleType.ts +++ b/tests/cases/conformance/internalModules/exportDeclarations/ExportClassWhichExtendsInterfaceWithInaccessibleType.ts @@ -1,4 +1,4 @@ -module A { +namespace A { interface Point { x: number; diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts b/tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts index 8713205555bc4..470179f7b056d 100644 --- a/tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts +++ b/tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts @@ -1,4 +1,4 @@ -module A { +namespace A { export class Point { x: number; diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts b/tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts index f20a1893e821e..74ac344f7b5a8 100644 --- a/tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts +++ b/tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts @@ -1,4 +1,4 @@ -module A { +namespace A { class Point { x: number; diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts b/tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts index b75b3703523b4..5f71851e88e54 100644 --- a/tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts +++ b/tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts @@ -1,4 +1,4 @@ -module A { +namespace A { class Point { x: number; diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts b/tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts index 21b8419972a87..703fb89fb26ce 100644 --- a/tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts +++ b/tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts @@ -1,4 +1,4 @@ -module A { +namespace A { export class Point { x: number; diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts b/tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts index cf0fb9e32fb81..8a53b131c0d91 100644 --- a/tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts +++ b/tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts @@ -1,4 +1,4 @@ -module A { +namespace A { class Point { x: number; diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts b/tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts index b58588cc4fbe3..5c9dc054424fe 100644 --- a/tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts +++ b/tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts @@ -1,4 +1,4 @@ -module A { +namespace A { export class Point { x: number; diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts b/tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts index e3d1f23f109db..7cd7cf2315b52 100644 --- a/tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts +++ b/tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts @@ -1,4 +1,4 @@ -module A { +namespace A { export interface Point { x: number; diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts b/tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts index 72581982bbd1d..8c47b587ec9ba 100644 --- a/tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts +++ b/tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts @@ -1,4 +1,4 @@ -module A { +namespace A { interface Point { x: number; diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts b/tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts index 0a96f0e732004..f6c4feb4c3c17 100644 --- a/tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts +++ b/tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts @@ -1,4 +1,4 @@ -module A { +namespace A { interface Point { x: number; diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ExportModuleWithAccessibleTypesOnItsExportedMembers.ts b/tests/cases/conformance/internalModules/exportDeclarations/ExportModuleWithAccessibleTypesOnItsExportedMembers.ts index a96c9020c7577..595b46d4206ab 100644 --- a/tests/cases/conformance/internalModules/exportDeclarations/ExportModuleWithAccessibleTypesOnItsExportedMembers.ts +++ b/tests/cases/conformance/internalModules/exportDeclarations/ExportModuleWithAccessibleTypesOnItsExportedMembers.ts @@ -1,10 +1,10 @@ -module A { +namespace A { export class Point { constructor(public x: number, public y: number) { } } - export module B { + export namespace B { export var Origin: Point = new Point(0, 0); export class Line { diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts b/tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts index ef5c2f365ce5b..e4ae3d0eebb49 100644 --- a/tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts +++ b/tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts @@ -1,4 +1,4 @@ -module A { +namespace A { class Point { constructor(public x: number, public y: number) { } diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts b/tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts index 75c854053a776..eeb277af2c3c3 100644 --- a/tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts +++ b/tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts @@ -1,4 +1,4 @@ -module A { +namespace A { class Point { constructor(public x: number, public y: number) { } diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts b/tests/cases/conformance/internalModules/exportDeclarations/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts index 5e1252025ba68..5263cfbd28f5c 100644 --- a/tests/cases/conformance/internalModules/exportDeclarations/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts +++ b/tests/cases/conformance/internalModules/exportDeclarations/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts @@ -1,4 +1,4 @@ -module A { +namespace A { class B { id: number; } diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ExportVariableWithAccessibleTypeInTypeAnnotation.ts b/tests/cases/conformance/internalModules/exportDeclarations/ExportVariableWithAccessibleTypeInTypeAnnotation.ts index e98615a4160c5..7407806ccdd09 100644 --- a/tests/cases/conformance/internalModules/exportDeclarations/ExportVariableWithAccessibleTypeInTypeAnnotation.ts +++ b/tests/cases/conformance/internalModules/exportDeclarations/ExportVariableWithAccessibleTypeInTypeAnnotation.ts @@ -1,4 +1,4 @@ -module A { +namespace A { export interface Point { x: number; diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ExportVariableWithInaccessibleTypeInTypeAnnotation.ts b/tests/cases/conformance/internalModules/exportDeclarations/ExportVariableWithInaccessibleTypeInTypeAnnotation.ts index 0767ec742502e..394a5e8f39ca3 100644 --- a/tests/cases/conformance/internalModules/exportDeclarations/ExportVariableWithInaccessibleTypeInTypeAnnotation.ts +++ b/tests/cases/conformance/internalModules/exportDeclarations/ExportVariableWithInaccessibleTypeInTypeAnnotation.ts @@ -1,4 +1,4 @@ -module A { +namespace A { export interface Point { x: number; diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedClasses.ts b/tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedClasses.ts index 23000e84088dc..1dc04dbb435f0 100644 --- a/tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedClasses.ts +++ b/tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedClasses.ts @@ -1,4 +1,4 @@ -module A { +namespace A { export class A { id: number; name: string; diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedEnums.ts b/tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedEnums.ts index c384ccff96aaa..c72c939daee0e 100644 --- a/tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedEnums.ts +++ b/tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedEnums.ts @@ -1,4 +1,4 @@ -module A { +namespace A { export enum Color { Red, Blue } enum Day { Monday, Tuesday } } diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedFunctions.ts b/tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedFunctions.ts index 3954f58f6f4e6..3d527c30c7b4e 100644 --- a/tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedFunctions.ts +++ b/tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedFunctions.ts @@ -1,4 +1,4 @@ -module A { +namespace A { export function fn(s: string) { return true; diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedImportAlias.ts b/tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedImportAlias.ts index fe1ecca6914d9..6961a4f1ae2a8 100644 --- a/tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedImportAlias.ts +++ b/tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedImportAlias.ts @@ -1,4 +1,4 @@ -module A { +namespace A { export interface Point { x: number; y: number; @@ -9,13 +9,13 @@ module A { } } -module B { +namespace B { export class Line { constructor(public start: A.Point, public end: A.Point) { } } } -module Geometry { +namespace Geometry { export import Points = A; import Lines = B; diff --git a/tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedVariables.ts b/tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedVariables.ts index 64bd95348add2..c2366a560405c 100644 --- a/tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedVariables.ts +++ b/tests/cases/conformance/internalModules/exportDeclarations/ModuleWithExportedAndNonExportedVariables.ts @@ -1,4 +1,4 @@ -module A { +namespace A { export var x = 'hello world' var y = 12; } diff --git a/tests/cases/conformance/internalModules/exportDeclarations/NonInitializedExportInInternalModule.ts b/tests/cases/conformance/internalModules/exportDeclarations/NonInitializedExportInInternalModule.ts index cd08ae00041ec..73e29590d63ed 100644 --- a/tests/cases/conformance/internalModules/exportDeclarations/NonInitializedExportInInternalModule.ts +++ b/tests/cases/conformance/internalModules/exportDeclarations/NonInitializedExportInInternalModule.ts @@ -1,5 +1,5 @@ -module Inner { +namespace Inner { var; let; const; @@ -17,7 +17,7 @@ module Inner { export let x, y, z; } - module C { + namespace C { export var a = 1, b, c = 2; export var x, y, z; } diff --git a/tests/cases/conformance/internalModules/importDeclarations/circularImportAlias.ts b/tests/cases/conformance/internalModules/importDeclarations/circularImportAlias.ts index 0c748c6d8314f..3c81fdcafd047 100644 --- a/tests/cases/conformance/internalModules/importDeclarations/circularImportAlias.ts +++ b/tests/cases/conformance/internalModules/importDeclarations/circularImportAlias.ts @@ -1,13 +1,13 @@ // expected no error -module B { +namespace B { export import a = A; export class D extends a.C { id: number; } } -module A { +namespace A { export class C { name: string } export import b = B; } diff --git a/tests/cases/conformance/internalModules/importDeclarations/exportImportAlias.ts b/tests/cases/conformance/internalModules/importDeclarations/exportImportAlias.ts index f9d64deed7951..3b7f42977351b 100644 --- a/tests/cases/conformance/internalModules/importDeclarations/exportImportAlias.ts +++ b/tests/cases/conformance/internalModules/importDeclarations/exportImportAlias.ts @@ -1,19 +1,19 @@ // expect no errors here -module A { +namespace A { export var x = 'hello world' export class Point { constructor(public x: number, public y: number) { } } - export module B { + export namespace B { export interface Id { name: string; } } } -module C { +namespace C { export import a = A; } @@ -22,19 +22,19 @@ var b: { x: number; y: number; } = new C.a.Point(0, 0); var c: { name: string }; var c: C.a.B.Id; -module X { +namespace X { export function Y() { return 42; } - export module Y { + export namespace Y { export class Point { constructor(public x: number, public y: number) { } } } } -module Z { +namespace Z { // 'y' should be a fundule here export import y = X.Y; @@ -43,12 +43,12 @@ module Z { var m: number = Z.y(); var n: { x: number; y: number; } = new Z.y.Point(0, 0); -module K { +namespace K { export class L { constructor(public name: string) { } } - export module L { + export namespace L { export var y = 12; export interface Point { x: number; @@ -57,7 +57,7 @@ module K { } } -module M { +namespace M { export import D = K.L; } diff --git a/tests/cases/conformance/internalModules/importDeclarations/importAliasIdentifiers.ts b/tests/cases/conformance/internalModules/importDeclarations/importAliasIdentifiers.ts index 6d5723c1355eb..1ee0ca0384f28 100644 --- a/tests/cases/conformance/internalModules/importDeclarations/importAliasIdentifiers.ts +++ b/tests/cases/conformance/internalModules/importDeclarations/importAliasIdentifiers.ts @@ -1,4 +1,4 @@ -module moduleA { +namespace moduleA { export class Point { constructor(public x: number, public y: number) { } } @@ -14,7 +14,7 @@ class clodule { name: string; } -module clodule { +namespace clodule { export interface Point { x: number; y: number; } @@ -32,7 +32,7 @@ function fundule() { return { x: 0, y: 0 }; } -module fundule { +namespace fundule { export interface Point { x: number; y: number; } diff --git a/tests/cases/conformance/internalModules/importDeclarations/shadowedInternalModule.ts b/tests/cases/conformance/internalModules/importDeclarations/shadowedInternalModule.ts index a2c9738455bb5..bd751796c822e 100644 --- a/tests/cases/conformance/internalModules/importDeclarations/shadowedInternalModule.ts +++ b/tests/cases/conformance/internalModules/importDeclarations/shadowedInternalModule.ts @@ -1,6 +1,6 @@ // all errors imported modules conflict with local variables -module A { +namespace A { export var Point = { x: 0, y: 0 } export interface Point { x: number; @@ -8,13 +8,13 @@ module A { } } -module B { +namespace B { var A = { x: 0, y: 0 }; import Point = A; } -module X { - export module Y { +namespace X { + export namespace Y { export interface Point{ x: number; y: number @@ -26,7 +26,7 @@ module X { } } -module Z { +namespace Z { import Y = X.Y; var Y = 12; @@ -34,31 +34,31 @@ module Z { // -module a { +namespace a { export type A = number; } -module b { +namespace b { export import A = a.A; - export module A {} + export namespace A {} } -module c { +namespace c { import any = b.A; } // -module q { +namespace q { export const Q = {}; } -module r { +namespace r { export import Q = q.Q; export type Q = number; } -module s { +namespace s { import Q = r.Q; const Q = 0; } diff --git a/tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts b/tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts index d16105b19e2ab..68e46cf6149a7 100644 --- a/tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts +++ b/tests/cases/conformance/internalModules/moduleBody/invalidModuleWithStatementsOfEveryKind.ts @@ -1,6 +1,6 @@ // All of these should be an error -module Y { +namespace Y { public class A { s: string } public class BB extends A { @@ -8,24 +8,24 @@ module Y { } } -module Y2 { +namespace Y2 { public class AA { s: T } public interface I { id: number } public class B extends AA implements I { id: number } } -module Y3 { +namespace Y3 { public module Module { class A { s: string } } } -module Y4 { +namespace Y4 { public enum Color { Blue, Red } } -module YY { +namespace YY { private class A { s: string } private class BB extends A { @@ -33,25 +33,25 @@ module YY { } } -module YY2 { +namespace YY2 { private class AA { s: T } private interface I { id: number } private class B extends AA implements I { id: number } } -module YY3 { +namespace YY3 { private module Module { class A { s: string } } } -module YY4 { +namespace YY4 { private enum Color { Blue, Red } } -module YYY { +namespace YYY { static class A { s: string } static class BB extends A { @@ -59,19 +59,19 @@ module YYY { } } -module YYY2 { +namespace YYY2 { static class AA { s: T } static interface I { id: number } static class B extends AA implements I { id: number } } -module YYY3 { +namespace YYY3 { static module Module { class A { s: string } } } -module YYY4 { +namespace YYY4 { static enum Color { Blue, Red } } diff --git a/tests/cases/conformance/internalModules/moduleBody/invalidModuleWithVarStatements.ts b/tests/cases/conformance/internalModules/moduleBody/invalidModuleWithVarStatements.ts index 8d40f964222df..4106b752add15 100644 --- a/tests/cases/conformance/internalModules/moduleBody/invalidModuleWithVarStatements.ts +++ b/tests/cases/conformance/internalModules/moduleBody/invalidModuleWithVarStatements.ts @@ -1,26 +1,26 @@ // All of these should be an error -module Y { +namespace Y { public var x: number = 0; } -module Y2 { +namespace Y2 { public function fn(x: string) { } } -module Y4 { +namespace Y4 { static var x: number = 0; } -module YY { +namespace YY { static function fn(x: string) { } } -module YY2 { +namespace YY2 { private var x: number = 0; } -module YY3 { +namespace YY3 { private function fn(x: string) { } } diff --git a/tests/cases/conformance/internalModules/moduleBody/moduleWithStatementsOfEveryKind.ts b/tests/cases/conformance/internalModules/moduleBody/moduleWithStatementsOfEveryKind.ts index 6991795b26c8f..4e2f826cfbcd2 100644 --- a/tests/cases/conformance/internalModules/moduleBody/moduleWithStatementsOfEveryKind.ts +++ b/tests/cases/conformance/internalModules/moduleBody/moduleWithStatementsOfEveryKind.ts @@ -1,4 +1,4 @@ -module A { +namespace A { class A { s: string } class AA { s: T } interface I { id: number } @@ -8,7 +8,7 @@ module A { id: number; } - module Module { + namespace Module { class A { s: string } } enum Color { Blue, Red } @@ -27,7 +27,7 @@ module A { } } -module Y { +namespace Y { export class A { s: string } export class AA { s: T } export interface I { id: number } @@ -37,7 +37,7 @@ module Y { id: number; } - export module Module { + export namespace Module { class A { s: string } } export enum Color { Blue, Red } diff --git a/tests/cases/conformance/internalModules/moduleDeclarations/InvalidNonInstantiatedModule.ts b/tests/cases/conformance/internalModules/moduleDeclarations/InvalidNonInstantiatedModule.ts index 230806f956383..031a65646fd92 100644 --- a/tests/cases/conformance/internalModules/moduleDeclarations/InvalidNonInstantiatedModule.ts +++ b/tests/cases/conformance/internalModules/moduleDeclarations/InvalidNonInstantiatedModule.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export interface Point { x: number; y: number } } diff --git a/tests/cases/conformance/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace04.ts b/tests/cases/conformance/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace04.ts index 03021576ea5fe..594844cf38dc3 100644 --- a/tests/cases/conformance/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace04.ts +++ b/tests/cases/conformance/internalModules/moduleDeclarations/asiPreventsParsingAsNamespace04.ts @@ -1,3 +1,3 @@ let module = 10; -module in {} \ No newline at end of file +namespace in {} \ No newline at end of file diff --git a/tests/cases/conformance/internalModules/moduleDeclarations/instantiatedModule.ts b/tests/cases/conformance/internalModules/moduleDeclarations/instantiatedModule.ts index 3d19aef7376aa..a7db090d18a9d 100644 --- a/tests/cases/conformance/internalModules/moduleDeclarations/instantiatedModule.ts +++ b/tests/cases/conformance/internalModules/moduleDeclarations/instantiatedModule.ts @@ -1,6 +1,6 @@ // adding the var makes this an instantiated module -module M { +namespace M { export interface Point { x: number; y: number } export var Point = 1; } @@ -18,7 +18,7 @@ var p1: M.Point; // making the point a class instead of an interface // makes this an instantiated mmodule -module M2 { +namespace M2 { export class Point { x: number; y: number; @@ -42,7 +42,7 @@ var p2: M2.Point; var p2 = new m2.Point(); var p2 = new M2.Point(); -module M3 { +namespace M3 { export enum Color { Blue, Red } } diff --git a/tests/cases/conformance/internalModules/moduleDeclarations/invalidInstantiatedModule.ts b/tests/cases/conformance/internalModules/moduleDeclarations/invalidInstantiatedModule.ts index eee2d0cfd3a0c..e996bf66ff4ec 100644 --- a/tests/cases/conformance/internalModules/moduleDeclarations/invalidInstantiatedModule.ts +++ b/tests/cases/conformance/internalModules/moduleDeclarations/invalidInstantiatedModule.ts @@ -1,9 +1,9 @@ -module M { +namespace M { export class Point { x: number; y: number } export var Point = 1; // Error } -module M2 { +namespace M2 { export interface Point { x: number; y: number } export var Point = 1; } diff --git a/tests/cases/conformance/internalModules/moduleDeclarations/invalidNestedModules.ts b/tests/cases/conformance/internalModules/moduleDeclarations/invalidNestedModules.ts index 18b190df5bf6d..7a9173df4e048 100644 --- a/tests/cases/conformance/internalModules/moduleDeclarations/invalidNestedModules.ts +++ b/tests/cases/conformance/internalModules/moduleDeclarations/invalidNestedModules.ts @@ -5,8 +5,8 @@ module A.B.C { } } -module A { - export module B { +namespace A { + export namespace B { export class C { // Error name: string; } @@ -19,8 +19,8 @@ module M2.X { } } -module M2 { - export module X { +namespace M2 { + export namespace X { export var Point: number; // Error } } diff --git a/tests/cases/conformance/internalModules/moduleDeclarations/nestedModules.ts b/tests/cases/conformance/internalModules/moduleDeclarations/nestedModules.ts index a91cfd1a723f3..a4afe605fd9db 100644 --- a/tests/cases/conformance/internalModules/moduleDeclarations/nestedModules.ts +++ b/tests/cases/conformance/internalModules/moduleDeclarations/nestedModules.ts @@ -5,8 +5,8 @@ module A.B.C { } } -module A { - export module B { +namespace A { + export namespace B { var Point: C.Point = { x: 0, y: 0 }; // bug 832088: could not find module 'C' } } @@ -17,8 +17,8 @@ module M2.X { } } -module M2 { - export module X { +namespace M2 { + export namespace X { export var Point: number; } } diff --git a/tests/cases/conformance/internalModules/moduleDeclarations/nonInstantiatedModule.ts b/tests/cases/conformance/internalModules/moduleDeclarations/nonInstantiatedModule.ts index 44f78652dbcbb..bb500215992d8 100644 --- a/tests/cases/conformance/internalModules/moduleDeclarations/nonInstantiatedModule.ts +++ b/tests/cases/conformance/internalModules/moduleDeclarations/nonInstantiatedModule.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export interface Point { x: number; y: number } export var a = 1; } @@ -13,8 +13,8 @@ var a1 = M.a; var a2: number; var a2 = m.a; -module M2 { - export module Point { +namespace M2 { + export namespace Point { export function Origin(): Point { return { x: 0, y: 0 }; } @@ -32,8 +32,8 @@ var p: M2.Point; var p2: { Origin() : { x: number; y: number; } }; var p2: typeof M2.Point; -module M3 { - export module Utils { +namespace M3 { + export namespace Utils { export interface Point { x: number; y: number; } diff --git a/tests/cases/conformance/internalModules/moduleDeclarations/reExportAliasMakesInstantiated.ts b/tests/cases/conformance/internalModules/moduleDeclarations/reExportAliasMakesInstantiated.ts index 8d62691b2bc86..0d274b397d1db 100644 --- a/tests/cases/conformance/internalModules/moduleDeclarations/reExportAliasMakesInstantiated.ts +++ b/tests/cases/conformance/internalModules/moduleDeclarations/reExportAliasMakesInstantiated.ts @@ -1,18 +1,18 @@ -declare module pack1 { +declare namespace pack1 { const test1: string; export { test1 }; } -declare module pack2 { +declare namespace pack2 { import test1 = pack1.test1; export { test1 }; } export import test1 = pack2.test1; -declare module mod1 { +declare namespace mod1 { type test1 = string; export { test1 }; } -declare module mod2 { +declare namespace mod2 { import test1 = mod1.test1; export { test1 }; } diff --git a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration7.ts b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration7.ts index ec5ff748c4dd8..648cf9e016fcc 100644 --- a/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration7.ts +++ b/tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClassDeclaration7.ts @@ -1,4 +1,4 @@ -declare module M { +declare namespace M { declare class C { } } \ No newline at end of file diff --git a/tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration2.ts b/tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration2.ts index 312523ebb9cb0..c7fc10ce88bcc 100644 --- a/tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration2.ts +++ b/tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnumDeclaration2.ts @@ -1,4 +1,4 @@ -declare module M { +declare namespace M { declare enum E { } } \ No newline at end of file diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ClassElements/parserErrorRecovery_ClassElement2.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ClassElements/parserErrorRecovery_ClassElement2.ts index d9896761cab40..fb730f6cbc932 100644 --- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ClassElements/parserErrorRecovery_ClassElement2.ts +++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ClassElements/parserErrorRecovery_ClassElement2.ts @@ -1,4 +1,4 @@ -module M { +namespace M { class C { enum E { diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ClassElements/parserErrorRecovery_ClassElement3.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ClassElements/parserErrorRecovery_ClassElement3.ts index e6c6a2e10b903..ac2c8049883a8 100644 --- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ClassElements/parserErrorRecovery_ClassElement3.ts +++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ClassElements/parserErrorRecovery_ClassElement3.ts @@ -1,4 +1,4 @@ -module M { +namespace M { ¬ class C { } diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable1.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable1.ts index db6859191c14f..c65a16e8da6c3 100644 --- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable1.ts +++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable1.ts @@ -4,7 +4,7 @@ interface IPoint { } // Module -module Shapes { +namespace Shapes { // Class export class Point implements IPoint { diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable2.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable2.ts index a1c6c438505f8..7399b78df859f 100644 --- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable2.ts +++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable2.ts @@ -4,7 +4,7 @@ interface IPoint { } // Module -module Shapes { +namespace Shapes { // Class export class Point implements IPoint { diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantAccessibilityModifierInModule1.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantAccessibilityModifierInModule1.ts index b448c7d4148e2..f102d6c2d863c 100644 --- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantAccessibilityModifierInModule1.ts +++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantAccessibilityModifierInModule1.ts @@ -1,4 +1,4 @@ -module M { +namespace M { var x=10; // variable local to this module body private y=x; // property visible only in module export var z=y; // property visible to any code diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnfinishedTypeNameBeforeKeyword1.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnfinishedTypeNameBeforeKeyword1.ts index 2982009393fe3..9a9a90a6328c9 100644 --- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnfinishedTypeNameBeforeKeyword1.ts +++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnfinishedTypeNameBeforeKeyword1.ts @@ -1,3 +1,3 @@ var x: TypeModule1. -module TypeModule2 { +namespace TypeModule2 { } diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric2.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric2.ts index 4475445f75cf1..079019e9e054a 100644 --- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric2.ts +++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric2.ts @@ -1,4 +1,4 @@ -declare module ng { +declare namespace ng { interfaceICompiledExpression { (context: any, locals?: any): any; assign(context: any, value: any): any; diff --git a/tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment5.ts b/tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment5.ts index 67a5a98066003..988c5b43bb008 100644 --- a/tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment5.ts +++ b/tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment5.ts @@ -1,3 +1,3 @@ -module M { +namespace M { export = A; } \ No newline at end of file diff --git a/tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment9.ts b/tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment9.ts index dc3aad853359d..bca02594993c7 100644 --- a/tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment9.ts +++ b/tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment9.ts @@ -2,6 +2,6 @@ namespace Foo { export default foo; } -module Bar { +namespace Bar { export default bar; } \ No newline at end of file diff --git a/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration1.ts b/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration1.ts index a41285e609fde..e6360d755c2f8 100644 --- a/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration1.ts +++ b/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration1.ts @@ -1,3 +1,3 @@ -declare module M { +declare namespace M { declare function F(); } \ No newline at end of file diff --git a/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration7.ts b/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration7.ts index 4a47c5e6736d1..3684110c82ca0 100644 --- a/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration7.ts +++ b/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration7.ts @@ -1,3 +1,3 @@ -module M { +namespace M { function foo(); } \ No newline at end of file diff --git a/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration8.ts b/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration8.ts index cfc171c4d9b54..f1b8f0efc027d 100644 --- a/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration8.ts +++ b/tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration8.ts @@ -1,3 +1,3 @@ -declare module M { +declare namespace M { function foo(); } \ No newline at end of file diff --git a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModule1.ts b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModule1.ts index 8cf72dd0847f2..1ac21fe9e12b6 100644 --- a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModule1.ts +++ b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModule1.ts @@ -1,4 +1,4 @@ - export module CompilerDiagnostics { + export namespace CompilerDiagnostics { export var debug = false; export interface IDiagnosticWriter { Alert(output: string): void; diff --git a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration11.ts b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration11.ts index 3fd73030c81de..e0045fc9f9e9a 100644 --- a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration11.ts +++ b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration11.ts @@ -1,4 +1,4 @@ -declare module string { +declare namespace string { interface X { } export function foo(s: string); } diff --git a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration2.d.ts b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration2.d.ts index f3fda8a6457d9..914fd82b1dd32 100644 --- a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration2.d.ts +++ b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration2.d.ts @@ -1,2 +1,2 @@ -module M { +namespace M { } \ No newline at end of file diff --git a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.d.ts b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.d.ts index 33e15b4eedacd..9922ffb96b3c0 100644 --- a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.d.ts +++ b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.d.ts @@ -1,2 +1,2 @@ -declare module M { +declare namespace M { } \ No newline at end of file diff --git a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.ts b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.ts index 06970e52a4cd4..f9144ba1683cd 100644 --- a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.ts +++ b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration3.ts @@ -1,4 +1,4 @@ -declare module M { - declare module M2 { +declare namespace M { + declare namespace M2 { } } \ No newline at end of file diff --git a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4.d.ts b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4.d.ts index fd658476e6117..4875b6e714462 100644 --- a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4.d.ts +++ b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4.d.ts @@ -1,4 +1,4 @@ -module M { - declare module M1 { +namespace M { + declare namespace M1 { } } \ No newline at end of file diff --git a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4.ts b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4.ts index e63ed3fcddd28..d68f1ffc4d56f 100644 --- a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4.ts +++ b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4.ts @@ -1,6 +1,6 @@ -module M { - declare module M1 { - module M2 { +namespace M { + declare namespace M1 { + namespace M2 { } } } \ No newline at end of file diff --git a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration5.ts b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration5.ts index 995bfb1e8aec8..c739bb8f76012 100644 --- a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration5.ts +++ b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration5.ts @@ -1,6 +1,6 @@ -module M1 { - declare module M2 { - declare module M3 { +namespace M1 { + declare namespace M2 { + declare namespace M3 { } } } \ No newline at end of file diff --git a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration6.ts b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration6.ts index 20bd858482e99..4eb3f3c4ef25f 100644 --- a/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration6.ts +++ b/tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration6.ts @@ -1,2 +1,2 @@ -module number { +namespace number { } \ No newline at end of file diff --git a/tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts b/tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts index 4cb9c6cb75dc8..a34899dcdb046 100644 --- a/tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts +++ b/tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts @@ -48,12 +48,12 @@ if (typeof ActiveXObject === "function") { throw new Error('Unknown context'); } -declare module process { +declare namespace process { export function nextTick(callback: () => any): void; export function on(event: string, listener: Function); } -module Harness { +namespace Harness { // Settings export var userSpecifiedroot = ""; var global = Function("return this").call(null); @@ -79,7 +79,7 @@ module Harness { } // Assert functions - export module Assert { + export namespace Assert { export var bugIds: string[] = []; export var throwAssertError = (error: Error) => { throw error; @@ -497,16 +497,16 @@ module Harness { } // Performance test - export module Perf { - export module Clock { + export namespace Perf { + export namespace Clock { export var now: () => number; export var resolution: number; - declare module WScript { + declare namespace WScript { export function InitializeProjection(); } - declare module TestUtilities { + declare namespace TestUtilities { export function QueryPerformanceCounter(): number; export function QueryPerformanceFrequency(): number; } @@ -685,7 +685,7 @@ module Harness { } /** Functionality for compiling TypeScript code */ - export module Compiler { + export namespace Compiler { /** Aggregate various writes into a single array of lines. Useful for passing to the * TypeScript compiler to fill with source code or errors. */ @@ -1412,7 +1412,7 @@ module Harness { /** Parses the test cases files * extracts options and individual files in a multifile test */ - export module TestCaseParser { + export namespace TestCaseParser { /** all the necesarry information to set the right compiler settings */ export interface CompilerSetting { flag: string; @@ -1867,7 +1867,7 @@ module Harness { } /** Runs TypeScript or Javascript code. */ - export module Runner { + export namespace Runner { export function runCollateral(path: string, callback: (error: Error, result: any) => void ) { path = switchToForwardSlashes(path); runString(readFile(path), path.match(/[^\/]*$/)[0], callback); @@ -1908,7 +1908,7 @@ module Harness { } /** Support class for baseline files */ - export module Baseline { + export namespace Baseline { var reportFilename = 'baseline-report.html'; var firstRun = true; diff --git a/tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts b/tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts index 6446eeae0faa0..50978e05868a8 100644 --- a/tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts +++ b/tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts @@ -16,7 +16,7 @@ /// -module Formatting { +namespace Formatting { export class Indenter implements ILineIndenationResolver { private indentationBag: IndentationBag; diff --git a/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509618.ts b/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509618.ts index eda90337f7931..2c075a4463c18 100644 --- a/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509618.ts +++ b/tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509618.ts @@ -1,3 +1,3 @@ -declare module ambiModule { +declare namespace ambiModule { interface i1 { }; } diff --git a/tests/cases/conformance/parser/ecmascript5/SkippedTokens/parserSkippedTokens16.ts b/tests/cases/conformance/parser/ecmascript5/SkippedTokens/parserSkippedTokens16.ts index be6281dcf80da..5c520ffe9fdca 100644 --- a/tests/cases/conformance/parser/ecmascript5/SkippedTokens/parserSkippedTokens16.ts +++ b/tests/cases/conformance/parser/ecmascript5/SkippedTokens/parserSkippedTokens16.ts @@ -1,7 +1,7 @@ foo(): Bar { } function Foo () ¬ { } 4+:5 -module M { +namespace M { function a( : T) { } } diff --git a/tests/cases/conformance/parser/ecmascript5/SuperExpressions/parserSuperExpression1.ts b/tests/cases/conformance/parser/ecmascript5/SuperExpressions/parserSuperExpression1.ts index e8cbfe0a351f6..9ebf47474a69c 100644 --- a/tests/cases/conformance/parser/ecmascript5/SuperExpressions/parserSuperExpression1.ts +++ b/tests/cases/conformance/parser/ecmascript5/SuperExpressions/parserSuperExpression1.ts @@ -4,7 +4,7 @@ class C { } } -module M1.M2 { +namespace M1.M2 { class C { private foo() { super.foo(); diff --git a/tests/cases/conformance/parser/ecmascript5/SuperExpressions/parserSuperExpression4.ts b/tests/cases/conformance/parser/ecmascript5/SuperExpressions/parserSuperExpression4.ts index 097841b0f87d9..e91e0d71d22be 100644 --- a/tests/cases/conformance/parser/ecmascript5/SuperExpressions/parserSuperExpression4.ts +++ b/tests/cases/conformance/parser/ecmascript5/SuperExpressions/parserSuperExpression4.ts @@ -4,7 +4,7 @@ class C { } } -module M1.M2 { +namespace M1.M2 { class C { private foo() { super.foo = 1 diff --git a/tests/cases/conformance/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration4.ts b/tests/cases/conformance/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration4.ts index b64ce2532bbd0..14b003f4f9369 100644 --- a/tests/cases/conformance/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration4.ts +++ b/tests/cases/conformance/parser/ecmascript5/VariableDeclarations/parserVariableDeclaration4.ts @@ -1,3 +1,3 @@ -declare module M { +declare namespace M { declare var v; } \ No newline at end of file diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource1.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource1.ts index d423e3ba2476c..69499c512c2b7 100644 --- a/tests/cases/conformance/parser/ecmascript5/parserRealSource1.ts +++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource1.ts @@ -3,8 +3,8 @@ /// -module TypeScript { - export module CompilerDiagnostics { +namespace TypeScript { + export namespace CompilerDiagnostics { export var debug = false; export interface IDiagnosticWriter { Alert(output: string): void; diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts index 31f8e145d3567..9e0016bd99e35 100644 --- a/tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts +++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts @@ -3,7 +3,7 @@ /// -module TypeScript { +namespace TypeScript { export enum TokenID { // Keywords Any, diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts index be3de8f8738d4..e4aff55ca36e1 100644 --- a/tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts +++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts @@ -3,7 +3,7 @@ /// -module TypeScript { +namespace TypeScript { export class ASTSpan { public minChar: number = -1; // -1 = "undefined" or "compiler generated" public limChar: number = -1; // -1 = "undefined" or "compiler generated" diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource12.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource12.ts index d288dcbc80d82..3a50638c3d205 100644 --- a/tests/cases/conformance/parser/ecmascript5/parserRealSource12.ts +++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource12.ts @@ -3,7 +3,7 @@ /// -module TypeScript { +namespace TypeScript { export interface IAstWalker { walk(ast: AST, parent: AST): AST; options: AstWalkOptions; @@ -217,7 +217,7 @@ module TypeScript { return globalAstWalkerFactory; } - module ChildrenWalkers { + namespace ChildrenWalkers { export function walkNone(preAst: ASTList, parent: AST, walker: IAstWalker): void { // Nothing to do } diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource13.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource13.ts index 7fd0735fe4c4f..22966321e9b9d 100644 --- a/tests/cases/conformance/parser/ecmascript5/parserRealSource13.ts +++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource13.ts @@ -3,7 +3,7 @@ /// -module TypeScript.AstWalkerWithDetailCallback { +namespace TypeScript.AstWalkerWithDetailCallback { export interface AstWalkerDetailCallback { EmptyCallback? (pre, ast: AST): boolean; EmptyExprCallback? (pre, ast: AST): boolean; diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts index 451bd9754d5e6..49bb0ad75a3ab 100644 --- a/tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts +++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts @@ -3,7 +3,7 @@ /// -module TypeScript { +namespace TypeScript { export function lastOf(items: any[]): any { return (items === null || items.length === 0) ? null : items[items.length - 1]; } diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource2.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource2.ts index 8d19dee8c7221..a961fceb518e6 100644 --- a/tests/cases/conformance/parser/ecmascript5/parserRealSource2.ts +++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource2.ts @@ -3,7 +3,7 @@ /// -module TypeScript { +namespace TypeScript { export function hasFlag(val: number, flag: number) { return (val & flag) != 0; diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource3.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource3.ts index 6c6a9d8dccb33..ca7c81be0c1d0 100644 --- a/tests/cases/conformance/parser/ecmascript5/parserRealSource3.ts +++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource3.ts @@ -3,7 +3,7 @@ /// -module TypeScript { +namespace TypeScript { // Note: Any addition to the NodeType should also be supported with addition to AstWalkerDetailCallback export enum NodeType { None, diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource4.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource4.ts index 5c9327a7d2704..e2c93f08e17db 100644 --- a/tests/cases/conformance/parser/ecmascript5/parserRealSource4.ts +++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource4.ts @@ -3,7 +3,7 @@ /// -module TypeScript { +namespace TypeScript { export class BlockIntrinsics { public prototype = undefined; diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource5.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource5.ts index 32b29e574d289..c1546dc54e144 100644 --- a/tests/cases/conformance/parser/ecmascript5/parserRealSource5.ts +++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource5.ts @@ -3,7 +3,7 @@ /// -module TypeScript { +namespace TypeScript { // TODO: refactor indent logic for use in emit export class PrintContext { public builder = ""; diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource6.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource6.ts index 5e98003f85108..6dfc89957f2e9 100644 --- a/tests/cases/conformance/parser/ecmascript5/parserRealSource6.ts +++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource6.ts @@ -3,7 +3,7 @@ /// -module TypeScript { +namespace TypeScript { export class TypeCollectionContext { public script: Script = null; diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource7.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource7.ts index de8b0ff4cb41a..be93b002572ed 100644 --- a/tests/cases/conformance/parser/ecmascript5/parserRealSource7.ts +++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource7.ts @@ -3,7 +3,7 @@ /// -module TypeScript { +namespace TypeScript { export class Continuation { public exceptionBlock = -1; constructor (public normalBlock: number) { } diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource8.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource8.ts index 17e855656aca8..94ac52faa9cf0 100644 --- a/tests/cases/conformance/parser/ecmascript5/parserRealSource8.ts +++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource8.ts @@ -3,7 +3,7 @@ /// -module TypeScript { +namespace TypeScript { export class AssignScopeContext { constructor (public scopeChain: ScopeChain, diff --git a/tests/cases/conformance/parser/ecmascript5/parserRealSource9.ts b/tests/cases/conformance/parser/ecmascript5/parserRealSource9.ts index 781a4db90ebc0..ae26f557656e7 100644 --- a/tests/cases/conformance/parser/ecmascript5/parserRealSource9.ts +++ b/tests/cases/conformance/parser/ecmascript5/parserRealSource9.ts @@ -3,7 +3,7 @@ /// -module TypeScript { +namespace TypeScript { export class Binder { constructor (public checker: TypeChecker) { } public resolveBaseTypeLinks(typeLinks: TypeLink[], scope: SymbolScope) { diff --git a/tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInitializer.ts b/tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInitializer.ts index 5985dee0614f0..a7f0580702afb 100644 --- a/tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInitializer.ts +++ b/tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInitializer.ts @@ -14,7 +14,7 @@ class D{ function F(x: string): number { return 42; } -module M { +namespace M { export class A { name: string; } diff --git a/tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts b/tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts index bc354f99c8d46..a1c699d4ad1ba 100644 --- a/tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts +++ b/tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts @@ -15,7 +15,7 @@ class D{ function F(x: string): number { return 42; } function F2(x: number): boolean { return x < 42; } -module M { +namespace M { export class A { name: string; } @@ -23,7 +23,7 @@ module M { export function F2(x: number): string { return x.toString(); } } -module N { +namespace N { export class A { id: number; } diff --git a/tests/cases/conformance/statements/VariableStatements/everyTypeWithInitializer.ts b/tests/cases/conformance/statements/VariableStatements/everyTypeWithInitializer.ts index 94bb301bc5491..dda7d3b6c6064 100644 --- a/tests/cases/conformance/statements/VariableStatements/everyTypeWithInitializer.ts +++ b/tests/cases/conformance/statements/VariableStatements/everyTypeWithInitializer.ts @@ -14,7 +14,7 @@ class D{ function F(x: string): number { return 42; } -module M { +namespace M { export class A { name: string; } diff --git a/tests/cases/conformance/statements/VariableStatements/invalidMultipleVariableDeclarations.ts b/tests/cases/conformance/statements/VariableStatements/invalidMultipleVariableDeclarations.ts index 8a22997661b7b..9b27072ab598f 100644 --- a/tests/cases/conformance/statements/VariableStatements/invalidMultipleVariableDeclarations.ts +++ b/tests/cases/conformance/statements/VariableStatements/invalidMultipleVariableDeclarations.ts @@ -19,7 +19,7 @@ class D{ function F(x: string): number { return 42; } -module M { +namespace M { export class A { name: string; } diff --git a/tests/cases/conformance/statements/for-inStatements/for-inStatements.ts b/tests/cases/conformance/statements/for-inStatements/for-inStatements.ts index 89cc0314d365d..daaeeee0c1494 100644 --- a/tests/cases/conformance/statements/for-inStatements/for-inStatements.ts +++ b/tests/cases/conformance/statements/for-inStatements/for-inStatements.ts @@ -64,7 +64,7 @@ var i: I; for (var x in i[42]) { } -module M { +namespace M { export class X { name:string } diff --git a/tests/cases/conformance/statements/forStatements/forStatements.ts b/tests/cases/conformance/statements/forStatements/forStatements.ts index 1e65bdc293216..961aab8ac92bf 100644 --- a/tests/cases/conformance/statements/forStatements/forStatements.ts +++ b/tests/cases/conformance/statements/forStatements/forStatements.ts @@ -16,7 +16,7 @@ class D{ function F(x: string): number { return 42; } -module M { +namespace M { export class A { name: string; } diff --git a/tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts b/tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts index 64317b233369d..1759ea55ae9a5 100644 --- a/tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts +++ b/tests/cases/conformance/statements/forStatements/forStatementsMultipleInvalidDecl.ts @@ -21,7 +21,7 @@ class D{ function F(x: string): number { return 42; } -module M { +namespace M { export class A { name: string; } diff --git a/tests/cases/conformance/statements/ifDoWhileStatements/ifDoWhileStatements.ts b/tests/cases/conformance/statements/ifDoWhileStatements/ifDoWhileStatements.ts index 03f042401d822..02c63e85ff55c 100644 --- a/tests/cases/conformance/statements/ifDoWhileStatements/ifDoWhileStatements.ts +++ b/tests/cases/conformance/statements/ifDoWhileStatements/ifDoWhileStatements.ts @@ -22,7 +22,7 @@ class D{ function F(x: string): number { return 42; } function F2(x: number): boolean { return x < 42; } -module M { +namespace M { export class A { name: string; } @@ -30,7 +30,7 @@ module M { export function F2(x: number): string { return x.toString(); } } -module N { +namespace N { export class A { id: number; } diff --git a/tests/cases/conformance/statements/switchStatements/switchStatements.ts b/tests/cases/conformance/statements/switchStatements/switchStatements.ts index e26d8b76b5667..6455d091bd942 100644 --- a/tests/cases/conformance/statements/switchStatements/switchStatements.ts +++ b/tests/cases/conformance/statements/switchStatements/switchStatements.ts @@ -1,4 +1,4 @@ -module M { +namespace M { export function fn(x: number) { return ''; } diff --git a/tests/cases/conformance/statements/throwStatements/throwStatements.ts b/tests/cases/conformance/statements/throwStatements/throwStatements.ts index 07c09da93fc68..5825ed6c2e0df 100644 --- a/tests/cases/conformance/statements/throwStatements/throwStatements.ts +++ b/tests/cases/conformance/statements/throwStatements/throwStatements.ts @@ -18,7 +18,7 @@ class D{ function F(x: string): number { return 42; } -module M { +namespace M { export class A { name: string; } diff --git a/tests/cases/conformance/types/any/assignAnyToEveryType.ts b/tests/cases/conformance/types/any/assignAnyToEveryType.ts index 0af7d94d7b37f..e26cdc01ad8d2 100644 --- a/tests/cases/conformance/types/any/assignAnyToEveryType.ts +++ b/tests/cases/conformance/types/any/assignAnyToEveryType.ts @@ -34,7 +34,7 @@ var i: I = x; var j: { (): string } = x; var j2: { (x: T): string } = x; -module M { +namespace M { export var foo = 1; } diff --git a/tests/cases/conformance/types/members/duplicateStringIndexers.ts b/tests/cases/conformance/types/members/duplicateStringIndexers.ts index 67e12d8801708..6bbc790736988 100644 --- a/tests/cases/conformance/types/members/duplicateStringIndexers.ts +++ b/tests/cases/conformance/types/members/duplicateStringIndexers.ts @@ -1,6 +1,6 @@ // it is an error to have duplicate index signatures of the same kind in a type -module test { +namespace test { interface Number { [x: string]: string; [x: string]: string; diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignatureWithoutReturnTypeAnnotationInference.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignatureWithoutReturnTypeAnnotationInference.ts index 1cc499c7d6e03..fa3de3127291a 100644 --- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignatureWithoutReturnTypeAnnotationInference.ts +++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/callSignatureWithoutReturnTypeAnnotationInference.ts @@ -73,7 +73,7 @@ function foo10(x: number) { } var r10 = foo10(1); -module M { +namespace M { export var x = 1; export class C { foo: string } } @@ -96,7 +96,7 @@ function foo12() { var r12 = foo12(); function m1() { return 1; } -module m1 { export var y = 2; } +namespace m1 { export var y = 2; } function foo13() { return m1; } @@ -106,7 +106,7 @@ class c1 { foo: string; constructor(x) { } } -module c1 { +namespace c1 { export var x = 1; } function foo14() { @@ -115,7 +115,7 @@ function foo14() { var r14 = foo14(); enum e1 { A } -module e1 { export var y = 1; } +namespace e1 { export var y = 1; } function foo15() { return e1; } diff --git a/tests/cases/conformance/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads2.ts b/tests/cases/conformance/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads2.ts index 0075325bda45b..71fbcd6d97c28 100644 --- a/tests/cases/conformance/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads2.ts +++ b/tests/cases/conformance/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads2.ts @@ -6,7 +6,7 @@ class C { constructor(x: number, y: string); constructor(x: number) { } } -module C { +namespace C { export var x = 1; } @@ -17,7 +17,7 @@ class C2 { constructor(x: T, y: string); constructor(x: T) { } } -module C2 { +namespace C2 { export var x = 1; } diff --git a/tests/cases/conformance/types/primitives/boolean/invalidBooleanAssignments.ts b/tests/cases/conformance/types/primitives/boolean/invalidBooleanAssignments.ts index 5d9fe27edbc0f..5f498843bd196 100644 --- a/tests/cases/conformance/types/primitives/boolean/invalidBooleanAssignments.ts +++ b/tests/cases/conformance/types/primitives/boolean/invalidBooleanAssignments.ts @@ -17,7 +17,7 @@ var g: I = x; var h: { (): string } = x; var h2: { toString(): string } = x; // no error -module M { export var a = 1; } +namespace M { export var a = 1; } M = x; function i(a: T) { diff --git a/tests/cases/conformance/types/primitives/null/validNullAssignments.ts b/tests/cases/conformance/types/primitives/null/validNullAssignments.ts index 5fe7fac194489..eab813d531e94 100644 --- a/tests/cases/conformance/types/primitives/null/validNullAssignments.ts +++ b/tests/cases/conformance/types/primitives/null/validNullAssignments.ts @@ -19,7 +19,7 @@ var g: I; g = null; // ok I = null; // error -module M { export var x = 1; } +namespace M { export var x = 1; } M = null; // error var h: { f(): void } = null; diff --git a/tests/cases/conformance/types/primitives/number/invalidNumberAssignments.ts b/tests/cases/conformance/types/primitives/number/invalidNumberAssignments.ts index 443a719be269e..74ca77f34c3c1 100644 --- a/tests/cases/conformance/types/primitives/number/invalidNumberAssignments.ts +++ b/tests/cases/conformance/types/primitives/number/invalidNumberAssignments.ts @@ -14,7 +14,7 @@ var f: I = x; var g: { baz: string } = 1; var g2: { 0: number } = 1; -module M { export var x = 1; } +namespace M { export var x = 1; } M = x; function i(a: T) { diff --git a/tests/cases/conformance/types/primitives/string/invalidStringAssignments.ts b/tests/cases/conformance/types/primitives/string/invalidStringAssignments.ts index 0957843f04137..8c526bf3e30b2 100644 --- a/tests/cases/conformance/types/primitives/string/invalidStringAssignments.ts +++ b/tests/cases/conformance/types/primitives/string/invalidStringAssignments.ts @@ -14,7 +14,7 @@ var f: I = x; var g: { baz: string } = 1; var g2: { 0: number } = 1; -module M { export var x = 1; } +namespace M { export var x = 1; } M = x; function i(a: T) { diff --git a/tests/cases/conformance/types/primitives/undefined/invalidUndefinedAssignments.ts b/tests/cases/conformance/types/primitives/undefined/invalidUndefinedAssignments.ts index 185e6e6884eb1..28608c30e3f87 100644 --- a/tests/cases/conformance/types/primitives/undefined/invalidUndefinedAssignments.ts +++ b/tests/cases/conformance/types/primitives/undefined/invalidUndefinedAssignments.ts @@ -13,7 +13,7 @@ var g: I; g = x; I = x; -module M { export var x = 1; } +namespace M { export var x = 1; } M = x; function i(a: T) { } diff --git a/tests/cases/conformance/types/primitives/undefined/invalidUndefinedValues.ts b/tests/cases/conformance/types/primitives/undefined/invalidUndefinedValues.ts index 58a5a5438610b..b17f174618d89 100644 --- a/tests/cases/conformance/types/primitives/undefined/invalidUndefinedValues.ts +++ b/tests/cases/conformance/types/primitives/undefined/invalidUndefinedValues.ts @@ -16,7 +16,7 @@ interface I { foo: string } var c: I; x = c; -module M { export var x = 1; } +namespace M { export var x = 1; } x = M; x = { f() { } } diff --git a/tests/cases/conformance/types/primitives/void/invalidAssignmentsToVoid.ts b/tests/cases/conformance/types/primitives/void/invalidAssignmentsToVoid.ts index f779296408614..73612df0b8d54 100644 --- a/tests/cases/conformance/types/primitives/void/invalidAssignmentsToVoid.ts +++ b/tests/cases/conformance/types/primitives/void/invalidAssignmentsToVoid.ts @@ -13,7 +13,7 @@ interface I { foo: string; } var i: I; x = i; -module M { export var x = 1; } +namespace M { export var x = 1; } x = M; function f(a: T) { diff --git a/tests/cases/conformance/types/primitives/void/invalidVoidAssignments.ts b/tests/cases/conformance/types/primitives/void/invalidVoidAssignments.ts index 35b77268f9f4b..61e2fbd574dd4 100644 --- a/tests/cases/conformance/types/primitives/void/invalidVoidAssignments.ts +++ b/tests/cases/conformance/types/primitives/void/invalidVoidAssignments.ts @@ -14,7 +14,7 @@ var f: I = x; var g: { baz: string } = 1; var g2: { 0: number } = 1; -module M { export var x = 1; } +namespace M { export var x = 1; } M = x; function i(a: T) { diff --git a/tests/cases/conformance/types/primitives/void/invalidVoidValues.ts b/tests/cases/conformance/types/primitives/void/invalidVoidValues.ts index 4605195f5da98..89e6d4ae9b200 100644 --- a/tests/cases/conformance/types/primitives/void/invalidVoidValues.ts +++ b/tests/cases/conformance/types/primitives/void/invalidVoidValues.ts @@ -17,7 +17,7 @@ x = b; x = { f() {} } -module M { export var x = 1; } +namespace M { export var x = 1; } x = M; function f(a: T) { diff --git a/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofANonExportedType.ts b/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofANonExportedType.ts index 0bd76a9ba5db0..c7013c1f79ae8 100644 --- a/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofANonExportedType.ts +++ b/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofANonExportedType.ts @@ -20,7 +20,7 @@ var i2: I; export var r5: typeof i; export var r5: typeof i2; -module M { +namespace M { export var foo = ''; export class C { foo: string; @@ -42,7 +42,7 @@ export var r11: typeof E.A; export var r12: typeof r12; function foo() { } -module foo { +namespace foo { export var y = 1; export class C { foo: string; diff --git a/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts b/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts index 78bf21547d156..92cb1858912df 100644 --- a/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts +++ b/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts @@ -20,7 +20,7 @@ var i2: I; export var r5: typeof i; export var r5: typeof i2; -export module M { +export namespace M { export var foo = ''; export class C { foo: string; @@ -42,7 +42,7 @@ export var r11: typeof E.A; export var r12: typeof r12; export function foo() { } -export module foo { +export namespace foo { export var y = 1; export class C { foo: string; diff --git a/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofModuleWithoutExports.ts b/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofModuleWithoutExports.ts index 878885a8a9d46..4f7f116b921c3 100644 --- a/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofModuleWithoutExports.ts +++ b/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofModuleWithoutExports.ts @@ -1,4 +1,4 @@ -module M { +namespace M { var x = 1; class C { foo: number; diff --git a/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofThis.ts b/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofThis.ts index 420604c55072d..b922b01fe16d1 100644 --- a/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofThis.ts +++ b/tests/cases/conformance/types/specifyingTypes/typeQueries/typeofThis.ts @@ -50,7 +50,7 @@ namespace Test6 { } } -module Test7 { +namespace Test7 { export let f = () => { let x: typeof this.no = 1; } diff --git a/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.d.ts b/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.d.ts index fdd51b3f5c6d6..5099887a7491c 100644 --- a/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.d.ts +++ b/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.d.ts @@ -15,7 +15,7 @@ declare function f(x: C): C; declare class D extends C {} -declare module M { +declare namespace M { export class E { foo: T } } diff --git a/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.ts b/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.ts index 86f6df5cdfe3d..c51906a27416e 100644 --- a/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.ts +++ b/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument.ts @@ -22,7 +22,7 @@ class D extends C { interface I extends C {} -module M { +namespace M { export class E { foo: T } } diff --git a/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument2.ts b/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument2.ts index 7f062766cb3b5..e185ba8d408ec 100644 --- a/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument2.ts +++ b/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument2.ts @@ -22,7 +22,7 @@ class D extends I { interface U extends I {} -module M { +namespace M { export interface E { foo: T } } diff --git a/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument3.ts b/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument3.ts index fdd51b3f5c6d6..5099887a7491c 100644 --- a/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument3.ts +++ b/tests/cases/conformance/types/specifyingTypes/typeReferences/genericTypeReferenceWithoutTypeArgument3.ts @@ -15,7 +15,7 @@ declare function f(x: C): C; declare class D extends C {} -declare module M { +declare namespace M { export class E { foo: T } } diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/anyAssignabilityInInheritance.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/anyAssignabilityInInheritance.ts index cc154308a1fe8..ae927567cce1d 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/anyAssignabilityInInheritance.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/anyAssignabilityInInheritance.ts @@ -64,7 +64,7 @@ declare function foo14(x: any): any; var r3 = foo3(a); // any function f() { } -module f { +namespace f { export var bar = 1; } declare function foo15(x: typeof f): typeof f; @@ -72,7 +72,7 @@ declare function foo15(x: any): any; var r3 = foo3(a); // any class CC { baz: string } -module CC { +namespace CC { export var bar = 1; } declare function foo16(x: CC): CC; diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType2.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType2.ts index 26f3eee594d8e..2f3831196ddf8 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType2.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType2.ts @@ -86,7 +86,7 @@ interface I14 { function f() { } -module f { +namespace f { export var bar = 1; } interface I15 { @@ -96,7 +96,7 @@ interface I15 { class c { baz: string } -module c { +namespace c { export var bar = 1; } interface I16 { diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures4.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures4.ts index 33f8ea4613e75..8d19894899039 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures4.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures4.ts @@ -1,12 +1,12 @@ // These are mostly permitted with the current loose rules. All ok unless otherwise noted. -module Errors { +namespace Errors { class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Derived { baz: string; } class OtherDerived extends Base { bing: string; } - module WithNonGenericSignaturesInBaseType { + namespace WithNonGenericSignaturesInBaseType { // target type with non-generic call signatures var a2: (x: number) => string[]; var a7: (x: (arg: Base) => Derived) => (r: Base) => Derived2; @@ -82,7 +82,7 @@ module Errors { b17 = a17; } - module WithGenericSignaturesInBaseType { + namespace WithGenericSignaturesInBaseType { // target type has generic call signature var a2: (x: T) => T[]; var b2: (x: T) => string[]; diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts index ef74c1eb63358..e63a4131b769e 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts @@ -1,12 +1,12 @@ // checking assignment compatibility relations for function types. -module Errors { +namespace Errors { class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Derived { baz: string; } class OtherDerived extends Base { bing: string; } - module WithNonGenericSignaturesInBaseType { + namespace WithNonGenericSignaturesInBaseType { // target type with non-generic call signatures var a2: new (x: number) => string[]; var a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived2; @@ -82,7 +82,7 @@ module Errors { b17 = a17; // error } - module WithGenericSignaturesInBaseType { + namespace WithGenericSignaturesInBaseType { // target type has generic call signature var a2: new (x: T) => T[]; var b2: new (x: T) => string[]; diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts index 63a6995395fb6..c5fb6773a9508 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.ts @@ -1,6 +1,6 @@ // call signatures in derived types must have the same or fewer optional parameters as the target for assignment -module ClassTypeParam { +namespace ClassTypeParam { class Base { a: () => T; a2: (x?: T) => T; @@ -36,7 +36,7 @@ module ClassTypeParam { } } -module GenericSignaturesInvalid { +namespace GenericSignaturesInvalid { class Base2 { a: () => T; @@ -92,7 +92,7 @@ module GenericSignaturesInvalid { } } -module GenericSignaturesValid { +namespace GenericSignaturesValid { class Base2 { a: () => T; diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer.ts index ad19c342656c2..42a8dee654e6c 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer.ts @@ -17,7 +17,7 @@ var b2: { [x: number]: Derived2; } a = b2; b2 = a; // error -module Generics { +namespace Generics { class A { [x: number]: T; } diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2.ts index 8fa330cd6e5a7..ff0cb4a931905 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer2.ts @@ -17,7 +17,7 @@ var b2: { [x: number]: Derived2; } a = b2; b2 = a; // error -module Generics { +namespace Generics { interface A { [x: number]: T; } diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3.ts index 53cefaf12866e..249e2b8e7ce36 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithNumericIndexer3.ts @@ -22,7 +22,7 @@ var b2: { [x: number]: Derived2; }; a = b2; // ok b2 = a; // error -module Generics { +namespace Generics { class A { [x: number]: T; } diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers.ts index d7a94cc86293c..74a2c2e941088 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers.ts @@ -1,7 +1,7 @@ // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M // no errors expected -module SimpleTypes { +namespace SimpleTypes { class S { foo: string; } class T { foo: string; } var s: S; @@ -42,7 +42,7 @@ module SimpleTypes { a2 = t; } -module ObjectTypes { +namespace ObjectTypes { class S { foo: S; } class T { foo: T; } var s: S; diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts index 26ef9d3a2402d..e2b127f223117 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers4.ts @@ -1,6 +1,6 @@ // members N and M of types S and T have the same name, same accessibility, same optionality, and N is not assignable M -module OnlyDerived { +namespace OnlyDerived { class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Base { baz: string; } @@ -45,7 +45,7 @@ module OnlyDerived { a2 = t; // error } -module WithBase { +namespace WithBase { class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Base { baz: string; } diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersAccessibility.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersAccessibility.ts index c6546722336ef..b151a2946f0e6 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersAccessibility.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersAccessibility.ts @@ -1,6 +1,6 @@ // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M -module TargetIsPublic { +namespace TargetIsPublic { // targets class Base { public foo: string; @@ -53,7 +53,7 @@ module TargetIsPublic { } -module TargetIsPublic { +namespace TargetIsPublic { // targets class Base { private foo: string; diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality.ts index 31fb92072864d..9af58367a8bce 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality.ts @@ -4,7 +4,7 @@ class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Derived { baz: string; } -module TargetHasOptional { +namespace TargetHasOptional { // targets interface C { opt?: Base @@ -46,7 +46,7 @@ module TargetHasOptional { b = c; } -module SourceHasOptional { +namespace SourceHasOptional { // targets interface C { opt: Base diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts index 1f19328568141..b34322ce514b5 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersOptionality2.ts @@ -5,7 +5,7 @@ class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Derived { baz: string; } -module TargetHasOptional { +namespace TargetHasOptional { // targets interface C { opt?: Base @@ -47,7 +47,7 @@ module TargetHasOptional { b = c; } -module SourceHasOptional { +namespace SourceHasOptional { // targets interface C { opt: Base diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts index 5ea0e35b9cab1..e767ef94976f3 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersStringNumericNames.ts @@ -1,7 +1,7 @@ // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M // string named numeric properties work correctly, errors below unless otherwise noted -module JustStrings { +namespace JustStrings { class S { '1': string; } class T { '1.': string; } var s: S; @@ -42,7 +42,7 @@ module JustStrings { a2 = t; } -module NumbersAndStrings { +namespace NumbersAndStrings { class S { '1': string; } class T { 1: string; } var s: S; diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer.ts index 421ac1c00c6b2..8c5ffbc930906 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer.ts @@ -18,7 +18,7 @@ var b2: { [x: string]: Derived2; } a = b2; // ok b2 = a; // error -module Generics { +namespace Generics { class A { [x: string]: T; } diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer2.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer2.ts index 9827bd425c0de..68a37a0416247 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer2.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer2.ts @@ -18,7 +18,7 @@ var b2: { [x: string]: Derived2; } a = b2; // ok b2 = a; // error -module Generics { +namespace Generics { interface A { [x: string]: T; } diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer3.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer3.ts index 74b34313277cf..6956a47a2eff4 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer3.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithStringIndexer3.ts @@ -9,7 +9,7 @@ var b1: { [x: string]: string; } a = b1; // error b1 = a; // error -module Generics { +namespace Generics { class A { [x: string]: T; } diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance.ts index f43557426cca1..02aef7aaf41b6 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance.ts @@ -1,4 +1,4 @@ -module CallSignature { +namespace CallSignature { interface Base { // T // M's (x: number): void; @@ -31,7 +31,7 @@ module CallSignature { } } -module MemberWithCallSignature { +namespace MemberWithCallSignature { interface Base { // T // M's a: (x: number) => void; diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance3.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance3.ts index f729407c9c3a8..a9afeccfda845 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance3.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance3.ts @@ -1,13 +1,13 @@ // checking subtype relations for function types as it relates to contextual signature instantiation // error cases -module Errors { +namespace Errors { class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Derived { baz: string; } class OtherDerived extends Base { bing: string; } - module WithNonGenericSignaturesInBaseType { + namespace WithNonGenericSignaturesInBaseType { // base type with non-generic call signatures interface A { a2: (x: number) => string[]; @@ -91,7 +91,7 @@ module Errors { } } - module WithGenericSignaturesInBaseType { + namespace WithGenericSignaturesInBaseType { // base type has generic call signature interface B { a2: (x: T) => T[]; diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance.ts index aec5def130f3f..ac822681356da 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance.ts @@ -1,6 +1,6 @@ // Checking basic subtype relations with construct signatures -module ConstructSignature { +namespace ConstructSignature { interface Base { // T // M's new (x: number): void; // BUG 842221 @@ -32,7 +32,7 @@ module ConstructSignature { } } -module MemberWithConstructSignature { +namespace MemberWithConstructSignature { interface Base { // T // M's a: new (x: number) => void; diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance3.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance3.ts index ce655eba97540..5e8ff19b4f16e 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance3.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance3.ts @@ -1,13 +1,13 @@ // checking subtype relations for function types as it relates to contextual signature instantiation // error cases -module Errors { +namespace Errors { class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Derived { baz: string; } class OtherDerived extends Base { bing: string; } - module WithNonGenericSignaturesInBaseType { + namespace WithNonGenericSignaturesInBaseType { // base type with non-generic call signatures interface A { a2: new (x: number) => string[]; @@ -77,7 +77,7 @@ module Errors { } } - module WithGenericSignaturesInBaseType { + namespace WithGenericSignaturesInBaseType { // base type has generic call signature interface B { a2: new (x: T) => T[]; diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts index 84d7638375f5b..13cf313e66894 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignability.ts @@ -13,7 +13,7 @@ f = 1; // ok var x: number = e; // ok x = f; // ok -module Others { +namespace Others { var a: any = e; // ok class C { diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignabilityInInheritance.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignabilityInInheritance.ts index 619fec45af99c..c04673b29fc67 100644 --- a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignabilityInInheritance.ts +++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/enumAssignabilityInInheritance.ts @@ -81,7 +81,7 @@ declare function foo13(x: E): E; var r4 = foo13(E.A); function f() { } -module f { +namespace f { export var bar = 1; } declare function foo14(x: typeof f): typeof f; @@ -90,7 +90,7 @@ declare function foo14(x: E): E; var r4 = foo14(E.A); class CC { baz: string } -module CC { +namespace CC { export var bar = 1; } declare function foo15(x: CC): CC; diff --git a/tests/cases/conformance/types/typeRelationships/bestCommonType/heterogeneousArrayLiterals.ts b/tests/cases/conformance/types/typeRelationships/bestCommonType/heterogeneousArrayLiterals.ts index 0f498c570a73e..e9a0121e45536 100644 --- a/tests/cases/conformance/types/typeRelationships/bestCommonType/heterogeneousArrayLiterals.ts +++ b/tests/cases/conformance/types/typeRelationships/bestCommonType/heterogeneousArrayLiterals.ts @@ -25,7 +25,7 @@ var base: Base; var derived: Derived; var derived2: Derived2; -module Derived { +namespace Derived { var h = [{ foo: base, basear: derived }, { foo: base }]; // {foo: Base}[] var i = [{ foo: base, basear: derived }, { foo: derived }]; // {foo: Derived}[] @@ -39,7 +39,7 @@ module Derived { var q = [[() => derived2], [() => derived]]; // {}[] } -module WithContextualType { +namespace WithContextualType { // no errors var a: Base[] = [derived, derived2]; var b: Derived[] = [null]; diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/enumIsNotASubtypeOfAnythingButNumber.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/enumIsNotASubtypeOfAnythingButNumber.ts index 3d76f3f024585..8d312791b649b 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/enumIsNotASubtypeOfAnythingButNumber.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/enumIsNotASubtypeOfAnythingButNumber.ts @@ -87,7 +87,7 @@ interface I14 { function f() { } -module f { +namespace f { export var bar = 1; } interface I15 { @@ -97,7 +97,7 @@ interface I15 { class c { baz: string } -module c { +namespace c { export var bar = 1; } interface I16 { diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/nullIsSubtypeOfEverythingButUndefined.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/nullIsSubtypeOfEverythingButUndefined.ts index 24f2ab71d4105..ec976b6227016 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/nullIsSubtypeOfEverythingButUndefined.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/nullIsSubtypeOfEverythingButUndefined.ts @@ -54,7 +54,7 @@ var r14 = true ? E.A : null; var r14 = true ? null : E.A; function f() { } -module f { +namespace f { export var bar = 1; } var af: typeof f; @@ -62,7 +62,7 @@ var r15 = true ? af : null; var r15 = true ? null : af; class c { baz: string } -module c { +namespace c { export var bar = 1; } var ac: typeof c; diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfAny.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfAny.ts index 0e5df5431996c..fc24f4120deaf 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfAny.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfAny.ts @@ -86,7 +86,7 @@ interface I14 { function f() { } -module f { +namespace f { export var bar = 1; } interface I15 { @@ -96,7 +96,7 @@ interface I15 { class c { baz: string } -module c { +namespace c { export var bar = 1; } interface I16 { diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameter.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameter.ts index a731ae60a229b..a82066954d26a 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameter.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameter.ts @@ -18,11 +18,11 @@ class C1 { foo: number; } class C2 { foo: T; } enum E { A } function f() { } -module f { +namespace f { export var bar = 1; } class c { baz: string } -module c { +namespace c { export var bar = 1; } diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints2.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints2.ts index 9edf4f5f41736..1191383bf90c2 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints2.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithConstraints2.ts @@ -39,11 +39,11 @@ class C1 { foo: number; } class C2 { foo: T; } enum E { A } function f() { } -module f { +namespace f { export var bar = 1; } class c { baz: string } -module c { +namespace c { export var bar = 1; } diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts index f63b63432e549..b535499be890c 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfTypeParameterWithRecursiveConstraints.ts @@ -53,7 +53,7 @@ function f, U extends Foo, V extends Foo>(t: T, u: U, v: var r12 = true ? new Foo() : v; } -module M1 { +namespace M1 { class Base { foo: T; } @@ -105,7 +105,7 @@ module M1 { } -module M2 { +namespace M2 { class Base2 { foo: Foo; } diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfUnion.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfUnion.ts index c20bafeeabfbc..188cc9142bb87 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfUnion.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypesOfUnion.ts @@ -3,9 +3,9 @@ interface I8 { [x: string]: number[]; } class A { foo: number; } class A2 { foo: T; } function f() { } -module f { export var bar = 1; } +namespace f { export var bar = 1; } class c { baz: string } -module c { export var bar = 1; } +namespace c { export var bar = 1; } // A type T is a subtype of a union type U if T is a subtype of any type in U. interface I1 { diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures.ts index 768007371c3d4..59069c4849e72 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures.ts @@ -1,4 +1,4 @@ -module CallSignature { +namespace CallSignature { declare function foo1(cb: (x: number) => void): typeof cb; declare function foo1(cb: any): any; var r = foo1((x: number) => 1); // ok because base returns void diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures3.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures3.ts index 505919547f778..b0e644145cbff 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures3.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures3.ts @@ -1,7 +1,7 @@ // checking subtype relations for function types as it relates to contextual signature instantiation // error cases, so function calls will all result in 'any' -module Errors { +namespace Errors { class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Derived { baz: string; } @@ -105,7 +105,7 @@ module Errors { var r9 = foo17(r9arg); // (x: { (a: T): T; (a: T): T; }): any[]; (x: { (a: T): T; (a: T): T; }): any[]; } -module WithGenericSignaturesInBaseType { +namespace WithGenericSignaturesInBaseType { declare function foo2(a2: (x: T) => T[]): typeof a2; declare function foo2(a2: any): any; var r2arg2 = (x: T) => ['']; diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithSpecializedSignatures.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithSpecializedSignatures.ts index 25efe0679fdb4..947f0a84f427c 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithSpecializedSignatures.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithSpecializedSignatures.ts @@ -1,6 +1,6 @@ // same as subtypingWithCallSignatures but with additional specialized signatures that should not affect the results -module CallSignature { +namespace CallSignature { interface Base { // T // M's (x: 'a'): void; @@ -35,7 +35,7 @@ module CallSignature { } } -module MemberWithCallSignature { +namespace MemberWithCallSignature { interface Base { // T // M's a: { diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures.ts index cec1cf8b29926..206a90a318e10 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures.ts @@ -1,4 +1,4 @@ -module ConstructSignature { +namespace ConstructSignature { declare function foo1(cb: new (x: number) => void): typeof cb; declare function foo1(cb: any): any; var rarg1: new (x: number) => number; diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures3.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures3.ts index 215a5d1d4d1be..0142def4fb970 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures3.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures3.ts @@ -1,7 +1,7 @@ // checking subtype relations for function types as it relates to contextual signature instantiation // error cases, so function calls will all result in 'any' -module Errors { +namespace Errors { class Base { foo: string; } class Derived extends Base { bar: string; } class Derived2 extends Derived { baz: string; } @@ -107,7 +107,7 @@ module Errors { var r9 = foo17(r9arg); // // (x: { (a: T): T; (a: T): T; }): any[]; (x: { (a: T): T; (a: T): T; }): any[]; } -module WithGenericSignaturesInBaseType { +namespace WithGenericSignaturesInBaseType { declare function foo2(a2: new (x: T) => T[]): typeof a2; declare function foo2(a2: any): any; var r2arg2: new (x: T) => string[]; diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignaturesWithSpecializedSignatures.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignaturesWithSpecializedSignatures.ts index b6bade1902a80..97f1522393ad4 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignaturesWithSpecializedSignatures.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignaturesWithSpecializedSignatures.ts @@ -1,6 +1,6 @@ // same as subtypingWithCallSignatures but with additional specialized signatures that should not affect the results -module CallSignature { +namespace CallSignature { interface Base { // T // M's new (x: 'a'): void; @@ -35,7 +35,7 @@ module CallSignature { } } -module MemberWithCallSignature { +namespace MemberWithCallSignature { interface Base { // T // M's a: { diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericCallSignaturesWithOptionalParameters.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericCallSignaturesWithOptionalParameters.ts index 9bed1ee5ad54a..c1b3845f8f402 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericCallSignaturesWithOptionalParameters.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericCallSignaturesWithOptionalParameters.ts @@ -1,6 +1,6 @@ // call signatures in derived types must have the same or fewer optional parameters as the base type -module ClassTypeParam { +namespace ClassTypeParam { interface Base { a: () => T; a2: (x?: T) => T; @@ -86,7 +86,7 @@ module ClassTypeParam { } } -module GenericSignaturesInvalid { +namespace GenericSignaturesInvalid { // all of these are errors interface Base2 { @@ -174,7 +174,7 @@ module GenericSignaturesInvalid { } } -module GenericSignaturesValid { +namespace GenericSignaturesValid { interface Base2 { a: () => T; diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericConstructSignaturesWithOptionalParameters.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericConstructSignaturesWithOptionalParameters.ts index 576e89a7f17c9..f24f03ae859ee 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericConstructSignaturesWithOptionalParameters.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithGenericConstructSignaturesWithOptionalParameters.ts @@ -1,6 +1,6 @@ // call signatures in derived types must have the same or fewer optional parameters as the base type -module ClassTypeParam { +namespace ClassTypeParam { interface Base { a: new () => T; a2: new (x?: T) => T; @@ -86,7 +86,7 @@ module ClassTypeParam { } } -module GenericSignaturesInvalid { +namespace GenericSignaturesInvalid { // all of these are errors interface Base2 { @@ -174,7 +174,7 @@ module GenericSignaturesInvalid { } } -module GenericSignaturesValid { +namespace GenericSignaturesValid { interface Base2 { a: new () => T; diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer.ts index ae4d578d55d61..87a3058397b4f 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer.ts @@ -16,7 +16,7 @@ class B2 extends A { [x: number]: Derived2; // ok } -module Generics { +namespace Generics { class A { [x: number]: T; } diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer2.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer2.ts index 24437548a3bb6..2f48ea170c3c6 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer2.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer2.ts @@ -16,7 +16,7 @@ interface B2 extends A { [x: number]: Derived2; // ok } -module Generics { +namespace Generics { interface A { [x: number]: T; } diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer3.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer3.ts index a69756c44a749..8f5dc495236ed 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer3.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer3.ts @@ -16,7 +16,7 @@ class B2 extends A { [x: number]: Derived2; // ok } -module Generics { +namespace Generics { class A { [x: number]: T; } diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer4.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer4.ts index e86e3e2c5948f..53150d3728344 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer4.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer4.ts @@ -12,7 +12,7 @@ class B extends A { [x: number]: string; // error } -module Generics { +namespace Generics { class A { [x: number]: T; } diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer5.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer5.ts index 721a203a20ff8..76f99f9931572 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer5.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithNumericIndexer5.ts @@ -16,7 +16,7 @@ class B2 implements A { [x: string]: Derived2; // ok } -module Generics { +namespace Generics { interface A { [x: number]: T; } diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers.ts index 0d901b18f74d6..6e5cdba83825b 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers.ts @@ -34,7 +34,7 @@ class B3 extends A3 { '2.0': string; // error } -module TwoLevels { +namespace TwoLevels { class A { foo: Base; bar: Base; diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers2.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers2.ts index 5dea46670f3ce..4ff24e8ed685f 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers2.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers2.ts @@ -8,7 +8,7 @@ interface Derived extends Base { // N and M have the same name, same accessibility, same optionality, and N is a subtype of M // foo properties are valid, bar properties cause errors in the derived class declarations -module NotOptional { +namespace NotOptional { interface A { foo: Base; bar: Base; @@ -41,7 +41,7 @@ module NotOptional { } // same cases as above but with optional -module Optional { +namespace Optional { interface A { foo?: Base; bar?: Base; diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers3.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers3.ts index 423753dbc0ce3..fb06291f49f19 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers3.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers3.ts @@ -8,7 +8,7 @@ interface Derived extends Base { // N and M have the same name, same accessibility, same optionality, and N is a subtype of M // foo properties are valid, bar properties cause errors in the derived class declarations -module NotOptional { +namespace NotOptional { interface A { foo: Base; bar: Derived; @@ -40,7 +40,7 @@ module NotOptional { } } -module Optional { +namespace Optional { interface A { foo?: Base; bar?: Derived; diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts index 1095a2183f392..e3d72f00a1a5e 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers5.ts @@ -8,7 +8,7 @@ interface Derived extends Base { // N and M have the same name, same accessibility, same optionality, and N is a subtype of M // foo properties are valid, bar properties cause errors in the derived class declarations -module NotOptional { +namespace NotOptional { interface A { foo: Base; } @@ -35,7 +35,7 @@ module NotOptional { } // same cases as above but with optional -module Optional { +namespace Optional { interface A { foo?: Base; } diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersAccessibility2.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersAccessibility2.ts index 921f5fb76b32d..a669071372673 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersAccessibility2.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersAccessibility2.ts @@ -8,7 +8,7 @@ class Derived extends Base { bar: string; } -module ExplicitPublic { +namespace ExplicitPublic { class A { private foo: Base; } @@ -34,7 +34,7 @@ module ExplicitPublic { } } -module ImplicitPublic { +namespace ImplicitPublic { class A { private foo: Base; } diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality.ts index 05a8b071c87d6..635daca63b4d4 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembersOptionality.ts @@ -41,7 +41,7 @@ var a: { Foo?: Base; }; var b = { Foo: null }; var r = true ? a : b; -module TwoLevels { +namespace TwoLevels { interface T { Foo?: Base; } diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer.ts index 78065e03991cd..2b4d3fbe69d3f 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer.ts @@ -16,7 +16,7 @@ class B2 extends A { [x: string]: Derived2; // ok } -module Generics { +namespace Generics { class A { [x: string]: T; } diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer2.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer2.ts index dba473accde1d..b88b6362e956e 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer2.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer2.ts @@ -16,7 +16,7 @@ interface B2 extends A { [x: string]: Derived2; // ok } -module Generics { +namespace Generics { interface A { [x: string]: T; } diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer3.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer3.ts index c87937ec7a566..2ba9d981b7850 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer3.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer3.ts @@ -16,7 +16,7 @@ class B2 extends A { [x: string]: Derived2; // ok } -module Generics { +namespace Generics { class A { [x: string]: T; } diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer4.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer4.ts index 08e42144a3886..fd26338a5bd44 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer4.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithStringIndexer4.ts @@ -12,7 +12,7 @@ class B extends A { [x: string]: string; // error } -module Generics { +namespace Generics { class A { [x: string]: T; } diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/undefinedIsSubtypeOfEverything.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/undefinedIsSubtypeOfEverything.ts index 7ee0906ee29c2..b32eaddad3862 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/undefinedIsSubtypeOfEverything.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/undefinedIsSubtypeOfEverything.ts @@ -79,7 +79,7 @@ class D11 extends Base { } function f() { } -module f { +namespace f { export var bar = 1; } class D12 extends Base { @@ -88,7 +88,7 @@ class D12 extends Base { class c { baz: string } -module c { +namespace c { export var bar = 1; } class D13 extends Base { diff --git a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/unionSubtypeIfEveryConstituentTypeIsSubtype.ts b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/unionSubtypeIfEveryConstituentTypeIsSubtype.ts index 7caa26a2959b6..1004d557cc418 100644 --- a/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/unionSubtypeIfEveryConstituentTypeIsSubtype.ts +++ b/tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/unionSubtypeIfEveryConstituentTypeIsSubtype.ts @@ -102,7 +102,7 @@ interface I14 { function f() { } -module f { +namespace f { export var bar = 1; } interface I15 { @@ -113,7 +113,7 @@ interface I15 { class c { baz: string } -module c { +namespace c { export var bar = 1; } interface I16 { diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallToOverloadedMethodWithOverloadedArguments.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallToOverloadedMethodWithOverloadedArguments.ts index b1db7364ab28a..27dad55cf3c9f 100644 --- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallToOverloadedMethodWithOverloadedArguments.ts +++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallToOverloadedMethodWithOverloadedArguments.ts @@ -1,5 +1,5 @@ -module m1 { +namespace m1 { interface Promise { then(cb: (x: T) => Promise): Promise; } @@ -12,7 +12,7 @@ module m1 { ////////////////////////////////////// -module m2 { +namespace m2 { interface Promise { then(cb: (x: T) => Promise): Promise; } @@ -26,7 +26,7 @@ module m2 { ////////////////////////////////////// -module m3 { +namespace m3 { interface Promise { then(cb: (x: T) => Promise): Promise; then(cb: (x: T) => Promise, error?: (error: any) => Promise): Promise; @@ -40,7 +40,7 @@ module m3 { ////////////////////////////////////// -module m4 { +namespace m4 { interface Promise { then(cb: (x: T) => Promise): Promise; then(cb: (x: T) => Promise, error?: (error: any) => Promise): Promise; @@ -55,7 +55,7 @@ module m4 { ////////////////////////////////////// -module m5 { +namespace m5 { interface Promise { then(cb: (x: T) => Promise): Promise; then(cb: (x: T) => Promise, error?: (error: any) => Promise): Promise; @@ -71,7 +71,7 @@ module m5 { ////////////////////////////////////// -module m6 { +namespace m6 { interface Promise { then(cb: (x: T) => Promise): Promise; then(cb: (x: T) => Promise, error?: (error: any) => Promise): Promise; diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts index c37b2e31333ff..ed1ea0b7fb7fb 100644 --- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts +++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts @@ -1,7 +1,7 @@ // When a function expression is inferentially typed (section 4.9.3) and a type assigned to a parameter in that expression references type parameters for which inferences are being made, // the corresponding inferred type arguments to become fixed and no further candidate inferences are made for them. -module onlyT { +namespace onlyT { function foo(a: (x: T) => T, b: (x: T) => T) { var r: (x: T) => T; return r; @@ -37,7 +37,7 @@ module onlyT { var r7 = foo3(E.A, (x) => E.A, (x) => F.A); // error } -module TU { +namespace TU { function foo(a: (x: T) => T, b: (x: U) => U) { var r: (x: T) => T; return r; diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments.ts index 527286e6ee220..3833f433a1d0b 100644 --- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments.ts +++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments.ts @@ -1,7 +1,7 @@ // Function typed arguments with multiple signatures must be passed an implementation that matches all of them // Inferences are made quadratic-pairwise to and from these overload sets -module NonGenericParameter { +namespace NonGenericParameter { var a: { new(x: boolean): boolean; new(x: string): string; @@ -16,7 +16,7 @@ module NonGenericParameter { var r2 = foo4(b); } -module GenericParameter { +namespace GenericParameter { function foo5(cb: { new(x: T): string; new(x: number): T }) { return cb; } diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments2.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments2.ts index c8ce120d3576a..0041e31ec7330 100644 --- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments2.ts +++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments2.ts @@ -1,7 +1,7 @@ // Function typed arguments with multiple signatures must be passed an implementation that matches all of them // Inferences are made quadratic-pairwise to and from these overload sets -module NonGenericParameter { +namespace NonGenericParameter { var a: { new(x: boolean): boolean; new(x: string): string; @@ -15,7 +15,7 @@ module NonGenericParameter { var r3 = foo4(b); // ok } -module GenericParameter { +namespace GenericParameter { function foo5(cb: { new(x: T): string; new(x: number): T }) { return cb; } diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments.ts index b0389698d084b..ebe561b60b42f 100644 --- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments.ts +++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments.ts @@ -1,7 +1,7 @@ // Function typed arguments with multiple signatures must be passed an implementation that matches all of them // Inferences are made quadratic-pairwise to and from these overload sets -module NonGenericParameter { +namespace NonGenericParameter { var a: { (x: boolean): boolean; (x: string): string; @@ -16,7 +16,7 @@ module NonGenericParameter { var r4 = foo4(x => x); } -module GenericParameter { +namespace GenericParameter { function foo5(cb: { (x: T): string; (x: number): T }) { return cb; } diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments2.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments2.ts index 1333f49f83340..535a631951121 100644 --- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments2.ts +++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedFunctionTypedArguments2.ts @@ -1,7 +1,7 @@ // Function typed arguments with multiple signatures must be passed an implementation that matches all of them // Inferences are made quadratic-pairwise to and from these overload sets -module NonGenericParameter { +namespace NonGenericParameter { var a: { (x: boolean): boolean; (x: string): string; @@ -14,7 +14,7 @@ module NonGenericParameter { var r3 = foo4((x: T) => { var r: U; return r }); // ok } -module GenericParameter { +namespace GenericParameter { function foo5(cb: { (x: T): string; (x: number): T }) { return cb; } diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericClassWithFunctionTypedMemberArguments.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericClassWithFunctionTypedMemberArguments.ts index f429cd5169d69..b2ab3c3a7546c 100644 --- a/tests/cases/conformance/types/typeRelationships/typeInference/genericClassWithFunctionTypedMemberArguments.ts +++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericClassWithFunctionTypedMemberArguments.ts @@ -1,7 +1,7 @@ // Generic functions used as arguments for function typed parameters are not used to make inferences from // Using function arguments, no errors expected -module ImmediatelyFix { +namespace ImmediatelyFix { class C { foo(x: (a: T) => T) { return x(null); @@ -24,7 +24,7 @@ module ImmediatelyFix { var r3a = c2.foo(x => 1); // number } -module WithCandidates { +namespace WithCandidates { class C { foo2(x: T, cb: (a: T) => U) { return cb(x); diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.ts index 1c29b3822b4a6..07c017d9bfe47 100644 --- a/tests/cases/conformance/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.ts +++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.ts @@ -14,7 +14,7 @@ class X { x: T; } -module Class { +namespace Class { class G { foo(t: X, t2: X) { var x: T; @@ -39,7 +39,7 @@ module Class { var r2 = g2.foo2(c1, c1); } -module Interface { +namespace Interface { interface G { foo(t: X, t2: X): T; } diff --git a/tests/cases/conformance/types/witness/witness.ts b/tests/cases/conformance/types/witness/witness.ts index ab1ea7fe0fa1b..0c19b422ebff2 100644 --- a/tests/cases/conformance/types/witness/witness.ts +++ b/tests/cases/conformance/types/witness/witness.ts @@ -114,7 +114,7 @@ var propAcc1 = { var propAcc1: { m: any; } // Property access of module member -module M2 { +namespace M2 { export var x = M2.x; var y = x; var y: any; diff --git a/tests/cases/fourslash/formatWithBaseIndent.ts b/tests/cases/fourslash/formatWithBaseIndent.ts index 660131996c95d..678fe6bdc3cec 100644 --- a/tests/cases/fourslash/formatWithBaseIndent.ts +++ b/tests/cases/fourslash/formatWithBaseIndent.ts @@ -136,7 +136,7 @@ format.setFormatOptions(copy); format.document(); verify.currentFileContentIs(` - module classes { + namespace classes { class Bar { constructor() { @@ -156,7 +156,7 @@ verify.currentFileContentIs(` } - module interfaces { + namespace interfaces { interface Foo { x: number; @@ -166,8 +166,8 @@ verify.currentFileContentIs(` } - module nestedModules { - module Foo2 { + namespace nestedModules { + namespace Foo2 { function f() { } var x: number; @@ -175,7 +175,7 @@ verify.currentFileContentIs(` } - module Enums { + namespace Enums { enum Foo3 { val1, val2, diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts index 8c6566392053d..9ec091fe67004 100644 --- a/tests/cases/fourslash/fourslash.ts +++ b/tests/cases/fourslash/fourslash.ts @@ -42,7 +42,7 @@ // // TODO: figure out a better solution to the API exposure problem. -declare module ts { +declare namespace ts { export const Diagnostics: typeof import("../../../src/compiler/diagnosticInformationMap.generated").Diagnostics; export type MapKey = string | number; export interface Map { diff --git a/tests/cases/fourslash/moduleDeclarationDeprecated_error1.ts b/tests/cases/fourslash/moduleDeclarationDeprecated_error1.ts new file mode 100644 index 0000000000000..9c6a6315d204d --- /dev/null +++ b/tests/cases/fourslash/moduleDeclarationDeprecated_error1.ts @@ -0,0 +1,27 @@ +/// + +// @Filename: a.ts +////[|module|] mod1 { export let x: number } +////declare [|module|] mod2 { export let x: number } +////export [|module|] mod3 { export let x: number } +////export declare [|module|] mod4 { export let x: number } +////namespace mod5 { export let x: number } +////declare namespace mod6 { export let x: number } +////mod1.x = 1; +////mod2.x = 1; +////mod5.x = 1; +////mod6.x = 1; + +// @Filename: b.ts +////declare module "global-ambient-module" {} + +goTo.file("a.ts") +const errorDiagnostics = test.ranges().map(range => ({ + code: 1547, + message: "The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead.", + range, +})); +verify.getSemanticDiagnostics(errorDiagnostics) + +goTo.file("b.ts") +verify.getSemanticDiagnostics([]) \ No newline at end of file diff --git a/tests/cases/fourslash/moduleDeclarationDeprecated_ignoreDeprecations.ts b/tests/cases/fourslash/moduleDeclarationDeprecated_ignoreDeprecations.ts new file mode 100644 index 0000000000000..6ca2f2d05e22d --- /dev/null +++ b/tests/cases/fourslash/moduleDeclarationDeprecated_ignoreDeprecations.ts @@ -0,0 +1,31 @@ +/// + +// @ignoreDeprecations: 6.0 +// @Filename: a.ts +////[|module|] mod1 { export let x: number } +////declare [|module|] mod2 { export let x: number } +////export [|module|] mod3 { export let x: number } +////export declare [|module|] mod4 { export let x: number } +////namespace mod5 { export let x: number } +////declare namespace mod6 { export let x: number } +////declare module "module-augmentation" {} +////declare global {} +////mod1.x = 1; +////mod2.x = 1; +////mod5.x = 1; +////mod6.x = 1; + +// @Filename: b.ts +////module "global-ambient-module" {} + +goTo.file("a.ts") +const diagnostics = test.ranges().map(range => ({ + code: 1540, + message: "A 'namespace' declaration should not be declared using the 'module' keyword. Please use the 'namespace' keyword instead.", + reportsDeprecated: true as true, + range, +})); +verify.getSuggestionDiagnostics(diagnostics) + +goTo.file("b.ts") +verify.getSuggestionDiagnostics([]) \ No newline at end of file diff --git a/tests/cases/fourslash/moduleDeclarationDeprecated_suggestion1.ts b/tests/cases/fourslash/moduleDeclarationDeprecated_suggestion1.ts index 5554300a5a0b9..96f34910f7d04 100644 --- a/tests/cases/fourslash/moduleDeclarationDeprecated_suggestion1.ts +++ b/tests/cases/fourslash/moduleDeclarationDeprecated_suggestion1.ts @@ -1,30 +1,31 @@ -/// -// @Filename: a.ts -////[|module|] mod1 { export let x: number } -////declare [|module|] mod2 { export let x: number } -////export [|module|] mod3 { export let x: number } -////export declare [|module|] mod4 { export let x: number } -////namespace mod5 { export let x: number } -////declare namespace mod6 { export let x: number } -////declare module "module-augmentation" {} -////declare global {} -////mod1.x = 1; -////mod2.x = 1; -////mod5.x = 1; -////mod6.x = 1; - -// @Filename: b.ts -////module "global-ambient-module" {} - -goTo.file("a.ts") -const diagnostics = test.ranges().map(range => ({ - code: 1540, - message: "A 'namespace' declaration should not be declared using the 'module' keyword. Please use the 'namespace' keyword instead.", - reportsDeprecated: true, - range, -})); -verify.getSuggestionDiagnostics(diagnostics) - -goTo.file("b.ts") +/// +// @ignoreDeprecations: 6.0 +// @Filename: a.ts +////[|module|] mod1 { export let x: number } +////declare [|module|] mod2 { export let x: number } +////export [|module|] mod3 { export let x: number } +////export declare [|module|] mod4 { export let x: number } +////namespace mod5 { export let x: number } +////declare namespace mod6 { export let x: number } +////declare module "module-augmentation" {} +////declare global {} +////mod1.x = 1; +////mod2.x = 1; +////mod5.x = 1; +////mod6.x = 1; + +// @Filename: b.ts +////module "global-ambient-module" {} + +goTo.file("a.ts") +const diagnostics = test.ranges().map(range => ({ + code: 1540, + message: "A 'namespace' declaration should not be declared using the 'module' keyword. Please use the 'namespace' keyword instead.", + reportsDeprecated: true as true, + range, +})); +verify.getSuggestionDiagnostics(diagnostics) + +goTo.file("b.ts") verify.getSuggestionDiagnostics([]) diff --git a/tests/cases/projects/DeclareExportAdded/ref.d.ts b/tests/cases/projects/DeclareExportAdded/ref.d.ts index 4ce3adee420c0..242a4eb2e7b8e 100644 --- a/tests/cases/projects/DeclareExportAdded/ref.d.ts +++ b/tests/cases/projects/DeclareExportAdded/ref.d.ts @@ -1,4 +1,4 @@ -declare module M1 +declare namespace M1 { export function f1(): void; } \ No newline at end of file diff --git a/tests/cases/projects/NestedLocalModule-SimpleCase/test1.ts b/tests/cases/projects/NestedLocalModule-SimpleCase/test1.ts index a182217506c64..9cd4f6542d5ad 100644 --- a/tests/cases/projects/NestedLocalModule-SimpleCase/test1.ts +++ b/tests/cases/projects/NestedLocalModule-SimpleCase/test1.ts @@ -1,4 +1,4 @@ -export module myModule { +export namespace myModule { import foo = require("test2"); //console.log(foo.$); } diff --git a/tests/cases/projects/NestedLocalModule-WithRecursiveTypecheck/test1.ts b/tests/cases/projects/NestedLocalModule-WithRecursiveTypecheck/test1.ts index 3b51322fb8a4c..173d5073affd0 100644 --- a/tests/cases/projects/NestedLocalModule-WithRecursiveTypecheck/test1.ts +++ b/tests/cases/projects/NestedLocalModule-WithRecursiveTypecheck/test1.ts @@ -1,4 +1,4 @@ -module myModule { +namespace myModule { import foo = require("test2"); diff --git a/tests/cases/projects/NestedLocalModule-WithRecursiveTypecheck/test2.ts b/tests/cases/projects/NestedLocalModule-WithRecursiveTypecheck/test2.ts index dce144b3dc7ab..28957fbb77896 100644 --- a/tests/cases/projects/NestedLocalModule-WithRecursiveTypecheck/test2.ts +++ b/tests/cases/projects/NestedLocalModule-WithRecursiveTypecheck/test2.ts @@ -1,7 +1,7 @@ export var $; -export module Yo { +export namespace Yo { import test = require("test1"); test.x; diff --git a/tests/cases/projects/PrologueEmit/__extends.ts b/tests/cases/projects/PrologueEmit/__extends.ts index 415bdec20a41c..21d21e6986168 100644 --- a/tests/cases/projects/PrologueEmit/__extends.ts +++ b/tests/cases/projects/PrologueEmit/__extends.ts @@ -1,5 +1,5 @@ // class inheritance to ensure __extends is emitted -module m { +namespace m { export class base {} export class child extends base {} } \ No newline at end of file diff --git a/tests/cases/projects/Quote'InName/li'b/class'A.ts b/tests/cases/projects/Quote'InName/li'b/class'A.ts index ea29d5448dabb..ea558861d4121 100644 --- a/tests/cases/projects/Quote'InName/li'b/class'A.ts +++ b/tests/cases/projects/Quote'InName/li'b/class'A.ts @@ -1,4 +1,4 @@ -module test { +namespace test { export class ClassA { public method() { } diff --git a/tests/cases/projects/baseline/nestedModule.ts b/tests/cases/projects/baseline/nestedModule.ts index 9137cac6bb016..b670b1765970c 100644 --- a/tests/cases/projects/baseline/nestedModule.ts +++ b/tests/cases/projects/baseline/nestedModule.ts @@ -1,5 +1,5 @@ -export module outer { - export module inner { +export namespace outer { + export namespace inner { var local = 1; export var a = local; } diff --git a/tests/cases/projects/declarations_ExportNamespace/useModule.ts b/tests/cases/projects/declarations_ExportNamespace/useModule.ts index dc297a5a0ae46..050a82e0fdb2e 100644 --- a/tests/cases/projects/declarations_ExportNamespace/useModule.ts +++ b/tests/cases/projects/declarations_ExportNamespace/useModule.ts @@ -1,4 +1,4 @@ -module moduleB { +namespace moduleB { export interface IUseModuleA { a: moduleA.A; } diff --git a/tests/cases/projects/declarations_ImportedInPrivate/useModule.ts b/tests/cases/projects/declarations_ImportedInPrivate/useModule.ts index e7a03b58cdbb1..634116d668983 100644 --- a/tests/cases/projects/declarations_ImportedInPrivate/useModule.ts +++ b/tests/cases/projects/declarations_ImportedInPrivate/useModule.ts @@ -1,6 +1,6 @@ // only used privately no need to emit import private_m4 = require("private_m4"); -export module usePrivate_m4_m1 { +export namespace usePrivate_m4_m1 { var x3 = private_m4.x; var d3 = private_m4.d; var f3 = private_m4.foo(); diff --git a/tests/cases/projects/declarations_MultipleTimesImport/useModule.ts b/tests/cases/projects/declarations_MultipleTimesImport/useModule.ts index c3b2f5c788716..5f4377333a744 100644 --- a/tests/cases/projects/declarations_MultipleTimesImport/useModule.ts +++ b/tests/cases/projects/declarations_MultipleTimesImport/useModule.ts @@ -3,7 +3,7 @@ export var x4 = m4.x; export var d4 = m4.d; export var f4 = m4.foo(); -export module m1 { +export namespace m1 { export var x2 = m4.x; export var d2 = m4.d; export var f2 = m4.foo(); diff --git a/tests/cases/projects/declarations_MultipleTimesMultipleImport/useModule.ts b/tests/cases/projects/declarations_MultipleTimesMultipleImport/useModule.ts index 012e1ecfdecc1..956c384ba58bc 100644 --- a/tests/cases/projects/declarations_MultipleTimesMultipleImport/useModule.ts +++ b/tests/cases/projects/declarations_MultipleTimesMultipleImport/useModule.ts @@ -3,7 +3,7 @@ export var x4 = m4.x; export var d4 = m4.d; export var f4 = m4.foo(); -export module m1 { +export namespace m1 { export var x2 = m4.x; export var d2 = m4.d; export var f2 = m4.foo(); diff --git a/tests/cases/projects/declarations_SimpleImport/useModule.ts b/tests/cases/projects/declarations_SimpleImport/useModule.ts index a2a8191972c92..0df95cac1b5dd 100644 --- a/tests/cases/projects/declarations_SimpleImport/useModule.ts +++ b/tests/cases/projects/declarations_SimpleImport/useModule.ts @@ -3,7 +3,7 @@ export var x4 = m4.x; export var d4 = m4.d; export var f4 = m4.foo(); -export module m1 { +export namespace m1 { export var x2 = m4.x; export var d2 = m4.d; export var f2 = m4.foo(); diff --git a/tests/cases/projects/declareVariableCollision/decl.d.ts b/tests/cases/projects/declareVariableCollision/decl.d.ts index 9bcb7bb84b436..294bf6a0a5435 100644 --- a/tests/cases/projects/declareVariableCollision/decl.d.ts +++ b/tests/cases/projects/declareVariableCollision/decl.d.ts @@ -1,11 +1,11 @@ // bug 535531: duplicate identifier error reported for "import" declarations in separate files -declare module A +declare namespace A { class MyRoot { } - export module B + export namespace B { class MyClass{ } } diff --git a/tests/cases/projects/ext-int-ext/internal.ts b/tests/cases/projects/ext-int-ext/internal.ts index 2c932f7221209..863538a972ea6 100644 --- a/tests/cases/projects/ext-int-ext/internal.ts +++ b/tests/cases/projects/ext-int-ext/internal.ts @@ -1,3 +1,3 @@ -module outer { +namespace outer { export var b = "foo"; } \ No newline at end of file diff --git a/tests/cases/projects/ext-int-ext/internal2.ts b/tests/cases/projects/ext-int-ext/internal2.ts index dda289f0e65bf..73ccea25b83ac 100644 --- a/tests/cases/projects/ext-int-ext/internal2.ts +++ b/tests/cases/projects/ext-int-ext/internal2.ts @@ -1,4 +1,4 @@ -module outer { +namespace outer { import g = require("external2") export var a = g.square(5); export var b = "foo"; diff --git a/tests/cases/projects/moduleMergeOrder/a.ts b/tests/cases/projects/moduleMergeOrder/a.ts index aa9b2bd617142..1a4d250150b07 100644 --- a/tests/cases/projects/moduleMergeOrder/a.ts +++ b/tests/cases/projects/moduleMergeOrder/a.ts @@ -1,4 +1,4 @@ -module Test { +namespace Test { class A { one: string; two: boolean; diff --git a/tests/cases/projects/moduleMergeOrder/b.ts b/tests/cases/projects/moduleMergeOrder/b.ts index d48afa37dbbc4..5d920a1903600 100644 --- a/tests/cases/projects/moduleMergeOrder/b.ts +++ b/tests/cases/projects/moduleMergeOrder/b.ts @@ -1,2 +1,2 @@ -module Test {} +namespace Test {} diff --git a/tests/cases/projects/privacyCheck-ImportInParent/mExported.ts b/tests/cases/projects/privacyCheck-ImportInParent/mExported.ts index 1c25c14413bbb..2ea26e7e803d0 100644 --- a/tests/cases/projects/privacyCheck-ImportInParent/mExported.ts +++ b/tests/cases/projects/privacyCheck-ImportInParent/mExported.ts @@ -1,4 +1,4 @@ -export module me { +export namespace me { export class class1 { public prop1 = 0; } diff --git a/tests/cases/projects/privacyCheck-ImportInParent/mNonExported.ts b/tests/cases/projects/privacyCheck-ImportInParent/mNonExported.ts index 3674792f342b5..4ea93a9fec94a 100644 --- a/tests/cases/projects/privacyCheck-ImportInParent/mNonExported.ts +++ b/tests/cases/projects/privacyCheck-ImportInParent/mNonExported.ts @@ -1,4 +1,4 @@ -export module mne { +export namespace mne { export class class1 { public prop1 = 0; } diff --git a/tests/cases/projects/privacyCheck-ImportInParent/test.ts b/tests/cases/projects/privacyCheck-ImportInParent/test.ts index ae2ca263f8fc4..75c74f0313bbe 100644 --- a/tests/cases/projects/privacyCheck-ImportInParent/test.ts +++ b/tests/cases/projects/privacyCheck-ImportInParent/test.ts @@ -1,7 +1,7 @@ -export module m2 { +export namespace m2 { export import mExported = require("mExported"); - module Internal_M1 { + namespace Internal_M1 { export var c1 = new mExported.me.class1; export function f1() { return new mExported.me.class1(); @@ -20,7 +20,7 @@ export module m2 { } } - export module Internal_M2 { + export namespace Internal_M2 { export var c1 = new mExported.me.class1; export function f1() { return new mExported.me.class1(); @@ -40,7 +40,7 @@ export module m2 { } import mNonExported = require("mNonExported"); - module Internal_M3 { + namespace Internal_M3 { export var c3 = new mNonExported.mne.class1; export function f3() { return new mNonExported.mne.class1(); @@ -60,7 +60,7 @@ export module m2 { } } - export module Internal_M4 { + export namespace Internal_M4 { export var c3 = new mNonExported.mne.class1; export function f3() { return new mNonExported.mne.class1(); diff --git a/tests/cases/projects/privacyCheck-InsideModule/mExported.ts b/tests/cases/projects/privacyCheck-InsideModule/mExported.ts index 1c25c14413bbb..2ea26e7e803d0 100644 --- a/tests/cases/projects/privacyCheck-InsideModule/mExported.ts +++ b/tests/cases/projects/privacyCheck-InsideModule/mExported.ts @@ -1,4 +1,4 @@ -export module me { +export namespace me { export class class1 { public prop1 = 0; } diff --git a/tests/cases/projects/privacyCheck-InsideModule/mNonExported.ts b/tests/cases/projects/privacyCheck-InsideModule/mNonExported.ts index 3674792f342b5..4ea93a9fec94a 100644 --- a/tests/cases/projects/privacyCheck-InsideModule/mNonExported.ts +++ b/tests/cases/projects/privacyCheck-InsideModule/mNonExported.ts @@ -1,4 +1,4 @@ -export module mne { +export namespace mne { export class class1 { public prop1 = 0; } diff --git a/tests/cases/projects/privacyCheck-InsideModule/test.ts b/tests/cases/projects/privacyCheck-InsideModule/test.ts index 872c0306e17a2..8de870b2e8694 100644 --- a/tests/cases/projects/privacyCheck-InsideModule/test.ts +++ b/tests/cases/projects/privacyCheck-InsideModule/test.ts @@ -1,7 +1,7 @@ -export module m1 { +export namespace m1 { } -module m2 { +namespace m2 { export import mExported = require("mExported"); export var c1 = new mExported.me.class1; export function f1() { diff --git a/tests/cases/projects/privacyCheck-InsideModule/testGlo.ts b/tests/cases/projects/privacyCheck-InsideModule/testGlo.ts index 983c3f764ab9c..3bdba8d570c31 100644 --- a/tests/cases/projects/privacyCheck-InsideModule/testGlo.ts +++ b/tests/cases/projects/privacyCheck-InsideModule/testGlo.ts @@ -1,4 +1,4 @@ -module m2 { +namespace m2 { export import mExported = require("mExported"); export var c1 = new mExported.me.class1; export function f1() { diff --git a/tests/cases/projects/privacyCheck-SimpleReference/mExported.ts b/tests/cases/projects/privacyCheck-SimpleReference/mExported.ts index 1c25c14413bbb..2ea26e7e803d0 100644 --- a/tests/cases/projects/privacyCheck-SimpleReference/mExported.ts +++ b/tests/cases/projects/privacyCheck-SimpleReference/mExported.ts @@ -1,4 +1,4 @@ -export module me { +export namespace me { export class class1 { public prop1 = 0; } diff --git a/tests/cases/projects/privacyCheck-SimpleReference/mNonExported.ts b/tests/cases/projects/privacyCheck-SimpleReference/mNonExported.ts index 3674792f342b5..4ea93a9fec94a 100644 --- a/tests/cases/projects/privacyCheck-SimpleReference/mNonExported.ts +++ b/tests/cases/projects/privacyCheck-SimpleReference/mNonExported.ts @@ -1,4 +1,4 @@ -export module mne { +export namespace mne { export class class1 { public prop1 = 0; } diff --git a/tests/cases/projects/reference-1/lib/classA.ts b/tests/cases/projects/reference-1/lib/classA.ts index ea29d5448dabb..ea558861d4121 100644 --- a/tests/cases/projects/reference-1/lib/classA.ts +++ b/tests/cases/projects/reference-1/lib/classA.ts @@ -1,4 +1,4 @@ -module test { +namespace test { export class ClassA { public method() { } diff --git a/tests/cases/projects/reference-1/lib/classB.ts b/tests/cases/projects/reference-1/lib/classB.ts index e95102a321767..c42258cc035cc 100644 --- a/tests/cases/projects/reference-1/lib/classB.ts +++ b/tests/cases/projects/reference-1/lib/classB.ts @@ -1,6 +1,6 @@ /// -module test { +namespace test { export class ClassB extends ClassA { } diff --git a/tests/cases/projects/reference-path-static/lib.ts b/tests/cases/projects/reference-path-static/lib.ts index 8d0f3d9c69d30..5c4584687aa75 100644 --- a/tests/cases/projects/reference-path-static/lib.ts +++ b/tests/cases/projects/reference-path-static/lib.ts @@ -1,3 +1,3 @@ -module Lib { +namespace Lib { export class LibType {} }