Restore arrow function.

DanielRosenwasser · DanielRosenwasser · commit e0c35f2c8290 · 2016-09-27T14:44:50.000-07:00
diff --git a/src/compiler/transformers/es6.ts b/src/compiler/transformers/es6.ts
@@ -224,7 +224,7 @@ namespace ts {
                 : visitorWorker(node);
         }
 
-        function saveStateAndInvoke<T>(node: Node, f: (node: Node) => T): T {
+        function saveStateAndInvoke<T extends Node, U>(node: T, f: (node: T) => U): U {
             const savedEnclosingFunction = enclosingFunction;
             const savedEnclosingNonArrowFunction = enclosingNonArrowFunction;
             const savedEnclosingNonAsyncFunctionBody = enclosingNonAsyncFunctionBody;
@@ -867,7 +867,7 @@ namespace ts {
             }
 
             if (constructor) {
-                const body = saveStateAndInvoke(constructor, makeTransformerForConstructorBodyAtOffset(statementOffset));
+                const body = saveStateAndInvoke(constructor, constructor => visitNodes(constructor.body.statements, visitor, isStatement, /*start*/ statementOffset));
                 addRange(statements, body);
             }
 
@@ -900,10 +900,6 @@ namespace ts {
             return block;
         }
 
-        function makeTransformerForConstructorBodyAtOffset(offset: number): (c: ConstructorDeclaration) => NodeArray<Statement> {
-            return constructor => visitNodes(constructor.body.statements, visitor, isStatement, /*start*/ offset);
-        }
-
         /**
          * We want to try to avoid emitting a return statement in certain cases if a user already returned something.
          * It would be pointless and generate dead code, so we'll try to make things a little bit prettier

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ namespace ts {`
`224`	`224`	`: visitorWorker(node);`
`225`	`225`	`}`
`226`	`226`
`227`		`- function saveStateAndInvoke<T>(node: Node, f: (node: Node) => T): T {`
	`227`	`+ function saveStateAndInvoke<T extends Node, U>(node: T, f: (node: T) => U): U {`
`228`	`228`	`const savedEnclosingFunction = enclosingFunction;`
`229`	`229`	`const savedEnclosingNonArrowFunction = enclosingNonArrowFunction;`
`230`	`230`	`const savedEnclosingNonAsyncFunctionBody = enclosingNonAsyncFunctionBody;`
`@@ -867,7 +867,7 @@ namespace ts {`
`867`	`867`	`}`
`868`	`868`
`869`	`869`	`if (constructor) {`
`870`		`- const body = saveStateAndInvoke(constructor, makeTransformerForConstructorBodyAtOffset(statementOffset));`
	`870`	`+ const body = saveStateAndInvoke(constructor, constructor => visitNodes(constructor.body.statements, visitor, isStatement, /start/ statementOffset));`
`871`	`871`	`addRange(statements, body);`
`872`	`872`	`}`
`873`	`873`
`@@ -900,10 +900,6 @@ namespace ts {`
`900`	`900`	`return block;`
`901`	`901`	`}`
`902`	`902`
`903`		`- function makeTransformerForConstructorBodyAtOffset(offset: number): (c: ConstructorDeclaration) => NodeArray<Statement> {`
`904`		`- return constructor => visitNodes(constructor.body.statements, visitor, isStatement, /start/ offset);`
`905`		`- }`
`906`		`-`
`907`	`903`	`/**`
`908`	`904`	`* We want to try to avoid emitting a return statement in certain cases if a user already returned something.`
`909`	`905`	`* It would be pointless and generate dead code, so we'll try to make things a little bit prettier`