Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'transforms' into sourceMapUpdatesForClasses

Browse Source
This commit is contained in:
Ron Buckton
2016-04-14 11:28:23 -07:00
parent 49d3ed5919 f13753d366
commit c735c3673e
218 changed files with 1376 additions and 918 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/printer.ts
+7 -3
View File
@@ -1642,8 +1642,10 @@ const _super = (function (geti, seti) {
function emitImportDeclaration(node: ImportDeclaration) {
emitModifiers(node, node.modifiers);
write("import ");
emit(node.importClause);
write(" from ");
if (node.importClause) {
emit(node.importClause);
write(" from ");
}
emitExpression(node.moduleSpecifier);
write(";");
}
@@ -2605,8 +2607,10 @@ const _super = (function (geti, seti) {
function getSourceNodeForGeneratedName(name: Identifier) {
let node: Node = name;
while (node.original !== undefined) {
const nodeId = node.id;
node = node.original;
if (isIdentifier(node) && node.autoGenerateKind === GeneratedIdentifierKind.Node) {
// If "node" is not the exact clone of "original" identifier, use "original" identifier to generate the name
if (isIdentifier(node) && node.autoGenerateKind === GeneratedIdentifierKind.Node && node.id !== nodeId) {
break;
}
}