From b6c97de24e30220994c8591b510df780fe123191 Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Tue, 7 Feb 2017 07:18:49 -0800 Subject: [PATCH] Address code review: update error message --- src/compiler/checker.ts | 2 +- src/compiler/diagnosticMessages.json | 2 +- tests/baselines/reference/es5-commonjs3.errors.txt | 4 ++-- tests/baselines/reference/es5-commonjs4.errors.txt | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 1564f0c7f69..22e70aaaa93 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -21929,7 +21929,7 @@ namespace ts { function checkESModuleMarker(name: Identifier | BindingPattern): boolean { if (name.kind === SyntaxKind.Identifier) { if (unescapeIdentifier(name.text) === "__esModule") { - return grammarErrorOnNode(name, Diagnostics.Identifier_expected_esModule_is_reserved_as_a_marker_for_transpiled_ES2015_module); + return grammarErrorOnNode(name, Diagnostics.Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules); } } else { diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 50a91761e80..3e2118f67b7 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -671,7 +671,7 @@ "category": "Error", "code": 1215 }, - "Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module.": { + "Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules.": { "category": "Error", "code": 1216 }, diff --git a/tests/baselines/reference/es5-commonjs3.errors.txt b/tests/baselines/reference/es5-commonjs3.errors.txt index 51c5d2cd44d..fddabf56fac 100644 --- a/tests/baselines/reference/es5-commonjs3.errors.txt +++ b/tests/baselines/reference/es5-commonjs3.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/es5-commonjs3.ts(3,12): error TS1216: Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module. +tests/cases/compiler/es5-commonjs3.ts(3,12): error TS1216: Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules. ==== tests/cases/compiler/es5-commonjs3.ts (1 errors) ==== @@ -6,5 +6,5 @@ tests/cases/compiler/es5-commonjs3.ts(3,12): error TS1216: Identifier expected. export default "test"; export var __esModule = 1; ~~~~~~~~~~ -!!! error TS1216: Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module. +!!! error TS1216: Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules. \ No newline at end of file diff --git a/tests/baselines/reference/es5-commonjs4.errors.txt b/tests/baselines/reference/es5-commonjs4.errors.txt index 6a047378bac..9a901728cfb 100644 --- a/tests/baselines/reference/es5-commonjs4.errors.txt +++ b/tests/baselines/reference/es5-commonjs4.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/es5-commonjs4.ts(14,12): error TS1216: Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module. +tests/cases/compiler/es5-commonjs4.ts(14,12): error TS1216: Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules. ==== tests/cases/compiler/es5-commonjs4.ts (1 errors) ==== @@ -17,5 +17,5 @@ tests/cases/compiler/es5-commonjs4.ts(14,12): error TS1216: Identifier expected. } export var __esModule = 1; ~~~~~~~~~~ -!!! error TS1216: Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module. +!!! error TS1216: Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules. \ No newline at end of file