Emit generated name for unnamed default function in down-level code

ahejlsberg · ahejlsberg · commit 3a72c004a041 · 2015-03-30T02:25:09.000-07:00
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -2935,16 +2935,14 @@ module ts {
                 }
             }
 
-            function shouldEmitFunctionName(node: Declaration): boolean {
-                // Emit a declaration name for the function iff:
-                //    it is a function expression with a name provided
-                //    it is a function declaration with a name provided
-                //    it is a function declaration is not the default export, and is missing a name (emit a generated name for it)
+            function shouldEmitFunctionName(node: FunctionLikeDeclaration) {
                 if (node.kind === SyntaxKind.FunctionExpression) {
+                    // Emit name if one is present
                     return !!node.name;
                 }
-                else if (node.kind === SyntaxKind.FunctionDeclaration) {
-                    return !!node.name || (languageVersion >= ScriptTarget.ES6 && !(node.flags & NodeFlags.Default));
+                if (node.kind === SyntaxKind.FunctionDeclaration) {
+                    // Emit name if one is present, or emit generated name in down-level case (for export default case)
+                    return !!node.name || languageVersion < ScriptTarget.ES6;
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -2935,16 +2935,14 @@ module ts {`
`2935`	`2935`	`}`
`2936`	`2936`	`}`
`2937`	`2937`
`2938`		`- function shouldEmitFunctionName(node: Declaration): boolean {`
`2939`		`- // Emit a declaration name for the function iff:`
`2940`		`- // it is a function expression with a name provided`
`2941`		`- // it is a function declaration with a name provided`
`2942`		`- // it is a function declaration is not the default export, and is missing a name (emit a generated name for it)`
	`2938`	`+ function shouldEmitFunctionName(node: FunctionLikeDeclaration) {`
`2943`	`2939`	`if (node.kind === SyntaxKind.FunctionExpression) {`
	`2940`	`+ // Emit name if one is present`
`2944`	`2941`	`return !!node.name;`
`2945`	`2942`	`}`
`2946`		`- else if (node.kind === SyntaxKind.FunctionDeclaration) {`
`2947`		`- return !!node.name \|\| (languageVersion >= ScriptTarget.ES6 && !(node.flags & NodeFlags.Default));`
	`2943`	`+ if (node.kind === SyntaxKind.FunctionDeclaration) {`
	`2944`	`+ // Emit name if one is present, or emit generated name in down-level case (for export default case)`
	`2945`	`+ return !!node.name \|\| languageVersion < ScriptTarget.ES6;`
`2948`	`2946`	`}`
`2949`	`2947`	`}`
`2950`	`2948`