Remove custom source map emit for modules.

Author: rbuckton

src/compiler/emitter.ts

@@ -1651,17 +1651,7 @@ const _super = (function (geti, seti) {
         }
 
         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.
-            if (body.emitFlags & NodeEmitFlags.SourceMapEmitOpenBraceAsToken) {
-                write(" ");
-                writeToken(SyntaxKind.OpenBraceToken, body.pos);
-            }
-            else {
-                write(" {");
-            }
-
+            write(" {");
             increaseIndent();
 
             emitBodyWithDetachedComments(body, body.statements,

src/compiler/transformers/ts.ts

@@ -2836,14 +2836,6 @@ namespace ts {
                 /*location*/ blockLocation,
                 /*multiLine*/ true
             );
-
-            // 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.
-            if (body.kind === SyntaxKind.ModuleBlock) {
-                setNodeEmitFlags(block, NodeEmitFlags.SourceMapEmitOpenBraceAsToken);
-            }
-
             return block;
         }
 

src/compiler/types.ts

@@ -3110,12 +3110,6 @@ namespace ts {
         AsyncFunctionBody = 1 << 21,
         ReuseTempVariableScope = 1 << 22,        // Reuse the existing temp variable scope during emit.
         CustomPrologue = 1 << 23,                // Treat the statement as if it were a prologue directive (NOTE: Prologue directives are *not* transformed).
-
-        // SourceMap Specialization.
-        // TODO(rbuckton): These 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.
-        SourceMapEmitOpenBraceAsToken = 1 << 24,        // Emits the open brace of a block function body as a source mapped token.
     }
 
     /** Additional context provided to `visitEachChild` */

tests/baselines/reference/contextualTyping.js.map

@@ -160,27 +160,21 @@ sourceFile:contextualTyping.ts
 1->
 2 >^^^^^^^^^^^
 3 >           ^^^^
-4 >               ^^
-5 >                 ^
-6 >                  ^^^^^^^^^^^^->
+4 >               ^^^^^^^^^^^^^^^->
 1->
 2 >module 
 3 >           C2T5
-4 >                
-5 >                 {
 1->Emitted(12, 1) Source(21, 1) + SourceIndex(0)
 2 >Emitted(12, 12) Source(21, 8) + SourceIndex(0)
 3 >Emitted(12, 16) Source(21, 12) + SourceIndex(0)
-4 >Emitted(12, 18) Source(21, 13) + SourceIndex(0)
-5 >Emitted(12, 19) Source(21, 14) + SourceIndex(0)
 ---
 >>>    C2T5.foo = function (i) {
 1->^^^^
 2 >    ^^^^^^^^
 3 >            ^^^
 4 >               ^^^^^^^^^^
 5 >                         ^
-1->
+1-> {
   >    export var 
 2 >    foo
 3 >            : (i: number, s: string) => number = 
@@ -1100,19 +1094,13 @@ sourceFile:contextualTyping.ts
 1->
 2 >^^^^^^^^^^^
 3 >           ^^^^
-4 >               ^^
-5 >                 ^
-6 >                  ^^^^^^^^^^^^^^^->
+4 >               ^^^^^^^^^^^^^^^^^^->
 1->
 2 >module 
 3 >           C5T5
-4 >                
-5 >                 {
 1->Emitted(51, 1) Source(66, 1) + SourceIndex(0)
 2 >Emitted(51, 12) Source(66, 8) + SourceIndex(0)
 3 >Emitted(51, 16) Source(66, 12) + SourceIndex(0)
-4 >Emitted(51, 18) Source(66, 13) + SourceIndex(0)
-5 >Emitted(51, 19) Source(66, 14) + SourceIndex(0)
 ---
 >>>    C5T5.foo = function (i, s) {
 1->^^^^
@@ -1123,7 +1111,7 @@ sourceFile:contextualTyping.ts
 6 >                         ^
 7 >                          ^^
 8 >                            ^
-1->
+1-> {
   >    export var foo: (i: number, s: string) => string;
   >    
 2 >