From 64683a1a4a7e14a5fc3a81a76964bde7536cddb8 Mon Sep 17 00:00:00 2001 From: Michael Henderson Date: Thu, 26 Sep 2019 17:15:35 -0500 Subject: [PATCH] update message, generate diagnostics, update src and accept baselines --- src/compiler/checker.ts | 2 +- src/compiler/diagnosticMessages.json | 2 +- .../importHelpersNoHelpers.errors.txt | 28 +++++++++---------- ...persNoHelpersForAsyncGenerators.errors.txt | 20 ++++++------- ...edTemplateWithoutDeclaredHelper.errors.txt | 4 +-- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index f180f9e544b..ec5087d8dba 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -32818,7 +32818,7 @@ namespace ts { const name = getHelperName(helper); const symbol = getSymbol(helpersModule.exports!, escapeLeadingUnderscores(name), SymbolFlags.Value); if (!symbol) { - error(location, Diagnostics.This_syntax_requires_an_imported_helper_named_1_but_module_0_has_no_exported_member_1, externalHelpersModuleNameText, name); + error(location, Diagnostics.This_syntax_requires_an_imported_helper_named_1_which_does_not_exist_in_0_Consider_upgrading_your_version_of_0, externalHelpersModuleNameText, name); } } } diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 78700a9476c..ef616567e2a 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1241,7 +1241,7 @@ "category": "Error", "code": 2342 }, - "This syntax requires an imported helper named '{1}', but module '{0}' has no exported member '{1}'.": { + "This syntax requires an imported helper named '{1}' which does not exist in '{0}'. Consider upgrading your version of '{0}'.": { "category": "Error", "code": 2343 }, diff --git a/tests/baselines/reference/importHelpersNoHelpers.errors.txt b/tests/baselines/reference/importHelpersNoHelpers.errors.txt index 4034fbc649b..60a864ef352 100644 --- a/tests/baselines/reference/importHelpersNoHelpers.errors.txt +++ b/tests/baselines/reference/importHelpersNoHelpers.errors.txt @@ -1,42 +1,42 @@ -tests/cases/compiler/external.ts(1,1): error TS2343: This syntax requires an imported helper named '__exportStar', but module 'tslib' has no exported member '__exportStar'. -tests/cases/compiler/external.ts(3,16): error TS2343: This syntax requires an imported helper named '__extends', but module 'tslib' has no exported member '__extends'. -tests/cases/compiler/external.ts(7,1): error TS2343: This syntax requires an imported helper named '__decorate', but module 'tslib' has no exported member '__decorate'. -tests/cases/compiler/external.ts(7,1): error TS2343: This syntax requires an imported helper named '__metadata', but module 'tslib' has no exported member '__metadata'. -tests/cases/compiler/external.ts(9,12): error TS2343: This syntax requires an imported helper named '__param', but module 'tslib' has no exported member '__param'. -tests/cases/compiler/external.ts(14,13): error TS2343: This syntax requires an imported helper named '__assign', but module 'tslib' has no exported member '__assign'. -tests/cases/compiler/external.ts(15,12): error TS2343: This syntax requires an imported helper named '__rest', but module 'tslib' has no exported member '__rest'. +tests/cases/compiler/external.ts(1,1): error TS2343: This syntax requires an imported helper named '__exportStar' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. +tests/cases/compiler/external.ts(3,16): error TS2343: This syntax requires an imported helper named '__extends' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. +tests/cases/compiler/external.ts(7,1): error TS2343: This syntax requires an imported helper named '__decorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. +tests/cases/compiler/external.ts(7,1): error TS2343: This syntax requires an imported helper named '__metadata' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. +tests/cases/compiler/external.ts(9,12): error TS2343: This syntax requires an imported helper named '__param' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. +tests/cases/compiler/external.ts(14,13): error TS2343: This syntax requires an imported helper named '__assign' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. +tests/cases/compiler/external.ts(15,12): error TS2343: This syntax requires an imported helper named '__rest' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. ==== tests/cases/compiler/external.ts (7 errors) ==== export * from "./other"; ~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2343: This syntax requires an imported helper named '__exportStar', but module 'tslib' has no exported member '__exportStar'. +!!! error TS2343: This syntax requires an imported helper named '__exportStar' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. export class A { } export class B extends A { } ~~~~~~~~~ -!!! error TS2343: This syntax requires an imported helper named '__extends', but module 'tslib' has no exported member '__extends'. +!!! error TS2343: This syntax requires an imported helper named '__extends' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. declare var dec: any; @dec ~~~~ -!!! error TS2343: This syntax requires an imported helper named '__decorate', but module 'tslib' has no exported member '__decorate'. +!!! error TS2343: This syntax requires an imported helper named '__decorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. ~~~~ -!!! error TS2343: This syntax requires an imported helper named '__metadata', but module 'tslib' has no exported member '__metadata'. +!!! error TS2343: This syntax requires an imported helper named '__metadata' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. class C { method(@dec x: number) { ~~~~ -!!! error TS2343: This syntax requires an imported helper named '__param', but module 'tslib' has no exported member '__param'. +!!! error TS2343: This syntax requires an imported helper named '__param' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. } } const o = { a: 1 }; const y = { ...o }; ~~~~ -!!! error TS2343: This syntax requires an imported helper named '__assign', but module 'tslib' has no exported member '__assign'. +!!! error TS2343: This syntax requires an imported helper named '__assign' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. const { ...x } = y; ~ -!!! error TS2343: This syntax requires an imported helper named '__rest', but module 'tslib' has no exported member '__rest'. +!!! error TS2343: This syntax requires an imported helper named '__rest' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. ==== tests/cases/compiler/other.ts (0 errors) ==== export const x = 1; diff --git a/tests/baselines/reference/importHelpersNoHelpersForAsyncGenerators.errors.txt b/tests/baselines/reference/importHelpersNoHelpersForAsyncGenerators.errors.txt index 633b812c356..370b04d2d3a 100644 --- a/tests/baselines/reference/importHelpersNoHelpersForAsyncGenerators.errors.txt +++ b/tests/baselines/reference/importHelpersNoHelpersForAsyncGenerators.errors.txt @@ -1,25 +1,25 @@ -tests/cases/compiler/main.ts(1,25): error TS2343: This syntax requires an imported helper named '__asyncGenerator', but module 'tslib' has no exported member '__asyncGenerator'. -tests/cases/compiler/main.ts(1,25): error TS2343: This syntax requires an imported helper named '__await', but module 'tslib' has no exported member '__await'. -tests/cases/compiler/main.ts(1,25): error TS2343: This syntax requires an imported helper named '__generator', but module 'tslib' has no exported member '__generator'. -tests/cases/compiler/main.ts(4,5): error TS2343: This syntax requires an imported helper named '__asyncDelegator', but module 'tslib' has no exported member '__asyncDelegator'. -tests/cases/compiler/main.ts(4,5): error TS2343: This syntax requires an imported helper named '__asyncValues', but module 'tslib' has no exported member '__asyncValues'. +tests/cases/compiler/main.ts(1,25): error TS2343: This syntax requires an imported helper named '__asyncGenerator' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. +tests/cases/compiler/main.ts(1,25): error TS2343: This syntax requires an imported helper named '__await' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. +tests/cases/compiler/main.ts(1,25): error TS2343: This syntax requires an imported helper named '__generator' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. +tests/cases/compiler/main.ts(4,5): error TS2343: This syntax requires an imported helper named '__asyncDelegator' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. +tests/cases/compiler/main.ts(4,5): error TS2343: This syntax requires an imported helper named '__asyncValues' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. ==== tests/cases/compiler/main.ts (5 errors) ==== export async function * f() { ~ -!!! error TS2343: This syntax requires an imported helper named '__asyncGenerator', but module 'tslib' has no exported member '__asyncGenerator'. +!!! error TS2343: This syntax requires an imported helper named '__asyncGenerator' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. ~ -!!! error TS2343: This syntax requires an imported helper named '__await', but module 'tslib' has no exported member '__await'. +!!! error TS2343: This syntax requires an imported helper named '__await' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. ~ -!!! error TS2343: This syntax requires an imported helper named '__generator', but module 'tslib' has no exported member '__generator'. +!!! error TS2343: This syntax requires an imported helper named '__generator' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. await 1; yield 2; yield* [3]; ~~~~~~~~~~ -!!! error TS2343: This syntax requires an imported helper named '__asyncDelegator', but module 'tslib' has no exported member '__asyncDelegator'. +!!! error TS2343: This syntax requires an imported helper named '__asyncDelegator' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. ~~~~~~~~~~ -!!! error TS2343: This syntax requires an imported helper named '__asyncValues', but module 'tslib' has no exported member '__asyncValues'. +!!! error TS2343: This syntax requires an imported helper named '__asyncValues' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. } ==== tests/cases/compiler/tslib.d.ts (0 errors) ==== diff --git a/tests/baselines/reference/taggedTemplateWithoutDeclaredHelper.errors.txt b/tests/baselines/reference/taggedTemplateWithoutDeclaredHelper.errors.txt index c0931c50bb5..17566006133 100755 --- a/tests/baselines/reference/taggedTemplateWithoutDeclaredHelper.errors.txt +++ b/tests/baselines/reference/taggedTemplateWithoutDeclaredHelper.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/foo.ts(5,23): error TS2343: This syntax requires an imported helper named '__makeTemplateObject', but module 'tslib' has no exported member '__makeTemplateObject'. +tests/cases/compiler/foo.ts(5,23): error TS2343: This syntax requires an imported helper named '__makeTemplateObject' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. ==== tests/cases/compiler/foo.ts (1 errors) ==== @@ -8,7 +8,7 @@ tests/cases/compiler/foo.ts(5,23): error TS2343: This syntax requires an importe export const result = id `hello world`; ~~~~~~~~~~~~~~~~ -!!! error TS2343: This syntax requires an imported helper named '__makeTemplateObject', but module 'tslib' has no exported member '__makeTemplateObject'. +!!! error TS2343: This syntax requires an imported helper named '__makeTemplateObject' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. ==== tests/cases/compiler/node_modules/tslib/index.d.ts (0 errors) ==== export { };