Adds source maps for captured this, skips source map for synthetic return token in arrow.

rbuckton · rbuckton · commit 719705faf66e · 2016-04-22T12:57:27.000-07:00
diff --git a/src/compiler/printer.ts b/src/compiler/printer.ts
@@ -1546,7 +1546,7 @@ const _super = (function (geti, seti) {
                         const savedTempFlags = tempFlags;
                         tempFlags = 0;
                         emitSignatureHead(node);
-                        emitBlockFunctionBodyAndEndLexicalEnvironment(node, body);
+                        emitBlockFunctionBody(node, body);
                         if (indentedFlag) {
                             decreaseIndent();
                         }
@@ -1610,7 +1610,7 @@ const _super = (function (geti, seti) {
                 return true;
             }
 
-            function emitBlockFunctionBodyAndEndLexicalEnvironment(parentNode: Node, body: Block) {
+            function emitBlockFunctionBody(parentNode: Node, body: Block) {
                 // TODO(rbuckton): This should be removed once source maps are aligned with the old
                 //                 emitter and new baselines are taken. This exists solely to
                 //                 align with the old emitter.
diff --git a/src/compiler/transformers/es6.ts b/src/compiler/transformers/es6.ts
@@ -1063,7 +1063,8 @@ namespace ts {
                                 "_this",
                                 createThis()
                             )
-                        ])
+                        ]),
+                        /*location*/ node
                     )
                 );
             }
@@ -1343,7 +1344,9 @@ namespace ts {
 
                 const expression = visitNode(body, visitor, isExpression);
                 if (expression) {
-                    statements.push(createReturn(expression, /*location*/ statementsLocation));
+                    const returnStatement = createReturn(expression, /*location*/ statementsLocation);
+                    setNodeEmitFlags(returnStatement, NodeEmitFlags.NoTokenSourceMaps);
+                    statements.push(returnStatement);
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -1063,7 +1063,8 @@ namespace ts {`
`1063`	`1063`	`"_this",`
`1064`	`1064`	`createThis()`
`1065`	`1065`	`)`
`1066`		`- ])`
	`1066`	`+ ]),`
	`1067`	`+ /location/ node`
`1067`	`1068`	`)`
`1068`	`1069`	`);`
`1069`	`1070`	`}`
`@@ -1343,7 +1344,9 @@ namespace ts {`
`1343`	`1344`
`1344`	`1345`	`const expression = visitNode(body, visitor, isExpression);`
`1345`	`1346`	`if (expression) {`
`1346`		`- statements.push(createReturn(expression, /location/ statementsLocation));`
	`1347`	`+ const returnStatement = createReturn(expression, /location/ statementsLocation);`
	`1348`	`+ setNodeEmitFlags(returnStatement, NodeEmitFlags.NoTokenSourceMaps);`
	`1349`	`+ statements.push(returnStatement);`
`1347`	`1350`	`}`
`1348`	`1351`	`}`
`1349`	`1352`