From dc501f47c20fff0e0ed728f18a6914db166b35e0 Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Thu, 15 Sep 2016 09:21:14 -0700 Subject: [PATCH] Update baselines --- ...tionEmitArrayTypesFromGenericArrayUsage.js | 10 ++ ...mitArrayTypesFromGenericArrayUsage.symbols | 5 + ...nEmitArrayTypesFromGenericArrayUsage.types | 5 + ...s.js => declarationEmitBindingPatterns.js} | 6 +- .../declarationEmitBindingPatterns.symbols | 17 +++ ...s => declarationEmitBindingPatterns.types} | 2 +- ...declarationEmitClassMemberNameConflict.js} | 6 +- ...arationEmitClassMemberNameConflict.symbols | 70 +++++++++++ ...larationEmitClassMemberNameConflict.types} | 2 +- ...eclarationEmitClassMemberNameConflict2.js} | 6 +- ...rationEmitClassMemberNameConflict2.symbols | 37 ++++++ ...arationEmitClassMemberNameConflict2.types} | 2 +- ....js => declarationEmitExportAssignment.js} | 2 +- ...> declarationEmitExportAssignment.symbols} | 0 ... => declarationEmitExportAssignment.types} | 0 ...js => declarationEmitExportDeclaration.js} | 2 +- ... declarationEmitExportDeclaration.symbols} | 0 ...=> declarationEmitExportDeclaration.types} | 0 ... => declarationEmitExpressionInExtends.js} | 6 +- ...declarationEmitExpressionInExtends.symbols | 32 +++++ ... declarationEmitExpressionInExtends.types} | 2 +- ...=> declarationEmitExpressionInExtends2.js} | 6 +- ...eclarationEmitExpressionInExtends2.symbols | 30 +++++ ...declarationEmitExpressionInExtends2.types} | 2 +- ...rationEmitExpressionInExtends3.errors.txt} | 6 +- ...=> declarationEmitExpressionInExtends3.js} | 4 +- ...rationEmitExpressionInExtends4.errors.txt} | 12 +- ...=> declarationEmitExpressionInExtends4.js} | 4 +- ...eclarationEmitInferedDefaultExportType.js} | 6 +- ...rationEmitInferedDefaultExportType.symbols | 14 +++ ...arationEmitInferedDefaultExportType.types} | 2 +- ...clarationEmitInferedDefaultExportType2.js} | 6 +- ...ationEmitInferedDefaultExportType2.symbols | 14 +++ ...rationEmitInferedDefaultExportType2.types} | 2 +- .../declarationEmitInvalidExport.errors.txt | 19 +++ ...ort.js => declarationEmitInvalidExport.js} | 4 +- .../declarationEmitInvalidReference.js | 11 ++ .../declarationEmitInvalidReference.symbols | 5 + .../declarationEmitInvalidReference.types | 6 + ...eclarationEmitInvalidReference2.errors.txt | 8 ++ .../declarationEmitInvalidReference2.js | 11 ++ ...cts.js => declarationEmitNameConflicts.js} | 2 +- ...s => declarationEmitNameConflicts.symbols} | 0 ...pes => declarationEmitNameConflicts.types} | 0 ...s2.js => declarationEmitNameConflicts2.js} | 6 +- .../declarationEmitNameConflicts2.symbols | 68 +++++++++++ ...es => declarationEmitNameConflicts2.types} | 2 +- ...s3.js => declarationEmitNameConflicts3.js} | 6 +- .../declarationEmitNameConflicts3.symbols | 76 ++++++++++++ ...es => declarationEmitNameConflicts3.types} | 2 +- ... declarationEmitNameConflictsWithAlias.js} | 6 +- ...larationEmitNameConflictsWithAlias.symbols | 21 ++++ ...clarationEmitNameConflictsWithAlias.types} | 2 +- ....js => declarationEmitProtectedMembers.js} | 6 +- .../declarationEmitProtectedMembers.symbols | 114 ++++++++++++++++++ ... => declarationEmitProtectedMembers.types} | 2 +- ...readonly.js => declarationEmitReadonly.js} | 6 +- .../reference/declarationEmitReadonly.symbols | 8 ++ ...ly.types => declarationEmitReadonly.types} | 2 +- .../declarationEmitUnknownImport.errors.txt | 15 +++ ...ort.js => declarationEmitUnknownImport.js} | 4 +- .../declarationEmitUnknownImport2.errors.txt | 21 ++++ ...t2.js => declarationEmitUnknownImport2.js} | 4 +- .../declarationEmit_UnknownImport.errors.txt | 15 --- .../declarationEmit_UnknownImport2.errors.txt | 21 ---- ...it_array-types-from-generic-array-usage.js | 10 -- ...ray-types-from-generic-array-usage.symbols | 5 - ...array-types-from-generic-array-usage.types | 5 - .../declarationEmit_bindingPatterns.symbols | 17 --- ...rationEmit_classMemberNameConflict.symbols | 70 ----------- ...ationEmit_classMemberNameConflict2.symbols | 37 ------ ...eclarationEmit_expressionInExtends.symbols | 32 ----- ...clarationEmit_expressionInExtends2.symbols | 30 ----- ...ationEmit_inferedDefaultExportType.symbols | 14 --- ...tionEmit_inferedDefaultExportType2.symbols | 14 --- .../declarationEmit_invalidExport.errors.txt | 19 --- .../declarationEmit_invalidReference.js | 11 -- .../declarationEmit_invalidReference.symbols | 5 - .../declarationEmit_invalidReference.types | 6 - ...clarationEmit_invalidReference2.errors.txt | 8 -- .../declarationEmit_invalidReference2.js | 11 -- .../declarationEmit_nameConflicts2.symbols | 68 ----------- .../declarationEmit_nameConflicts3.symbols | 76 ------------ ...arationEmit_nameConflictsWithAlias.symbols | 21 ---- .../declarationEmit_protectedMembers.symbols | 114 ------------------ .../declarationEmit_readonly.symbols | 8 -- ...readonly.ts => declarationEmitReadonly.ts} | 0 87 files changed, 687 insertions(+), 687 deletions(-) create mode 100644 tests/baselines/reference/declarationEmitArrayTypesFromGenericArrayUsage.js create mode 100644 tests/baselines/reference/declarationEmitArrayTypesFromGenericArrayUsage.symbols create mode 100644 tests/baselines/reference/declarationEmitArrayTypesFromGenericArrayUsage.types rename tests/baselines/reference/{declarationEmit_bindingPatterns.js => declarationEmitBindingPatterns.js} (74%) create mode 100644 tests/baselines/reference/declarationEmitBindingPatterns.symbols rename tests/baselines/reference/{declarationEmit_bindingPatterns.types => declarationEmitBindingPatterns.types} (79%) rename tests/baselines/reference/{declarationEmit_classMemberNameConflict.js => declarationEmitClassMemberNameConflict.js} (90%) create mode 100644 tests/baselines/reference/declarationEmitClassMemberNameConflict.symbols rename tests/baselines/reference/{declarationEmit_classMemberNameConflict.types => declarationEmitClassMemberNameConflict.types} (89%) rename tests/baselines/reference/{declarationEmit_classMemberNameConflict2.js => declarationEmitClassMemberNameConflict2.js} (82%) create mode 100644 tests/baselines/reference/declarationEmitClassMemberNameConflict2.symbols rename tests/baselines/reference/{declarationEmit_classMemberNameConflict2.types => declarationEmitClassMemberNameConflict2.types} (80%) rename tests/baselines/reference/{declarationEmit_exportAssignment.js => declarationEmitExportAssignment.js} (84%) rename tests/baselines/reference/{declarationEmit_exportAssignment.symbols => declarationEmitExportAssignment.symbols} (100%) rename tests/baselines/reference/{declarationEmit_exportAssignment.types => declarationEmitExportAssignment.types} (100%) rename tests/baselines/reference/{declarationEmit_exportDeclaration.js => declarationEmitExportDeclaration.js} (85%) rename tests/baselines/reference/{declarationEmit_exportDeclaration.symbols => declarationEmitExportDeclaration.symbols} (100%) rename tests/baselines/reference/{declarationEmit_exportDeclaration.types => declarationEmitExportDeclaration.types} (100%) rename tests/baselines/reference/{declarationEmit_expressionInExtends.js => declarationEmitExpressionInExtends.js} (80%) create mode 100644 tests/baselines/reference/declarationEmitExpressionInExtends.symbols rename tests/baselines/reference/{declarationEmit_expressionInExtends.types => declarationEmitExpressionInExtends.types} (71%) rename tests/baselines/reference/{declarationEmit_expressionInExtends2.js => declarationEmitExpressionInExtends2.js} (82%) create mode 100644 tests/baselines/reference/declarationEmitExpressionInExtends2.symbols rename tests/baselines/reference/{declarationEmit_expressionInExtends2.types => declarationEmitExpressionInExtends2.types} (78%) rename tests/baselines/reference/{declarationEmit_expressionInExtends3.errors.txt => declarationEmitExpressionInExtends3.errors.txt} (73%) rename tests/baselines/reference/{declarationEmit_expressionInExtends3.js => declarationEmitExpressionInExtends3.js} (93%) rename tests/baselines/reference/{declarationEmit_expressionInExtends4.errors.txt => declarationEmitExpressionInExtends4.errors.txt} (51%) rename tests/baselines/reference/{declarationEmit_expressionInExtends4.js => declarationEmitExpressionInExtends4.js} (89%) rename tests/baselines/reference/{declarationEmit_inferedDefaultExportType.js => declarationEmitInferedDefaultExportType.js} (62%) create mode 100644 tests/baselines/reference/declarationEmitInferedDefaultExportType.symbols rename tests/baselines/reference/{declarationEmit_inferedDefaultExportType.types => declarationEmitInferedDefaultExportType.types} (74%) rename tests/baselines/reference/{declarationEmit_inferedDefaultExportType2.js => declarationEmitInferedDefaultExportType2.js} (57%) create mode 100644 tests/baselines/reference/declarationEmitInferedDefaultExportType2.symbols rename tests/baselines/reference/{declarationEmit_inferedDefaultExportType2.types => declarationEmitInferedDefaultExportType2.types} (74%) create mode 100644 tests/baselines/reference/declarationEmitInvalidExport.errors.txt rename tests/baselines/reference/{declarationEmit_invalidExport.js => declarationEmitInvalidExport.js} (61%) create mode 100644 tests/baselines/reference/declarationEmitInvalidReference.js create mode 100644 tests/baselines/reference/declarationEmitInvalidReference.symbols create mode 100644 tests/baselines/reference/declarationEmitInvalidReference.types create mode 100644 tests/baselines/reference/declarationEmitInvalidReference2.errors.txt create mode 100644 tests/baselines/reference/declarationEmitInvalidReference2.js rename tests/baselines/reference/{declarationEmit_nameConflicts.js => declarationEmitNameConflicts.js} (94%) rename tests/baselines/reference/{declarationEmit_nameConflicts.symbols => declarationEmitNameConflicts.symbols} (100%) rename tests/baselines/reference/{declarationEmit_nameConflicts.types => declarationEmitNameConflicts.types} (100%) rename tests/baselines/reference/{declarationEmit_nameConflicts2.js => declarationEmitNameConflicts2.js} (90%) create mode 100644 tests/baselines/reference/declarationEmitNameConflicts2.symbols rename tests/baselines/reference/{declarationEmit_nameConflicts2.types => declarationEmitNameConflicts2.types} (89%) rename tests/baselines/reference/{declarationEmit_nameConflicts3.js => declarationEmitNameConflicts3.js} (91%) create mode 100644 tests/baselines/reference/declarationEmitNameConflicts3.symbols rename tests/baselines/reference/{declarationEmit_nameConflicts3.types => declarationEmitNameConflicts3.types} (88%) rename tests/baselines/reference/{declarationEmit_nameConflictsWithAlias.js => declarationEmitNameConflictsWithAlias.js} (72%) create mode 100644 tests/baselines/reference/declarationEmitNameConflictsWithAlias.symbols rename tests/baselines/reference/{declarationEmit_nameConflictsWithAlias.types => declarationEmitNameConflictsWithAlias.types} (76%) rename tests/baselines/reference/{declarationEmit_protectedMembers.js => declarationEmitProtectedMembers.js} (93%) create mode 100644 tests/baselines/reference/declarationEmitProtectedMembers.symbols rename tests/baselines/reference/{declarationEmit_protectedMembers.types => declarationEmitProtectedMembers.types} (91%) rename tests/baselines/reference/{declarationEmit_readonly.js => declarationEmitReadonly.js} (63%) create mode 100644 tests/baselines/reference/declarationEmitReadonly.symbols rename tests/baselines/reference/{declarationEmit_readonly.types => declarationEmitReadonly.types} (70%) create mode 100644 tests/baselines/reference/declarationEmitUnknownImport.errors.txt rename tests/baselines/reference/{declarationEmit_UnknownImport.js => declarationEmitUnknownImport.js} (56%) create mode 100644 tests/baselines/reference/declarationEmitUnknownImport2.errors.txt rename tests/baselines/reference/{declarationEmit_UnknownImport2.js => declarationEmitUnknownImport2.js} (69%) delete mode 100644 tests/baselines/reference/declarationEmit_UnknownImport.errors.txt delete mode 100644 tests/baselines/reference/declarationEmit_UnknownImport2.errors.txt delete mode 100644 tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.js delete mode 100644 tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.symbols delete mode 100644 tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.types delete mode 100644 tests/baselines/reference/declarationEmit_bindingPatterns.symbols delete mode 100644 tests/baselines/reference/declarationEmit_classMemberNameConflict.symbols delete mode 100644 tests/baselines/reference/declarationEmit_classMemberNameConflict2.symbols delete mode 100644 tests/baselines/reference/declarationEmit_expressionInExtends.symbols delete mode 100644 tests/baselines/reference/declarationEmit_expressionInExtends2.symbols delete mode 100644 tests/baselines/reference/declarationEmit_inferedDefaultExportType.symbols delete mode 100644 tests/baselines/reference/declarationEmit_inferedDefaultExportType2.symbols delete mode 100644 tests/baselines/reference/declarationEmit_invalidExport.errors.txt delete mode 100644 tests/baselines/reference/declarationEmit_invalidReference.js delete mode 100644 tests/baselines/reference/declarationEmit_invalidReference.symbols delete mode 100644 tests/baselines/reference/declarationEmit_invalidReference.types delete mode 100644 tests/baselines/reference/declarationEmit_invalidReference2.errors.txt delete mode 100644 tests/baselines/reference/declarationEmit_invalidReference2.js delete mode 100644 tests/baselines/reference/declarationEmit_nameConflicts2.symbols delete mode 100644 tests/baselines/reference/declarationEmit_nameConflicts3.symbols delete mode 100644 tests/baselines/reference/declarationEmit_nameConflictsWithAlias.symbols delete mode 100644 tests/baselines/reference/declarationEmit_protectedMembers.symbols delete mode 100644 tests/baselines/reference/declarationEmit_readonly.symbols rename tests/cases/conformance/classes/constructorDeclarations/constructorParameters/{declarationEmit_readonly.ts => declarationEmitReadonly.ts} (100%) diff --git a/tests/baselines/reference/declarationEmitArrayTypesFromGenericArrayUsage.js b/tests/baselines/reference/declarationEmitArrayTypesFromGenericArrayUsage.js new file mode 100644 index 00000000000..4fd9534080f --- /dev/null +++ b/tests/baselines/reference/declarationEmitArrayTypesFromGenericArrayUsage.js @@ -0,0 +1,10 @@ +//// [declarationEmitArrayTypesFromGenericArrayUsage.ts] +interface A extends Array { } + + +//// [declarationEmitArrayTypesFromGenericArrayUsage.js] + + +//// [declarationEmitArrayTypesFromGenericArrayUsage.d.ts] +interface A extends Array { +} diff --git a/tests/baselines/reference/declarationEmitArrayTypesFromGenericArrayUsage.symbols b/tests/baselines/reference/declarationEmitArrayTypesFromGenericArrayUsage.symbols new file mode 100644 index 00000000000..33c9d38355a --- /dev/null +++ b/tests/baselines/reference/declarationEmitArrayTypesFromGenericArrayUsage.symbols @@ -0,0 +1,5 @@ +=== tests/cases/compiler/declarationEmitArrayTypesFromGenericArrayUsage.ts === +interface A extends Array { } +>A : Symbol(A, Decl(declarationEmitArrayTypesFromGenericArrayUsage.ts, 0, 0)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + diff --git a/tests/baselines/reference/declarationEmitArrayTypesFromGenericArrayUsage.types b/tests/baselines/reference/declarationEmitArrayTypesFromGenericArrayUsage.types new file mode 100644 index 00000000000..25350552a5f --- /dev/null +++ b/tests/baselines/reference/declarationEmitArrayTypesFromGenericArrayUsage.types @@ -0,0 +1,5 @@ +=== tests/cases/compiler/declarationEmitArrayTypesFromGenericArrayUsage.ts === +interface A extends Array { } +>A : A +>Array : T[] + diff --git a/tests/baselines/reference/declarationEmit_bindingPatterns.js b/tests/baselines/reference/declarationEmitBindingPatterns.js similarity index 74% rename from tests/baselines/reference/declarationEmit_bindingPatterns.js rename to tests/baselines/reference/declarationEmitBindingPatterns.js index 8cc52af53b8..c55d885a1ca 100644 --- a/tests/baselines/reference/declarationEmit_bindingPatterns.js +++ b/tests/baselines/reference/declarationEmitBindingPatterns.js @@ -1,4 +1,4 @@ -//// [declarationEmit_bindingPatterns.ts] +//// [declarationEmitBindingPatterns.ts] const k = ({x: z = 'y'}) => { } @@ -6,7 +6,7 @@ var a; function f({} = a, [] = a, { p: {} = a} = a) { } -//// [declarationEmit_bindingPatterns.js] +//// [declarationEmitBindingPatterns.js] var k = function (_a) { var _b = _a.x, z = _b === void 0 ? 'y' : _b; }; @@ -18,7 +18,7 @@ function f(_a, _b, _c) { } -//// [declarationEmit_bindingPatterns.d.ts] +//// [declarationEmitBindingPatterns.d.ts] declare const k: ({x: z}: { x?: string; }) => void; diff --git a/tests/baselines/reference/declarationEmitBindingPatterns.symbols b/tests/baselines/reference/declarationEmitBindingPatterns.symbols new file mode 100644 index 00000000000..705610bf04f --- /dev/null +++ b/tests/baselines/reference/declarationEmitBindingPatterns.symbols @@ -0,0 +1,17 @@ +=== tests/cases/compiler/declarationEmitBindingPatterns.ts === + +const k = ({x: z = 'y'}) => { } +>k : Symbol(k, Decl(declarationEmitBindingPatterns.ts, 1, 5)) +>x : Symbol(x) +>z : Symbol(z, Decl(declarationEmitBindingPatterns.ts, 1, 12)) + +var a; +>a : Symbol(a, Decl(declarationEmitBindingPatterns.ts, 3, 3)) + +function f({} = a, [] = a, { p: {} = a} = a) { +>f : Symbol(f, Decl(declarationEmitBindingPatterns.ts, 3, 6)) +>a : Symbol(a, Decl(declarationEmitBindingPatterns.ts, 3, 3)) +>a : Symbol(a, Decl(declarationEmitBindingPatterns.ts, 3, 3)) +>a : Symbol(a, Decl(declarationEmitBindingPatterns.ts, 3, 3)) +>a : Symbol(a, Decl(declarationEmitBindingPatterns.ts, 3, 3)) +} diff --git a/tests/baselines/reference/declarationEmit_bindingPatterns.types b/tests/baselines/reference/declarationEmitBindingPatterns.types similarity index 79% rename from tests/baselines/reference/declarationEmit_bindingPatterns.types rename to tests/baselines/reference/declarationEmitBindingPatterns.types index b3da24a2b95..a0ae3f5aa14 100644 --- a/tests/baselines/reference/declarationEmit_bindingPatterns.types +++ b/tests/baselines/reference/declarationEmitBindingPatterns.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/declarationEmit_bindingPatterns.ts === +=== tests/cases/compiler/declarationEmitBindingPatterns.ts === const k = ({x: z = 'y'}) => { } >k : ({x: z}: { x?: string; }) => void diff --git a/tests/baselines/reference/declarationEmit_classMemberNameConflict.js b/tests/baselines/reference/declarationEmitClassMemberNameConflict.js similarity index 90% rename from tests/baselines/reference/declarationEmit_classMemberNameConflict.js rename to tests/baselines/reference/declarationEmitClassMemberNameConflict.js index 55acb13d2b9..23c83276201 100644 --- a/tests/baselines/reference/declarationEmit_classMemberNameConflict.js +++ b/tests/baselines/reference/declarationEmitClassMemberNameConflict.js @@ -1,4 +1,4 @@ -//// [declarationEmit_classMemberNameConflict.ts] +//// [declarationEmitClassMemberNameConflict.ts] export class C1 { C1() { } // has to be the same as the class name @@ -36,7 +36,7 @@ export class C4 { } } -//// [declarationEmit_classMemberNameConflict.js] +//// [declarationEmitClassMemberNameConflict.js] "use strict"; var C1 = (function () { function C1() { @@ -93,7 +93,7 @@ var C4 = (function () { exports.C4 = C4; -//// [declarationEmit_classMemberNameConflict.d.ts] +//// [declarationEmitClassMemberNameConflict.d.ts] export declare class C1 { C1(): void; bar(): (t: typeof C1) => void; diff --git a/tests/baselines/reference/declarationEmitClassMemberNameConflict.symbols b/tests/baselines/reference/declarationEmitClassMemberNameConflict.symbols new file mode 100644 index 00000000000..02ea2f015f3 --- /dev/null +++ b/tests/baselines/reference/declarationEmitClassMemberNameConflict.symbols @@ -0,0 +1,70 @@ +=== tests/cases/compiler/declarationEmitClassMemberNameConflict.ts === + +export class C1 { +>C1 : Symbol(C1, Decl(declarationEmitClassMemberNameConflict.ts, 0, 0)) + + C1() { } // has to be the same as the class name +>C1 : Symbol(C1.C1, Decl(declarationEmitClassMemberNameConflict.ts, 1, 17)) + + bar() { +>bar : Symbol(C1.bar, Decl(declarationEmitClassMemberNameConflict.ts, 2, 12)) + + return function (t: typeof C1) { +>t : Symbol(t, Decl(declarationEmitClassMemberNameConflict.ts, 5, 25)) +>C1 : Symbol(C1, Decl(declarationEmitClassMemberNameConflict.ts, 0, 0)) + + }; + } +} + +export class C2 { +>C2 : Symbol(C2, Decl(declarationEmitClassMemberNameConflict.ts, 8, 1)) + + C2: any // has to be the same as the class name +>C2 : Symbol(C2.C2, Decl(declarationEmitClassMemberNameConflict.ts, 10, 17)) + + bar() { +>bar : Symbol(C2.bar, Decl(declarationEmitClassMemberNameConflict.ts, 11, 11)) + + return function (t: typeof C2) { +>t : Symbol(t, Decl(declarationEmitClassMemberNameConflict.ts, 14, 25)) +>C2 : Symbol(C2, Decl(declarationEmitClassMemberNameConflict.ts, 8, 1)) + + }; + } +} + +export class C3 { +>C3 : Symbol(C3, Decl(declarationEmitClassMemberNameConflict.ts, 17, 1)) + + get C3() { return 0; } // has to be the same as the class name +>C3 : Symbol(C3.C3, Decl(declarationEmitClassMemberNameConflict.ts, 19, 17)) + + bar() { +>bar : Symbol(C3.bar, Decl(declarationEmitClassMemberNameConflict.ts, 20, 26)) + + return function (t: typeof C3) { +>t : Symbol(t, Decl(declarationEmitClassMemberNameConflict.ts, 23, 25)) +>C3 : Symbol(C3, Decl(declarationEmitClassMemberNameConflict.ts, 17, 1)) + + }; + } +} + +export class C4 { +>C4 : Symbol(C4, Decl(declarationEmitClassMemberNameConflict.ts, 26, 1)) + + set C4(v) { } // has to be the same as the class name +>C4 : Symbol(C4.C4, Decl(declarationEmitClassMemberNameConflict.ts, 28, 17)) +>v : Symbol(v, Decl(declarationEmitClassMemberNameConflict.ts, 29, 11)) + + bar() { +>bar : Symbol(C4.bar, Decl(declarationEmitClassMemberNameConflict.ts, 29, 17)) + + return function (t: typeof C4) { +>t : Symbol(t, Decl(declarationEmitClassMemberNameConflict.ts, 32, 25)) +>C4 : Symbol(C4, Decl(declarationEmitClassMemberNameConflict.ts, 26, 1)) + + }; + } +} diff --git a/tests/baselines/reference/declarationEmit_classMemberNameConflict.types b/tests/baselines/reference/declarationEmitClassMemberNameConflict.types similarity index 89% rename from tests/baselines/reference/declarationEmit_classMemberNameConflict.types rename to tests/baselines/reference/declarationEmitClassMemberNameConflict.types index 66bc493b2ee..266942f29c5 100644 --- a/tests/baselines/reference/declarationEmit_classMemberNameConflict.types +++ b/tests/baselines/reference/declarationEmitClassMemberNameConflict.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/declarationEmit_classMemberNameConflict.ts === +=== tests/cases/compiler/declarationEmitClassMemberNameConflict.ts === export class C1 { >C1 : C1 diff --git a/tests/baselines/reference/declarationEmit_classMemberNameConflict2.js b/tests/baselines/reference/declarationEmitClassMemberNameConflict2.js similarity index 82% rename from tests/baselines/reference/declarationEmit_classMemberNameConflict2.js rename to tests/baselines/reference/declarationEmitClassMemberNameConflict2.js index d3ebddc8d17..233ca0fe138 100644 --- a/tests/baselines/reference/declarationEmit_classMemberNameConflict2.js +++ b/tests/baselines/reference/declarationEmitClassMemberNameConflict2.js @@ -1,4 +1,4 @@ -//// [declarationEmit_classMemberNameConflict2.ts] +//// [declarationEmitClassMemberNameConflict2.ts] const Bar = 'bar'; @@ -21,7 +21,7 @@ class Foo { Hello2 = Hello1; } -//// [declarationEmit_classMemberNameConflict2.js] +//// [declarationEmitClassMemberNameConflict2.js] var Bar = 'bar'; var Hello; (function (Hello) { @@ -44,7 +44,7 @@ var Foo = (function () { }()); -//// [declarationEmit_classMemberNameConflict2.d.ts] +//// [declarationEmitClassMemberNameConflict2.d.ts] declare const Bar: "bar"; declare enum Hello { World = 0, diff --git a/tests/baselines/reference/declarationEmitClassMemberNameConflict2.symbols b/tests/baselines/reference/declarationEmitClassMemberNameConflict2.symbols new file mode 100644 index 00000000000..059200c6074 --- /dev/null +++ b/tests/baselines/reference/declarationEmitClassMemberNameConflict2.symbols @@ -0,0 +1,37 @@ +=== tests/cases/compiler/declarationEmitClassMemberNameConflict2.ts === + +const Bar = 'bar'; +>Bar : Symbol(Bar, Decl(declarationEmitClassMemberNameConflict2.ts, 1, 5)) + +enum Hello { +>Hello : Symbol(Hello, Decl(declarationEmitClassMemberNameConflict2.ts, 1, 18)) + + World +>World : Symbol(Hello.World, Decl(declarationEmitClassMemberNameConflict2.ts, 3, 12)) +} + +enum Hello1 { +>Hello1 : Symbol(Hello1, Decl(declarationEmitClassMemberNameConflict2.ts, 5, 1)) + + World1 +>World1 : Symbol(Hello1.World1, Decl(declarationEmitClassMemberNameConflict2.ts, 7, 13)) +} + +class Foo { +>Foo : Symbol(Foo, Decl(declarationEmitClassMemberNameConflict2.ts, 9, 1)) + + // Same names + string => OK + Bar = Bar; +>Bar : Symbol(Foo.Bar, Decl(declarationEmitClassMemberNameConflict2.ts, 11, 11)) +>Bar : Symbol(Bar, Decl(declarationEmitClassMemberNameConflict2.ts, 1, 5)) + + // Same names + enum => OK + Hello = Hello; +>Hello : Symbol(Foo.Hello, Decl(declarationEmitClassMemberNameConflict2.ts, 13, 14)) +>Hello : Symbol(Hello, Decl(declarationEmitClassMemberNameConflict2.ts, 1, 18)) + + // Different names + enum => OK + Hello2 = Hello1; +>Hello2 : Symbol(Foo.Hello2, Decl(declarationEmitClassMemberNameConflict2.ts, 16, 18)) +>Hello1 : Symbol(Hello1, Decl(declarationEmitClassMemberNameConflict2.ts, 5, 1)) +} diff --git a/tests/baselines/reference/declarationEmit_classMemberNameConflict2.types b/tests/baselines/reference/declarationEmitClassMemberNameConflict2.types similarity index 80% rename from tests/baselines/reference/declarationEmit_classMemberNameConflict2.types rename to tests/baselines/reference/declarationEmitClassMemberNameConflict2.types index dd184f7ba34..f355a9002c8 100644 --- a/tests/baselines/reference/declarationEmit_classMemberNameConflict2.types +++ b/tests/baselines/reference/declarationEmitClassMemberNameConflict2.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/declarationEmit_classMemberNameConflict2.ts === +=== tests/cases/compiler/declarationEmitClassMemberNameConflict2.ts === const Bar = 'bar'; >Bar : "bar" diff --git a/tests/baselines/reference/declarationEmit_exportAssignment.js b/tests/baselines/reference/declarationEmitExportAssignment.js similarity index 84% rename from tests/baselines/reference/declarationEmit_exportAssignment.js rename to tests/baselines/reference/declarationEmitExportAssignment.js index 36f698ec6c7..8c97ef8eb07 100644 --- a/tests/baselines/reference/declarationEmit_exportAssignment.js +++ b/tests/baselines/reference/declarationEmitExportAssignment.js @@ -1,4 +1,4 @@ -//// [tests/cases/compiler/declarationEmit_exportAssignment.ts] //// +//// [tests/cases/compiler/declarationEmitExportAssignment.ts] //// //// [utils.ts] diff --git a/tests/baselines/reference/declarationEmit_exportAssignment.symbols b/tests/baselines/reference/declarationEmitExportAssignment.symbols similarity index 100% rename from tests/baselines/reference/declarationEmit_exportAssignment.symbols rename to tests/baselines/reference/declarationEmitExportAssignment.symbols diff --git a/tests/baselines/reference/declarationEmit_exportAssignment.types b/tests/baselines/reference/declarationEmitExportAssignment.types similarity index 100% rename from tests/baselines/reference/declarationEmit_exportAssignment.types rename to tests/baselines/reference/declarationEmitExportAssignment.types diff --git a/tests/baselines/reference/declarationEmit_exportDeclaration.js b/tests/baselines/reference/declarationEmitExportDeclaration.js similarity index 85% rename from tests/baselines/reference/declarationEmit_exportDeclaration.js rename to tests/baselines/reference/declarationEmitExportDeclaration.js index 6c6c37bbcfd..dfbed90742d 100644 --- a/tests/baselines/reference/declarationEmit_exportDeclaration.js +++ b/tests/baselines/reference/declarationEmitExportDeclaration.js @@ -1,4 +1,4 @@ -//// [tests/cases/compiler/declarationEmit_exportDeclaration.ts] //// +//// [tests/cases/compiler/declarationEmitExportDeclaration.ts] //// //// [utils.ts] diff --git a/tests/baselines/reference/declarationEmit_exportDeclaration.symbols b/tests/baselines/reference/declarationEmitExportDeclaration.symbols similarity index 100% rename from tests/baselines/reference/declarationEmit_exportDeclaration.symbols rename to tests/baselines/reference/declarationEmitExportDeclaration.symbols diff --git a/tests/baselines/reference/declarationEmit_exportDeclaration.types b/tests/baselines/reference/declarationEmitExportDeclaration.types similarity index 100% rename from tests/baselines/reference/declarationEmit_exportDeclaration.types rename to tests/baselines/reference/declarationEmitExportDeclaration.types diff --git a/tests/baselines/reference/declarationEmit_expressionInExtends.js b/tests/baselines/reference/declarationEmitExpressionInExtends.js similarity index 80% rename from tests/baselines/reference/declarationEmit_expressionInExtends.js rename to tests/baselines/reference/declarationEmitExpressionInExtends.js index 061042aa34b..a7b2a6c7873 100644 --- a/tests/baselines/reference/declarationEmit_expressionInExtends.js +++ b/tests/baselines/reference/declarationEmitExpressionInExtends.js @@ -1,4 +1,4 @@ -//// [declarationEmit_expressionInExtends.ts] +//// [declarationEmitExpressionInExtends.ts] var x: { new(s: any): Q; @@ -14,7 +14,7 @@ class B extends x { var q: B; q.s; -//// [declarationEmit_expressionInExtends.js] +//// [declarationEmitExpressionInExtends.js] var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } @@ -37,7 +37,7 @@ var q; q.s; -//// [declarationEmit_expressionInExtends.d.ts] +//// [declarationEmitExpressionInExtends.d.ts] declare var x: { new (s: any): Q; }; diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends.symbols b/tests/baselines/reference/declarationEmitExpressionInExtends.symbols new file mode 100644 index 00000000000..8ae1e2928fd --- /dev/null +++ b/tests/baselines/reference/declarationEmitExpressionInExtends.symbols @@ -0,0 +1,32 @@ +=== tests/cases/compiler/declarationEmitExpressionInExtends.ts === + +var x: { +>x : Symbol(x, Decl(declarationEmitExpressionInExtends.ts, 1, 3)) + + new(s: any): Q; +>T : Symbol(T, Decl(declarationEmitExpressionInExtends.ts, 2, 8)) +>s : Symbol(s, Decl(declarationEmitExpressionInExtends.ts, 2, 11)) +>Q : Symbol(Q, Decl(declarationEmitExpressionInExtends.ts, 3, 1)) +} + +class Q { +>Q : Symbol(Q, Decl(declarationEmitExpressionInExtends.ts, 3, 1)) + + s: string; +>s : Symbol(Q.s, Decl(declarationEmitExpressionInExtends.ts, 5, 9)) +} + +class B extends x { +>B : Symbol(B, Decl(declarationEmitExpressionInExtends.ts, 7, 1)) +>x : Symbol(x, Decl(declarationEmitExpressionInExtends.ts, 1, 3)) +} + +var q: B; +>q : Symbol(q, Decl(declarationEmitExpressionInExtends.ts, 12, 3)) +>B : Symbol(B, Decl(declarationEmitExpressionInExtends.ts, 7, 1)) + +q.s; +>q.s : Symbol(Q.s, Decl(declarationEmitExpressionInExtends.ts, 5, 9)) +>q : Symbol(q, Decl(declarationEmitExpressionInExtends.ts, 12, 3)) +>s : Symbol(Q.s, Decl(declarationEmitExpressionInExtends.ts, 5, 9)) + diff --git a/tests/baselines/reference/declarationEmit_expressionInExtends.types b/tests/baselines/reference/declarationEmitExpressionInExtends.types similarity index 71% rename from tests/baselines/reference/declarationEmit_expressionInExtends.types rename to tests/baselines/reference/declarationEmitExpressionInExtends.types index 2e810fccf68..fdbec3f9c48 100644 --- a/tests/baselines/reference/declarationEmit_expressionInExtends.types +++ b/tests/baselines/reference/declarationEmitExpressionInExtends.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/declarationEmit_expressionInExtends.ts === +=== tests/cases/compiler/declarationEmitExpressionInExtends.ts === var x: { >x : new (s: any) => Q diff --git a/tests/baselines/reference/declarationEmit_expressionInExtends2.js b/tests/baselines/reference/declarationEmitExpressionInExtends2.js similarity index 82% rename from tests/baselines/reference/declarationEmit_expressionInExtends2.js rename to tests/baselines/reference/declarationEmitExpressionInExtends2.js index da0478e26d0..09298fbd92d 100644 --- a/tests/baselines/reference/declarationEmit_expressionInExtends2.js +++ b/tests/baselines/reference/declarationEmitExpressionInExtends2.js @@ -1,4 +1,4 @@ -//// [declarationEmit_expressionInExtends2.ts] +//// [declarationEmitExpressionInExtends2.ts] class C { x: T; @@ -12,7 +12,7 @@ function getClass(c: T) { class MyClass extends getClass(2) { } -//// [declarationEmit_expressionInExtends2.js] +//// [declarationEmitExpressionInExtends2.js] var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } @@ -35,7 +35,7 @@ var MyClass = (function (_super) { }(getClass(2))); -//// [declarationEmit_expressionInExtends2.d.ts] +//// [declarationEmitExpressionInExtends2.d.ts] declare class C { x: T; y: U; diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends2.symbols b/tests/baselines/reference/declarationEmitExpressionInExtends2.symbols new file mode 100644 index 00000000000..a07590a14c7 --- /dev/null +++ b/tests/baselines/reference/declarationEmitExpressionInExtends2.symbols @@ -0,0 +1,30 @@ +=== tests/cases/compiler/declarationEmitExpressionInExtends2.ts === + +class C { +>C : Symbol(C, Decl(declarationEmitExpressionInExtends2.ts, 0, 0)) +>T : Symbol(T, Decl(declarationEmitExpressionInExtends2.ts, 1, 8)) +>U : Symbol(U, Decl(declarationEmitExpressionInExtends2.ts, 1, 10)) + + x: T; +>x : Symbol(C.x, Decl(declarationEmitExpressionInExtends2.ts, 1, 15)) +>T : Symbol(T, Decl(declarationEmitExpressionInExtends2.ts, 1, 8)) + + y: U; +>y : Symbol(C.y, Decl(declarationEmitExpressionInExtends2.ts, 2, 9)) +>U : Symbol(U, Decl(declarationEmitExpressionInExtends2.ts, 1, 10)) +} + +function getClass(c: T) { +>getClass : Symbol(getClass, Decl(declarationEmitExpressionInExtends2.ts, 4, 1)) +>T : Symbol(T, Decl(declarationEmitExpressionInExtends2.ts, 6, 18)) +>c : Symbol(c, Decl(declarationEmitExpressionInExtends2.ts, 6, 21)) +>T : Symbol(T, Decl(declarationEmitExpressionInExtends2.ts, 6, 18)) + + return C; +>C : Symbol(C, Decl(declarationEmitExpressionInExtends2.ts, 0, 0)) +} + +class MyClass extends getClass(2) { +>MyClass : Symbol(MyClass, Decl(declarationEmitExpressionInExtends2.ts, 8, 1)) +>getClass : Symbol(getClass, Decl(declarationEmitExpressionInExtends2.ts, 4, 1)) +} diff --git a/tests/baselines/reference/declarationEmit_expressionInExtends2.types b/tests/baselines/reference/declarationEmitExpressionInExtends2.types similarity index 78% rename from tests/baselines/reference/declarationEmit_expressionInExtends2.types rename to tests/baselines/reference/declarationEmitExpressionInExtends2.types index 3f2b8964a2d..04265e9f74e 100644 --- a/tests/baselines/reference/declarationEmit_expressionInExtends2.types +++ b/tests/baselines/reference/declarationEmitExpressionInExtends2.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/declarationEmit_expressionInExtends2.ts === +=== tests/cases/compiler/declarationEmitExpressionInExtends2.ts === class C { >C : C diff --git a/tests/baselines/reference/declarationEmit_expressionInExtends3.errors.txt b/tests/baselines/reference/declarationEmitExpressionInExtends3.errors.txt similarity index 73% rename from tests/baselines/reference/declarationEmit_expressionInExtends3.errors.txt rename to tests/baselines/reference/declarationEmitExpressionInExtends3.errors.txt index 2783810c568..5ed622caafe 100644 --- a/tests/baselines/reference/declarationEmit_expressionInExtends3.errors.txt +++ b/tests/baselines/reference/declarationEmitExpressionInExtends3.errors.txt @@ -1,8 +1,8 @@ -tests/cases/compiler/declarationEmit_expressionInExtends3.ts(29,30): error TS4020: Extends clause of exported class 'MyClass' has or is using private name 'LocalClass'. -tests/cases/compiler/declarationEmit_expressionInExtends3.ts(37,31): error TS4020: Extends clause of exported class 'MyClass3' has or is using private name 'LocalInterface'. +tests/cases/compiler/declarationEmitExpressionInExtends3.ts(29,30): error TS4020: Extends clause of exported class 'MyClass' has or is using private name 'LocalClass'. +tests/cases/compiler/declarationEmitExpressionInExtends3.ts(37,31): error TS4020: Extends clause of exported class 'MyClass3' has or is using private name 'LocalInterface'. -==== tests/cases/compiler/declarationEmit_expressionInExtends3.ts (2 errors) ==== +==== tests/cases/compiler/declarationEmitExpressionInExtends3.ts (2 errors) ==== export class ExportedClass { x: T; diff --git a/tests/baselines/reference/declarationEmit_expressionInExtends3.js b/tests/baselines/reference/declarationEmitExpressionInExtends3.js similarity index 93% rename from tests/baselines/reference/declarationEmit_expressionInExtends3.js rename to tests/baselines/reference/declarationEmitExpressionInExtends3.js index 10ef42d6838..c21074fc3b7 100644 --- a/tests/baselines/reference/declarationEmit_expressionInExtends3.js +++ b/tests/baselines/reference/declarationEmitExpressionInExtends3.js @@ -1,4 +1,4 @@ -//// [declarationEmit_expressionInExtends3.ts] +//// [declarationEmitExpressionInExtends3.ts] export class ExportedClass { x: T; @@ -43,7 +43,7 @@ export class MyClass4 extends getExportedClass(undefined)foo : Symbol(foo, Decl(declarationEmitInferedDefaultExportType.ts, 2, 16)) + + bar: undefined, +>bar : Symbol(bar, Decl(declarationEmitInferedDefaultExportType.ts, 3, 10)) +>undefined : Symbol(undefined) + + baz: null +>baz : Symbol(baz, Decl(declarationEmitInferedDefaultExportType.ts, 4, 17)) +} diff --git a/tests/baselines/reference/declarationEmit_inferedDefaultExportType.types b/tests/baselines/reference/declarationEmitInferedDefaultExportType.types similarity index 74% rename from tests/baselines/reference/declarationEmit_inferedDefaultExportType.types rename to tests/baselines/reference/declarationEmitInferedDefaultExportType.types index 0f5d0ceed91..5c01d22b32e 100644 --- a/tests/baselines/reference/declarationEmit_inferedDefaultExportType.types +++ b/tests/baselines/reference/declarationEmitInferedDefaultExportType.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/declarationEmit_inferedDefaultExportType.ts === +=== tests/cases/compiler/declarationEmitInferedDefaultExportType.ts === // test.ts export default { diff --git a/tests/baselines/reference/declarationEmit_inferedDefaultExportType2.js b/tests/baselines/reference/declarationEmitInferedDefaultExportType2.js similarity index 57% rename from tests/baselines/reference/declarationEmit_inferedDefaultExportType2.js rename to tests/baselines/reference/declarationEmitInferedDefaultExportType2.js index 617d4a9966b..a81c7fc0bb7 100644 --- a/tests/baselines/reference/declarationEmit_inferedDefaultExportType2.js +++ b/tests/baselines/reference/declarationEmitInferedDefaultExportType2.js @@ -1,4 +1,4 @@ -//// [declarationEmit_inferedDefaultExportType2.ts] +//// [declarationEmitInferedDefaultExportType2.ts] // test.ts export = { @@ -7,7 +7,7 @@ export = { baz: null } -//// [declarationEmit_inferedDefaultExportType2.js] +//// [declarationEmitInferedDefaultExportType2.js] "use strict"; module.exports = { foo: [], @@ -16,7 +16,7 @@ module.exports = { }; -//// [declarationEmit_inferedDefaultExportType2.d.ts] +//// [declarationEmitInferedDefaultExportType2.d.ts] declare var _default: { foo: any[]; bar: any; diff --git a/tests/baselines/reference/declarationEmitInferedDefaultExportType2.symbols b/tests/baselines/reference/declarationEmitInferedDefaultExportType2.symbols new file mode 100644 index 00000000000..7ae974cca05 --- /dev/null +++ b/tests/baselines/reference/declarationEmitInferedDefaultExportType2.symbols @@ -0,0 +1,14 @@ +=== tests/cases/compiler/declarationEmitInferedDefaultExportType2.ts === + +// test.ts +export = { + foo: [], +>foo : Symbol(foo, Decl(declarationEmitInferedDefaultExportType2.ts, 2, 10)) + + bar: undefined, +>bar : Symbol(bar, Decl(declarationEmitInferedDefaultExportType2.ts, 3, 10)) +>undefined : Symbol(undefined) + + baz: null +>baz : Symbol(baz, Decl(declarationEmitInferedDefaultExportType2.ts, 4, 17)) +} diff --git a/tests/baselines/reference/declarationEmit_inferedDefaultExportType2.types b/tests/baselines/reference/declarationEmitInferedDefaultExportType2.types similarity index 74% rename from tests/baselines/reference/declarationEmit_inferedDefaultExportType2.types rename to tests/baselines/reference/declarationEmitInferedDefaultExportType2.types index 5c8cbbb158c..a334434ea45 100644 --- a/tests/baselines/reference/declarationEmit_inferedDefaultExportType2.types +++ b/tests/baselines/reference/declarationEmitInferedDefaultExportType2.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/declarationEmit_inferedDefaultExportType2.ts === +=== tests/cases/compiler/declarationEmitInferedDefaultExportType2.ts === // test.ts export = { diff --git a/tests/baselines/reference/declarationEmitInvalidExport.errors.txt b/tests/baselines/reference/declarationEmitInvalidExport.errors.txt new file mode 100644 index 00000000000..529a6167973 --- /dev/null +++ b/tests/baselines/reference/declarationEmitInvalidExport.errors.txt @@ -0,0 +1,19 @@ +tests/cases/compiler/declarationEmitInvalidExport.ts(3,3): error TS7027: Unreachable code detected. +tests/cases/compiler/declarationEmitInvalidExport.ts(5,30): error TS4081: Exported type alias 'MyClass' has or is using private name 'myClass'. +tests/cases/compiler/declarationEmitInvalidExport.ts(6,1): error TS1128: Declaration or statement expected. + + +==== tests/cases/compiler/declarationEmitInvalidExport.ts (3 errors) ==== + + if (false) { + export var myClass = 0; + ~~~~~~ +!!! error TS7027: Unreachable code detected. + } + export type MyClass = typeof myClass; + ~~~~~~~ +!!! error TS4081: Exported type alias 'MyClass' has or is using private name 'myClass'. + } + ~ +!!! error TS1128: Declaration or statement expected. + \ No newline at end of file diff --git a/tests/baselines/reference/declarationEmit_invalidExport.js b/tests/baselines/reference/declarationEmitInvalidExport.js similarity index 61% rename from tests/baselines/reference/declarationEmit_invalidExport.js rename to tests/baselines/reference/declarationEmitInvalidExport.js index 74b5bfd8019..18ed73b0a5a 100644 --- a/tests/baselines/reference/declarationEmit_invalidExport.js +++ b/tests/baselines/reference/declarationEmitInvalidExport.js @@ -1,4 +1,4 @@ -//// [declarationEmit_invalidExport.ts] +//// [declarationEmitInvalidExport.ts] if (false) { export var myClass = 0; @@ -7,7 +7,7 @@ export type MyClass = typeof myClass; } -//// [declarationEmit_invalidExport.js] +//// [declarationEmitInvalidExport.js] "use strict"; if (false) { export var myClass = 0; diff --git a/tests/baselines/reference/declarationEmitInvalidReference.js b/tests/baselines/reference/declarationEmitInvalidReference.js new file mode 100644 index 00000000000..e5a8bf5f289 --- /dev/null +++ b/tests/baselines/reference/declarationEmitInvalidReference.js @@ -0,0 +1,11 @@ +//// [declarationEmitInvalidReference.ts] +/// +var x = 0; + +//// [declarationEmitInvalidReference.js] +/// +var x = 0; + + +//// [declarationEmitInvalidReference.d.ts] +declare var x: number; diff --git a/tests/baselines/reference/declarationEmitInvalidReference.symbols b/tests/baselines/reference/declarationEmitInvalidReference.symbols new file mode 100644 index 00000000000..9607e5434ca --- /dev/null +++ b/tests/baselines/reference/declarationEmitInvalidReference.symbols @@ -0,0 +1,5 @@ +=== tests/cases/compiler/declarationEmitInvalidReference.ts === +/// +var x = 0; +>x : Symbol(x, Decl(declarationEmitInvalidReference.ts, 1, 3)) + diff --git a/tests/baselines/reference/declarationEmitInvalidReference.types b/tests/baselines/reference/declarationEmitInvalidReference.types new file mode 100644 index 00000000000..aa2658874bc --- /dev/null +++ b/tests/baselines/reference/declarationEmitInvalidReference.types @@ -0,0 +1,6 @@ +=== tests/cases/compiler/declarationEmitInvalidReference.ts === +/// +var x = 0; +>x : number +>0 : 0 + diff --git a/tests/baselines/reference/declarationEmitInvalidReference2.errors.txt b/tests/baselines/reference/declarationEmitInvalidReference2.errors.txt new file mode 100644 index 00000000000..32423b8d849 --- /dev/null +++ b/tests/baselines/reference/declarationEmitInvalidReference2.errors.txt @@ -0,0 +1,8 @@ +tests/cases/compiler/declarationEmitInvalidReference2.ts(1,1): error TS6053: File 'tests/cases/compiler/invalid.ts' not found. + + +==== tests/cases/compiler/declarationEmitInvalidReference2.ts (1 errors) ==== + /// + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS6053: File 'tests/cases/compiler/invalid.ts' not found. + var x = 0; \ No newline at end of file diff --git a/tests/baselines/reference/declarationEmitInvalidReference2.js b/tests/baselines/reference/declarationEmitInvalidReference2.js new file mode 100644 index 00000000000..e14da1dabb6 --- /dev/null +++ b/tests/baselines/reference/declarationEmitInvalidReference2.js @@ -0,0 +1,11 @@ +//// [declarationEmitInvalidReference2.ts] +/// +var x = 0; + +//// [declarationEmitInvalidReference2.js] +/// +var x = 0; + + +//// [declarationEmitInvalidReference2.d.ts] +declare var x: number; diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.js b/tests/baselines/reference/declarationEmitNameConflicts.js similarity index 94% rename from tests/baselines/reference/declarationEmit_nameConflicts.js rename to tests/baselines/reference/declarationEmitNameConflicts.js index 957a0da472a..2ce92501409 100644 --- a/tests/baselines/reference/declarationEmit_nameConflicts.js +++ b/tests/baselines/reference/declarationEmitNameConflicts.js @@ -1,4 +1,4 @@ -//// [tests/cases/compiler/declarationEmit_nameConflicts.ts] //// +//// [tests/cases/compiler/declarationEmitNameConflicts.ts] //// //// [declarationEmit_nameConflicts_1.ts] module f { export class c { } } diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.symbols b/tests/baselines/reference/declarationEmitNameConflicts.symbols similarity index 100% rename from tests/baselines/reference/declarationEmit_nameConflicts.symbols rename to tests/baselines/reference/declarationEmitNameConflicts.symbols diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.types b/tests/baselines/reference/declarationEmitNameConflicts.types similarity index 100% rename from tests/baselines/reference/declarationEmit_nameConflicts.types rename to tests/baselines/reference/declarationEmitNameConflicts.types diff --git a/tests/baselines/reference/declarationEmit_nameConflicts2.js b/tests/baselines/reference/declarationEmitNameConflicts2.js similarity index 90% rename from tests/baselines/reference/declarationEmit_nameConflicts2.js rename to tests/baselines/reference/declarationEmitNameConflicts2.js index b93745c3a12..b7b345979d7 100644 --- a/tests/baselines/reference/declarationEmit_nameConflicts2.js +++ b/tests/baselines/reference/declarationEmitNameConflicts2.js @@ -1,4 +1,4 @@ -//// [declarationEmit_nameConflicts2.ts] +//// [declarationEmitNameConflicts2.ts] module X.Y.base { export function f() { } export class C { } @@ -15,7 +15,7 @@ module X.Y.base.Z { export var E = X.Y.base.E; // Should be base.E } -//// [declarationEmit_nameConflicts2.js] +//// [declarationEmitNameConflicts2.js] var X; (function (X) { var Y; @@ -57,7 +57,7 @@ var X; })(X || (X = {})); -//// [declarationEmit_nameConflicts2.d.ts] +//// [declarationEmitNameConflicts2.d.ts] declare module X.Y.base { function f(): void; class C { diff --git a/tests/baselines/reference/declarationEmitNameConflicts2.symbols b/tests/baselines/reference/declarationEmitNameConflicts2.symbols new file mode 100644 index 00000000000..eba4dd0bf4d --- /dev/null +++ b/tests/baselines/reference/declarationEmitNameConflicts2.symbols @@ -0,0 +1,68 @@ +=== tests/cases/compiler/declarationEmitNameConflicts2.ts === +module 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)) + + export function f() { } +>f : Symbol(f, Decl(declarationEmitNameConflicts2.ts, 0, 17)) + + export class C { } +>C : Symbol(C, Decl(declarationEmitNameConflicts2.ts, 1, 27)) + + export module M { +>M : Symbol(M, Decl(declarationEmitNameConflicts2.ts, 2, 22)) + + export var v; +>v : Symbol(v, Decl(declarationEmitNameConflicts2.ts, 4, 18)) + } + export enum E { } +>E : Symbol(E, Decl(declarationEmitNameConflicts2.ts, 5, 5)) +} + +module 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)) + + 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 : 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)) + + 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 : 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)) +>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 : 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)) +>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 : 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)) +>E : Symbol(E, Decl(declarationEmitNameConflicts2.ts, 5, 5)) +} diff --git a/tests/baselines/reference/declarationEmit_nameConflicts2.types b/tests/baselines/reference/declarationEmitNameConflicts2.types similarity index 89% rename from tests/baselines/reference/declarationEmit_nameConflicts2.types rename to tests/baselines/reference/declarationEmitNameConflicts2.types index 026cfed0989..7da15138c16 100644 --- a/tests/baselines/reference/declarationEmit_nameConflicts2.types +++ b/tests/baselines/reference/declarationEmitNameConflicts2.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/declarationEmit_nameConflicts2.ts === +=== tests/cases/compiler/declarationEmitNameConflicts2.ts === module X.Y.base { >X : typeof X >Y : typeof Y diff --git a/tests/baselines/reference/declarationEmit_nameConflicts3.js b/tests/baselines/reference/declarationEmitNameConflicts3.js similarity index 91% rename from tests/baselines/reference/declarationEmit_nameConflicts3.js rename to tests/baselines/reference/declarationEmitNameConflicts3.js index f1ea96973b8..e9d5ea3b98e 100644 --- a/tests/baselines/reference/declarationEmit_nameConflicts3.js +++ b/tests/baselines/reference/declarationEmitNameConflicts3.js @@ -1,4 +1,4 @@ -//// [declarationEmit_nameConflicts3.ts] +//// [declarationEmitNameConflicts3.ts] module M { export interface D { } export module D { @@ -26,7 +26,7 @@ module M.P { export var x = M.E.f; // error, should be typeof M.E.f } -//// [declarationEmit_nameConflicts3.js] +//// [declarationEmitNameConflicts3.js] var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } @@ -80,7 +80,7 @@ var M; })(M || (M = {})); -//// [declarationEmit_nameConflicts3.d.ts] +//// [declarationEmitNameConflicts3.d.ts] declare module M { interface D { } diff --git a/tests/baselines/reference/declarationEmitNameConflicts3.symbols b/tests/baselines/reference/declarationEmitNameConflicts3.symbols new file mode 100644 index 00000000000..b4bd4615da9 --- /dev/null +++ b/tests/baselines/reference/declarationEmitNameConflicts3.symbols @@ -0,0 +1,76 @@ +=== tests/cases/compiler/declarationEmitNameConflicts3.ts === +module 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)) + + export module D { +>D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 0, 10), Decl(declarationEmitNameConflicts3.ts, 1, 26)) + + export function f() { } +>f : Symbol(f, Decl(declarationEmitNameConflicts3.ts, 2, 21)) + } + export module C { +>C : Symbol(C, Decl(declarationEmitNameConflicts3.ts, 4, 5)) + + export function f() { } +>f : Symbol(f, Decl(declarationEmitNameConflicts3.ts, 5, 21)) + } + export module E { +>E : Symbol(E, Decl(declarationEmitNameConflicts3.ts, 7, 5)) + + export function f() { } +>f : Symbol(f, Decl(declarationEmitNameConflicts3.ts, 8, 21)) + } +} + +module M.P { +>M : Symbol(M, Decl(declarationEmitNameConflicts3.ts, 0, 0), Decl(declarationEmitNameConflicts3.ts, 11, 1)) +>P : Symbol(P, Decl(declarationEmitNameConflicts3.ts, 13, 9)) + + export class C { +>C : Symbol(C, Decl(declarationEmitNameConflicts3.ts, 13, 12)) + + 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)) + + export enum D { +>D : Symbol(D, Decl(declarationEmitNameConflicts3.ts, 17, 32)) + + f +>f : Symbol(D.f, Decl(declarationEmitNameConflicts3.ts, 18, 19)) + } + 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)) + + 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 : 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)) + + 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 : 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)) + + 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 : 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)) +} diff --git a/tests/baselines/reference/declarationEmit_nameConflicts3.types b/tests/baselines/reference/declarationEmitNameConflicts3.types similarity index 88% rename from tests/baselines/reference/declarationEmit_nameConflicts3.types rename to tests/baselines/reference/declarationEmitNameConflicts3.types index 8d52bda68f5..2443f2c78d7 100644 --- a/tests/baselines/reference/declarationEmit_nameConflicts3.types +++ b/tests/baselines/reference/declarationEmitNameConflicts3.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/declarationEmit_nameConflicts3.ts === +=== tests/cases/compiler/declarationEmitNameConflicts3.ts === module M { >M : typeof M diff --git a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js similarity index 72% rename from tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js rename to tests/baselines/reference/declarationEmitNameConflictsWithAlias.js index 0b99d3e1efe..b49e3ad314d 100644 --- a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js +++ b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js @@ -1,4 +1,4 @@ -//// [declarationEmit_nameConflictsWithAlias.ts] +//// [declarationEmitNameConflictsWithAlias.ts] export module C { export interface I { } } export import v = C; export module M { @@ -6,14 +6,14 @@ export module M { export var w: v.I; // Gets emitted as C.I, which is the wrong interface } -//// [declarationEmit_nameConflictsWithAlias.js] +//// [declarationEmitNameConflictsWithAlias.js] "use strict"; var M; (function (M) { })(M = exports.M || (exports.M = {})); -//// [declarationEmit_nameConflictsWithAlias.d.ts] +//// [declarationEmitNameConflictsWithAlias.d.ts] export declare module C { interface I { } diff --git a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.symbols b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.symbols new file mode 100644 index 00000000000..8690cffaa80 --- /dev/null +++ b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.symbols @@ -0,0 +1,21 @@ +=== tests/cases/compiler/declarationEmitNameConflictsWithAlias.ts === +export module C { export interface I { } } +>C : Symbol(C, Decl(declarationEmitNameConflictsWithAlias.ts, 0, 0)) +>I : Symbol(I, Decl(declarationEmitNameConflictsWithAlias.ts, 0, 17)) + +export import v = C; +>v : Symbol(v, Decl(declarationEmitNameConflictsWithAlias.ts, 0, 42)) +>C : Symbol(C, Decl(declarationEmitNameConflictsWithAlias.ts, 0, 0)) + +export module 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 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)) +} diff --git a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.types b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.types similarity index 76% rename from tests/baselines/reference/declarationEmit_nameConflictsWithAlias.types rename to tests/baselines/reference/declarationEmitNameConflictsWithAlias.types index 744869f0e3a..f00982eb70c 100644 --- a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.types +++ b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts === +=== tests/cases/compiler/declarationEmitNameConflictsWithAlias.ts === export module C { export interface I { } } >C : any >I : I diff --git a/tests/baselines/reference/declarationEmit_protectedMembers.js b/tests/baselines/reference/declarationEmitProtectedMembers.js similarity index 93% rename from tests/baselines/reference/declarationEmit_protectedMembers.js rename to tests/baselines/reference/declarationEmitProtectedMembers.js index 192f0647ed6..f391e143d72 100644 --- a/tests/baselines/reference/declarationEmit_protectedMembers.js +++ b/tests/baselines/reference/declarationEmitProtectedMembers.js @@ -1,4 +1,4 @@ -//// [declarationEmit_protectedMembers.ts] +//// [declarationEmitProtectedMembers.ts] // Class with protected members class C1 { @@ -50,7 +50,7 @@ class C4 { constructor(protected a: number, protected b) { } } -//// [declarationEmit_protectedMembers.js] +//// [declarationEmitProtectedMembers.js] var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } @@ -127,7 +127,7 @@ var C4 = (function () { }()); -//// [declarationEmit_protectedMembers.d.ts] +//// [declarationEmitProtectedMembers.d.ts] declare class C1 { protected x: number; protected f(): number; diff --git a/tests/baselines/reference/declarationEmitProtectedMembers.symbols b/tests/baselines/reference/declarationEmitProtectedMembers.symbols new file mode 100644 index 00000000000..31f1a9a67e4 --- /dev/null +++ b/tests/baselines/reference/declarationEmitProtectedMembers.symbols @@ -0,0 +1,114 @@ +=== tests/cases/compiler/declarationEmitProtectedMembers.ts === + +// Class with protected members +class C1 { +>C1 : Symbol(C1, Decl(declarationEmitProtectedMembers.ts, 0, 0)) + + protected x: number; +>x : Symbol(C1.x, Decl(declarationEmitProtectedMembers.ts, 2, 10)) + + protected f() { +>f : Symbol(C1.f, Decl(declarationEmitProtectedMembers.ts, 3, 24)) + + return this.x; +>this.x : Symbol(C1.x, Decl(declarationEmitProtectedMembers.ts, 2, 10)) +>this : Symbol(C1, Decl(declarationEmitProtectedMembers.ts, 0, 0)) +>x : Symbol(C1.x, Decl(declarationEmitProtectedMembers.ts, 2, 10)) + } + + protected set accessor(a: number) { } +>accessor : Symbol(C1.accessor, Decl(declarationEmitProtectedMembers.ts, 7, 5), Decl(declarationEmitProtectedMembers.ts, 9, 41)) +>a : Symbol(a, Decl(declarationEmitProtectedMembers.ts, 9, 27)) + + protected get accessor() { return 0; } +>accessor : Symbol(C1.accessor, Decl(declarationEmitProtectedMembers.ts, 7, 5), Decl(declarationEmitProtectedMembers.ts, 9, 41)) + + protected static sx: number; +>sx : Symbol(C1.sx, Decl(declarationEmitProtectedMembers.ts, 10, 42)) + + protected static sf() { +>sf : Symbol(C1.sf, Decl(declarationEmitProtectedMembers.ts, 12, 32)) + + return this.sx; +>this.sx : Symbol(C1.sx, Decl(declarationEmitProtectedMembers.ts, 10, 42)) +>this : Symbol(C1, Decl(declarationEmitProtectedMembers.ts, 0, 0)) +>sx : Symbol(C1.sx, Decl(declarationEmitProtectedMembers.ts, 10, 42)) + } + + protected static set staticSetter(a: number) { } +>staticSetter : Symbol(C1.staticSetter, Decl(declarationEmitProtectedMembers.ts, 16, 5)) +>a : Symbol(a, Decl(declarationEmitProtectedMembers.ts, 18, 38)) + + protected static get staticGetter() { return 0; } +>staticGetter : Symbol(C1.staticGetter, Decl(declarationEmitProtectedMembers.ts, 18, 52)) +} + +// Derived class overriding protected members +class C2 extends C1 { +>C2 : Symbol(C2, Decl(declarationEmitProtectedMembers.ts, 20, 1)) +>C1 : Symbol(C1, Decl(declarationEmitProtectedMembers.ts, 0, 0)) + + protected f() { +>f : Symbol(C2.f, Decl(declarationEmitProtectedMembers.ts, 23, 21)) + + return super.f() + this.x; +>super.f : Symbol(C1.f, Decl(declarationEmitProtectedMembers.ts, 3, 24)) +>super : Symbol(C1, Decl(declarationEmitProtectedMembers.ts, 0, 0)) +>f : Symbol(C1.f, Decl(declarationEmitProtectedMembers.ts, 3, 24)) +>this.x : Symbol(C1.x, Decl(declarationEmitProtectedMembers.ts, 2, 10)) +>this : Symbol(C2, Decl(declarationEmitProtectedMembers.ts, 20, 1)) +>x : Symbol(C1.x, Decl(declarationEmitProtectedMembers.ts, 2, 10)) + } + protected static sf() { +>sf : Symbol(C2.sf, Decl(declarationEmitProtectedMembers.ts, 26, 5)) + + return super.sf() + this.sx; +>super.sf : Symbol(C1.sf, Decl(declarationEmitProtectedMembers.ts, 12, 32)) +>super : Symbol(C1, Decl(declarationEmitProtectedMembers.ts, 0, 0)) +>sf : Symbol(C1.sf, Decl(declarationEmitProtectedMembers.ts, 12, 32)) +>this.sx : Symbol(C1.sx, Decl(declarationEmitProtectedMembers.ts, 10, 42)) +>this : Symbol(C2, Decl(declarationEmitProtectedMembers.ts, 20, 1)) +>sx : Symbol(C1.sx, Decl(declarationEmitProtectedMembers.ts, 10, 42)) + } +} + +// Derived class making protected members public +class C3 extends C2 { +>C3 : Symbol(C3, Decl(declarationEmitProtectedMembers.ts, 30, 1)) +>C2 : Symbol(C2, Decl(declarationEmitProtectedMembers.ts, 20, 1)) + + x: number; +>x : Symbol(C3.x, Decl(declarationEmitProtectedMembers.ts, 33, 21)) + + static sx: number; +>sx : Symbol(C3.sx, Decl(declarationEmitProtectedMembers.ts, 34, 14)) + + f() { +>f : Symbol(C3.f, Decl(declarationEmitProtectedMembers.ts, 35, 22)) + + return super.f(); +>super.f : Symbol(C2.f, Decl(declarationEmitProtectedMembers.ts, 23, 21)) +>super : Symbol(C2, Decl(declarationEmitProtectedMembers.ts, 20, 1)) +>f : Symbol(C2.f, Decl(declarationEmitProtectedMembers.ts, 23, 21)) + } + static sf() { +>sf : Symbol(C3.sf, Decl(declarationEmitProtectedMembers.ts, 38, 5)) + + return super.sf(); +>super.sf : Symbol(C2.sf, Decl(declarationEmitProtectedMembers.ts, 26, 5)) +>super : Symbol(C2, Decl(declarationEmitProtectedMembers.ts, 20, 1)) +>sf : Symbol(C2.sf, Decl(declarationEmitProtectedMembers.ts, 26, 5)) + } + + static get staticGetter() { return 1; } +>staticGetter : Symbol(C3.staticGetter, Decl(declarationEmitProtectedMembers.ts, 41, 5)) +} + +// Protected properties in constructors +class C4 { +>C4 : Symbol(C4, Decl(declarationEmitProtectedMembers.ts, 44, 1)) + + constructor(protected a: number, protected b) { } +>a : Symbol(C4.a, Decl(declarationEmitProtectedMembers.ts, 48, 16)) +>b : Symbol(C4.b, Decl(declarationEmitProtectedMembers.ts, 48, 36)) +} diff --git a/tests/baselines/reference/declarationEmit_protectedMembers.types b/tests/baselines/reference/declarationEmitProtectedMembers.types similarity index 91% rename from tests/baselines/reference/declarationEmit_protectedMembers.types rename to tests/baselines/reference/declarationEmitProtectedMembers.types index dd2f0012bf9..b293487d57d 100644 --- a/tests/baselines/reference/declarationEmit_protectedMembers.types +++ b/tests/baselines/reference/declarationEmitProtectedMembers.types @@ -1,4 +1,4 @@ -=== tests/cases/compiler/declarationEmit_protectedMembers.ts === +=== tests/cases/compiler/declarationEmitProtectedMembers.ts === // Class with protected members class C1 { diff --git a/tests/baselines/reference/declarationEmit_readonly.js b/tests/baselines/reference/declarationEmitReadonly.js similarity index 63% rename from tests/baselines/reference/declarationEmit_readonly.js rename to tests/baselines/reference/declarationEmitReadonly.js index 4925e5dafae..fd90188940c 100644 --- a/tests/baselines/reference/declarationEmit_readonly.js +++ b/tests/baselines/reference/declarationEmitReadonly.js @@ -1,10 +1,10 @@ -//// [declarationEmit_readonly.ts] +//// [declarationEmitReadonly.ts] class C { constructor(readonly x: number) {} } -//// [declarationEmit_readonly.js] +//// [declarationEmitReadonly.js] var C = (function () { function C(x) { this.x = x; @@ -13,7 +13,7 @@ var C = (function () { }()); -//// [declarationEmit_readonly.d.ts] +//// [declarationEmitReadonly.d.ts] declare class C { readonly x: number; constructor(x: number); diff --git a/tests/baselines/reference/declarationEmitReadonly.symbols b/tests/baselines/reference/declarationEmitReadonly.symbols new file mode 100644 index 00000000000..2ef310cf7df --- /dev/null +++ b/tests/baselines/reference/declarationEmitReadonly.symbols @@ -0,0 +1,8 @@ +=== tests/cases/conformance/classes/constructorDeclarations/constructorParameters/declarationEmitReadonly.ts === + +class C { +>C : Symbol(C, Decl(declarationEmitReadonly.ts, 0, 0)) + + constructor(readonly x: number) {} +>x : Symbol(C.x, Decl(declarationEmitReadonly.ts, 2, 16)) +} diff --git a/tests/baselines/reference/declarationEmit_readonly.types b/tests/baselines/reference/declarationEmitReadonly.types similarity index 70% rename from tests/baselines/reference/declarationEmit_readonly.types rename to tests/baselines/reference/declarationEmitReadonly.types index 3036c234ae5..e64256698cf 100644 --- a/tests/baselines/reference/declarationEmit_readonly.types +++ b/tests/baselines/reference/declarationEmitReadonly.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/classes/constructorDeclarations/constructorParameters/declarationEmit_readonly.ts === +=== tests/cases/conformance/classes/constructorDeclarations/constructorParameters/declarationEmitReadonly.ts === class C { >C : C diff --git a/tests/baselines/reference/declarationEmitUnknownImport.errors.txt b/tests/baselines/reference/declarationEmitUnknownImport.errors.txt new file mode 100644 index 00000000000..a2bee225fe8 --- /dev/null +++ b/tests/baselines/reference/declarationEmitUnknownImport.errors.txt @@ -0,0 +1,15 @@ +tests/cases/compiler/declarationEmitUnknownImport.ts(2,14): error TS2304: Cannot find name 'SomeNonExistingName'. +tests/cases/compiler/declarationEmitUnknownImport.ts(2,14): error TS2503: Cannot find namespace 'SomeNonExistingName'. +tests/cases/compiler/declarationEmitUnknownImport.ts(2,14): error TS4000: Import declaration 'Foo' is using private name 'SomeNonExistingName'. + + +==== tests/cases/compiler/declarationEmitUnknownImport.ts (3 errors) ==== + + import Foo = SomeNonExistingName + ~~~~~~~~~~~~~~~~~~~ +!!! error TS2304: Cannot find name 'SomeNonExistingName'. + ~~~~~~~~~~~~~~~~~~~ +!!! error TS2503: Cannot find namespace 'SomeNonExistingName'. + ~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'Foo' is using private name 'SomeNonExistingName'. + export {Foo} \ No newline at end of file diff --git a/tests/baselines/reference/declarationEmit_UnknownImport.js b/tests/baselines/reference/declarationEmitUnknownImport.js similarity index 56% rename from tests/baselines/reference/declarationEmit_UnknownImport.js rename to tests/baselines/reference/declarationEmitUnknownImport.js index 05449c08b6a..bccf2337e08 100644 --- a/tests/baselines/reference/declarationEmit_UnknownImport.js +++ b/tests/baselines/reference/declarationEmitUnknownImport.js @@ -1,9 +1,9 @@ -//// [declarationEmit_UnknownImport.ts] +//// [declarationEmitUnknownImport.ts] import Foo = SomeNonExistingName export {Foo} -//// [declarationEmit_UnknownImport.js] +//// [declarationEmitUnknownImport.js] "use strict"; var Foo = SomeNonExistingName; exports.Foo = Foo; diff --git a/tests/baselines/reference/declarationEmitUnknownImport2.errors.txt b/tests/baselines/reference/declarationEmitUnknownImport2.errors.txt new file mode 100644 index 00000000000..db017d3c89a --- /dev/null +++ b/tests/baselines/reference/declarationEmitUnknownImport2.errors.txt @@ -0,0 +1,21 @@ +tests/cases/compiler/declarationEmitUnknownImport2.ts(2,12): error TS1005: '=' expected. +tests/cases/compiler/declarationEmitUnknownImport2.ts(2,12): error TS2304: Cannot find name 'From'. +tests/cases/compiler/declarationEmitUnknownImport2.ts(2,12): error TS2503: Cannot find namespace 'From'. +tests/cases/compiler/declarationEmitUnknownImport2.ts(2,12): error TS4000: Import declaration 'Foo' is using private name 'From'. +tests/cases/compiler/declarationEmitUnknownImport2.ts(2,17): error TS1005: ';' expected. + + +==== tests/cases/compiler/declarationEmitUnknownImport2.ts (5 errors) ==== + + import Foo From './Foo'; // Syntax error + ~~~~ +!!! error TS1005: '=' expected. + ~~~~ +!!! error TS2304: Cannot find name 'From'. + ~~~~ +!!! error TS2503: Cannot find namespace 'From'. + ~~~~ +!!! error TS4000: Import declaration 'Foo' is using private name 'From'. + ~~~~~~~ +!!! error TS1005: ';' expected. + export default Foo \ No newline at end of file diff --git a/tests/baselines/reference/declarationEmit_UnknownImport2.js b/tests/baselines/reference/declarationEmitUnknownImport2.js similarity index 69% rename from tests/baselines/reference/declarationEmit_UnknownImport2.js rename to tests/baselines/reference/declarationEmitUnknownImport2.js index 7f20d9ec9b8..08afa34f8c8 100644 --- a/tests/baselines/reference/declarationEmit_UnknownImport2.js +++ b/tests/baselines/reference/declarationEmitUnknownImport2.js @@ -1,9 +1,9 @@ -//// [declarationEmit_UnknownImport2.ts] +//// [declarationEmitUnknownImport2.ts] import Foo From './Foo'; // Syntax error export default Foo -//// [declarationEmit_UnknownImport2.js] +//// [declarationEmitUnknownImport2.js] "use strict"; var Foo = From; './Foo'; // Syntax error diff --git a/tests/baselines/reference/declarationEmit_UnknownImport.errors.txt b/tests/baselines/reference/declarationEmit_UnknownImport.errors.txt deleted file mode 100644 index 9d333e66129..00000000000 --- a/tests/baselines/reference/declarationEmit_UnknownImport.errors.txt +++ /dev/null @@ -1,15 +0,0 @@ -tests/cases/compiler/declarationEmit_UnknownImport.ts(2,14): error TS2304: Cannot find name 'SomeNonExistingName'. -tests/cases/compiler/declarationEmit_UnknownImport.ts(2,14): error TS2503: Cannot find namespace 'SomeNonExistingName'. -tests/cases/compiler/declarationEmit_UnknownImport.ts(2,14): error TS4000: Import declaration 'Foo' is using private name 'SomeNonExistingName'. - - -==== tests/cases/compiler/declarationEmit_UnknownImport.ts (3 errors) ==== - - import Foo = SomeNonExistingName - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2304: Cannot find name 'SomeNonExistingName'. - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2503: Cannot find namespace 'SomeNonExistingName'. - ~~~~~~~~~~~~~~~~~~~ -!!! error TS4000: Import declaration 'Foo' is using private name 'SomeNonExistingName'. - export {Foo} \ No newline at end of file diff --git a/tests/baselines/reference/declarationEmit_UnknownImport2.errors.txt b/tests/baselines/reference/declarationEmit_UnknownImport2.errors.txt deleted file mode 100644 index 72dbde546f1..00000000000 --- a/tests/baselines/reference/declarationEmit_UnknownImport2.errors.txt +++ /dev/null @@ -1,21 +0,0 @@ -tests/cases/compiler/declarationEmit_UnknownImport2.ts(2,12): error TS1005: '=' expected. -tests/cases/compiler/declarationEmit_UnknownImport2.ts(2,12): error TS2304: Cannot find name 'From'. -tests/cases/compiler/declarationEmit_UnknownImport2.ts(2,12): error TS2503: Cannot find namespace 'From'. -tests/cases/compiler/declarationEmit_UnknownImport2.ts(2,12): error TS4000: Import declaration 'Foo' is using private name 'From'. -tests/cases/compiler/declarationEmit_UnknownImport2.ts(2,17): error TS1005: ';' expected. - - -==== tests/cases/compiler/declarationEmit_UnknownImport2.ts (5 errors) ==== - - import Foo From './Foo'; // Syntax error - ~~~~ -!!! error TS1005: '=' expected. - ~~~~ -!!! error TS2304: Cannot find name 'From'. - ~~~~ -!!! error TS2503: Cannot find namespace 'From'. - ~~~~ -!!! error TS4000: Import declaration 'Foo' is using private name 'From'. - ~~~~~~~ -!!! error TS1005: ';' expected. - export default Foo \ No newline at end of file diff --git a/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.js b/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.js deleted file mode 100644 index 59974d0fb85..00000000000 --- a/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.js +++ /dev/null @@ -1,10 +0,0 @@ -//// [declarationEmit_array-types-from-generic-array-usage.ts] -interface A extends Array { } - - -//// [declarationEmit_array-types-from-generic-array-usage.js] - - -//// [declarationEmit_array-types-from-generic-array-usage.d.ts] -interface A extends Array { -} diff --git a/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.symbols b/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.symbols deleted file mode 100644 index 9c9e757afb9..00000000000 --- a/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.symbols +++ /dev/null @@ -1,5 +0,0 @@ -=== tests/cases/compiler/declarationEmit_array-types-from-generic-array-usage.ts === -interface A extends Array { } ->A : Symbol(A, Decl(declarationEmit_array-types-from-generic-array-usage.ts, 0, 0)) ->Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) - diff --git a/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.types b/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.types deleted file mode 100644 index 63f35d0f263..00000000000 --- a/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.types +++ /dev/null @@ -1,5 +0,0 @@ -=== tests/cases/compiler/declarationEmit_array-types-from-generic-array-usage.ts === -interface A extends Array { } ->A : A ->Array : T[] - diff --git a/tests/baselines/reference/declarationEmit_bindingPatterns.symbols b/tests/baselines/reference/declarationEmit_bindingPatterns.symbols deleted file mode 100644 index b39aca17ea3..00000000000 --- a/tests/baselines/reference/declarationEmit_bindingPatterns.symbols +++ /dev/null @@ -1,17 +0,0 @@ -=== tests/cases/compiler/declarationEmit_bindingPatterns.ts === - -const k = ({x: z = 'y'}) => { } ->k : Symbol(k, Decl(declarationEmit_bindingPatterns.ts, 1, 5)) ->x : Symbol(x) ->z : Symbol(z, Decl(declarationEmit_bindingPatterns.ts, 1, 12)) - -var a; ->a : Symbol(a, Decl(declarationEmit_bindingPatterns.ts, 3, 3)) - -function f({} = a, [] = a, { p: {} = a} = a) { ->f : Symbol(f, Decl(declarationEmit_bindingPatterns.ts, 3, 6)) ->a : Symbol(a, Decl(declarationEmit_bindingPatterns.ts, 3, 3)) ->a : Symbol(a, Decl(declarationEmit_bindingPatterns.ts, 3, 3)) ->a : Symbol(a, Decl(declarationEmit_bindingPatterns.ts, 3, 3)) ->a : Symbol(a, Decl(declarationEmit_bindingPatterns.ts, 3, 3)) -} diff --git a/tests/baselines/reference/declarationEmit_classMemberNameConflict.symbols b/tests/baselines/reference/declarationEmit_classMemberNameConflict.symbols deleted file mode 100644 index 2b8959289a8..00000000000 --- a/tests/baselines/reference/declarationEmit_classMemberNameConflict.symbols +++ /dev/null @@ -1,70 +0,0 @@ -=== tests/cases/compiler/declarationEmit_classMemberNameConflict.ts === - -export class C1 { ->C1 : Symbol(C1, Decl(declarationEmit_classMemberNameConflict.ts, 0, 0)) - - C1() { } // has to be the same as the class name ->C1 : Symbol(C1.C1, Decl(declarationEmit_classMemberNameConflict.ts, 1, 17)) - - bar() { ->bar : Symbol(C1.bar, Decl(declarationEmit_classMemberNameConflict.ts, 2, 12)) - - return function (t: typeof C1) { ->t : Symbol(t, Decl(declarationEmit_classMemberNameConflict.ts, 5, 25)) ->C1 : Symbol(C1, Decl(declarationEmit_classMemberNameConflict.ts, 0, 0)) - - }; - } -} - -export class C2 { ->C2 : Symbol(C2, Decl(declarationEmit_classMemberNameConflict.ts, 8, 1)) - - C2: any // has to be the same as the class name ->C2 : Symbol(C2.C2, Decl(declarationEmit_classMemberNameConflict.ts, 10, 17)) - - bar() { ->bar : Symbol(C2.bar, Decl(declarationEmit_classMemberNameConflict.ts, 11, 11)) - - return function (t: typeof C2) { ->t : Symbol(t, Decl(declarationEmit_classMemberNameConflict.ts, 14, 25)) ->C2 : Symbol(C2, Decl(declarationEmit_classMemberNameConflict.ts, 8, 1)) - - }; - } -} - -export class C3 { ->C3 : Symbol(C3, Decl(declarationEmit_classMemberNameConflict.ts, 17, 1)) - - get C3() { return 0; } // has to be the same as the class name ->C3 : Symbol(C3.C3, Decl(declarationEmit_classMemberNameConflict.ts, 19, 17)) - - bar() { ->bar : Symbol(C3.bar, Decl(declarationEmit_classMemberNameConflict.ts, 20, 26)) - - return function (t: typeof C3) { ->t : Symbol(t, Decl(declarationEmit_classMemberNameConflict.ts, 23, 25)) ->C3 : Symbol(C3, Decl(declarationEmit_classMemberNameConflict.ts, 17, 1)) - - }; - } -} - -export class C4 { ->C4 : Symbol(C4, Decl(declarationEmit_classMemberNameConflict.ts, 26, 1)) - - set C4(v) { } // has to be the same as the class name ->C4 : Symbol(C4.C4, Decl(declarationEmit_classMemberNameConflict.ts, 28, 17)) ->v : Symbol(v, Decl(declarationEmit_classMemberNameConflict.ts, 29, 11)) - - bar() { ->bar : Symbol(C4.bar, Decl(declarationEmit_classMemberNameConflict.ts, 29, 17)) - - return function (t: typeof C4) { ->t : Symbol(t, Decl(declarationEmit_classMemberNameConflict.ts, 32, 25)) ->C4 : Symbol(C4, Decl(declarationEmit_classMemberNameConflict.ts, 26, 1)) - - }; - } -} diff --git a/tests/baselines/reference/declarationEmit_classMemberNameConflict2.symbols b/tests/baselines/reference/declarationEmit_classMemberNameConflict2.symbols deleted file mode 100644 index e7c4b6f060c..00000000000 --- a/tests/baselines/reference/declarationEmit_classMemberNameConflict2.symbols +++ /dev/null @@ -1,37 +0,0 @@ -=== tests/cases/compiler/declarationEmit_classMemberNameConflict2.ts === - -const Bar = 'bar'; ->Bar : Symbol(Bar, Decl(declarationEmit_classMemberNameConflict2.ts, 1, 5)) - -enum Hello { ->Hello : Symbol(Hello, Decl(declarationEmit_classMemberNameConflict2.ts, 1, 18)) - - World ->World : Symbol(Hello.World, Decl(declarationEmit_classMemberNameConflict2.ts, 3, 12)) -} - -enum Hello1 { ->Hello1 : Symbol(Hello1, Decl(declarationEmit_classMemberNameConflict2.ts, 5, 1)) - - World1 ->World1 : Symbol(Hello1.World1, Decl(declarationEmit_classMemberNameConflict2.ts, 7, 13)) -} - -class Foo { ->Foo : Symbol(Foo, Decl(declarationEmit_classMemberNameConflict2.ts, 9, 1)) - - // Same names + string => OK - Bar = Bar; ->Bar : Symbol(Foo.Bar, Decl(declarationEmit_classMemberNameConflict2.ts, 11, 11)) ->Bar : Symbol(Bar, Decl(declarationEmit_classMemberNameConflict2.ts, 1, 5)) - - // Same names + enum => OK - Hello = Hello; ->Hello : Symbol(Foo.Hello, Decl(declarationEmit_classMemberNameConflict2.ts, 13, 14)) ->Hello : Symbol(Hello, Decl(declarationEmit_classMemberNameConflict2.ts, 1, 18)) - - // Different names + enum => OK - Hello2 = Hello1; ->Hello2 : Symbol(Foo.Hello2, Decl(declarationEmit_classMemberNameConflict2.ts, 16, 18)) ->Hello1 : Symbol(Hello1, Decl(declarationEmit_classMemberNameConflict2.ts, 5, 1)) -} diff --git a/tests/baselines/reference/declarationEmit_expressionInExtends.symbols b/tests/baselines/reference/declarationEmit_expressionInExtends.symbols deleted file mode 100644 index 319914702ac..00000000000 --- a/tests/baselines/reference/declarationEmit_expressionInExtends.symbols +++ /dev/null @@ -1,32 +0,0 @@ -=== tests/cases/compiler/declarationEmit_expressionInExtends.ts === - -var x: { ->x : Symbol(x, Decl(declarationEmit_expressionInExtends.ts, 1, 3)) - - new(s: any): Q; ->T : Symbol(T, Decl(declarationEmit_expressionInExtends.ts, 2, 8)) ->s : Symbol(s, Decl(declarationEmit_expressionInExtends.ts, 2, 11)) ->Q : Symbol(Q, Decl(declarationEmit_expressionInExtends.ts, 3, 1)) -} - -class Q { ->Q : Symbol(Q, Decl(declarationEmit_expressionInExtends.ts, 3, 1)) - - s: string; ->s : Symbol(Q.s, Decl(declarationEmit_expressionInExtends.ts, 5, 9)) -} - -class B extends x { ->B : Symbol(B, Decl(declarationEmit_expressionInExtends.ts, 7, 1)) ->x : Symbol(x, Decl(declarationEmit_expressionInExtends.ts, 1, 3)) -} - -var q: B; ->q : Symbol(q, Decl(declarationEmit_expressionInExtends.ts, 12, 3)) ->B : Symbol(B, Decl(declarationEmit_expressionInExtends.ts, 7, 1)) - -q.s; ->q.s : Symbol(Q.s, Decl(declarationEmit_expressionInExtends.ts, 5, 9)) ->q : Symbol(q, Decl(declarationEmit_expressionInExtends.ts, 12, 3)) ->s : Symbol(Q.s, Decl(declarationEmit_expressionInExtends.ts, 5, 9)) - diff --git a/tests/baselines/reference/declarationEmit_expressionInExtends2.symbols b/tests/baselines/reference/declarationEmit_expressionInExtends2.symbols deleted file mode 100644 index 03a36a49b15..00000000000 --- a/tests/baselines/reference/declarationEmit_expressionInExtends2.symbols +++ /dev/null @@ -1,30 +0,0 @@ -=== tests/cases/compiler/declarationEmit_expressionInExtends2.ts === - -class C { ->C : Symbol(C, Decl(declarationEmit_expressionInExtends2.ts, 0, 0)) ->T : Symbol(T, Decl(declarationEmit_expressionInExtends2.ts, 1, 8)) ->U : Symbol(U, Decl(declarationEmit_expressionInExtends2.ts, 1, 10)) - - x: T; ->x : Symbol(C.x, Decl(declarationEmit_expressionInExtends2.ts, 1, 15)) ->T : Symbol(T, Decl(declarationEmit_expressionInExtends2.ts, 1, 8)) - - y: U; ->y : Symbol(C.y, Decl(declarationEmit_expressionInExtends2.ts, 2, 9)) ->U : Symbol(U, Decl(declarationEmit_expressionInExtends2.ts, 1, 10)) -} - -function getClass(c: T) { ->getClass : Symbol(getClass, Decl(declarationEmit_expressionInExtends2.ts, 4, 1)) ->T : Symbol(T, Decl(declarationEmit_expressionInExtends2.ts, 6, 18)) ->c : Symbol(c, Decl(declarationEmit_expressionInExtends2.ts, 6, 21)) ->T : Symbol(T, Decl(declarationEmit_expressionInExtends2.ts, 6, 18)) - - return C; ->C : Symbol(C, Decl(declarationEmit_expressionInExtends2.ts, 0, 0)) -} - -class MyClass extends getClass(2) { ->MyClass : Symbol(MyClass, Decl(declarationEmit_expressionInExtends2.ts, 8, 1)) ->getClass : Symbol(getClass, Decl(declarationEmit_expressionInExtends2.ts, 4, 1)) -} diff --git a/tests/baselines/reference/declarationEmit_inferedDefaultExportType.symbols b/tests/baselines/reference/declarationEmit_inferedDefaultExportType.symbols deleted file mode 100644 index 7e8cdea2c75..00000000000 --- a/tests/baselines/reference/declarationEmit_inferedDefaultExportType.symbols +++ /dev/null @@ -1,14 +0,0 @@ -=== tests/cases/compiler/declarationEmit_inferedDefaultExportType.ts === - -// test.ts -export default { - foo: [], ->foo : Symbol(foo, Decl(declarationEmit_inferedDefaultExportType.ts, 2, 16)) - - bar: undefined, ->bar : Symbol(bar, Decl(declarationEmit_inferedDefaultExportType.ts, 3, 10)) ->undefined : Symbol(undefined) - - baz: null ->baz : Symbol(baz, Decl(declarationEmit_inferedDefaultExportType.ts, 4, 17)) -} diff --git a/tests/baselines/reference/declarationEmit_inferedDefaultExportType2.symbols b/tests/baselines/reference/declarationEmit_inferedDefaultExportType2.symbols deleted file mode 100644 index d04c50c0d7c..00000000000 --- a/tests/baselines/reference/declarationEmit_inferedDefaultExportType2.symbols +++ /dev/null @@ -1,14 +0,0 @@ -=== tests/cases/compiler/declarationEmit_inferedDefaultExportType2.ts === - -// test.ts -export = { - foo: [], ->foo : Symbol(foo, Decl(declarationEmit_inferedDefaultExportType2.ts, 2, 10)) - - bar: undefined, ->bar : Symbol(bar, Decl(declarationEmit_inferedDefaultExportType2.ts, 3, 10)) ->undefined : Symbol(undefined) - - baz: null ->baz : Symbol(baz, Decl(declarationEmit_inferedDefaultExportType2.ts, 4, 17)) -} diff --git a/tests/baselines/reference/declarationEmit_invalidExport.errors.txt b/tests/baselines/reference/declarationEmit_invalidExport.errors.txt deleted file mode 100644 index 19d650d6d6f..00000000000 --- a/tests/baselines/reference/declarationEmit_invalidExport.errors.txt +++ /dev/null @@ -1,19 +0,0 @@ -tests/cases/compiler/declarationEmit_invalidExport.ts(3,3): error TS7027: Unreachable code detected. -tests/cases/compiler/declarationEmit_invalidExport.ts(5,30): error TS4081: Exported type alias 'MyClass' has or is using private name 'myClass'. -tests/cases/compiler/declarationEmit_invalidExport.ts(6,1): error TS1128: Declaration or statement expected. - - -==== tests/cases/compiler/declarationEmit_invalidExport.ts (3 errors) ==== - - if (false) { - export var myClass = 0; - ~~~~~~ -!!! error TS7027: Unreachable code detected. - } - export type MyClass = typeof myClass; - ~~~~~~~ -!!! error TS4081: Exported type alias 'MyClass' has or is using private name 'myClass'. - } - ~ -!!! error TS1128: Declaration or statement expected. - \ No newline at end of file diff --git a/tests/baselines/reference/declarationEmit_invalidReference.js b/tests/baselines/reference/declarationEmit_invalidReference.js deleted file mode 100644 index d6ef9f48e53..00000000000 --- a/tests/baselines/reference/declarationEmit_invalidReference.js +++ /dev/null @@ -1,11 +0,0 @@ -//// [declarationEmit_invalidReference.ts] -/// -var x = 0; - -//// [declarationEmit_invalidReference.js] -/// -var x = 0; - - -//// [declarationEmit_invalidReference.d.ts] -declare var x: number; diff --git a/tests/baselines/reference/declarationEmit_invalidReference.symbols b/tests/baselines/reference/declarationEmit_invalidReference.symbols deleted file mode 100644 index b23bf697661..00000000000 --- a/tests/baselines/reference/declarationEmit_invalidReference.symbols +++ /dev/null @@ -1,5 +0,0 @@ -=== tests/cases/compiler/declarationEmit_invalidReference.ts === -/// -var x = 0; ->x : Symbol(x, Decl(declarationEmit_invalidReference.ts, 1, 3)) - diff --git a/tests/baselines/reference/declarationEmit_invalidReference.types b/tests/baselines/reference/declarationEmit_invalidReference.types deleted file mode 100644 index 942f2088fc0..00000000000 --- a/tests/baselines/reference/declarationEmit_invalidReference.types +++ /dev/null @@ -1,6 +0,0 @@ -=== tests/cases/compiler/declarationEmit_invalidReference.ts === -/// -var x = 0; ->x : number ->0 : 0 - diff --git a/tests/baselines/reference/declarationEmit_invalidReference2.errors.txt b/tests/baselines/reference/declarationEmit_invalidReference2.errors.txt deleted file mode 100644 index 9d480419022..00000000000 --- a/tests/baselines/reference/declarationEmit_invalidReference2.errors.txt +++ /dev/null @@ -1,8 +0,0 @@ -tests/cases/compiler/declarationEmit_invalidReference2.ts(1,1): error TS6053: File 'tests/cases/compiler/invalid.ts' not found. - - -==== tests/cases/compiler/declarationEmit_invalidReference2.ts (1 errors) ==== - /// - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS6053: File 'tests/cases/compiler/invalid.ts' not found. - var x = 0; \ No newline at end of file diff --git a/tests/baselines/reference/declarationEmit_invalidReference2.js b/tests/baselines/reference/declarationEmit_invalidReference2.js deleted file mode 100644 index 78fb232cca7..00000000000 --- a/tests/baselines/reference/declarationEmit_invalidReference2.js +++ /dev/null @@ -1,11 +0,0 @@ -//// [declarationEmit_invalidReference2.ts] -/// -var x = 0; - -//// [declarationEmit_invalidReference2.js] -/// -var x = 0; - - -//// [declarationEmit_invalidReference2.d.ts] -declare var x: number; diff --git a/tests/baselines/reference/declarationEmit_nameConflicts2.symbols b/tests/baselines/reference/declarationEmit_nameConflicts2.symbols deleted file mode 100644 index 801ad3e7cfc..00000000000 --- a/tests/baselines/reference/declarationEmit_nameConflicts2.symbols +++ /dev/null @@ -1,68 +0,0 @@ -=== tests/cases/compiler/declarationEmit_nameConflicts2.ts === -module X.Y.base { ->X : Symbol(X, Decl(declarationEmit_nameConflicts2.ts, 0, 0), Decl(declarationEmit_nameConflicts2.ts, 7, 1)) ->Y : Symbol(Y, Decl(declarationEmit_nameConflicts2.ts, 0, 9), Decl(declarationEmit_nameConflicts2.ts, 9, 9)) ->base : Symbol(base, Decl(declarationEmit_nameConflicts2.ts, 0, 11), Decl(declarationEmit_nameConflicts2.ts, 9, 11)) - - export function f() { } ->f : Symbol(f, Decl(declarationEmit_nameConflicts2.ts, 0, 17)) - - export class C { } ->C : Symbol(C, Decl(declarationEmit_nameConflicts2.ts, 1, 27)) - - export module M { ->M : Symbol(M, Decl(declarationEmit_nameConflicts2.ts, 2, 22)) - - export var v; ->v : Symbol(v, Decl(declarationEmit_nameConflicts2.ts, 4, 18)) - } - export enum E { } ->E : Symbol(E, Decl(declarationEmit_nameConflicts2.ts, 5, 5)) -} - -module X.Y.base.Z { ->X : Symbol(X, Decl(declarationEmit_nameConflicts2.ts, 0, 0), Decl(declarationEmit_nameConflicts2.ts, 7, 1)) ->Y : Symbol(Y, Decl(declarationEmit_nameConflicts2.ts, 0, 9), Decl(declarationEmit_nameConflicts2.ts, 9, 9)) ->base : Symbol(base, Decl(declarationEmit_nameConflicts2.ts, 0, 11), Decl(declarationEmit_nameConflicts2.ts, 9, 11)) ->Z : Symbol(Z, Decl(declarationEmit_nameConflicts2.ts, 9, 16)) - - export var f = X.Y.base.f; // Should be base.f ->f : Symbol(f, Decl(declarationEmit_nameConflicts2.ts, 10, 14)) ->X.Y.base.f : Symbol(f, Decl(declarationEmit_nameConflicts2.ts, 0, 17)) ->X.Y.base : Symbol(base, Decl(declarationEmit_nameConflicts2.ts, 0, 11), Decl(declarationEmit_nameConflicts2.ts, 9, 11)) ->X.Y : Symbol(Y, Decl(declarationEmit_nameConflicts2.ts, 0, 9), Decl(declarationEmit_nameConflicts2.ts, 9, 9)) ->X : Symbol(X, Decl(declarationEmit_nameConflicts2.ts, 0, 0), Decl(declarationEmit_nameConflicts2.ts, 7, 1)) ->Y : Symbol(Y, Decl(declarationEmit_nameConflicts2.ts, 0, 9), Decl(declarationEmit_nameConflicts2.ts, 9, 9)) ->base : Symbol(base, Decl(declarationEmit_nameConflicts2.ts, 0, 11), Decl(declarationEmit_nameConflicts2.ts, 9, 11)) ->f : Symbol(f, Decl(declarationEmit_nameConflicts2.ts, 0, 17)) - - export var C = X.Y.base.C; // Should be base.C ->C : Symbol(C, Decl(declarationEmit_nameConflicts2.ts, 11, 14)) ->X.Y.base.C : Symbol(C, Decl(declarationEmit_nameConflicts2.ts, 1, 27)) ->X.Y.base : Symbol(base, Decl(declarationEmit_nameConflicts2.ts, 0, 11), Decl(declarationEmit_nameConflicts2.ts, 9, 11)) ->X.Y : Symbol(Y, Decl(declarationEmit_nameConflicts2.ts, 0, 9), Decl(declarationEmit_nameConflicts2.ts, 9, 9)) ->X : Symbol(X, Decl(declarationEmit_nameConflicts2.ts, 0, 0), Decl(declarationEmit_nameConflicts2.ts, 7, 1)) ->Y : Symbol(Y, Decl(declarationEmit_nameConflicts2.ts, 0, 9), Decl(declarationEmit_nameConflicts2.ts, 9, 9)) ->base : Symbol(base, Decl(declarationEmit_nameConflicts2.ts, 0, 11), Decl(declarationEmit_nameConflicts2.ts, 9, 11)) ->C : Symbol(C, Decl(declarationEmit_nameConflicts2.ts, 1, 27)) - - export var M = X.Y.base.M; // Should be base.M ->M : Symbol(M, Decl(declarationEmit_nameConflicts2.ts, 12, 14)) ->X.Y.base.M : Symbol(M, Decl(declarationEmit_nameConflicts2.ts, 2, 22)) ->X.Y.base : Symbol(base, Decl(declarationEmit_nameConflicts2.ts, 0, 11), Decl(declarationEmit_nameConflicts2.ts, 9, 11)) ->X.Y : Symbol(Y, Decl(declarationEmit_nameConflicts2.ts, 0, 9), Decl(declarationEmit_nameConflicts2.ts, 9, 9)) ->X : Symbol(X, Decl(declarationEmit_nameConflicts2.ts, 0, 0), Decl(declarationEmit_nameConflicts2.ts, 7, 1)) ->Y : Symbol(Y, Decl(declarationEmit_nameConflicts2.ts, 0, 9), Decl(declarationEmit_nameConflicts2.ts, 9, 9)) ->base : Symbol(base, Decl(declarationEmit_nameConflicts2.ts, 0, 11), Decl(declarationEmit_nameConflicts2.ts, 9, 11)) ->M : Symbol(M, Decl(declarationEmit_nameConflicts2.ts, 2, 22)) - - export var E = X.Y.base.E; // Should be base.E ->E : Symbol(E, Decl(declarationEmit_nameConflicts2.ts, 13, 14)) ->X.Y.base.E : Symbol(E, Decl(declarationEmit_nameConflicts2.ts, 5, 5)) ->X.Y.base : Symbol(base, Decl(declarationEmit_nameConflicts2.ts, 0, 11), Decl(declarationEmit_nameConflicts2.ts, 9, 11)) ->X.Y : Symbol(Y, Decl(declarationEmit_nameConflicts2.ts, 0, 9), Decl(declarationEmit_nameConflicts2.ts, 9, 9)) ->X : Symbol(X, Decl(declarationEmit_nameConflicts2.ts, 0, 0), Decl(declarationEmit_nameConflicts2.ts, 7, 1)) ->Y : Symbol(Y, Decl(declarationEmit_nameConflicts2.ts, 0, 9), Decl(declarationEmit_nameConflicts2.ts, 9, 9)) ->base : Symbol(base, Decl(declarationEmit_nameConflicts2.ts, 0, 11), Decl(declarationEmit_nameConflicts2.ts, 9, 11)) ->E : Symbol(E, Decl(declarationEmit_nameConflicts2.ts, 5, 5)) -} diff --git a/tests/baselines/reference/declarationEmit_nameConflicts3.symbols b/tests/baselines/reference/declarationEmit_nameConflicts3.symbols deleted file mode 100644 index e72c4ec9cee..00000000000 --- a/tests/baselines/reference/declarationEmit_nameConflicts3.symbols +++ /dev/null @@ -1,76 +0,0 @@ -=== tests/cases/compiler/declarationEmit_nameConflicts3.ts === -module M { ->M : Symbol(M, Decl(declarationEmit_nameConflicts3.ts, 0, 0), Decl(declarationEmit_nameConflicts3.ts, 11, 1)) - - export interface D { } ->D : Symbol(D, Decl(declarationEmit_nameConflicts3.ts, 0, 10), Decl(declarationEmit_nameConflicts3.ts, 1, 26)) - - export module D { ->D : Symbol(D, Decl(declarationEmit_nameConflicts3.ts, 0, 10), Decl(declarationEmit_nameConflicts3.ts, 1, 26)) - - export function f() { } ->f : Symbol(f, Decl(declarationEmit_nameConflicts3.ts, 2, 21)) - } - export module C { ->C : Symbol(C, Decl(declarationEmit_nameConflicts3.ts, 4, 5)) - - export function f() { } ->f : Symbol(f, Decl(declarationEmit_nameConflicts3.ts, 5, 21)) - } - export module E { ->E : Symbol(E, Decl(declarationEmit_nameConflicts3.ts, 7, 5)) - - export function f() { } ->f : Symbol(f, Decl(declarationEmit_nameConflicts3.ts, 8, 21)) - } -} - -module M.P { ->M : Symbol(M, Decl(declarationEmit_nameConflicts3.ts, 0, 0), Decl(declarationEmit_nameConflicts3.ts, 11, 1)) ->P : Symbol(P, Decl(declarationEmit_nameConflicts3.ts, 13, 9)) - - export class C { ->C : Symbol(C, Decl(declarationEmit_nameConflicts3.ts, 13, 12)) - - static f() { } ->f : Symbol(C.f, Decl(declarationEmit_nameConflicts3.ts, 14, 20)) - } - export class E extends C { } ->E : Symbol(E, Decl(declarationEmit_nameConflicts3.ts, 16, 5)) ->C : Symbol(C, Decl(declarationEmit_nameConflicts3.ts, 13, 12)) - - export enum D { ->D : Symbol(D, Decl(declarationEmit_nameConflicts3.ts, 17, 32)) - - f ->f : Symbol(D.f, Decl(declarationEmit_nameConflicts3.ts, 18, 19)) - } - export var v: M.D; // ok ->v : Symbol(v, Decl(declarationEmit_nameConflicts3.ts, 21, 14)) ->M : Symbol(M, Decl(declarationEmit_nameConflicts3.ts, 0, 0), Decl(declarationEmit_nameConflicts3.ts, 11, 1)) ->D : Symbol(D, Decl(declarationEmit_nameConflicts3.ts, 0, 10), Decl(declarationEmit_nameConflicts3.ts, 1, 26)) - - export var w = M.D.f; // error, should be typeof M.D.f ->w : Symbol(w, Decl(declarationEmit_nameConflicts3.ts, 22, 14)) ->M.D.f : Symbol(M.D.f, Decl(declarationEmit_nameConflicts3.ts, 2, 21)) ->M.D : Symbol(D, Decl(declarationEmit_nameConflicts3.ts, 0, 10), Decl(declarationEmit_nameConflicts3.ts, 1, 26)) ->M : Symbol(M, Decl(declarationEmit_nameConflicts3.ts, 0, 0), Decl(declarationEmit_nameConflicts3.ts, 11, 1)) ->D : Symbol(D, Decl(declarationEmit_nameConflicts3.ts, 0, 10), Decl(declarationEmit_nameConflicts3.ts, 1, 26)) ->f : Symbol(M.D.f, Decl(declarationEmit_nameConflicts3.ts, 2, 21)) - - export var x = M.C.f; // error, should be typeof M.C.f ->x : Symbol(x, Decl(declarationEmit_nameConflicts3.ts, 23, 14), Decl(declarationEmit_nameConflicts3.ts, 24, 14)) ->M.C.f : Symbol(C.f, Decl(declarationEmit_nameConflicts3.ts, 5, 21)) ->M.C : Symbol(C, Decl(declarationEmit_nameConflicts3.ts, 4, 5)) ->M : Symbol(M, Decl(declarationEmit_nameConflicts3.ts, 0, 0), Decl(declarationEmit_nameConflicts3.ts, 11, 1)) ->C : Symbol(C, Decl(declarationEmit_nameConflicts3.ts, 4, 5)) ->f : Symbol(C.f, Decl(declarationEmit_nameConflicts3.ts, 5, 21)) - - export var x = M.E.f; // error, should be typeof M.E.f ->x : Symbol(x, Decl(declarationEmit_nameConflicts3.ts, 23, 14), Decl(declarationEmit_nameConflicts3.ts, 24, 14)) ->M.E.f : Symbol(E.f, Decl(declarationEmit_nameConflicts3.ts, 8, 21)) ->M.E : Symbol(E, Decl(declarationEmit_nameConflicts3.ts, 7, 5)) ->M : Symbol(M, Decl(declarationEmit_nameConflicts3.ts, 0, 0), Decl(declarationEmit_nameConflicts3.ts, 11, 1)) ->E : Symbol(E, Decl(declarationEmit_nameConflicts3.ts, 7, 5)) ->f : Symbol(E.f, Decl(declarationEmit_nameConflicts3.ts, 8, 21)) -} diff --git a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.symbols b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.symbols deleted file mode 100644 index 26c8875a236..00000000000 --- a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.symbols +++ /dev/null @@ -1,21 +0,0 @@ -=== tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts === -export module C { export interface I { } } ->C : Symbol(C, Decl(declarationEmit_nameConflictsWithAlias.ts, 0, 0)) ->I : Symbol(I, Decl(declarationEmit_nameConflictsWithAlias.ts, 0, 17)) - -export import v = C; ->v : Symbol(v, Decl(declarationEmit_nameConflictsWithAlias.ts, 0, 42)) ->C : Symbol(C, Decl(declarationEmit_nameConflictsWithAlias.ts, 0, 0)) - -export module M { ->M : Symbol(M, Decl(declarationEmit_nameConflictsWithAlias.ts, 1, 20)) - - export module C { export interface I { } } ->C : Symbol(C, Decl(declarationEmit_nameConflictsWithAlias.ts, 2, 17)) ->I : Symbol(I, Decl(declarationEmit_nameConflictsWithAlias.ts, 3, 21)) - - export var w: v.I; // Gets emitted as C.I, which is the wrong interface ->w : Symbol(w, Decl(declarationEmit_nameConflictsWithAlias.ts, 4, 14)) ->v : Symbol(v, Decl(declarationEmit_nameConflictsWithAlias.ts, 0, 42)) ->I : Symbol(v.I, Decl(declarationEmit_nameConflictsWithAlias.ts, 0, 17)) -} diff --git a/tests/baselines/reference/declarationEmit_protectedMembers.symbols b/tests/baselines/reference/declarationEmit_protectedMembers.symbols deleted file mode 100644 index ee9f5ce199d..00000000000 --- a/tests/baselines/reference/declarationEmit_protectedMembers.symbols +++ /dev/null @@ -1,114 +0,0 @@ -=== tests/cases/compiler/declarationEmit_protectedMembers.ts === - -// Class with protected members -class C1 { ->C1 : Symbol(C1, Decl(declarationEmit_protectedMembers.ts, 0, 0)) - - protected x: number; ->x : Symbol(C1.x, Decl(declarationEmit_protectedMembers.ts, 2, 10)) - - protected f() { ->f : Symbol(C1.f, Decl(declarationEmit_protectedMembers.ts, 3, 24)) - - return this.x; ->this.x : Symbol(C1.x, Decl(declarationEmit_protectedMembers.ts, 2, 10)) ->this : Symbol(C1, Decl(declarationEmit_protectedMembers.ts, 0, 0)) ->x : Symbol(C1.x, Decl(declarationEmit_protectedMembers.ts, 2, 10)) - } - - protected set accessor(a: number) { } ->accessor : Symbol(C1.accessor, Decl(declarationEmit_protectedMembers.ts, 7, 5), Decl(declarationEmit_protectedMembers.ts, 9, 41)) ->a : Symbol(a, Decl(declarationEmit_protectedMembers.ts, 9, 27)) - - protected get accessor() { return 0; } ->accessor : Symbol(C1.accessor, Decl(declarationEmit_protectedMembers.ts, 7, 5), Decl(declarationEmit_protectedMembers.ts, 9, 41)) - - protected static sx: number; ->sx : Symbol(C1.sx, Decl(declarationEmit_protectedMembers.ts, 10, 42)) - - protected static sf() { ->sf : Symbol(C1.sf, Decl(declarationEmit_protectedMembers.ts, 12, 32)) - - return this.sx; ->this.sx : Symbol(C1.sx, Decl(declarationEmit_protectedMembers.ts, 10, 42)) ->this : Symbol(C1, Decl(declarationEmit_protectedMembers.ts, 0, 0)) ->sx : Symbol(C1.sx, Decl(declarationEmit_protectedMembers.ts, 10, 42)) - } - - protected static set staticSetter(a: number) { } ->staticSetter : Symbol(C1.staticSetter, Decl(declarationEmit_protectedMembers.ts, 16, 5)) ->a : Symbol(a, Decl(declarationEmit_protectedMembers.ts, 18, 38)) - - protected static get staticGetter() { return 0; } ->staticGetter : Symbol(C1.staticGetter, Decl(declarationEmit_protectedMembers.ts, 18, 52)) -} - -// Derived class overriding protected members -class C2 extends C1 { ->C2 : Symbol(C2, Decl(declarationEmit_protectedMembers.ts, 20, 1)) ->C1 : Symbol(C1, Decl(declarationEmit_protectedMembers.ts, 0, 0)) - - protected f() { ->f : Symbol(C2.f, Decl(declarationEmit_protectedMembers.ts, 23, 21)) - - return super.f() + this.x; ->super.f : Symbol(C1.f, Decl(declarationEmit_protectedMembers.ts, 3, 24)) ->super : Symbol(C1, Decl(declarationEmit_protectedMembers.ts, 0, 0)) ->f : Symbol(C1.f, Decl(declarationEmit_protectedMembers.ts, 3, 24)) ->this.x : Symbol(C1.x, Decl(declarationEmit_protectedMembers.ts, 2, 10)) ->this : Symbol(C2, Decl(declarationEmit_protectedMembers.ts, 20, 1)) ->x : Symbol(C1.x, Decl(declarationEmit_protectedMembers.ts, 2, 10)) - } - protected static sf() { ->sf : Symbol(C2.sf, Decl(declarationEmit_protectedMembers.ts, 26, 5)) - - return super.sf() + this.sx; ->super.sf : Symbol(C1.sf, Decl(declarationEmit_protectedMembers.ts, 12, 32)) ->super : Symbol(C1, Decl(declarationEmit_protectedMembers.ts, 0, 0)) ->sf : Symbol(C1.sf, Decl(declarationEmit_protectedMembers.ts, 12, 32)) ->this.sx : Symbol(C1.sx, Decl(declarationEmit_protectedMembers.ts, 10, 42)) ->this : Symbol(C2, Decl(declarationEmit_protectedMembers.ts, 20, 1)) ->sx : Symbol(C1.sx, Decl(declarationEmit_protectedMembers.ts, 10, 42)) - } -} - -// Derived class making protected members public -class C3 extends C2 { ->C3 : Symbol(C3, Decl(declarationEmit_protectedMembers.ts, 30, 1)) ->C2 : Symbol(C2, Decl(declarationEmit_protectedMembers.ts, 20, 1)) - - x: number; ->x : Symbol(C3.x, Decl(declarationEmit_protectedMembers.ts, 33, 21)) - - static sx: number; ->sx : Symbol(C3.sx, Decl(declarationEmit_protectedMembers.ts, 34, 14)) - - f() { ->f : Symbol(C3.f, Decl(declarationEmit_protectedMembers.ts, 35, 22)) - - return super.f(); ->super.f : Symbol(C2.f, Decl(declarationEmit_protectedMembers.ts, 23, 21)) ->super : Symbol(C2, Decl(declarationEmit_protectedMembers.ts, 20, 1)) ->f : Symbol(C2.f, Decl(declarationEmit_protectedMembers.ts, 23, 21)) - } - static sf() { ->sf : Symbol(C3.sf, Decl(declarationEmit_protectedMembers.ts, 38, 5)) - - return super.sf(); ->super.sf : Symbol(C2.sf, Decl(declarationEmit_protectedMembers.ts, 26, 5)) ->super : Symbol(C2, Decl(declarationEmit_protectedMembers.ts, 20, 1)) ->sf : Symbol(C2.sf, Decl(declarationEmit_protectedMembers.ts, 26, 5)) - } - - static get staticGetter() { return 1; } ->staticGetter : Symbol(C3.staticGetter, Decl(declarationEmit_protectedMembers.ts, 41, 5)) -} - -// Protected properties in constructors -class C4 { ->C4 : Symbol(C4, Decl(declarationEmit_protectedMembers.ts, 44, 1)) - - constructor(protected a: number, protected b) { } ->a : Symbol(C4.a, Decl(declarationEmit_protectedMembers.ts, 48, 16)) ->b : Symbol(C4.b, Decl(declarationEmit_protectedMembers.ts, 48, 36)) -} diff --git a/tests/baselines/reference/declarationEmit_readonly.symbols b/tests/baselines/reference/declarationEmit_readonly.symbols deleted file mode 100644 index eadb7dc3ddf..00000000000 --- a/tests/baselines/reference/declarationEmit_readonly.symbols +++ /dev/null @@ -1,8 +0,0 @@ -=== tests/cases/conformance/classes/constructorDeclarations/constructorParameters/declarationEmit_readonly.ts === - -class C { ->C : Symbol(C, Decl(declarationEmit_readonly.ts, 0, 0)) - - constructor(readonly x: number) {} ->x : Symbol(C.x, Decl(declarationEmit_readonly.ts, 2, 16)) -} diff --git a/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/declarationEmit_readonly.ts b/tests/cases/conformance/classes/constructorDeclarations/constructorParameters/declarationEmitReadonly.ts similarity index 100% rename from tests/cases/conformance/classes/constructorDeclarations/constructorParameters/declarationEmit_readonly.ts rename to tests/cases/conformance/classes/constructorDeclarations/constructorParameters/declarationEmitReadonly.ts