From 27c5d6fa503e8fc439ced7173a41794dd22c22d2 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Tue, 24 Mar 2015 20:50:42 -0700 Subject: [PATCH] use the correct check for import and export specifiers --- src/compiler/emitter.ts | 8 ++++---- .../reference/es6ImportNamedImportParsingError.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 2892059061f..93ff34fef8e 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -3706,7 +3706,7 @@ module ts { } else { write("{ "); - emitExportOrImportSpecifierList((node.importClause.namedBindings).elements); + emitExportOrImportSpecifierList((node.importClause.namedBindings).elements, resolver.isReferencedAliasDeclaration); write(" }"); } emitEnd(node.importClause.namedBindings); @@ -3917,7 +3917,7 @@ module ts { if (node.exportClause) { // export { x, y, ... } write("{ "); - emitExportOrImportSpecifierList(node.exportClause.elements); + emitExportOrImportSpecifierList(node.exportClause.elements, resolver.isValueAliasDeclaration); write(" }"); } else { @@ -3933,12 +3933,12 @@ module ts { } } - function emitExportOrImportSpecifierList(specifiers: ImportOrExportSpecifier[]) { + function emitExportOrImportSpecifierList(specifiers: ImportOrExportSpecifier[], shouldEmit: (node: Node) => boolean) { Debug.assert(languageVersion >= ScriptTarget.ES6); let needsComma = false; for (let specifier of specifiers) { - if (resolver.isValueAliasDeclaration(specifier)) { + if (shouldEmit(specifier)) { if (needsComma) { write(", "); } diff --git a/tests/baselines/reference/es6ImportNamedImportParsingError.js b/tests/baselines/reference/es6ImportNamedImportParsingError.js index 1be56ef4a08..81f141b3dd8 100644 --- a/tests/baselines/reference/es6ImportNamedImportParsingError.js +++ b/tests/baselines/reference/es6ImportNamedImportParsingError.js @@ -24,5 +24,5 @@ from; } from; "es6ImportNamedImportParsingError_0"; -import { } from , from; +import { a } from , from; "es6ImportNamedImportParsingError_0";