From a61936b63acb2a3388501d7f0ffc136f2c01e4ef Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Mon, 25 Apr 2016 12:28:30 -0700 Subject: [PATCH 1/2] Comments --- tests/baselines/reference/moduleDuplicateIdentifiers.js | 3 +-- tests/baselines/reference/privacyImport.js | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/baselines/reference/moduleDuplicateIdentifiers.js b/tests/baselines/reference/moduleDuplicateIdentifiers.js index a8689aa486d..1da296d7d12 100644 --- a/tests/baselines/reference/moduleDuplicateIdentifiers.js +++ b/tests/baselines/reference/moduleDuplicateIdentifiers.js @@ -43,7 +43,7 @@ export enum Utensils { // Shouldn't error //// [moduleDuplicateIdentifiers.js] "use strict"; exports.Foo = 2; -exports.Foo = 42; +exports.Foo = 42; // Should error var FooBar; (function (FooBar) { FooBar.member1 = 2; @@ -77,4 +77,3 @@ var Utensils = exports.Utensils; (function (Utensils) { Utensils[Utensils["Spork"] = 3] = "Spork"; })(exports.Utensils || (exports.Utensils = {})); -var Utensils = exports.Utensils; diff --git a/tests/baselines/reference/privacyImport.js b/tests/baselines/reference/privacyImport.js index debb1e3b4bd..fcac37bac36 100644 --- a/tests/baselines/reference/privacyImport.js +++ b/tests/baselines/reference/privacyImport.js @@ -440,6 +440,8 @@ var m1; //var m1_im4_private_v4_private = m1_im4_private.f1(); m1.m1_im1_public = m1_M1_public; m1.m1_im2_public = m1_M2_private; + //export import m1_im3_public = require("m1_M3_public"); + //export import m1_im4_public = require("m1_M4_private"); })(m1 = exports.m1 || (exports.m1 = {})); var m2; (function (m2) { @@ -524,6 +526,8 @@ var m2; // Parse error to export module m2.m1_im1_public = m2_M1_public; m2.m1_im2_public = m2_M2_private; + //export import m1_im3_public = require("m2_M3_public"); + //export import m1_im4_public = require("m2_M4_private"); })(m2 || (m2 = {})); var glo_M1_public; (function (glo_M1_public) { @@ -686,6 +690,7 @@ var m2; var m4; (function (m4) { var a = 10; + //import m2 = require("use_glo_M1_public"); })(m4 || (m4 = {})); })(m2 || (m2 = {})); var m3; @@ -694,5 +699,6 @@ var m3; var m4; (function (m4) { var a = 10; + //import m2 = require("use_glo_M1_public"); })(m4 || (m4 = {})); })(m3 = exports.m3 || (exports.m3 = {})); From b98ab5735bcfd54060d1802a9d1a2d0d8dc4db0d Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Tue, 26 Apr 2016 13:17:06 -0700 Subject: [PATCH 2/2] Error baselines --- .../reference/moduleElementsInWrongContext.errors.txt | 5 +---- .../reference/moduleElementsInWrongContext2.errors.txt | 5 +---- .../reference/moduleElementsInWrongContext3.errors.txt | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/tests/baselines/reference/moduleElementsInWrongContext.errors.txt b/tests/baselines/reference/moduleElementsInWrongContext.errors.txt index 4ab5c5b42c0..0ab411e03c4 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext.errors.txt +++ b/tests/baselines/reference/moduleElementsInWrongContext.errors.txt @@ -6,7 +6,6 @@ tests/cases/compiler/moduleElementsInWrongContext.ts(13,5): error TS1231: An exp tests/cases/compiler/moduleElementsInWrongContext.ts(17,5): error TS1233: An export declaration can only be used in a module. tests/cases/compiler/moduleElementsInWrongContext.ts(18,5): error TS1233: An export declaration can only be used in a module. tests/cases/compiler/moduleElementsInWrongContext.ts(19,5): error TS1233: An export declaration can only be used in a module. -tests/cases/compiler/moduleElementsInWrongContext.ts(19,14): error TS2305: Module '"ambient"' has no exported member 'baz'. tests/cases/compiler/moduleElementsInWrongContext.ts(20,5): error TS1231: An export assignment can only be used in a module. tests/cases/compiler/moduleElementsInWrongContext.ts(21,5): error TS1184: Modifiers cannot appear here. tests/cases/compiler/moduleElementsInWrongContext.ts(22,5): error TS1184: Modifiers cannot appear here. @@ -18,7 +17,7 @@ tests/cases/compiler/moduleElementsInWrongContext.ts(27,5): error TS1232: An imp tests/cases/compiler/moduleElementsInWrongContext.ts(28,5): error TS1232: An import declaration can only be used in a namespace or module. -==== tests/cases/compiler/moduleElementsInWrongContext.ts (18 errors) ==== +==== tests/cases/compiler/moduleElementsInWrongContext.ts (17 errors) ==== { module M { } ~~~~~~ @@ -54,8 +53,6 @@ tests/cases/compiler/moduleElementsInWrongContext.ts(28,5): error TS1232: An imp export { baz as b } from "ambient"; ~~~~~~ !!! error TS1233: An export declaration can only be used in a module. - ~~~ -!!! error TS2305: Module '"ambient"' has no exported member 'baz'. export default v; ~~~~~~ !!! error TS1231: An export assignment can only be used in a module. diff --git a/tests/baselines/reference/moduleElementsInWrongContext2.errors.txt b/tests/baselines/reference/moduleElementsInWrongContext2.errors.txt index d6611e71831..223f14684fe 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext2.errors.txt +++ b/tests/baselines/reference/moduleElementsInWrongContext2.errors.txt @@ -6,7 +6,6 @@ tests/cases/compiler/moduleElementsInWrongContext2.ts(13,5): error TS1231: An ex tests/cases/compiler/moduleElementsInWrongContext2.ts(17,5): error TS1233: An export declaration can only be used in a module. tests/cases/compiler/moduleElementsInWrongContext2.ts(18,5): error TS1233: An export declaration can only be used in a module. tests/cases/compiler/moduleElementsInWrongContext2.ts(19,5): error TS1233: An export declaration can only be used in a module. -tests/cases/compiler/moduleElementsInWrongContext2.ts(19,30): error TS2307: Cannot find module 'ambient'. tests/cases/compiler/moduleElementsInWrongContext2.ts(20,5): error TS1231: An export assignment can only be used in a module. tests/cases/compiler/moduleElementsInWrongContext2.ts(21,5): error TS1184: Modifiers cannot appear here. tests/cases/compiler/moduleElementsInWrongContext2.ts(22,5): error TS1184: Modifiers cannot appear here. @@ -18,7 +17,7 @@ tests/cases/compiler/moduleElementsInWrongContext2.ts(27,5): error TS1232: An im tests/cases/compiler/moduleElementsInWrongContext2.ts(28,5): error TS1232: An import declaration can only be used in a namespace or module. -==== tests/cases/compiler/moduleElementsInWrongContext2.ts (18 errors) ==== +==== tests/cases/compiler/moduleElementsInWrongContext2.ts (17 errors) ==== function blah () { module M { } ~~~~~~ @@ -54,8 +53,6 @@ tests/cases/compiler/moduleElementsInWrongContext2.ts(28,5): error TS1232: An im export { baz as b } from "ambient"; ~~~~~~ !!! error TS1233: An export declaration can only be used in a module. - ~~~~~~~~~ -!!! error TS2307: Cannot find module 'ambient'. export default v; ~~~~~~ !!! error TS1231: An export assignment can only be used in a module. diff --git a/tests/baselines/reference/moduleElementsInWrongContext3.errors.txt b/tests/baselines/reference/moduleElementsInWrongContext3.errors.txt index f5361319b68..5d4b190bb65 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext3.errors.txt +++ b/tests/baselines/reference/moduleElementsInWrongContext3.errors.txt @@ -6,7 +6,6 @@ tests/cases/compiler/moduleElementsInWrongContext3.ts(14,9): error TS1231: An ex tests/cases/compiler/moduleElementsInWrongContext3.ts(18,9): error TS1233: An export declaration can only be used in a module. tests/cases/compiler/moduleElementsInWrongContext3.ts(19,9): error TS1233: An export declaration can only be used in a module. tests/cases/compiler/moduleElementsInWrongContext3.ts(20,9): error TS1233: An export declaration can only be used in a module. -tests/cases/compiler/moduleElementsInWrongContext3.ts(20,34): error TS2307: Cannot find module 'ambient'. tests/cases/compiler/moduleElementsInWrongContext3.ts(21,9): error TS1231: An export assignment can only be used in a module. tests/cases/compiler/moduleElementsInWrongContext3.ts(22,9): error TS1184: Modifiers cannot appear here. tests/cases/compiler/moduleElementsInWrongContext3.ts(23,9): error TS1184: Modifiers cannot appear here. @@ -18,7 +17,7 @@ tests/cases/compiler/moduleElementsInWrongContext3.ts(28,9): error TS1232: An im tests/cases/compiler/moduleElementsInWrongContext3.ts(29,9): error TS1232: An import declaration can only be used in a namespace or module. -==== tests/cases/compiler/moduleElementsInWrongContext3.ts (18 errors) ==== +==== tests/cases/compiler/moduleElementsInWrongContext3.ts (17 errors) ==== module P { { module M { } @@ -55,8 +54,6 @@ tests/cases/compiler/moduleElementsInWrongContext3.ts(29,9): error TS1232: An im export { baz as b } from "ambient"; ~~~~~~ !!! error TS1233: An export declaration can only be used in a module. - ~~~~~~~~~ -!!! error TS2307: Cannot find module 'ambient'. export default v; ~~~~~~ !!! error TS1231: An export assignment can only be used in a module.