From d1acc2b63c39b281e7f13122018dd9eb14859999 Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Tue, 9 Jun 2020 15:49:12 -0700 Subject: [PATCH 1/3] Fix isSameEntityName --- src/compiler/utilities.ts | 2 +- tests/cases/compiler/usedImportNotElidedInJs.ts | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 tests/cases/compiler/usedImportNotElidedInJs.ts diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index cb7b27c932382..d241ed7226b9b 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -2105,7 +2105,7 @@ namespace ts { */ function isSameEntityName(name: Expression, initializer: Expression): boolean { if (isPropertyNameLiteral(name) && isPropertyNameLiteral(initializer)) { - return getTextOfIdentifierOrLiteral(name) === getTextOfIdentifierOrLiteral(name); + return getTextOfIdentifierOrLiteral(name) === getTextOfIdentifierOrLiteral(initializer); } if (isIdentifier(name) && isLiteralLikeAccess(initializer) && (initializer.expression.kind === SyntaxKind.ThisKeyword || diff --git a/tests/cases/compiler/usedImportNotElidedInJs.ts b/tests/cases/compiler/usedImportNotElidedInJs.ts new file mode 100644 index 0000000000000..8fb9d840f700d --- /dev/null +++ b/tests/cases/compiler/usedImportNotElidedInJs.ts @@ -0,0 +1,12 @@ +// #38412 + +// @allowJs: true +// @noResolve: true +// @target: es2015 +// @outDir: out +// @noTypesAndSymbols: true + +// @Filename: test.js +import * as moment from 'moment'; +import rollupMoment__default from 'moment'; +export const moment = rollupMoment__default || moment; From 1e3b8b9b07d9493142a66961e458f600e776a797 Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Tue, 9 Jun 2020 15:54:28 -0700 Subject: [PATCH 2/3] Add baseline --- tests/baselines/reference/usedImportNotElidedInJs.js | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 tests/baselines/reference/usedImportNotElidedInJs.js diff --git a/tests/baselines/reference/usedImportNotElidedInJs.js b/tests/baselines/reference/usedImportNotElidedInJs.js new file mode 100644 index 0000000000000..4fcec0de4c9fd --- /dev/null +++ b/tests/baselines/reference/usedImportNotElidedInJs.js @@ -0,0 +1,10 @@ +//// [test.js] +import * as moment from 'moment'; +import rollupMoment__default from 'moment'; +export const moment = rollupMoment__default || moment; + + +//// [test.js] +import * as moment from 'moment'; +import rollupMoment__default from 'moment'; +export const moment = rollupMoment__default || moment; From 4141c14431436f6110d4f0592fb37580dffc8865 Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Tue, 9 Jun 2020 16:12:09 -0700 Subject: [PATCH 3/3] Fix baseline --- tests/baselines/reference/usedImportNotElidedInJs.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/baselines/reference/usedImportNotElidedInJs.js b/tests/baselines/reference/usedImportNotElidedInJs.js index 4fcec0de4c9fd..ae5e5d17ac88a 100644 --- a/tests/baselines/reference/usedImportNotElidedInJs.js +++ b/tests/baselines/reference/usedImportNotElidedInJs.js @@ -1,10 +1,14 @@ //// [test.js] +// #38412 + + import * as moment from 'moment'; import rollupMoment__default from 'moment'; export const moment = rollupMoment__default || moment; //// [test.js] +// #38412 import * as moment from 'moment'; import rollupMoment__default from 'moment'; export const moment = rollupMoment__default || moment;